diff options
| author |   Matteo Bernardini | 2015-12-05 09:36:49 +0100 |
|---|---|---|
| committer | Matteo Bernardini | 2015-12-05 09:36:49 +0100 |
| commit | 4def11ef1716c91bf77e1c3f3bad794a091d4972 (patch) | |
| tree | 2c25278393d91d7c75387ff5907fe8b572f82779 | |
| parent | ce5f1ace6655d31c9ae689fdca3955e398298bc7 (diff) | |
| download | old.slackbuilds-4def11ef1716c91bf77e1c3f3bad794a091d4972.tar.gz | |
20151205.1 global branch merge.current-20151205.1
Signed-off-by: Matteo Bernardini <ponce@slackbuilds.org>
823 files changed, 9440 insertions, 8411 deletions
@@ -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/EMBASSY/EMBASSY.SlackBuild b/academic/EMBASSY/EMBASSY.SlackBuild index a5fd088e4d..67e2ea8471 100644 --- a/academic/EMBASSY/EMBASSY.SlackBuild +++ b/academic/EMBASSY/EMBASSY.SlackBuild @@ -367,8 +367,9 @@ make install DESTDIR=$PKG # Build VIENNA cd $TMP/$PRGNAM-$VERSION/$VIENNA -CFLAGS="$SLKCFLAGS" \ -CXXFLAGS="$SLKCFLAGS" \ +# -std=gnu89 fixes build with gcc-5.2 (inline functions HairpinE and LoopEnergy) +CFLAGS="$SLKCFLAGS -std=gnu89" \ +CXXFLAGS="$SLKCFLAGS -std=gnu89" \ ./configure \ --prefix=/usr \ --libdir=/usr/lib${LIBDIRSUFFIX} \ diff --git a/academic/Kst/Kst.SlackBuild b/academic/Kst/Kst.SlackBuild index 0ab614f03d..527bc6ba1b 100644 --- a/academic/Kst/Kst.SlackBuild +++ b/academic/Kst/Kst.SlackBuild @@ -45,6 +45,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 with gsl-2.1 (gsl API change) +patch -p1 < $CWD/Kst_gsl2.patch + sed -i "s/find_package\(PythonLibs REQUIRED\)/SET \(PythonLibs \"\/usr\/lib${LIBDIRSUFFIX}\/libpython2.7.so\"\)/" \ ./cmake/pyKst/CMakeLists.txt sed -i "s/\${NUMPY_VERSION_PATCH}/0/" ./cmake/modules/FindNumPy.cmake diff --git a/academic/Kst/Kst_gsl2.patch b/academic/Kst/Kst_gsl2.patch new file mode 100644 index 0000000000..1a7db24321 --- /dev/null +++ b/academic/Kst/Kst_gsl2.patch @@ -0,0 +1,53 @@ +diff -u -r Kst-2.0.8/src/plugins/fits/non_linear.h Kst-2.0.8-patched/src/plugins/fits/non_linear.h +--- Kst-2.0.8/src/plugins/fits/non_linear.h 2014-02-13 09:41:44.000000000 +0000 ++++ Kst-2.0.8-patched/src/plugins/fits/non_linear.h 2015-11-18 22:28:40.761417846 +0000 +@@ -18,6 +18,7 @@ + #include <gsl/gsl_blas.h> + #include <gsl/gsl_multifit_nlin.h> + #include <gsl/gsl_statistics.h> ++#include <gsl/gsl_version.h> + #include "common.h" + + struct data { +@@ -177,7 +178,15 @@ + } + iIterations++; + } while( iStatus == GSL_CONTINUE && iIterations < MAX_NUM_ITERATIONS ); ++ ++#if GSL_MAJOR_VERSION >=2 ++ gsl_matrix *J=gsl_matrix_alloc(pSolver->fdf->n, pSolver->fdf->p); ++ gsl_multifit_fdfsolver_jac (pSolver, J); ++ gsl_multifit_covar( J, 0.0, pMatrixCovariance ); ++ gsl_matrix_free(J); ++#else + gsl_multifit_covar( pSolver->J, 0.0, pMatrixCovariance ); ++#endif + + // + // determine the fitted values... +diff -u -r Kst-2.0.8/src/plugins/fits/non_linear_weighted.h Kst-2.0.8-patched/src/plugins/fits/non_linear_weighted.h +--- Kst-2.0.8/src/plugins/fits/non_linear_weighted.h 2014-02-13 09:41:44.000000000 +0000 ++++ Kst-2.0.8-patched/src/plugins/fits/non_linear_weighted.h 2015-11-18 22:28:44.004399807 +0000 +@@ -18,6 +18,7 @@ + #include <gsl/gsl_blas.h> + #include <gsl/gsl_multifit_nlin.h> + #include <gsl/gsl_statistics.h> ++#include <gsl/gsl_version.h> + #include "common.h" + + struct data { +@@ -193,7 +194,14 @@ + } + while( iStatus == GSL_CONTINUE && iIterations < MAX_NUM_ITERATIONS ); + ++#if GSL_MAJOR_VERSION >=2 ++ gsl_matrix *J=gsl_matrix_alloc(pSolver->fdf->n, pSolver->fdf->p); ++ gsl_multifit_fdfsolver_jac (pSolver, J); ++ gsl_multifit_covar( J, 0.0, pMatrixCovariance ); ++ gsl_matrix_free(J); ++#else + gsl_multifit_covar( pSolver->J, 0.0, pMatrixCovariance ); ++#endif + + // + // determine the fitted values... diff --git a/academic/QtiPlot/QtiPlot.SlackBuild b/academic/QtiPlot/QtiPlot.SlackBuild index bd10844559..719db33181 100644 --- a/academic/QtiPlot/QtiPlot.SlackBuild +++ b/academic/QtiPlot/QtiPlot.SlackBuild @@ -47,16 +47,16 @@ OUTPUT=${OUTPUT:-/tmp} if [ "$ARCH" = "i486" ]; then SLKCFLAGS="-O2 -march=i486 -mtune=i686" - LIBDIRSUFFIX="" + QMAKESPEC="linux-g++" elif [ "$ARCH" = "i686" ]; then SLKCFLAGS="-O2 -march=i686 -mtune=i686" - LIBDIRSUFFIX="" + QMAKESPEC="linux-g++" elif [ "$ARCH" = "x86_64" ]; then SLKCFLAGS="-O2 -fPIC" - LIBDIRSUFFIX="64" + QMAKESPEC="linux-g++-64" else SLKCFLAGS="-O2" - LIBDIRSUFFIX="" + QMAKESPEC="linux-g++" fi # Define these here, as numbers change between Slackware releases. The @@ -90,6 +90,14 @@ cp -a $UNOFPLUGIN/qtiplot/src/plugins $SRCNAM-$VERSION/qtiplot/src cp -a $UNOFPLUGIN/qtiplot/importOPJ.pro $SRCNAM-$VERSION/qtiplot cd $SRCNAM-$VERSION +# Patches for recent libpng, sip, gsl, etc +# thanks to slack_jack, Raveriux, ponce, Arch and Gentoo +patch -p0 -d 3rdparty/qwtplot3d < $CWD/qwtplot3d-libpng15.patch +patch -p1 < $CWD/sip-4.15.patch +patch -p1 < $CWD/qtiplot-0.9.8.9-private.patch +patch -p1 < $CWD/pyqt-4.11.patch +patch -p1 < $CWD/qtiplot-0.9.8.9_gsl-2.patch + # Use the custom build.conf cp $CWD/build.conf.slack build.conf @@ -156,10 +164,10 @@ make -j1 web # Build QtiPlot cd ../qtiplot -qmake qtiplot.pro +qmake qtiplot.pro "QMAKESPEC=$QMAKESPEC" CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ -make -j1 +make -j1 "QMAKESPEC=$QMAKESPEC" make -j1 install INSTALL_ROOT=$PKG # Generate translations and copy them to their proper place @@ -173,10 +181,10 @@ cp examples/python/* $PKG/usr/share/qtiplot/python-examples # Build fitPlugins cd ../fitPlugins -qmake +qmake "QMAKESPEC=$QMAKESPEC" CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ -make -j1 +make -j1 "QMAKESPEC=$QMAKESPEC" make -j1 install INSTALL_ROOT=$PKG cd .. diff --git a/academic/QtiPlot/pyqt-4.11.patch b/academic/QtiPlot/pyqt-4.11.patch new file mode 100644 index 0000000000..dc7d56f3e3 --- /dev/null +++ b/academic/QtiPlot/pyqt-4.11.patch @@ -0,0 +1,33 @@ + qtiplot/python-sipcmd.py | 21 ++++++++++++++++++--- + 1 file changed, 18 insertions(+), 3 deletions(-) + +diff --git a/qtiplot/python-sipcmd.py b/qtiplot/python-sipcmd.py +index f643194..d8d1ef2 100755 +--- a/qtiplot/python-sipcmd.py ++++ b/qtiplot/python-sipcmd.py +@@ -27,6 +27,21 @@ + # # + ############################################################################ + +-from PyQt4 import pyqtconfig +-config = pyqtconfig.Configuration() +-print " ".join([config.sip_bin, "-I", config.pyqt_sip_dir, config.pyqt_sip_flags]) ++from __future__ import print_function ++ ++import os ++import sipconfig ++import PyQt4.QtCore ++ ++try: ++ # >= 4.10 ++ SIP_FLAGS = PyQt4.QtCore.PYQT_CONFIGURATION['sip_flags'] ++except: ++ import PyQt4.pyqtconfig ++ SIP_FLAGS = PyQt4.pyqtconfig.Configuration().pyqt_sip_flags ++ ++PYQT_SIP_DIR = os.path.join(sipconfig.Configuration().default_sip_dir, 'PyQt4') ++SIP_BIN = sipconfig.Configuration().sip_bin ++SIP_INC_DIR = sipconfig.Configuration().sip_inc_dir ++ ++print(" ".join([SIP_BIN, "-I", PYQT_SIP_DIR, SIP_FLAGS])) + diff --git a/academic/QtiPlot/qtiplot-0.9.8.9-private.patch b/academic/QtiPlot/qtiplot-0.9.8.9-private.patch new file mode 100644 index 0000000000..1dd92fd1a3 --- /dev/null +++ b/academic/QtiPlot/qtiplot-0.9.8.9-private.patch @@ -0,0 +1,16 @@ +diff -ruN qtiplot-0.9.8.9.orig/qtiplot/src/plot2D/ImageWidget.h qtiplot-0.9.8.9/qtiplot/src/plot2D/ImageWidget.h +--- qtiplot-0.9.8.9.orig/qtiplot/src/plot2D/ImageWidget.h 2010-10-17 09:04:05.000000000 +0200 ++++ qtiplot-0.9.8.9/qtiplot/src/plot2D/ImageWidget.h 2013-11-01 12:11:36.559973891 +0100 +@@ -67,10 +67,10 @@ + void setWindowName(const QString& name){d_window_name = name;}; + + static QPixmap windowPixmap(ApplicationWindow *mw, const QString& name, const QSize& size); ++ void paintEvent(QPaintEvent *e); + + private: + void draw(QPainter *painter, const QRect& r); +- void paintEvent(QPaintEvent *e); + QPixmap d_pix; + //! The file from which the image was loaded. + QString d_file_name; + diff --git a/academic/QtiPlot/qtiplot-0.9.8.9_gsl-2.patch b/academic/QtiPlot/qtiplot-0.9.8.9_gsl-2.patch new file mode 100644 index 0000000000..d6ff7d00b0 --- /dev/null +++ b/academic/QtiPlot/qtiplot-0.9.8.9_gsl-2.patch @@ -0,0 +1,52 @@ +diff -u -r qtiplot-0.9.8.9/qtiplot/src/analysis/Fit.cpp qtiplot-0.9.8.9-patched/qtiplot/src/analysis/Fit.cpp +--- qtiplot-0.9.8.9/qtiplot/src/analysis/Fit.cpp 2011-10-17 11:06:00.000000000 +0100 ++++ qtiplot-0.9.8.9-patched/qtiplot/src/analysis/Fit.cpp 2015-11-18 22:26:22.535193469 +0000 +@@ -39,6 +39,7 @@ + #include <gsl/gsl_statistics.h> + #include <gsl/gsl_blas.h> + #include <gsl/gsl_cdf.h> ++#include <gsl/gsl_version.h> + + #include <QApplication> + #include <QMessageBox> +@@ -106,6 +107,10 @@ + gsl_multifit_fdfsolver * Fit::fitGSL(gsl_multifit_function_fdf f, int &iterations, int &status) + { + const gsl_multifit_fdfsolver_type *T; ++#if GSL_MAJOR_VERSION >=2 ++ gsl_matrix *J=0; ++#endif ++ + if (d_solver) + T = gsl_multifit_fdfsolver_lmder; + else +@@ -128,7 +133,14 @@ + } + + if (status){ ++#if GSL_MAJOR_VERSION >=2 ++ J=gsl_matrix_alloc(s->fdf->n, s->fdf->p); ++ gsl_multifit_fdfsolver_jac (s, J); ++ gsl_multifit_covar (J, 0.0, covar); ++ gsl_matrix_free(J); ++#else + gsl_multifit_covar (s->J, 0.0, covar); ++#endif + iterations = 0; + return s; + } +@@ -155,7 +167,14 @@ + status = gsl_multifit_test_delta (s->dx, s->x, d_tolerance, d_tolerance); + } while (inRange && status == GSL_CONTINUE && (int)iter < d_max_iterations); + ++#if GSL_MAJOR_VERSION >=2 ++ J=gsl_matrix_alloc(s->fdf->n, s->fdf->p); ++ gsl_multifit_fdfsolver_jac (s, J); ++ gsl_multifit_covar (J, 0.0, covar); ++ gsl_matrix_free(J); ++#else + gsl_multifit_covar (s->J, 0.0, covar); ++#endif + + iterations = iter; + return s; diff --git a/academic/QtiPlot/qwtplot3d-libpng15.patch b/academic/QtiPlot/qwtplot3d-libpng15.patch new file mode 100644 index 0000000000..828f0c6d84 --- /dev/null +++ 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/QtiPlot/sip-4.15.patch b/academic/QtiPlot/sip-4.15.patch new file mode 100644 index 0000000000..504223190a --- /dev/null +++ b/academic/QtiPlot/sip-4.15.patch @@ -0,0 +1,32 @@ +--- ./qtiplot/src/analysis/FFT.cpp.orig 2011-07-06 11:51:08.000000000 +0000 ++++ ./qtiplot/src/analysis/FFT.cpp 2013-10-23 23:07:45.674925476 +0000 +@@ -353,7 +353,7 @@ + ml->arrangeLayers(false, false); + } + +-bool FFT::setDataFromTable(Table *t, const QString& realColName, const QString& imagColName, int from, int to) ++bool FFT::setDataFromTable(Table *t, const QString& realColName, const QString& imagColName, int from, int to, bool unused) + { + d_init_err = true; + +--- ./qtiplot/src/analysis/FFT.h.orig 2011-07-05 22:05:03.000000000 +0000 ++++ ./qtiplot/src/analysis/FFT.h 2013-10-23 23:11:34.277924367 +0000 +@@ -52,6 +52,8 @@ + Matrix *realOutputMatrix(){return d_re_out_matrix;} + Matrix *imaginaryOutputMatrix(){return d_im_out_matrix;} + ++ bool setDataFromTable(Table *t, const QString& realColName, const QString& imagColName = QString(), int from = 0, int to = -1, bool unused = false); ++ + private: + void init(); + void output(); +@@ -60,8 +62,6 @@ + void fftTable(); + void fftMatrix(); + +- bool setDataFromTable(Table *t, const QString& realColName, const QString& imagColName = QString(), int from = 0, int to = -1); +- + double d_sampling; + //! Flag telling if an inverse FFT must be performed. + bool d_inverse; + diff --git a/academic/arka/arka.SlackBuild b/academic/arka/arka.SlackBuild index 9143a44173..bb68495fa0 100644 --- a/academic/arka/arka.SlackBuild +++ b/academic/arka/arka.SlackBuild @@ -66,8 +66,9 @@ sed "s:/usr/X11R6/include/X11/pixmaps:/usr/share/pixmaps:" -i Makefile # Use our CFLAGS sed -i "/^CFLAGS/s/=/+=/" src/Makefile -CFLAGS="$SLKCFLAGS" \ -CXXFLAGS="$SLKCFLAGS" \ +# Fix for gcc-5.2.0 linker errors: add -fgnu89-inline +CFLAGS="$SLKCFLAGS -fgnu89-inline" \ +CXXFLAGS="$SLKCFLAGS -fgnu89-inline" \ make # The Makefile does not support "make DESTDIR install". So... diff --git a/academic/avogadro/avogadro-1.1.1-eigen3.patch b/academic/avogadro/avogadro-1.1.1-eigen3.patch new file mode 100644 index 0000000000..dc07d6974e --- /dev/null +++ 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-cmake-3.2.patch b/academic/avogadro/avogadro-cmake-3.2.patch new file mode 100644 index 0000000000..1c6a38d4ca --- /dev/null +++ b/academic/avogadro/avogadro-cmake-3.2.patch @@ -0,0 +1,12 @@ +Index: avogadro-1.1.1/CMakeLists.txt +=================================================================== +--- avogadro-1.1.1.orig/CMakeLists.txt ++++ avogadro-1.1.1/CMakeLists.txt +@@ -225,6 +225,7 @@ set(I18N_LANGUAGE "" CACHE STRING "Build + + find_package(Qt4 4.6.0 REQUIRED) # find and setup Qt4 for this project + find_package(OpenGL REQUIRED) # find and setup OpenGL ++find_package(X11 REQUIRED) # find and setup X11 + find_package(Linguist) # find and setup Linguist + if(NOT Linguist_FOUND) + message(WARNING " Qt4 Linguist not found, please install it if you want Avogadro translations") diff --git a/academic/avogadro/avogadro.SlackBuild b/academic/avogadro/avogadro.SlackBuild index ee365f9bfb..4fe366eb56 100644 --- a/academic/avogadro/avogadro.SlackBuild +++ b/academic/avogadro/avogadro.SlackBuild @@ -76,6 +76,13 @@ 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 + +# Fix underlinking (gcc-5.2) thanks Fedora +patch -p1 < $CWD/avogadro-cmake-3.2.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 new file mode 100644 index 0000000000..5dffbab246 --- /dev/null +++ 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 new file mode 100644 index 0000000000..78911cb557 --- /dev/null +++ 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 index 1802c08d6d..4faaed06ae 100644 --- 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/coq/coq.SlackBuild b/academic/coq/coq.SlackBuild index f4f5603990..c961252a6d 100644 --- a/academic/coq/coq.SlackBuild +++ b/academic/coq/coq.SlackBuild @@ -18,7 +18,7 @@ # Written by William Bowman (wilbowma@indiana.edu) PRGNAM=coq -VERSION=${VERSION:-8.3pl2} +VERSION=${VERSION:-8.4pl6} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -72,6 +72,7 @@ fi ./configure \ -prefix /usr \ -libdir /usr/lib${LIBDIRSUFFIX}/coq \ + -mandir /usr/man \ -arch $ARCH \ $OPT diff --git a/academic/coq/coq.info b/academic/coq/coq.info index 3331831597..75969f213c 100644 --- a/academic/coq/coq.info +++ b/academic/coq/coq.info @@ -1,8 +1,8 @@ PRGNAM="coq" -VERSION="8.3pl2" +VERSION="8.4pl6" HOMEPAGE="http://coq.inria.fr/" -DOWNLOAD="http://coq.inria.fr/distrib/V8.3pl2/files/coq-8.3pl2.tar.gz" -MD5SUM="db415f6c5372f5a443699c62f5affcb4" +DOWNLOAD="http://coq.inria.fr/distrib/V8.4pl6/files/coq-8.4pl6.tar.gz" +MD5SUM="2334a98b64578cb81d2b4127e327b368" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="camlp5" 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 new file mode 100644 index 0000000000..57bce20dce --- /dev/null +++ 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 index 7e57e1c799..f749eb317b 100644 --- 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/gelemental/gelemental.SlackBuild b/academic/gelemental/gelemental.SlackBuild index 5967379a8d..013d8ba5b6 100644 --- a/academic/gelemental/gelemental.SlackBuild +++ b/academic/gelemental/gelemental.SlackBuild @@ -85,7 +85,7 @@ sed -i "s:set_size_request (50, 50):set_size_request (64, 64):" src/buttons.cc patch -p1 -i $CWD/glib-single-include.patch CFLAGS="$SLKCFLAGS" \ -CXXFLAGS="$SLKCFLAGS" \ +CXXFLAGS="$SLKCFLAGS -std=c++11" \ ./configure \ --prefix=/usr \ --libdir=/usr/lib${LIBDIRSUFFIX} \ diff --git a/academic/genius/genius.SlackBuild b/academic/genius/genius.SlackBuild index d87e418893..64e755559a 100644 --- a/academic/genius/genius.SlackBuild +++ b/academic/genius/genius.SlackBuild @@ -75,8 +75,8 @@ 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 {} \; -CFLAGS="$SLKCFLAGS" \ -CXXFLAGS="$SLKCFLAGS" \ +CFLAGS="$SLKCFLAGS -std=gnu89" \ +CXXFLAGS="$SLKCFLAGS -std=gnu89" \ ./configure \ --prefix=/usr \ --libdir=/usr/lib${LIBDIRSUFFIX} \ diff --git a/academic/gretl/gretl.SlackBuild b/academic/gretl/gretl.SlackBuild index 6b741b59ca..f9725f0917 100644 --- a/academic/gretl/gretl.SlackBuild +++ b/academic/gretl/gretl.SlackBuild @@ -80,8 +80,8 @@ CXXFLAGS="$SLKCFLAGS" \ --docdir=/usr/doc/$PRGNAM-$VERSION \ --disable-static \ --build=$ARCH-slackware-linux -make -make install DESTDIR=$PKG +make -j1 +make -j1 install DESTDIR=$PKG 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 diff --git a/academic/itex2mml/bison3-fix.patch b/academic/itex2mml/bison3-fix.patch new file mode 100644 index 0000000000..53daeaaddd --- /dev/null +++ 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 index 218769b763..4b03e37293 100644 --- 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 index a7573bf636..7360427342 100644 --- 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/labplot2/labplot2.SlackBuild b/academic/labplot2/labplot2.SlackBuild index 052e3324cf..ca807e8da1 100644 --- a/academic/labplot2/labplot2.SlackBuild +++ b/academic/labplot2/labplot2.SlackBuild @@ -24,11 +24,17 @@ PKG=$TMP/package-$PRGNAM OUTPUT=${OUTPUT:-/tmp} if [ "$ARCH" = "i486" ]; then - SLKCFLAGS="-O2 -march=i486 -mtune=i686"; SLKLDFLAGS=""; LIBDIRSUFFIX=""; CHOST=i486 + SLKCFLAGS="-O2 -march=i486 -mtune=i686" + LIBDIRSUFFIX="" elif [ "$ARCH" = "i686" ]; then - SLKCFLAGS="-O2 -march=i686 -mtune=i686"; SLKLDFLAGS=""; LIBDIRSUFFIX=""; CHOST=i486 + SLKCFLAGS="-O2 -march=i686 -mtune=i686" + LIBDIRSUFFIX="" elif [ "$ARCH" = "x86_64" ]; then - SLKCFLAGS="-O2 -fPIC"; SLKLDFLAGS="-L/usr/lib64"; LIBDIRSUFFIX="64" + SLKCFLAGS="-O2 -fPIC" + LIBDIRSUFFIX="64" +else + SLKCFLAGS="-O2" + LIBDIRSUFFIX="" fi set -e @@ -46,19 +52,21 @@ 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 {} \; -./compile +# Use -fpermissive to fix build failure with gcc-5.2.0 +mkdir -p build +cd build + cmake \ + -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS -fpermissive" \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DLIB_SUFFIX=${LIBDIRSUFFIX} \ + -DMAN_INSTALL_DIR=/usr/man \ + -DCMAKE_BUILD_TYPE=Release .. + make + make install DESTDIR=$PKG +cd .. -( cd build/ -cmake ./ -DCMAKE_INSTALL_PREFIX=/usr -cmake ./ -DCMAKE_BUILD_TYPE=Release -make install DESTDIR=$PKG -) - -( cd $PKG -find . | xargs file | grep "executable" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true -find . | xargs file | grep "shared object" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true -find . | xargs file | grep "current ar archive" | cut -f 1 -d : | xargs strip -g 2> /dev/null || true -) +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 AUTHORS ChangeLog COPYING INSTALL README $PKG/usr/doc/$PRGNAM-$VERSION diff --git a/academic/pspp/pspp.SlackBuild b/academic/pspp/pspp.SlackBuild index de0d59a462..e76d3e3ce2 100644 --- 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 index cc5cb38c79..c405a31efa 100644 --- 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 index ed4c5c9148..0a182993d8 100644 --- 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} @@ -98,6 +98,9 @@ find -L . \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ -exec chmod 644 {} \; +# Fix building with gsl-2.1 +patch -p1 < $CWD/root_gsl2.patch + # Make sure we use system libs and headers rm -r graf3d/ftgl/{inc,src} || die rm -r graf2d/freetype/src || die diff --git a/academic/root/root.info b/academic/root/root.info index b42552b267..26f73494a1 100644 --- 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/academic/root/root_gsl2.patch b/academic/root/root_gsl2.patch new file mode 100644 index 0000000000..8f049d7e03 --- /dev/null +++ b/academic/root/root_gsl2.patch @@ -0,0 +1,42 @@ +diff -u -r root/math/mathmore/src/GSLMultiFit.h root-patched/math/mathmore/src/GSLMultiFit.h +--- root/math/mathmore/src/GSLMultiFit.h 2015-06-23 16:56:20.000000000 +0100 ++++ root-patched/math/mathmore/src/GSLMultiFit.h 2015-11-18 22:30:54.300681289 +0000 +@@ -32,6 +32,7 @@ + #include "gsl/gsl_multifit_nlin.h" + #include "gsl/gsl_blas.h" + #include "GSLMultiFitFunctionWrapper.h" ++#include <gsl/gsl_version.h> + + #include "Math/IFunction.h" + #include <string> +@@ -139,7 +140,14 @@ + /// gradient value at the minimum + const double * Gradient() const { + if (fSolver == 0) return 0; +- gsl_multifit_gradient(fSolver->J, fSolver->f,fVec); ++#if GSL_MAJOR_VERSION >=2 ++ gsl_matrix *J=gsl_matrix_alloc(fSolver->fdf->n, fSolver->fdf->p); ++ gsl_multifit_fdfsolver_jac (fSolver, J); ++ gsl_multifit_gradient(J, fSolver->f, fVec); ++ gsl_matrix_free(J); ++#else ++ gsl_multifit_gradient(fSolver->J, fSolver->f, fVec); ++#endif + return fVec->data; + } + +@@ -150,7 +158,14 @@ + unsigned int npar = fSolver->fdf->p; + fCov = gsl_matrix_alloc( npar, npar ); + static double kEpsrel = 0.0001; ++#if GSL_MAJOR_VERSION >=2 ++ gsl_matrix *J=gsl_matrix_alloc(fSolver->fdf->n, fSolver->fdf->p); ++ gsl_multifit_fdfsolver_jac (fSolver, J); ++ int ret = gsl_multifit_covar(J, kEpsrel, fCov); ++ gsl_matrix_free(J); ++#else + int ret = gsl_multifit_covar(fSolver->J, kEpsrel, fCov); ++#endif + if (ret != GSL_SUCCESS) return 0; + return fCov->data; + } diff --git a/accessibility/jpilot/jpilot.SlackBuild b/accessibility/jpilot/jpilot.SlackBuild index 32294b2035..78eeb3f868 100644 --- a/accessibility/jpilot/jpilot.SlackBuild +++ b/accessibility/jpilot/jpilot.SlackBuild @@ -70,8 +70,8 @@ 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 {} \; -CFLAGS="$SLKCFLAGS" \ -CXXFLAGS="$SLKCFLAGS" \ +CFLAGS="$SLKCFLAGS -std=gnu89" \ +CXXFLAGS="$SLKCFLAGS -std=gnu89" \ ./configure \ --prefix=/usr \ --libdir=/usr/lib${LIBDIRSUFFIX} \ diff --git a/audio/Pd-extended/Pd-extended.SlackBuild b/audio/Pd-extended/Pd-extended.SlackBuild index 9267927f3f..922eba5bb1 100644 --- 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" \ diff --git a/audio/Pd-extended/change_gem_configure_file.patch b/audio/Pd-extended/change_gem_configure_file.patch new file mode 100644 index 0000000000..a10ff9155a --- /dev/null +++ b/audio/Pd-extended/change_gem_configure_file.patch @@ -0,0 +1,28 @@ +*** configure.ac 2011-12-23 08:44:12.000000000 +0100 +--- configureUP.ac 2012-11-03 09:51:31.000000000 +0100 +*************** +*** 114,124 **** + + # Checks for programs. + AC_PROG_CXX +! dnl AC_PROG_OBJCXX + + AC_LIBTOOL_WIN32_DLL + AC_PROG_LIBTOOL +- #predeps_CXX="-lstdc++" + + AC_PROG_INSTALL + AC_PROG_LN_S +--- 114,125 ---- + + # Checks for programs. + AC_PROG_CXX +! m4_ifdef([AC_PROG_OBJC], [AC_PROG_OBJC]) +! m4_ifdef([AC_PROG_OBJCXX], [AC_PROG_OBJCXX]) +! + + AC_LIBTOOL_WIN32_DLL + AC_PROG_LIBTOOL + + AC_PROG_INSTALL + AC_PROG_LN_S diff --git a/audio/SAM/README b/audio/SAM/README new file mode 100644 index 0000000000..184eaee3ba --- /dev/null +++ b/audio/SAM/README @@ -0,0 +1,8 @@ +Sam is a very small Text-To-Speech (TTS) program written in C, that +runs on most popular platforms. +It is an adaption to C of the speech software SAM (Software Automatic +Mouth) for the Commodore C64 published in the year 1982 by Don't Ask +Software (now SoftVoice, Inc.). +It includes a Text-To-Phoneme converter called reciter and a +Phoneme-To-Speech routine for the final output. +It is so small that it will work also on embedded computers. diff --git a/audio/SAM/SAM.SlackBuild b/audio/SAM/SAM.SlackBuild new file mode 100644 index 0000000000..344714068b --- /dev/null +++ b/audio/SAM/SAM.SlackBuild @@ -0,0 +1,91 @@ +#!/bin/sh + +# Slackware build script for SAM + +# Copyright 2013-2015 Matteo Bernardini <ponce@slackbuilds.org>, Pisa, Italy +# All rights reserved. +# +# Redistribution and use of this script, with or without modification, is +# permitted provided that the following conditions are met: +# +# 1. Redistributions of this script must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# +# THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED +# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF +# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO +# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, +# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; +# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, +# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR +# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF +# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +PRGNAM=SAM +VERSION=${VERSION:-20141230_5a63e72} +BUILD=${BUILD:-1} +TAG=${TAG:-_SBo} + +if [ -z "$ARCH" ]; then + case "$( uname -m )" in + i?86) ARCH=i486 ;; + arm*) ARCH=arm ;; + *) ARCH=$( uname -m ) ;; + esac +fi + +CWD=$(pwd) +TMP=${TMP:-/tmp/SBo} +PKG=$TMP/package-$PRGNAM +OUTPUT=${OUTPUT:-/tmp} + +if [ "$ARCH" = "i486" ]; then + SLKCFLAGS="-O2 -march=i486 -mtune=i686" + LIBDIRSUFFIX="" +elif [ "$ARCH" = "i686" ]; then + SLKCFLAGS="-O2 -march=i686 -mtune=i686" + LIBDIRSUFFIX="" +elif [ "$ARCH" = "x86_64" ]; then + SLKCFLAGS="-O2 -fPIC" + LIBDIRSUFFIX="64" +else + SLKCFLAGS="-O2" + LIBDIRSUFFIX="" +fi + +set -e + +rm -rf $PKG +mkdir -p $TMP $PKG $OUTPUT +cd $TMP +rm -rf $PRGNAM-$VERSION +tar xvf $CWD/$PRGNAM-$VERSION.tar.?z* +cd $PRGNAM-$VERSION +chown -R root:root . +find . \ + \( -perm 777 -o -perm 775 -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 {} \; + +# Use our CFLAGS +sed -i "s|-O2|$SLKCFLAGS|" Makefile +make +install -D -m 0755 sam $PKG/usr/bin/sam + +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 README.md $PKG/usr/doc/$PRGNAM-$VERSION +cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild +# copy dos demo files converting line endings +mkdir $PKG/usr/doc/$PRGNAM-$VERSION/demos +for i in demos/*; do tr -d '\015' < $i > $PKG/usr/doc/$PRGNAM-$VERSION/$i ; done + +mkdir -p $PKG/install +cat $CWD/slack-desc > $PKG/install/slack-desc + +cd $PKG +/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz} diff --git a/audio/SAM/SAM.info b/audio/SAM/SAM.info new file mode 100644 index 0000000000..7dfb02218f --- /dev/null +++ b/audio/SAM/SAM.info @@ -0,0 +1,10 @@ +PRGNAM="SAM" +VERSION="20141230_5a63e72" +HOMEPAGE="https://github.com/s-macke/SAM" +DOWNLOAD="http://ponce.cc/slackware/sources/repo/SAM-20141230_5a63e72.tar.xz" +MD5SUM="8a7b2902c0c383404dc300c375965a0f" +DOWNLOAD_x86_64="" +MD5SUM_x86_64="" +REQUIRES="" +MAINTAINER="Matteo Bernardini" +EMAIL="ponce@slackbuilds.org" diff --git a/audio/SAM/slack-desc b/audio/SAM/slack-desc new file mode 100644 index 0000000000..d31ef3b855 --- /dev/null +++ b/audio/SAM/slack-desc @@ -0,0 +1,19 @@ +# HOW TO EDIT THIS FILE: +# The "handy ruler" below makes it easier to edit a package description. +# Line up the first '|' above the ':' following the base package name, and +# the '|' on the right side marks the last column you can put a character in. +# You must make exactly 11 lines for the formatting to be correct. It's also +# customary to leave one space after the ':' except on otherwise blank lines. + + |-----handy-ruler------------------------------------------------------| +SAM: SAM (Software Automatic Mouth) +SAM: +SAM: Sam is a very small Text-To-Speech (TTS) program written in C, that +SAM: runs on most popular platforms. +SAM: It is an adaption to C of the speech software SAM (Software Automatic +SAM: Mouth) for the Commodore C64 published in the year 1982 by Don't Ask +SAM: Software (now SoftVoice, Inc.). +SAM: It includes a Text-To-Phoneme converter called reciter and a +SAM: Phoneme-To-Speech routine for the final output. +SAM: It is so small that it will work also on embedded computers. +SAM: diff --git a/audio/SuperCollider/SuperCollider.SlackBuild b/audio/SuperCollider/SuperCollider.SlackBuild index 6dafa3d0ad..8a4d6bbf05 100644 --- a/audio/SuperCollider/SuperCollider.SlackBuild +++ b/audio/SuperCollider/SuperCollider.SlackBuild @@ -61,6 +61,9 @@ if [ "$LIBDIRSUFFIX" = "64" ]; then patch -p1 < $CWD/fixups_for_x86_64.diff fi +# Fix build failure with gcc-4.9 (thanks to Debian) +patch -p1 < $CWD/ftbfs-gcc-4.9.patch + # Pass AVAHI=yes to the script to enable avahi support if [ "${AVAHI:-no}" = "yes" ]; then avahi="OFF"; else avahi="ON"; fi diff --git a/audio/SuperCollider/ftbfs-gcc-4.9.patch b/audio/SuperCollider/ftbfs-gcc-4.9.patch new file mode 100644 index 0000000000..1b124f7277 --- /dev/null +++ b/audio/SuperCollider/ftbfs-gcc-4.9.patch @@ -0,0 +1,20 @@ +From: Felipe Sateler <fsateler@debian.org> +Date: Fri, 6 Jun 2014 13:15:18 -0400 +Subject: Fix implementation of aligned_allocator::construct<U>. + +Fixes a build failure with gcc >= 4.9, because it defines __cplusplus >= 201103L. + +A typo, apparently. This patch can be dropped in the next upstream release. +Index: supercollider/server/supernova/utilities/malloc_aligned.hpp +=================================================================== +--- supercollider.orig/server/supernova/utilities/malloc_aligned.hpp 2014-09-11 09:15:20.399357542 +0100 ++++ supercollider/server/supernova/utilities/malloc_aligned.hpp 2014-09-11 09:15:20.399357542 +0100 +@@ -243,7 +243,7 @@ + template< class U, class... Args > + void construct(U * p, Args&& ... args) + { +- ::new(p) T(std::forward<Args>(args)...); ++ ::new(p) U(std::forward<Args>(args)...); + } + #endif + diff --git a/audio/a52dec/README b/audio/a52dec/README deleted file mode 100644 index acfea38edb..0000000000 --- a/audio/a52dec/README +++ /dev/null @@ -1,9 +0,0 @@ -a52dec is a test program for liba52. -It decodes ATSC A/52 streams, and also includes a demultiplexer for -mpeg-1 and mpeg-2 program streams. -This package also includes liba52 -liba52 is a free library for decoding ATSC A/52 streams. -The A/52 standard is used in a variety of applications, -including digital television and DVD. It is also known as AC-3. - -This SlackBuild doesn't compile against djbfft. diff --git a/audio/a52dec/a52dec.SlackBuild b/audio/a52dec/a52dec.SlackBuild deleted file mode 100644 index 3236e8820a..0000000000 --- a/audio/a52dec/a52dec.SlackBuild +++ /dev/null @@ -1,102 +0,0 @@ -#!/bin/sh - -# Slackware build script for a52dec -# -# Copyright 2007 Niklas "Nille" Åkerström -# All rights reserved. -# -# Redistribution and use of this script, with or without modification, is -# permitted provided that the following conditions are met: -# -# 1. Redistributions of this script must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# -# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ''AS IS'' AND ANY EXPRESS OR IMPLIED -# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO -# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, -# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; -# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, -# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR -# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF -# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -PRGNAM=a52dec -VERSION=0.7.4 -BUILD=${BUILD:-1} -TAG=${TAG:-_SBo} - -if [ -z "$ARCH" ]; then - case "$( uname -m )" in - i?86) ARCH=i486 ;; - arm*) ARCH=arm ;; - *) ARCH=$( uname -m ) ;; - esac -fi - -CWD=$(pwd) -TMP=${TMP:-/tmp/SBo} -PKG=$TMP/package-$PRGNAM -OUTPUT=${OUTPUT:-/tmp} - - -if [ "$ARCH" = "i486" ]; then - SLKCFLAGS="-O2 -march=i486 -mtune=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "i686" ]; then - SLKCFLAGS="-O2 -march=i686 -mtune=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "x86_64" ]; then - SLKCFLAGS="-O2 -fPIC" - LIBDIRSUFFIX="64" -else - SLKCFLAGS="-O2" - LIBDIRSUFFIX="" -fi - -set -e - -rm -rf $PKG -mkdir -p $TMP $PKG $OUTPUT -cd $TMP -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 640 -o -perm 600 -o -perm 444 \ - -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; - -CFLAGS="$SLKCFLAGS" \ -CXXFLAGS="$SLKCFLAGS" \ -./configure \ - --prefix=/usr \ - --libdir=/usr/lib${LIBDIRSUFFIX} \ - --enable-shared \ - --build=$ARCH-slackware-linux - -make -make install DESTDIR=$PKG - -find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \ - | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true - -( cd $PKG/usr/man - find . -type f -exec gzip -9 {} \; - for i in $(find . -type l) ; do ln -s $(readlink $i).gz $i.gz ; rm $i ; done - ) - -mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION -cp -a \ - AUTHORS COPYING ChangeLog HISTORY INSTALL NEWS README TODO \ - $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 - -cd $PKG -/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz} diff --git a/audio/a52dec/a52dec.info b/audio/a52dec/a52dec.info deleted file mode 100644 index f85a1314cd..0000000000 --- a/audio/a52dec/a52dec.info +++ /dev/null @@ -1,10 +0,0 @@ -PRGNAM="a52dec" -VERSION="0.7.4" -HOMEPAGE="http://liba52.sourceforge.net" -DOWNLOAD="http://liba52.sourceforge.net/files/a52dec-0.7.4.tar.gz" -MD5SUM="caa9f5bc44232dc8aeea773fea56be80" -DOWNLOAD_x86_64="" -MD5SUM_x86_64="" -REQUIRES="" -MAINTAINER="Niklas 'Nille' Åkerström" -EMAIL="nille.kungen[AT]gmail.com" diff --git a/audio/a52dec/slack-desc b/audio/a52dec/slack-desc deleted file mode 100644 index e15d3d878a..0000000000 --- a/audio/a52dec/slack-desc +++ /dev/null @@ -1,19 +0,0 @@ -# HOW TO EDIT THIS FILE: -# The "handy ruler" below makes it easier to edit a package description. -# Line up the first '|' above the ':' following the base package name, and -# the '|' on the right side marks the last column you can put a character in. -# You must make exactly 11 lines for the formatting to be correct. It's also -# customary to leave one space after the ':' except on otherwise blank lines. - - |-----handy-ruler------------------------------------------------------| -a52dec: a52dec (test program for liba52) -a52dec: -a52dec: a52dec is a test program for liba52. It decodes ATSC A/52 streams -a52dec: and also includes a demultiplexer for mpeg-1 and mpeg-2 program -a52dec: streams. This package also includes liba52, which is a free -a52dec: library for decoding ATSC A/52 streams. The A/52 standard is used -a52dec: in a variety of applications, including digital television and DVD. -a52dec: It is also known as AC-3. -a52dec: -a52dec: Homepage: http://liba52.sourceforge.net/ -a52dec: diff --git a/audio/audacious-aac/audacious-aac.SlackBuild b/audio/audacious-aac/audacious-aac.SlackBuild index 21e0183b77..89210c58e7 100644 --- a/audio/audacious-aac/audacious-aac.SlackBuild +++ b/audio/audacious-aac/audacious-aac.SlackBuild @@ -23,7 +23,7 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=audacious-aac -VERSION=${VERSION:-3.3.4} +VERSION=${VERSION:-3.6.1} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -86,6 +86,7 @@ CXXFLAGS="$SLKCFLAGS" \ --enable-aac \ --program-prefix= \ --program-suffix= \ + --with-ffmpeg=none \ ${ARCHOPTS} \ --build=$ARCH-slackware-linux @@ -96,7 +97,7 @@ find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | gr | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION -cp -a AUTHORS COPYING INSTALL $PKG/usr/doc/$PRGNAM-$VERSION +cp -a COPYING INSTALL $PKG/usr/doc/$PRGNAM-$VERSION cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild mkdir -p $PKG/install diff --git a/audio/audacious-aac/audacious-aac.info b/audio/audacious-aac/audacious-aac.info index 493d70264e..8deab4d1fa 100644 --- a/audio/audacious-aac/audacious-aac.info +++ b/audio/audacious-aac/audacious-aac.info @@ -1,8 +1,8 @@ PRGNAM="audacious-aac" -VERSION="3.3.4" +VERSION="3.6.1" HOMEPAGE="http://audacious-media-player.org/" -DOWNLOAD="http://distfiles.audacious-media-player.org/audacious-plugins-3.3.4.tar.bz2" -MD5SUM="c7fc344b802557cbbe208c31e5289ef1" +DOWNLOAD="http://distfiles.audacious-media-player.org/audacious-plugins-3.6.1.tar.bz2" +MD5SUM="f1a2ef5fac0afa08d7f54b12f6f64a4e" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="faad2" diff --git a/audio/audacious-aac/patches/enable_only_aac_plugin.diff b/audio/audacious-aac/patches/enable_only_aac_plugin.diff index 398cb50513..1d98abf622 100644 --- a/audio/audacious-aac/patches/enable_only_aac_plugin.diff +++ b/audio/audacious-aac/patches/enable_only_aac_plugin.diff @@ -2,7 +2,7 @@ +++ audacious-plugins-3.2.4/Makefile 2012-07-23 21:32:11.750875868 +0200 @@ -1,4 +1,4 @@ -SUBDIRS = src po -+SUBDIRS = src/aac ++SUBDIRS = src/aac-raw DISTCLEAN = buildsys.mk config.h config.log config.status extra.mk diff --git a/audio/audacious-cue/audacious-cue.SlackBuild b/audio/audacious-cue/audacious-cue.SlackBuild index 4f9666a3db..ca9e517f36 100644 --- a/audio/audacious-cue/audacious-cue.SlackBuild +++ b/audio/audacious-cue/audacious-cue.SlackBuild @@ -23,7 +23,7 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=audacious-cue -VERSION=${VERSION:-3.3.4} +VERSION=${VERSION:-3.6.1} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -86,6 +86,8 @@ CXXFLAGS="$SLKCFLAGS" \ --enable-cue \ --program-prefix= \ --program-suffix= \ + --disable-aac \ + --with-ffmpeg=none \ ${ARCHOPTS} \ --build=$ARCH-slackware-linux @@ -96,7 +98,7 @@ find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | gr | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION -cp -a AUTHORS COPYING INSTALL $PKG/usr/doc/$PRGNAM-$VERSION +cp -a COPYING INSTALL $PKG/usr/doc/$PRGNAM-$VERSION cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild mkdir -p $PKG/install diff --git a/audio/audacious-cue/audacious-cue.info b/audio/audacious-cue/audacious-cue.info index c88aa5a0cc..adba764672 100644 --- a/audio/audacious-cue/audacious-cue.info +++ b/audio/audacious-cue/audacious-cue.info @@ -1,8 +1,8 @@ PRGNAM="audacious-cue" -VERSION="3.3.4" +VERSION="3.6.1" HOMEPAGE="http://audacious-media-player.org/" -DOWNLOAD="http://distfiles.audacious-media-player.org/audacious-plugins-3.3.4.tar.bz2" -MD5SUM="c7fc344b802557cbbe208c31e5289ef1" +DOWNLOAD="http://distfiles.audacious-media-player.org/audacious-plugins-3.6.1.tar.bz2" +MD5SUM="f1a2ef5fac0afa08d7f54b12f6f64a4e" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="libcue" diff --git a/audio/audacity/README b/audio/audacity/README index e977fe06c5..c18b9debf5 100644 --- a/audio/audacity/README +++ b/audio/audacity/README @@ -3,4 +3,5 @@ With Audacity one can record live audio, convert tapes and records into digital recordings, edit Ogg, MP3, and WAV sound files, and much more. Optional dependencies (autodetected) are ffmpeg, jack-audio-connection-kit, -ladspa_sdk, lame, lilv, soundtouch, twolame and vamp-plugin-sdk. +ladspa_sdk, lame, soundtouch, twolame, vamp-plugin-sdk and lilv + suil +(for lv2 support). diff --git a/audio/audacity/audacity.SlackBuild b/audio/audacity/audacity.SlackBuild index 3ac335fd25..d8c86f3d41 100644 --- a/audio/audacity/audacity.SlackBuild +++ b/audio/audacity/audacity.SlackBuild @@ -30,8 +30,9 @@ # Modified by the SlackBuilds.org project PRGNAM=audacity -VERSION=${VERSION:-2.1.0} -BUILD=${BUILD:-2} +SRCNAM=Audacity +VERSION=${VERSION:-2.1.1} +BUILD=${BUILD:-1} TAG=${TAG:-_SBo} if [ -z "$ARCH" ]; then @@ -63,10 +64,10 @@ fi if [ -x /usr/bin/listplugins ]; then do_ladspa="--with-ladspa"; else do_ladspa="--without-ladspa"; fi if pkg-config --exists libavcodec; then do_ffmpeg="-ffmpeg=system"; else do_ffmpeg="out-ffmpeg"; fi -if pkg-config --exists lv2; then do_lv2="-lv2=system"; else do_lv2="out-lv2"; fi if pkg-config --exists soundtouch; then do_soundtouch="-soundtouch=system"; else do_soundtouch="out-soundtouch"; fi if pkg-config --exists twolame; then do_twolame="-libtwolame=system"; else do_twolame="out-libtwolame"; fi if pkg-config --exists vamp-hostsdk; then do_vamp="-libvamp=system"; else do_vamp="out-libvamp"; fi +if $(pkg-config --exists lilv-0) && $(pkg-config --exists suil-0); then do_lv2="-lv2=system"; else do_lv2="out-lv2"; fi set -e @@ -74,8 +75,8 @@ rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT cd $TMP rm -rf $PRGNAM-src-$VERSION -tar xvf $CWD/$PRGNAM-src-$VERSION.tar.?z* -cd $PRGNAM-src-$VERSION +tar xvf $CWD/$PRGNAM-$SRCNAM-$VERSION.tar.?z* || tar xvf $CWD/$SRCNAM-$VERSION.tar.?z* +cd $PRGNAM-$SRCNAM-$VERSION chown -R root:root . find -L . \ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 -o -perm 511 \) \ @@ -91,6 +92,7 @@ sed -i "s,lib/vamp,lib$LIBDIRSUFFIX/vamp,g" \ patch -p1 < $CWD/audacity-ffmpeg.patch # libsoxr is the new default resampling library +LDFLAGS="-L/usr/lib$LIBDIRSUFFIX" \ CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ ./configure \ @@ -115,8 +117,8 @@ CXXFLAGS="$SLKCFLAGS" \ --without-libresample \ --without-libsamplerate -# ensure we use the system headers for these, note we do this after -# configure as it wants to run sub-configures in these dirs +# ensure we use the system headers for these: note that we do this after the +# configure as this last wants to run sub-configures in these dirs for i in ffmpeg expat libid3tag libflac libmad libresample libsndfile libvamp lv2 soundtouch twolame; do rm -rf lib-src/$i done @@ -134,13 +136,13 @@ install -D -m 0644 $CWD/audacity.desktop \ install -D -m 0644 images/AudacityLogo48x48.xpm \ $PKG/usr/share/pixmaps/audacity.xpm -# Move manpage directory to proper location +# Move manpage directory to the proper location mv $PKG/usr/share/man $PKG/usr find $PKG/usr/man -type f -exec gzip -9 {} \; mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION rm -fr $PKG/usr/share/doc -cp LICENSE.txt README.txt $PKG/usr/doc/$PRGNAM-$VERSION +cp LICENSE.txt README.txt todo.txt $PKG/usr/doc/$PRGNAM-$VERSION cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild mkdir -p $PKG/install diff --git a/audio/audacity/audacity.info b/audio/audacity/audacity.info index 85138b8c87..fd81bc0cf3 100644 --- a/audio/audacity/audacity.info +++ b/audio/audacity/audacity.info @@ -1,8 +1,8 @@ PRGNAM="audacity" -VERSION="2.1.0" +VERSION="2.1.1" HOMEPAGE="http://audacity.sourceforge.net" -DOWNLOAD="http://ponce.cc/slackware/sources/repo/audacity-src-2.1.0.tar.xz" -MD5SUM="53785a020536ac3b28ddd22a9d6ca1bb" +DOWNLOAD="https://github.com/audacity/audacity/archive/Audacity-2.1.1.tar.gz" +MD5SUM="7cd627dc61da8b3698d234c96aee284d" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="wxPython" diff --git a/audio/clam/clam.SlackBuild b/audio/clam/clam.SlackBuild index 6927378043..641dc6bab4 100644 --- a/audio/clam/clam.SlackBuild +++ b/audio/clam/clam.SlackBuild @@ -66,6 +66,10 @@ if [ "$LIBDIRSUFFIX" != "" ]; then sed -i "s,/lib\>,/lib$LIBDIRSUFFIX," scons/libs/clam_build_helpers.py fi +# Fix underlinking error on -current (thanks to Debian) +# http://anonscm.debian.org/cgit/pkg-multimedia/clam.git/plain/debian/patches/link-to-vorbis-ogg.patch?id=f6bb1f2af9fbaea42f6936fa91faf3e851fe5f33 +patch -p1 < $CWD/link-to-vorbis-ogg.patch + CCFLAGS="$SLKCFLAGS" \ CPPFLAGS="$SLKCFLAGS" \ scons configure \ diff --git a/audio/clam/link-to-vorbis-ogg.patch b/audio/clam/link-to-vorbis-ogg.patch new file mode 100644 index 0000000000..abd54e9bca --- /dev/null +++ b/audio/clam/link-to-vorbis-ogg.patch @@ -0,0 +1,17 @@ +Description: Link against libvorbis and libogg to fix FTBFS +Author: James Cowgill <james410@cowgill.org.uk> +Bug-Debian: https://bugs.debian.org/769213 +Forwarded: no +--- +This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ +--- a/scons/libs/clam_dependent_libs_checks.py ++++ b/scons/libs/clam_dependent_libs_checks.py +@@ -88,7 +88,7 @@ def test_sndfile( env, conf ) : + return True + + def test_oggvorbis( env, conf ) : +- if not conf.CheckPkgConfigFile(['vorbisfile', 'vorbisenc']) : ++ if not conf.CheckPkgConfigFile(['vorbisfile', 'vorbisenc', 'vorbis', 'ogg']) : + return False + if not conf.CheckLibrarySample('libogg', 'c', None, libogg_test_code ) : return False + if not conf.CheckLibrarySample('libvorbis', 'c', None, libvorbis_test_code ) : return False diff --git a/audio/clementine/README b/audio/clementine/README index 5b8f452a59..2d68ba992a 100644 --- a/audio/clementine/README +++ b/audio/clementine/README @@ -9,10 +9,12 @@ Features: * Native desktop notifications on Linux (libnotify) and Mac OS X (Growl) Optional dependencies: -gst-plugins-bad (for http support) -gst-plugins-ugly (for mp3 support) +gst1-plugins-bad (for http support) +gst1-plugins-ugly (for mp3 support) +gst1-libav (for m4a support) libimobiledevice (for iPod support) libusbmuxd (for iPod support) +sparsehash (for various online services) libspotify and libqca (for Spotify support) (not on SBo) libvlc (not available on slackbuilds.org but AlienBob has vlc packages and slackbuilds at http://connie.slackware.com/~alien/slackbuilds/vlc/ ) diff --git a/audio/clementine/clementine.SlackBuild b/audio/clementine/clementine.SlackBuild index 2e60758b24..876fcbb699 100644 --- a/audio/clementine/clementine.SlackBuild +++ b/audio/clementine/clementine.SlackBuild @@ -25,7 +25,7 @@ # Modified by SlackBuilds.org PRGNAM=clementine -VERSION=${VERSION:-1.2.3} +VERSION=${VERSION:-20151123_136c980} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -62,7 +62,7 @@ rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT cd $TMP rm -rf $PRGNAM-$VERSION -tar xvf $CWD/$PRGNAM-$VERSION.tar.gz +tar xvf $CWD/$PRGNAM-$VERSION.tar.?z* cd $PRGNAM-$VERSION chown -R root:root . find -L . \ diff --git a/audio/clementine/clementine.info b/audio/clementine/clementine.info index e6d316dba4..0fe19ad952 100644 --- a/audio/clementine/clementine.info +++ b/audio/clementine/clementine.info @@ -1,10 +1,10 @@ PRGNAM="clementine" -VERSION="1.2.3" +VERSION="20151123_136c980" HOMEPAGE="http://www.clementine-player.org/" -DOWNLOAD="https://github.com/clementine-player/Clementine/releases/download/1.2.3/clementine-1.2.3.tar.gz" -MD5SUM="91e96c9d36566668b24ac7d465cfee5f" +DOWNLOAD="http://ponce.cc/slackware/sources/repo/clementine-20151123_136c980.tar.xz" +MD5SUM="a131a4629debfca22950885aa8c06925" DOWNLOAD_x86_64="" MD5SUM_x86_64="" -REQUIRES="protobuf" +REQUIRES="chromaprint cryptopp libechonest protobuf" MAINTAINER="David Woodfall" EMAIL="dave@dawoodfall.net" diff --git a/audio/flake/flake.SlackBuild b/audio/flake/flake.SlackBuild index b675b9f05a..7fde646799 100644 --- a/audio/flake/flake.SlackBuild +++ b/audio/flake/flake.SlackBuild @@ -77,7 +77,7 @@ CXXFLAGS="$SLKCFLAGS" \ --prefix=/usr \ --libdir=/usr/lib${LIBDIRSUFFIX} -make +make -j1 make install DESTDIR=$PKG find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \ diff --git a/audio/gimmix/gimmix.SlackBuild b/audio/gimmix/gimmix.SlackBuild index 210a70a952..93fc58e0ce 100644 --- a/audio/gimmix/gimmix.SlackBuild +++ b/audio/gimmix/gimmix.SlackBuild @@ -4,7 +4,7 @@ # Written by Kristaps Esterlins <esterlinsh[at]gmail.com> PRGNAM=gimmix -VERSION=0.5.7.1 +VERSION=${VERSION:-0.5.7.2} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -53,6 +53,8 @@ find -L . \ # Fix curl includes. patch -p1 -i $CWD/gimmix-0.5.7.1-curl-headers.patch +intltoolize + # Replace "enable" with "disable" -cover and -lyrics if you do not # want to have built in plugins for cover and lyrics fetching. CFLAGS="$SLKCFLAGS" \ diff --git a/audio/gimmix/gimmix.info b/audio/gimmix/gimmix.info index e1ec086c86..76cccd8232 100644 --- a/audio/gimmix/gimmix.info +++ b/audio/gimmix/gimmix.info @@ -1,8 +1,8 @@ PRGNAM="gimmix" -VERSION="0.5.7.1" +VERSION="0.5.7.2" HOMEPAGE="http://gimmix.berlios.de/" -DOWNLOAD="http://downloads.sourceforge.net/project/gimmix.berlios/gimmix-0.5.7.1.tar.bz2" -MD5SUM="d89f3d6a80a85e9e6f34f9abd2614c15" +DOWNLOAD="http://downloads.sourceforge.net/project/gimmix.berlios/gimmix-0.5.7.2.tar.bz2" +MD5SUM="5517007fd881cbeb3aad7ae340bee500" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="libmpd libnxml" diff --git a/audio/gmpc-plugins/gmpc-plugins.SlackBuild b/audio/gmpc-plugins/gmpc-plugins.SlackBuild index 62dc89f0e4..1720e14f32 100644 --- a/audio/gmpc-plugins/gmpc-plugins.SlackBuild +++ b/audio/gmpc-plugins/gmpc-plugins.SlackBuild @@ -73,7 +73,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 {} \; -CFLAGS="$SLKCFLAGS" \ +# HAVE_STRNDUP=1 is a fix for libmpd's internal header cockup (thanks to Fedora) + +CFLAGS="$SLKCFLAGS -DHAVE_STRNDUP=1" \ ./configure \ --prefix=/usr \ --sysconfdir=/etc \ diff --git a/audio/jack-audio-connection-kit/jack-audio-connection-kit.SlackBuild b/audio/jack-audio-connection-kit/jack-audio-connection-kit.SlackBuild index bbb62a4693..02c98f9559 100644 --- a/audio/jack-audio-connection-kit/jack-audio-connection-kit.SlackBuild +++ b/audio/jack-audio-connection-kit/jack-audio-connection-kit.SlackBuild @@ -27,7 +27,7 @@ PRGNAM=jack-audio-connection-kit VERSION=${VERSION:-0.124.1} -BUILD=${BUILD:-1} +BUILD=${BUILD:-2} TAG=${TAG:-_SBo} if [ -z "$ARCH" ]; then @@ -72,6 +72,10 @@ find -L . \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ -exec chmod 644 {} \; +# respect march and mtune flags: fixes building on x86_64 +sed -i 's|-march=native \-mtune=native||' configure.ac +autoreconf -fi + CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ ./configure \ diff --git a/audio/kid3/kid3.SlackBuild b/audio/kid3/kid3.SlackBuild index ae7a93be18..125cea7555 100644 --- a/audio/kid3/kid3.SlackBuild +++ b/audio/kid3/kid3.SlackBuild @@ -3,7 +3,7 @@ # Written by Michales Michaloudes korgie@gmail.com PRGNAM=kid3 -VERSION=${VERSION:-3.2.0} +VERSION=${VERSION:-3.2.1} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} diff --git a/audio/kid3/kid3.info b/audio/kid3/kid3.info index 9db910f046..8b1ae17611 100644 --- a/audio/kid3/kid3.info +++ b/audio/kid3/kid3.info @@ -1,8 +1,8 @@ PRGNAM="kid3" -VERSION="3.2.0" +VERSION="3.2.1" HOMEPAGE="http://kid3.sourceforge.net/" -DOWNLOAD="http://prdownloads.sourceforge.net/kid3/kid3-3.2.0.tar.gz" -MD5SUM="5e95dd3f708985b3346bc59b816c81f6" +DOWNLOAD="http://prdownloads.sourceforge.net/kid3/kid3-3.2.1.tar.gz" +MD5SUM="9aa4afff030953c8ffaf1895420234b7" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="id3lib" diff --git a/audio/lastfm/github-192b979c57a.patch b/audio/lastfm/github-192b979c57a.patch new file mode 100644 index 0000000000..fc3e682d2a --- /dev/null +++ b/audio/lastfm/github-192b979c57a.patch @@ -0,0 +1,22 @@ +From 192b979c57aa0b9a2df4f11ad4851ce4fbf5d38b Mon Sep 17 00:00:00 2001 +From: Spiek <spiek@ymail.com> +Date: Fri, 27 Dec 2013 13:27:11 +0100 +Subject: [PATCH] Fix missing Cast + +--- + app/client/Services/RadioService/RadioService.cpp | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/app/client/Services/RadioService/RadioService.cpp b/app/client/Services/RadioService/RadioService.cpp +index 05f22c8..10094b6 100644 +--- a/app/client/Services/RadioService/RadioService.cpp ++++ b/app/client/Services/RadioService/RadioService.cpp +@@ -307,7 +307,7 @@ RadioService::mute() + void + RadioService::onPhononStateChanged( Phonon::State newstate, Phonon::State oldstate ) + { +- qDebug() << oldstate << " -> " << newstate; ++ qDebug() << (int)oldstate << " -> " << (int)newstate; + if (m_mediaObject == 0) { + qDebug() << "m_mediaObject is null!"; + return; diff --git a/audio/lastfm/lastfm.SlackBuild b/audio/lastfm/lastfm.SlackBuild index b08ad8f54b..142b932ef6 100644 --- a/audio/lastfm/lastfm.SlackBuild +++ b/audio/lastfm/lastfm.SlackBuild @@ -74,6 +74,9 @@ cat $CWD/package-paths.patch | sed -e "s|@LIBDIRSUFFIX@|$LIBDIRSUFFIX|" \ | patch -p1 # Fix for ffmpeg 2.x. patch -p1 < $CWD/ffmpeg-2.0.patch +# Fix for "ambiguous overload for ‘operator<<’" in gcc-4.9 +# thanks to Spiek on github (https://github.com/lastfm/lastfm-desktop/pull/44) +patch -p1 < $CWD/github-192b979c57a.patch # Turn on verbose compile output. sed -i 's|^CONFIG.*|#&|' admin/include.qmake diff --git a/audio/mixxx/README b/audio/mixxx/README index e8e1406e74..1f775a38e9 100644 --- a/audio/mixxx/README +++ b/audio/mixxx/README @@ -5,3 +5,5 @@ and FLAC playback, pitch independent time stretch, vinyl emulation, wave recording, BPM detection, multichannel and multiple soundcard support, MIDI controllers support and scripting engine, a skinnable interface. + +opus is an optional dependency. diff --git a/audio/mixxx/mixxx.SlackBuild b/audio/mixxx/mixxx.SlackBuild index 73c8c601eb..4820455b0d 100644 --- a/audio/mixxx/mixxx.SlackBuild +++ b/audio/mixxx/mixxx.SlackBuild @@ -23,7 +23,7 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=mixxx -VERSION=${VERSION:-1.11.0} +VERSION=${VERSION:-1.12.0_beta1} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -54,14 +54,16 @@ else LIBDIRSUFFIX="" fi +SRCVER=$(echo $VERSION | tr _ - ) + set -e rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT cd $TMP -rm -rf $PRGNAM-$VERSION -tar xvf $CWD/$PRGNAM-$VERSION-src.tar.gz -cd $PRGNAM-$VERSION +rm -rf $PRGNAM-$SRCVER +tar xvf $CWD/$PRGNAM-$SRCVER-src.tar.gz +cd $PRGNAM-$SRCVER chown -R root:root . find -L . \ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 -o -perm 511 \) \ @@ -72,11 +74,15 @@ find -L . \ # Fix the desktop file patch -p0 < $CWD/desktop.diff -# it seems libshout isn't detected :( +# Fix library installation path +sed -i "s|'lib'|'lib$LIBDIRSUFFIX'|" build/depends.py src/SConscript +sed -i "s|usr/lib|usr/lib$LIBDIRSUFFIX|" src/SConscript + CFLAGS="$SLKCFLAGS" \ QTDIR=/usr/lib$LIBDIRSUFFIX/qt \ scons \ - shoutcast=0 \ + shoutcast=1 \ + faad=1 \ prefix=/usr QTDIR=/usr/lib$LIBDIRSUFFIX/qt \ @@ -88,7 +94,9 @@ scons \ find $PKG | xargs 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 +mkdir $PKG/usr/doc +mv $PKG/usr/share/doc/$PRGNAM $PKG/usr/doc/$PRGNAM-$VERSION +rmdir $PKG/usr/share/doc cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild mkdir -p $PKG/install diff --git a/audio/mixxx/mixxx.info b/audio/mixxx/mixxx.info index 84d2d66424..c8c4e4bca1 100644 --- a/audio/mixxx/mixxx.info +++ b/audio/mixxx/mixxx.info @@ -1,10 +1,10 @@ PRGNAM="mixxx" -VERSION="1.11.0" +VERSION="1.12.0_beta1" HOMEPAGE="http://www.mixxx.org" -DOWNLOAD="http://downloads.mixxx.org/mixxx-1.11.0/mixxx-1.11.0-src.tar.gz" -MD5SUM="89ee8ba60824919d8dd1194287bda259" +DOWNLOAD="http://ponce.cc/slackware/sources/repo/mixxx-1.12.0-beta1-src.tar.gz" +MD5SUM="3dfd4f19dcc1fccab571290b035c7c46" DOWNLOAD_x86_64="" MD5SUM_x86_64="" -REQUIRES="libshout portaudio portmidi protobuf scons" +REQUIRES="chromaprint faad2 libmp4v2 libshout opencore-amr portaudio portmidi protobuf rubberband scons" MAINTAINER="Elvio Basello (HelLViS69)" EMAIL="hellvis69@gmail.com" diff --git a/audio/mp3splt-gtk/mp3splt-gtk.SlackBuild b/audio/mp3splt-gtk/mp3splt-gtk.SlackBuild index 54a70e2d4d..23807b568f 100644 --- a/audio/mp3splt-gtk/mp3splt-gtk.SlackBuild +++ b/audio/mp3splt-gtk/mp3splt-gtk.SlackBuild @@ -96,6 +96,8 @@ else GSTOPT="disable" fi +# Disabled audacious support, upstream mp3splt-gtk does not yet support audacious-3.6 + CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ ./configure \ @@ -107,6 +109,7 @@ CXXFLAGS="$SLKCFLAGS" \ --disable-gnome \ --disable-scrollkeeper \ --disable-doxygen_doc \ + --disable-audacious \ --build=$ARCH-slackware-linux make diff --git a/audio/non/non.SlackBuild b/audio/non/non.SlackBuild index da7ed3d997..e581b85193 100644 --- a/audio/non/non.SlackBuild +++ b/audio/non/non.SlackBuild @@ -62,6 +62,8 @@ 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 {} \; +CFLAGS="$SLKCFLAGS" \ +CXXFLAGS="$SLKCFLAGS -std=c++11" \ ./waf configure $DAW \ --prefix=/usr \ --libdir=/usr/lib${LIBDIRSUFFIX} \ diff --git a/audio/paman/paman.SlackBuild b/audio/paman/paman.SlackBuild index bacd529713..03f5619b3c 100644 --- a/audio/paman/paman.SlackBuild +++ b/audio/paman/paman.SlackBuild @@ -66,7 +66,7 @@ chown -R root:root . chmod -R u+w,go+r-w,a-s . CFLAGS="$SLKCFLAGS" \ -CXXFLAGS="$SLKCFLAGS" \ +CXXFLAGS="$SLKCFLAGS -std=c++11" \ ./configure \ --prefix=/usr \ --build=$ARCH-slackware-linux diff --git a/audio/paprefs/paprefs.SlackBuild b/audio/paprefs/paprefs.SlackBuild index 3f35df47e2..c014f2c908 100644 --- a/audio/paprefs/paprefs.SlackBuild +++ b/audio/paprefs/paprefs.SlackBuild @@ -53,7 +53,7 @@ find -L . \ -exec chmod 644 {} \; CFLAGS="$SLKCFLAGS" \ -CXXFLAGS="$SLKCFLAGS" \ +CXXFLAGS="$SLKCFLAGS -std=c++11" \ ./configure \ --prefix=/usr \ --libdir=/usr/lib${LIBDIRSUFFIX} \ diff --git a/audio/pavucontrol/pavucontrol.SlackBuild b/audio/pavucontrol/pavucontrol.SlackBuild index 02861c109f..0513eb331a 100644 --- a/audio/pavucontrol/pavucontrol.SlackBuild +++ b/audio/pavucontrol/pavucontrol.SlackBuild @@ -53,7 +53,7 @@ find -L . \ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; CFLAGS="$SLKCFLAGS" \ -CXXFLAGS="$SLKCFLAGS" \ +CXXFLAGS="$SLKCFLAGS -std=c++11" \ ./configure \ --prefix=/usr \ --libdir=/usr/lib${LIBDIRSUFFIX} \ diff --git a/audio/pavumeter/pavumeter.SlackBuild b/audio/pavumeter/pavumeter.SlackBuild index 0e2dff5e2d..7160350887 100644 --- a/audio/pavumeter/pavumeter.SlackBuild +++ b/audio/pavumeter/pavumeter.SlackBuild @@ -66,7 +66,7 @@ chown -R root:root . chmod -R u+w,go+r-w,a-s . CFLAGS="$SLKCFLAGS" \ -CXXFLAGS="$SLKCFLAGS" \ +CXXFLAGS="$SLKCFLAGS -std=c++11" \ ./configure \ --prefix=/usr \ --build=$ARCH-slackware-linux diff --git a/audio/python-audiotools/python-audiotools.SlackBuild b/audio/python-audiotools/python-audiotools.SlackBuild index 8f3c02cc1b..275d3a66d0 100644 --- a/audio/python-audiotools/python-audiotools.SlackBuild +++ b/audio/python-audiotools/python-audiotools.SlackBuild @@ -73,6 +73,9 @@ find -L . \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ -exec chmod 644 {} \; +# Fix for libcdio-0.9 and libcdio-paranoia-10.2+0.93 (-current) +sed -i -e 's:#include <cdio/:#include <cdio/paranoia/:' src/cdiomodule.h + CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ python setup.py install --root=$PKG diff --git a/audio/rhythmbox/rhythmbox.SlackBuild b/audio/rhythmbox/rhythmbox.SlackBuild index 5adf426cfd..d5edbf5d43 100644 --- a/audio/rhythmbox/rhythmbox.SlackBuild +++ b/audio/rhythmbox/rhythmbox.SlackBuild @@ -3,9 +3,10 @@ # Slackware build script for rhythmbox # Written by crocket (crockabiscuit@yahoo.com) +# Modified by SlackBuilds.org PRGNAM=rhythmbox -VERSION=${VERSION:-2.97} +VERSION=${VERSION:-3.2.1} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -53,10 +54,7 @@ find -L . \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ -exec chmod 644 {} \; -# configure looks for a pkg-config entry for tdb... -patch -p1 < $CWD/we_have_tdb_in_samba.patch - -LDFLAGS="-ltdb" \ +#LDFLAGS="-ltdb" \ CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ ./configure \ @@ -83,7 +81,7 @@ CXXFLAGS="$SLKCFLAGS" \ make make install DESTDIR=$PKG -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 find $PKG/usr/man -type f -exec gzip -9 {} \; diff --git a/audio/rhythmbox/rhythmbox.info b/audio/rhythmbox/rhythmbox.info index 8cd4c57ba8..a846862e6f 100644 --- a/audio/rhythmbox/rhythmbox.info +++ b/audio/rhythmbox/rhythmbox.info @@ -1,10 +1,10 @@ PRGNAM="rhythmbox" -VERSION="2.97" +VERSION="3.2.1" HOMEPAGE="http://projects.gnome.org/rhythmbox/" -DOWNLOAD="http://ftp.gnome.org/pub/gnome/sources/rhythmbox/2.97/rhythmbox-2.97.tar.xz" -MD5SUM="26ed78c9c4695c5f28adb34ca9d4d943" +DOWNLOAD="http://ftp.gnome.org/pub/GNOME/sources/rhythmbox/3.2/rhythmbox-3.2.1.tar.xz" +MD5SUM="74739fcc59b91b129f0ffda85b90ec4a" DOWNLOAD_x86_64="" MD5SUM_x86_64="" -REQUIRES="libpeas json-glib totem-pl-parser" +REQUIRES="libpeas json-glib python3 totem-pl-parser" MAINTAINER="crocket" EMAIL="crockabiscuit@yahoo.com" diff --git a/audio/rhythmbox/we_have_tdb_in_samba.patch b/audio/rhythmbox/we_have_tdb_in_samba.patch deleted file mode 100644 index 2035887282..0000000000 --- a/audio/rhythmbox/we_have_tdb_in_samba.patch +++ /dev/null @@ -1,75 +0,0 @@ -diff -Naur rhythmbox-2.97.orig/configure rhythmbox-2.97/configure ---- rhythmbox-2.97.orig/configure 2012-06-03 11:07:09.000000000 +0200 -+++ rhythmbox-2.97/configure 2012-09-24 19:13:42.643306600 +0200 -@@ -15592,7 +15592,6 @@ - libpeas-1.0 >= \$LIBPEAS_REQS \\ - libpeas-gtk-1.0 >= \$LIBPEAS_REQS \\ - libxml-2.0 >= \$LIBXML2_REQS \\ -- tdb >= 1.2.6 \\ - json-glib-1.0\""; } >&5 - ($PKG_CONFIG --exists --print-errors "\ - gobject-introspection-1.0 >= $GOBJECT_INTROSPECTION_REQS \ -@@ -15606,7 +15605,6 @@ - libpeas-1.0 >= $LIBPEAS_REQS \ - libpeas-gtk-1.0 >= $LIBPEAS_REQS \ - libxml-2.0 >= $LIBXML2_REQS \ -- tdb >= 1.2.6 \ - json-glib-1.0") 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 -@@ -15623,7 +15621,6 @@ - libpeas-1.0 >= $LIBPEAS_REQS \ - libpeas-gtk-1.0 >= $LIBPEAS_REQS \ - libxml-2.0 >= $LIBXML2_REQS \ -- tdb >= 1.2.6 \ - json-glib-1.0" 2>/dev/null` - else - pkg_failed=yes -@@ -15647,7 +15644,6 @@ - libpeas-1.0 >= \$LIBPEAS_REQS \\ - libpeas-gtk-1.0 >= \$LIBPEAS_REQS \\ - libxml-2.0 >= \$LIBXML2_REQS \\ -- tdb >= 1.2.6 \\ - json-glib-1.0\""; } >&5 - ($PKG_CONFIG --exists --print-errors "\ - gobject-introspection-1.0 >= $GOBJECT_INTROSPECTION_REQS \ -@@ -15661,7 +15657,6 @@ - libpeas-1.0 >= $LIBPEAS_REQS \ - libpeas-gtk-1.0 >= $LIBPEAS_REQS \ - libxml-2.0 >= $LIBXML2_REQS \ -- tdb >= 1.2.6 \ - json-glib-1.0") 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 -@@ -15678,7 +15673,6 @@ - libpeas-1.0 >= $LIBPEAS_REQS \ - libpeas-gtk-1.0 >= $LIBPEAS_REQS \ - libxml-2.0 >= $LIBXML2_REQS \ -- tdb >= 1.2.6 \ - json-glib-1.0" 2>/dev/null` - else - pkg_failed=yes -@@ -15711,7 +15705,6 @@ - libpeas-1.0 >= $LIBPEAS_REQS \ - libpeas-gtk-1.0 >= $LIBPEAS_REQS \ - libxml-2.0 >= $LIBXML2_REQS \ -- tdb >= 1.2.6 \ - json-glib-1.0" 2>&1` - else - RHYTHMBOX_PKG_ERRORS=`$PKG_CONFIG --print-errors "\ -@@ -15726,7 +15719,6 @@ - libpeas-1.0 >= $LIBPEAS_REQS \ - libpeas-gtk-1.0 >= $LIBPEAS_REQS \ - libxml-2.0 >= $LIBXML2_REQS \ -- tdb >= 1.2.6 \ - json-glib-1.0" 2>&1` - fi - # Put the nasty error message in config.log where it belongs -@@ -15744,7 +15736,6 @@ - libpeas-1.0 >= $LIBPEAS_REQS \ - libpeas-gtk-1.0 >= $LIBPEAS_REQS \ - libxml-2.0 >= $LIBXML2_REQS \ -- tdb >= 1.2.6 \ - json-glib-1.0) were not met: - - $RHYTHMBOX_PKG_ERRORS diff --git a/audio/xmms2/xmms2-0.8-cython-0.19.1.patch b/audio/xmms2/xmms2-0.8-cython-0.19.1.patch deleted file mode 100644 index 1d6e59f6c8..0000000000 --- a/audio/xmms2/xmms2-0.8-cython-0.19.1.patch +++ /dev/null @@ -1,47 +0,0 @@ -From 6d6d7a7ee38c8e3f57242f2510e06a03f4e7e249 Mon Sep 17 00:00:00 2001 -From: Sergei Trofimovich <slyfox@gentoo.org> -Date: Mon, 5 Aug 2013 22:29:46 +0300 -Subject: [PATCH] unbreak xmms2 building on cython-0.19.1 - -Error compiling Cython file: ------------------------------------------------------------- -... - def medialib_path_import(self, path, cb = None, encoded=False): - """ - @deprecated - Use medialib_import_path(path, ...) instead - """ - return self.medialib_import_path(self, path, cb=cb, encoded=encoded) - ^ - -Reported-by: ChunFeng -Signed-off-by: Sergei Trofimovich <slyfox@gentoo.org> ---- - src/clients/lib/python/xmmsapi.pyx | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/src/clients/lib/python/xmmsapi.pyx b/src/clients/lib/python/xmmsapi.pyx -index 501a068..863db88 100644 ---- a/src/clients/lib/python/xmmsapi.pyx -+++ b/src/clients/lib/python/xmmsapi.pyx -@@ -1364,7 +1364,7 @@ cdef class XmmsApi(XmmsCore): - @deprecated - Use medialib_import_path(path, ...) instead - """ -- return self.medialib_import_path(self, path, cb=cb, encoded=encoded) -+ return self.medialib_import_path(path, cb=cb, encoded=encoded) - - @deprecated - def medialib_path_import_encoded(self, path, cb = None): -@@ -1372,7 +1372,7 @@ cdef class XmmsApi(XmmsCore): - @deprecated - Use medialib_import_path(path, ..., encoded=True) instead - """ -- return self.medialib_import_path(self, path, cb=cb, encoded=True) -+ return self.medialib_import_path(path, cb=cb, encoded=True) - - cpdef XmmsResult medialib_property_set(self, int id, key, value, source=None, cb=None): - """ --- -1.8.3.2 - diff --git a/audio/xmms2/xmms2.SlackBuild b/audio/xmms2/xmms2.SlackBuild index 9562503e7c..97de0a8f75 100644 --- a/audio/xmms2/xmms2.SlackBuild +++ b/audio/xmms2/xmms2.SlackBuild @@ -7,8 +7,8 @@ # Updated by Andrew Brouwers, abrouwers at gmail d0t com (13.0, 64-bit) PRGNAM=xmms2 -VERSION="0.8DrO_o" -BUILD=${BUILD:-3} +VERSION="20150712_942b17f" +BUILD=${BUILD:-1} TAG=${TAG:-_SBo} if [ -z "$ARCH" ]; then @@ -44,7 +44,7 @@ rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT cd $TMP rm -rf $PRGNAM-$VERSION -tar xvf $CWD/$PRGNAM-$VERSION.tar.bz2 +tar xvf $CWD/$PRGNAM-$VERSION.tar.xz cd $PRGNAM-$VERSION chown -R root:root . @@ -54,12 +54,6 @@ 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 {} \; -# This fixes building over the newer ffmpeg - NOT -#sed -i "s|^\ \ \ \ flags\.enable_c_error.*||" wscript - -# unbreak xmms2 building on cython-0.19.1 -patch -p1 < $CWD/xmms2-0.8-cython-0.19.1.patch - export CCFLAGS="$SLKCFLAGS" export CXXFLAGS="$SLKCFLAGS" @@ -69,7 +63,7 @@ export CXXFLAGS="$SLKCFLAGS" --with-pkgconfigdir=/usr/lib${LIBDIRSUFFIX}/pkgconfig \ --mandir=/usr/man \ --without-ldconfig \ - --without-plugins=apefile,avcodec,flv,tta \ + --without-plugins=apefile,flv,tta \ --with-perl-archdir=/usr/lib$LIBDIRSUFFIX/perl5 \ -p configure @@ -80,7 +74,7 @@ find $PKG | xargs 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 AUTHORS COPYING* INSTALL README TODO \ +cp -a AUTHORS COPYING* README.mdown TODO \ $PKG/usr/doc/$PRGNAM-$VERSION cat $CWD/$PRGNAM.SlackBuild > \ $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild diff --git a/audio/xmms2/xmms2.info b/audio/xmms2/xmms2.info index 02db361d66..61f3ec488c 100644 --- a/audio/xmms2/xmms2.info +++ b/audio/xmms2/xmms2.info @@ -1,8 +1,8 @@ PRGNAM="xmms2" -VERSION="0.8DrO_o" +VERSION="20150712_942b17f" HOMEPAGE="http://wiki.xmms2.xmms.se/" -DOWNLOAD="http://downloads.sourceforge.net/xmms2/xmms2-0.8DrO_o.tar.bz2" -MD5SUM="84d5c05a70bfd31ed392a4e3f701eaa3" +DOWNLOAD="http://ponce.cc/slackware/sources/repo/xmms2-20150712_942b17f.tar.xz" +MD5SUM="8a5c43ef18fdaf24f6853ced83ce1620" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" diff --git a/business/ledger/ledger.SlackBuild b/business/ledger/ledger.SlackBuild index 1135b1f649..fb5532d4b9 100644 --- a/business/ledger/ledger.SlackBuild +++ b/business/ledger/ledger.SlackBuild @@ -26,7 +26,7 @@ rm -rf $PKG mkdir -p $TMP $PKG/usr $OUTPUT cd $TMP rm -rf $PRGNAM-$VERSION -tar xvf $CWD/v$VERSION.tar.gz +tar xvf $CWD/$PRGNAM-$VERSION.tar.gz || tar xvf $CWD/v$VERSION.tar.gz cd $PRGNAM-$VERSION chown -R root:root . find -L . \ @@ -36,6 +36,10 @@ find -L . \ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; tar xvf $CWD/utfcpp.tar.gz -C lib/ + +# Fix build with boost-1.58 (thanks to Arch Linux) +patch -p1 < $CWD/ledger_git.diff + ./acprep --prefix=/usr update make install DESTDIR=$PKG diff --git a/business/ledger/ledger_git.diff b/business/ledger/ledger_git.diff new file mode 100644 index 0000000000..5398144762 --- /dev/null +++ b/business/ledger/ledger_git.diff @@ -0,0 +1,105 @@ +diff --git a/src/account.h b/src/account.h +index 76e839e..0b55ce9 100644 +--- a/src/account.h ++++ b/src/account.h +@@ -261,11 +261,7 @@ public: + mutable optional<xdata_t> xdata_; + + bool has_xdata() const { +-#if BOOST_VERSION >= 105600 +- return xdata_ != NULL; +-#else +- return xdata_; +-#endif ++ return !!(xdata_); + } + void clear_xdata(); + xdata_t& xdata() { +diff --git a/src/filters.cc b/src/filters.cc +index 2f97a0e..b6530c0 100644 +--- a/src/filters.cc ++++ b/src/filters.cc +@@ -707,7 +707,7 @@ namespace { + insert_prices_in_map(price_map_t& _all_prices) + : all_prices(_all_prices) {} + +- void operator()(datetime_t& date, const amount_t& price) { ++ void operator()(const datetime_t& date, const amount_t& price) { + all_prices.insert(price_map_t::value_type(date, price)); + } + }; +diff --git a/src/item.h b/src/item.h +index 458cb37..aa55e41 100644 +--- a/src/item.h ++++ b/src/item.h +@@ -191,11 +191,7 @@ public: + static bool use_aux_date; + + virtual bool has_date() const { +-#if BOOST_VERSION >= 105600 +- return _date != NULL; +-#else +- return _date; +-#endif ++ return !!(_date); + } + + virtual date_t date() const { +diff --git a/src/iterators.cc b/src/iterators.cc +index 21bec5d..0225e21 100644 +--- a/src/iterators.cc ++++ b/src/iterators.cc +@@ -96,7 +96,7 @@ namespace { + TRACE_DTOR(create_price_xact); + } + +- void operator()(datetime_t& date, const amount_t& price) { ++ void operator()(const datetime_t& date, const amount_t& price) { + xact_t * xact; + string symbol = price.commodity().symbol(); + +diff --git a/src/parser.h b/src/parser.h +index e46fc71..25c4a7e 100644 +--- a/src/parser.h ++++ b/src/parser.h +@@ -118,7 +118,7 @@ public: + + ptr_op_t parse(std::istream& in, + const parse_flags_t& flags = PARSE_DEFAULT, +- const optional<string>& original_string = NULL); ++ const optional<string>& original_string = boost::none); + }; + + } // namespace ledger +diff --git a/src/post.h b/src/post.h +index 1e5fc56..7796293 100644 +--- a/src/post.h ++++ b/src/post.h +@@ -205,11 +205,7 @@ public: + mutable optional<xdata_t> xdata_; + + bool has_xdata() const { +-#if BOOST_VERSION >= 105600 +- return xdata_ != NULL; +-#else +- return xdata_; +-#endif ++ return !!(xdata_); + } + void clear_xdata() { + xdata_ = none; +diff --git a/src/times.h b/src/times.h +index c1bfb1c..0cb05ff 100644 +--- a/src/times.h ++++ b/src/times.h +@@ -568,11 +568,7 @@ public: + void stabilize(const optional<date_t>& date = none); + + bool is_valid() const { +-#if BOOST_VERSION >= 105600 +- return start != NULL; +-#else +- return start; +-#endif ++ return !!(start); + } diff --git a/business/reckon/reckon.SlackBuild b/business/reckon/reckon.SlackBuild index 808d80f608..b52ef1f805 100644 --- a/business/reckon/reckon.SlackBuild +++ b/business/reckon/reckon.SlackBuild @@ -73,12 +73,12 @@ printf("%s/%s/gems/%s\n", # print a friendly warning of unsatisfied ":runtime" dependencies gem specification $CWD/$SRCNAM-$VERSION.gem | \ ruby -r yaml -r rbconfig -e ' -c = Config::CONFIG +c = RbConfig::CONFIG path = sprintf("%s/%s/gems/%s", c["libdir"], c["RUBY_INSTALL_NAME"], c["ruby_version"]) -sys_gemspecs = Dir.glob(path + "/specifications/*").map {|g| gs = Gem::Specification.load(g); gs.name } +sys_gemspecs = Dir.glob(path + "/specifications/**/*.gemspec").map {|g| gs = Gem::Specification.load(g); gs.name } obj = Gem::Specification.from_yaml($stdin) obj.dependencies.each {|dep| if not(dep.type == :runtime) diff --git a/desktop/ClipboardViewer/ClipboardViewer.SlackBuild b/desktop/ClipboardViewer/ClipboardViewer.SlackBuild index b6fb7d3335..0ec35e3ce7 100644 --- a/desktop/ClipboardViewer/ClipboardViewer.SlackBuild +++ b/desktop/ClipboardViewer/ClipboardViewer.SlackBuild @@ -63,7 +63,7 @@ CXXFLAGS="$SLKCFLAGS" \ --build=$ARCH-slackware-linux make -j1 -make install DESTDIR=$PKG +make -j1 install DESTDIR=$PKG find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \ | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true diff --git a/desktop/avant-window-navigator/avant-window-navigator.SlackBuild b/desktop/avant-window-navigator/avant-window-navigator.SlackBuild index 431e5b6fd0..42c23d1f6a 100644 --- a/desktop/avant-window-navigator/avant-window-navigator.SlackBuild +++ b/desktop/avant-window-navigator/avant-window-navigator.SlackBuild @@ -84,7 +84,7 @@ CXXFLAGS="$SLKCFLAGS" \ --docdir=/usr/doc/$PRGNAM-$VERSION \ --build=$ARCH-slackware-linux -make +make -j1 make install DESTDIR=$PKG find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \ diff --git a/desktop/devilspie/devilspie.SlackBuild b/desktop/devilspie/devilspie.SlackBuild index e1e4babfca..636c051729 100644 --- a/desktop/devilspie/devilspie.SlackBuild +++ b/desktop/devilspie/devilspie.SlackBuild @@ -52,7 +52,7 @@ find -L . \ # Allow DEPRECATED functions or build fails on gtk+2-2.24.3. sed -i -e '/-DG.*_DISABLE_DEPRECATED/d' src/Makefile.am -autoreconf +autoreconf -i LDFLAGS="-lX11" \ CFLAGS="$SLKCFLAGS" \ diff --git a/desktop/ee/ee.SlackBuild b/desktop/ee/ee.SlackBuild index dac0672af3..0eb23f4096 100644 --- a/desktop/ee/ee.SlackBuild +++ b/desktop/ee/ee.SlackBuild @@ -75,7 +75,7 @@ find -L . \ CFLAGS="$SLKCFLAGS" \ LD_LIBS=-lm \ -make +make -j1 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION cp -a Artistic Changes ee.i18n.guide README.ee $PKG/usr/doc/$PRGNAM-$VERSION diff --git a/desktop/gtk1-industrial-engine/gtk1-industrial-engine.SlackBuild b/desktop/gtk1-industrial-engine/gtk1-industrial-engine.SlackBuild index e780618a5b..91a15f589a 100644 --- a/desktop/gtk1-industrial-engine/gtk1-industrial-engine.SlackBuild +++ b/desktop/gtk1-industrial-engine/gtk1-industrial-engine.SlackBuild @@ -62,8 +62,8 @@ find -L . \ cp ./gtk-common/* ./gtk1-engine/ cp ./gtk-common/* ./gtk2-engine/ -CFLAGS="$SLKCFLAGS" \ -CXXFLAGS="$SLKCFLAGS" \ +CFLAGS="$SLKCFLAGS -std=gnu89" \ +CXXFLAGS="$SLKCFLAGS -std=gnu89" \ ./autogen.sh \ --prefix=/usr \ --libdir=/usr/lib${LIBDIRSUFFIX} \ diff --git a/desktop/i3/README b/desktop/i3/README index 602f080236..6475beb284 100644 --- a/desktop/i3/README +++ b/desktop/i3/README @@ -11,6 +11,5 @@ Please be aware that i3 is primarily targeted at advanced users and developers. i3status is optional, but useful to provide a system status -bar. As of v4.8 there are 3 new optional dependencies: -perl-JSON-XS, perl-AnyEvent, perl-AnyEvent-I3. They are required -for i3's new layout saving/restoring features. +bar. As of v4.8 there is the optional dependencies perl-AnyEvent-I3. +It is required for i3's new layout saving/restoring features. diff --git a/desktop/i3/i3.SlackBuild b/desktop/i3/i3.SlackBuild index 8c6c44b1d6..387577cb81 100644 --- a/desktop/i3/i3.SlackBuild +++ b/desktop/i3/i3.SlackBuild @@ -9,7 +9,7 @@ # Cleaning up docs by ponce PRGNAM=i3 -VERSION=${VERSION:-4.8} +VERSION=${VERSION:-4.10.4} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} diff --git a/desktop/i3/i3.info b/desktop/i3/i3.info index b1ad3ce8a1..5c2517c695 100644 --- a/desktop/i3/i3.info +++ b/desktop/i3/i3.info @@ -1,10 +1,10 @@ PRGNAM="i3" -VERSION="4.8" +VERSION="4.10.4" HOMEPAGE="http://www.i3wm.org" -DOWNLOAD="http://i3wm.org/downloads/i3-4.8.tar.bz2" -MD5SUM="4151e8e81fdc78b32a7cb953f67e3bef" +DOWNLOAD="http://i3wm.org/downloads/i3-4.10.4.tar.bz2" +MD5SUM="fbfcf6e7de9c53894ae2d475a870c16f" DOWNLOAD_x86_64="" MD5SUM_x86_64="" -REQUIRES="dmenu libev yajl" +REQUIRES="dmenu libev libxkbcommon yajl" MAINTAINER="Marcin Herda" EMAIL="mherda@slackword.net" diff --git a/desktop/ion/ion.SlackBuild b/desktop/ion/ion.SlackBuild index a9b87316f9..480e681b37 100644 --- a/desktop/ion/ion.SlackBuild +++ b/desktop/ion/ion.SlackBuild @@ -60,7 +60,7 @@ find -L . \ sed -e "s%@VERSION@%$VERSION%g" -e "s%@LIBDIRSUFFIX@%$LIBDIRSUFFIX%g" \ $CWD/system.mk.diff | patch -p1 -make OPTS="$SLKCFLAGS" +make -j1 OPTS="$SLKCFLAGS" # The Makefile doesn't support DESTDIR :/ make install \ diff --git a/desktop/kbdd/kbdd.SlackBuild b/desktop/kbdd/kbdd.SlackBuild index e1bab925d2..d78bf6fc7b 100644 --- a/desktop/kbdd/kbdd.SlackBuild +++ b/desktop/kbdd/kbdd.SlackBuild @@ -55,6 +55,8 @@ 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 {} \; +autoreconf -vif + FLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ ./configure \ @@ -86,4 +88,4 @@ cat $CWD/slack-desc > $PKG/install/slack-desc cat $CWD/README > $PKG/usr/doc/$PRGNAM-$VERSION/README.SBo cd $PKG -/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.tgz +/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz} diff --git a/desktop/kover/kover-gcc44-fixup_includes.patch b/desktop/kover/kover-gcc44-fixup_includes.patch deleted file mode 100644 index f7c88da952..0000000000 --- a/desktop/kover/kover-gcc44-fixup_includes.patch +++ /dev/null @@ -1,22 +0,0 @@ -diff -Nur kover-4.orig/src/directory.h kover-4/src/directory.h ---- kover-4.orig/src/directory.h 2008-11-15 15:59:26.000000000 -0600 -+++ kover-4/src/directory.h 2009-11-28 22:55:39.994692905 -0600 -@@ -10,6 +10,7 @@ - #include <config.h> - #include <string> - #include <list> -+#include <stdio.h> - using namespace std; - - class directory -diff -Nur kover-4.orig/src/inexact_dialog.h kover-4/src/inexact_dialog.h ---- kover-4.orig/src/inexact_dialog.h 2008-11-15 15:59:26.000000000 -0600 -+++ kover-4/src/inexact_dialog.h 2009-11-28 22:56:06.061713788 -0600 -@@ -26,6 +26,7 @@ - #include <list> - #include <string> - #include <QListWidget> -+#include <stdio.h> - - using namespace std; - diff --git a/desktop/kover/kover.SlackBuild b/desktop/kover/kover.SlackBuild index 7f2a06e572..0b5a3a257a 100644 --- a/desktop/kover/kover.SlackBuild +++ b/desktop/kover/kover.SlackBuild @@ -3,7 +3,7 @@ # Written by Michales Michaloudes korgie_erase_this@gmail.com PRGNAM=kover -VERSION=${VERSION:-4} +VERSION=${VERSION:-6} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -49,9 +49,6 @@ find -L . \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ -exec chmod 644 {} \; -# Add stdio.h includes for gcc 4.4.x -patch -p1 < $CWD/kover-gcc44-fixup_includes.patch - cmake . \ -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \ -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \ diff --git a/desktop/kover/kover.info b/desktop/kover/kover.info index a33771098e..42842e7f07 100644 --- a/desktop/kover/kover.info +++ b/desktop/kover/kover.info @@ -1,8 +1,8 @@ PRGNAM="kover" -VERSION="4" +VERSION="6" HOMEPAGE="http://lisas.de/kover/" -DOWNLOAD="https://lisas.de/kover/kover-4.tar.bz2" -MD5SUM="364bd68967bfada4f9961e14ab1d3a6c" +DOWNLOAD="https://lisas.de/kover/kover-6.tar.bz2" +MD5SUM="9504afd8a779c54d7c77fb28d7b5c76e" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" diff --git a/desktop/libfakekey/README b/desktop/libfakekey/README deleted file mode 100644 index 4b11f17da3..0000000000 --- a/desktop/libfakekey/README +++ /dev/null @@ -1 +0,0 @@ -X virtual keyboard library of the Matchbox WM project. diff --git a/desktop/libfakekey/libfakekey.SlackBuild b/desktop/libfakekey/libfakekey.SlackBuild deleted file mode 100644 index b32cb2dc77..0000000000 --- a/desktop/libfakekey/libfakekey.SlackBuild +++ /dev/null @@ -1,92 +0,0 @@ -#!/bin/sh - -# Slackware build script for libfakekey -# Benjamin Trigona-Harany -# -# Redistribution and use of this script, with or without modification, is -# permitted provided that the following conditions are met: -# -# 1. Redistributions of this script must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# -# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ''AS IS'' AND ANY EXPRESS OR IMPLIED -# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO -# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, -# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; -# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, -# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR -# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF -# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -PRGNAM=libfakekey -VERSION=${VERSION:-0.1} -BUILD=${BUILD:-1} -TAG=${TAG:-_SBo} - -if [ -z "$ARCH" ]; then - case "$( uname -m )" in - i?86) ARCH=i486 ;; - arm*) ARCH=arm ;; - *) ARCH=$( uname -m ) ;; - esac -fi - -CWD=$(pwd) -TMP=${TMP:-/tmp/SBo} -PKG=$TMP/package-$PRGNAM -OUTPUT=${OUTPUT:-/tmp} - -if [ "$ARCH" = "i486" ]; then - SLKCFLAGS="-O2 -march=i486 -mtune=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "i686" ]; then - SLKCFLAGS="-O2 -march=i686 -mtune=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "x86_64" ]; then - SLKCFLAGS="-O2 -fPIC" - LIBDIRSUFFIX="64" -else - SLKCFLAGS="-O2" - LIBDIRSUFFIX="" -fi - -set -e - -rm -rf $PKG -mkdir -p $TMP $PKG $OUTPUT -cd $TMP -rm -rf $PRGNAM-$VERSION -tar xvf $CWD/$PRGNAM-$VERSION.tar.bz2 -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 640 -o -perm 600 -o -perm 444 \ - -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; - -CFLAGS="$SLKCFLAGS" \ -CXXFLAGS="$SLKCFLAGS" \ -./configure \ - --prefix=/usr \ - --libdir=/usr/lib${LIBDIRSUFFIX} \ - --disable-static \ - --build=$ARCH-slackware-linux - -make AM_LDFLAGS=-lX11 -make install DESTDIR=$PKG - -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 ChangeLog COPYING $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 - -cd $PKG -/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz} diff --git a/desktop/libfakekey/libfakekey.info b/desktop/libfakekey/libfakekey.info deleted file mode 100644 index a4590c7bf7..0000000000 --- a/desktop/libfakekey/libfakekey.info +++ /dev/null @@ -1,10 +0,0 @@ -PRGNAM="libfakekey" -VERSION="0.1" -HOMEPAGE="https://www.yoctoproject.org/tools-resources/projects/matchbox" -DOWNLOAD="http://mirrors.kernel.org/yocto/matchbox/libfakekey/0.1/libfakekey-0.1.tar.bz2" -MD5SUM="83dbde4d77e8baf0176fe4291d8a2303" -DOWNLOAD_x86_64="" -MD5SUM_x86_64="" -REQUIRES="" -MAINTAINER="Benjamin Trigona-Harany" -EMAIL="slackbuilds@jaxartes.net" diff --git a/desktop/menumaker/menumaker.SlackBuild b/desktop/menumaker/menumaker.SlackBuild index 5b1888288a..f0eea91e42 100644 --- a/desktop/menumaker/menumaker.SlackBuild +++ b/desktop/menumaker/menumaker.SlackBuild @@ -81,8 +81,8 @@ CXXFLAGS="$SLKCFLAGS" \ --with-python \ --build=$ARCH-slackware-linux -make -make install DESTDIR=$PKG +make -j1 +make -j1 install DESTDIR=$PKG 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 diff --git a/desktop/nitrogen/nitrogen.SlackBuild b/desktop/nitrogen/nitrogen.SlackBuild index d22863d1a6..717f51df49 100644 --- a/desktop/nitrogen/nitrogen.SlackBuild +++ b/desktop/nitrogen/nitrogen.SlackBuild @@ -57,7 +57,7 @@ find -L . \ ./bootstrap CFLAGS="$SLKCFLAGS" \ -CXXFLAGS="$SLKCFLAGS" \ +CXXFLAGS="$SLKCFLAGS -std=c++11" \ ./configure \ --prefix=/usr \ --libdir=/usr/lib${LIBDIRSUFFIX} \ diff --git a/desktop/notification-daemon/notification-daemon.SlackBuild b/desktop/notification-daemon/notification-daemon.SlackBuild index cd44008293..e86169e8c4 100644 --- a/desktop/notification-daemon/notification-daemon.SlackBuild +++ b/desktop/notification-daemon/notification-daemon.SlackBuild @@ -24,7 +24,7 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=notification-daemon -VERSION=${VERSION:-0.7.6} +VERSION=${VERSION:-3.18.1} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} diff --git a/desktop/notification-daemon/notification-daemon.info b/desktop/notification-daemon/notification-daemon.info index 84f8ea856e..a4f5c326af 100644 --- a/desktop/notification-daemon/notification-daemon.info +++ b/desktop/notification-daemon/notification-daemon.info @@ -1,8 +1,8 @@ PRGNAM="notification-daemon" -VERSION="0.7.6" +VERSION="3.18.1" HOMEPAGE="https://wiki.gnome.org/Projects/NotificationDaemon" -DOWNLOAD="http://ftp.gnome.org/pub/GNOME/sources/notification-daemon/0.7/notification-daemon-0.7.6.tar.xz" -MD5SUM="08c9a6d18ead0aa62d933fc5a4135d38" +DOWNLOAD="http://ftp.gnome.org/pub/GNOME/sources/notification-daemon/3.18/notification-daemon-3.18.1.tar.xz" +MD5SUM="b4a15a8428cd5b7b44ba37c905bd66bc" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" diff --git a/desktop/obshutdown/obshutdown.SlackBuild b/desktop/obshutdown/obshutdown.SlackBuild index 38562c6877..f09716b953 100644 --- a/desktop/obshutdown/obshutdown.SlackBuild +++ b/desktop/obshutdown/obshutdown.SlackBuild @@ -71,6 +71,8 @@ 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 {} \; +autoreconf -vif + CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ ./configure \ diff --git a/desktop/openbox/openbox.SlackBuild b/desktop/openbox/openbox.SlackBuild index bf22c39622..c71bc05f87 100644 --- a/desktop/openbox/openbox.SlackBuild +++ b/desktop/openbox/openbox.SlackBuild @@ -28,7 +28,7 @@ # Currently maintained by Robby Workman <rw@rlworkman.net> PRGNAM=openbox -VERSION=${VERSION:-3.5.2} +VERSION=${VERSION:-3.6.1} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -79,7 +79,7 @@ rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT cd $TMP rm -rf $PRGNAM-$VERSION -tar xvf $CWD/$PRGNAM-$VERSION.tar.gz +tar xvf $CWD/$PRGNAM-$VERSION.tar.?z* cd $PRGNAM-$VERSION chown -R root:root . find -L . \ diff --git a/desktop/openbox/openbox.info b/desktop/openbox/openbox.info index dd63ee9c11..1c82e84e6f 100644 --- a/desktop/openbox/openbox.info +++ b/desktop/openbox/openbox.info @@ -1,8 +1,8 @@ PRGNAM="openbox" -VERSION="3.5.2" +VERSION="3.6.1" HOMEPAGE="http://openbox.org/" -DOWNLOAD="http://openbox.org/dist/openbox/openbox-3.5.2.tar.gz" -MD5SUM="93df606606053b7e8578a5c116afb8ec" +DOWNLOAD="http://openbox.org/dist/openbox/openbox-3.6.1.tar.xz" +MD5SUM="46bf5f1edda0eda0d9e824b585988be9" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" diff --git a/desktop/pspshrink/pspshrink.SlackBuild b/desktop/pspshrink/pspshrink.SlackBuild index 3b1f84b9e1..6fd80a494f 100644 --- a/desktop/pspshrink/pspshrink.SlackBuild +++ b/desktop/pspshrink/pspshrink.SlackBuild @@ -70,7 +70,7 @@ find -L . \ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; CFLAGS="$SLKCFLAGS" \ -CXXFLAGS="$SLKCFLAGS" \ +CXXFLAGS="$SLKCFLAGS -std=c++11" \ ./configure \ --prefix=/usr \ --libdir=/usr/lib${LIBDIRSUFFIX} \ diff --git a/desktop/rss-guard/README b/desktop/rss-guard/README index 1aec1fdd38..07e5b0e719 100644 --- a/desktop/rss-guard/README +++ b/desktop/rss-guard/README @@ -4,3 +4,6 @@ RSS Guard is useful and (very) tiny RSS 0.92/1.0/2.0 & ATOM 1.0 feed reader. It can keep feeds organized in categories, update information from them automatically and notice user if there is new message. + +By default it uses qt-4.x but it supports using qt5 too: if you +want to build against it, pass the script the option QT5=yes diff --git a/desktop/rss-guard/rss-guard.SlackBuild b/desktop/rss-guard/rss-guard.SlackBuild index e8326f21b4..06eda98453 100644 --- a/desktop/rss-guard/rss-guard.SlackBuild +++ b/desktop/rss-guard/rss-guard.SlackBuild @@ -1,7 +1,8 @@ #!/bin/sh # Slackware build script for rss-guard -# Copyright Matteo Bernardini <ponce@slackbuilds.org>, Pisa, Italy, 2012 +# +# Copyright 2012-2015 Matteo Bernardini <ponce@slackbuilds.org>, Pisa, Italy # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -23,7 +24,7 @@ PRGNAM=rss-guard SRCNAM=rssguard -VERSION=${VERSION:-1.9.9.9} +VERSION=${VERSION:-2.4.0} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -54,6 +55,8 @@ else LIBDIRSUFFIX="" fi +qt5="OFF" ; [ "${QT5:-no}" != "no" ] && qt5="ON" + set -e rm -rf $PKG @@ -76,6 +79,7 @@ cd build -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \ -DCMAKE_INSTALL_PREFIX=/usr \ -DLIB_SUFFIX=${LIBDIRSUFFIX} \ + -DUSE_QT_5=$qt5 \ -DCMAKE_BUILD_TYPE=Release .. make make install DESTDIR=$PKG diff --git a/desktop/rss-guard/rss-guard.info b/desktop/rss-guard/rss-guard.info index 2bef2b4172..77e477ae9d 100644 --- a/desktop/rss-guard/rss-guard.info +++ b/desktop/rss-guard/rss-guard.info @@ -1,10 +1,10 @@ PRGNAM="rss-guard" -VERSION="1.9.9.9" +VERSION="2.4.0" HOMEPAGE="https://bitbucket.org/skunkos/rssguard" -DOWNLOAD="https://bitbucket.org/skunkos/rssguard/downloads/rssguard-1.9.9.9.tar.gz" -MD5SUM="c9d788b7ac261448ba8dc0b1430ae6c9" +DOWNLOAD="https://bitbucket.org/skunkos/rssguard/downloads/rssguard-2.4.0.tar.gz" +MD5SUM="071b9c6661719763d7159e3ce9377241" DOWNLOAD_x86_64="" MD5SUM_x86_64="" -REQUIRES="" +REQUIRES="qt5" MAINTAINER="Matteo Bernardini" EMAIL="ponce@slackbuilds.org" diff --git a/desktop/subtle/changeset_r3240.diff b/desktop/subtle/changeset_r3240.diff new file mode 100644 index 0000000000..cdef6aec92 --- /dev/null +++ b/desktop/subtle/changeset_r3240.diff @@ -0,0 +1,21 @@ +diff -r 6670ea4caf96 -r 5d8d64f95c49 Rakefile +--- a/Rakefile ++++ b/Rakefile +@@ -65,7 +65,7 @@ + "revision" => "3224", #< Latest stable + "cflags" => "-Wall -Werror -Wpointer-arith -Wstrict-prototypes -Wunused -Wshadow -std=gnu99", + "cpppath" => "-I. -I$(builddir) -Isrc -Isrc/shared -Isrc/subtle -idirafter$(hdrdir) -idirafter$(archdir)", +- "ldflags" => "-L$(libdir) $(rpath) $(LIBS) -l$(RUBY_SO_NAME)", ++ "ldflags" => "$(rpath) -L$(libdir) $(LIBS) -l$(RUBY_SO_NAME)", + "extflags" => "$(LDFLAGS) $(rpath) $(LIBS) -l$(RUBY_SO_NAME)", + "rpath" => "-L$(libdir) -Wl,-rpath=$(libdir)", + "checksums" => [] +@@ -258,7 +258,7 @@ + make_config unless checksums + else + # Check version +- if 1 != RbConfig::CONFIG["MAJOR"].to_i or 9 != RbConfig::CONFIG["MINOR"].to_i ++ if 1 == RbConfig::CONFIG["MAJOR"].to_i and 9 > RbConfig::CONFIG["MINOR"].to_i + fail("Ruby 1.9.0 or higher required") + end + diff --git a/desktop/subtle/changeset_r3242.diff b/desktop/subtle/changeset_r3242.diff new file mode 100644 index 0000000000..14f259a4f0 --- /dev/null +++ b/desktop/subtle/changeset_r3242.diff @@ -0,0 +1,11 @@ +diff -r 71c757f2a3c4 -r c39a45123787 src/shared/shared.h +--- a/src/shared/shared.h ++++ b/src/shared/shared.h +@@ -28,6 +28,7 @@ + #include <X11/Xutil.h> + #include <X11/Xmd.h> + #include <X11/cursorfont.h> ++#include <ruby.h> + #include <ruby/oniguruma.h> + + #include "config.h" diff --git a/desktop/subtle/changeset_r3244.diff b/desktop/subtle/changeset_r3244.diff new file mode 100644 index 0000000000..9fe46a4a80 --- /dev/null +++ b/desktop/subtle/changeset_r3244.diff @@ -0,0 +1,16 @@ +diff -r 43d1d0478c46 -r 31e0a9716e58 Rakefile +--- a/Rakefile ++++ b/Rakefile +@@ -397,6 +397,12 @@ + ret = false + + cflags, ldflags, libs = pkg_config("xft") ++ ++ # Fix a bug in ruby 2.2.0 (https://bugs.ruby-lang.org/issues/10651) ++ if cflags.empty? ++ cflags << `#{$PKGCONFIG} --cflags xft`.chomp ++ end ++ + unless libs.nil? + # Update flags + @options["cpppath"] << " %s" % [ cflags ] diff --git a/desktop/subtle/subtle.SlackBuild b/desktop/subtle/subtle.SlackBuild index ee21eaf037..173cf7925c 100644 --- a/desktop/subtle/subtle.SlackBuild +++ b/desktop/subtle/subtle.SlackBuild @@ -58,6 +58,11 @@ find -L . \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ -exec chmod 644 {} \; +# Fixes to build against ruby2: +patch -p1 < $CWD/changeset_r3240.diff +patch -p1 < $CWD/changeset_r3242.diff +patch -p1 < $CWD/changeset_r3244.diff + rake install manprefix=/usr/man destdir=$PKG mv $PKG/etc/xdg/subtle/subtle.rb $PKG/etc/xdg/subtle/subtle.rb.new diff --git a/desktop/wmakerconf/slack-desc b/desktop/wmakerconf/slack-desc index 36b4e7243f..f0de607f1d 100644 --- a/desktop/wmakerconf/slack-desc +++ b/desktop/wmakerconf/slack-desc @@ -11,7 +11,7 @@ wmakerconf: wmakerconf: WMakerConf (short for Window Maker Configurator) is a configuration wmakerconf: utility for the Window Maker window manager. wmakerconf: -wmakerconf: +wmakerconf: homepage: http://wmakerconf.sourceforge.net wmakerconf: wmakerconf: wmakerconf: diff --git a/desktop/wmakerconf/wmakerconf.SlackBuild b/desktop/wmakerconf/wmakerconf.SlackBuild index b29f7da625..a971aba9b7 100644 --- a/desktop/wmakerconf/wmakerconf.SlackBuild +++ b/desktop/wmakerconf/wmakerconf.SlackBuild @@ -7,7 +7,7 @@ PRGNAM=wmakerconf VERSION=${VERSION:-2.12} -BUILD=${BUILD:-2} +BUILD=${BUILD:-3} TAG=${TAG:-_SBo} if [ -z "$ARCH" ]; then @@ -57,6 +57,9 @@ find -L . \ # http://sourceforge.net/tracker/?func=detail&aid=3522083&group_id=196469&atid=957581 patch -p1 < $CWD/wmakerconf-2.12-wmaker-0.95_support.patch +# Fix linking to X11 libs +sed -e "/^LIBS =/s/$/ -lX11/" -i src/Makefile.in + CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ ./configure \ diff --git a/desktop/wmakerconf/wmakerconf.info b/desktop/wmakerconf/wmakerconf.info index 0b633c8caf..4052e2da2e 100644 --- a/desktop/wmakerconf/wmakerconf.info +++ b/desktop/wmakerconf/wmakerconf.info @@ -1,6 +1,6 @@ PRGNAM="wmakerconf" VERSION="2.12" -HOMEPAGE="http://starplot.org/wmakerconf/" +HOMEPAGE="http://wmakerconf.sourceforge.net" DOWNLOAD="http://downloads.sourceforge.net/wmakerconf/wmakerconf_2.12.tar.gz" MD5SUM="252114b5ee5fc5bec99477497ee045cc" DOWNLOAD_x86_64="" diff --git a/desktop/xfce4-datetime-plugin/xfce4-datetime-plugin.SlackBuild b/desktop/xfce4-datetime-plugin/xfce4-datetime-plugin.SlackBuild index d27203b47d..665d827bad 100644 --- a/desktop/xfce4-datetime-plugin/xfce4-datetime-plugin.SlackBuild +++ b/desktop/xfce4-datetime-plugin/xfce4-datetime-plugin.SlackBuild @@ -23,7 +23,7 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=xfce4-datetime-plugin -VERSION=${VERSION:-0.6.1} +VERSION=${VERSION:-0.6.2} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} diff --git a/desktop/xfce4-datetime-plugin/xfce4-datetime-plugin.info b/desktop/xfce4-datetime-plugin/xfce4-datetime-plugin.info index 6dfb67cbcf..a4c124ed2d 100644 --- a/desktop/xfce4-datetime-plugin/xfce4-datetime-plugin.info +++ b/desktop/xfce4-datetime-plugin/xfce4-datetime-plugin.info @@ -1,8 +1,8 @@ PRGNAM="xfce4-datetime-plugin" -VERSION="0.6.1" +VERSION="0.6.2" HOMEPAGE="http://goodies.xfce.org/" -DOWNLOAD="http://archive.xfce.org/src/panel-plugins/xfce4-datetime-plugin/0.6/xfce4-datetime-plugin-0.6.1.tar.bz2" -MD5SUM="e82f51ff0e75a63e5cbd139e43e094f9" +DOWNLOAD="http://archive.xfce.org/src/panel-plugins/xfce4-datetime-plugin/0.6/xfce4-datetime-plugin-0.6.2.tar.bz2" +MD5SUM="fe604a251eadbc5b0f2b4737b85d92c8" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" diff --git a/desktop/xfce4-notes-plugin/xfce4-notes-plugin.SlackBuild b/desktop/xfce4-notes-plugin/xfce4-notes-plugin.SlackBuild index 964c0b66a6..8982fabb7e 100644 --- a/desktop/xfce4-notes-plugin/xfce4-notes-plugin.SlackBuild +++ b/desktop/xfce4-notes-plugin/xfce4-notes-plugin.SlackBuild @@ -23,7 +23,7 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=xfce4-notes-plugin -VERSION=1.7.7 +VERSION=${VERSION:-1.8.1} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} diff --git a/desktop/xfce4-notes-plugin/xfce4-notes-plugin.info b/desktop/xfce4-notes-plugin/xfce4-notes-plugin.info index ffa2dbb5d6..706ca84620 100644 --- a/desktop/xfce4-notes-plugin/xfce4-notes-plugin.info +++ b/desktop/xfce4-notes-plugin/xfce4-notes-plugin.info @@ -1,8 +1,8 @@ PRGNAM="xfce4-notes-plugin" -VERSION="1.7.7" +VERSION="1.8.1" HOMEPAGE="http://goodies.xfce.org/" -DOWNLOAD="http://archive.xfce.org/src/panel-plugins/xfce4-notes-plugin/1.7/xfce4-notes-plugin-1.7.7.tar.bz2" -MD5SUM="42b924b23f2fec6a1099e9b7a87db4a3" +DOWNLOAD="http://archive.xfce.org/src/panel-plugins/xfce4-notes-plugin/1.8/xfce4-notes-plugin-1.8.1.tar.bz2" +MD5SUM="31cb9520b01512a94344770b4befdb3b" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="libunique" diff --git a/desktop/xfce4-verve-plugin/xfce4-verve-plugin.SlackBuild b/desktop/xfce4-verve-plugin/xfce4-verve-plugin.SlackBuild index 9599b6a13a..23de9de23e 100644 --- a/desktop/xfce4-verve-plugin/xfce4-verve-plugin.SlackBuild +++ b/desktop/xfce4-verve-plugin/xfce4-verve-plugin.SlackBuild @@ -23,7 +23,7 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=xfce4-verve-plugin -VERSION=1.0.0 +VERSION=${VERSION:-1.0.1} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} diff --git a/desktop/xfce4-verve-plugin/xfce4-verve-plugin.info b/desktop/xfce4-verve-plugin/xfce4-verve-plugin.info index 568cc24f62..4ff30e8916 100644 --- a/desktop/xfce4-verve-plugin/xfce4-verve-plugin.info +++ b/desktop/xfce4-verve-plugin/xfce4-verve-plugin.info @@ -1,8 +1,8 @@ PRGNAM="xfce4-verve-plugin" -VERSION="1.0.0" +VERSION="1.0.1" HOMEPAGE="http://goodies.xfce.org/" -DOWNLOAD="http://archive.xfce.org/src/panel-plugins/xfce4-verve-plugin/1.0/xfce4-verve-plugin-1.0.0.tar.bz2" -MD5SUM="ed7039c40d6e560ed8bcf9a324d2ae86" +DOWNLOAD="http://archive.xfce.org/src/panel-plugins/xfce4-verve-plugin/1.0/xfce4-verve-plugin-1.0.1.tar.bz2" +MD5SUM="b5dbe88b2bea2c35785961d68fe446e4" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" diff --git a/development/JSONObject/JSONObject.SlackBuild b/development/JSONObject/JSONObject.SlackBuild index 778007184e..4dc3689d8c 100644 --- a/development/JSONObject/JSONObject.SlackBuild +++ b/development/JSONObject/JSONObject.SlackBuild @@ -73,6 +73,9 @@ find -L . \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ -exec chmod 644 {} \; +# Fails to build with boost-1.58 (missing include) +patch -p1 < $CWD/incl-iostream.patch + mkdir -p build cd build LDFLAGS="-lboost_system" \ diff --git a/development/JSONObject/JSONObject.info b/development/JSONObject/JSONObject.info index 310d2b88fb..c5e168b97d 100644 --- a/development/JSONObject/JSONObject.info +++ b/development/JSONObject/JSONObject.info @@ -1,6 +1,6 @@ PRGNAM="JSONObject" VERSION="1.0.2" -HOMEPAGE="https://github.com/mariolpantunes/json" +HOMEPAGE="https://github.com/ATNoG/JSONObject" DOWNLOAD="https://github.com/ATNoG/JSONObject/archive/v1.0.2.tar.gz" MD5SUM="a329aed36a18170511cbadc009d75311" DOWNLOAD_x86_64="" diff --git a/development/JSONObject/incl-iostream.patch b/development/JSONObject/incl-iostream.patch new file mode 100644 index 0000000000..1033ea7a6f --- /dev/null +++ b/development/JSONObject/incl-iostream.patch @@ -0,0 +1,11 @@ +diff -u -r JSONObject-1.0.2/JSONObject.hpp JSONObject-1.0.2-patched/JSONObject.hpp +--- JSONObject-1.0.2/JSONObject.hpp 2013-03-15 10:07:13.000000000 +0000 ++++ JSONObject-1.0.2-patched/JSONObject.hpp 2015-08-21 15:49:05.151811279 +0100 +@@ -15,6 +15,7 @@ + #include <string> + #include <sstream> + #include <vector> ++#include <iostream> + + #include <boost/property_tree/ptree.hpp> + #include <boost/regex.hpp> diff --git a/development/anjuta/anjuta.SlackBuild b/development/anjuta/anjuta.SlackBuild index f08c45cb45..c1d591e4ea 100644 --- a/development/anjuta/anjuta.SlackBuild +++ b/development/anjuta/anjuta.SlackBuild @@ -23,7 +23,7 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=anjuta -VERSION=${VERSION:-3.13.1} +VERSION=${VERSION:-3.18.2} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} diff --git a/development/anjuta/anjuta.info b/development/anjuta/anjuta.info index d422a5d1ab..e2b2bea302 100644 --- a/development/anjuta/anjuta.info +++ b/development/anjuta/anjuta.info @@ -1,8 +1,8 @@ PRGNAM="anjuta" -VERSION="3.13.1" +VERSION="3.18.2" HOMEPAGE="http://anjuta.org/" -DOWNLOAD="http://ftp.gnome.org/pub/GNOME/sources/anjuta/3.13/anjuta-3.13.1.tar.xz" -MD5SUM="49e4f54399f336a76f8843a526115645" +DOWNLOAD="http://ftp.gnome.org/pub/GNOME/sources/anjuta/3.18/anjuta-3.18.2.tar.xz" +MD5SUM="56326a553178325c9a4b06cc79e595cb" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="autogen gdl gtksourceview3 libgda vte3" diff --git a/development/bacon/bacon.SlackBuild b/development/bacon/bacon.SlackBuild index 7cd82d5401..dcf2081cb5 100644 --- a/development/bacon/bacon.SlackBuild +++ b/development/bacon/bacon.SlackBuild @@ -5,7 +5,7 @@ # Written by Steve Pledger <spledger91@yahoo.com> PRGNAM=bacon -VERSION=${VERSION:-1.0_build_26} +VERSION=${VERSION:-3.1} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -22,26 +22,6 @@ TMP=${TMP:-/tmp/SBo} PKG=$TMP/package-$PRGNAM OUTPUT=${OUTPUT:-/tmp} -# which C compiler to use: -COMPILER="${COMPILER:-gcc}" # supported compilers: gcc, tcc, and HP's Compaq C Compiler - -# Version number may change, so figure out the real version -SRCVER="$(/bin/bash $CWD/bacon.bash -v | grep version | cut -d' ' -f3-5 | tr ' ' _)" - -# suggested by Niels Horn: -if [ "$VERSION" != "$SRCVER" ]; then - cat <<EOF -WARNING: The source version ($SRCVER) does not match the VERSION variable ($VERSION). -To build anyway, run the SlackBuild like this: - - VERSION=$SRCVER ./$PRGNAM.SlackBuild - -exiting... -EOF - - exit 1 -fi - if [ "$ARCH" = "i486" ]; then SLKCFLAGS="-O2 -march=i486 -mtune=i686" LIBDIRSUFFIX="" @@ -62,32 +42,57 @@ rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT cd $TMP rm -rf $PRGNAM-$VERSION -mkdir $PRGNAM-$VERSION - +tar xvf $CWD/$PRGNAM-$VERSION.tar.gz cd $PRGNAM-$VERSION -# Bacon creates a binary in the same location as the source, so copy the source files here. -cp $CWD/bacon.bash $CWD/bacon.bac . - 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 {} \; - -# Use the Bash version of BaCon to convert and compile the BASIC version, which is much faster. -# (Note: Not using sh because this requires Bash >=3.2 and sh may be a symlink to another shell) -/bin/bash bacon.bash -c $COMPILER -p -o $(echo $SLKCFLAGS | sed -e 's: : -o :g') bacon.bac - + \( -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 {} \; + +CFLAGS="$SLKCFLAGS" \ +CXXFLAGS="$SLKCFLAGS" \ +./configure \ + --prefix=/usr \ + --libdir=/usr/lib${LIBDIRSUFFIX} \ + --sysconfdir=/etc \ + --localstatedir=/var \ + --build=$ARCH-slackware-linux + +make -j1 + +# make install doesn't understand DESTDIR mkdir -p $PKG/usr/bin -install -m 0755 bacon $PKG/usr/bin -strip --strip-unneeded $PKG/usr/bin/* 2>/dev/null || true +/usr/bin/ginstall -c build/bacon $PKG/usr/bin +/usr/bin/ginstall -c build/bacongui $PKG/usr/bin +/usr/bin/ginstall -c bacon.sh $PKG/usr/bin +mkdir -p $PKG/usr/lib${LIBDIRSUFFIX} +/usr/bin/ginstall -c -m 644 build/libbacon.a $PKG/usr/lib${LIBDIRSUFFIX} +mkdir -p $PKG/usr/man/man1 +/usr/bin/ginstall -c -m 644 bacon.1 $PKG/usr/man/man1 +mkdir -p $PKG/usr/share/applications +/usr/bin/ginstall -c -m 644 bacongui.desktop $PKG/usr/share/applications +mkdir -p $PKG/usr/share/pixmaps +/usr/bin/ginstall -c -m 644 icons/BaCon.png $PKG/usr/share/pixmaps +mkdir -p $PKG/usr/share/enscript/hl +/usr/bin/ginstall -c -m 644 syntax/bacon.st $PKG/usr/share/enscript/hl + +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 + +find $PKG/usr/man -type f -exec gzip -9 {} \; +for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION +cp -a \ + README.1ST \ + $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 +cat $CWD/doinst.sh > $PKG/install/doinst.sh cd $PKG /sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz} diff --git a/development/bacon/bacon.info b/development/bacon/bacon.info index a38e8cd744..642edcf592 100644 --- a/development/bacon/bacon.info +++ b/development/bacon/bacon.info @@ -1,10 +1,8 @@ PRGNAM="bacon" -VERSION="1.0_build_26" +VERSION="3.1" HOMEPAGE="http://www.basic-converter.org" -DOWNLOAD="http://ponce.cc/slackware/sources/repo/bacon-1.0_build_26/bacon.bash \ - http://ponce.cc/slackware/sources/repo/bacon-1.0_build_26/bacon.bac" -MD5SUM="ca42c30a310e11450cf5060e54c0f69e \ - 581a11252c108f99d4f58bbeee3e9c09" +DOWNLOAD="http://www.basic-converter.org/stable/bacon-3.1.tar.gz" +MD5SUM="40c0384e0e31ca959819a826d4e96323" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" diff --git a/development/bacon/doinst.sh b/development/bacon/doinst.sh new file mode 100644 index 0000000000..5fb28930db --- /dev/null +++ b/development/bacon/doinst.sh @@ -0,0 +1,3 @@ +if [ -x /usr/bin/update-desktop-database ]; then + /usr/bin/update-desktop-database -q usr/share/applications >/dev/null 2>&1 +fi diff --git a/development/couchdb/couchdb.SlackBuild b/development/couchdb/couchdb.SlackBuild index 8b517b2516..4961643071 100644 --- a/development/couchdb/couchdb.SlackBuild +++ b/development/couchdb/couchdb.SlackBuild @@ -71,7 +71,7 @@ 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 {} \; -CFLAGS="$SLKCFLAGS" \ +CFLAGS="$SLKCFLAGS -D_DEFAULT_SOURCE" \ CXXFLAGS="$SLKCFLAGS" \ ./configure \ --prefix=/usr \ diff --git a/development/curlpp/curlpp.SlackBuild b/development/curlpp/curlpp.SlackBuild index 4fdecd0b77..0a685f034c 100644 --- a/development/curlpp/curlpp.SlackBuild +++ b/development/curlpp/curlpp.SlackBuild @@ -68,8 +68,8 @@ 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 {} \; -CFLAGS="$SLKCFLAGS" \ -CXXFLAGS="$SLKCFLAGS" \ +CFLAGS="$SLKCFLAGS -Wno-error=unused-function" \ +CXXFLAGS="$SLKCFLAGS -Wno-error=unused-function" \ ./configure \ --prefix=/usr \ --libdir=/usr/lib${LIBDIRSUFFIX} \ diff --git a/development/gengetopt/gengetopt.SlackBuild b/development/gengetopt/gengetopt.SlackBuild index 0299bd5392..13d0e9e84c 100644 --- a/development/gengetopt/gengetopt.SlackBuild +++ b/development/gengetopt/gengetopt.SlackBuild @@ -79,7 +79,7 @@ CXXFLAGS="$SLKCFLAGS" \ --mandir=/usr/man \ --build=$ARCH-slackware-linux -make +make -j1 make install DESTDIR=$PKG find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \ diff --git a/development/glade/glade.SlackBuild b/development/glade/glade.SlackBuild index b60626898f..06272f07b8 100644 --- a/development/glade/glade.SlackBuild +++ b/development/glade/glade.SlackBuild @@ -23,7 +23,7 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=glade -VERSION=${VERSION:-3.14.2} +VERSION=${VERSION:-3.18.3} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} diff --git a/development/glade/glade.info b/development/glade/glade.info index 8d3664dee1..0be49e937e 100644 --- a/development/glade/glade.info +++ b/development/glade/glade.info @@ -1,8 +1,8 @@ PRGNAM="glade" -VERSION="3.14.2" +VERSION="3.18.3" HOMEPAGE="http://glade.gnome.org" -DOWNLOAD="http://ftp.gnome.org/pub/GNOME/sources/glade/3.14/glade-3.14.2.tar.xz" -MD5SUM="0998f456cdc82e1fd0e3f2fd44f5cf55" +DOWNLOAD="http://ftp.gnome.org/pub/GNOME/sources/glade/3.18/glade-3.18.3.tar.xz" +MD5SUM="6852d6286683728e0ea40ca9b5d2416f" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" diff --git a/development/judy/README b/development/judy/README deleted file mode 100644 index 5c8b5b7133..0000000000 --- a/development/judy/README +++ /dev/null @@ -1,9 +0,0 @@ -judy (sparse dynamic array library) - -Judy is a C library that provides a state-of-the-art core technology -that implements a sparse dynamic array. -Judy arrays are declared simply with a null pointer. -A Judy array consumes memory only when it is populated, yet can grow -to take advantage of all available memory if desired. -Judy's key benefits are scalability, high performance, and memory -efficiency. diff --git a/development/judy/judy-1.0.5-parallel-make.patch b/development/judy/judy-1.0.5-parallel-make.patch deleted file mode 100644 index b332e2038f..0000000000 --- a/development/judy/judy-1.0.5-parallel-make.patch +++ /dev/null @@ -1,186 +0,0 @@ -https://sourceforge.net/tracker/index.php?func=detail&aid=2219175&group_id=55753&atid=478140 - -=== modified file 'doc/Makefile.am' ---- doc/Makefile.am 2009-12-27 10:41:45 +0000 -+++ doc/Makefile.am 2009-12-27 10:56:50 +0000 -@@ -94,116 +94,95 @@ - man/man3/JudyHSFreeArray - - -+dep_on_Judy = J1T J1S J1U J1F J1N J1L J1P J1FE J1NE J1LE J1PE J1C J1BC J1FA J1MU -+ -+$(patsubst %,man/man3/%,$(dep_on_Judy)): man/man3/Judy - - man/man3/Judy: - ../tool/jhton ext/Judy_3.htm | grep -v '^[ ]*$$' | sed -e 's/\.C//' > man/man3/Judy -+ cd man/man3 && \ -+ for man in $(dep_on_Judy); do \ -+ ln -s Judy $$man; \ -+ done - - man/man3/Judy1: - ../tool/jhton ext/Judy1_3.htm | grep -v '^[ ]*$$' | sed -e 's/\.C//' > man/man3/Judy1 -- cd man/man3; ln -s Judy J1T -- cd man/man3; ln -s Judy J1S -- cd man/man3; ln -s Judy J1U -- cd man/man3; ln -s Judy J1F -- cd man/man3; ln -s Judy J1N -- cd man/man3; ln -s Judy J1L -- cd man/man3; ln -s Judy J1P -- cd man/man3; ln -s Judy J1FE -- cd man/man3; ln -s Judy J1NE -- cd man/man3; ln -s Judy J1LE -- cd man/man3; ln -s Judy J1PE -- cd man/man3; ln -s Judy J1C -- cd man/man3; ln -s Judy J1BC -- cd man/man3; ln -s Judy J1FA -- cd man/man3; ln -s Judy J1MU -+ -+dep_on_Judy1_funcs = Judy1Test Judy1Set Judy1Unset Judy1First Judy1Next Judy1Last Judy1Prev Judy1FirstEmpty Judy1NextEmpty Judy1LastEmpty Judy1PrevEmpty Judy1Count Judy1ByCount Judy1FreeArray Judy1MemUsed -+ -+$(patsubst %,man/man3/%,$(dep_on_Judy1_funcs)): man/man3/Judy1_funcs - - man/man3/Judy1_funcs: - ../tool/jhton ext/Judy1_funcs_3.htm | grep -v '^[ ]*$$' | sed -e 's/\.C//' > man/man3/Judy1_funcs -- cd man/man3; ln -s Judy1_funcs Judy1Test -- cd man/man3; ln -s Judy1_funcs Judy1Set -- cd man/man3; ln -s Judy1_funcs Judy1Unset -- cd man/man3; ln -s Judy1_funcs Judy1First -- cd man/man3; ln -s Judy1_funcs Judy1Next -- cd man/man3; ln -s Judy1_funcs Judy1Last -- cd man/man3; ln -s Judy1_funcs Judy1Prev -- cd man/man3; ln -s Judy1_funcs Judy1FirstEmpty -- cd man/man3; ln -s Judy1_funcs Judy1NextEmpty -- cd man/man3; ln -s Judy1_funcs Judy1LastEmpty -- cd man/man3; ln -s Judy1_funcs Judy1PrevEmpty -- cd man/man3; ln -s Judy1_funcs Judy1Count -- cd man/man3; ln -s Judy1_funcs Judy1ByCount -- cd man/man3; ln -s Judy1_funcs Judy1FreeArray -- cd man/man3; ln -s Judy1_funcs Judy1MemUsed -+ cd man/man3 && \ -+ for man in $(dep_on_Judy1_funcs); do \ -+ ln -s Judy1_funcs $$man; \ -+ done -+ -+dep_on_JudyL= JLG JLI JLD JLF JLN JLL JLP JLFE JLNE JLLE JLPE JLC JLBC JLFA JLMU -+ -+$(patsubst %,man/man3/%,$(dep_on_JudyL)): man/man3/JudyL - - man/man3/JudyL: - ../tool/jhton ext/JudyL_3.htm | grep -v '^[ ]*$$' | sed -e 's/\.C//' > man/man3/JudyL -- cd man/man3; ln -s JudyL JLG -- cd man/man3; ln -s JudyL JLI -- cd man/man3; ln -s JudyL JLD -- cd man/man3; ln -s JudyL JLF -- cd man/man3; ln -s JudyL JLN -- cd man/man3; ln -s JudyL JLL -- cd man/man3; ln -s JudyL JLP -- cd man/man3; ln -s JudyL JLFE -- cd man/man3; ln -s JudyL JLNE -- cd man/man3; ln -s JudyL JLLE -- cd man/man3; ln -s JudyL JLPE -- cd man/man3; ln -s JudyL JLC -- cd man/man3; ln -s JudyL JLBC -- cd man/man3; ln -s JudyL JLFA -- cd man/man3; ln -s JudyL JLMU -+ cd man/man3 && \ -+ for man in $(dep_on_JudyL); do \ -+ ln -s JudyL $$man; \ -+ done -+ -+dep_on_JudyL_funcs = JudyLGet JudyLIns JudyLDel JudyLFirst JudyLNext JudyLLast JudyLPrev JudyLFirstEmpty JudyLNextEmpty JudyLLastEmpty JudyLPrevEmpty JudyLCount JudyLByCount JudyLFreeArray JudyLMemUsed -+ -+$(patsubst %,man/man3/%,$(dep_on_JudyL_funcs)): man/man3/JudyL_funcs - - man/man3/JudyL_funcs: - ../tool/jhton ext/JudyL_funcs_3.htm | grep -v '^[ ]*$$' | sed -e 's/\.C//' > man/man3/JudyL_funcs -- cd man/man3; ln -s JudyL_funcs JudyLGet -- cd man/man3; ln -s JudyL_funcs JudyLIns -- cd man/man3; ln -s JudyL_funcs JudyLDel -- cd man/man3; ln -s JudyL_funcs JudyLFirst -- cd man/man3; ln -s JudyL_funcs JudyLNext -- cd man/man3; ln -s JudyL_funcs JudyLLast -- cd man/man3; ln -s JudyL_funcs JudyLPrev -- cd man/man3; ln -s JudyL_funcs JudyLFirstEmpty -- cd man/man3; ln -s JudyL_funcs JudyLNextEmpty -- cd man/man3; ln -s JudyL_funcs JudyLLastEmpty -- cd man/man3; ln -s JudyL_funcs JudyLPrevEmpty -- cd man/man3; ln -s JudyL_funcs JudyLCount -- cd man/man3; ln -s JudyL_funcs JudyLByCount -- cd man/man3; ln -s JudyL_funcs JudyLFreeArray -- cd man/man3; ln -s JudyL_funcs JudyLMemUsed -+ cd man/man3 && \ -+ for man in $(dep_on_JudyL_funcs); do \ -+ ln -s JudyL_funcs $$man; \ -+ done -+ -+dep_on_JudySL = JSLG JSLI JSLD JSLF JSLN JSLL JSLP JSLFA -+ -+$(patsubst %,man/man3/%,$(dep_on_JudySL)): man/man3/JudySL - - man/man3/JudySL: - ../tool/jhton ext/JudySL_3.htm | grep -v '^[ ]*$$' | sed -e 's/\.C//' > man/man3/JudySL -- cd man/man3; ln -s JudySL JSLG -- cd man/man3; ln -s JudySL JSLI -- cd man/man3; ln -s JudySL JSLD -- cd man/man3; ln -s JudySL JSLF -- cd man/man3; ln -s JudySL JSLN -- cd man/man3; ln -s JudySL JSLL -- cd man/man3; ln -s JudySL JSLP -- cd man/man3; ln -s JudySL JSLFA -+ cd man/man3 && \ -+ for man in $(dep_on_JudySL); do \ -+ ln -s JudySL $$man; \ -+ done -+ -+dep_on_JudySL_funcs = JudySLGet JudySLIns JudySLDel JudySLFirst JudySLNext JudySLLast JudySLPrev JudySLFreeArray -+ -+$(patsubst %,man/man3/%,$(dep_on_JudySL_funcs)): man/man3/JudySL_funcs - - man/man3/JudySL_funcs: - ../tool/jhton ext/JudySL_funcs_3.htm | grep -v '^[ ]*$$' | sed -e 's/\.C//' > man/man3/JudySL_funcs -- cd man/man3; ln -s JudySL_funcs JudySLGet -- cd man/man3; ln -s JudySL_funcs JudySLIns -- cd man/man3; ln -s JudySL_funcs JudySLDel -- cd man/man3; ln -s JudySL_funcs JudySLFirst -- cd man/man3; ln -s JudySL_funcs JudySLNext -- cd man/man3; ln -s JudySL_funcs JudySLLast -- cd man/man3; ln -s JudySL_funcs JudySLPrev -- cd man/man3; ln -s JudySL_funcs JudySLFreeArray -+ cd man/man3 && \ -+ for man in $(dep_on_JudySL_funcs); do \ -+ ln -s JudySL_funcs $$man; \ -+ done -+ -+dep_on_JudyHS = JHSG JHSI JHSD JHSFA -+ -+$(patsubst %,man/man3/%,$(dep_on_JudyHS)): man/man3/JudyHS - - man/man3/JudyHS: - ../tool/jhton ext/JudyHS_3.htm | grep -v '^[ ]*$$' | sed -e 's/\.C//' > man/man3/JudyHS -- cd man/man3; ln -s JudyHS JHSG -- cd man/man3; ln -s JudyHS JHSI -- cd man/man3; ln -s JudyHS JHSD -- cd man/man3; ln -s JudyHS JHSFA -+ cd man/man3 && \ -+ for man in $(dep_on_JudyHS); do \ -+ ln -s JudyHS $$man; \ -+ done -+ -+dep_on_JudyHS_funcs = JudyHSGet JudyHSIns JudyHSDel JudyHSFreeArray -+ -+$(patsubst %,man/man3/%,$(dep_on_JudyHS_funcs)): man/man3/JudyHS_funcs - - man/man3/JudyHS_funcs: - ../tool/jhton ext/JudyHS_funcs_3.htm | grep -v '^[ ]*$$' | sed -e 's/\.C//' > man/man3/JudyHS_funcs -- cd man/man3; ln -s JudyHS_funcs JudyHSGet -- cd man/man3; ln -s JudyHS_funcs JudyHSIns -- cd man/man3; ln -s JudyHS_funcs JudyHSDel -- cd man/man3; ln -s JudyHS_funcs JudyHSFreeArray -+ cd man/man3 && \ -+ for man in $(dep_on_JudyHS_funcs); do \ -+ ln -s JudyHS_funcs $$man; \ -+ done - - CLEANFILES = man/man3/* - diff --git a/development/judy/judy.info b/development/judy/judy.info deleted file mode 100644 index 8e5582ab2c..0000000000 --- a/development/judy/judy.info +++ /dev/null @@ -1,10 +0,0 @@ -PRGNAM="judy" -VERSION="1.0.5" -HOMEPAGE="http://judy.sourceforge.net/" -DOWNLOAD="http://downloads.sourceforge.net/judy/Judy-1.0.5.tar.gz" -MD5SUM="115a0d26302676e962ae2f70ec484a54" -DOWNLOAD_x86_64="" -MD5SUM_x86_64="" -REQUIRES="" -MAINTAINER="Matteo Bernardini" -EMAIL="ponce@slackbuilds.org" diff --git a/development/judy/slack-desc b/development/judy/slack-desc deleted file mode 100644 index 4b05d3de13..0000000000 --- a/development/judy/slack-desc +++ /dev/null @@ -1,19 +0,0 @@ -# HOW TO EDIT THIS FILE: -# The "handy ruler" below makes it easier to edit a package description. -# Line up the first '|' above the ':' following the base package name, and -# the '|' on the right side marks the last column you can put a character in. -# You must make exactly 11 lines for the formatting to be correct. It's also -# customary to leave one space after the ':' except on otherwise blank lines. - - |-----handy-ruler------------------------------------------------------| -judy: judy (sparse dynamic array library) -judy: -judy: Judy is a C library that provides a state-of-the-art core technology -judy: that implements a sparse dynamic array. -judy: Judy arrays are declared simply with a null pointer. -judy: A Judy array consumes memory only when it is populated, yet can grow -judy: to take advantage of all available memory if desired. -judy: Judy's key benefits are scalability, high performance, and memory -judy: efficiency. -judy: -judy: homepage: http://judy.sourceforge.net diff --git a/development/julius/julius.SlackBuild b/development/julius/julius.SlackBuild index 9dacf43783..72982edabb 100644 --- a/development/julius/julius.SlackBuild +++ b/development/julius/julius.SlackBuild @@ -26,7 +26,7 @@ # Modified by SlackBuilds.org PRGNAM=julius -VERSION=4.1.5 +VERSION=${VERSION:-4.3.1} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} diff --git a/development/julius/julius.info b/development/julius/julius.info index 7f77a3c06e..7e9394ed94 100644 --- a/development/julius/julius.info +++ b/development/julius/julius.info @@ -1,8 +1,8 @@ PRGNAM="julius" -VERSION="4.1.5" +VERSION="4.3.1" HOMEPAGE="http://julius.sourceforge.jp/en_index.php" -DOWNLOAD="http://iij.dl.sourceforge.jp/julius/47530/julius-4.1.5.tar.gz" -MD5SUM="6c6bbddf58ff03add1797c1bb3f13615" +DOWNLOAD="http://jaist.dl.osdn.jp/julius/60273/julius-4.3.1.tar.gz" +MD5SUM="7868d89ac1fa729f477a7c700efaf087" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" diff --git a/development/libbitcoin/libbitcoin-2.0_mnemonic.cpp.patch b/development/libbitcoin/libbitcoin-2.0_mnemonic.cpp.patch new file mode 100644 index 0000000000..359ba81d7c --- /dev/null +++ b/development/libbitcoin/libbitcoin-2.0_mnemonic.cpp.patch @@ -0,0 +1,16 @@ +Description: Fix FTBFS due to unknown std::cout +Author: Martin Pitt <martin.pitt@ubuntu.com> +Forwarded: No, file is gone in latest upstream + +Index: libbitcoin-2.0/src/utility/mnemonic.cpp +=================================================================== +--- libbitcoin-2.0.orig/src/utility/mnemonic.cpp ++++ libbitcoin-2.0/src/utility/mnemonic.cpp +@@ -21,6 +21,7 @@ + + #include <algorithm> + #include <sstream> ++#include <iostream> + #include <bitcoin/utility/assert.hpp> + + namespace libbitcoin { diff --git a/development/libbitcoin/libbitcoin.SlackBuild b/development/libbitcoin/libbitcoin.SlackBuild index f51deaf1ca..a48a495ded 100644 --- a/development/libbitcoin/libbitcoin.SlackBuild +++ b/development/libbitcoin/libbitcoin.SlackBuild @@ -60,21 +60,27 @@ rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT cd $TMP rm -rf $PRGNAM-$VERSION -tar xjf $CWD/$PRGNAM-$VERSION.tar.bz2 +tar xvf $CWD/$PRGNAM-$VERSION.tar.bz2 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 640 -o -perm 600 -o -perm 444 \ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; +# Fix missing include (thanks to Debian) +# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=791092;msg=12 +patch -p1 < $CWD/libbitcoin-2.0_mnemonic.cpp.patch + autoreconf -i + if [ -e /usr/include/leveldb/db.h ]; then export LEVELDB_FLAG=--enable-leveldb else export LEVELDB_FLAG= fi + CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ ./configure \ diff --git a/development/meld3/meld3.SlackBuild b/development/meld3/meld3.SlackBuild index 92483dc41e..02b579c1ac 100644 --- a/development/meld3/meld3.SlackBuild +++ b/development/meld3/meld3.SlackBuild @@ -24,7 +24,7 @@ PRGNAM=meld3 SRCNAM=meld -VERSION=${VERSION:-3.12.3} +VERSION=${VERSION:-3.14.1} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -55,6 +55,8 @@ else LIBDIRSUFFIX="" fi +set -e + rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT cd $TMP diff --git a/development/meld3/meld3.info b/development/meld3/meld3.info index 437dc1b604..d676cedcaa 100644 --- a/development/meld3/meld3.info +++ b/development/meld3/meld3.info @@ -1,8 +1,8 @@ PRGNAM="meld3" -VERSION="3.12.3" +VERSION="3.14.1" HOMEPAGE="http://meldmerge.org/" -DOWNLOAD="http://ftp.gnome.org/pub/GNOME/sources/meld/3.12/meld-3.12.3.tar.xz" -MD5SUM="4cb8cf5d1f07b4350d253f325b9c9c20" +DOWNLOAD="http://ftp.gnome.org/pub/GNOME/sources/meld/3.14/meld-3.14.1.tar.xz" +MD5SUM="820c5c4dc59faa51fa65c47b0fef6247" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="pygobject3 gtksourceview3" diff --git a/development/ming/0001-GvCV-isn-t-an-lvalue-since-Perl-5.13.10.patch b/development/ming/0001-GvCV-isn-t-an-lvalue-since-Perl-5.13.10.patch deleted file mode 100644 index e34eb0f6f5..0000000000 --- a/development/ming/0001-GvCV-isn-t-an-lvalue-since-Perl-5.13.10.patch +++ /dev/null @@ -1,43 +0,0 @@ -From a0ea1cc47330a3ab316713d720892b6272401890 Mon Sep 17 00:00:00 2001 -From: Niko Tyni <ntyni@debian.org> -Date: Sun, 10 Jul 2011 21:46:09 +0300 -Subject: [PATCH] GvCV() isn't an lvalue since Perl 5.13.10 - -GvCV() can't be assigned to anymore with recent perls, so use the new -GvCV_set() macro when available or implement it the old way if it isn't. ---- - perl_ext/Exports.c | 2 +- - perl_ext/perl_swf.h | 4 ++++ - 2 files changed, 5 insertions(+), 1 deletions(-) - -diff --git a/perl_ext/Exports.c b/perl_ext/Exports.c -index 65f8912..5529728 100644 ---- a/perl_ext/Exports.c -+++ b/perl_ext/Exports.c -@@ -190,7 +190,7 @@ void export_cv(SV *class, SV *caller, char *sub) - SvPVX(caller), sub, SvPVX(class), sub); - #endif - gv = gv_fetchpv(form("%s::%s",SvPVX( caller), sub), TRUE, SVt_PVCV); -- GvCV(gv) = perl_get_cv(form("%s::%s", SvPVX(class), sub), TRUE); -+ GvCV_set(gv, perl_get_cv(form("%s::%s", SvPVX(class), sub), TRUE)); - GvIMPORTED_CV_on(gv); - GvMULTI_on(gv); - } -diff --git a/perl_ext/perl_swf.h b/perl_ext/perl_swf.h -index b960229..1a3656e 100644 ---- a/perl_ext/perl_swf.h -+++ b/perl_ext/perl_swf.h -@@ -58,6 +58,10 @@ typedef SWFFontCollection SWF__FontCollection; - #define aTHXo_ - #endif - -+#ifndef GvCV_set -+# define GvCV_set(G, C) (GvCV(G) = (C)) -+#endif -+ - #ifndef S_DEBUG - #define swf_debug 0 /* Should we get this from, say, $SWF::debug? */ - #define S_DEBUG(level,code) if (swf_debug >= level) { code; } --- -1.7.5.4 - diff --git a/development/ming/ming.SlackBuild b/development/ming/ming.SlackBuild index 974ceb65b4..5eda48ed0e 100644 --- a/development/ming/ming.SlackBuild +++ b/development/ming/ming.SlackBuild @@ -23,8 +23,10 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=ming -VERSION=0.4.4 -BUILD=${BUILD:-2} +VERSION=${VERSION:-0.4.7} +TARNAM=libming-ming +TARVERSION=$(echo $VERSION | tr . _) +BUILD=${BUILD:-1} TAG=${TAG:-_SBo} if [ -z "$ARCH" ]; then @@ -59,9 +61,9 @@ set -e rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT cd $TMP -rm -rf $PRGNAM-$VERSION -tar xvf $CWD/$PRGNAM-$VERSION.tar.bz2 -cd $PRGNAM-$VERSION +rm -rf $TARNAM-$TARVERSION +tar xvf $CWD/$TARNAM-$TARVERSION.tar.?z* || tar xvf $CWD/$PRGNAM-$TARVERSION.tar.?z* +cd $TARNAM-$TARVERSION chown -R root:root . find -L . \ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \ @@ -69,11 +71,7 @@ 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 PHP 5.4 compatibility -patch -p0 -d php_ext -i $CWD/patch-ming.c.diff - -# Fix building against perl 5.16 -patch -p1 -i $CWD/0001-GvCV-isn-t-an-lvalue-since-Perl-5.13.10.patch +autoreconf -vif # static library is activated because the perl extension needs it CFLAGS="$SLKCFLAGS" \ @@ -124,7 +122,7 @@ find $PKG -depth -type d -empty -delete || true find $PKG/usr/man -type f -exec gzip -9 {} \; mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION -cp -a AUTHORS COPYING HISTORY INSTALL LICENSE* NEWS README TODO \ +cp -a AUTHORS HISTORY INSTALL LICENSE* NEWS README TODO \ $PKG/usr/doc/$PRGNAM-$VERSION cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild diff --git a/development/ming/ming.info b/development/ming/ming.info index 1d885aaf04..83a778d2f3 100644 --- a/development/ming/ming.info +++ b/development/ming/ming.info @@ -1,8 +1,8 @@ PRGNAM="ming" -VERSION="0.4.4" +VERSION="0.4.7" HOMEPAGE="http://www.libming.org" -DOWNLOAD="http://downloads.sourceforge.net/ming/ming-0.4.4.tar.bz2" -MD5SUM="9e780f93670eaf68b1eefa6cdfc1d1e2" +DOWNLOAD="https://github.com/libming/libming/archive/ming-0_4_7.tar.gz" +MD5SUM="dbb71ae5bc131a609fbfe2005bc095cc" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" diff --git a/development/ming/patch-ming.c.diff b/development/ming/patch-ming.c.diff deleted file mode 100644 index 9465b56281..0000000000 --- a/development/ming/patch-ming.c.diff +++ /dev/null @@ -1,22 +0,0 @@ -http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=662620 ---- ming.c.orig 2011-10-26 01:33:18.000000000 -0500 -+++ ming.c 2012-05-14 17:06:09.000000000 -0500 -@@ -87,10 +87,17 @@ - static SWFMatrix getMatrix(zval *id TSRMLS_DC); - #endif - -+#if PHP_API_VERSION < 20100412 - #define PHP_MING_FILE_CHK(file) \ - if ((PG(safe_mode) && !php_checkuid((file), NULL, CHECKUID_CHECK_FILE_AND_DIR)) || php_check_open_basedir((file) TSRMLS_CC)) { \ - RETURN_FALSE; \ -- } \ -+ } -+#else -+#define PHP_MING_FILE_CHK(file) \ -+ if (php_check_open_basedir((file) TSRMLS_CC)) { \ -+ RETURN_FALSE; \ -+ } -+#endif - - /* {{{ proto void ming_setcubicthreshold (int threshold) - Set cubic threshold (?) */ diff --git a/development/mm-common/mm-common.SlackBuild b/development/mm-common/mm-common.SlackBuild index f2f72b8002..00e6e5c4cf 100644 --- a/development/mm-common/mm-common.SlackBuild +++ b/development/mm-common/mm-common.SlackBuild @@ -27,7 +27,7 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=mm-common -VERSION=${VERSION:-0.9.7} +VERSION=${VERSION:-0.9.8} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} diff --git a/development/mm-common/mm-common.info b/development/mm-common/mm-common.info index 69de64f07f..331e5666cf 100644 --- a/development/mm-common/mm-common.info +++ b/development/mm-common/mm-common.info @@ -1,8 +1,8 @@ PRGNAM="mm-common" -VERSION="0.9.7" +VERSION="0.9.8" HOMEPAGE="http://www.gtkmm.org/" -DOWNLOAD="http://ftp.gnome.org/pub/GNOME/sources/mm-common/0.9/mm-common-0.9.7.tar.xz" -MD5SUM="a8b7c11db81a72168bf38d88d97df686" +DOWNLOAD="http://ftp.gnome.org/pub/GNOME/sources/mm-common/0.9/mm-common-0.9.8.tar.xz" +MD5SUM="00fd5c6850cd5fecc2e02b04d0dd1637" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" diff --git a/development/nedit/nedit.SlackBuild b/development/nedit/nedit.SlackBuild index 6bf9c6e614..8e0133eb4c 100644 --- a/development/nedit/nedit.SlackBuild +++ b/development/nedit/nedit.SlackBuild @@ -23,7 +23,8 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=nedit -VERSION=${VERSION:-5.5} +VERSION=${VERSION:-5.6a} +NUMVER=$(echo $VERSION | tr -d '[:alpha:]') BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -59,20 +60,20 @@ set -e rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT cd $TMP -rm -rf $PRGNAM-$VERSION -tar jxvf $CWD/$PRGNAM-$VERSION-src.tar.bz2 -cd $PRGNAM-$VERSION +rm -rf $PRGNAM-$NUMVER +tar xvf $CWD/$PRGNAM-$VERSION-src.tar.?z* +cd $PRGNAM-$NUMVER 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 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 {} \; # Apply patch to make compilation possible patch -p1 < $CWD/nedit.patch -make linux +make CFLAGS="${SLKCFLAGS} -DBUILD_UNTESTED_NEDIT" linux mkdir -p $PKG/usr/bin $PKG/usr/man/man1 install -m 755 source/nedit $PKG/usr/bin/nedit @@ -85,8 +86,7 @@ find $PKG/usr/man -type f -exec gzip -9 {} \; for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION -cp -a COPYRIGHT ChangeLog README $PKG/usr/doc/$PRGNAM-$VERSION -cp -a doc/html $PKG/usr/doc/$PRGNAM-$VERSION +cp -a COPYRIGHT ChangeLog README doc/faq.txt $PKG/usr/doc/$PRGNAM-$VERSION cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild mkdir -p $PKG/install diff --git a/development/nedit/nedit.info b/development/nedit/nedit.info index 8a2d2ebc81..6b97d32cd5 100644 --- a/development/nedit/nedit.info +++ b/development/nedit/nedit.info @@ -1,8 +1,8 @@ PRGNAM="nedit" -VERSION="5.5" +VERSION="5.6a" HOMEPAGE="http://sourceforge.net/projects/nedit/" -DOWNLOAD="http://sourceforge.net/projects/nedit/files/nedit-source/5.5/nedit-5.5-src.tar.bz2" -MD5SUM="48cb3dce52d44988f3a4d7c6f47b6bbe" +DOWNLOAD="http://sourceforge.net/projects/nedit/files/nedit-source/nedit-5.6a-src.tar.gz" +MD5SUM="f8d7e22879c7e9c62ad02eef078f1c2b" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" diff --git a/development/nedit/nedit.patch b/development/nedit/nedit.patch index d66623f0f9..9eac5b9eb9 100644 --- a/development/nedit/nedit.patch +++ b/development/nedit/nedit.patch @@ -1,24 +1,34 @@ -diff -rNu nedit-5.5.orig/source/nedit.c nedit-5.5/source/nedit.c ---- nedit-5.5.orig/source/nedit.c 2014-04-15 21:37:41.893066434 +0200 -+++ nedit-5.5/source/nedit.c 2014-04-15 21:41:30.262069783 +0200 -@@ -389,6 +389,9 @@ - "-bw", "-title", NULL}; - unsigned char* invalidBindings = NULL; - -+ /* workaround for lesstif */ -+ setenv("XLIB_SKIP_ARGB_VISUALS", "1", 1); -+ - /* Save the command which was used to invoke nedit for restart command */ - ArgV0 = argv[0]; - -diff -rNu nedit-5.5.orig/util/check_lin_tif.c nedit-5.5/util/check_lin_tif.c ---- nedit-5.5.orig/util/check_lin_tif.c 2014-04-15 21:37:41.973066435 +0200 -+++ nedit-5.5/util/check_lin_tif.c 2014-04-15 21:38:39.407067277 +0200 -@@ -87,6 +87,7 @@ - "0.93.12", - "0.93.18", - "0.93.94", -+ "0.95.2", - NULL - }; +diff -u -r nedit-5.6/util/check_lin_tif.c nedit-5.6-patched/util/check_lin_tif.c +--- nedit-5.6/util/check_lin_tif.c 2014-12-28 13:56:21.000000000 +0000 ++++ nedit-5.6-patched/util/check_lin_tif.c 2015-08-07 11:18:29.404307905 +0100 +@@ -103,28 +103,11 @@ + if (stability == MotifUnknown) + { + /* This version is neither known-good nor known-bad */ +- fprintf(stderr, +- "ERROR: Untested Motif Version:\n\t%s\n", +- XmVERSION_STRING); +- +- fprintf(stderr, +- "You are attempting to build NEdit with a version of Motif that\n" +- "has not been verified to work well with NEdit. This could be fine,\n" +- "but it could also lead to crashes and instability. Historically, \n" +- "older versions of Motif have quite often been more stable\n" +- "than newer versions when used with NEdit, so don't assume newer\n" +- "is better.\n"); ++ /* Yeah, whatevs, it's the only version we have, mister snottypants */ + #ifdef BUILD_UNTESTED_NEDIT + { +- char buf[2]; +- fprintf(stderr, +- "\n========================== WARNING ===========================\n" +- "You have chosen to build NEdit with an untested version of Motif.\n" +- "Please report your success or failure with this version to:\n" +- "\tdevelop@nedit.org\n" +- "\nHIT ENTER TO CONTINUE\n"); +- fgets(buf, 2, stdin); ++ /* Bollocks. */ + return EXIT_SUCCESS; + } + #else diff --git a/development/nvi/nvi.SlackBuild b/development/nvi/nvi.SlackBuild index 999002e46e..c208be4d77 100644 --- a/development/nvi/nvi.SlackBuild +++ b/development/nvi/nvi.SlackBuild @@ -87,7 +87,7 @@ cd build.unix --program-prefix="n" \ --build=$ARCH-slackware-linux make -j1 - make install DESTDIR=$PKG + make -j1 install DESTDIR=$PKG cd .. # These are better as softlinks instead of hardlinks diff --git a/development/opencvs/opencvs.SlackBuild b/development/opencvs/opencvs.SlackBuild index 023166e6f0..57f170f422 100644 --- a/development/opencvs/opencvs.SlackBuild +++ b/development/opencvs/opencvs.SlackBuild @@ -72,6 +72,8 @@ find -L . \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ -exec chmod 644 {} \; +# Teach the braindead 'bootstrap' script about the 21st century +sed -i -e 's/for v in 11 10 9 8 7 6 5/for v in 14 13 12 11 10 15 16/' bootstrap ./bootstrap CFLAGS="$SLKCFLAGS" \ diff --git a/development/orc/README b/development/orc/README deleted file mode 100644 index 118f4cccec..0000000000 --- a/development/orc/README +++ /dev/null @@ -1,5 +0,0 @@ -Orc is a library and set of tools for compiling and executing very -simple programs that operate on arrays of data. The language is a generic -assembly language that represents many of the features available in SIMD -architectures, including saturated addition and subtraction, and many -arithmetic operations. diff --git a/development/orc/orc.SlackBuild b/development/orc/orc.SlackBuild deleted file mode 100644 index 9150e2ad66..0000000000 --- a/development/orc/orc.SlackBuild +++ /dev/null @@ -1,80 +0,0 @@ -#!/bin/sh - -# Slackware build script for orc - -# Written by M.Dinslage (daedra1980@gmail.com) - -PRGNAM=orc -VERSION=${VERSION:-0.4.23} -BUILD=${BUILD:-1} -TAG=${TAG:-_SBo} - -if [ -z "$ARCH" ]; then - case "$( uname -m )" in - i?86) ARCH=i486 ;; - arm*) ARCH=arm ;; - *) ARCH=$( uname -m ) ;; - esac -fi - -CWD=$(pwd) -TMP=${TMP:-/tmp/SBo} -PKG=$TMP/package-$PRGNAM -OUTPUT=${OUTPUT:-/tmp} - -if [ "$ARCH" = "i486" ]; then - SLKCFLAGS="-O2 -march=i486 -mtune=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "i686" ]; then - SLKCFLAGS="-O2 -march=i686 -mtune=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "x86_64" ]; then - SLKCFLAGS="-O2 -fPIC" - LIBDIRSUFFIX="64" -else - SLKCFLAGS="-O2" - LIBDIRSUFFIX="" -fi - -set -e - -rm -rf $PKG -mkdir -p $TMP $PKG $OUTPUT -cd $TMP -rm -rf $PRGNAM-$VERSION -tar xvf $CWD/$PRGNAM-$VERSION.tar.xz -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 640 -o -perm 600 -o -perm 444 \ - -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; - -CFLAGS="$SLKCFLAGS" \ -CXXFLAGS="$SLKCFLAGS" \ -./configure \ - --prefix=/usr \ - --libdir=/usr/lib${LIBDIRSUFFIX} \ - --sysconfdir=/etc \ - --localstatedir=/var \ - --mandir=/usr/man \ - --docdir=/usr/doc/$PRGNAM-$VERSION \ - --disable-static \ - --build=$ARCH-slackware-linux - -make -make install DESTDIR=$PKG - -find $PKG | xargs 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 README TODO $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 - -cd $PKG -/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz} diff --git a/development/orc/orc.info b/development/orc/orc.info deleted file mode 100644 index b91f690a64..0000000000 --- a/development/orc/orc.info +++ /dev/null @@ -1,10 +0,0 @@ -PRGNAM="orc" -VERSION="0.4.23" -HOMEPAGE="http://code.entropywave.com/projects/orc/" -DOWNLOAD="http://gstreamer.freedesktop.org/data/src/orc/orc-0.4.23.tar.xz" -MD5SUM="72e0612ace54d77aa2f7a006348ee81a" -DOWNLOAD_x86_64="" -MD5SUM_x86_64="" -REQUIRES="" -MAINTAINER="M.Dinslage" -EMAIL="daedra1980@gmail.com" diff --git a/development/orc/slack-desc b/development/orc/slack-desc deleted file mode 100644 index 930c6fc921..0000000000 --- a/development/orc/slack-desc +++ /dev/null @@ -1,19 +0,0 @@ -# HOW TO EDIT THIS FILE: -# The "handy ruler" below makes it easier to edit a package description. -# Line up the first '|' above the ':' following the base package name, and -# the '|' on the right side marks the last column you can put a character in. -# You must make exactly 11 lines for the formatting to be correct. It's also -# customary to leave one space after the ':' except on otherwise blank lines. - - |-----handy-ruler------------------------------------------------------| -orc: orc (The Oil Runtime Compiler) -orc: -orc: Orc is a library and set of tools for compiling and executing very -orc: simple programs that operate on arrays of data. The language is -orc: a generic assembly language that represents many of the features -orc: available in SIMD architectures, including saturated addition and -orc: subtraction, and many arithmetic operations. -orc: -orc: -orc: -orc: diff --git a/development/perf/perf.SlackBuild b/development/perf/perf.SlackBuild index 3300137091..db0a537d95 100644 --- a/development/perf/perf.SlackBuild +++ b/development/perf/perf.SlackBuild @@ -23,7 +23,7 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=perf -VERSION=${VERSION:-3.10.17} +VERSION=${VERSION:-4.1.6} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -56,27 +56,27 @@ fi set -e -SRCDIR="/usr/src/linux-$VERSION/tools" +SRCDIR="/usr/src/linux-$VERSION/tools/perf" BUILDDIR=$TMP/$PRGNAM-$VERSION -rm -rf $PKG -mkdir -p $TMP $PKG $OUTPUT -cd $TMP -rm -rf $BUILDDIR - -mkdir -p $BUILDDIR/lib/lk -cd $BUILDDIR -make -C $SRCDIR/lib/lk/ O=$BUILDDIR/lib/lk -# We need -DSILENT_NO_TAINT_SUPPORT=0, -DNO_TAINT_SUPPORT=0, and -# -Wno-strict-default to compile together with perl 5.18+ -make -C $SRCDIR/ perf_install O=$BUILDDIR DESTDIR=$PKG/ \ - mandir=/usr/man/ perfexecdir=/usr/libexec/perf-core \ - CFLAGS="-DSILENT_NO_TAINT_SUPPORT=0 -DNO_TAINT_SUPPORT=0" \ - -Wno-strict-default - -mkdir $PKG/usr/bin -mv $PKG/bin/perf $PKG/usr/bin/perf -rm -rf $PKG/bin +rm -rf $PKG $BUILDDIR +mkdir -p $TMP $PKG $BUILDDIR $OUTPUT + +cd $SRCDIR + +make \ + O=$BUILDDIR \ + DESTDIR=$PKG/ \ + prefix=/usr \ + EXTRA_CFLAGS="$SLKCFLAGS" \ + install + +# Tidy up the source tree :-( +rm -f $SRCDIR/.config-detected + +# Fixup paths (sysconfdir= and mandir= don't work) +mv $PKG/usr/share/man $PKG/usr/man +rmdir $PKG/usr/share 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 @@ -86,10 +86,10 @@ for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; r DOCDIR=$PKG/usr/doc/$PRGNAM-$VERSION mkdir -p $DOCDIR/Documentation - -cp -a $SRCDIR/perf/command-list.txt $SRCDIR/perf/design.txt \ - $SRCDIR/perf/CREDITS $SRCDIR/../COPYING $DOCDIR -cp -a $SRCDIR/perf/Documentation/*.txt $DOCDIR/Documentation +cp -a command-list.txt design.txt \ + CREDITS ../../COPYING \ + $DOCDIR +cp -a Documentation/*.txt $DOCDIR/Documentation cat $CWD/$PRGNAM.SlackBuild > $DOCDIR/$PRGNAM.SlackBuild mkdir -p $PKG/install diff --git a/development/perf/perf.info b/development/perf/perf.info index 47a1d618f9..3e67ce7575 100644 --- a/development/perf/perf.info +++ b/development/perf/perf.info @@ -1,5 +1,5 @@ PRGNAM="perf" -VERSION="3.10.17" +VERSION="4.1.6" HOMEPAGE="https://perf.wiki.kernel.org/index.php/Main_Page" DOWNLOAD="http://www.pastemobile.org/perf.dummy" MD5SUM="9cba6c70fb57a22a155073d54748b614" diff --git a/development/rstudio-desktop/rstudio-desktop.SlackBuild b/development/rstudio-desktop/rstudio-desktop.SlackBuild index e1b350c939..96920b2710 100644 --- a/development/rstudio-desktop/rstudio-desktop.SlackBuild +++ b/development/rstudio-desktop/rstudio-desktop.SlackBuild @@ -77,6 +77,11 @@ 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 with boost-1.58 +# http://stackoverflow.com/questions/25866378/cant-build-rstudio-ide-with-boost-1-56-0 +find . \( -name *.cpp -or -name *.hpp \) -exec \ + sed -i -e 's@<core::@< ::core::@g' -e 's@\([^:]\)core::@\1::core::@g' {} \; + cd dependencies/common unzip -qd dictionaries $CWD/core-dictionaries.zip unzip -q $CWD/$MATHJAX.zip diff --git a/development/scons/README b/development/scons/README deleted file mode 100644 index 3e749f8528..0000000000 --- a/development/scons/README +++ /dev/null @@ -1,5 +0,0 @@ -SCons is an Open Source software construction tool--that is, a next-generation -build tool. Think of SCons as an improved, cross-platform substitute for the -classic Make utility with integrated functionality similar to -autoconf/automake and compiler caches such as ccache. In short, SCons is an -easier, more reliable and faster way to build software. diff --git a/development/scons/scons.SlackBuild b/development/scons/scons.SlackBuild deleted file mode 100644 index 559c5c625c..0000000000 --- a/development/scons/scons.SlackBuild +++ /dev/null @@ -1,76 +0,0 @@ -#!/bin/sh - -# Slackware build script for scons - -# Written by Kyle Guinn <elyk03@gmail.com> -# Updated by Andrzej Telszewski <atelszewski@gmail.com> - -# Ryan P.C. McQuen | Everett, WA | ryan.q@linux.com - -# This program is free software: you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version, with the following exception: -# the text of the GPL license may be omitted. - -# This program is distributed in the hope that it will be useful, but -# without any warranty; without even the implied warranty of -# merchantability or fitness for a particular purpose. Compiling, -# interpreting, executing or merely reading the text of the program -# may result in lapses of consciousness and/or very being, up to and -# including the end of all existence and the Universe as we know it. -# See the GNU General Public License for more details. - -# You may have received a copy of the GNU General Public License along -# with this program (most likely, a file named COPYING). If not, see -# <https://www.gnu.org/licenses/>. - -PRGNAM=scons -VERSION=${VERSION:-2.4.1} -BUILD=${BUILD:-1} -TAG=${TAG:-_SBo} - -if [ -z "$ARCH" ]; then - case "$( uname -m )" in - i?86) ARCH=i486 ;; - arm*) ARCH=arm ;; - *) ARCH=$( uname -m ) ;; - esac -fi - -CWD=$(pwd) -TMP=${TMP:-/tmp/SBo} -PKG=$TMP/package-$PRGNAM-$VERSION -OUTPUT=${OUTPUT:-/tmp} - -DOCS="CHANGES.txt LICENSE.txt README.txt RELEASE.txt" - -set -e - -rm -rf $PKG -mkdir -p $TMP $PKG $OUTPUT -cd $TMP -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 640 -o -perm 600 -o -perm 444 \ - -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; - -python ./setup.py install --root=$PKG --symlink-scons - -find $PKG/usr/man -type f -exec gzip -9 {} \; -for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done - -mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION -cp -a $DOCS $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 - -cd $PKG -/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz} diff --git a/development/scons/scons.info b/development/scons/scons.info deleted file mode 100644 index 13ac8383c6..0000000000 --- a/development/scons/scons.info +++ /dev/null @@ -1,10 +0,0 @@ -PRGNAM="scons" -VERSION="2.4.1" -HOMEPAGE="http://www.scons.org/" -DOWNLOAD="http://downloads.sourceforge.net/scons/scons-2.4.1.tar.gz" -MD5SUM="9a0ddf33d9839f04380e0fae87cc4b40" -DOWNLOAD_x86_64="" -MD5SUM_x86_64="" -REQUIRES="" -MAINTAINER="Ryan P.C. McQuen" -EMAIL="ryan.q@linux.com" diff --git a/development/scons/slack-desc b/development/scons/slack-desc deleted file mode 100644 index 1a9894f461..0000000000 --- a/development/scons/slack-desc +++ /dev/null @@ -1,19 +0,0 @@ -# HOW TO EDIT THIS FILE: -# The "handy ruler" below makes it easier to edit a package description. -# Line up the first '|' above the ':' following the base package name, and -# the '|' on the right side marks the last column you can put a character in. -# You must make exactly 11 lines for the formatting to be correct. It's also -# customary to leave one space after the ':' except on otherwise blank lines. - - |-----handy-ruler------------------------------------------------------| -scons: SCons (Open Source software construction tool) -scons: -scons: SCons is an Open Source software construction tool--that is, -scons: a next-generation build tool. Think of SCons as an improved, -scons: cross-platform substitute for the classic Make utility with -scons: integrated functionality similar to autoconf/automake and -scons: compiler caches such as ccache. In short, SCons is an easier, -scons: more reliable and faster way to build software. -scons: -scons: -scons: diff --git a/development/sourcenav/sourcenav.SlackBuild b/development/sourcenav/sourcenav.SlackBuild index 49e3b5c3bf..2a450a3d9e 100644 --- a/development/sourcenav/sourcenav.SlackBuild +++ b/development/sourcenav/sourcenav.SlackBuild @@ -78,8 +78,8 @@ CXXFLAGS="$SLKCFLAGS" \ --libdir=/usr/lib${LIBDIRSUFFIX} \ --build=$ARCH-slackware-linux -make -make install DESTDIR=$PKG +make -j1 +make -j1 install DESTDIR=$PKG 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 diff --git a/development/spice-protocol/spice-protocol.SlackBuild b/development/spice-protocol/spice-protocol.SlackBuild index 23c5243d3b..128380fda2 100644 --- a/development/spice-protocol/spice-protocol.SlackBuild +++ b/development/spice-protocol/spice-protocol.SlackBuild @@ -22,7 +22,7 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=spice-protocol -VERSION=${VERSION:-0.12.7} +VERSION=${VERSION:-0.12.10} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} diff --git a/development/spice-protocol/spice-protocol.info b/development/spice-protocol/spice-protocol.info index 9a8a071966..a3f9c16860 100644 --- a/development/spice-protocol/spice-protocol.info +++ b/development/spice-protocol/spice-protocol.info @@ -1,8 +1,8 @@ PRGNAM="spice-protocol" -VERSION="0.12.7" +VERSION="0.12.10" HOMEPAGE="http://spice-space.org" -DOWNLOAD="http://spice-space.org/download/releases/spice-protocol-0.12.7.tar.bz2" -MD5SUM="799707321e88df4ecd17c4ccb0cc4ffe" +DOWNLOAD="http://spice-space.org/download/releases/spice-protocol-0.12.10.tar.bz2" +MD5SUM="1fb9d0dcdd42dce1b476ae8aa7569bcc" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" diff --git a/development/splint/splint.SlackBuild b/development/splint/splint.SlackBuild index d56fae50ab..0bdcdbe717 100644 --- a/development/splint/splint.SlackBuild +++ b/development/splint/splint.SlackBuild @@ -67,7 +67,12 @@ CXXFLAGS="$SLKCFLAGS" \ --mandir=/usr/man \ --build=$ARCH-slackware-linux -make +# Fix for bison-3 (LDFLAGS doesn't work) +sed -i \ + -e 's/^LIBS = $/LIBS = -lfl/' \ + src/Makefile + +make -j1 make install DESTDIR=$PKG find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \ diff --git a/development/swfmill/swfmill.SlackBuild b/development/swfmill/swfmill.SlackBuild index 2957728602..5881f08825 100644 --- a/development/swfmill/swfmill.SlackBuild +++ b/development/swfmill/swfmill.SlackBuild @@ -6,7 +6,7 @@ # This script is public domain PRGNAM=swfmill -VERSION=${VERSION:-0.3.0} +VERSION=${VERSION:-0.3.3} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -74,7 +74,7 @@ find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \ mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION -cp -a AUTHORS COPYING NEWS README TODO \ +cp -a AUTHORS COPYING NEWS README.md \ $PKG/usr/doc/$PRGNAM-$VERSION cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild diff --git a/development/swfmill/swfmill.info b/development/swfmill/swfmill.info index 7322fb0863..cd7fee85e0 100644 --- a/development/swfmill/swfmill.info +++ b/development/swfmill/swfmill.info @@ -1,8 +1,8 @@ PRGNAM="swfmill" -VERSION="0.3.0" +VERSION="0.3.3" HOMEPAGE="http://swfmill.org/" -DOWNLOAD="http://swfmill.org/releases/swfmill-0.3.0.tar.gz" -MD5SUM="b7850211cf683aa7a1c62324b56e3216" +DOWNLOAD="http://swfmill.org/releases/swfmill-0.3.3.tar.gz" +MD5SUM="e0fc3c4068ffe135f201e6ee864dce62" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" diff --git a/development/tea/slack-desc b/development/tea/slack-desc index 5305436703..c8ad1d6508 100644 --- a/development/tea/slack-desc +++ b/development/tea/slack-desc @@ -11,7 +11,7 @@ tea: tea: TEA is the text text editor for UNIX-like systems and Windows. With tea: an ultimate small size TEA provides you hundreds of functions. tea: -tea: http://tea-editor.sourceforge.net/index.html +tea: http://semiletov.org/tea/ tea: tea: tea: diff --git a/development/tea/tea.SlackBuild b/development/tea/tea.SlackBuild index b1259cc9c2..cb7297540e 100644 --- a/development/tea/tea.SlackBuild +++ b/development/tea/tea.SlackBuild @@ -4,7 +4,7 @@ # Written by Nai (bluedbs@gmail.com) PRGNAM=tea -VERSION=${VERSION:-30.0.0} +VERSION=${VERSION:-37.2.1} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} diff --git a/development/tea/tea.info b/development/tea/tea.info index 7c2976f2ae..fd15f60728 100644 --- a/development/tea/tea.info +++ b/development/tea/tea.info @@ -1,8 +1,8 @@ PRGNAM="tea" -VERSION="30.0.0" -HOMEPAGE="http://tea-editor.sourceforge.net/index.html" -DOWNLOAD="http://sourceforge.net/projects/tea-editor/files/tea-editor/30.0.0/tea-30.0.0.tar.bz2" -MD5SUM="07508b4972403fc7c3a72169700e6157" +VERSION="37.2.1" +HOMEPAGE="http://semiletov.org/tea/" +DOWNLOAD="http://semiletov.org/tea/dloads/tea-37.2.1.tar.bz2" +MD5SUM="a74c2d18cc2cace9d961d1a215b19e31" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" diff --git a/development/xxdiff/xxdiff-e3cdca0088916446b019dcbf8ea7164cc5f788ac.diff b/development/xxdiff/xxdiff-e3cdca0088916446b019dcbf8ea7164cc5f788ac.diff new file mode 100644 index 0000000000..fc39adbc7e --- /dev/null +++ b/development/xxdiff/xxdiff-e3cdca0088916446b019dcbf8ea7164cc5f788ac.diff @@ -0,0 +1,115 @@ +# HG changeset patch +# User Martin Blais <blais@furius.ca> +# Date 1407690283 14400 +# Node ID e3cdca0088916446b019dcbf8ea7164cc5f788ac +# Parent 5ebaec3d8cb9bb8eaf0600acee495a1ffc28b67c +Applied patch from <john dot schmerge at gmail dot com> for bison 3.0.2 + +diff --git a/src/resParser.cpp b/src/resParser.cpp +--- a/src/resParser.cpp ++++ b/src/resParser.cpp +@@ -73,7 +73,7 @@ + + //------------------------------------------------------------------------------ + // +-void resParsererror( const char* msg ) ++void resParsererror( XxResources *, const char* msg ) + { + // Send errors to stdout so we can filter out the debug info shmeglu while + // debugging parser. +@@ -794,7 +794,7 @@ + QString os; + QTextStream oss( &os ); + oss << "Unknown " << errmsg << ": " << name << flush; +- resParsererror( os.toLatin1().constData() ); ++ resParsererror( NULL, os.toLatin1().constData() ); + } + num = ERROR_TOKEN; + return ERROR_TOKEN; +diff --git a/src/resParser.l b/src/resParser.l +--- a/src/resParser.l ++++ b/src/resParser.l +@@ -76,7 +76,7 @@ + result = YY_NULL; \ + } \ + else { \ +- int ii = 0; \ ++ unsigned ii = 0; \ + for ( ; (ii < max_size) && (!input_stream_ptr->atEnd()); ++ii ) { \ + (*input_stream_ptr) >> buf[ii]; \ + } \ +diff --git a/src/resParser.y b/src/resParser.y +--- a/src/resParser.y ++++ b/src/resParser.y +@@ -20,11 +20,6 @@ + * + ******************************************************************************/ + +-%union +-{ +- int num; +- char* str; +-} + %{ + + // xxdiff imports +@@ -39,12 +34,22 @@ + + // The parser input is the resources object to fill in. + #define RESOURCES ( static_cast<XxResources*>(resources) ) +-#define YYPARSE_PARAM resources ++%} + ++%define api.pure full ++%parse-param {XxResources * resources} ++ ++%union ++{ ++ int num; ++ char* str; ++} ++ ++%{ + // Declare lexer from other compilation unit. + int resParserlex( YYSTYPE* yylval ); + +-void resParsererror( const char* msg ); ++void resParsererror( XxResources *, const char* msg ); + + // Declare some parser functions and data defined in resParser.cpp + namespace XxResParserNS { +@@ -144,7 +149,6 @@ + %type <num> boolkwd + + %start xxdiffrc +-%pure_parser + + %% + xxdiffrc : stmts +@@ -188,7 +192,7 @@ + RESOURCES->setPreferredGeometry( geometry ); + } + else { +- yyerror( "Bad geometry specification." ); ++ yyerror( NULL, "Bad geometry specification." ); + // Should never happen, the lexer regexp should be tough + // enough. + } +@@ -212,7 +216,7 @@ + QString err = QString( "Requested style key does not exist." ); + err += QString( "\nValid styles are: " ); + err += styles.join( ", " ); +- yyerror( err.toLatin1().constData() ); ++ yyerror( NULL, err.toLatin1().constData() ); + } + } + ; +@@ -224,7 +228,7 @@ + char buf[2048]; + ::snprintf( buf, 2048, + "Unrecognized accelerator: %s\n", $5 ); +- yyerror( buf ); ++ yyerror( NULL, buf ); + } + } + ; diff --git a/development/xxdiff/xxdiff.SlackBuild b/development/xxdiff/xxdiff.SlackBuild index 479511df34..eaf1563b36 100644 --- a/development/xxdiff/xxdiff.SlackBuild +++ b/development/xxdiff/xxdiff.SlackBuild @@ -51,6 +51,10 @@ find -L . \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ -exec chmod 644 {} \; +# Fix for bison-3 +# https://bitbucket.org/blais/xxdiff/commits/e3cdca0088916446b019dcbf8ea7164cc5f788ac/raw/ +patch -p1 < $CWD/xxdiff-e3cdca0088916446b019dcbf8ea7164cc5f788ac.diff + cd src QMAKE=`which qmake` make -f Makefile.bootstrap Makefile make diff --git a/games/Scorched3D/Scorched3D.SlackBuild b/games/Scorched3D/Scorched3D.SlackBuild index c5b296e0af..d8370b3006 100644 --- a/games/Scorched3D/Scorched3D.SlackBuild +++ b/games/Scorched3D/Scorched3D.SlackBuild @@ -23,7 +23,7 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=Scorched3D -VERSION=43.3d +VERSION=${VERSION:-44} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -71,12 +71,6 @@ 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 for glibc-2.15 http://www.scorched3d.co.uk/mantisbt/view.php?id=156 -patch -p1 -i $CWD/scorched-svn_glibc-2.15_fix.patch - -chmod +x ./autogen.sh -./autogen.sh - CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ ./configure \ diff --git a/games/Scorched3D/Scorched3D.info b/games/Scorched3D/Scorched3D.info index dc1bdd28db..aac8fe3c02 100644 --- a/games/Scorched3D/Scorched3D.info +++ b/games/Scorched3D/Scorched3D.info @@ -1,8 +1,8 @@ PRGNAM="Scorched3D" -VERSION="43.3d" +VERSION="44" HOMEPAGE="http://www.scorched3d.co.uk" -DOWNLOAD="http://downloads.sourceforge.net/scorched3d/Scorched3D-43.3d-src.tar.gz" -MD5SUM="9c3043282a9e7451468ff325bef3b04c" +DOWNLOAD="http://downloads.sourceforge.net/scorched3d/Scorched3D-44-src.tar.gz" +MD5SUM="c395d54a7a43cf91166d2cc0f7dec83e" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="freealut wxPython" diff --git a/games/Scorched3D/scorched-svn_glibc-2.15_fix.patch b/games/Scorched3D/scorched-svn_glibc-2.15_fix.patch deleted file mode 100644 index 690d51f074..0000000000 --- a/games/Scorched3D/scorched-svn_glibc-2.15_fix.patch +++ /dev/null @@ -1,12 +0,0 @@ -Index: scorched/src/client/client/SecureID.cpp -=================================================================== ---- scorched/src/client/client/SecureID.cpp (revision 549) -+++ scorched/src/client/client/SecureID.cpp (working copy) -@@ -75,6 +75,7 @@ -
- #include <sys/ioctl.h>
- #include <net/if.h>
-+#include <unistd.h>
-
- std::string SecureID::GetPrivateKey(void)
- {
diff --git a/games/brainparty/brainparty.SlackBuild b/games/brainparty/brainparty.SlackBuild index dc0aa9c7d7..3b693c0098 100644 --- a/games/brainparty/brainparty.SlackBuild +++ b/games/brainparty/brainparty.SlackBuild @@ -56,7 +56,7 @@ patch -p1 < $CWD/patches/brainparty-0.5-savegame.patch patch -p1 < $CWD/patches/brainparty-0.5-data-directory.patch sed -i 's|CXXFLAGS =|CXXFLAGS +=|g' Makefile -CXXFLAGS="$SLKCFLAGS" make +CXXFLAGS="$SLKCFLAGS -fpermissive" make mkdir -p $PKG/usr/bin $PKG/usr/share/$PRGNAM/Content install -m 0644 Content/* $PKG/usr/share/$PRGNAM/Content diff --git a/games/dolphin-emu/CommonFuncs.patch b/games/dolphin-emu/CommonFuncs.patch new file mode 100644 index 0000000000..60cfc53342 --- /dev/null +++ b/games/dolphin-emu/CommonFuncs.patch @@ -0,0 +1,24 @@ +--- Source/Core/Common/Src/CommonFuncs.h.orig 2015-02-23 09:00:42.000000000 +0100 ++++ Source/Core/Common/Src/CommonFuncs.h 2015-02-23 10:04:34.000000000 +0100 +@@ -12,6 +12,11 @@ + #define SLEEP(x) usleep(x*1000) + #endif + ++#if defined __FreeBSD__ ++#include <sys/cdefs.h> ++#define __GNUC_PREREQ __GNUC_PREREQ__ ++#endif ++ + #include <cstddef> + #include <type_traits> + +@@ -30,7 +35,8 @@ + #define b32(x) (b16(x) | (b16(x) >>16) ) + #define ROUND_UP_POW2(x) (b32(x - 1) + 1) + +-#if defined __GNUC__ && !defined __SSSE3__ && !defined _M_GENERIC ++#if (defined __GNUC__ && !__GNUC_PREREQ(4,9)) && \ ++ !defined __SSSE3__ && defined _M_X86 + #include <emmintrin.h> + static __inline __m128i __attribute__((__always_inline__)) + _mm_shuffle_epi8(__m128i a, __m128i mask) diff --git a/games/dolphin-emu/dolphin-emu.SlackBuild b/games/dolphin-emu/dolphin-emu.SlackBuild index 7b03331af7..e2d0c3a1b0 100644 --- a/games/dolphin-emu/dolphin-emu.SlackBuild +++ b/games/dolphin-emu/dolphin-emu.SlackBuild @@ -69,6 +69,10 @@ 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 {} \; +# Thanks to FreeBSD for this patch to fix building on gcc-4.9 +# https://svnweb.freebsd.org/ports/head/emulators/dolphin-emu/files/patch-Source-Core-Common-Src-CommonFuncs.h?revision=379673&view=co&pathrev=379673 +patch -p0 < $CWD/CommonFuncs.patch + mkdir build cd build cmake -G "Unix Makefiles" \ diff --git a/games/etlegacy-data/LICENSE b/games/etlegacy-data/LICENSE new file mode 100644 index 0000000000..4d2d6c3139 --- /dev/null +++ b/games/etlegacy-data/LICENSE @@ -0,0 +1,253 @@ +LIMITED USE SOFTWARE LICENSE AGREEMENT + +This Limited Use Software License Agreement (this "Agreement") is a +legal agreement between you, the end-user, and Id Software, Inc. +("ID"). BY CONTINUING THE DOWNLOAD OR INSTALLATION OF THE GAME +PROGRAM ENTITLED WOLFENSTEIN™: ENEMY TERRITORY™ (THE +"SOFTWARE"), BY LOADING OR RUNNING THE SOFTWARE, OR BY PLACING OR +COPYING THE SOFTWARE ONTO YOUR COMPUTER HARD DRIVE, COMPUTER RAM OR +OTHER STORAGE, YOU ARE AGREEING TO BE BOUND BY THE TERMS OF THIS +AGREEMENT. You agree that you are obtaining a copy of the Software +via download only, and you acknowledge and agree that you shall not +copy or retain the Software except as expressly permitted herein. + +1. Grant of License. Subject to the terms and provisions of this +Agreement and so long as you fully comply at all times with this +Agreement, ID grants to you the non-exclusive and limited right to +use the Software only in executable or object code form. The term +"Software" includes all elements of the Software, including, without +limitation, data files and screen displays. You are not receiving +any ownership or proprietary right, title or interest in or to the +Software or the copyrights, trademarks or other rights related +thereto. For purposes of the first sentence of this section, "use" +means loading the Software into RAM and/or onto computer hard drive, +as well as installation of the Software on a hard disk or other +storage device, and means the uses permitted in sections 2 and 4 +hereinbelow. You agree that the Software will not be downloaded, +shipped, transferred, exported or re-exported into any country or to +a national or resident of any country in violation of the United +States Export Administration Act (or any other law governing such +matters) by you or anyone at your direction and that you will not +utilize, and will not authorize anyone to utilize, in any other +manner, the Software in violation of any applicable law. The +Software shall not be downloaded or otherwise exported or re-exported +into any country or to a national or resident of any country to which +the United States has embargoed goods or to anyone or into any +country who/that are prohibited, by applicable law, from receiving +such property. In exercising your limited rights hereunder, you +shall comply, at all times, with all applicable laws, regulations, +ordinances and statutes. ID reserves all rights not granted in this +Agreement, including, without limitation, all rights to ID's +trademarks. + +2. Permitted New Creations. Subject to the terms and provisions of +this Agreement and so long as you fully comply at all times with this +Agreement, ID grants to you the non-exclusive and limited right to +create for the Software (except any Software code) your own +modifications (the "New Creations") that shall operate only with the +Software (but not any demo, test or other version of the Software). +You may include within the New Creations certain textures and other +images (the "Software Images") from the Software. You shall not +create any New Creations that infringe against any third-party right +or that are libelous, defamatory, obscene, false, misleading, or +otherwise illegal or unlawful. You agree that the New Creations will +not be downloaded, shipped, transferred, exported or re-exported into +any country or to a national or resident of any country in violation +of the United States Export Administration Act (or any other law +governing such matters) by you or anyone at your direction and that +you will not utilize, and will not authorize anyone to utilize, in +any other manner, the New Creations in violation of any applicable +law. The New Creations shall not be downloaded or otherwise exported +or re-exported into any country or to a national or resident of any +country to which the United States has embargoed goods or to anyone +or into any country who/that are prohibited, by applicable law, from +receiving such property. You shall not rent, sell, lease, lend, +offer on a pay-per-play basis or otherwise commercially exploit or +commercially distribute the New Creations. You are permitted only to +distribute, without any cost or charge, the New Creations to other +end-users so long as such distribution is not infringing against any +third-party right and is not otherwise illegal or unlawful. As noted +below, in the event you commit any breach of this Agreement, your +license and this Agreement automatically shall terminate, without +notice. + +3. Prohibitions with Regard to the Software. You, whether directly +or indirectly, shall not do any of the following acts: + +a. rent the Software; + +b. sell the Software; + +c. lease or lend the Software; + +d. offer the Software on a "pay-per-play" basis; + +e. distribute the Software by any means, except as permitted by +section 4 hereinbelow; + +f. in any other manner and through any medium whatsoever commercially +exploit the Software, or use the Software for any commercial purpose, +including, without limitation, giving away copies of the Software for +free to promote or market any other material; + +g. disassemble, reverse engineer, decompile, modify, except as +permitted by section 2 hereinabove, or alter the Software; + +h. translate the Software; + +i. reproduce or copy the Software, except as permitted by section 4 +hereinbelow; + +j. publicly display the Software; + +k. prepare or develop derivative works based upon the Software; or + +l. modify, remove or alter this Agreement or any notices or other +markings or legends, such as trademark or copyright notices, affixed +on or within the Software. + +4. Permitted Distribution and Copying. So long as this Agreement +accompanies each copy you make of the Software and so long as you +fully comply at all times with this Agreement, ID grants to you the +non-exclusive and limited right to: (i) copy the Software from the +download onto your computer hard drive; (ii) copy the Software from +your computer hard drive into your computer RAM; (iii) copy on one +(1) hard disk one (1) "back up" or archival copy of the Software; and +(iv) copy the Software and distribute such copies as standalone +copies on physical media or in electronic format of the Software free +of charge for non-commercial purposes and not in connection with any +other material. You shall not distribute copies of the Software as +mounted on or attached to the covers or any other part of magazines +or other printed material. You shall not copy or distribute the +Software in any manner that infringes against, misappropriates or +otherwise violates any third-party right or that is libelous, +defamatory, obscene, false, misleading, or otherwise illegal or +unlawful. You shall not receive any postage, shipping, handling or +other charge, payment, fee, or other consideration, including items +in trade, in exchange for or in connection with copies of Software +you may distribute, even if only for reimbursement. You shall not +receive any value or consideration in exchange for or in connection +with copies of the Software you may distribute. You shall not +distribute the Software bundled, co-packaged or together with any +material. You shall not distribute the Software in connection with +the promotion or marketing of any material. Except as such are +included by ID within copies of the Software that you are permitted +to make under this Agreement, you shall not reproduce, depict, +display or copy the title of the Software, the ID name or any screen +display or other element or part of the Software. In exercising your +limited rights hereunder, you shall comply, at all times, with all +applicable laws, regulations, ordinances and statutes. ID reserves +all rights not granted in this Agreement. You shall not commercially +distribute the Software unless you first enter into a separate +contract with ID, on terms and conditions determined in ID's sole +discretion, and only upon your receipt of a written agreement +executed by an authorized officer of ID. + +5. Intellectual Property Rights. The Software and all copyrights, +trademarks and all other conceivable intellectual property rights +related to the Software are owned by ID and are protected by United +States copyright laws, international treaty provisions and all +applicable law, such as the Lanham Act. You must treat the Software +like any other copyrighted material, as required by 17 U.S.C. § 101 +et seq. and other applicable law. You agree to use your best +efforts to see that any user of the Software licensed hereunder, or +the New Creations, complies with this Agreement. You agree that you +are receiving a copy of the Software by limited license only and not +by sale and that the "first sale" doctrine of 17 U.S.C. § 109 does +not apply to your receipt or use of the Software. This section shall +survive the cancellation or termination of this Agreement. + +6. ID WARRANTIES. ID DISCLAIMS , AND ITS LICENSEE'S (INCLUDING, +WITHOUT LIMITATION, ACTIVISION INC. AND ITS AFFILIATES) DISCLAIM, +ALL WARRANTIES, WHETHER EXPRESS OR IMPLIED, INCLUDING, BUT NOT +LIMITED TO, IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A +PARTICULAR PURPOSE AND ANY WARRANTY OF NON-INFRINGEMENT, WITH RESPECT +TO THE SOFTWARE, THE SOFTWARE IMAGES AND OTHERWISE. THE SOFTWARE IS +PROVIDED "AS IS" AND WITHOUT WARRANTY. ID DOES NOT (AND ITS +LICENSEES DO NOT) WARRANT THAT THE SOFTWARE OR THE OPERATION OF THE +SOFTWARE WILL BE UNINTERRUPTED OR ERROR FREE OR THAT THE SOFTWARE +WILL MEET YOUR SPECIFIC OR SPECIAL REQUIREMENTS. ADDITIONAL +STATEMENTS, WHETHER ORAL OR WRITTEN, DO NOT CONSTITUTE WARRANTIES BY +ID (OR ANY ID LICENSEE) AND SHOULD NOT BE RELIED UPON. THIS +SECTION SHALL SURVIVE THE CANCELLATION OR TERMINATION OF THIS +AGREEMENT. + +7. Governing Law, Venue, Indemnity and Liability Limitation. This +Agreement shall be construed in accordance with and governed by the +applicable laws of the State of Texas and applicable United States +federal law. Exclusive venue for all litigation regarding this +Agreement shall be in Dallas County, Texas, and you agree to submit +to the jurisdiction of the federal and state courts in Dallas County, +Texas, for any such litigation. You hereby agree to indemnify, +defend and hold harmless ID and ID's officers, employees, directors, +agents, licensees (excluding you), sub-licensees (excluding you), +successors and assigns from and against all losses, lawsuits, +damages, causes of action and claims relating to and/or arising from +the New Creations or the distribution or other use of the New +Creations or relating to and/or arising from your breach of this +Agreement. You agree that your unauthorized use of the Software +Images, or the Software, or any part thereof, immediately and +irreparably will damage ID such that ID could not be compensated +adequately solely by a monetary award, and upon such actual or +threatened unauthorized use, at ID's option, that ID shall be +entitled to an injunctive order, in addition to all other available +remedies, including a monetary award, to prohibit such unauthorized +use without the necessity of ID posting bond or other security. IN +ANY CASE, ID, AND ID'S OFFICERS, EMPLOYEES, DIRECTORS, SHAREHOLDERS, +REPRESENTATIVES, AGENTS, LICENSEES (EXCLUDING YOU), SUBLICENSEES +(EXCLUDING YOU), SUCCESSORS AND ASSIGNS SHALL NOT BE LIABLE FOR ANY +CLAIM BY ANY THIRD PARTY OR FOR ANY LOSS OF DATA, LOSS OF PROFITS, +LOST SAVINGS, SPECIAL, INCIDENTAL, CONSEQUENTIAL, INDIRECT OR +PUNITIVE DAMAGES OR ANY OTHER DAMAGES ARISING FROM ANY ALLEGED CLAIM +FOR BREACH OF WARRANTY, BREACH OF CONTRACT, NEGLIGENCE, STRICT +PRODUCT LIABILITY, OR OTHER LEGAL THEORY EVEN IF ID OR ID'S +REPRESENTATIVES HAVE BEEN ADVISED OF THE POSSIBILITY OF ANY SUCH +DAMAGES, OR EVEN IF SUCH DAMAGES ARE FORESEEABLE. Some jurisdictions +do not allow the exclusion or limitation of incidental or +consequential damages, so the above limitation or exclusion may not +apply to you. This section shall survive the cancellation or +termination of this Agreement. + +8. United States Government Restricted Rights. To the extent +applicable, the United States Government shall only have those rights +to use the Software as expressly stated and expressly limited and +restricted in this Agreement, as provided in 48 C.F.R. §§ 227.7201 +through 227.7204, inclusive. + +9. General Provisions. Neither this Agreement nor any part or +portion hereof shall be assigned or sublicensed by you. ID may +assign its rights under this Agreement in ID's sole discretion. +Should any provision of this Agreement be held to be void, invalid, +unenforceable or illegal by a court of competent jurisdiction, the +validity and enforceability of the other provisions shall not be +affected thereby. If any provision is determined to be unenforceable +by a court of competent jurisdiction, you agree to a modification of +such provision to provide for enforcement of the provision's intent, +to the maximum extent permitted by applicable law. Failure of ID to +enforce any provision of this Agreement shall not constitute or be +construed as a waiver of such provision or of the right to enforce +such provision. IMMEDIATELY UPON YOUR FAILURE TO COMPLY WITH OR +BREACH OF ANY TERM OR PROVISION OF THIS AGREEMENT, YOUR LICENSE +GRANTED HEREIN AND THIS AGREEMENT AUTOMATICALLY SHALL TERMINATE, +WITHOUT NOTICE, AND ID MAY PURSUE ALL RELIEF AND REMEDIES AGAINST YOU +THAT ARE AVAILABLE UNDER APPLICABLE LAW AND/OR THIS AGREEMENT. +Immediately upon termination of this Agreement, any and all rights +you are granted hereunder shall terminate, you shall have no right to +use the Software or the New Creations, in any manner, and you +immediately shall destroy all copies of the Software and the New +Creations in your possession, custody or control, and all rights +granted hereunder shall revert, without notice, to and be vested in +ID. + +YOU ACKNOWLEDGE THAT YOU HAVE READ THIS AGREEMENT, YOU UNDERSTAND +THIS AGREEMENT, AND UNDERSTAND THAT BY CONTINUING THE DOWNLOAD OR +INSTALLATION OF THE SOFTWARE, BY LOADING OR RUNNING THE SOFTWARE, OR +BY PLACING OR COPYING THE SOFTWARE ONTO YOUR COMPUTER HARD DRIVE OR +RAM, YOU AGREE TO BE BOUND BY THE TERMS AND CONDITIONS OF THIS +AGREEMENT. YOU FURTHER AGREE THAT, EXCEPT FOR WRITTEN SEPARATE +AGREEMENTS, IF ANY, BETWEEN ID AND YOU, THIS AGREEMENT IS A COMPLETE +AND EXCLUSIVE STATEMENT OF THE RIGHTS AND LIABILITIES OF THE PARTIES +HERETO, RELATING TO THE SUBJECT MATTER HEREOF. THIS AGREEMENT +SUPERSEDES ALL PRIOR ORAL AGREEMENTS, PROPOSALS OR UNDERSTANDINGS, +AND ANY OTHER COMMUNICATIONS, IF ANY, BETWEEN ID AND YOU RELATING TO +THE SUBJECT MATTER OF THIS AGREEMENT. diff --git a/games/etlegacy-data/README b/games/etlegacy-data/README new file mode 100644 index 0000000000..01bad53b97 --- /dev/null +++ b/games/etlegacy-data/README @@ -0,0 +1,7 @@ +Wolfenstein Enemy Territory : Legacy is a project that aims +to create a fully compatible client and server for the popular +online FPS game Wolfenstein: Enemy Territory. + +This script repackages the original ID assets for W:ET to use +with etlegacy (they are needed for the game to run): the +resulting package is not redistributable. diff --git a/python/pysetuptools/pysetuptools.SlackBuild b/games/etlegacy-data/etlegacy-data.SlackBuild index 0ffafc259e..5d7a890d0a 100644 --- a/python/pysetuptools/pysetuptools.SlackBuild +++ b/games/etlegacy-data/etlegacy-data.SlackBuild @@ -1,6 +1,7 @@ #!/bin/sh -# Copyright 2013-2015 Audrius Kažukauskas <audrius@neutrino.lt> +# Slackware build script for etlegacy-data +# Copyright Matteo Bernardini <ponce@slackbuilds.org>, Pisa, Italy # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -20,45 +21,36 @@ # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -PRGNAM=pysetuptools -VERSION=${VERSION:-18.2} +PRGNAM=etlegacy-data +VERSION=${VERSION:-2.60} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} -SRCNAM=setuptools - -if [ -z "$ARCH" ]; then - case "$( uname -m )" in - i?86) ARCH=i486 ;; - arm*) ARCH=arm ;; - *) ARCH=$( uname -m ) ;; - esac -fi +ARCH=noarch CWD=$(pwd) TMP=${TMP:-/tmp/SBo} -PKG=${PKG:-$TMP/package-$SRCNAM} +PKG=$TMP/package-$PRGNAM OUTPUT=${OUTPUT:-/tmp} -set -eu +set -e # Exit on most errors rm -rf $PKG -mkdir -p $TMP $PKG $OUTPUT -cd $TMP -rm -rf $SRCNAM-$VERSION -tar xvf $CWD/$SRCNAM-$VERSION.tar.gz -cd $SRCNAM-$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 640 -o -perm 600 -o -perm 444 \ - -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; +mkdir -p $PKG/usr/share/etlegacy $OUTPUT +cd $PKG/usr/share/etlegacy -python setup.py install --root=$PKG +sh $CWD/et-linux-2.60.x86.run --tar xvf etmain/mp_bin.pk3 etmain/pak0.pk3 \ + etmain/pak1.pk3 etmain/pak2.pk3 etmain/video/etintro.roq + +chown -R root:root . +find . \ + \( -perm 777 -o -perm 775 -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 {} \; mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION -cp -a *.txt $PKG/usr/doc/$PRGNAM-$VERSION +cat $CWD/LICENSE > $PKG/usr/doc/$PRGNAM-$VERSION/LICENSE cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild mkdir -p $PKG/install diff --git a/games/etlegacy-data/etlegacy-data.info b/games/etlegacy-data/etlegacy-data.info new file mode 100644 index 0000000000..e081001099 --- /dev/null +++ b/games/etlegacy-data/etlegacy-data.info @@ -0,0 +1,10 @@ +PRGNAM="etlegacy-data" +VERSION="2.60" +HOMEPAGE="http://www.etlegacy.com" +DOWNLOAD="http://ftp.games.skynet.be/pub/wolfenstein/et-linux-2.60.x86.run" +MD5SUM="2d2373f29f02e18d365d7f1860eee435" +DOWNLOAD_x86_64="" +MD5SUM_x86_64="" +REQUIRES="" +MAINTAINER="Matteo Bernardini" +EMAIL="ponce@slackbuilds.org" diff --git a/games/etlegacy-data/slack-desc b/games/etlegacy-data/slack-desc new file mode 100644 index 0000000000..dc6fee0b01 --- /dev/null +++ b/games/etlegacy-data/slack-desc @@ -0,0 +1,19 @@ +# HOW TO EDIT THIS FILE: +# The "handy ruler" below makes it easier to edit a package description. +# Line up the first '|' above the ':' following the base package name, and +# the '|' on the right side marks the last column you can put a character in. +# You must make exactly 11 lines for the formatting to be correct. It's also +# customary to leave one space after the ':' except on otherwise blank lines. + + |-----handy-ruler------------------------------------------------------| +etlegacy-data: etlegacy-data (collaborative FPS - data files) +etlegacy-data: +etlegacy-data: Wolfenstein Enemy Territory : Legacy is a project that aims to create +etlegacy-data: a fully compatible client and server for the popular online FPS game +etlegacy-data: Wolfenstein: Enemy Territory. +etlegacy-data: This script repackages the original ID assets for W:ET to use +etlegacy-data: with etlegacy (they are needed for the game to run). This package +etlegacy-data: is not redistributable. +etlegacy-data: +etlegacy-data: homepage: http://www.etlegacy.com/ +etlegacy-data: diff --git a/games/etlegacy/README b/games/etlegacy/README new file mode 100644 index 0000000000..7d9f4aaf5a --- /dev/null +++ b/games/etlegacy/README @@ -0,0 +1,31 @@ +Wolfenstein Enemy Territory: Legacy is a project that aims to create +a fully compatible client and server for the popular online FPS game +Wolfenstein: Enemy Territory. + +It's based on its source code released under the GPLv3 license. + +The main goal of this project is to fix bugs, remove old dependencies +and make it playable on all major operating systems while still +remaining compatible with the ET 2.60b version and as many of its mods +as possible. + +This script builds the server with omni-bot support (x86 32bit only). +(http://www.omni-bot.com/) + +This command line switches are available: +- RENDERER2=yes (default: no) enable the new renderer (it performs + better but needs an OpenGL 3.0+ capable GPU; also it's still WIP, + so enable at your own risk, may cause incompatibilities with some + maps); +- FREETYPE=yes (default: no) enables freetype support; +- OPENAL=yes (default: no) enables OpenAL support + (for this you need the optional dependency OpenAL); +- CROUCH=yes (default: no) enables sticky crouching (during game). + +To play you *need* also the data files from the original game +(etlegacy-data). + +* WARNING * + +To have a client/server compatible with the existing ones (to play +on the existing online servers), build it on/for a 32bit platform. diff --git a/games/etlegacy/doinst.sh b/games/etlegacy/doinst.sh new file mode 100644 index 0000000000..5fb28930db --- /dev/null +++ b/games/etlegacy/doinst.sh @@ -0,0 +1,3 @@ +if [ -x /usr/bin/update-desktop-database ]; then + /usr/bin/update-desktop-database -q usr/share/applications >/dev/null 2>&1 +fi diff --git a/games/etlegacy/etlegacy.SlackBuild b/games/etlegacy/etlegacy.SlackBuild new file mode 100644 index 0000000000..d4777f01c7 --- /dev/null +++ b/games/etlegacy/etlegacy.SlackBuild @@ -0,0 +1,177 @@ +#!/bin/sh + +# Slackware build script for etlegacy +# Copyright 2013-2014 Matteo Bernardini <ponce@slackbuilds.org>, Pisa, Italy +# All rights reserved. +# +# Redistribution and use of this script, with or without modification, is +# permitted provided that the following conditions are met: +# +# 1. Redistributions of this script must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# +# THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED +# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF +# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO +# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, +# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; +# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, +# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR +# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF +# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +PRGNAM=etlegacy +VERSION=${VERSION:-20141115_3a6dbd5} +BUILD=${BUILD:-1} +TAG=${TAG:-_SBo} + +if [ -z "$ARCH" ]; then + case "$( uname -m )" in + i*86) ARCH=i686 ;; + arm*) ARCH=arm ;; + *) ARCH=$( uname -m ) ;; + esac +fi + +CWD=$(pwd) +TMP=${TMP:-/tmp/SBo} +PKG=$TMP/package-$PRGNAM +OUTPUT=${OUTPUT:-/tmp} + +w_omnibot=1 +if [ "$ARCH" = "i386" ]; then + SLKCFLAGS="-O2 -march=i386 -mtune=i686" +elif [ "$ARCH" = "i686" ]; then + SLKCFLAGS="-O2 -march=i686 -mtune=core2" +elif [ "$ARCH" = "x86_64" ]; then + SLKCFLAGS="-O2 -fPIC" + w_omnibot=0 +else + SLKCFLAGS="-O2" + w_omnibot=0 +fi + +# The new renderer performs better but needs an OpenGL 3.0+ capable GPU; +# also it's still WIP, so enable at your own risk, may cause incompatibilities +# with some maps +if [ "${RENDERER2:-no}" = "yes" ]; then w_renderer=1; else w_renderer=0; fi +if [ "${FREETYPE:-no}" = "yes" ]; then w_freetype=1; else w_freetype=0; fi +if [ "${OPENAL:-no}" = "yes" ]; then w_openal=1; else w_openal=0; fi +if [ "${CROUCH:-no}" = "yes" ]; then w_crouch=1; else w_crouch=0; fi +if [ "${MULTIVIEW:-no}" = "yes" ]; then w_multiview=1; else w_multiview=0; fi + +set -e # Exit on most errors + +rm -rf $PKG +mkdir -p $TMP $PKG $OUTPUT +cd $TMP +rm -rf $PRGNAM-$VERSION +tar xvf $CWD/$PRGNAM-$VERSION.tar.?z* +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 640 -o -perm 600 -o -perm 444 \ + -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; + +# Fix location of the omnibot.zip, man install path +# and leave the relative path to binaries off +sed -i "s|share/man|man|" CMakeLists.txt +sed -i "s|^\.\/etl|etl|" misc/etl_bot.sh misc/etlded_bot.sh + +mkdir -p build/legacy +cd build + ln -s $CWD/omnibot-linux-latest.tar.gz legacy/ + # We have to use bundled lua and sdl + cmake \ + -DCMAKE_C_FLAGS_RELEASE:STRING="$SLKCFLAGS" \ + -DCMAKE_CXX_FLAGS_RELEASE:STRING="$SLKCFLAGS" \ + -DCMAKE_INSTALL_PREFIX="/usr" \ + -DINSTALL_DEFAULT_BINDIR="bin" \ + -DINSTALL_DEFAULT_MODDIR="share/$PRGNAM" \ + -DINSTALL_DEFAULT_BASEDIR="/usr/share/$PRGNAM" \ + -DBUILD_CLIENT=1 \ + -DBUILD_SERVER=1 \ + -DBUILD_MOD=1 \ + -DBUILD_MOD_PK3=1 \ + -DBUILD_PAK3_PK3=1 \ + -DFEATURE_ANTICHEAT=1 \ + -DFEATURE_CURL=1 \ + -DFEATURE_LUA=1 \ + -DFEATURE_TRACKER=1 \ + -DFEATURE_OMNIBOT=$w_omnibot \ + -DINSTALL_OMNIBOT=$w_omnibot \ + -DFEATURE_MULTIVIEW=0 \ + -DFEATURE_CURSES=0 \ + -DCROSS_COMPILE32=0 \ + -DFEATURE_OGG_VORBIS=1 \ + -DFEATURE_FREETYPE=$w_freetype \ + -DFEATURE_OPENAL=$w_openal \ + -DFEATURE_AUTOUPDATE=0 \ + -DFEATURE_IPV6=0 \ + -DFEATURE_GETTEXT=1 \ + -DFEATURE_RENDERER2=$w_renderer \ + -DFEATURE_CROUCH=$w_crouch \ + -DFEATURE_MULTIVIEW=$w_multiview \ + -DRENDERER_DYNAMIC=0 \ + -DBUNDLED_LIBS=1 \ + -DBUNDLED_SDL=1 \ + -DBUNDLED_LUA=1 \ + -DBUNDLED_CURL=0 \ + -DBUNDLED_JPEG=0 \ + -DBUNDLED_OGG_VORBIS=0 \ + -DBUNDLED_GLEW=0 \ + -DBUNDLED_FREETYPE=0 \ + -DBUNDLED_JANSSON=1 \ + -DCMAKE_BUILD_TYPE=Release .. + + # JIC, sanitize the just-uncompressed omnibot stuff + chown -R root:root legacy + find -L legacy \ + \( -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 {} \; + make + make install DESTDIR=$PKG +cd .. + +# Move man pages in the proper place +mv $PKG/usr/share/man $PKG/usr/man + +# Install a script to open urls, and move two scripts to launch the client and +# the dedicated server with omnibot support in the binaries folder +install -m 0755 $CWD/files/openurl.sh $PKG/usr/bin/openurl.sh +mv $PKG/usr/share/$PRGNAM/etl*.sh $PKG/usr/bin/ +chmod 755 $PKG/usr/bin/etl*.sh + +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 + +find $PKG/usr/man -type f -exec gzip -9 {} \; +for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done + +# Install an icon, a desktop file and man pages +install -m 0644 -D $CWD/files/$PRGNAM.svg \ + $PKG/usr/share/pixmaps/$PRGNAM.svg +install -m 0644 -D $CWD/files/$PRGNAM.desktop \ + $PKG/usr/share/applications/$PRGNAM.desktop +mkdir -p $PKG/usr/man/man6 +gzip -9 -c docs/linux/man/man6/etl.6 > $PKG/usr/man/man6/etl.6.gz +gzip -9 -c docs/linux/man/man6/etlded.6 > $PKG/usr/man/man6/etlded.6.gz + +mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION +mv \ + $PKG/usr/share/$PRGNAM/README.md \ + $PKG/usr/share/$PRGNAM/COPYING.txt \ + $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 +cat $CWD/doinst.sh > $PKG/install/doinst.sh + +cd $PKG +/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz} diff --git a/games/etlegacy/etlegacy.info b/games/etlegacy/etlegacy.info new file mode 100644 index 0000000000..e828ee48a0 --- /dev/null +++ b/games/etlegacy/etlegacy.info @@ -0,0 +1,12 @@ +PRGNAM="etlegacy" +VERSION="20141115_3a6dbd5" +HOMEPAGE="http://www.etlegacy.com" +DOWNLOAD="http://ponce.cc/slackware/sources/repo/etlegacy-20141115_3a6dbd5.tar.xz \ + http://ponce.cc/slackware/sources/repo/omnibot-linux-latest.tar.gz" +MD5SUM="9a4ac962170e7a9d0d7b9ac995917546 \ + b355b2d25a6812fda61725d45a51f049" +DOWNLOAD_x86_64="" +MD5SUM_x86_64="" +REQUIRES="%README% etlegacy-data zenity" +MAINTAINER="Matteo Bernardini" +EMAIL="ponce@slackbuilds.org" diff --git a/games/etlegacy/files/etlegacy.desktop b/games/etlegacy/files/etlegacy.desktop new file mode 100644 index 0000000000..2618c0c13e --- /dev/null +++ b/games/etlegacy/files/etlegacy.desktop @@ -0,0 +1,9 @@ +[Desktop Entry] +Name=ETLegacy +Comment=ET: Legacy (Collaborative online FPS) +Exec=etl +Icon=etl +Terminal=false +Type=Application +Categories=Game; +StartupNotify=false diff --git a/games/etlegacy/files/etlegacy.svg b/games/etlegacy/files/etlegacy.svg new file mode 100644 index 0000000000..51754d1889 --- /dev/null +++ b/games/etlegacy/files/etlegacy.svg @@ -0,0 +1,100 @@ +<?xml version="1.0" encoding="UTF-8" standalone="no"?> +<!-- Created with Inkscape (http://www.inkscape.org/) --> + +<svg + xmlns:dc="http://purl.org/dc/elements/1.1/" + xmlns:cc="http://creativecommons.org/ns#" + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" + xmlns:svg="http://www.w3.org/2000/svg" + xmlns="http://www.w3.org/2000/svg" + xmlns:xlink="http://www.w3.org/1999/xlink" + version="1.1" + width="273.6875" + height="173.40625" + viewBox="0 0 218.95 138.72526" + id="svg2"> + <metadata + id="metadata16"> + <rdf:RDF> + <cc:Work + rdf:about=""> + <dc:format>image/svg+xml</dc:format> + <dc:type + rdf:resource="http://purl.org/dc/dcmitype/StillImage" /> + <dc:title></dc:title> + </cc:Work> + </rdf:RDF> + </metadata> + <defs + id="defs14"> + <linearGradient + id="linearGradient5430"> + <stop + id="stop5432" + style="stop-color:#df3323;stop-opacity:1" + offset="0" /> + <stop + id="stop5434" + style="stop-color:#3d0000;stop-opacity:1" + offset="1" /> + </linearGradient> + <linearGradient + x1="134.5764" + y1="2.2628517" + x2="134.5764" + y2="150.06567" + id="linearGradient5438" + xlink:href="#linearGradient5430" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(0.80000151,0,0,0.80000151,1.4747917,2.0250038)" + spreadMethod="pad" /> + </defs> + <path + d="m 141.47506,0 -2.025,0.025 -2.20001,0.025 -0.025,0 -0.05,0 c -0.56094,0.029611 -1.70494,0.1655976 -3.625,0.4000007 -1.92006,0.2344032 -4.43694,0.566477 -7.10002,1.0000019 -2.76457,0.4500476 -5.64229,1.0096873 -8.15001,1.6750032 -2.39466,0.6353177 -4.73741,1.1624015 -6.65002,3.0750058 -1.11785,1.1178567 -1.76614,2.3933294 -2.175,3.6250069 C 109.06614,8.5933348 108.41785,7.3178683 107.3,6.2000117 105.38739,4.2874074 103.04464,3.7603236 100.64998,3.1250059 98.142257,2.45969 95.264537,1.9000503 92.499964,1.4500027 89.859095,1.0200941 87.367626,0.683809 85.474951,0.4500008 83.582275,0.2161926 82.445337,0.0816673 81.924944,0.0500001 c -0.002,2.358e-4 -0.0219,2.018e-4 -0.025,0 -0.05436,-0.00354 -0.104368,0.00167 -0.15,0 -0.09126,-0.00334 -0.182568,0.00226 -0.300001,0 -0.234863,-0.00451 -0.536171,-0.022255 -0.825001,-0.025 -0.577661,-0.00549 -1.150002,0 -1.150002,0 l -2.000004,0 0,2.0000038 0,13.0000251 -72.650138,0 -4.82500917679,0 0,8.000015 L 3.3997953,26.45005 42.39987,65.450124 l 0.600001,0.575001 0.825001,0 35.650068,0 0,58.850115 0,4.85001 3.425006,-3.45001 13.575026,-13.62503 0,21.22504 0,4.85001 3.425005,-3.45 14.575033,-14.62503 0,4.22501 0,4.82501 3.42501,-3.40001 21.00004,-21.00004 0.575,-0.60001 0,-0.825 0,-37.850065 35.65006,0 0.825,0 0.6,-0.575001 39.00008,-39.000074 3.4,-3.425006 0,-8.000015 -4.82501,0 -72.65013,0 0,-13.0000251 z m -59.875116,4.0500076 0.075,0 c 0.01691,0.00103 1.091842,0.132738 1.725003,0.2000004 z m 55.700106,0 0.075,0 0.1,0 0,0.2250004 -2,0 c 0.72505,-0.076119 1.78584,-0.2215776 1.825,-0.2250004 z M 83.824948,4.3000081 c 0.505641,0.055705 0.521361,0.044253 1.175002,0.1250002 1.655203,0.2044728 3.853399,0.5170549 6.125012,0.8750017 C 88.120084,4.8294493 85.543799,4.4927178 83.824948,4.3000081 z m 50.925102,0.05 c -1.61252,0.1827352 -3.91957,0.4916419 -6.57501,0.9000017 2.14817,-0.332921 4.26472,-0.6314689 5.85001,-0.8250016 0.40573,-0.049532 0.36769,-0.034762 0.725,-0.075 z m -34.950073,2.675005 c 1.462323,0.389813 2.501633,0.7939944 3.350013,1.2250023 -0.15979,-0.072953 -0.27743,-0.1411677 -0.475,-0.2250004 -0.73852,-0.313363 -1.74502,-0.6878195 -2.875013,-1.0000019 z m 19.350043,0 c -1.12999,0.3121818 -2.13649,0.686639 -2.87501,1.0000019 -0.19757,0.083833 -0.31521,0.1520469 -0.475,0.2250004 0.84838,-0.4310079 1.88769,-0.8351893 3.35001,-1.2250023 z m -33.675069,1.550003 c 1.673843,0.2029118 3.290574,0.3746285 5.750011,0.7750014 2.615437,0.4257684 5.275002,0.9244885 7.350015,1.4750025 0.97355,0.25829 1.877973,0.600456 2.525003,0.875002 0.2086,0.08851 0.35117,0.155736 0.50001,0.225 0.0575,0.137843 0.13205,0.275764 0.2,0.475002 0.0976,0.286085 0.1654,0.634726 0.25,0.975001 -0.97037,0.241444 -2.243943,0.668929 -3.400013,1.825004 -1.3422,1.342202 -1.77999,2.924928 -1.975005,3.900007 -0.207144,1.03545 -0.201016,1.881533 -0.2,1.925004 2.4e-5,0.0011 0,0.05 0,0.05 l 0,16.950032 -65.325124,0 -3.000005,-3.000006 27.325051,0 0.825002,0 0.600001,-0.575001 4.000008,-4.000007 3.400006,-3.425007 -4.825009,0 -39.325074,0 -4.000008,-4.000007 58.47511,0 -5.57501,5.57501 -3.400007,3.425007 4.82501,0 13.000024,0 2.000004,0 0,-2.000004 z m 48.000099,0 0,21.4500409 0,2.000004 2,0 13.00002,0 4.82501,0 -3.4,-3.425007 -5.57501,-5.57501 58.47511,0 -4.00001,4.000007 -39.32508,0 -4.825,0 3.4,3.425007 4.00001,4.000007 0.6,0.575001 0.825,0 27.32505,0 -3,3.000006 -65.32513,0 0,-16.950032 c 0,0 -2e-5,-0.04888 0,-0.05 0.001,-0.04347 0.007,-0.889474 -0.2,-1.925004 -0.19501,-0.975067 -0.63279,-2.557801 -1.975,-3.900007 -1.15607,-1.156066 -2.42964,-1.583559 -3.40001,-1.825004 0.0846,-0.340275 0.15244,-0.688916 0.25,-0.975001 0.0679,-0.199238 0.14251,-0.337159 0.20001,-0.475002 0.14882,-0.06926 0.2914,-0.136491 0.5,-0.225 0.64703,-0.274545 1.55145,-0.616712 2.525,-0.875002 2.07501,-0.550514 4.73458,-1.0492341 7.35001,-1.4750025 2.45944,-0.4003729 4.07617,-0.5720896 5.75002,-0.7750014 z M 105.44999,10.75002 c 0.36286,0.911786 0.61428,1.899778 0.775,3.025006 0.11508,0.806639 0.13951,1.402629 0.2,1.950004 l 0.025,1.300002 -1.975,0 1.725,-0.025 0.1,-1.875003 c 0,0 0.031,-0.608393 -0.075,-1.350003 -0.13725,-0.96083 -0.38475,-1.897196 -0.65,-2.675005 -0.0439,-0.128608 -0.0802,-0.229896 -0.125,-0.350001 z m 8.05002,0 c -0.0448,0.120105 -0.0811,0.221393 -0.125,0.350001 -0.26525,0.777809 -0.51275,1.714175 -0.65,2.675005 0.16075,-1.125247 0.41213,-2.113214 0.775,-3.025006 z m -0.875,4.125008 -0.1,1.575003 0,-0.725001 c 0.0264,-0.239123 0.0753,-0.570767 0.1,-0.850002 z m -0.125,2.125004 1.975,0.025 -1,0 -0.975,0 z m -8.17502,0.025 c -0.041,0.0024 -0.4443,0.04387 -0.975,0.150001 -0.36337,0.07267 -0.66015,0.160047 -0.9,0.25 -0.0624,0.02341 -0.11939,0.02704 -0.175,0.05 0.33272,-0.161248 0.70162,-0.275325 1.075,-0.35 0.48654,-0.09731 0.975,-0.100001 0.975,-0.100001 z m 10.27502,0 c 0.17915,0.0019 0.4303,-0.01394 1,0.100001 0.37338,0.07468 0.74228,0.188751 1.075,0.35 -0.0556,-0.02295 -0.11256,-0.02659 -0.175,-0.05 -0.23984,-0.08995 -0.53662,-0.177325 -0.9,-0.25 -0.54393,-0.108764 -0.97882,-0.148809 -1,-0.150001 z m -13.67503,1.800004 c -0.0229,0.0556 -0.0266,0.112574 -0.05,0.175 -0.0899,0.239816 -0.17732,0.536711 -0.25,0.900002 -0.10298,0.515223 -0.12122,0.888151 -0.125,0.950002 2.7e-4,-0.09844 -0.0292,-0.429085 0.075,-0.950002 0.0747,-0.373381 0.18875,-0.742282 0.35,-1.075002 z m 17.10004,0 c 0.16124,0.332717 0.27532,0.701615 0.35,1.075002 0.1042,0.520844 0.0747,0.851573 0.075,0.950002 -0.004,-0.06189 -0.0219,-0.434562 -0.125,-0.950002 -0.0727,-0.36332 -0.16004,-0.660121 -0.25,-0.900002 -0.0234,-0.06244 -0.027,-0.119368 -0.05,-0.175 z m -13.55003,10.200019 c 0.0155,-0.0012 0.1,0 0.1,0 l 1.9,0 1.97501,0 0.025,0 2,0 0.025,0 2.97501,0 0.9,0 c 0,0 0.0845,-0.0012 0.1,0 l 0,0.1 0,8.900017 -10.00002,0 0,-8.900017 z m -23.000047,-7.150014 0,6.150012 -6.150011,0 5.57501,-5.57501 z m 56.000107,0 0.575,0.575002 5.57501,5.57501 -6.15001,0 z m -98.325187,24.150046 57.325109,0 0,38.000072 0,4.825009 3.425005,-3.400007 4.000013,-4.000007 0.575,-0.600001 0,-0.825002 0,-34.000064 10.00002,0 0,38.000072 0,4.825009 3.42501,-3.400007 4,-4.000007 0.575,-0.600001 0,-0.825002 0,-34.000064 57.32511,0 -4,4.000008 -42.32508,0 -2.00001,0 0,2.000003 0,41.325078 -9.00002,9.000014 0,-12.32502 0,-4.825009 -3.425,3.400006 -4.00001,4.000008 -0.575,0.600001 0,0.825002 0,7.325012 -10.00002,10.00002 0,-21.17504 0,-4.825009 -3.42501,3.400007 -13.575025,13.600022 0,-50.325092 0,-2.000003 -2.000004,0 -42.32508,0 z" + id="path3892" + style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:5;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans" /> + <path + d="m 80.899942,3.4500065 0,13.5750255 c 0.0057,0.747658 -0.677344,1.430652 -1.425003,1.425003 l -74.4251406,0 36.1500686,36.150068 40.275076,0 c 0.747658,-0.0057 1.430651,0.677345 1.425003,1.425003 l 0,57.425104 14.575031,-14.625023 c 0.39153,-0.399953 1.03245,-0.531513 1.54988,-0.318145 0.51742,0.213376 0.87931,0.758473 0.87512,1.318146 l 0,22.625042 15.575033,-15.62503 c 0.39153,-0.39995 1.03246,-0.53151 1.54988,-0.31814 0.51743,0.21337 0.87932,0.75847 0.87512,1.31814 l 0,5.62501 18.15004,-18.15003 0,-39.275074 c -0.006,-0.747658 0.67734,-1.430652 1.425,-1.425003 l 40.27508,0 36.15007,-36.150068 -74.42514,0 c -0.74766,0.0057 -1.43066,-0.677345 -1.42501,-1.425003 l 0,-13.5500255 -0.75,0 0,-0.025 c -0.12117,0.00807 -1.49587,0.1472265 -3.35,0.3750007 -1.88147,0.2311324 -4.34424,0.5758045 -6.95002,1.0000019 -2.69691,0.4390327 -5.46733,0.9811276 -7.80001,1.600003 -2.41264,0.6400874 -3.98999,1.0649805 -5.12501,2.2000042 -1.33333,1.3333278 -1.65391,3.1773877 -1.92501,5.0750097 -0.12252,0.857658 -0.14082,1.502959 -0.2,2.025004 l -0.025,1.875003 1.55001,0 1,0 c 0.0252,0.0076 0.0502,0.01597 0.075,0.025 0,0 0.40683,0.02138 0.925,0.125 0.31902,0.0638 0.5829,0.143578 0.8,0.225001 0.10855,0.04071 0.21314,0.08552 0.3,0.125 0.0434,0.01974 0.0715,0.02167 0.125,0.05 0.0535,0.02833 0.0276,-0.07243 0.375,0.275001 0.34819,0.347604 0.24662,0.321414 0.275,0.375 0.0284,0.05358 0.0302,0.08154 0.05,0.125001 0.0395,0.08692 0.0843,0.191437 0.125,0.3 0.0814,0.217128 0.16121,0.481024 0.225,0.800002 0.10364,0.518223 0.125,0.925002 0.125,0.925002 0.009,0.02476 0.0174,0.04978 0.025,0.075 l 0,19.000036 c 0.006,0.747644 -0.67732,1.430629 -1.42496,1.425002 l -14.00002,0 c -0.74766,0.0057 -1.43065,-0.677344 -1.42501,-1.425002 l 0,-19.000036 c 0.008,-0.02522 0.016,-0.05024 0.025,-0.075 0,0 0.0214,-0.406945 0.125,-0.925002 0.0638,-0.318958 0.1436,-0.582921 0.225,-0.800002 0.0407,-0.10854 0.0855,-0.213147 0.125,-0.3 0.0198,-0.04342 0.0217,-0.0715 0.05,-0.125001 0.0283,-0.0535 -0.0723,-0.02764 0.275,-0.375 0.34793,-0.348311 0.32148,-0.246652 0.37501,-0.275001 0.0535,-0.02835 0.0816,-0.03026 0.125,-0.05 0.0869,-0.03949 0.19144,-0.08429 0.3,-0.125 0.21711,-0.08142 0.48099,-0.161197 0.8,-0.225001 0.51824,-0.103637 0.925,-0.125 0.925,-0.125 0.0247,-0.009 0.0498,-0.01737 0.075,-0.025 l 2,0 0.55,0 -0.025,-1.875003 c -0.0591,-0.521651 -0.0776,-1.167032 -0.2,-2.025004 -0.271,-1.897581 -0.59162,-3.7416741 -1.92496,-5.0750097 C 103.73996,7.4899926 102.16262,7.0650995 99.749977,6.4250121 97.417297,5.8061367 94.64688,5.2640418 91.949963,4.8250091 89.364134,4.4040604 86.933122,4.0566076 85.07495,3.8250072 83.216778,3.5934068 81.821792,3.4558999 81.724944,3.4500065 c -0.01664,2.946e-4 -0.03336,2.946e-4 -0.05,0 -5.04e-4,-3.11e-5 -0.05432,-0.00264 -0.05,0 -0.0108,-3.603e-4 -0.03648,3.705e-4 -0.05,0 -0.05408,-0.00148 -0.114734,0.00133 -0.2,0 -0.130649,-0.00204 -0.307376,0.00137 -0.475001,0 z" + id="path3885" + style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:url(#linearGradient5438);fill-opacity:1;stroke:none;stroke-width:4.00000763;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans" /> + <path + d="m 79.474939,2.0250038 0,15.0000282 -77.850147,0 39.000074,39.000074 40.850077,0 0,60.850114 17.000034,-17.050032 c 0,8.683352 0,17.366702 0,26.050052 l 18.000033,-18.05004 0,9.05002 21.00004,-21.000039 0,-39.850075 40.85008,0 39.00007,-39.000074 -77.85014,0 0,-15.0000282 -2.19342,0.030005 c -0.56842,0.030005 -5.24819,0.5139758 -10.50661,1.3699977 -2.72494,0.4435953 -5.54482,0.9868914 -7.95001,1.6250031 -2.40519,0.6381117 -4.29291,1.1178968 -5.75001,2.5750049 -1.70711,1.7071081 -2.05238,3.9666185 -2.32501,5.8750105 -0.14279,0.999532 -0.19036,1.874272 -0.23268,2.199639 l -0.0423,3.325372 3.00001,0 1,0 c 0,0 0.30115,0.01525 0.725,0.1 0.42385,0.08477 0.84641,0.271405 0.875,0.300001 0.0286,0.02859 0.21523,0.451146 0.3,0.875001 0.0848,0.423855 0.1,0.725002 0.1,0.725002 l 0,19.000036 -14.00002,0 0,-19.000036 c 0,0 0.0153,-0.301147 0.1,-0.725002 0.0848,-0.423855 0.2714,-0.846406 0.3,-0.875001 0.0286,-0.02859 0.45115,-0.21523 0.875,-0.300001 0.4239,-0.08477 0.725,-0.1 0.725,-0.1 l 2,0 2.00001,0 -0.0424,-3.325372 c -0.0423,-0.325367 -0.0901,-1.200107 -0.23264,-2.199639 -0.27262,-1.908392 -0.61788,-4.1679025 -2.32499,-5.8750106 -1.4571,-1.4571081 -3.34482,-1.9368932 -5.75001,-2.5750049 C 97.719787,4.4118978 94.899905,3.8686017 92.174963,3.4250064 86.958546,2.5758217 82.355913,2.0923049 81.802928,2.0586543 81.714408,2.034763 79.474939,2.0250038 79.474939,2.0250038 z m 4.000008,4.250008 c 1.883196,0.2104537 4.619937,0.537548 8.075015,1.1000021 2.650061,0.4314048 5.361455,0.9443646 7.550015,1.5250029 2.188563,0.5806383 3.932123,1.4821112 3.975013,1.5250032 0.29289,0.292891 0.94763,2.033399 1.175,3.625006 0.0742,0.519018 0.05,0.975002 0.05,0.975002 0,0 -0.64839,0.0097 -1.34996,0.150001 -0.82616,0.165229 -1.90361,0.478597 -2.87501,1.450002 -0.971403,0.971405 -1.284773,2.048861 -1.450003,2.875006 -0.16527,0.826145 -0.15004,1.525003 -0.15004,1.525003 l 0,19.000036 -68.17513,0 -7.000014,-7.000014 32.175061,0 4.000008,-4.000007 -40.175076,0 -8.000015,-8.000015 68.175128,0 -9.000017,9.000017 13.000025,0 z m 52.000103,0 0,23.7500452 13.00002,0 -9.00001,-9.000017 68.17512,0 -8.00001,8.000015 -40.17508,0 4.00001,4.000007 32.17506,0 -7.00001,7.000014 -68.17513,0 0,-19.000036 c 0,0 0.0153,-0.698858 -0.15,-1.525003 -0.16523,-0.826145 -0.47859,-1.903601 -1.45,-2.875006 -0.97141,-0.971405 -2.04886,-1.284773 -2.87501,-1.450002 -0.74271,-0.148543 -1.25461,-0.148713 -1.375,-0.150001 0.034,-0.432859 8e-4,-0.455984 0.075,-0.975002 0.22737,-1.591607 0.88211,-3.332115 1.175,-3.625006 0.0429,-0.0429 1.78645,-0.9443649 3.97501,-1.5250032 2.18855,-0.5806383 4.89995,-1.0935981 7.55001,-1.5250029 3.45508,-0.5624541 6.19182,-0.8895484 8.07502,-1.1000021 z M 34.299854,44.025083 l 64.175123,0 0,40.000076 4.000013,-4.000008 0,-36.000068 14.00002,0 0,40.000076 4.00001,-4.000008 0,-36.000068 64.17512,0 -8.00001,8.000015 -43.17509,0 0,42.17508 -13.00002,13.000022 0,-17.17503 -4.00001,4.000007 0,8.175013 -14.00002,14.00003 0,-26.02505 -17.000039,17.02503 0,-55.175102 -43.175082,0 z" + id="stroke_curved_top_left" + style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000000;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans" /> + <g + transform="translate(1.4749954,152.42528)" + id="g3771"> + <path + d="m 103,15 c 0,0 -2,0 -3,1 -1,1 -1,3 -1,3 M 80,2 c 0,0 20,2 23,5 2,2 2,8 2,8" + id="path3773" + style="fill:none;stroke:#000000;stroke-width:4.00000763;stroke-linecap:round;stroke-miterlimit:4;stroke-dasharray:none" /> + <path + d="m 113,15 c 0,0 2,0 3,1 1,1 1,3 1,3 M 136,2 c 0,0 -20,2 -23,5 -2,2 -2,8 -2,8" + id="path3775" + style="fill:none;stroke:#000000;stroke-width:4.00000763;stroke-linecap:round;stroke-miterlimit:4;stroke-dasharray:none" /> + <path + d="m 99,19 c 0,0 0,58 0,58 M 82,93 c 0,0 0,-41 0,-41 0,0 -42,0 -42,0 0,0 -35,-35 -35,-35 0,0 75,0 75,0 m 25,-2 c 0,0 -2,0 -2,0 M 80,2 c 0,0 0,24 0,24 m -27,3 c 0,0 -36,0 -36,0 m 91,11 c 0,0 -80,0 -80,0" + id="path3777" + style="fill:none;stroke:#000000;stroke-width:4.00000763;stroke-linecap:round;stroke-miterlimit:4;stroke-dasharray:none" /> + <path + d="m 117,19 c 0,0 0,58 0,58 m 17,16 c 0,0 0,-41 0,-41 0,0 42,0 42,0 0,0 35,-35 35,-35 0,0 -75,0 -75,0 m -25,-2 c 0,0 2,0 2,0 M 136,2 c 0,0 0,24 0,24 m 27,3 c 0,0 36,0 36,0 m -91,11 c 0,0 80,0 80,0" + id="path3779" + style="fill:none;stroke:#000000;stroke-width:4.00000763;stroke-linecap:round;stroke-miterlimit:4;stroke-dasharray:none" /> + <path + d="m 134,89 c 0,0 0,4 0,4 0,0 -17,17 -17,17 0,0 0,-9 0,-9 0,0 -18,18 -18,18 0,0 0,-26 0,-26 0,0 -17,17 -17,17 0,0 0,-17 0,-17 m 35,0 c 0,0 0,8 0,8" + id="path3781" + style="fill:none;stroke:#000000;stroke-width:4.00000763;stroke-linecap:round;stroke-miterlimit:4;stroke-dasharray:none" /> + <path + d="m 138,2 c 0,0 0,-2 0,-2 0,0 -2,0 -2,0 0,0 0,2 0,2 0,0 2,0 2,0 z m -4,24 c 0,0 0,2 0,2 0,0 13,0 13,0 0,0 -9,-9 -9,-9 0,0 -4,0 -4,0 0,0 0,7 0,7 z m 30,5 c 0,0 -2,0 -2,0 0,0 -4,-4 -4,-4 0,0 6,0 6,0 0,0 0,4 0,4 z M 112,17 c 0,0 -3,0 -3,0 0,0 0,-3 0,-3 0,0 3,0 3,0 0,0 0,3 0,3 z" + id="path3783" + style="fill:#000000;fill-opacity:1;stroke:none" /> + <path + d="m 78,2 c 0,0 0,-2 0,-2 0,0 2,0 2,0 0,0 0,2 0,2 0,0 -2,0 -2,0 z m 4,24 c 0,0 0,2 0,2 0,0 -13,0 -13,0 0,0 9,-9 9,-9 0,0 4,0 4,0 0,0 0,7 0,7 z m -30,5 c 0,0 2,0 2,0 0,0 4,-4 4,-4 0,0 -6,0 -6,0 0,0 0,4 0,4 z m 52,-14 c 0,0 3,0 3,0 0,0 0,-3 0,-3 0,0 -3,0 -3,0 0,0 0,3 0,3 z" + id="path3785" + style="fill:#000000;fill-opacity:1;stroke:none" /> + <path + d="m 97,82 c 0,0 4,-4 4,-4 0,0 0,-1 0,-1 0,0 -4,0 -4,0 0,0 0,5 0,5 z m 18,0 c 0,0 4,-4 4,-4 0,0 0,-1 0,-1 0,0 -4,0 -4,0 0,0 0,5 0,5 z m 0,11 c 0,0 4,0 4,0 0,0 0,-5 0,-5 0,0 -4,4 -4,4 0,0 0,1 0,1 z" + id="path3787" + style="fill:#000000;fill-opacity:1;stroke:none" /> + </g> +</svg> diff --git a/games/etlegacy/files/get_tarball_from_git.sh b/games/etlegacy/files/get_tarball_from_git.sh new file mode 100644 index 0000000000..42aaa1626d --- /dev/null +++ b/games/etlegacy/files/get_tarball_from_git.sh @@ -0,0 +1,31 @@ +rm -fR /tmp/tmp-etlegacy +mkdir -p /tmp/tmp-etlegacy +cd /tmp/tmp-etlegacy +git clone git://github.com/etlegacy/etlegacy.git +cd etlegacy +git submodule init +git submodule update +cd libs +git archive master > ../../libs.tar +cd .. +cd scripts +git archive master > ../../scripts.tar +cd .. +COMMIT=$( git log -1 | head -1 | cut -c 8-14 ) +COMMDATE=$( git log -1 --date=short | grep ^Date | awk '{print $2}' | sed 's/-//g' ) +rm -f /tmp/etlegacy-${COMMDATE}_${COMMIT}.tar.xz +git archive master > ../src.tar +cd .. +mkdir etlegacy-${COMMDATE}_${COMMIT} +cd etlegacy-${COMMDATE}_${COMMIT} +tar xf ../src.tar +cd libs +tar xf ../../libs.tar +cd .. +cd scripts +tar xf ../../scripts.tar +cd .. +cd .. +rm -f src.tar libs.tar scripts.tar +tar Jcf /tmp/etlegacy-${COMMDATE}_${COMMIT}.tar.xz etlegacy-${COMMDATE}_${COMMIT} +echo "/tmp/etlegacy-${COMMDATE}_${COMMIT}.tar.xz done." diff --git a/games/etlegacy/files/openurl.sh b/games/etlegacy/files/openurl.sh new file mode 100644 index 0000000000..274f12d08d --- /dev/null +++ b/games/etlegacy/files/openurl.sh @@ -0,0 +1,15 @@ +#!/bin/sh +# use this script to customize the way the engine should open URLs + +for test_browser in firefox seamonkey opera +do + browser=`which $test_browser` + if [ "x$browser" != "x" ] + then + $browser -remote "openURL($1,new-window)" || $browser "$1" + exit + fi +done +# xterm -e lynx "$1" + +exit 0 diff --git a/games/etlegacy/slack-desc b/games/etlegacy/slack-desc new file mode 100644 index 0000000000..7c92988b4e --- /dev/null +++ b/games/etlegacy/slack-desc @@ -0,0 +1,19 @@ +# HOW TO EDIT THIS FILE: +# The "handy ruler" below makes it easier to edit a package description. +# Line up the first '|' above the ':' following the base package name, and +# the '|' on the right side marks the last column you can put a character in. +# You must make exactly 11 lines for the formatting to be correct. It's also +# customary to leave one space after the ':' except on otherwise blank lines. + + |-----handy-ruler------------------------------------------------------| +etlegacy: etlegacy (collaborative FPS) +etlegacy: +etlegacy: Wolfenstein Enemy Territory : Legacy is a project that aims to create +etlegacy: a fully compatible client and server for the popular online FPS game +etlegacy: Wolfenstein: Enemy Territory. +etlegacy: It's based on its source code released under the GPLv3 license. +etlegacy: The main goal of this project is to fix bugs, remove old dependencies +etlegacy: and make it playable on all major operating systems while still +etlegacy: remaining compatible with the ET 2.60b version and as many of its mods +etlegacy: as possible. +etlegacy: homepage: http://www.etlegacy.com/ diff --git a/games/frogatto/frogatto.SlackBuild b/games/frogatto/frogatto.SlackBuild index 6790379517..a33cebcbe5 100644 --- a/games/frogatto/frogatto.SlackBuild +++ b/games/frogatto/frogatto.SlackBuild @@ -23,7 +23,7 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=frogatto -VERSION=1.1.1 +VERSION=${VERSION:-1.3.1} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -60,7 +60,7 @@ rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT cd $TMP rm -rf $PRGNAM-$VERSION -tar xvf $CWD/$PRGNAM-$VERSION.tar.bz2 +tar xvf $CWD/$PRGNAM-$VERSION.tar.?z* || tar xvf $CWD/$VERSION.tar.?z* cd $PRGNAM-$VERSION chown -R root:root . find -L . \ @@ -85,8 +85,8 @@ mkdir -p $PKG/usr/libexec/frogatto mv game $PKG/usr/libexec/frogatto mkdir -p $PKG/usr/share/frogatto -mv data images music sounds $PKG/usr/share/frogatto -mv locale $PKG/usr/share +mv modules/frogatto/{data,images,music,sounds} $PKG/usr/share/frogatto +mv modules/frogatto/locale $PKG/usr/share mkdir -p $PKG/usr/bin cat $CWD/frogatto.wrapper > $PKG/usr/bin/frogatto @@ -110,7 +110,7 @@ for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; r mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION cp -a \ - CHANGELOG FONT_GENERATION INSTALL LICENSE \ + FONT_GENERATION INSTALL LICENSE modules/frogatto/CHANGELOG \ $PKG/usr/doc/$PRGNAM-$VERSION cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild diff --git a/games/frogatto/frogatto.info b/games/frogatto/frogatto.info index 1a03363d85..9e9abbe51a 100644 --- a/games/frogatto/frogatto.info +++ b/games/frogatto/frogatto.info @@ -1,8 +1,8 @@ PRGNAM="frogatto" -VERSION="1.1.1" +VERSION="1.3.1" HOMEPAGE="http://www.frogatto.com/" -DOWNLOAD="http://www.frogatto.com/files/frogatto-1.1.1.tar.bz2" -MD5SUM="bf5a2ee4c3254a424766895ff250758b" +DOWNLOAD="https://github.com/frogatto/frogatto/archive/1.3.1.tar.gz" +MD5SUM="f3206fbe1395ea2878092fbd4ed2c591" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" diff --git a/games/frozen-bubble/frozen-bubble.SlackBuild b/games/frozen-bubble/frozen-bubble.SlackBuild index 288ae83dc9..50cbcd8f9e 100644 --- a/games/frozen-bubble/frozen-bubble.SlackBuild +++ b/games/frozen-bubble/frozen-bubble.SlackBuild @@ -24,7 +24,7 @@ PRGNAM=frozen-bubble VERSION=905bf71 -BUILD=${BUILD:-1} +BUILD=${BUILD:-2} TAG=${TAG:-_SBo} if [ -z "$ARCH" ]; then @@ -69,6 +69,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 {} \; +# Werror breaks build on current +sed -i "s|\ -Werror||" inc/My/Builder.pm + perl Build.PL \ prefix=/usr \ installdirs=vendor \ diff --git a/games/gens-gs/gens-gs.SlackBuild b/games/gens-gs/gens-gs.SlackBuild index 228c9a0def..0ebdb159cd 100644 --- a/games/gens-gs/gens-gs.SlackBuild +++ b/games/gens-gs/gens-gs.SlackBuild @@ -69,8 +69,7 @@ CXXFLAGS="$SLKCFLAGS" \ --disable-static \ --docdir=/usr/doc/$PRGNAM-$VERSION \ --with-opengl=$OPENGL \ - --with-nasm=$ASM \ - --build=$ARCH-slackware-linux + --with-nasm=$ASM make make install DESTDIR=$PKG diff --git a/games/jzintv/jzintv.SlackBuild b/games/jzintv/jzintv.SlackBuild index fd533e16ac..fb247d23db 100644 --- a/games/jzintv/jzintv.SlackBuild +++ b/games/jzintv/jzintv.SlackBuild @@ -7,7 +7,7 @@ # Licensed under the WTFPL. See http://www.wtfpl.net/txt/copying/ for details. PRGNAM=jzintv -VERSION=${VERSION:-r1007} +VERSION=${VERSION:-r1025} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} diff --git a/games/jzintv/jzintv.info b/games/jzintv/jzintv.info index aacd3c1107..ab351a8ea6 100644 --- a/games/jzintv/jzintv.info +++ b/games/jzintv/jzintv.info @@ -1,8 +1,8 @@ PRGNAM="jzintv" -VERSION="r1007" +VERSION="r1025" HOMEPAGE="http://spatula-city.org/~im14u2c/intv/" -DOWNLOAD="http://ponce.cc/slackware/sources/repo/jzintv-r1007.tar.xz" -MD5SUM="3e6bda7bc4b052cb0f5eaaf1e3a0b30a" +DOWNLOAD="http://ponce.cc/slackware/sources/repo/jzintv-r1025.tar.xz" +MD5SUM="6c1a9703c1c3a797aca94a0f98907bcb" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" diff --git a/games/ltris/ltris.SlackBuild b/games/ltris/ltris.SlackBuild index 8e09f89a8f..d5d3f565f3 100644 --- a/games/ltris/ltris.SlackBuild +++ b/games/ltris/ltris.SlackBuild @@ -69,6 +69,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 for gcc 5 +patch -p1 < $CWD/removed_all_inline_keywords.patch + CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ ./configure \ diff --git a/games/ltris/removed_all_inline_keywords.patch b/games/ltris/removed_all_inline_keywords.patch new file mode 100644 index 0000000000..8ad04c2e8a --- /dev/null +++ b/games/ltris/removed_all_inline_keywords.patch @@ -0,0 +1,299 @@ +Index: ltris/src/sdl.c +=================================================================== +--- ltris/src/sdl.c (revision 163) ++++ ltris/src/sdl.c (revision 164) +@@ -244,7 +244,7 @@ + #endif + + /* return full path of bitmap */ +-inline void get_full_bmp_path( char *full_path, char *file_name ) ++void get_full_bmp_path( char *full_path, char *file_name ) + { + sprintf(full_path, "%s/gfx/%s", SRC_DIR, file_name ); + } +@@ -330,7 +330,7 @@ + /* + lock surface + */ +-inline void lock_surf(SDL_Surface *sur) ++void lock_surf(SDL_Surface *sur) + { + if (SDL_MUSTLOCK(sur)) + SDL_LockSurface(sur); +@@ -339,7 +339,7 @@ + /* + unlock surface + */ +-inline void unlock_surf(SDL_Surface *sur) ++void unlock_surf(SDL_Surface *sur) + { + if (SDL_MUSTLOCK(sur)) + SDL_UnlockSurface(sur); +@@ -666,7 +666,7 @@ + /* + lock font surface + */ +-inline void lock_font(Font *fnt) ++void lock_font(Font *fnt) + { + if (SDL_MUSTLOCK(fnt->pic)) + SDL_LockSurface(fnt->pic); +@@ -675,7 +675,7 @@ + /* + unlock font surface + */ +-inline void unlock_font(Font *fnt) ++void unlock_font(Font *fnt) + { + if (SDL_MUSTLOCK(fnt->pic)) + SDL_UnlockSurface(fnt->pic); +@@ -905,7 +905,7 @@ + /* + update rectangle (0,0,0,0)->fullscreen + */ +-inline void refresh_screen(int x, int y, int w, int h) ++void refresh_screen(int x, int y, int w, int h) + { + SDL_UpdateRect(sdl.screen, x, y, w, h); + } +@@ -1055,7 +1055,7 @@ + /* + lock surface + */ +-inline void lock_screen() ++void lock_screen() + { + if (SDL_MUSTLOCK(sdl.screen)) + SDL_LockSurface(sdl.screen); +@@ -1064,7 +1064,7 @@ + /* + unlock surface + */ +-inline void unlock_screen() ++void unlock_screen() + { + if (SDL_MUSTLOCK(sdl.screen)) + SDL_UnlockSurface(sdl.screen); +@@ -1073,7 +1073,7 @@ + /* + flip hardware screens (double buffer) + */ +-inline void flip_screen() ++void flip_screen() + { + SDL_Flip(sdl.screen); + } +@@ -1132,7 +1132,7 @@ + /* + get milliseconds since last call + */ +-inline int get_time() ++int get_time() + { + int ms; + cur_time = SDL_GetTicks(); +@@ -1148,7 +1148,7 @@ + /* + reset timer + */ +-inline void reset_timer() ++void reset_timer() + { + last_time = SDL_GetTicks(); + } +Index: ltris/src/sdl.h +=================================================================== +--- ltris/src/sdl.h (revision 163) ++++ ltris/src/sdl.h (revision 164) +@@ -41,8 +41,8 @@ + SDL_Surface* load_surf(char *fname, int f); + SDL_Surface* create_surf(int w, int h, int f); + void free_surf( SDL_Surface **surf ); +-inline void lock_surf(SDL_Surface *sur); +-inline void unlock_surf(SDL_Surface *sur); ++void lock_surf(SDL_Surface *sur); ++void unlock_surf(SDL_Surface *sur); + void blit_surf(void); + void alpha_blit_surf(int alpha); + void fill_surf(int c); +@@ -86,8 +86,8 @@ + Font* load_fixed_font(char *fname, int off, int len, int w); + void free_font(Font **sfnt); + int write_text(Font *sfnt, SDL_Surface *dest, int x, int y, char *str, int alpha); +-inline void lock_font(Font *sfnt); +-inline void unlock_font(Font *sfnt); ++void lock_font(Font *sfnt); ++void unlock_font(Font *sfnt); + SDL_Rect last_write_rect(Font *fnt); + int text_width(Font *fnt, char *str); + +@@ -132,14 +132,14 @@ + char** get_mode_names( int *count ); + int set_video_mode( Video_Mode mode ); + void hardware_cap(); +-inline void refresh_screen( int x, int y, int w, int h ); ++void refresh_screen( int x, int y, int w, int h ); + void refresh_rects(); + void add_refresh_rect(int x, int y, int w, int h); + int wait_for_key(); + void wait_for_click(); +-inline void lock_screen(); +-inline void unlock_screen(); +-inline void flip_screen(); ++void lock_screen(); ++void unlock_screen(); ++void flip_screen(); + void fade_screen( int type, int ms ); + void take_screenshot( int i ); + +@@ -148,8 +148,8 @@ + SDL_Cursor* create_cursor( int width, int height, int hot_x, int hot_y, char *source ); + + /* timer */ +-inline int get_time(); +-inline void reset_timer(); ++int get_time(); ++void reset_timer(); + + #ifdef __cplusplus + }; +Index: ltris/src/tools.c +=================================================================== +--- ltris/src/tools.c (revision 163) ++++ ltris/src/tools.c (revision 164) +@@ -23,7 +23,7 @@ + #include "ltris.h" + + /* compares to strings and returns true if their first strlen(str1) chars are equal */ +-inline int strequal( char *str1, char *str2 ) ++int strequal( char *str1, char *str2 ) + { + if ( strlen( str1 ) != strlen( str2 ) ) return 0; + return ( !strncmp( str1, str2, strlen( str1 ) ) ); +@@ -30,7 +30,7 @@ + } + + /* set delay to ms milliseconds */ +-inline void delay_set( Delay *delay, int ms ) ++void delay_set( Delay *delay, int ms ) + { + delay->limit = ms; + delay->cur = 0; +@@ -37,13 +37,13 @@ + } + + /* reset delay ( cur = 0 )*/ +-inline void delay_reset( Delay *delay ) ++void delay_reset( Delay *delay ) + { + delay->cur = 0; + } + + /* check if times out and reset */ +-inline int delay_timed_out( Delay *delay, int ms ) ++int delay_timed_out( Delay *delay, int ms ) + { + delay->cur += ms; + if ( delay->cur >= delay->limit ) { +@@ -56,12 +56,12 @@ + } + + /* set timer so that we have a time out next call of delay_timed_out() */ +-inline void delay_force_time_out( Delay *delay ) ++void delay_force_time_out( Delay *delay ) + { + delay->cur = delay->limit; + } + +-inline void goto_tile( int *x, int *y, int d ) ++void goto_tile( int *x, int *y, int d ) + { + /* 0 -up, clockwise, 5 - left up */ + switch ( d ) { +@@ -326,24 +326,24 @@ + the target value until reached when counter_update() is called. + ==================================================================== + */ +-inline void counter_set( Counter *counter, double value ) ++void counter_set( Counter *counter, double value ) + { + counter->value = value; + counter->approach = value; + } +-inline void counter_add( Counter *counter, double add ) ++void counter_add( Counter *counter, double add ) + { + counter->value += add; + } +-inline double counter_get_approach( Counter counter ) ++double counter_get_approach( Counter counter ) + { + return counter.approach; + } +-inline double counter_get( Counter counter ) ++double counter_get( Counter counter ) + { + return counter.value; + } +-inline void counter_update( Counter *counter, int ms ) ++void counter_update( Counter *counter, int ms ) + { + double change; + if ( counter->approach == counter->value ) return; +Index: ltris/src/bowl.c +=================================================================== +--- ltris/src/bowl.c (revision 163) ++++ ltris/src/bowl.c (revision 164) +@@ -333,7 +333,7 @@ + Set a tile contents and pixel contents. + ==================================================================== + */ +-inline void bowl_set_tile( Bowl *bowl, int x, int y, int tile_id ) ++void bowl_set_tile( Bowl *bowl, int x, int y, int tile_id ) + { + int i, j = y * bowl->block_size; + bowl->contents[x][y] = tile_id; +Index: ltris/src/tools.h +=================================================================== +--- ltris/src/tools.h (revision 163) ++++ ltris/src/tools.h (revision 164) +@@ -33,7 +33,7 @@ + #define VEC_DIST( vec1, vec2 ) ( sqrt( ( vec1.x - vec2.x ) * ( vec1.x - vec2.x ) + ( vec1.y - vec2.y ) * ( vec1.y - vec2.y ) ) ) + + /* compares to strings and returns true if their first strlen(str1) chars are equal */ +-inline int strequal( char *str1, char *str2 ); ++int strequal( char *str1, char *str2 ); + + /* delete lines */ + void delete_lines( char **lines, int line_number ); +@@ -45,16 +45,16 @@ + } Delay; + + /* set delay to ms milliseconds */ +-inline void delay_set( Delay *delay, int ms ); ++void delay_set( Delay *delay, int ms ); + + /* reset delay ( cur = 0 )*/ +-inline void delay_reset( Delay *delay ); ++void delay_reset( Delay *delay ); + + /* check if time's out ( add ms milliseconds )and reset */ +-inline int delay_timed_out( Delay *delay, int ms ); ++int delay_timed_out( Delay *delay, int ms ); + + /* set timer so that we have a time out next call of delay_timed_out() */ +-inline void delay_force_time_out( Delay *delay ); ++void delay_force_time_out( Delay *delay ); + + /* return distance betwteen to map positions */ + int get_dist( int x1, int y1, int x2, int y2 ); +Index: ltris/ChangeLog +=================================================================== +--- ltris/ChangeLog (revision 163) ++++ ltris/ChangeLog (revision 164) +@@ -1,3 +1,5 @@ ++- removed all inline keywords to work with GCC 5 (2015/05/16 MS) ++ + 1.0.19: + - removed link to lib math as not needed (2013/10/29 MS) + - reset key states when unpausing to prevent unwanted movement (2013/10/29 MS) diff --git a/games/naev/naev.SlackBuild b/games/naev/naev.SlackBuild index 82059af66f..28eaaf0d66 100644 --- a/games/naev/naev.SlackBuild +++ b/games/naev/naev.SlackBuild @@ -70,6 +70,7 @@ cat $CWD/ndata-$VERSION.zip > $PKG/usr/share/$PRGNAM/ndata CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ +LDFLAGS="-lm -lvorbis" \ ./configure \ --prefix=/usr \ --sysconfdir=/etc \ diff --git a/games/neverball/Makefile.diff b/games/neverball/Makefile.diff index f9cc96f5a7..dae48cb7f8 100644 --- a/games/neverball/Makefile.diff +++ b/games/neverball/Makefile.diff @@ -1,7 +1,7 @@ -diff -Nur neverball-1.5.4.orig//Makefile neverball-1.5.4/Makefile ---- neverball-1.5.4.orig//Makefile 2012-06-02 00:19:40.340921775 -0400 -+++ neverball-1.5.4/Makefile 2012-06-02 21:54:52.078406763 -0400 -@@ -27,7 +27,7 @@ +diff -Naur neverball-1.6.0.orig/Makefile neverball-1.6.0/Makefile +--- neverball-1.6.0.orig/Makefile 2014-05-21 15:21:43.000000000 +0200 ++++ neverball-1.6.0/Makefile 2015-04-23 04:30:07.093366557 +0200 +@@ -21,7 +21,7 @@ # Paths (packagers might want to set DATADIR and LOCALEDIR) USERDIR := .neverball @@ -9,21 +9,4 @@ diff -Nur neverball-1.5.4.orig//Makefile neverball-1.5.4/Makefile +DATADIR := /usr/share/neverball/data LOCALEDIR := ./locale - ifdef MINGW -@@ -131,14 +131,14 @@ - OGL_LIBS := -framework OpenGL - endif - --BASE_LIBS := -ljpeg $(PNG_LIBS) $(FS_LIBS) -+BASE_LIBS := -ljpeg $(PNG_LIBS) $(FS_LIBS) -lm - - ifdef DARWIN - BASE_LIBS += -L/opt/local/lib - endif - - ALL_LIBS := $(SDL_LIBS) $(BASE_LIBS) $(TILT_LIBS) $(INTL_LIBS) -lSDL_ttf \ -- -lvorbisfile $(OGL_LIBS) -+ -lvorbisfile $(OGL_LIBS) -lX11 - - #------------------------------------------------------------------------------ - + ifeq ($(PLATFORM),mingw) diff --git a/games/neverball/neverball.SlackBuild b/games/neverball/neverball.SlackBuild index adcb0d1aca..c6bb39b7f9 100644 --- a/games/neverball/neverball.SlackBuild +++ b/games/neverball/neverball.SlackBuild @@ -26,7 +26,7 @@ PRGNAM=neverball BONUS=neverputt -VERSION=${VERSION:-1.5.4} +VERSION=${VERSION:-1.6.0} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -57,6 +57,8 @@ else LIBDIRSUFFIX="" fi +set -e + rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT cd $TMP || exit 1 @@ -99,7 +101,7 @@ cp -a data/ $PKG/usr/share/$PRGNAM || exit 1 install -D -m 0644 ${i}_512.png $PKG/usr/share/icons/hicolor/512x512/apps/$i.png done cp -a ${PRGNAM}_replay.png $PKG/usr/share/icons/hicolor/48x48/apps/${PRGNAM}_replay.png - cp -a neverlogos.svg $PKG/usr/share/icons/hicolor/scalable/apps/neverlogos.svg + install -D -m 0644 neverlogos.svg $PKG/usr/share/icons/hicolor/scalable/apps/neverlogos.svg install -D -m 0644 mapc.1 $PKG/usr/man/man1/mapc.1 install -D -m 0644 $PRGNAM.6 $PKG/usr/man/man6/$PRGNAM.6 install -D -m 0644 $BONUS.6 $PKG/usr/man/man6/$BONUS.6 @@ -112,8 +114,7 @@ find $PKG/usr/man -type f -exec gzip -9 {} \; for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION -cp -a CHANGES COPYING README doc/* \ - $PKG/usr/doc/$PRGNAM-$VERSION +cp -a LICENSE.md README.md doc/* $PKG/usr/doc/$PRGNAM-$VERSION cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild mkdir -p $PKG/install diff --git a/games/neverball/neverball.info b/games/neverball/neverball.info index 19cc94ecbe..b98022a093 100644 --- a/games/neverball/neverball.info +++ b/games/neverball/neverball.info @@ -1,10 +1,10 @@ PRGNAM="neverball" -VERSION="1.5.4" +VERSION="1.6.0" HOMEPAGE="http://neverball.org/" -DOWNLOAD="http://neverball.org/neverball-1.5.4.tar.gz" -MD5SUM="c523b0f72c2035831310e821162f7bd7" +DOWNLOAD="http://neverball.org/neverball-1.6.0.tar.gz" +MD5SUM="444ba7838af776d504f3d16950a802eb" DOWNLOAD_x86_64="" MD5SUM_x86_64="" -REQUIRES="physfs" +REQUIRES="physfs SDL2_ttf" MAINTAINER="Brad Hermanson" EMAIL="apeitheo@gmail.com" diff --git a/games/pcsx2/README b/games/pcsx2/README new file mode 100644 index 0000000000..05ac7d7db5 --- /dev/null +++ b/games/pcsx2/README @@ -0,0 +1,6 @@ +PCSX2 is a PlayStation 2 emulator for Windows and Linux, started by +the same team that brought you PCSX (a Sony PlayStation 1 emulator). + +wxPython, portaudio and soundtouch are optional dependencies. + +NOTE: This is buildable only on x86 32bit platform. diff --git a/games/pcsx2/doinst.sh b/games/pcsx2/doinst.sh new file mode 100644 index 0000000000..5fb28930db --- /dev/null +++ b/games/pcsx2/doinst.sh @@ -0,0 +1,3 @@ +if [ -x /usr/bin/update-desktop-database ]; then + /usr/bin/update-desktop-database -q usr/share/applications >/dev/null 2>&1 +fi diff --git a/games/pcsx2/pcsx2.SlackBuild b/games/pcsx2/pcsx2.SlackBuild new file mode 100644 index 0000000000..3b3014c169 --- /dev/null +++ b/games/pcsx2/pcsx2.SlackBuild @@ -0,0 +1,104 @@ +#!/bin/sh + +# Slackware build script for pcsx2 +# Copyright 2014 Matteo Bernardini <ponce@slackbuilds.org>, Pisa, Italy +# All rights reserved. +# +# Redistribution and use of this script, with or without modification, is +# permitted provided that the following conditions are met: +# +# 1. Redistributions of this script must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# +# THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED +# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF +# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO +# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, +# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; +# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, +# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR +# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF +# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +PRGNAM=pcsx2 +VERSION=${VERSION:-r5913} +BUILD=${BUILD:-1} +TAG=${TAG:-_SBo} + +if [ -z "$ARCH" ]; then + case "$( uname -m )" in + i?86) ARCH=i686 ;; + arm*) ARCH=arm ;; + *) ARCH=$( uname -m ) ;; + esac +fi + +CWD=$(pwd) +TMP=${TMP:-/tmp/SBo} +PKG=$TMP/package-$PRGNAM +OUTPUT=${OUTPUT:-/tmp} + +if [ "$ARCH" = "i486" ]; then + SLKCFLAGS="-O2 -march=i486 -mtune=i686" + LIBDIRSUFFIX="" +elif [ "$ARCH" = "i686" ]; then + SLKCFLAGS="-O2 -march=i686 -mtune=core2" + LIBDIRSUFFIX="" +elif [ "$ARCH" = "x86_64" ]; then + SLKCFLAGS="-O2 -fPIC" + LIBDIRSUFFIX="64" +else + SLKCFLAGS="-O2" + LIBDIRSUFFIX="" +fi + +DOCS="pcsx2/Docs/*.txt pcsx2/Docs/*.doc" + +set -e # Exit on most errors + +rm -rf $PKG +mkdir -p $TMP $PKG $OUTPUT +cd $TMP +rm -rf $PRGNAM-$VERSION +tar xvf $CWD/$PRGNAM-$VERSION.tar.?z* +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 640 -o -perm 600 -o -perm 444 \ + -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; + +# Set our locations +sed -i \ + -e "s|share/doc/pcsx2|doc/${PRGNAM}-${VERSION}|" \ + -e "s|share/man|man|" \ + CMakeLists.txt + +mkdir -p build +cd build + cmake \ + -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \ + -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DPLUGIN_DIR=/usr/lib/$PRGNAM \ + -DPACKAGE_MODE=ON \ + -DCMAKE_BUILD_TYPE=Release .. + make + make install DESTDIR=$PKG +cd .. + +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 $DOCS $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 +cat $CWD/doinst.sh > $PKG/install/doinst.sh + +cd $PKG +/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz} diff --git a/games/pcsx2/pcsx2.info b/games/pcsx2/pcsx2.info new file mode 100644 index 0000000000..d37b6065f0 --- /dev/null +++ b/games/pcsx2/pcsx2.info @@ -0,0 +1,10 @@ +PRGNAM="pcsx2" +VERSION="r5913" +HOMEPAGE="http://pcsx2.net" +DOWNLOAD="http://ponce.cc/slackware/sources/repo/pcsx2-r5913.tar.xz" +MD5SUM="51a81cc75f171d3c369dd590de2c1aae" +DOWNLOAD_x86_64="UNSUPPORTED" +MD5SUM_x86_64="" +REQUIRES="wxPython nvidia-cg-toolkit portaudio soundtouch sparsehash" +MAINTAINER="Matteo Bernardini" +EMAIL="ponce@slackbuilds.org" diff --git a/libraries/libwpg/slack-desc b/games/pcsx2/slack-desc index 7152cd82cb..7511c9bbd2 100644 --- a/libraries/libwpg/slack-desc +++ b/games/pcsx2/slack-desc @@ -5,15 +5,15 @@ # You must make exactly 11 lines for the formatting to be correct. It's also # customary to leave one space after the ':' except on otherwise blank lines. - |-----handy-ruler------------------------------------------------------| -libwpg: libwpg (WPG-image reading/converting library) -libwpg: -libwpg: libwpg is a library for reading and converting WPG images -libwpg: -libwpg: Homepage: http://libwpg.sourceforge.net/ -libwpg: -libwpg: -libwpg: -libwpg: -libwpg: -libwpg: + |-----handy-ruler------------------------------------------------------| +pcsx2: pcsx2 (Playstation 2 emulator) +pcsx2: +pcsx2: PCSX2 is a PlayStation 2 emulator for Windows and Linux, started by +pcsx2: the same team that brought you PCSX (a Sony PlayStation 1 emulator). +pcsx2: +pcsx2: homepage: http://pcsx2.net +pcsx2: +pcsx2: +pcsx2: +pcsx2: +pcsx2: diff --git a/games/supermariowar/libpng.patch b/games/supermariowar/libpng.patch new file mode 100644 index 0000000000..1348cc548f --- /dev/null +++ b/games/supermariowar/libpng.patch @@ -0,0 +1,29 @@ +Index: _src/savepng.cpp +=================================================================== +--- _src/savepng.cpp (revision 6) ++++ _src/savepng.cpp (working copy) +@@ -94,7 +94,11 @@ + } + + /* Set error handling. */ ++#if PNG_LIBPNG_VER > 10399 ++ if (setjmp(png_jmpbuf(png_ptr))) ++#else + if (setjmp(png_ptr->jmpbuf)) ++#endif + { + /* If we get here, we had a problem reading the file */ + IMG_SetError("Error writing the PNG file"); +@@ -142,10 +146,10 @@ + done: + if (row_pointers) + delete [] row_pointers; +- ++#if PNG_LIBPNG_VER <= 10399 + if (info_ptr->palette) + delete info_ptr->palette; +- ++#endif + png_destroy_write_struct(&png_ptr, (png_infopp)NULL); + + diff --git a/games/supermariowar/supermariowar.SlackBuild b/games/supermariowar/supermariowar.SlackBuild index 416831766e..e5dce1fd61 100644 --- a/games/supermariowar/supermariowar.SlackBuild +++ b/games/supermariowar/supermariowar.SlackBuild @@ -58,6 +58,9 @@ find -L . \ # Makefile hadn't been (so I had to parse the VC++ project file, ugh). zcat $CWD/compilefixes.diff.gz | patch -p1 +# Patch for libpng16 (-current) thanks to Arch Linux +patch -p0 < $CWD/libpng.patch + # the configure script isn't autoconf (yay), but it has CRLFs (boo) sed -i 's,\r,,g' configure diff --git a/games/vcmi/github-aa00fdbd0e9.patch.gz b/games/vcmi/github-aa00fdbd0e9.patch.gz Binary files differnew file mode 100644 index 0000000000..64fbf948cb --- /dev/null +++ b/games/vcmi/github-aa00fdbd0e9.patch.gz diff --git a/games/vcmi/vcmi.SlackBuild b/games/vcmi/vcmi.SlackBuild index ff62cd752d..7cdb64a17a 100644 --- a/games/vcmi/vcmi.SlackBuild +++ b/games/vcmi/vcmi.SlackBuild @@ -70,6 +70,10 @@ 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 building with boost-1.58 +# Thanks to rohit-n on github https://github.com/vcmi/vcmi/pull/102 +zcat $CWD/github-aa00fdbd0e9.patch.gz | patch -p1 + mkdir -p build cd build cmake \ diff --git a/games/warmux/gcc47.patch b/games/warmux/patches/gcc47.patch index e51801a369..e51801a369 100644 --- a/games/warmux/gcc47.patch +++ b/games/warmux/patches/gcc47.patch diff --git a/games/warmux/patches/include-zlib.patch b/games/warmux/patches/include-zlib.patch new file mode 100644 index 0000000000..c7e77aba11 --- /dev/null +++ b/games/warmux/patches/include-zlib.patch @@ -0,0 +1,11 @@ +diff -uNr warmux-11.04.orig/src/graphic/surface.cpp warmux-11.04/src/graphic/surface.cpp +--- warmux-11.04.orig/src/graphic/surface.cpp 2011-09-19 09:26:52.392650465 +0200 ++++ warmux-11.04/src/graphic/surface.cpp 2011-09-19 09:26:19.417648189 +0200 +@@ -25,6 +25,7 @@ + #include <SDL_image.h> + #include <SDL_rotozoom.h> + #include <png.h> ++#include <zlib.h> + + #include "graphic/surface.h" + #include "tool/math_tools.h" diff --git a/games/warmux/warmux.SlackBuild b/games/warmux/warmux.SlackBuild index 1d711e8373..a360b817ca 100644 --- a/games/warmux/warmux.SlackBuild +++ b/games/warmux/warmux.SlackBuild @@ -73,7 +73,9 @@ find -L . \ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; # Fix building with gcc-4.7.x -patch -p1 < $CWD/gcc47.patch +patch -p1 < $CWD/patches/gcc47.patch +# Explicitly include zlib headers +patch -p1 < $CWD/patches/include-zlib.patch # Fix for sdlnet sed -i "s|SDLNet_Read32(buffer)|SDLNet_Read32(const_cast<char*>(buffer))|" \ lib/warmux/action/action.cpp diff --git a/games/warzone2100/warzone2100.SlackBuild b/games/warzone2100/warzone2100.SlackBuild index e0c3eb6931..d6f8048d42 100644 --- a/games/warzone2100/warzone2100.SlackBuild +++ b/games/warzone2100/warzone2100.SlackBuild @@ -23,7 +23,7 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=warzone2100 -VERSION=${VERSION:-3.1.0} +VERSION=${VERSION:-3.1.2} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -69,7 +69,7 @@ find -L . \ -exec chmod 644 {} \; CFLAGS="$SLKCFLAGS" \ -CXXFLAGS="$SLKCFLAGS" \ +CXXFLAGS="$SLKCFLAGS -fpermissive" \ ./configure \ --prefix=/usr \ --libdir=/usr/lib${LIBDIRSUFFIX} \ diff --git a/games/warzone2100/warzone2100.info b/games/warzone2100/warzone2100.info index 402963e9f5..b953363396 100644 --- a/games/warzone2100/warzone2100.info +++ b/games/warzone2100/warzone2100.info @@ -1,8 +1,8 @@ PRGNAM="warzone2100" -VERSION="3.1.0" +VERSION="3.1.2" HOMEPAGE="http://wz2100.net" -DOWNLOAD="http://downloads.sourceforge.net/warzone2100/warzone2100-3.1.0.tar.xz" -MD5SUM="7f061f3e5a2a6a83c146508ccefabd86" +DOWNLOAD="http://downloads.sourceforge.net/warzone2100/warzone2100-3.1.2.tar.xz" +MD5SUM="4e947125e9604821164f1ad9d1922447" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="OpenAL physfs quesoglc" diff --git a/games/zaz/zaz.SlackBuild b/games/zaz/zaz.SlackBuild index a25d8c728f..7afa888c5f 100644 --- a/games/zaz/zaz.SlackBuild +++ b/games/zaz/zaz.SlackBuild @@ -70,6 +70,7 @@ 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 {} \; +LDFLAGS="-lvorbis" \ CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ ./configure \ diff --git a/games/zsnes/zsnes-1.51-libpng15.patch b/games/zsnes/zsnes-1.51-libpng15.patch new file mode 100644 index 0000000000..b32c309675 --- /dev/null +++ b/games/zsnes/zsnes-1.51-libpng15.patch @@ -0,0 +1,12 @@ +Use existing png_set_IHDR() and stop accessing PNG structure members directly + +--- src/zip/zpng.c ++++ src/zip/zpng.c +@@ -129,7 +129,6 @@ + png_set_IHDR(png_ptr, info_ptr, width, height, 8, + PNG_COLOR_TYPE_RGB, PNG_INTERLACE_NONE, + PNG_COMPRESSION_TYPE_DEFAULT, PNG_FILTER_TYPE_DEFAULT); +- info_ptr->color_type = PNG_COLOR_TYPE_RGB; + + //Allocate an array of scanline pointers + row_pointers = (png_bytep*)malloc(height*sizeof(png_bytep)); diff --git a/games/zsnes/zsnes.SlackBuild b/games/zsnes/zsnes.SlackBuild index bdad578a74..171d487562 100644 --- a/games/zsnes/zsnes.SlackBuild +++ b/games/zsnes/zsnes.SlackBuild @@ -64,9 +64,6 @@ mv $PRGNAM$ZSNESDIR $PRGNAM-$VERSION mv $PRGNAM-$VERSION/src/* $PRGNAM-$VERSION cd $PRGNAM-$VERSION -# GCC 4.7 fixes from Debian -cat $CWD/0012-Fix-build-with-gcc-4.7.patch | patch -p2 --verbose - chown -R root:root . find -L . \ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 -o -perm 511 \) \ @@ -74,6 +71,13 @@ find -L . \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ -exec chmod 644 {} \; +# GCC 4.7 fixes from Debian +cat $CWD/0012-Fix-build-with-gcc-4.7.patch | patch -p2 --verbose + +# Fix for libpng16 (thanks to Arch Linux) +# https://projects.archlinux.org/svntogit/community.git/plain/trunk/zsnes-1.51-libpng15.patch?h=packages/zsnes +patch -p1 < $CWD/zsnes-1.51-libpng15.patch + CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ force_arch="$ARCH" \ diff --git a/gis/SFCGAL/SFCGAL.SlackBuild b/gis/SFCGAL/SFCGAL.SlackBuild index f1294d04f0..858aaee031 100644 --- a/gis/SFCGAL/SFCGAL.SlackBuild +++ b/gis/SFCGAL/SFCGAL.SlackBuild @@ -77,7 +77,7 @@ mkdir -p build cd build cmake \ -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \ - -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \ + -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS -DBOOST_VARIANT_USE_RELAXED_GET_BY_DEFAULT=1" \ -DCMAKE_INSTALL_PREFIX=/usr \ .. diff --git a/gis/xplanet/giflib6.patch b/gis/xplanet/giflib6.patch new file mode 100644 index 0000000000..653b9c8dc7 --- /dev/null +++ b/gis/xplanet/giflib6.patch @@ -0,0 +1,141 @@ +diff -wbBur xplanet-1.3.0/src/libimage/gif.c xplanet-1.3.0.my/src/libimage/gif.c +--- xplanet-1.3.0/src/libimage/gif.c 2006-03-26 01:50:51.000000000 +0300 ++++ xplanet-1.3.0.my/src/libimage/gif.c 2014-05-29 18:59:14.830652716 +0400 +@@ -20,7 +20,7 @@ + + #include <stdio.h> + #include <stdlib.h> +- ++#define FALSE 0 + #include <gif_lib.h> + + /* +@@ -42,11 +42,11 @@ + int color_index; + unsigned char *ptr = NULL; + +- infile = DGifOpenFileName(filename); ++ infile = DGifOpenFileName(filename, NULL); + + if (infile == NULL) + { +- PrintGifError(); ++ printf("%s\n", GifErrorString(GIF_ERROR)); + return(0); + } + +@@ -54,7 +54,7 @@ + { + if (DGifGetRecordType(infile, &record_type) == GIF_ERROR) + { +- PrintGifError(); ++ printf("%s\n", GifErrorString(GIF_ERROR)); + return(0); + } + +@@ -63,7 +63,7 @@ + case IMAGE_DESC_RECORD_TYPE: + if (DGifGetImageDesc(infile) == GIF_ERROR) + { +- PrintGifError(); ++ printf("%s\n", GifErrorString(GIF_ERROR)); + return(0); + } + +@@ -107,14 +107,14 @@ + GifByteType *ext; + if (DGifGetExtension(infile, &ext_code, &ext) == GIF_ERROR) + { +- PrintGifError(); ++ printf("%s\n", GifErrorString(GIF_ERROR)); + return(0); + } + while (ext != NULL) + { + if (DGifGetExtensionNext(infile, &ext) == GIF_ERROR) + { +- PrintGifError(); ++ printf("%s\n", GifErrorString(GIF_ERROR)); + return(0); + } + } +@@ -154,7 +154,7 @@ + + free(buffer); + +- DGifCloseFile(infile); ++ DGifCloseFile(infile, NULL); + return(1); + } + +@@ -178,7 +178,7 @@ + return(0); + } + +- colormap = MakeMapObject(colormap_size, NULL); ++ colormap = GifMakeMapObject(colormap_size, NULL); + + for (i = 0; i < width * height; i++) + { +@@ -187,10 +187,10 @@ + blue[i] = (GifByteType) rgb[3*i+2]; + } + +- if (QuantizeBuffer(width, height, &colormap_size, red, green, blue, ++ if (GifQuantizeBuffer(width, height, &colormap_size, red, green, blue, + buffer, colormap->Colors) == GIF_ERROR) + { +- PrintGifError(); ++ printf("%s\n", GifErrorString(GIF_ERROR)); + return(0); + } + +@@ -198,24 +198,24 @@ + free(green); + free(blue); + +- outfile = EGifOpenFileName((char *) filename, FALSE); ++ outfile = EGifOpenFileName((char *) filename, FALSE, NULL); + if (outfile == NULL) + { +- PrintGifError(); ++ printf("%s\n", GifErrorString(GIF_ERROR)); + return(0); + } + + if (EGifPutScreenDesc(outfile, width, height, colormap_size, 0, colormap) + == GIF_ERROR) + { +- PrintGifError(); ++ printf("%s\n", GifErrorString(GIF_ERROR)); + return(0); + } + + if (EGifPutImageDesc(outfile, 0, 0, width, height, FALSE, NULL) + == GIF_ERROR) + { +- PrintGifError(); ++ printf("%s\n", GifErrorString(GIF_ERROR)); + return(0); + } + +@@ -224,7 +224,7 @@ + { + if (EGifPutLine(outfile, ptr, width) == GIF_ERROR) + { +- PrintGifError(); ++ printf("%s\n", GifErrorString(GIF_ERROR)); + return(0); + } + ptr += width; +@@ -232,8 +232,8 @@ + + EGifSpew(outfile); + +- if (EGifCloseFile(outfile) == GIF_ERROR) +- PrintGifError(); ++ if (EGifCloseFile(outfile, NULL) == GIF_ERROR) ++ printf("%s\n", GifErrorString(GIF_ERROR)); + + free(buffer); + diff --git a/gis/xplanet/xplanet.SlackBuild b/gis/xplanet/xplanet.SlackBuild index a97b5ba314..1b2e453174 100644 --- a/gis/xplanet/xplanet.SlackBuild +++ b/gis/xplanet/xplanet.SlackBuild @@ -50,6 +50,10 @@ find -L . \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ -exec chmod 644 {} \; +# Patch for giflib 5.x from Arch Linux (thanks!) +# https://projects.archlinux.org/svntogit/community.git/plain/trunk/giflib6.patch?h=packages/xplanet +patch -p1 < $CWD/giflib6.patch + CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ ./configure \ diff --git a/graphics/Blender/Blender.info b/graphics/Blender/Blender.info index 22323b3195..8d4d425640 100644 --- a/graphics/Blender/Blender.info +++ b/graphics/Blender/Blender.info @@ -5,6 +5,6 @@ DOWNLOAD="http://mirror.cs.umn.edu/blender.org/source/blender-2.74.tar.gz" MD5SUM="488151953d69d63bedd8ed59f92daf3b" DOWNLOAD_x86_64="" MD5SUM_x86_64="" -REQUIRES="ffmpeg jack-audio-connection-kit opencollada openjpeg python-requests valgrind numpy3 SDL2 openimageio freealut jemalloc" +REQUIRES="ffmpeg jack-audio-connection-kit opencollada openjpeg1 python-requests valgrind numpy3 SDL2 openimageio freealut jemalloc" MAINTAINER="Christoph Willing" EMAIL="chris.willing@iinet.net.au" diff --git a/graphics/Blender/README.Slackware b/graphics/Blender/README.Slackware index 9b2990c9a7..1f809b3299 100644 --- a/graphics/Blender/README.Slackware +++ b/graphics/Blender/README.Slackware @@ -72,12 +72,3 @@ dirac schroedinger openjpeg " which are needed to be useful for any numpy-related python scripting in blender. It is therefore numpy3 which is the prerequisite for this build of blender. - -Due to the official versions of some software packages included in -Slackware 14.1, the most recent version of Blender that can be built from -the source code is Blender-2.74. Building more recent versions of -Blender would require replacement of at least the openexr and ilmbase -packages (both already updated in -current). - -NB. if building for -current (14.2), use SBo's openjpeg1 instead of -Slackware -current's official openjpeg (version 2.x.x). diff --git a/graphics/Pixie/Pixie.SlackBuild b/graphics/Pixie/Pixie.SlackBuild index 25e3eac650..63e52adb49 100644 --- a/graphics/Pixie/Pixie.SlackBuild +++ b/graphics/Pixie/Pixie.SlackBuild @@ -76,6 +76,12 @@ patch -p1 < $CWD/Pixie-2.2.6-strict.patch # Fix a logical problem in configure for linking to the static version sed -i.r_static -e 's|--ldstaticflags|--ldflags|' configure +# Fix building with bison-3 (thanks to cmuelle8 at Gentoo) +# https://bugs.gentoo.org/show_bug.cgi?id=486148 +sed -i \ + -e '/define YY_DECL/ s/yylval/riblval/' \ + src/ri/rib.l + CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ ./configure \ diff --git a/graphics/comix/README b/graphics/comix/README deleted file mode 100644 index 2ea1e356f3..0000000000 --- a/graphics/comix/README +++ /dev/null @@ -1,6 +0,0 @@ -comix (Viewer for archived images) - -Cartoons are, most of the time, archived. comix opens an archive file -and displays images in it, removing the need to decompress comicbook -files. It reads images in zip, rar, or tar(gzip or bzip2) archives. -It is written in Python and uses GTK+ through the PyGTK bindings. diff --git a/graphics/comix/comix.SlackBuild b/graphics/comix/comix.SlackBuild deleted file mode 100644 index c274e37930..0000000000 --- a/graphics/comix/comix.SlackBuild +++ /dev/null @@ -1,48 +0,0 @@ -#!/bin/sh - -# Slackware build script for comix - -# Written by crocket (crockabiscuit@gmail.com) - -PRGNAM=comix -VERSION=${VERSION:-4.0.4} -BUILD=${BUILD:-1} -TAG=${TAG:-_SBo} - -ARCH=noarch - -CWD=$(pwd) -TMP=${TMP:-/tmp/SBo} -PKG=$TMP/package-$PRGNAM -OUTPUT=${OUTPUT:-/tmp} - -set -e - -rm -rf $PKG -mkdir -p $TMP $PKG $OUTPUT -cd $TMP -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 {} \; - -mkdir -p $PKG/usr -python install.py install --dir=$PKG/usr --no-mime - -mv $PKG/usr/share/man $PKG/usr - -mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION -cp -a COPYING README ChangeLog $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 -cat $CWD/doinst.sh > $PKG/install/doinst.sh - -cd $PKG -/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz} diff --git a/graphics/comix/comix.info b/graphics/comix/comix.info deleted file mode 100644 index 628d599540..0000000000 --- a/graphics/comix/comix.info +++ /dev/null @@ -1,10 +0,0 @@ -PRGNAM="comix" -VERSION="4.0.4" -HOMEPAGE="http://comix.sourceforge.net/" -DOWNLOAD="http://downloads.sourceforge.net/comix/comix-4.0.4.tar.gz" -MD5SUM="029227a77b122f7080ee0280d41bee78" -DOWNLOAD_x86_64="" -MD5SUM_x86_64="" -REQUIRES="unrar" -MAINTAINER="Ozan Türkyılmaz" -EMAIL="ozan.turkyilmaz@gmail.com" diff --git a/graphics/entangle/entangle.SlackBuild b/graphics/entangle/entangle.SlackBuild index 1fc640ca46..921a11c254 100644 --- a/graphics/entangle/entangle.SlackBuild +++ b/graphics/entangle/entangle.SlackBuild @@ -23,7 +23,7 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=entangle -VERSION=${VERSION:-0.6.0} +VERSION=${VERSION:-0.7.0} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -69,6 +69,8 @@ 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 {} \; +sed -i -e 's/gnome-icon-theme-symbolic/adwaita-icon-theme/g' configure + CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ ./configure \ diff --git a/graphics/entangle/entangle.info b/graphics/entangle/entangle.info index 368ee18e57..7ed3e62a4f 100644 --- a/graphics/entangle/entangle.info +++ b/graphics/entangle/entangle.info @@ -1,8 +1,8 @@ PRGNAM="entangle" -VERSION="0.6.0" +VERSION="0.7.0" HOMEPAGE="http://entangle-photo.org" -DOWNLOAD="http://entangle-photo.org/download/sources/entangle-0.6.0.tar.gz" -MD5SUM="016a6e0f9b665efc79d1972f5fedb664" +DOWNLOAD="http://entangle-photo.org/download/sources/entangle-0.7.0.tar.gz" +MD5SUM="bdb5fab70276ea27c4614fecfa5c1d86" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="libgexiv2 libpeas LibRaw" diff --git a/graphics/exact-image/exact-image-giflib.patch b/graphics/exact-image/exact-image-giflib.patch new file mode 100644 index 0000000000..f15c7ad717 --- /dev/null +++ b/graphics/exact-image/exact-image-giflib.patch @@ -0,0 +1,139 @@ +--- exact-image-0.8.9/codecs/gif.cc.orig 2010-03-03 22:04:44.000000000 +0100 ++++ exact-image-0.8.9/codecs/gif.cc 2014-10-20 16:45:48.021255431 +0200 +@@ -17,6 +17,12 @@ + + #include <gif_lib.h> + ++#if (GIFLIB_MAJOR > 5) || (GIFLIB_MINOR >= 1) ++#define Internal_EGifCloseFile(f) EGifCloseFile(f, NULL) ++#else ++#define Internal_EGifCloseFile(f) EGifCloseFile(f) ++#endif ++ + #include "gif.hh" + #include "Colorspace.hh" + +@@ -58,11 +64,11 @@ + GifRecordType RecordType; + GifByteType* Extension; + ColorMapObject *ColorMap = NULL; +- int ExtCode; ++ int ExtCode, GifError; + +- if ((GifFile = DGifOpen (stream, &GIFInputFunc)) == NULL) ++ if ((GifFile = DGifOpen (stream, &GIFInputFunc, &GifError)) == NULL) + { +- PrintGifError(); ++ std::cerr << "Error: " << GifErrorString(GifError) << std::endl; + return false; + } + +@@ -74,7 +80,7 @@ + /* Scan the content of the GIF file and load the image(s) in: */ + do { + if (DGifGetRecordType(GifFile, &RecordType) == GIF_ERROR) { +- PrintGifError(); ++ std::cerr << "DGifGetRecordType error: " << GifErrorString(GifFile->Error) << std::endl; + return false; + } + +@@ -83,7 +89,7 @@ + switch (RecordType) { + case IMAGE_DESC_RECORD_TYPE: + if (DGifGetImageDesc(GifFile) == GIF_ERROR) { +- PrintGifError(); ++ std::cerr << "DGifGetImageDesc error: " << GifErrorString(GifFile->Error) << std::endl; + return false; + } + +@@ -104,7 +110,7 @@ + j += InterlacedJumps[i]) { + if (DGifGetLine(GifFile, &image.getRawData()[j*image.stride()+Col], + Width) == GIF_ERROR) { +- PrintGifError(); ++ std::cerr << "DGifGetLine error: " << GifErrorString(GifFile->Error) << std::endl; + return false; + } + } +@@ -113,7 +119,7 @@ + for (int i = 0; i < Height; ++i) { + if (DGifGetLine(GifFile, &image.getRawData()[Row++ * image.stride()+Col], + Width) == GIF_ERROR) { +- PrintGifError(); ++ std::cerr << "DGifGetLine error: " << GifErrorString(GifFile->Error) << std::endl; + return false; + } + } +@@ -122,12 +128,12 @@ + case EXTENSION_RECORD_TYPE: + /* Skip any extension blocks in file: */ + if (DGifGetExtension(GifFile, &ExtCode, &Extension) == GIF_ERROR) { +- PrintGifError(); ++ std::cerr << "DGifGetExtension error: " << GifErrorString(GifFile->Error) << std::endl; + return false; + } + while (Extension != NULL) { + if (DGifGetExtensionNext(GifFile, &Extension) == GIF_ERROR) { +- PrintGifError(); ++ std::cerr << "DGifGetExtensionNext error: " << GifErrorString(GifFile->Error) << std::endl; + return false; + } + } +@@ -155,7 +161,7 @@ + // convert colormap to our 16bit "TIFF"format + colorspace_de_palette (image, ColorMap->ColorCount, rmap, gmap, bmap); + +- EGifCloseFile(GifFile); ++ Internal_EGifCloseFile(GifFile); + + return true; + } +@@ -165,17 +171,18 @@ + { + GifFileType* GifFile; + GifByteType* Ptr; ++ int GifError; + +- if ((GifFile = EGifOpen (stream, &GIFOutputFunc)) == NULL) ++ if ((GifFile = EGifOpen (stream, &GIFOutputFunc, &GifError)) == NULL) + { +- std::cerr << "Error preparing GIF file for writing." << std::endl; ++ std::cerr << "Error preparing GIF file for writing: " << GifErrorString(GifError) << std::endl; + return false; + } + + int ColorMapSize = 256; + + // later use our own colormap generation +- ColorMapObject* OutputColorMap = MakeMapObject(ColorMapSize, NULL); ++ ColorMapObject* OutputColorMap = GifMakeMapObject(ColorMapSize, NULL); + if (!OutputColorMap) + return false; + +@@ -203,7 +210,7 @@ + } + + +- if (QuantizeBuffer(image.w, image.h, &ColorMapSize, ++ if (GifQuantizeBuffer(image.w, image.h, &ColorMapSize, + RedBuffer, GreenBuffer, BlueBuffer, + OutputBuffer, OutputColorMap->Colors) == GIF_ERROR) { + return false; +@@ -215,7 +222,7 @@ + if (EGifPutScreenDesc(GifFile, image.w, image.h, + ColorMapSize, 0, OutputColorMap) == GIF_ERROR || + EGifPutImageDesc(GifFile, 0, 0, image.w, image.h, +- FALSE, NULL) == GIF_ERROR) ++ false, NULL) == GIF_ERROR) + { + std::cerr << "Error writing GIF header." << std::endl; + return false; +@@ -234,7 +241,7 @@ + + delete (RedBuffer); delete (GreenBuffer); delete (BlueBuffer); + +- EGifCloseFile(GifFile); ++ Internal_EGifCloseFile(GifFile); + return true; + } + diff --git a/graphics/exact-image/png.cc-libpng14.diff b/graphics/exact-image/exact-image-libpng15.patch index ca738dbcf5..ba9df19e81 100644 --- a/graphics/exact-image/png.cc-libpng14.diff +++ b/graphics/exact-image/exact-image-libpng15.patch @@ -1,7 +1,28 @@ -diff -Naur exact-image-0.8.7-old/codecs/png.cc exact-image-0.8.7/codecs/png.cc ---- exact-image-0.8.7-old/codecs/png.cc -+++ exact-image-0.8.7/codecs/png.cc -@@ -71,7 +71,7 @@ +Description: Fix FTBFS with libpng 1.5 +Author: Nobuhiro Iwamatsu <iwamatsu@nigauri.org> +Approved: Ralf Treinen <treinen@debian.org> +Bug-Debian: #635745 + +--- exactimage-0.8.5.orig/codecs/png.cc ++++ exactimage-0.8.5/codecs/png.cc +@@ -17,6 +17,7 @@ + + #include <stdlib.h> + #include <png.h> ++#include <zlib.h> + + #include <iostream> + +@@ -58,7 +59,7 @@ int PNGCodec::readImage (std::istream* s + png_structp png_ptr; + png_infop info_ptr; + png_uint_32 width, height; +- int bit_depth, color_type, interlace_type; ++ int bit_depth, color_type, interlace_type, num_trans; + + png_ptr = png_create_read_struct(PNG_LIBPNG_VER_STRING, + NULL /*user_error_ptr*/, +@@ -71,7 +72,7 @@ int PNGCodec::readImage (std::istream* s /* Allocate/initialize the memory for image information. REQUIRED. */ info_ptr = png_create_info_struct(png_ptr); if (info_ptr == NULL) { @@ -10,7 +31,7 @@ diff -Naur exact-image-0.8.7-old/codecs/png.cc exact-image-0.8.7/codecs/png.cc return 0; } -@@ -82,7 +82,7 @@ +@@ -82,7 +83,7 @@ int PNGCodec::readImage (std::istream* s if (setjmp(png_jmpbuf(png_ptr))) { /* Free all of the memory associated with the png_ptr and info_ptr */ @@ -19,7 +40,7 @@ diff -Naur exact-image-0.8.7-old/codecs/png.cc exact-image-0.8.7/codecs/png.cc /* If we get here, we had a problem reading the file */ return 0; } -@@ -99,7 +99,7 @@ +@@ -99,13 +100,13 @@ int PNGCodec::readImage (std::istream* s png_read_info (png_ptr, info_ptr); png_get_IHDR (png_ptr, info_ptr, &width, &height, &bit_depth, &color_type, @@ -28,7 +49,30 @@ diff -Naur exact-image-0.8.7-old/codecs/png.cc exact-image-0.8.7/codecs/png.cc image.w = width; image.h = height; -@@ -196,11 +196,11 @@ + image.bps = bit_depth; +- image.spp = info_ptr->channels; +- ++ image.spp = png_get_channels(png_ptr, info_ptr); ++ + png_uint_32 res_x, res_y; + res_x = png_get_x_pixels_per_meter(png_ptr, info_ptr); + res_y = png_get_y_pixels_per_meter(png_ptr, info_ptr); +@@ -119,11 +120,13 @@ int PNGCodec::readImage (std::istream* s + * (not useful if you are using png_set_packing). */ + // png_set_packswap(png_ptr); + ++ png_get_tRNS(png_ptr, info_ptr, NULL, &num_trans, NULL); ++ + /* Expand paletted colors into true RGB triplets */ + if (color_type == PNG_COLOR_TYPE_PALETTE) { + png_set_palette_to_rgb(png_ptr); + image.bps = 8; +- if (info_ptr->num_trans) ++ if (num_trans) + image.spp = 4; + else + image.spp = 3; +@@ -196,11 +199,11 @@ int PNGCodec::readImage (std::istream* s for (int pass = 0; pass < number_passes; ++pass) for (unsigned int y = 0; y < height; ++y) { row_pointers[0] = image.getRawData() + y * stride; @@ -42,7 +86,7 @@ diff -Naur exact-image-0.8.7-old/codecs/png.cc exact-image-0.8.7/codecs/png.cc /* that's it */ return true; -@@ -224,7 +224,7 @@ +@@ -224,7 +227,7 @@ bool PNGCodec::writeImage (std::ostream* /* Allocate/initialize the memory for image information. REQUIRED. */ info_ptr = png_create_info_struct(png_ptr); if (info_ptr == NULL) { @@ -51,12 +95,15 @@ diff -Naur exact-image-0.8.7-old/codecs/png.cc exact-image-0.8.7/codecs/png.cc return false; } -@@ -244,8 +244,6 @@ +@@ -244,8 +247,10 @@ bool PNGCodec::writeImage (std::ostream* else if (quality > Z_BEST_COMPRESSION) quality = Z_BEST_COMPRESSION; png_set_compression_level(png_ptr, quality); -- png_info_init (info_ptr); ++ /* Need? + png_info_init (info_ptr); - ++ */ ++ /* Set up our STL stream output control */ png_set_write_fn (png_ptr, stream, &stdstream_write_data, &stdstream_flush_data); diff --git a/graphics/exact-image/exact-image.SlackBuild b/graphics/exact-image/exact-image.SlackBuild index 6c437bc8cf..d51b1d600c 100644 --- a/graphics/exact-image/exact-image.SlackBuild +++ b/graphics/exact-image/exact-image.SlackBuild @@ -3,7 +3,7 @@ # Written by Benjamin Trigona-Harany <slackbuilds@jaxartes.net> PRGNAM=exact-image -VERSION=${VERSION:-0.8.9} +VERSION=${VERSION:-0.9.1} BUILD=${BUILD:-3} TAG=${TAG:-_SBo} @@ -49,8 +49,11 @@ find -L . \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ -exec chmod 644 {} \; -# Patch to fix libpng linkage -patch -p1 --verbose < $CWD/png.cc-libpng14.diff +# Patch to fix build with libpng16 (-current) (thanks to Debian) +patch -p1 --verbose < $CWD/exact-image-libpng15.patch + +# Patch to fix build with giflib-5.1 (-current) (thanks to PLD Linux) +patch -p1 --verbose < $CWD/exact-image-giflib.patch # Patch to fix perl path eval $(perl -V:vendorlib) diff --git a/graphics/exact-image/exact-image.info b/graphics/exact-image/exact-image.info index 013d67ec98..0a6098651e 100644 --- a/graphics/exact-image/exact-image.info +++ b/graphics/exact-image/exact-image.info @@ -1,8 +1,8 @@ PRGNAM="exact-image" -VERSION="0.8.9" +VERSION="0.9.1" HOMEPAGE="http://www.exactcode.de/site/open_source/exactimage/" -DOWNLOAD="http://dl.exactcode.de/oss/exact-image/exact-image-0.8.9.tar.bz2" -MD5SUM="a8694722cd7cc9aa9407950a8440f0cd" +DOWNLOAD="http://dl.exactcode.de/oss/exact-image/exact-image-0.9.1.tar.bz2" +MD5SUM="864eddf488c309a02262f4e07b0fe319" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="agg" diff --git a/graphics/fbv/fbv.SlackBuild b/graphics/fbv/fbv.SlackBuild index 90252b9f35..5a38877d22 100644 --- a/graphics/fbv/fbv.SlackBuild +++ b/graphics/fbv/fbv.SlackBuild @@ -77,6 +77,10 @@ patch -p1 < $CWD/manhelp.diff # have to do this instead, to use our CFLAGS: sed -i "s,-O2,$SLKCFLAGS," Makefile +# Fix build with giflib-5.1 and libpng16 (thanks to Arch) +patch -p1 < $CWD/giflib-5.1.patch +sed -i 's|setjmp(png_ptr->jmpbuf)|setjmp(png_jmpbuf(png_ptr))|' png.c + make strip $PRGNAM mkdir -p $PKG/usr/bin $PKG/usr/man/man1 diff --git a/graphics/fbv/giflib-5.1.patch b/graphics/fbv/giflib-5.1.patch new file mode 100644 index 0000000000..1d819124f3 --- /dev/null +++ b/graphics/fbv/giflib-5.1.patch @@ -0,0 +1,62 @@ +diff -wbBur fbv-1.0b/gif.c fbv-1.0b.my/gif.c +--- fbv-1.0b/gif.c 2003-08-25 00:23:02.000000000 +0400 ++++ fbv-1.0b.my/gif.c 2014-05-29 18:39:41.337332872 +0400 +@@ -31,10 +31,10 @@ + #include <string.h> + #define min(a,b) ((a) < (b) ? (a) : (b)) + #define gflush return(FH_ERROR_FILE); +-#define grflush { DGifCloseFile(gft); return(FH_ERROR_FORMAT); } +-#define mgrflush { free(lb); free(slb); DGifCloseFile(gft); return(FH_ERROR_FORMAT); } ++#define grflush { DGifCloseFile(gft, NULL); return(FH_ERROR_FORMAT); } ++#define mgrflush { free(lb); free(slb); DGifCloseFile(gft, NULL); return(FH_ERROR_FORMAT); } + #define agflush return(FH_ERROR_FORMAT); +-#define agrflush { DGifCloseFile(gft); return(FH_ERROR_FORMAT); } ++#define agrflush { DGifCloseFile(gft, NULL); return(FH_ERROR_FORMAT); } + + + int fh_gif_id(char *name) +@@ -81,7 +81,7 @@ + ColorMapObject *cmap; + int cmaps; + +- gft=DGifOpenFileName(name); ++ gft=DGifOpenFileName(name, NULL); + if(gft==NULL){printf("err5\n"); gflush;} ////////// + do + { +@@ -170,7 +170,7 @@ + } + } + while( rt!= TERMINATE_RECORD_TYPE ); +- DGifCloseFile(gft); ++ DGifCloseFile(gft, NULL); + return(FH_ERROR_OK); + } + +@@ -184,7 +184,7 @@ + int extcode; + GifRecordType rt; + +- gft=DGifOpenFileName(name); ++ gft=DGifOpenFileName(name, NULL); + if(gft==NULL) gflush; + do + { +@@ -197,7 +197,7 @@ + px=gft->Image.Width; + py=gft->Image.Height; + *x=px; *y=py; +- DGifCloseFile(gft); ++ DGifCloseFile(gft, NULL); + return(FH_ERROR_OK); + break; + case EXTENSION_RECORD_TYPE: +@@ -210,7 +210,7 @@ + } + } + while( rt!= TERMINATE_RECORD_TYPE ); +- DGifCloseFile(gft); ++ DGifCloseFile(gft, NULL); + return(FH_ERROR_FORMAT); + } + #endif diff --git a/graphics/fim/fim.SlackBuild b/graphics/fim/fim.SlackBuild index 8b68d33d95..575890fe29 100644 --- a/graphics/fim/fim.SlackBuild +++ b/graphics/fim/fim.SlackBuild @@ -84,6 +84,11 @@ CXXFLAGS="$SLKCFLAGS" \ --with-default-consolefont=/usr/share/kbd/consolefonts/LatGrkCyr-8x16.psfu.gz \ --build=$ARCH-slackware-linux +# Fix build with bison-3 +sed -i \ + -e '/^fim_LDADD = /s/ \$(LEXLIB)//' \ + src/Makefile + make -j1 make install DESTDIR=$PKG diff --git a/graphics/fontforge/fontforge.SlackBuild b/graphics/fontforge/fontforge.SlackBuild index 23767033e1..3eafe3df3e 100644 --- a/graphics/fontforge/fontforge.SlackBuild +++ b/graphics/fontforge/fontforge.SlackBuild @@ -29,7 +29,7 @@ BUILD=${BUILD:-1} TAG=${TAG:-_SBo} ENABLE_BCINT=${ENABLE_BCINT:-yes} -FREETYPE=${FREETYPE:-"2.5.0.1"} +FREETYPE=${FREETYPE:-"2.6"} if [ -z "$ARCH" ]; then case "$( uname -m )" in @@ -70,13 +70,22 @@ chown -R root:root $PRGNAM-$VERSION freetype-$FREETYPE chmod -R u+w,go+r-w,a-s $PRGNAM-$VERSION freetype-$FREETYPE cd $PRGNAM-$VERSION -./bootstrap +# Fix for the newer libtool +# http://osdir.com/ml/blfs-dev/2015-02/msg00002.html +for i in m4/*.m4; do + if [[ ! -L $i ]]; then continue; fi + j=$(readlink "$i") + ln -sf "${j/aclocal\//aclocal\/lt}" "$i" +done + +./bootstrap -f CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ ./configure \ --prefix=/usr \ --libdir=/usr/lib${LIBDIRSUFFIX} \ --mandir=/usr/man \ + --docdir=/usr/doc/$PRGNAM-$VERSION \ --with-x \ --with-freetype-source=$TMP/freetype-${FREETYPE} \ --enable-python-extension \ diff --git a/graphics/fontforge/fontforge.info b/graphics/fontforge/fontforge.info index 2f79bcb190..a05c170777 100644 --- a/graphics/fontforge/fontforge.info +++ b/graphics/fontforge/fontforge.info @@ -3,10 +3,10 @@ VERSION="20141126" HOMEPAGE="http://fontforge.sourceforge.net/" DOWNLOAD="http://unrealize.co.uk/source/fontforge-20141126.tar.gz \ http://fontforge.sf.net/cidmaps.tgz \ - http://slackware.osuosl.org/slackware-14.1/source/l/freetype/freetype-2.5.0.1.tar.xz" + http://ponce.cc/slackware/sources/repo/freetype-2.6.tar.xz" MD5SUM="eaf134632c6c3a1a9c2cf8c8026a0c4a \ 063691163e592515b31514515bb3ce8c \ - 7ca0e253eb589b30d3e33786dbf39dff" + 7662700e5d5f471349ba6e557e04acb3" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" diff --git a/graphics/inkscape/inkscape.SlackBuild b/graphics/inkscape/inkscape.SlackBuild index f455b6ca69..1e533773a2 100644 --- a/graphics/inkscape/inkscape.SlackBuild +++ b/graphics/inkscape/inkscape.SlackBuild @@ -70,7 +70,7 @@ find -L . \ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; CFLAGS="$SLKCFLAGS" \ -CXXFLAGS="$SLKCFLAGS" \ +CXXFLAGS="$SLKCFLAGS -std=c++11" \ ./configure \ --prefix=/usr \ --libdir=/usr/lib${LIBDIRSUFFIX} \ diff --git a/graphics/kphotoalbum/kphotoalbum.SlackBuild b/graphics/kphotoalbum/kphotoalbum.SlackBuild index 5a02c47001..fb3bf76da7 100644 --- a/graphics/kphotoalbum/kphotoalbum.SlackBuild +++ b/graphics/kphotoalbum/kphotoalbum.SlackBuild @@ -4,7 +4,7 @@ # By default the demo pictures and movie are packaged. PRGNAM=kphotoalbum -VERSION=${VERSION:-4.6.1} +VERSION=${VERSION:-4.6.2} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -62,7 +62,7 @@ mkdir build && cd build -DLIB_INSTALL_DIR:PATH=/usr/lib${LIBDIRSUFFIX} \ -DCMAKE_INSTALL_PREFIX=/usr \ .. - make + make -j1 make install DESTDIR=$PKG cd - diff --git a/graphics/kphotoalbum/kphotoalbum.info b/graphics/kphotoalbum/kphotoalbum.info index 5e49442685..af65268853 100644 --- a/graphics/kphotoalbum/kphotoalbum.info +++ b/graphics/kphotoalbum/kphotoalbum.info @@ -1,8 +1,8 @@ PRGNAM="kphotoalbum" -VERSION="4.6.1" +VERSION="4.6.2" HOMEPAGE="http://kphotoalbum.org" -DOWNLOAD="http://download.kde.org/stable/kphotoalbum/4.6.1/src/kphotoalbum-4.6.1.tar.xz" -MD5SUM="a19c90ffd0c9bb388aa056855d95a377" +DOWNLOAD="http://download.kde.org/stable/kphotoalbum/4.6.2/src/kphotoalbum-4.6.2.tar.xz" +MD5SUM="74ed3454971cb27eb5999973c72b090a" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" diff --git a/graphics/luminance-hdr/luminance-hdr.SlackBuild b/graphics/luminance-hdr/luminance-hdr.SlackBuild index 1bddfc0589..22578cb403 100644 --- a/graphics/luminance-hdr/luminance-hdr.SlackBuild +++ b/graphics/luminance-hdr/luminance-hdr.SlackBuild @@ -71,6 +71,10 @@ find -L . \ # Fix recent qt5 breakage (thanks be unto Debian) patch -p1 < $CWD/qt5_printsupport.diff +# Workround build failure with gcc-g++-4.9.3 (mangling bug?) +# (fails to link libmvec: "undefined reference to `_ZGVbN4vv_powf'" etc) +export CXX=clang++ + mkdir -p build cd build cmake \ diff --git a/graphics/meh/meh-giflib.patch b/graphics/meh/meh-giflib.patch new file mode 100644 index 0000000000..b58dfd167d --- /dev/null +++ b/graphics/meh/meh-giflib.patch @@ -0,0 +1,81 @@ +diff -u -r meh-0.3/src/gif.c meh-0.3-git/src/gif.c +--- meh-0.3/src/gif.c 2010-01-04 17:45:01.000000000 +0000 ++++ meh-0.3-git/src/gif.c 2015-08-27 16:11:39.082286073 +0100 +@@ -32,7 +32,11 @@ + /* HACK HACK HACK */ + rewind(f); + lseek(fileno(f), 0L, SEEK_SET); ++#if defined(GIFLIB_MAJOR) && GIFLIB_MAJOR >= 5 ++ if(!(gif = DGifOpenFileHandle(fileno(f), NULL))){ ++#else + if(!(gif = DGifOpenFileHandle(fileno(f)))){ ++#endif + /* HACK AND HOPE */ + rewind(f); + lseek(fileno(f), 0L, SEEK_SET); +@@ -55,11 +59,10 @@ + struct gif_t *g = (struct gif_t *)img; + GifColorType *colormap; + SavedImage *s; ++ int ret; + +- if(DGifSlurp(g->gif) == GIF_ERROR){ +- PrintGifError(); +- return 1; +- } ++ if((ret = DGifSlurp(g->gif)) != GIF_OK) ++ goto error; + + s = &g->gif->SavedImages[0]; + +@@ -67,10 +70,8 @@ + colormap = s->ImageDesc.ColorMap->Colors; + else if(g->gif->SColorMap) + colormap = g->gif->SColorMap->Colors; +- else{ +- PrintGifError(); +- return 1; +- } ++ else ++ goto error; + + for(i = 0; i < img->bufwidth * img->bufheight; i++){ + unsigned char idx = s->RasterBits[i]; +@@ -82,11 +83,37 @@ + img->state |= LOADED | SLOWLOADED; + + return 0; ++error: ++#if defined(GIFLIB_MAJOR) && GIFLIB_MAJOR >= 5 ++ fprintf(stderr, "GIFLIB: %s\n", GifErrorString(ret)); ++#elif defined(GIFLIB_MAJOR) && defined(GIFLIB_MINOR) && ((GIFLIB_MAJOR == 4 && GIFLIB_MINOR >= 2) || GIFLIB_MAJOR > 4) ++ fprintf(stderr, "GIFLIB: %s\n", GifErrorString()); ++#else ++ PrintGifError(); ++#endif ++ return 1; + } + + void gif_close(struct image *img){ + struct gif_t *g = (struct gif_t *)img; ++#if defined(GIFLIB_MAJOR) && defined(GIFLIB_MINOR) && (GIFLIB_MAJOR == 5 && GIFLIB_MINOR >= 1) ++ int ret; ++#endif ++ ++#if defined(GIFLIB_MAJOR) && defined(GIFLIB_MINOR) && (GIFLIB_MAJOR == 5 && GIFLIB_MINOR >= 1) ++ DGifCloseFile(g->gif,&ret); ++ if(ret != GIF_OK) { ++#if defined(GIFLIB_MAJOR) && GIFLIB_MAJOR >= 5 ++ fprintf(stderr, "GIFLIB: %s\n", GifErrorString(ret)); ++#elif defined(GIFLIB_MAJOR) && defined(GIFLIB_MINOR) && ((GIFLIB_MAJOR == 4 && GIFLIB_MINOR >= 2) || GIFLIB_MAJOR > 4) ++ fprintf(stderr, "GIFLIB: %s\n", GifErrorString()); ++#else ++ PrintGifError(); ++#endif ++ } ++#else + DGifCloseFile(g->gif); ++#endif + fclose(g->f); + } + diff --git a/graphics/meh/meh.SlackBuild b/graphics/meh/meh.SlackBuild index c42feebc38..b6da713299 100644 --- a/graphics/meh/meh.SlackBuild +++ b/graphics/meh/meh.SlackBuild @@ -67,6 +67,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 {} \; +# Fixes for giflib-5.1 from https://github.com/jhawthorn/meh +patch -p1 < $CWD/meh-giflib.patch + CFLAGS="$SLKCFLAGS" make install -D -m 755 meh $PKG/usr/bin/meh diff --git a/graphics/metapixel/metapixel-rwimg.patch b/graphics/metapixel/metapixel-rwimg.patch new file mode 100644 index 0000000000..40e82238c7 --- /dev/null +++ b/graphics/metapixel/metapixel-rwimg.patch @@ -0,0 +1,258 @@ +diff -u -r metapixel-1.0.2/rwimg/rwgif.c metapixel-1.0.2-rwimg/rwimg/rwgif.c +--- metapixel-1.0.2/rwimg/rwgif.c 2006-12-10 17:59:54.000000000 +0000 ++++ metapixel-1.0.2-rwimg/rwimg/rwgif.c 2015-08-27 16:46:56.402621517 +0100 +@@ -54,7 +54,7 @@ + + assert(data != 0); + +- data->file = DGifOpenFileName(filename); ++ data->file = DGifOpenFileName(filename, NULL); + + assert(data->file !=0); + +@@ -137,7 +137,7 @@ + } + free(buffer); + +- assert(DGifCloseFile(data->file) == GIF_OK); ++ assert(DGifCloseFile(data->file, NULL) == GIF_OK); + + return data; + } +diff -u -r metapixel-1.0.2/rwimg/rwpng.c metapixel-1.0.2-rwimg/rwimg/rwpng.c +--- metapixel-1.0.2/rwimg/rwpng.c 2006-12-10 17:59:54.000000000 +0000 ++++ metapixel-1.0.2-rwimg/rwimg/rwpng.c 2015-08-27 16:44:12.337891932 +0100 +@@ -35,6 +35,7 @@ + png_structp png_ptr; + png_infop info_ptr, end_info; + int row_stride; ++ int pixel_stride; + int have_read; + } png_data_t; + +@@ -42,10 +43,11 @@ + open_png_file_reading (const char *filename, int *width, int *height) + { + png_data_t *data = (png_data_t*)malloc(sizeof(png_data_t)); ++ int bit_depth, color_type; + + assert(data != 0); + +- data->file = fopen(filename, "r"); ++ data->file = fopen(filename, "rb"); + assert(data->file != 0); + + data->png_ptr = png_create_read_struct(PNG_LIBPNG_VER_STRING, 0, 0, 0); +@@ -57,19 +59,41 @@ + data->end_info = png_create_info_struct(data->png_ptr); + assert(data->end_info != 0); + +- if (setjmp(data->png_ptr->jmpbuf)) ++ if (setjmp (png_jmpbuf (data->png_ptr))) + assert(0); + + png_init_io(data->png_ptr, data->file); + + png_read_info(data->png_ptr, data->info_ptr); + +- *width = data->info_ptr->width; +- *height = data->info_ptr->height; ++ *width = png_get_image_width (data->png_ptr, data->info_ptr); ++ *height = png_get_image_height (data->png_ptr, data->info_ptr); + +- assert(data->info_ptr->bit_depth == 8 || data->info_ptr->bit_depth == 16); +- assert(data->info_ptr->color_type == PNG_COLOR_TYPE_RGB || data->info_ptr->color_type == PNG_COLOR_TYPE_RGB_ALPHA); +- assert(data->info_ptr->interlace_type == PNG_INTERLACE_NONE); ++ bit_depth = png_get_bit_depth (data->png_ptr, data->info_ptr); ++ if (bit_depth != 8 && bit_depth != 16) ++ { ++ fprintf(stderr, "PNG files are only supported with bit depths 8 and 16.\n"); ++ /* FIXME: free stuff */ ++ return 0; ++ } ++ ++ color_type = png_get_color_type (data->png_ptr, data->info_ptr); ++ if (color_type != PNG_COLOR_TYPE_RGB ++ && color_type != PNG_COLOR_TYPE_RGB_ALPHA ++ && color_type != PNG_COLOR_TYPE_GRAY ++ && color_type != PNG_COLOR_TYPE_GRAY_ALPHA) ++ { ++ fprintf(stderr, "PNG files are only supported in RGB and Gray, with or without alpha.\n"); ++ /* FIXME: free stuff */ ++ return 0; ++ } ++ ++ if (png_get_interlace_type (data->png_ptr, data->info_ptr) != PNG_INTERLACE_NONE) ++ { ++ fprintf(stderr, "Interlaced PNG files are not supported.\n"); ++ /* FIXME: free stuff */ ++ return 0; ++ } + + data->have_read = 0; + +@@ -83,30 +107,44 @@ + int i; + int bps, spp; + unsigned char *row; ++ int color_type, width; + +- if (setjmp(data->png_ptr->jmpbuf)) ++ if (setjmp (png_jmpbuf (data->png_ptr))) + assert(0); + +- if (data->info_ptr->color_type == PNG_COLOR_TYPE_RGB) ++ color_type = png_get_color_type (data->png_ptr, data->info_ptr); ++ if (color_type == PNG_COLOR_TYPE_GRAY) ++ spp = 1; ++ else if (color_type == PNG_COLOR_TYPE_GRAY_ALPHA) ++ spp = 2; ++ else if (color_type == PNG_COLOR_TYPE_RGB) + spp = 3; + else + spp = 4; + +- if (data->info_ptr->bit_depth == 16) ++ if (png_get_bit_depth (data->png_ptr, data->info_ptr) == 16) + bps = 2; + else + bps = 1; + +- row = (unsigned char*)malloc(data->info_ptr->width * spp * bps); ++ width = png_get_image_width (data->png_ptr, data->info_ptr); ++ row = (unsigned char*)malloc (width * spp * bps); + + for (i = 0; i < num_lines; ++i) + { + int j, channel; + + png_read_row(data->png_ptr, (png_bytep)row, 0); +- for (j = 0; j < data->info_ptr->width; ++j) +- for (channel = 0; channel < 3; ++channel) +- lines[i * data->info_ptr->width * 3 + j * 3 + channel] = row[j * spp * bps + channel * bps]; ++ ++ if (spp <= 2) ++ for (j = 0; j < width; ++j) ++ for (channel = 0; channel < 3; ++channel) ++ lines[i * width * 3 + j * 3 + channel] = row[j * spp * bps]; ++ else ++ for (j = 0; j < width; ++j) ++ for (channel = 0; channel < 3; ++channel) ++ lines[i * width * 3 + j * 3 + channel] ++ = row[j * spp * bps + channel * bps]; + } + + free(row); +@@ -119,7 +157,7 @@ + { + png_data_t *data = (png_data_t*)_data; + +- if (setjmp(data->png_ptr->jmpbuf)) ++ if (setjmp (png_jmpbuf (data->png_ptr))) + assert(0); + + if (data->have_read) +@@ -137,9 +175,9 @@ + + assert(data != 0); + +- assert(pixel_stride == 3 || pixel_stride == 4); ++ assert(pixel_stride >= 3); + +- data->file = fopen(filename, "w"); ++ data->file = fopen(filename, "wb"); + assert(data->file != 0); + + data->png_ptr = png_create_write_struct(PNG_LIBPNG_VER_STRING, 0, 0, 0); +@@ -148,7 +186,7 @@ + data->info_ptr = png_create_info_struct(data->png_ptr); + assert(data->info_ptr != 0); + +- if (setjmp(data->png_ptr->jmpbuf)) ++ if (setjmp (png_jmpbuf (data->png_ptr))) + assert(0); + + if (pixel_stride == 4) +@@ -156,21 +194,13 @@ + + png_init_io(data->png_ptr, data->file); + +- data->info_ptr->width = width; +- data->info_ptr->height = height; +- data->info_ptr->valid = 0; +- data->info_ptr->rowbytes = width * 3; +- data->info_ptr->palette = 0; +- data->info_ptr->num_palette = 0; +- data->info_ptr->num_trans = 0; +- data->info_ptr->bit_depth = 8; +- data->info_ptr->color_type = PNG_COLOR_TYPE_RGB; +- data->info_ptr->compression_type = PNG_COMPRESSION_TYPE_DEFAULT; +- data->info_ptr->filter_type = PNG_FILTER_TYPE_DEFAULT; +- data->info_ptr->interlace_type = PNG_INTERLACE_NONE; ++ png_set_IHDR (data->png_ptr, data->info_ptr, ++ width, height, 8, PNG_COLOR_TYPE_RGB, ++ PNG_INTERLACE_NONE, PNG_COMPRESSION_TYPE_DEFAULT, PNG_FILTER_TYPE_DEFAULT); + + png_write_info(data->png_ptr, data->info_ptr); + ++ data->pixel_stride = pixel_stride; + data->row_stride = row_stride; + + return data; +@@ -180,13 +210,45 @@ + png_write_lines (void *_data, unsigned char *lines, int num_lines) + { + png_data_t *data = (png_data_t*)_data; ++ unsigned char *packed_line; + int i; ++ int width; + +- if (setjmp(data->png_ptr->jmpbuf)) ++ if (setjmp (png_jmpbuf (data->png_ptr))) + assert(0); + ++ width = png_get_image_width (data->png_ptr, data->info_ptr); ++ if (data->pixel_stride != 3) ++ { ++ packed_line = (unsigned char*)malloc(width * 3); ++ assert(packed_line != 0); ++ } ++ else ++ packed_line = 0; ++ + for (i = 0; i < num_lines; ++i) +- png_write_row(data->png_ptr, (png_bytep)(lines + i * data->row_stride)); ++ { ++ unsigned char *p = lines + i * data->row_stride; ++ ++ if (packed_line != 0) ++ { ++ int j; ++ ++ for (j = 0; j < width; ++j) ++ { ++ packed_line[j * 3 + 0] = p[j * data->pixel_stride + 0]; ++ packed_line[j * 3 + 1] = p[j * data->pixel_stride + 1]; ++ packed_line[j * 3 + 2] = p[j * data->pixel_stride + 2]; ++ } ++ ++ p = packed_line; ++ } ++ ++ png_write_row(data->png_ptr, (png_bytep)p); ++ } ++ ++ if (packed_line != 0) ++ free(packed_line); + } + + void +@@ -194,7 +256,7 @@ + { + png_data_t *data = (png_data_t*)_data; + +- if (setjmp(data->png_ptr->jmpbuf)) ++ if (setjmp (png_jmpbuf (data->png_ptr))) + assert(0); + + png_write_end(data->png_ptr, data->info_ptr); diff --git a/graphics/metapixel/metapixel.SlackBuild b/graphics/metapixel/metapixel.SlackBuild index 07a2db5c53..f680bf172e 100644 --- a/graphics/metapixel/metapixel.SlackBuild +++ b/graphics/metapixel/metapixel.SlackBuild @@ -51,6 +51,10 @@ find -L . \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ -exec chmod 644 {} \; +# Fix for libpng-1.5 and giflib-5.1 from rwimg git submodule +# https://github.com/schani/rwimg +patch -p1 < $CWD/metapixel-rwimg.patch + mkdir -p $PKG/usr/man/man1 make MANDIR=$PKG/man LDOPTS="-L/usr/X11R6/lib${LIBDIRSUFFIX}" diff --git a/graphics/mtpaint/mtpaint.SlackBuild b/graphics/mtpaint/mtpaint.SlackBuild index 4ac7fe9781..7ccd534395 100644 --- a/graphics/mtpaint/mtpaint.SlackBuild +++ b/graphics/mtpaint/mtpaint.SlackBuild @@ -63,7 +63,15 @@ find -L . \ -o -perm 400 \) -exec chmod 644 {} \; # bring deprecated function call into conformance with libpng14 -sed -i~ 's/png_set_gray_1_2_4_to_8/png_set_expand_gray_1_2_4_to_8/' src/png.c +sed -i 's/png_set_gray_1_2_4_to_8/png_set_expand_gray_1_2_4_to_8/' src/png.c + +# Fix build with giflib-5.1 (thanks to Arch) +sed -i 's:EGifOpenFileName(file_name, FALSE):EGifOpenFileName(file_name, FALSE, NULL):' src/png.c +sed -i 's:DGifOpenFileName(file_name):DGifOpenFileName(file_name, NULL):g' src/png.c +sed -i 's:EGifCloseFile(giffy):EGifCloseFile(giffy, NULL):g' src/png.c +sed -i 's:DGifCloseFile(giffy):DGifCloseFile(giffy, NULL):g' src/png.c +sed -i 's:MakeMapObject(:GifMakeMapObject(:g' src/png.c +sed -i 's:FreeMapObject(:GifFreeMapObject(:g' src/png.c CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ diff --git a/graphics/photivo/photivo.SlackBuild b/graphics/photivo/photivo.SlackBuild index c6cfb4874a..8a29947068 100644 --- a/graphics/photivo/photivo.SlackBuild +++ b/graphics/photivo/photivo.SlackBuild @@ -71,6 +71,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 with g++-4.9.3 +sed -i -e 's/-lgomp/-lgomp -lmvec/' photivoProject/photivoProject.pro + export CPLUS_INCLUDE_PATH=$CPLUS_INCLUDE_PATH:/usr/include/lensfun qmake CONFIG+=WithGimp photivo.pro PREFIX=/usr make diff --git a/graphics/plotutils/plotutils-2.6-libpng-1.5.patch b/graphics/plotutils/plotutils-2.6-libpng-1.5.patch new file mode 100644 index 0000000000..8a10d19e56 --- /dev/null +++ b/graphics/plotutils/plotutils-2.6-libpng-1.5.patch @@ -0,0 +1,31 @@ +fix building with libpng-1.5 + +--- libplot/z_write.c ++++ libplot/z_write.c +@@ -164,7 +164,7 @@ + } + + /* cleanup after libpng errors (error handler does a longjmp) */ +- if (setjmp (png_ptr->jmpbuf)) ++ if (setjmp (png_jmpbuf (png_ptr))) + { + png_destroy_write_struct (&png_ptr, (png_info **)NULL); + return -1; +@@ -444,7 +444,7 @@ + #endif + } + +- longjmp (png_ptr->jmpbuf, 1); ++ png_longjmp (png_ptr, 1); + } + + static void +@@ -515,7 +515,7 @@ + #endif + } + +- longjmp (png_ptr->jmpbuf, 1); ++ png_longjmp (png_ptr, 1); + } + + static void diff --git a/graphics/plotutils/plotutils.SlackBuild b/graphics/plotutils/plotutils.SlackBuild index d935b9d413..9f769eaaa7 100644 --- a/graphics/plotutils/plotutils.SlackBuild +++ b/graphics/plotutils/plotutils.SlackBuild @@ -51,6 +51,9 @@ find -L . \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ -exec chmod 644 {} \; +# Fix build with libpng16 (-current) (patch from Arch Linux) +patch -p0 < $CWD/plotutils-2.6-libpng-1.5.patch + CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ ./configure \ diff --git a/graphics/plotutils/plotutils.info b/graphics/plotutils/plotutils.info index ead3396b61..51d93cbb9c 100644 --- a/graphics/plotutils/plotutils.info +++ b/graphics/plotutils/plotutils.info @@ -1,7 +1,7 @@ PRGNAM="plotutils" VERSION="2.6" HOMEPAGE="http://www.gnu.org/software/plotutils" -DOWNLOAD="ftp://mirrors.kernel.org/gnu/plotutils/plotutils-2.6.tar.gz" +DOWNLOAD="http://mirrors.kernel.org/gnu/plotutils/plotutils-2.6.tar.gz" MD5SUM="c08a424bd2438c80a786a7f4b5bb6a40" DOWNLOAD_x86_64="" MD5SUM_x86_64="" diff --git a/graphics/rawstudio/rawstudio.SlackBuild b/graphics/rawstudio/rawstudio.SlackBuild index 3c16761bc7..30ec653dcb 100644 --- a/graphics/rawstudio/rawstudio.SlackBuild +++ b/graphics/rawstudio/rawstudio.SlackBuild @@ -86,7 +86,7 @@ patch -p1 < $CWD/patches/lensfun03.patch # Patch to use libpng > 1.5. This patch is only useful on -current and will need to # be applied once -current releases. Uncomment if you are building on -current -#patch -p1 < $CWD/patches/libpng15.patch +patch -p1 < $CWD/patches/libpng15.patch CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ diff --git a/graphics/sxiv/sxiv.SlackBuild b/graphics/sxiv/sxiv.SlackBuild index 8519d06379..9638ccbcb2 100644 --- a/graphics/sxiv/sxiv.SlackBuild +++ b/graphics/sxiv/sxiv.SlackBuild @@ -23,7 +23,7 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=sxiv -VERSION=${VERSION:-1.1.1} +VERSION=${VERSION:-1.3.1} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} diff --git a/graphics/sxiv/sxiv.info b/graphics/sxiv/sxiv.info index 988843b185..705af4ce18 100644 --- a/graphics/sxiv/sxiv.info +++ b/graphics/sxiv/sxiv.info @@ -1,8 +1,8 @@ PRGNAM="sxiv" -VERSION="1.1.1" +VERSION="1.3.1" HOMEPAGE="https://github.com/muennich/sxiv" -DOWNLOAD="https://github.com/muennich/sxiv/archive/v1.1.1.tar.gz" -MD5SUM="786f647326bdb24b672519924928dfca" +DOWNLOAD="https://github.com/muennich/sxiv/archive/v1.3.1.tar.gz" +MD5SUM="3255d0d47e0a4cddd752ec03ee4bddaf" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="imlib2" diff --git a/graphics/tuxpaint/doinst.sh b/graphics/tuxpaint/doinst.sh index be2037092f..a7a3a606e1 100644 --- a/graphics/tuxpaint/doinst.sh +++ b/graphics/tuxpaint/doinst.sh @@ -17,10 +17,6 @@ if [ -x /usr/bin/update-desktop-database ]; then /usr/bin/update-desktop-database -q usr/share/applications >/dev/null 2>&1 fi -if [ -x /usr/bin/update-mime-database ]; then - /usr/bin/update-mime-database usr/share/mime >/dev/null 2>&1 -fi - if [ -e usr/share/icons/hicolor/icon-theme.cache ]; then if [ -x /usr/bin/gtk-update-icon-cache ]; then /usr/bin/gtk-update-icon-cache usr/share/icons/hicolor >/dev/null 2>&1 diff --git a/graphics/tuxpaint/patch.diff b/graphics/tuxpaint/patch.diff index 6501c5a7ca..829b669363 100644 --- a/graphics/tuxpaint/patch.diff +++ b/graphics/tuxpaint/patch.diff @@ -1,11 +1,11 @@ -diff -ur tuxpaint-0.9.21.org/Makefile tuxpaint-0.9.21/Makefile ---- tuxpaint-0.9.21.org/Makefile 2009-04-29 02:18:57.000000000 -0300 -+++ tuxpaint-0.9.21/Makefile 2009-10-31 20:56:18.000000000 -0300 -@@ -120,14 +120,14 @@ +diff -u -r tuxpaint-0.9.22/Makefile tuxpaint-0.9.22-patched/Makefile +--- tuxpaint-0.9.22/Makefile 2014-08-19 08:28:33.000000000 +0100 ++++ tuxpaint-0.9.22-patched/Makefile 2015-08-04 14:35:11.258065084 +0100 +@@ -138,14 +138,14 @@ # Magic Tool plug-ins INCLUDE_PREFIX:=$(DESTDIR)$(PREFIX)/include --MAGIC_PREFIX:=$(DESTDIR)$(PREFIX)/lib/tuxpaint/plugins +-MAGIC_PREFIX:=$(DESTDIR)$(LIBDIR)/lib/tuxpaint/plugins +MAGIC_PREFIX:=$(DESTDIR)$(PREFIX)/lib$(LIBDIRSUFFIX)/tuxpaint/plugins @@ -19,9 +19,9 @@ diff -ur tuxpaint-0.9.21.org/Makefile tuxpaint-0.9.21/Makefile +MAN_PREFIX:=$(DESTDIR)$(PREFIX)/man +DEVMAN_PREFIX:=$(DESTDIR)$(PREFIX)/man - - # 'System-wide' Config file: -@@ -139,10 +139,10 @@ + # BASH tab-completion file: + COMPLETIONDIR:=$(DESTDIR)/etc/bash_completion.d +@@ -163,10 +163,10 @@ # Icons and launchers: ICON_PREFIX:=$(DESTDIR)$(PREFIX)/share/pixmaps @@ -35,16 +35,16 @@ diff -ur tuxpaint-0.9.21.org/Makefile tuxpaint-0.9.21/Makefile # Maemo flag MAEMOFLAG:= -@@ -393,7 +393,7 @@ +@@ -435,7 +435,7 @@ windows_ARCH_INSTALL:= osx_ARCH_INSTALL:= - beos_ARCH_INSTALL:= + beos_ARCH_INSTALL:=install-haiku -linux_ARCH_INSTALL:=install-gnome install-kde install-kde-icons +linux_ARCH_INSTALL:=install-kde install-kde-icons ARCH_INSTALL:=$($(OS)_ARCH_INSTALL) # "make install" installs all of the various parts -@@ -449,7 +449,8 @@ +@@ -494,7 +494,8 @@ @cp src/tp_magic_api.h $(INCLUDE_PREFIX)/tuxpaint @chmod a+r,g-w,o-w $(INCLUDE_PREFIX)/tuxpaint/tp_magic_api.h @install -d $(DEVDOC_PREFIX) @@ -54,7 +54,7 @@ diff -ur tuxpaint-0.9.21.org/Makefile tuxpaint-0.9.21/Makefile @chmod a=rX,g=rX,u=rwX $(DEVDOC_PREFIX) # Installs the various parts for the MinGW/MSYS development/testing environment. -@@ -521,7 +522,7 @@ +@@ -573,7 +574,7 @@ rm /usr/share/pixmaps/tuxpaint.png; \ fi -if [ "x$(KDE_PREFIX)" != "x" ]; then \ @@ -63,7 +63,7 @@ diff -ur tuxpaint-0.9.21.org/Makefile tuxpaint-0.9.21/Makefile fi -rm $(ICON_PREFIX)/tuxpaint.png -rm $(X11_ICON_PREFIX)/tuxpaint.xpm -@@ -628,9 +629,9 @@ +@@ -761,9 +762,9 @@ @echo @echo "...Installing launcher icon into KDE..." @if [ "x$(KDE_PREFIX)" != "x" ]; then \ @@ -76,7 +76,7 @@ diff -ur tuxpaint-0.9.21.org/Makefile tuxpaint-0.9.21/Makefile fi .PHONY: install-kde-icons -@@ -791,8 +792,7 @@ +@@ -944,8 +945,7 @@ @echo @echo "...Installing documentation..." @install -d $(DOC_PREFIX) @@ -86,7 +86,7 @@ diff -ur tuxpaint-0.9.21.org/Makefile tuxpaint-0.9.21/Makefile @chmod -R a=rX,g=rX,u=rwX $(DOC_PREFIX) -@@ -806,21 +806,21 @@ +@@ -959,21 +959,21 @@ @# tuxpaint.1 @cp src/manpage/tuxpaint.1 $(MAN_PREFIX)/man1 @gzip -f $(MAN_PREFIX)/man1/tuxpaint.1 diff --git a/graphics/tuxpaint/tuxpaint.SlackBuild b/graphics/tuxpaint/tuxpaint.SlackBuild index d24376e283..b85f267b73 100644 --- a/graphics/tuxpaint/tuxpaint.SlackBuild +++ b/graphics/tuxpaint/tuxpaint.SlackBuild @@ -6,8 +6,8 @@ # Modified by Willy Sudiarto Raharjo <willysr@slackware-id.org> PRGNAM=tuxpaint -VERSION=${VERSION:-0.9.21} -BUILD=${BUILD:-2} +VERSION=${VERSION:-0.9.22} +BUILD=${BUILD:-1} TAG=${TAG:-_SBo} if [ -z "$ARCH" ]; then @@ -47,25 +47,19 @@ 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 {} \; -# Create a more util Makefile +# Create a more useful Makefile patch -p1 < $CWD/patch.diff -# Explicitly link libpng -sed -i 's/$(ARCH_LINKS)/$(ARCH_LINKS) -lpng/' Makefile - make PREFIX=/usr LIBDIRSUFFIX=$LIBDIRSUFFIX OPTFLAGS="$SLKCFLAGS" make PREFIX=/usr LIBDIRSUFFIX=$LIBDIRSUFFIX DESTDIR=$PKG install mv $PKG/etc/tuxpaint/tuxpaint.conf $PKG/etc/tuxpaint/tuxpaint.conf.new -# Puzzle plugin is broken -rm -f $PKG/usr/lib64/tuxpaint/plugins/puzzle.so - -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 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild diff --git a/graphics/tuxpaint/tuxpaint.info b/graphics/tuxpaint/tuxpaint.info index 5050cdd05a..aeb4e1594d 100644 --- a/graphics/tuxpaint/tuxpaint.info +++ b/graphics/tuxpaint/tuxpaint.info @@ -1,10 +1,10 @@ PRGNAM="tuxpaint" -VERSION="0.9.21" +VERSION="0.9.22" HOMEPAGE="http://www.tuxpaint.org" -DOWNLOAD="http://downloads.sourceforge.net/tuxpaint/tuxpaint-0.9.21.tar.gz" -MD5SUM="a88401d1860648098eeed819cff038fa" +DOWNLOAD="http://downloads.sourceforge.net/tuxpaint/tuxpaint-0.9.22.tar.gz" +MD5SUM="bb9d7e4460ed8084be23b5dfcbf49ef3" DOWNLOAD_x86_64="" MD5SUM_x86_64="" -REQUIRES="libpaper" +REQUIRES="libpaper SDL_Pango" MAINTAINER="Pablo Santamaria" EMAIL="pablosantamaria@gmail.com" diff --git a/graphics/zgv/zgv.SlackBuild b/graphics/zgv/zgv.SlackBuild index 9768f3b701..95007b5876 100644 --- a/graphics/zgv/zgv.SlackBuild +++ b/graphics/zgv/zgv.SlackBuild @@ -77,6 +77,9 @@ for i in $CWD/patches/*; do patch -p0 < $i done +# Patch for libpng16 (-current) thanks to Debian +patch -p1 < $CWD/zgv_5.9-2.patch + make SLKCFLAGS="$SLKCFLAGS" make install DESTDIR=$PKG diff --git a/graphics/zgv/zgv_5.9-2.patch b/graphics/zgv/zgv_5.9-2.patch new file mode 100644 index 0000000000..90a3f840f1 --- /dev/null +++ b/graphics/zgv/zgv_5.9-2.patch @@ -0,0 +1,28 @@ +--- zgv-5.9.orig/src/readpng.c ++++ zgv-5.9/src/readpng.c +@@ -55,7 +55,6 @@ + fclose(global_png_infile); + } + +- + void my_png_error(png_structp png_ptr,const char *message) + { + strncpy(jpeg_png_errmsg,message,JPEG_PNG_ERRMSG_SIZE-1); +@@ -63,7 +62,7 @@ + use_errmsg=1; + + /* cleanup is done after jump back, so just do that now... */ +-longjmp(png_ptr->jmpbuf,1); ++longjmp(png_jmpbuf((png_ptr)),1); + } + + +@@ -132,7 +131,7 @@ + return(_PICERR_NOMEM); + } + +-if(setjmp(png_ptr->jmpbuf)) ++ if (setjmp(png_jmpbuf((png_ptr)))) + { + /* if we get here, there was an error. */ + /* don't use local variables here, they may have been blasted */ diff --git a/ham/cwstation/cwstation.SlackBuild b/ham/cwstation/cwstation.SlackBuild index 42f4fb5fc6..99ce5b4748 100644 --- a/ham/cwstation/cwstation.SlackBuild +++ b/ham/cwstation/cwstation.SlackBuild @@ -21,7 +21,6 @@ CWD=$(pwd) TMP=${TMP:-/tmp/SBo} PKG=$TMP/package-$PRGNAM OUTPUT=${OUTPUT:-/tmp} -AUTOMAKE=/usr/share/automake-1.11 if [ "$ARCH" = "i486" ]; then SLKCFLAGS="-O2 -march=i486 -mtune=i686" @@ -46,13 +45,6 @@ rm -rf $PRGNAM-$VERSION tar xvf $CWD/$PRGNAM-$VERSION.tar.gz cd $PRGNAM-$VERSION -# Delete links to /usr/share/automake-1.8 -rm COPYING -rm INSTALL -rm depcomp -rm install-sh -rm missing - chown -R root:root . find -L . \ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 -o -perm 511 \) \ @@ -60,7 +52,13 @@ find -L . \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ -exec chmod 644 {} \; -# Create links to /usr/share/automake-1.11 +# Replace links to /usr/share/automake-1.8 +rm COPYING +rm INSTALL +rm depcomp +rm install-sh +rm missing +AUTOMAKE=/usr/share/automake-1.14 ln -s $AUTOMAKE/COPYING COPYING ln -s $AUTOMAKE/INSTALL INSTALL ln -s $AUTOMAKE/depcomp depcomp diff --git a/libraries/DirectFB/DirectFB.SlackBuild b/libraries/DirectFB/DirectFB.SlackBuild index 2d871bdbd3..3c89a09e60 100644 --- a/libraries/DirectFB/DirectFB.SlackBuild +++ b/libraries/DirectFB/DirectFB.SlackBuild @@ -1,6 +1,6 @@ #!/bin/sh -# Slackware build script for DirectFB-1.6.2 +# Slackware build script for DirectFB # Copyright 2012 Erik Falor <ewfalor@gmail.com> USA # All rights reserved. @@ -23,7 +23,7 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=DirectFB -VERSION=${VERSION:-1.6.2} +VERSION=${VERSION:-1.7.7} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -64,10 +64,10 @@ 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 {} \; CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ diff --git a/libraries/DirectFB/DirectFB.info b/libraries/DirectFB/DirectFB.info index e65cb10b0a..7de364b99d 100644 --- a/libraries/DirectFB/DirectFB.info +++ b/libraries/DirectFB/DirectFB.info @@ -1,8 +1,8 @@ PRGNAM="DirectFB" -VERSION="1.6.2" +VERSION="1.7.7" HOMEPAGE="http://www.directfb.org/" -DOWNLOAD="http://attic-distfiles.pld-linux.org/distfiles/by-md5/6/b/6bebdbf26f03f7114ae17ab86d4d1d27/DirectFB-1.6.2.tar.gz" -MD5SUM="6bebdbf26f03f7114ae17ab86d4d1d27" +DOWNLOAD="http://www.directfb.org/downloads/Core/DirectFB-1.7/DirectFB-1.7.7.tar.gz" +MD5SUM="152cf1863b1a3a28aa1370e9053440bf" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" diff --git a/libraries/LibRaw/LibRaw.SlackBuild b/libraries/LibRaw/LibRaw.SlackBuild deleted file mode 100644 index fc14202d7f..0000000000 --- a/libraries/LibRaw/LibRaw.SlackBuild +++ /dev/null @@ -1,133 +0,0 @@ -#!/bin/sh - -# Slackware build script for LibRaw - -# Copyright 2011 David Spencer, Baildon, West Yorkshire, U.K. -# All rights reserved. -# -# Redistribution and use of this script, with or without modification, is -# permitted provided that the following conditions are met: -# -# 1. Redistributions of this script must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# -# THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED -# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO -# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, -# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; -# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, -# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR -# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF -# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -PRGNAM=LibRaw -VERSION=${VERSION:-0.17.0} -BUILD=${BUILD:-1} -TAG=${TAG:-_SBo} - -if [ -z "$ARCH" ]; then - case "$( uname -m )" in - i?86) ARCH=i486 ;; - arm*) ARCH=arm ;; - *) ARCH=$( uname -m ) ;; - esac -fi - -CWD=$(pwd) -TMP=${TMP:-/tmp/SBo} -PKG=$TMP/package-$PRGNAM -OUTPUT=${OUTPUT:-/tmp} - -if [ "$ARCH" = "i486" ]; then - SLKCFLAGS="-O2 -march=i486 -mtune=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "i686" ]; then - SLKCFLAGS="-O2 -march=i686 -mtune=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "x86_64" ]; then - SLKCFLAGS="-O2 -fPIC" - LIBDIRSUFFIX="64" -else - SLKCFLAGS="-O2" - LIBDIRSUFFIX="" -fi - -set -e - -rm -rf $PKG -mkdir -p $TMP $PKG $OUTPUT -cd $TMP - -rm -rf \ - LibRaw-$VERSION \ - LibRaw-demosaic-pack-GPL2-$VERSION \ - LibRaw-demosaic-pack-GPL3-$VERSION - -tar xvf $CWD/LibRaw-$VERSION.tar.gz -tar xvf $CWD/LibRaw-demosaic-pack-GPL2-$VERSION.tar.gz -tar xvf $CWD/LibRaw-demosaic-pack-GPL3-$VERSION.tar.gz - -chown -R root:root \ - LibRaw-$VERSION \ - LibRaw-demosaic-pack-GPL2-$VERSION \ - LibRaw-demosaic-pack-GPL3-$VERSION - -find \ - LibRaw-$VERSION \ - LibRaw-demosaic-pack-GPL2-$VERSION \ - LibRaw-demosaic-pack-GPL3-$VERSION \ - \( -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 {} \; - -cd $PRGNAM-$VERSION - -CFLAGS="$SLKCFLAGS" \ -CXXFLAGS="$SLKCFLAGS" \ -./configure \ - --prefix=/usr \ - --libdir=/usr/lib${LIBDIRSUFFIX} \ - --sysconfdir=/etc \ - --localstatedir=/var \ - --mandir=/usr/man \ - --docdir=/usr/doc/$PRGNAM-$VERSION \ - --disable-static \ - --enable-demosaic-pack-gpl2=$TMP/LibRaw-demosaic-pack-GPL2-$VERSION \ - --enable-demosaic-pack-gpl3=$TMP/LibRaw-demosaic-pack-GPL3-$VERSION \ - --disable-examples \ - --build=$ARCH-slackware-linux - -make -make install DESTDIR=$PKG - -find $PKG | xargs 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 \ - COPYRIGHT Changelog.txt INSTALL \ - LICENSE.CDDL LICENSE.LGPL LICENSE.LibRaw.pdf \ - README README.demosaic-packs doc/* \ - $PKG/usr/doc/$PRGNAM-$VERSION -for docfile in COPYRIGHT Changelog LICENSE.txt README; do - cp -a \ - $TMP/LibRaw-demosaic-pack-GPL2-$VERSION/$docfile \ - $PKG/usr/doc/$PRGNAM-$VERSION/demosaic-pack-GPL2-$docfile -done -for docfile in COPYRIGHT Changelog LICENSE.txt README; do - cp -a \ - $TMP/LibRaw-demosaic-pack-GPL3-$VERSION/$docfile \ - $PKG/usr/doc/$PRGNAM-$VERSION/demosaic-pack-GPL3-$docfile -done -find $PKG/usr/doc -type f -exec chmod 0644 {} \; - -cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild - -mkdir -p $PKG/install -cat $CWD/slack-desc > $PKG/install/slack-desc - -cd $PKG -/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz} diff --git a/libraries/LibRaw/LibRaw.info b/libraries/LibRaw/LibRaw.info deleted file mode 100644 index 8578f8d3d3..0000000000 --- a/libraries/LibRaw/LibRaw.info +++ /dev/null @@ -1,14 +0,0 @@ -PRGNAM="LibRaw" -VERSION="0.17.0" -HOMEPAGE="http://www.libraw.org/" -DOWNLOAD="http://www.libraw.org/data/LibRaw-0.17.0.tar.gz \ - http://www.libraw.org/data/LibRaw-demosaic-pack-GPL2-0.17.0.tar.gz \ - http://www.libraw.org/data/LibRaw-demosaic-pack-GPL3-0.17.0.tar.gz" -MD5SUM="f6d2b9dd22e63ac0f0bd3944489a81c6 \ - 291c83a5274b6ce0270131735f927adc \ - 141e24a0626b60e01dc9769cff14d499" -DOWNLOAD_x86_64="" -MD5SUM_x86_64="" -REQUIRES="" -MAINTAINER="David Spencer" -EMAIL="baildon.research@googlemail.com" diff --git a/libraries/LibRaw/README b/libraries/LibRaw/README deleted file mode 100644 index 449cb37daf..0000000000 --- a/libraries/LibRaw/README +++ /dev/null @@ -1,3 +0,0 @@ -LibRaw is a library for reading RAW files obtained from digital cameras -(CRW/CR2, NEF, RAF, DNG, and others). It is based on the source code of -the dcraw utility. diff --git a/libraries/LibRaw/slack-desc b/libraries/LibRaw/slack-desc deleted file mode 100644 index 28f09f6a5d..0000000000 --- a/libraries/LibRaw/slack-desc +++ /dev/null @@ -1,19 +0,0 @@ -# HOW TO EDIT THIS FILE: -# The "handy ruler" below makes it easier to edit a package description. -# Line up the first '|' above the ':' following the base package name, and -# the '|' on the right side marks the last column you can put a character in. -# You must make exactly 11 lines for the formatting to be correct. It's also -# customary to leave one space after the ':' except on otherwise blank lines. - - |-----handy-ruler------------------------------------------------------| -LibRaw: LibRaw (library for decoding raw digital photos) -LibRaw: -LibRaw: LibRaw is a library for reading RAW files obtained from digital -LibRaw: cameras (CRW/CR2, NEF, RAF, DNG, and others). It is based on the -LibRaw: source code of the dcraw utility. -LibRaw: -LibRaw: Homepage: http://www.libraw.org/ -LibRaw: -LibRaw: -LibRaw: -LibRaw: diff --git a/libraries/OpenSceneGraph/OpenSceneGraph.SlackBuild b/libraries/OpenSceneGraph/OpenSceneGraph.SlackBuild index 4720604deb..bd24ea73e2 100644 --- a/libraries/OpenSceneGraph/OpenSceneGraph.SlackBuild +++ b/libraries/OpenSceneGraph/OpenSceneGraph.SlackBuild @@ -54,7 +54,10 @@ find -L . \ sed -i 's|#include <curl/types.h>||' src/osgPlugins/curl/ReaderWriterCURL.cpp -# Our ffmpeg is incompatible ATM +# Fix building with giflib-5.1.1 -- thanks to Arch Linux +# https://projects.archlinux.org/svntogit/community.git/plain/trunk/giflib.patch?h=packages/openscenegraph +patch -p1 < $CWD/giflib.patch + cmake \ -DCMAKE_C_FLAGS="$SLKCFLAGS" \ -DCMAKE_CXX_FLAGS="$SLKCFLAGS -D__STDC_CONSTANT_MACROS" \ diff --git a/libraries/OpenSceneGraph/giflib.patch b/libraries/OpenSceneGraph/giflib.patch new file mode 100644 index 0000000000..8bb72a8d3b --- /dev/null +++ b/libraries/OpenSceneGraph/giflib.patch @@ -0,0 +1,12 @@ +diff -wbBur OpenSceneGraph-3.2.0/src/osgPlugins/gif/ReaderWriterGIF.cpp OpenSceneGraph-3.2.0.q/src/osgPlugins/gif/ReaderWriterGIF.cpp +--- OpenSceneGraph-3.2.0/src/osgPlugins/gif/ReaderWriterGIF.cpp 2013-06-03 18:04:02.000000000 +0400 ++++ OpenSceneGraph-3.2.0.q/src/osgPlugins/gif/ReaderWriterGIF.cpp 2014-05-29 19:00:40.163985068 +0400 +@@ -561,7 +561,7 @@ + *width_ret = giffile->SWidth; + *height_ret = giffile->SHeight; + *numComponents_ret = 4; +- DGifCloseFile(giffile); ++ DGifCloseFile(giffile, NULL); + return buffer; + } + diff --git a/libraries/QtGStreamer/QtGStreamer.info b/libraries/QtGStreamer/QtGStreamer.info deleted file mode 100644 index 79ad67aa0d..0000000000 --- a/libraries/QtGStreamer/QtGStreamer.info +++ /dev/null @@ -1,10 +0,0 @@ -PRGNAM="QtGStreamer" -VERSION="0.10.3" -HOMEPAGE="http://gstreamer.freedesktop.org" -DOWNLOAD="http://gstreamer.freedesktop.org/src/qt-gstreamer/qt-gstreamer-0.10.3.tar.gz" -MD5SUM="a5f73dfa50270a23a0b07af32304e162" -DOWNLOAD_x86_64="" -MD5SUM_x86_64="" -REQUIRES="" -MAINTAINER="Willy Sudiarto Raharjo" -EMAIL="willysr@slackbuilds.org" diff --git a/libraries/QtGStreamer/README b/libraries/QtGStreamer/README deleted file mode 100644 index 71344bab63..0000000000 --- a/libraries/QtGStreamer/README +++ /dev/null @@ -1,3 +0,0 @@ -QtGStreamer provides C++ bindings for GStreamer with a Qt-style API, -plus some helper classes for integrating GStreamer better in -Qt applications. diff --git a/libraries/SDL_Pango/SDL_Pango.SlackBuild b/libraries/SDL_Pango/SDL_Pango.SlackBuild index 093e35fd71..6f320d400b 100644 --- a/libraries/SDL_Pango/SDL_Pango.SlackBuild +++ b/libraries/SDL_Pango/SDL_Pango.SlackBuild @@ -24,7 +24,7 @@ PRGNAM=SDL_Pango VERSION=0.1.2 -BUILD=${BUILD:-2} +BUILD=${BUILD:-3} TAG=${TAG:-_SBo} if [ -z "$ARCH" ]; then @@ -71,8 +71,9 @@ patch -p1 < $CWD/SDL_Pango-0.1.2-suppress-warning.patch || exit 1 patch -p0 < $CWD/SDL_Pango-0.1.2-API-adds.patch || exit 1 patch -p1 < $CWD/SDL_Pango-0.1.2-matrix_declarations.patch || exit 1 -autoreconf +autoreconf -i libtoolize --copy --force +automake -a CFLAGS="$SLKCFLAGS" \ ./configure \ diff --git a/libraries/atkmm/atkmm.SlackBuild b/libraries/atkmm/atkmm.SlackBuild index 7e288ed86c..3885a33e29 100644 --- a/libraries/atkmm/atkmm.SlackBuild +++ b/libraries/atkmm/atkmm.SlackBuild @@ -23,7 +23,7 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=atkmm -VERSION=${VERSION:-2.22.7} +VERSION=${VERSION:-2.24.1} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} diff --git a/libraries/atkmm/atkmm.info b/libraries/atkmm/atkmm.info index 55501ca7eb..37467988ea 100644 --- a/libraries/atkmm/atkmm.info +++ b/libraries/atkmm/atkmm.info @@ -1,8 +1,8 @@ PRGNAM="atkmm" -VERSION="2.22.7" +VERSION="2.24.1" HOMEPAGE="http://www.gtkmm.org/" -DOWNLOAD="http://ftp.gnome.org/pub/GNOME/sources/atkmm/2.22/atkmm-2.22.7.tar.xz" -MD5SUM="fec7db3fc47ba2e0c95d130ec865a236" +DOWNLOAD="http://ftp.gnome.org/pub/GNOME/sources/atkmm/2.24/atkmm-2.24.1.tar.xz" +MD5SUM="279f32c23b74e5d25bce2b941294cdc8" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="pangomm" diff --git a/libraries/belle-sip/belle-sip.SlackBuild b/libraries/belle-sip/belle-sip.SlackBuild index 496bbe2195..b37b90d481 100644 --- a/libraries/belle-sip/belle-sip.SlackBuild +++ b/libraries/belle-sip/belle-sip.SlackBuild @@ -85,6 +85,9 @@ sed -i \ configure.ac autoreconf -ivf +# Kill the accursed -Werror (fix for -current) +SLKCFLAGS="$SLKCFLAGS -Wno-error" + CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ CPPFLAGS="${CPPFLAGS} -I/usr/include/antlr3" \ diff --git a/libraries/cairomm/cairomm.SlackBuild b/libraries/cairomm/cairomm.SlackBuild index e4b0228c47..b24c8a71fe 100644 --- a/libraries/cairomm/cairomm.SlackBuild +++ b/libraries/cairomm/cairomm.SlackBuild @@ -23,7 +23,7 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=cairomm -VERSION=${VERSION:-1.10.0} +VERSION=${VERSION:-1.12.0} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} diff --git a/libraries/cairomm/cairomm.info b/libraries/cairomm/cairomm.info index e0ebd6286a..d069e787a1 100644 --- a/libraries/cairomm/cairomm.info +++ b/libraries/cairomm/cairomm.info @@ -1,8 +1,8 @@ PRGNAM="cairomm" -VERSION="1.10.0" +VERSION="1.12.0" HOMEPAGE="http://cairographics.org/cairomm/" -DOWNLOAD="http://cairographics.org/releases/cairomm-1.10.0.tar.gz" -MD5SUM="9c63fb1c04c8ecd3c5e6473075b8c39f" +DOWNLOAD="http://cairographics.org/releases/cairomm-1.12.0.tar.gz" +MD5SUM="481501be65bcc34a605d6bc0f57a0023" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="glibmm" diff --git a/libraries/cryptopp/cryptopp.SlackBuild b/libraries/cryptopp/cryptopp.SlackBuild index 179c2df479..8e93f42813 100644 --- a/libraries/cryptopp/cryptopp.SlackBuild +++ b/libraries/cryptopp/cryptopp.SlackBuild @@ -7,7 +7,7 @@ PRGNAM=cryptopp VERSION=${VERSION:-5.6.2} -BUILD=${BUILD:-2} +BUILD=${BUILD:-3} TAG=${TAG:-_SBo} if [ -z "$ARCH" ]; then @@ -57,11 +57,21 @@ sed -i "s%(PREFIX)/lib%(PREFIX)/lib${LIBDIRSUFFIX}%g" GNUmakefile make dynamic CFLAGS="$SLKCFLAGS" CXXFLAGS="-DNDEBUG $SLKCFLAGS" make install PREFIX=$PKG/usr -ln -s libcryptopp.so $PKG/usr/lib${LIBDIRSUFFIX}/libcryptopp-${VERSION}.so.0 +( cd $PKG/usr/lib${LIBDIRSUFFIX} + mv libcryptopp.so libcryptopp-${VERSION}.so.0 + ln -s libcryptopp-${VERSION}.so.0 libcryptopp.so ) + +# This is empty +rmdir $PKG/usr/bin 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 +# Install a pkgconfig file +mkdir $PKG/usr/lib$LIBDIRSUFFIX/pkgconfig +sed "s|@LIBDIRSUFFIX@|$LIBDIRSUFFIX|" $CWD/$PRGNAM.pc \ + > $PKG/usr/lib$LIBDIRSUFFIX/pkgconfig/$PRGNAM.pc + mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION cp -a *.txt $PKG/usr/doc/$PRGNAM-$VERSION cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild diff --git a/libraries/cryptopp/cryptopp.pc b/libraries/cryptopp/cryptopp.pc new file mode 100644 index 0000000000..45d65d071b --- /dev/null +++ b/libraries/cryptopp/cryptopp.pc @@ -0,0 +1,13 @@ +prefix=/usr +exec_prefix=${prefix} +libdir=${prefix}/lib@LIBDIRSUFFIX@ +includedir=${prefix}/include/cryptopp + +Name: Crypto++ +Description: A free C++ class library of cryptographic schemes +Version: 5.6.2 +URL: http://www.cryptopp.com +Requires: +Conflicts: +Libs: -L${libdir} -lcryptopp +Cflags: -I${includedir} diff --git a/libraries/edelib/edelib.SlackBuild b/libraries/edelib/edelib.SlackBuild index 4fdb6a6bb2..f88ce0e3f8 100644 --- a/libraries/edelib/edelib.SlackBuild +++ b/libraries/edelib/edelib.SlackBuild @@ -72,8 +72,8 @@ find -L . \ patch -p1 < $CWD/edelib.patch LDFLAGS="-L/usr/lib${LIBDIRSUFFIX}" \ FLTK_CONFIG="/usr/bin/fltk13-config" \ -CFLAGS="$SLKCFLAGS" \ -CXXFLAGS="$SLKCFLAGS" \ +CFLAGS="$SLKCFLAGS -std=gnu89" \ +CXXFLAGS="$SLKCFLAGS -std=gnu89" \ ./configure \ --prefix=/usr \ --libdir=/usr/lib${LIBDIRSUFFIX} \ diff --git a/libraries/eet/eet.SlackBuild b/libraries/eet/eet.SlackBuild index 7830d87a26..2c06e6f7fe 100644 --- a/libraries/eet/eet.SlackBuild +++ b/libraries/eet/eet.SlackBuild @@ -23,7 +23,7 @@ PRGNAM=eet VERSION=${VERSION:-1.7.10} -BUILD=${BUILD:-1} +BUILD=${BUILD:-2} TAG=${TAG:-_SBo} if [ -z "$ARCH" ]; then @@ -78,6 +78,10 @@ CXXFLAGS="$SLKCFLAGS" \ --mandir=/usr/man \ --docdir=/usr/doc/$PRGNAM-$VERSION \ --build=$ARCH-slackware-linux \ + --enable-cipher \ + --enable-signature \ + --enable-openssl \ + --disable-gnutls \ --disable-static make diff --git a/libraries/eigen3/README b/libraries/eigen3/README deleted file mode 100644 index 151c65ee83..0000000000 --- a/libraries/eigen3/README +++ /dev/null @@ -1,4 +0,0 @@ -Eigen is a C++ template library for linear algebra: matrices, vectors, -numerical solvers, and related algorithms. - -Eigen3 can coexist without problems with Eigen2 included in Slackware. diff --git a/libraries/eigen3/eigen3.SlackBuild b/libraries/eigen3/eigen3.SlackBuild deleted file mode 100644 index 265a4e1f93..0000000000 --- a/libraries/eigen3/eigen3.SlackBuild +++ /dev/null @@ -1,100 +0,0 @@ -#!/bin/sh - -# Copyright 2007, 2008 Robby Workman, Northport, Alabama, USA -# Copyright 2008, 2009 Patrick J. Volkerding, Sebeka, MN, USA -# Copyright 2012-2013 Niels Horn, Rio de Janeiro, RJ, Brazil -# All rights reserved. - -# Redistribution and use of this script, with or without modification, is -# permitted provided that the following conditions are met: -# -# 1. Redistributions of this script must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# -# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ''AS IS'' AND ANY EXPRESS OR IMPLIED -# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO -# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, -# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; -# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, -# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR -# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF -# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -# -# Maintained by David Spencer <baildon.research@googlemail.com> - -PRGNAM=eigen3 -VERSION=${VERSION:-3.2.4} -BUILD=${BUILD:-1} -TAG=${TAG:-_SBo} - -TARVERSION=${TARVERSION:-eigen-10219c95fe65} - -if [ -z "$ARCH" ]; then - case "$( uname -m )" in - i?86) export ARCH=i486 ;; - arm*) export ARCH=arm ;; - *) export ARCH=$( uname -m ) ;; - esac -fi - -CWD=$(pwd) -TMP=${TMP:-/tmp/SBo} -PKG=$TMP/package-$PRGNAM -OUTPUT=${OUTPUT:-/tmp} - -if [ "$ARCH" = "i486" ]; then - SLKCFLAGS="-O2 -march=i486 -mtune=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "i686" ]; then - SLKCFLAGS="-O2 -march=i686 -mtune=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "x86_64" ]; then - SLKCFLAGS="-O2 -fPIC" - LIBDIRSUFFIX="" -else - SLKCFLAGS="-O2" - LIBDIRSUFFIX="" -fi - -set -e - -rm -rf $PKG -mkdir -p $TMP $PKG $OUTPUT -cd $TMP -rm -rf eigen-$TARVERSION -tar xvf $CWD/$VERSION.tar.bz2 || tar xvf $CWD/eigen-$TARVERSION.tar.bz2 -cd eigen-$TARVERSION -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 640 -o -perm 600 -o -perm 444 \ - -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; - -mkdir -p build -cd build - QTDIR=/usr/lib${LIBDIRSUFFIX}/qt \ - PATH=$QTDIR/bin:$PATH \ - cmake \ - -DCMAKE_BUILD_TYPE=Release \ - -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \ - -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \ - -DCMAKE_INSTALL_PREFIX=/usr \ - .. - make - make install DESTDIR=$PKG -cd .. - -find $PKG | xargs 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* $PKG/usr/doc/$PRGNAM-$VERSION - -mkdir -p $PKG/install -cat $CWD/slack-desc > $PKG/install/slack-desc - -cd $PKG -/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz} diff --git a/libraries/eigen3/eigen3.info b/libraries/eigen3/eigen3.info deleted file mode 100644 index 9a92984fb0..0000000000 --- a/libraries/eigen3/eigen3.info +++ /dev/null @@ -1,10 +0,0 @@ -PRGNAM="eigen3" -VERSION="3.2.4" -HOMEPAGE="http://eigen.tuxfamily.org" -DOWNLOAD="http://bitbucket.org/eigen/eigen/get/3.2.4.tar.bz2" -MD5SUM="4c4b5ed9a388a1e475166d575af25477" -DOWNLOAD_x86_64="" -MD5SUM_x86_64="" -REQUIRES="" -MAINTAINER="David Spencer" -EMAIL="baildon.research@googlemail.com" diff --git a/libraries/eigen3/slack-desc b/libraries/eigen3/slack-desc deleted file mode 100644 index 50e1446adf..0000000000 --- a/libraries/eigen3/slack-desc +++ /dev/null @@ -1,19 +0,0 @@ -# HOW TO EDIT THIS FILE: -# The "handy ruler" below makes it easier to edit a package description. -# Line up the first '|' above the ':' following the base package name, and -# the '|' on the right side marks the last column you can put a character in. -# You must make exactly 11 lines for the formatting to be correct. It's also -# customary to leave one space after the ':' except on otherwise blank lines. - - |-----handy-ruler------------------------------------------------------| -eigen3: Eigen3 (c++ math library) -eigen3: -eigen3: Eigen is a C++ template library for linear algebra: matrices, vectors, -eigen3: numerical solvers, and related algorithms. -eigen3: -eigen3: Homepage: http://eigen.tuxfamily.org -eigen3: -eigen3: -eigen3: -eigen3: -eigen3: diff --git a/libraries/evas/evas.SlackBuild b/libraries/evas/evas.SlackBuild index ab45c91bff..0a3e86e277 100644 --- a/libraries/evas/evas.SlackBuild +++ b/libraries/evas/evas.SlackBuild @@ -68,6 +68,8 @@ 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 {} \; +# disable the gif module as upstream seems to have labeled this as won't fix +# http://lists.enlightenment.fr/enlightenment-bugs/2012/08/4637.html CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ LDFLAGS="-L/usr/lib${LIBDIRSUFFIX}" \ @@ -79,6 +81,7 @@ LDFLAGS="-L/usr/lib${LIBDIRSUFFIX}" \ --mandir=/usr/man \ --docdir=/usr/doc/$PRGNAM-$VERSION \ --build=$ARCH-slackware-linux \ + --disable-image-loader-gif \ --disable-static make diff --git a/libraries/fcgi/fcgi.SlackBuild b/libraries/fcgi/fcgi.SlackBuild index 7be7439aa7..7eaed0e162 100644 --- a/libraries/fcgi/fcgi.SlackBuild +++ b/libraries/fcgi/fcgi.SlackBuild @@ -75,10 +75,9 @@ cat $CWD/fcgi-2.4.0-clientdata-pointer.patch | patch -p1 # Fix image paths in html docs (thanks to Gentoo) cat $CWD/fcgi-2.4.0-html-updates.patch | patch -p1 -libtoolize --copy --force # Create some empty files to make autoreconf happy touch INSTALL NEWS AUTHORS ChangeLog COPYING -autoreconf -vf +autoreconf -vif CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ diff --git a/libraries/fltk/fltk-1.1.10_libpng.patch b/libraries/fltk/fltk-1.1.10_libpng.patch new file mode 100644 index 0000000000..1b6d91ed7e --- /dev/null +++ b/libraries/fltk/fltk-1.1.10_libpng.patch @@ -0,0 +1,61 @@ +--- fltk1.1-1.1.10.orig/src/Fl_PNG_Image.cxx ++++ fltk1.1-1.1.10/src/Fl_PNG_Image.cxx +@@ -66,6 +66,8 @@ Fl_PNG_Image::Fl_PNG_Image(const char *p + png_structp pp; // PNG read pointer + png_infop info; // PNG info pointers + png_bytep *rows; // PNG row pointers ++ png_uint_32 width, height; ++ int bit_depth, color_type, num_trans = 0; + + + // Open the PNG file... +@@ -75,7 +77,7 @@ Fl_PNG_Image::Fl_PNG_Image(const char *p + pp = png_create_read_struct(PNG_LIBPNG_VER_STRING, NULL, NULL, NULL); + info = png_create_info_struct(pp); + +- if (setjmp(pp->jmpbuf)) ++ if (setjmp(png_jmpbuf(pp))) + { + Fl::warning("PNG file \"%s\" contains errors!\n", png); + return; +@@ -87,27 +89,33 @@ Fl_PNG_Image::Fl_PNG_Image(const char *p + // Get the image dimensions and convert to grayscale or RGB... + png_read_info(pp, info); + +- if (info->color_type == PNG_COLOR_TYPE_PALETTE) ++ png_get_IHDR(pp, info, &width, &height, &bit_depth, &color_type, ++ NULL /* interlace */, NULL /* compress */, NULL /* filter */); ++#ifdef PNG_tRNS_SUPPORTED ++ png_get_tRNS(pp, info, NULL /* trans */, &num_trans, NULL /* values */); ++#endif ++ ++ if (color_type == PNG_COLOR_TYPE_PALETTE) + png_set_expand(pp); + +- if (info->color_type & PNG_COLOR_MASK_COLOR) ++ if (color_type & PNG_COLOR_MASK_COLOR) + channels = 3; + else + channels = 1; + +- if ((info->color_type & PNG_COLOR_MASK_ALPHA) || info->num_trans) ++ if ((color_type & PNG_COLOR_MASK_ALPHA) || num_trans) + channels ++; + +- w((int)(info->width)); +- h((int)(info->height)); ++ w((int)(width)); ++ h((int)(height)); + d(channels); + +- if (info->bit_depth < 8) ++ if (bit_depth < 8) + { + png_set_packing(pp); + png_set_expand(pp); + } +- else if (info->bit_depth == 16) ++ else if (bit_depth == 16) + png_set_strip_16(pp); + + # if defined(HAVE_PNG_GET_VALID) && defined(HAVE_PNG_SET_TRNS_TO_ALPHA) diff --git a/libraries/fltk/fltk.SlackBuild b/libraries/fltk/fltk.SlackBuild index ba899ee152..3216b7a0bb 100644 --- a/libraries/fltk/fltk.SlackBuild +++ b/libraries/fltk/fltk.SlackBuild @@ -80,6 +80,9 @@ sed -i \ -e '/RANLIB/s:$(libdir)/\(.*LIBNAME)\):$(libdir)/`basename \1`:g' \ src/Makefile || exit +# Fix for libpng16 (-current) snarfed from Debian ;-) +patch -p1 < $CWD/fltk-1.1.10_libpng.patch + # --docdir seems to be ignored CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ diff --git a/libraries/ganv/ganv.SlackBuild b/libraries/ganv/ganv.SlackBuild index c3154d4646..2705881772 100644 --- a/libraries/ganv/ganv.SlackBuild +++ b/libraries/ganv/ganv.SlackBuild @@ -70,6 +70,7 @@ find -L . \ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; CFLAGS="$SLKCFLAGS" \ +CXXFLAGS="$SLKCFLAGS -std=c++11" \ ./waf configure \ --prefix=/usr \ --libdir=/usr/lib${LIBDIRSUFFIX} \ diff --git a/libraries/gconfmm/gconfmm.SlackBuild b/libraries/gconfmm/gconfmm.SlackBuild index 27c6d173eb..57d976d77f 100644 --- a/libraries/gconfmm/gconfmm.SlackBuild +++ b/libraries/gconfmm/gconfmm.SlackBuild @@ -53,7 +53,7 @@ find -L . \ -exec chmod 644 {} \; CFLAGS="$SLKCFLAGS" \ -CXXFLAGS="$SLKCFLAGS" \ +CXXFLAGS="$SLKCFLAGS -std=c++11" \ ./configure \ --prefix=/usr \ --libdir=/usr/lib${LIBDIRSUFFIX} \ diff --git a/libraries/gdl/gdl.SlackBuild b/libraries/gdl/gdl.SlackBuild index 7554aa3ec7..6fa8118462 100644 --- a/libraries/gdl/gdl.SlackBuild +++ b/libraries/gdl/gdl.SlackBuild @@ -23,7 +23,7 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=gdl -VERSION=${VERSION:-3.12.0} +VERSION=${VERSION:-3.18.0} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -65,7 +65,7 @@ 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 \ + -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 {} \; diff --git a/libraries/gdl/gdl.info b/libraries/gdl/gdl.info index ee4f5d1d66..bc973204e5 100644 --- a/libraries/gdl/gdl.info +++ b/libraries/gdl/gdl.info @@ -1,8 +1,8 @@ PRGNAM="gdl" -VERSION="3.12.0" +VERSION="3.18.0" HOMEPAGE="http://www.gnome.org/" -DOWNLOAD="ftp://ftp.gnome.org/pub/gnome/sources/gdl/3.12/gdl-3.12.0.tar.xz" -MD5SUM="e36701e5f0f2eeac2504375fe46aa478" +DOWNLOAD="http://ftp.gnome.org/pub/GNOME/sources/gdl/3.18/gdl-3.18.0.tar.xz" +MD5SUM="25f2e50969406563b78c8ad4571ef826" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" diff --git a/libraries/glibmm/glibmm.SlackBuild b/libraries/glibmm/glibmm.SlackBuild index a2c56b7602..4eae8e05db 100644 --- a/libraries/glibmm/glibmm.SlackBuild +++ b/libraries/glibmm/glibmm.SlackBuild @@ -23,7 +23,7 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=glibmm -VERSION=2.36.2 +VERSION=${VERSION:-2.46.1} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -65,12 +65,12 @@ 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 \ + -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 {} \; CFLAGS="$SLKCFLAGS" \ -CXXFLAGS="$SLKCFLAGS" \ +CXXFLAGS="$SLKCFLAGS -std=c++11" \ ./configure \ --prefix=/usr \ --libdir=/usr/lib${LIBDIRSUFFIX} \ diff --git a/libraries/glibmm/glibmm.info b/libraries/glibmm/glibmm.info index 4878ebf9b0..e7f538367b 100644 --- a/libraries/glibmm/glibmm.info +++ b/libraries/glibmm/glibmm.info @@ -1,8 +1,8 @@ PRGNAM="glibmm" -VERSION="2.36.2" +VERSION="2.46.1" HOMEPAGE="http://www.gtkmm.org/" -DOWNLOAD="http://ftp.gnome.org/pub/gnome/sources/glibmm/2.36/glibmm-2.36.2.tar.xz" -MD5SUM="5c96d566c22c209d7b9cbf2344c469e9" +DOWNLOAD="http://ftp.gnome.org/pub/GNOME/sources/glibmm/2.46/glibmm-2.46.1.tar.xz" +MD5SUM="77ad60087aae6f9378ea0ba0b743e5df" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="libsigc++" diff --git a/libraries/gnome-vfsmm/gnome-vfsmm.SlackBuild b/libraries/gnome-vfsmm/gnome-vfsmm.SlackBuild index 33e829dc09..78d5ed9dc4 100644 --- a/libraries/gnome-vfsmm/gnome-vfsmm.SlackBuild +++ b/libraries/gnome-vfsmm/gnome-vfsmm.SlackBuild @@ -74,7 +74,7 @@ sed -i "s|(libdir)/gnome-vfsmm-2\.6/include|(includedir)/gnome-vfsmm-2.6|" \ libgnomevfs/Makefile.in CFLAGS="$SLKCFLAGS" \ -CXXFLAGS="$SLKCFLAGS" \ +CXXFLAGS="$SLKCFLAGS -std=c++11" \ ./configure \ --prefix=/usr \ --libdir=/usr/lib$LIBDIRSUFFIX \ diff --git a/libraries/gsl/README b/libraries/gsl/README deleted file mode 100644 index 7824452098..0000000000 --- a/libraries/gsl/README +++ /dev/null @@ -1,7 +0,0 @@ -The GNU Scientific Library (GSL) is a numerical library for C and C++ -programmers. It is free software under the GNU General Public License. - -The library provides a wide range of mathematical routines such as -random number generators, special functions and least-squares -fitting. There are over 1000 functions in total with an extensive test -suite. diff --git a/libraries/gsl/gsl.SlackBuild b/libraries/gsl/gsl.SlackBuild deleted file mode 100644 index e102100335..0000000000 --- a/libraries/gsl/gsl.SlackBuild +++ /dev/null @@ -1,87 +0,0 @@ -#!/bin/sh - -# Slackware build script for GSL - -# Written by Aleksandar Samardzic <asamardzic@gmail.com> - -PRGNAM=gsl -VERSION=${VERSION:-1.16} -BUILD=${BUILD:-1} -TAG=${TAG:-_SBo} - -if [ -z "$ARCH" ]; then - case "$( uname -m )" in - i?86) ARCH=i486 ;; - arm*) ARCH=arm ;; - *) ARCH=$( uname -m ) ;; - esac -fi - -CWD=$(pwd) -TMP=${TMP:-/tmp/SBo} -PKG=$TMP/package-$PRGNAM -OUTPUT=${OUTPUT:-/tmp} - -if [ "$ARCH" = "i486" ]; then - SLKCFLAGS="-O2 -march=i486 -mtune=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "i686" ]; then - SLKCFLAGS="-O2 -march=i686 -mtune=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "x86_64" ]; then - SLKCFLAGS="-O2 -fPIC" - LIBDIRSUFFIX="64" -else - SLKCFLAGS="-O2" - LIBDIRSUFFIX="" -fi - -set -e - -rm -rf $PKG -mkdir -p $TMP $PKG $OUTPUT -cd $TMP -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 {} \; - -CFLAGS="$SLKCFLAGS" \ -CXXFLAGS="$SLKCFLAGS" \ -./configure \ - --prefix=/usr \ - --libdir=/usr/lib${LIBDIRSUFFIX} \ - --sysconfdir=/etc \ - --localstatedir=/var \ - --mandir=/usr/man \ - --docdir=/usr/doc/$PRGNAM-$VERSION \ - --build=$ARCH-slackware-linux - -make -make install DESTDIR=$PKG - -find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \ - | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true - -find $PKG/usr/man -type f -exec gzip -9 {} \; - -mv $PKG/usr/share/info $PKG/usr -rm -f $PKG/usr/info/dir -gzip -9 $PKG/usr/info/*.info* - -mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION -cp -a \ - AUTHORS BUGS COPYING ChangeLog INSTALL NEWS README THANKS TODO \ - $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 - -cd $PKG -/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz} diff --git a/libraries/gsl/gsl.info b/libraries/gsl/gsl.info deleted file mode 100644 index d433e61adb..0000000000 --- a/libraries/gsl/gsl.info +++ /dev/null @@ -1,10 +0,0 @@ -PRGNAM="gsl" -VERSION="1.16" -HOMEPAGE="http://www.gnu.org/software/gsl" -DOWNLOAD="ftp://ftp.gnu.org/gnu/gsl/gsl-1.16.tar.gz" -MD5SUM="e49a664db13d81c968415cd53f62bc8b" -DOWNLOAD_x86_64="" -MD5SUM_x86_64="" -REQUIRES="" -MAINTAINER="David Spencer" -EMAIL="baildon.research@googlemail.com" diff --git a/libraries/gsl/slack-desc b/libraries/gsl/slack-desc deleted file mode 100644 index 0b52c02196..0000000000 --- a/libraries/gsl/slack-desc +++ /dev/null @@ -1,19 +0,0 @@ -# HOW TO EDIT THIS FILE: -# The "handy ruler" below makes it easier to edit a package description. -# Line up the first '|' above the ':' following the base package name, and -# the '|' on the right side marks the last column you can put a character in. -# You must make exactly 11 lines for the formatting to be correct. It's also -# customary to leave one space after the ':' except on otherwise blank lines. - - |-----handy-ruler------------------------------------------------------| -gsl: GSL (a numerical library for C and C++ programmers) -gsl: -gsl: The GNU Scientific Library (GSL) is a collection of routines for -gsl: numerical computing. The routines are written from scratch by the -gsl: GSL team in ANSI C, and present a modern API for C programmers, -gsl: while allowing wrappers to be written for very high-level -gsl: languages. -gsl: -gsl: Homepage: http://www.gnu.org/software/gsl/ -gsl: -gsl: diff --git a/libraries/gssdp/gssdp.SlackBuild b/libraries/gssdp/gssdp.SlackBuild index 742c65db1c..d4e05be1b4 100644 --- a/libraries/gssdp/gssdp.SlackBuild +++ b/libraries/gssdp/gssdp.SlackBuild @@ -23,7 +23,7 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=gssdp -VERSION=${VERSION:-0.12.2.1} +VERSION=${VERSION:-0.14.11} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -77,6 +77,7 @@ CXXFLAGS="$SLKCFLAGS" \ --sysconfdir=/etc \ --localstatedir=/var \ --docdir=/usr/doc/$PRGNAM-$VERSION \ + --disable-static \ --build=$ARCH-slackware-linux make diff --git a/libraries/gssdp/gssdp.info b/libraries/gssdp/gssdp.info index 135cd847a9..488e9e1db8 100644 --- a/libraries/gssdp/gssdp.info +++ b/libraries/gssdp/gssdp.info @@ -1,8 +1,8 @@ PRGNAM="gssdp" -VERSION="0.12.2.1" +VERSION="0.14.11" HOMEPAGE="http://gupnp.org/" -DOWNLOAD="http://ftp.gnome.org/pub/GNOME/sources/gssdp/0.12/gssdp-0.12.2.1.tar.xz" -MD5SUM="8ac3a544ef0dcf8caaf7c249d2a50dc2" +DOWNLOAD="http://ftp.gnome.org/pub/GNOME/sources/gssdp/0.14/gssdp-0.14.11.tar.xz" +MD5SUM="43907464a6090b1d7e736c6b3b822983" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" diff --git a/libraries/gst1-plugins-base/README b/libraries/gst1-plugins-base/README deleted file mode 100644 index b94e4d587d..0000000000 --- a/libraries/gst1-plugins-base/README +++ /dev/null @@ -1,7 +0,0 @@ -This is a well-groomed and well-maintained collection of GStreamer -plug-ins and elements, spanning the range of possible types of -elements one would want to write for GStreamer. - -gst1-plugins-base is for gstreamer1 (GStreamer 1.x). - -orc is an optional (but recommended) dependency. diff --git a/libraries/gst1-plugins-base/gst1-plugins-base.info b/libraries/gst1-plugins-base/gst1-plugins-base.info deleted file mode 100644 index 722d0676de..0000000000 --- a/libraries/gst1-plugins-base/gst1-plugins-base.info +++ /dev/null @@ -1,10 +0,0 @@ -PRGNAM="gst1-plugins-base" -VERSION="1.4.5" -HOMEPAGE="http://gstreamer.freedesktop.org/" -DOWNLOAD="http://gstreamer.freedesktop.org/src/gst-plugins-base/gst-plugins-base-1.4.5.tar.xz" -MD5SUM="357165af625c0ca353ab47c5d843920e" -DOWNLOAD_x86_64="" -MD5SUM_x86_64="" -REQUIRES="gstreamer1" -MAINTAINER="Robby Workman" -EMAIL="rworkman@slackbuilds.org" diff --git a/libraries/gst1-plugins-base/slack-desc b/libraries/gst1-plugins-base/slack-desc deleted file mode 100644 index cfc288a2bf..0000000000 --- a/libraries/gst1-plugins-base/slack-desc +++ /dev/null @@ -1,19 +0,0 @@ -# HOW TO EDIT THIS FILE: -# The "handy ruler" below makes it easier to edit a package description. -# Line up the first '|' above the ':' following the base package name, and -# the '|' on the right side marks the last column you can put a character in. -# You must make exactly 11 lines for the formatting to be correct. It's also -# customary to leave one space after the ':' except on otherwise blank lines. - - |-----handy-ruler------------------------------------------------------| -gst1-plugins-base: gst1-plugins-base (base set of GStreamer1 plugins) -gst1-plugins-base: -gst1-plugins-base: GStreamer Base Plug-ins is a well-groomed and well-maintained -gst1-plugins-base: collection of GStreamer plug-ins and elements, spanning the -gst1-plugins-base: range of possible types of elements one would want to write -gst1-plugins-base: for GStreamer. It also contains helper libraries and base -gst1-plugins-base: classes useful for writing elements. A wide range of video -gst1-plugins-base: and audio decoders, encoders, and filters are included. -gst1-plugins-base: -gst1-plugins-base: -gst1-plugins-base: diff --git a/libraries/gst1-plugins-good/README b/libraries/gst1-plugins-good/README deleted file mode 100644 index f73427f25b..0000000000 --- a/libraries/gst1-plugins-good/README +++ /dev/null @@ -1,8 +0,0 @@ -This is a well-groomed and well-maintained collection of GStreamer -plug-ins and elements, spanning the range of possible types of -elements one would want to write for GStreamer. - -gst1-plugins-good is for gstreamer1 (GStreamer 1.x). - -Optional dependencies are libdv, libshout, libvpx, libiec61883, -jack-audio-connection-kit, pulseaudio, and speex. diff --git a/libraries/gst1-plugins-good/gst1-plugins-good.info b/libraries/gst1-plugins-good/gst1-plugins-good.info deleted file mode 100644 index 4128347edd..0000000000 --- a/libraries/gst1-plugins-good/gst1-plugins-good.info +++ /dev/null @@ -1,10 +0,0 @@ -PRGNAM="gst1-plugins-good" -VERSION="1.4.5" -HOMEPAGE="http://gstreamer.freedesktop.org/" -DOWNLOAD="http://gstreamer.freedesktop.org/src/gst-plugins-good/gst-plugins-good-1.4.5.tar.xz" -MD5SUM="eaf1a6daf73749bc423feac301d60038" -DOWNLOAD_x86_64="" -MD5SUM_x86_64="" -REQUIRES="gst1-plugins-base" -MAINTAINER="Robby Workman" -EMAIL="rworkman@slackbuilds.org" diff --git a/libraries/gst1-plugins-good/slack-desc b/libraries/gst1-plugins-good/slack-desc deleted file mode 100644 index e8ea5f9726..0000000000 --- a/libraries/gst1-plugins-good/slack-desc +++ /dev/null @@ -1,19 +0,0 @@ -# HOW TO EDIT THIS FILE: -# The "handy ruler" below makes it easier to edit a package description. -# Line up the first '|' above the ':' following the base package name, and -# the '|' on the right side marks the last column you can put a character in. -# You must make exactly 11 lines for the formatting to be correct. It's also -# customary to leave one space after the ':' except on otherwise blank lines. - - |-----handy-ruler------------------------------------------------------| -gst1-plugins-good: gst1-plugins-good (good set of GStreamer 1.x plugins) -gst1-plugins-good: -gst1-plugins-good: GStreamer Good Plug-ins is a set of plug-ins that have good -gst1-plugins-good: quality code, correct functionality, and a good license -gst1-plugins-good: (LGPL for the plug-in code, LGPL or LGPL-compatible for the -gst1-plugins-good: supporting library). -gst1-plugins-good: -gst1-plugins-good: -gst1-plugins-good: -gst1-plugins-good: -gst1-plugins-good: diff --git a/libraries/gstreamer1/README b/libraries/gstreamer1/README deleted file mode 100644 index e9cf0059e3..0000000000 --- a/libraries/gstreamer1/README +++ /dev/null @@ -1,8 +0,0 @@ -This is GStreamer, a framework for streaming media. -This builds gstreamer-1.x, which can be installed alongside -the stock gstreamer package included with Slackware. -DO NOT replace the Slackware-provide gstreamer package with -this gstreamer1 package from here! - -You'll probably want gst1-plugins-base, gst1-plugins-good, -and gst1-plugins-ugly for the best user experience. diff --git a/libraries/gstreamer1/gstreamer1.info b/libraries/gstreamer1/gstreamer1.info deleted file mode 100644 index 52119da780..0000000000 --- a/libraries/gstreamer1/gstreamer1.info +++ /dev/null @@ -1,10 +0,0 @@ -PRGNAM="gstreamer1" -VERSION="1.4.5" -HOMEPAGE="http://gstreamer.freedesktop.org/" -DOWNLOAD="http://gstreamer.freedesktop.org/src/gstreamer/gstreamer-1.4.5.tar.xz" -MD5SUM="88a9289c64a4950ebb4f544980234289" -DOWNLOAD_x86_64="" -MD5SUM_x86_64="" -REQUIRES="orc" -MAINTAINER="Robby Workman" -EMAIL="rworkman@slackbuilds.org" diff --git a/libraries/gstreamer1/slack-desc b/libraries/gstreamer1/slack-desc deleted file mode 100644 index 0303e82534..0000000000 --- a/libraries/gstreamer1/slack-desc +++ /dev/null @@ -1,19 +0,0 @@ -# HOW TO EDIT THIS FILE: -# The "handy ruler" below makes it easier to edit a package description. -# Line up the first '|' above the ':' following the base package name, and -# the '|' on the right side marks the last column you can put a character in. -# You must make exactly 11 lines for the formatting to be correct. It's also -# customary to leave one space after the ':' except on otherwise blank lines. - - |-----handy-ruler------------------------------------------------------| -gstreamer1: GStreamer v1.x (streaming multimedia framework) -gstreamer1: -gstreamer1: GStreamer is a library that allows the construction of graphs of a -gstreamer1: media-handling components, ranging from simple Ogg/Vorbis playback -gstreamer1: to complex audio (mixing) and video (non-linear editing) processing. -gstreamer1: Applications can take advantage of advances in codec and filter -gstreamer1: technology transparently. Developers can add new codecs and filters -gstreamer1: by writing a simple plugin with a clean, generic interface. -gstreamer1: -gstreamer1: GStreamer is released under the LGPL. -gstreamer1: diff --git a/libraries/gstreamermm/gstreamermm.SlackBuild b/libraries/gstreamermm/gstreamermm.SlackBuild index aececa4f0d..73ece14f12 100644 --- a/libraries/gstreamermm/gstreamermm.SlackBuild +++ b/libraries/gstreamermm/gstreamermm.SlackBuild @@ -23,7 +23,7 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=gstreamermm -VERSION=0.10.10.2 +VERSION=${VERSION:-1.4.3} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -70,6 +70,7 @@ find -L . \ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; CFLAGS="$SLKCFLAGS" \ +CXXFLAGS="$SLKCFLAGS -std=c++11" \ ./configure \ --prefix=/usr \ --libdir=/usr/lib${LIBDIRSUFFIX} \ diff --git a/libraries/gstreamermm/gstreamermm.info b/libraries/gstreamermm/gstreamermm.info index f6d51599df..2826e25c76 100644 --- a/libraries/gstreamermm/gstreamermm.info +++ b/libraries/gstreamermm/gstreamermm.info @@ -1,10 +1,10 @@ PRGNAM="gstreamermm" -VERSION="0.10.10.2" +VERSION="1.4.3" HOMEPAGE="http://www.gnome.org/" -DOWNLOAD="ftp://ftp.gnome.org/pub/GNOME/sources/gstreamermm/0.10/gstreamermm-0.10.10.2.tar.xz" -MD5SUM="2563bde3ffa785eac64c4d443da88360" +DOWNLOAD="http://ftp.gnome.org/pub/GNOME/sources/gstreamermm/1.4/gstreamermm-1.4.3.tar.xz" +MD5SUM="8f6c4b85083308def933eab1433a1865" DOWNLOAD_x86_64="" MD5SUM_x86_64="" -REQUIRES="gtkmm libxml++" +REQUIRES="gtkmm3 libxml++" MAINTAINER="Juan Valencia Escalante" EMAIL="jvalenciae@gmail.com" diff --git a/libraries/gtkglextmm/gtkglextmm.SlackBuild b/libraries/gtkglextmm/gtkglextmm.SlackBuild index e4ea64f664..6936491cdd 100644 --- a/libraries/gtkglextmm/gtkglextmm.SlackBuild +++ b/libraries/gtkglextmm/gtkglextmm.SlackBuild @@ -59,7 +59,7 @@ patch -p0 < $CWD/patch-gtkglext_gtkmm_gl-widget.cc.diff patch -p1 < $CWD/fix_ftbfs_gtk_2_36 CFLAGS="$SLKCFLAGS" \ -CXXFLAGS="$SLKCFLAGS" \ +CXXFLAGS="$SLKCFLAGS -std=c++11" \ ./configure \ --prefix=/usr \ --libdir=/usr/lib${LIBDIRSUFFIX} \ diff --git a/libraries/gtkimageview/disable_Werror_for_gdk_pixbuf.patch b/libraries/gtkimageview/disable_Werror_for_gdk_pixbuf.patch new file mode 100644 index 0000000000..68c8aa0467 --- /dev/null +++ b/libraries/gtkimageview/disable_Werror_for_gdk_pixbuf.patch @@ -0,0 +1,21 @@ +diff -Naur gtkimageview-1.6.4.orig/configure.in gtkimageview-1.6.4/configure.in +--- gtkimageview-1.6.4.orig/configure.in 2009-04-05 22:02:43.000000000 +0200 ++++ gtkimageview-1.6.4/configure.in 2015-09-02 10:43:04.455960995 +0200 +@@ -20,7 +20,7 @@ + # Initialize GNOME environment + GNOME_COMMON_INIT + GNOME_COMPILE_WARNINGS(error) +-DEPRECATED_FLAGS="-DG_DISABLE_DEPRECATED -DGDK_DISABLE_DEPRECATED -DGDK_PIXBUF_DISABLE_DEPRECATED -DGTK_DISABLE_DEPRECATED" ++DEPRECATED_FLAGS="-DG_DISABLE_DEPRECATED -DGDK_DISABLE_DEPRECATED -DGTK_DISABLE_DEPRECATED" + AC_SUBST(DEPRECATED_FLAGS) + + PKG_CHECK_MODULES(DEP, +@@ -39,7 +39,7 @@ + ###################################################################### + ##### Twiddle CFLAGS ################################################# + ###################################################################### +-CFLAGS="${CFLAGS} -Wall -Werror -std=c99 -Wmissing-prototypes" ++CFLAGS="${CFLAGS} -Wall -std=c99 -Wmissing-prototypes" + + + ###################################################################### diff --git a/libraries/gtkimageview/gtkimageview.SlackBuild b/libraries/gtkimageview/gtkimageview.SlackBuild index 6650aea4da..35f1e89ac5 100644 --- a/libraries/gtkimageview/gtkimageview.SlackBuild +++ b/libraries/gtkimageview/gtkimageview.SlackBuild @@ -6,7 +6,7 @@ PRGNAM=gtkimageview VERSION=${VERSION:-1.6.4} -BUILD=${BUILD:-2} +BUILD=${BUILD:-3} TAG=${TAG:-_SBo} if [ -z "$ARCH" ]; then @@ -51,6 +51,9 @@ find -L . \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ -exec chmod 644 {} \; +# Build breaks because functions in gdk-pixbuf are now deprecated +patch -p1 < $CWD/disable_Werror_for_gdk_pixbuf.patch + CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ ./configure \ diff --git a/libraries/gtkmm-utils/gtkmm-utils.SlackBuild b/libraries/gtkmm-utils/gtkmm-utils.SlackBuild index 7a14a4a1cd..7cf403dc65 100644 --- a/libraries/gtkmm-utils/gtkmm-utils.SlackBuild +++ b/libraries/gtkmm-utils/gtkmm-utils.SlackBuild @@ -69,8 +69,8 @@ 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 {} \; -CFLAGS="-DGLIB_COMPILATION" \ -CXXFLAGS="-DGLIB_COMPILATION" \ +CFLAGS="$SLKCFLAGS -DGLIB_COMPILATION" \ +CXXFLAGS="$SLKCFLAGS -DGLIB_COMPILATION -std=c++11" \ ./configure \ --prefix=/usr \ --libdir=/usr/lib${LIBDIRSUFFIX} \ diff --git a/libraries/gtkmm/gtkmm.SlackBuild b/libraries/gtkmm/gtkmm.SlackBuild index 8d519398d7..898437939f 100644 --- a/libraries/gtkmm/gtkmm.SlackBuild +++ b/libraries/gtkmm/gtkmm.SlackBuild @@ -72,7 +72,7 @@ find -L . \ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; CFLAGS="$SLKCFLAGS" \ -CXXFLAGS="$SLKCFLAGS" \ +CXXFLAGS="$SLKCFLAGS -std=c++11" \ ./configure \ --prefix=/usr \ --libdir=/usr/lib${LIBDIRSUFFIX} \ diff --git a/libraries/gtkmm3/gtkmm3.SlackBuild b/libraries/gtkmm3/gtkmm3.SlackBuild index 4f39fb353d..1c42c908b3 100644 --- a/libraries/gtkmm3/gtkmm3.SlackBuild +++ b/libraries/gtkmm3/gtkmm3.SlackBuild @@ -27,7 +27,7 @@ PRGNAM=gtkmm3 SRCNAM=gtkmm -VERSION=${VERSION:-3.8.1} +VERSION=${VERSION:-3.18.0} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -69,7 +69,7 @@ cd $SRCNAM-$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 \ + -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 {} \; diff --git a/libraries/gtkmm3/gtkmm3.info b/libraries/gtkmm3/gtkmm3.info index 108bbe99c8..d81ab390ac 100644 --- a/libraries/gtkmm3/gtkmm3.info +++ b/libraries/gtkmm3/gtkmm3.info @@ -1,8 +1,8 @@ PRGNAM="gtkmm3" -VERSION="3.8.1" +VERSION="3.18.0" HOMEPAGE="http://www.gtkmm.org/" -DOWNLOAD="http://ftp.gnome.org/pub/GNOME/sources/gtkmm/3.8/gtkmm-3.8.1.tar.xz" -MD5SUM="15211fab12ea2ce955369dcc320baf5c" +DOWNLOAD="http://ftp.gnome.org/pub/GNOME/sources/gtkmm/3.18/gtkmm-3.18.0.tar.xz" +MD5SUM="1f056682a0ffbe8b8678be79b69f7169" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="atkmm mm-common" diff --git a/libraries/gtksourceview3/allow-deprecated-glib-symbols.patch b/libraries/gtksourceview3/allow-deprecated-glib-symbols.patch deleted file mode 100644 index 6191aadd17..0000000000 --- a/libraries/gtksourceview3/allow-deprecated-glib-symbols.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- configure.orig 2012-09-11 11:07:07.750998010 +0300 -+++ configure 2012-09-11 11:07:25.848998458 +0300 -@@ -10955,7 +10955,6 @@ - - if test "$enable_deprecations" = "yes"; then - DISABLE_DEPRECATED_CFLAGS="\ ---DG_DISABLE_DEPRECATED \ - -DGDK_DISABLE_DEPRECATED \ - -DGTK_DISABLE_DEPRECATED \ - -DGDK_PIXBUF_DISABLE_DEPRECATED \ diff --git a/libraries/gtksourceview3/gtksourceview3.SlackBuild b/libraries/gtksourceview3/gtksourceview3.SlackBuild index 919e1b9c83..f654cce84e 100644 --- a/libraries/gtksourceview3/gtksourceview3.SlackBuild +++ b/libraries/gtksourceview3/gtksourceview3.SlackBuild @@ -26,7 +26,7 @@ PRGNAM=gtksourceview3 SRCNAM=gtksourceview -VERSION=${VERSION:-3.8.2} +VERSION=${VERSION:-3.18.1} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -72,11 +72,6 @@ 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 {} \; -# Code is still using G_CONST_RETURN which is deprecated in the -# version of glib shipping with Slackware 14.0. Let's remove the -# G_DISABLE_DEPRECATED from C preprocessor flags. -patch -p0 <$CWD/allow-deprecated-glib-symbols.patch - CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ ./configure \ @@ -98,7 +93,7 @@ find $PKG | xargs 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 AUTHORS COPYING* ChangeLog* HACKING INSTALL MAINTAINERS NEWS README \ +cp -a AUTHORS COPYING* HACKING MAINTAINERS NEWS README \ $PKG/usr/doc/$PRGNAM-$VERSION cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild diff --git a/libraries/gtksourceview3/gtksourceview3.info b/libraries/gtksourceview3/gtksourceview3.info index 22896d7b53..809795d999 100644 --- a/libraries/gtksourceview3/gtksourceview3.info +++ b/libraries/gtksourceview3/gtksourceview3.info @@ -1,10 +1,10 @@ PRGNAM="gtksourceview3" -VERSION="3.8.2" +VERSION="3.18.1" HOMEPAGE="http://projects.gnome.org/gtksourceview/" -DOWNLOAD="ftp://ftp.gnome.org/pub/gnome/sources/gtksourceview/3.8/gtksourceview-3.8.2.tar.xz" -MD5SUM="fa8a252f811b6042cfc2eb47e580609f" +DOWNLOAD="http://ftp.gnome.org/pub/GNOME/sources/gtksourceview/3.18/gtksourceview-3.18.1.tar.xz" +MD5SUM="b7600b6cc06ec96ce1d028bf7a44d14b" DOWNLOAD_x86_64="" MD5SUM_x86_64="" -REQUIRES="" +REQUIRES="glade" MAINTAINER="Willy Sudiarto Raharjo" EMAIL="willysr@slackbuilds.org" diff --git a/libraries/jemalloc/README b/libraries/jemalloc/README deleted file mode 100644 index 8b18ffb632..0000000000 --- a/libraries/jemalloc/README +++ /dev/null @@ -1 +0,0 @@ -jemalloc is a general-purpose scalable concurrent malloc(3) implementation. diff --git a/libraries/jemalloc/jemalloc.SlackBuild b/libraries/jemalloc/jemalloc.SlackBuild deleted file mode 100644 index f6bd6a9b37..0000000000 --- a/libraries/jemalloc/jemalloc.SlackBuild +++ /dev/null @@ -1,101 +0,0 @@ -#!/bin/sh - -# Slackware build script for jemalloc - -# Copyright 2012-2014 Heinz Wiesinger, Amsterdam, The Netherlands -# All rights reserved. -# -# Redistribution and use of this script, with or without modification, is -# permitted provided that the following conditions are met: -# -# 1. Redistributions of this script must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# -# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ''AS IS'' AND ANY EXPRESS OR IMPLIED -# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO -# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, -# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; -# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, -# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR -# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF -# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -PRGNAM=jemalloc -VERSION=${VERSION:-3.6.0} -BUILD=${BUILD:-1} -TAG=${TAG:-_SBo} - -if [ -z "$ARCH" ]; then - case "$( uname -m )" in - i?86) ARCH=i486 ;; - arm*) ARCH=arm ;; - *) ARCH=$( uname -m ) ;; - esac -fi - -CWD=$(pwd) -TMP=${TMP:-/tmp/SBo} -PKG=$TMP/package-$PRGNAM -OUTPUT=${OUTPUT:-/tmp} - -if [ "$ARCH" = "i486" ]; then - SLKCFLAGS="-O2 -march=i486 -mtune=i686" - LIBDIRSUFFIX="" - TARGET="x86" -elif [ "$ARCH" = "i686" ]; then - SLKCFLAGS="-O2 -march=i686 -mtune=i686" - LIBDIRSUFFIX="" - TARGET="x86" -elif [ "$ARCH" = "x86_64" ]; then - SLKCFLAGS="-O2 -fPIC" - LIBDIRSUFFIX="64" - TARGET="x86-64" -fi - -set -e - -rm -rf $PKG -mkdir -p $TMP $PKG $OUTPUT -cd $TMP -rm -rf $PRGNAM-$VERSION -tar xvf $CWD/$PRGNAM-$VERSION.tar.bz2 -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 640 -o -perm 600 -o -perm 444 \ - -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; - -CFLAGS="$SLKCFLAGS" \ -CXXFLAGS="$SLKCFLAGS" \ -./configure \ - --prefix=/usr \ - --libdir=/usr/lib$LIBDIRSUFFIX \ - --sysconfdir=/etc \ - --localstatedir=/var \ - --mandir=/usr/man \ - --build=$ARCH-slackware-linux - -make -make install DESTDIR=$PKG - -find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \ - | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true - -find $PKG/usr/man -type f -exec gzip -9 {} \; - -mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION -cp -a ChangeLog COPYING INSTALL README VERSION \ - $PKG/usr/doc/$PRGNAM-$VERSION -mv $PKG/usr/share/doc/jemalloc/* $PKG/usr/doc/$PRGNAM-$VERSION/ -rm -rf $PKG/usr/share -cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild - -mkdir -p $PKG/install -cat $CWD/slack-desc > $PKG/install/slack-desc - -cd $PKG -/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz} diff --git a/libraries/jemalloc/jemalloc.info b/libraries/jemalloc/jemalloc.info deleted file mode 100644 index b8d9a997ed..0000000000 --- a/libraries/jemalloc/jemalloc.info +++ /dev/null @@ -1,10 +0,0 @@ -PRGNAM="jemalloc" -VERSION="3.6.0" -HOMEPAGE="http://www.canonware.com/jemalloc/" -DOWNLOAD="http://www.canonware.com/download/jemalloc/jemalloc-3.6.0.tar.bz2" -MD5SUM="e76665b63a8fddf4c9f26d2fa67afdf2" -DOWNLOAD_x86_64="" -MD5SUM_x86_64="" -REQUIRES="" -MAINTAINER="Heinz Wiesinger" -EMAIL="pprkut@liwjatan.at" diff --git a/libraries/jemalloc/slack-desc b/libraries/jemalloc/slack-desc deleted file mode 100644 index 5613ba2b80..0000000000 --- a/libraries/jemalloc/slack-desc +++ /dev/null @@ -1,19 +0,0 @@ -# HOW TO EDIT THIS FILE: -# The "handy ruler" below makes it easier to edit a package description. -# Line up the first '|' above the ':' following the base package name, and -# the '|' on the right side marks the last column you can put a character in. -# You must make exactly 11 lines for the formatting to be correct. It's also -# customary to leave one space after the ':' except on otherwise blank lines. - - |-----handy-ruler------------------------------------------------------| -jemalloc: jemalloc (A memory allocator) -jemalloc: -jemalloc: jemalloc is a general-purpose scalable concurrent malloc(3) -jemalloc: implementation. -jemalloc: -jemalloc: Homepage: http://www.canonware.com/jemalloc/ -jemalloc: -jemalloc: -jemalloc: -jemalloc: -jemalloc: diff --git a/libraries/lame/lame.SlackBuild b/libraries/lame/lame.SlackBuild index 3b5d60bb07..bf04caabc0 100644 --- a/libraries/lame/lame.SlackBuild +++ b/libraries/lame/lame.SlackBuild @@ -70,6 +70,12 @@ find -L . \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ -exec chmod 644 {} \; +# Fix for the newer gcc +# http://www.linuxfromscratch.org/blfs/view/svn/multimedia/lame.html +case $(uname -m) in + i?86) sed -i -e '/xmmintrin\.h/d' configure ;; +esac + CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ ./configure \ diff --git a/libraries/libAfterImage/libAfterImage.SlackBuild b/libraries/libAfterImage/libAfterImage.SlackBuild index fac306d070..5f3ae72607 100644 --- a/libraries/libAfterImage/libAfterImage.SlackBuild +++ b/libraries/libAfterImage/libAfterImage.SlackBuild @@ -52,6 +52,9 @@ find -L . \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ -exec chmod 644 {} \; +# Patch for libpng16 (from Gentoo) +patch -p0 < $CWD/libafterimage-libpng15.patch + # Get rid of ldconfig in Makefile find . -name "Makefile*" -exec sed -i '/LDCONFIG/d' {} \; diff --git a/libraries/libAfterImage/libafterimage-libpng15.patch b/libraries/libAfterImage/libafterimage-libpng15.patch new file mode 100644 index 0000000000..44d5b94400 --- /dev/null +++ b/libraries/libAfterImage/libafterimage-libpng15.patch @@ -0,0 +1,31 @@ +--- export.c ++++ export.c +@@ -496,7 +496,7 @@ + png_ptr = png_create_write_struct( PNG_LIBPNG_VER_STRING, NULL, NULL, NULL ); + if ( png_ptr != NULL ) + if( (info_ptr = png_create_info_struct(png_ptr)) != NULL ) +- if( setjmp(png_ptr->jmpbuf) ) ++ if( setjmp(png_jmpbuf(png_ptr)) ) + { + png_destroy_info_struct(png_ptr, (png_infopp) &info_ptr); + info_ptr = NULL ; +--- import.c ++++ import.c +@@ -1251,7 +1251,7 @@ + * the normal method of doing things with libpng). REQUIRED unless you + * set up your own error handlers in the png_create_read_struct() earlier. + */ +- if ( !setjmp (png_ptr->jmpbuf)) ++ if ( !setjmp (png_jmpbuf(png_ptr))) + { + ASFlagType rgb_flags = ASStorage_RLEDiffCompress|ASStorage_32Bit ; + +@@ -1468,7 +1468,7 @@ + + static void asim_png_read_data(png_structp png_ptr, png_bytep data, png_size_t length) + { +- ASImPNGReadBuffer *buf = (ASImPNGReadBuffer *)png_ptr->io_ptr; ++ ASImPNGReadBuffer *buf = (ASImPNGReadBuffer *)png_get_io_ptr(png_ptr); + memcpy(data, buf->buffer, length); + buf->buffer += length; + } diff --git a/libraries/libaudclient/README b/libraries/libaudclient/README new file mode 100644 index 0000000000..ff836f5e95 --- /dev/null +++ b/libraries/libaudclient/README @@ -0,0 +1,2 @@ +libaudclient is a legacy D-Bus client library that used to be included +with Audacious. diff --git a/libraries/serf/serf.SlackBuild b/libraries/libaudclient/libaudclient.SlackBuild index fb81ac280b..2f88f048cd 100644 --- a/libraries/serf/serf.SlackBuild +++ b/libraries/libaudclient/libaudclient.SlackBuild @@ -1,8 +1,8 @@ #!/bin/sh -# Slackware build script for serf +# Slackware build script for libaudclient -# Copyright 2014 Andrzej Telszewski, Sabadell +# Copyright 2015 Matteo Bernardini <ponce@slackbuilds.org>, Pisa, Italy # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -22,10 +22,11 @@ # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -PRGNAM=serf -VERSION=${VERSION:-1.3.5} +PRGNAM=libaudclient +VERSION=${VERSION:-3.5_rc2} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} +SRCVER=$(echo $VERSION | tr _ - ) if [ -z "$ARCH" ]; then case "$( uname -m )" in @@ -59,33 +60,31 @@ set -e rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT cd $TMP -rm -rf $PRGNAM-$VERSION -tar xvf $CWD/$PRGNAM-$VERSION.tar.bz2 -cd $PRGNAM-$VERSION +rm -rf $PRGNAM-$SRCVER +tar xvf $CWD/$PRGNAM-$SRCVER.tar.?z* +cd $PRGNAM-$SRCVER 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 \ + -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 {} \; -# Disable build and install static library -# Thanks to LFS -# http://www.linuxfromscratch.org/blfs/view/svn/basicnet/serf.html -sed -i "/Default/s:lib_static,::" SConstruct -sed -i "/Alias/s:install_static,::" SConstruct +CFLAGS="$SLKCFLAGS" \ +CXXFLAGS="$SLKCFLAGS" \ +./configure \ + --prefix=/usr \ + --libdir=/usr/lib${LIBDIRSUFFIX} \ + --build=$ARCH-slackware-linux -scons \ - PREFIX=/usr \ - LIBDIR=/usr/lib${LIBDIRSUFFIX} \ - CFLAGS="$SLKCFLAGS" -scons install --install-sandbox=$PKG +make +make install DESTDIR=$PKG 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 CHANGES design-guide.txt LICENSE NOTICE README $PKG/usr/doc/$PRGNAM-$VERSION +cp -a AUTHORS COPYING $PKG/usr/doc/$PRGNAM-$VERSION cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild mkdir -p $PKG/install diff --git a/libraries/libaudclient/libaudclient.info b/libraries/libaudclient/libaudclient.info new file mode 100644 index 0000000000..f8b8ad827b --- /dev/null +++ b/libraries/libaudclient/libaudclient.info @@ -0,0 +1,10 @@ +PRGNAM="libaudclient" +VERSION="3.5_rc2" +HOMEPAGE="http://audacious-media-player.org" +DOWNLOAD="http://distfiles.audacious-media-player.org/libaudclient-3.5-rc2.tar.bz2" +MD5SUM="5c7006c39091226180c320e253270653" +DOWNLOAD_x86_64="" +MD5SUM_x86_64="" +REQUIRES="" +MAINTAINER="Matteo Bernardini" +EMAIL="ponce@slackbuilds.org" diff --git a/libraries/libaudclient/slack-desc b/libraries/libaudclient/slack-desc new file mode 100644 index 0000000000..3d29171d90 --- /dev/null +++ b/libraries/libaudclient/slack-desc @@ -0,0 +1,19 @@ +# HOW TO EDIT THIS FILE: +# The "handy ruler" below makes it easier to edit a package description. +# Line up the first '|' above the ':' following the base package name, and +# the '|' on the right side marks the last column you can put a character in. +# You must make exactly 11 lines for the formatting to be correct. It's also +# customary to leave one space after the ':' except on otherwise blank lines. + + |-----handy-ruler------------------------------------------------------| +libaudclient: libaudclient (legacy dbus audacious client library) +libaudclient: +libaudclient: libaudclient is a legacy D-Bus client library that used to be included +libaudclient: with Audacious. +libaudclient: +libaudclient: homepage: http://audacious-media-player.org +libaudclient: +libaudclient: +libaudclient: +libaudclient: +libaudclient: diff --git a/libraries/libbde/libbde.SlackBuild b/libraries/libbde/libbde.SlackBuild index 583a479c2f..afbca63ad8 100644 --- a/libraries/libbde/libbde.SlackBuild +++ b/libraries/libbde/libbde.SlackBuild @@ -72,8 +72,8 @@ 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 {} \; -CFLAGS="$SLKCFLAGS" \ -CXXFLAGS="$SLKCFLAGS" \ +CFLAGS="$SLKCFLAGS -std=gnu89" \ +CXXFLAGS="$SLKCFLAGS -std=gnu89" \ ./configure \ --prefix=/usr \ --libdir=/usr/lib${LIBDIRSUFFIX} \ diff --git a/libraries/libcacard/README b/libraries/libcacard/README new file mode 100644 index 0000000000..ea7c6152fc --- /dev/null +++ b/libraries/libcacard/README @@ -0,0 +1,4 @@ +This emulator is designed to provide emulation of actual smart cards +to a virtual card reader running in a guest virtual machine. The +emulates smart cards can be representations of real smart cards, or +the cards could be pure software constructs. diff --git a/development/judy/judy.SlackBuild b/libraries/libcacard/libcacard.SlackBuild index a5eb01fe12..66d256bb7c 100644 --- a/development/judy/judy.SlackBuild +++ b/libraries/libcacard/libcacard.SlackBuild @@ -1,7 +1,8 @@ #!/bin/sh -# Slackware build script for judy -# Copyright Matteo Bernardini <ponce@slackbuilds.org>, Pisa, Italy, 2012 +# Slackware build script for libcacard + +# Copyright 2012-2015 Matteo Bernardini <ponce@slackbuilds.org>, Pisa, Italy # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -21,10 +22,9 @@ # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -PRGNAM=judy -SRCNAM=Judy -VERSION=${VERSION:-1.0.5} -BUILD=${BUILD:-2} +PRGNAM=libcacard +VERSION=${VERSION:-2.5.1} +BUILD=${BUILD:-1} TAG=${TAG:-_SBo} if [ -z "$ARCH" ]; then @@ -54,15 +54,15 @@ else LIBDIRSUFFIX="" fi -DOCS="AUTHORS COPYING ChangeLog README" +DOCS="COPYING ChangeLog NEWS README.md" -set -e +set -e rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT cd $TMP rm -rf $PRGNAM-$VERSION -tar xvf $CWD/$SRCNAM-$VERSION.tar.gz +tar xvf $CWD/$PRGNAM-$VERSION.tar.?z* cd $PRGNAM-$VERSION chown -R root:root . find -L . \ @@ -71,11 +71,8 @@ find -L . \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ -exec chmod 644 {} \; -# Allow parallel make, thanks gentoo -patch -p0 < $CWD/judy-1.0.5-parallel-make.patch - -autoreconf -fi - +#LDFLAGS="-lnss3 -lpthread" \ +#CPPFLAGS="-I/usr/include/nss -I/usr/include/nspr" \ CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ ./configure \ @@ -94,9 +91,6 @@ make install DESTDIR=$PKG 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 -find $PKG/usr/man -type f -exec gzip -9 {} \; -for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done - mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION cp -a $DOCS $PKG/usr/doc/$PRGNAM-$VERSION cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild diff --git a/libraries/libcacard/libcacard.info b/libraries/libcacard/libcacard.info new file mode 100644 index 0000000000..d8641b0ca8 --- /dev/null +++ b/libraries/libcacard/libcacard.info @@ -0,0 +1,10 @@ +PRGNAM="libcacard" +VERSION="2.5.1" +HOMEPAGE="http://spice-space.org" +DOWNLOAD="http://spice-space.org/download/libcacard/libcacard-2.5.1.tar.xz" +MD5SUM="85276a16c24a8961b09cbcc18d7d853b" +DOWNLOAD_x86_64="" +MD5SUM_x86_64="" +REQUIRES="pcsc-lite" +MAINTAINER="Matteo Bernardini" +EMAIL="ponce@slackbuilds.org" diff --git a/libraries/openjpeg2/slack-desc b/libraries/libcacard/slack-desc index dc4f697226..ef68876697 100644 --- a/libraries/openjpeg2/slack-desc +++ b/libraries/libcacard/slack-desc @@ -6,14 +6,14 @@ # customary to leave one space after the ':' except on otherwise blank lines. |-----handy-ruler------------------------------------------------------| -openjpeg2: openjpeg2 (open-source JPEG 2000 codec) -openjpeg2: -openjpeg2: The OpenJPEG library is an open-source JPEG 2000 codec. This is -openjpeg2: version 2.x of OpenJPEG, which is API-incompatible with the 1.x -openjpeg2: series. For the 1.x API, install the openjpeg build. Both openjpeg -openjpeg2: and openjpeg2 can be installed on the same system with no conflicts. -openjpeg2: -openjpeg2: -openjpeg2: -openjpeg2: -openjpeg2: +libcacard: libcacard (Virtual Smart Card Emulator library) +libcacard: +libcacard: This emulator is designed to provide emulation of actual smart cards +libcacard: to a virtual card reader running in a guest virtual machine. The +libcacard: emulates smart cards can be representations of real smart cards, or +libcacard: the cards could be pure software constructs. +libcacard: +libcacard: Homepage: http://spice-space.org +libcacard: +libcacard: +libcacard: diff --git a/libraries/libcec/libcec-3.0.1_2f32a9d.patch b/libraries/libcec/libcec-3.0.1_2f32a9d.patch new file mode 100644 index 0000000000..db94adb0bb --- /dev/null +++ b/libraries/libcec/libcec-3.0.1_2f32a9d.patch @@ -0,0 +1,25 @@ +From 2f32a9debc1f148b5dfcfc463480f1432bb71725 Mon Sep 17 00:00:00 2001 +From: Lars Op den Kamp <lars@opdenkamp.eu> +Date: Sat, 11 Jul 2015 00:53:17 +0200 +Subject: [PATCH] fixed: don't generate an invalid env.h when not built with + the .git dir present. closes #112 + +--- + support/git-rev.sh | 7 +++++-- + 1 file changed, 5 insertions(+), 2 deletions(-) + +diff --git a/support/git-rev.sh b/support/git-rev.sh +index 5dce3d0..4aadae6 100755 +--- a/support/git-rev.sh ++++ b/support/git-rev.sh +@@ -1,5 +1,8 @@ + #!/bin/sh + + ## cmake doesn't read the variable when it doesn't end with a newline, and I haven't figured out how to have it add a newline directly... +-echo -n "`git --no-pager log --abbrev=7 -n 1 --pretty=format:"%h"`\n" +- ++if [ -d .git ]; then ++ echo "`git --no-pager log --abbrev=7 -n 1 --pretty=format:"%h"`" ++else ++ echo "<unknown>" ++fi diff --git a/libraries/libcec/libcec.SlackBuild b/libraries/libcec/libcec.SlackBuild index c999ae146a..e441c6bec1 100644 --- a/libraries/libcec/libcec.SlackBuild +++ b/libraries/libcec/libcec.SlackBuild @@ -69,6 +69,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 libcec-3.0.1 issue 112/115 on Github (upstream commit 2f32a9d) +patch -p1 < $CWD/libcec-3.0.1_2f32a9d.patch + # Fix python install folder. sed -i \ -e "s|lib/|lib${LIBDIRSUFFIX}/|" -e 's|dist-|site-|' \ diff --git a/libraries/libcryptui/libcryptui.SlackBuild b/libraries/libcryptui/libcryptui.SlackBuild index d673868791..cdeada12b7 100644 --- a/libraries/libcryptui/libcryptui.SlackBuild +++ b/libraries/libcryptui/libcryptui.SlackBuild @@ -1,7 +1,7 @@ #!/bin/sh # Slackware build script for libcryptui -# Copyright 2013 Matteo Bernardini <ponce@slackbuilds.org>, Pisa, Italy +# Copyright 2013-2015 Matteo Bernardini <ponce@slackbuilds.org>, Pisa, Italy # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -22,7 +22,7 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=libcryptui -VERSION=${VERSION:-3.8.0} +VERSION=${VERSION:-3.12.2} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -80,6 +80,7 @@ CXXFLAGS="$SLKCFLAGS" \ --mandir=/usr/man \ --docdir=/usr/doc/$PRGNAM-$VERSION \ --enable-introspection \ + --disable-static \ --build=$ARCH-slackware-linux make diff --git a/libraries/libcryptui/libcryptui.info b/libraries/libcryptui/libcryptui.info index 3ca903b184..53835718f9 100644 --- a/libraries/libcryptui/libcryptui.info +++ b/libraries/libcryptui/libcryptui.info @@ -1,8 +1,8 @@ PRGNAM="libcryptui" -VERSION="3.8.0" +VERSION="3.12.2" HOMEPAGE="http://gnome.org" -DOWNLOAD="http://ftp.gnome.org/pub/gnome/sources/libcryptui/3.8/libcryptui-3.8.0.tar.xz" -MD5SUM="cb76ee124166b120555bb1f836544b00" +DOWNLOAD="http://ftp.gnome.org/pub/GNOME/sources/libcryptui/3.12/libcryptui-3.12.2.tar.xz" +MD5SUM="da0ca49a8854e33aecce949f62def9d7" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" diff --git a/libraries/libdv/libdv.SlackBuild b/libraries/libdv/libdv.SlackBuild index 152cca0e21..845e7d9076 100644 --- a/libraries/libdv/libdv.SlackBuild +++ b/libraries/libdv/libdv.SlackBuild @@ -24,7 +24,7 @@ PRGNAM=libdv VERSION=1.0.0 -BUILD=${BUILD:-1} +BUILD=${BUILD:-2} TAG=${TAG:-_SBo} if [ -z "$ARCH" ]; then @@ -78,6 +78,9 @@ CXXFLAGS="$SLKCFLAGS" \ --localstatedir=/var \ --mandir=/usr/man \ --enable-sdl \ + --without-debug \ + --disable-gtk \ + --disable-gtktest \ --build=$ARCH-slackware-linux make diff --git a/libraries/libdvbpsi/libdvbpsi.SlackBuild b/libraries/libdvbpsi/libdvbpsi.SlackBuild index 7b493ff4eb..b4b0f4fa74 100644 --- a/libraries/libdvbpsi/libdvbpsi.SlackBuild +++ b/libraries/libdvbpsi/libdvbpsi.SlackBuild @@ -69,7 +69,7 @@ find -L . \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ -exec chmod 644 {} \; -CFLAGS="$SLKCFLAGS" \ +CFLAGS="$SLKCFLAGS -Wno-error=bool-compare" \ CXXFLAGS="$SLKCFLAGS" \ ./configure \ --prefix=/usr \ diff --git a/libraries/libdvdnav/README b/libraries/libdvdnav/README deleted file mode 100644 index 55f8e76c37..0000000000 --- a/libraries/libdvdnav/README +++ /dev/null @@ -1,3 +0,0 @@ -This is mplayer's fork of libdvdnav. libdvdnav is a library that allows easy -use of sophisticated DVD navigation features such as DVD menus, multiangle -playback, and even interactive DVD games. diff --git a/libraries/libdvdnav/libdvdnav.SlackBuild b/libraries/libdvdnav/libdvdnav.SlackBuild deleted file mode 100644 index 4adf5b8ea7..0000000000 --- a/libraries/libdvdnav/libdvdnav.SlackBuild +++ /dev/null @@ -1,96 +0,0 @@ -#!/bin/sh - -# Slackware build script for libdvdnav - -# Copyright 2007-2012 Heinz Wiesinger, Amsterdam, The Netherlands -# All rights reserved. -# -# Redistribution and use of this script, with or without modification, is -# permitted provided that the following conditions are met: -# -# 1. Redistributions of this script must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# -# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ''AS IS'' AND ANY EXPRESS OR IMPLIED -# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO -# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, -# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; -# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, -# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR -# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF -# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -PRGNAM=libdvdnav -VERSION=4.2.0 -BUILD=${BUILD:-1} -TAG=${TAG:-_SBo} - -if [ -z "$ARCH" ]; then - case "$( uname -m )" in - i?86) ARCH=i486 ;; - arm*) ARCH=arm ;; - *) ARCH=$( uname -m ) ;; - esac -fi - -CWD=$(pwd) -TMP=${TMP:-/tmp/SBo} -PKG=$TMP/package-$PRGNAM -OUTPUT=${OUTPUT:-/tmp} - -if [ "$ARCH" = "i486" ]; then - SLKCFLAGS="-O2 -march=i486 -mtune=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "i686" ]; then - SLKCFLAGS="-O2 -march=i686 -mtune=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "x86_64" ]; then - SLKCFLAGS="-O2 -fPIC" - LIBDIRSUFFIX="64" -else - SLKCFLAGS="-O2" - LIBDIRSUFFIX="" -fi - -set -e - -rm -rf $PKG -mkdir -p $TMP $PKG $OUTPUT -cd $TMP -rm -rf $PRGNAM-$VERSION -tar xvf $CWD/$PRGNAM-$VERSION.tar.bz2 -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 640 -o -perm 600 -o -perm 444 \ - -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; - -./autogen.sh - -CFLAGS="$SLKCFLAGS" \ -CXXFLAGS="$SLKCFLAGS" \ -./configure \ - --prefix=/usr \ - --libdir=/usr/lib${LIBDIRSUFFIX} \ - --sysconfdir=/etc \ - --localstatedir=/var \ - --disable-static \ - --build=$ARCH-slackware-linux - -make -make install-strip DESTDIR=$PKG - -mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION -cp -a AUTHORS ChangeLog COPYING DEVELOPMENT-POLICY.txt \ - INSTALL NEWS README TODO $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 - -cd $PKG -/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz} diff --git a/libraries/libdvdnav/libdvdnav.info b/libraries/libdvdnav/libdvdnav.info deleted file mode 100644 index 1fd0f4b622..0000000000 --- a/libraries/libdvdnav/libdvdnav.info +++ /dev/null @@ -1,10 +0,0 @@ -PRGNAM="libdvdnav" -VERSION="4.2.0" -HOMEPAGE="http://dvdnav.mplayerhq.hu/" -DOWNLOAD="http://dvdnav.mplayerhq.hu/releases/libdvdnav-4.2.0.tar.bz2" -MD5SUM="53be8903f9802e101929a3451203bbf6" -DOWNLOAD_x86_64="" -MD5SUM_x86_64="" -REQUIRES="" -MAINTAINER="Heinz Wiesinger" -EMAIL="pprkut@liwjatan.at" diff --git a/libraries/libepoxy/README b/libraries/libepoxy/README deleted file mode 100644 index 5c60683fbe..0000000000 --- a/libraries/libepoxy/README +++ /dev/null @@ -1,18 +0,0 @@ -Epoxy is a library for handling OpenGL function pointer management for you. - -It hides the complexity of dlopen(), dlsym(), glXGetProcAddress(), -eglGetProcAddress(), etc. from the app developer, with very little knowledge -needed on their part. They get to read GL specs and write code using -undecorated function names like glCompileShader(). - -libepoxy can be used during the build process of xorg-server. To enable the use -of libepoxy, edit the x/x11/configure/xorg-server file in the Slackware source -tree, and add this configure flag to the ./configure section: - ---enable-glamor \ - -*Note*: If you have installed the wayland-1.6.0 package from SBo, you can build -Xwayland server for usage with a Wayland capable display compositor. - -This package requires MesaLib be installed prior to building from the Slackware -default package schema. diff --git a/libraries/libepoxy/libepoxy.SlackBuild b/libraries/libepoxy/libepoxy.SlackBuild deleted file mode 100644 index 329456f0ea..0000000000 --- a/libraries/libepoxy/libepoxy.SlackBuild +++ /dev/null @@ -1,98 +0,0 @@ -#!/bin/sh -# Slackware build script for libepoxy - -# Copyright 2015 James Powell james4591@hotmail.com Tulare, CA, USA -# All rights reserved. -# -# Redistribution and use of this script, with or without modification, is -# permitted provided that the following conditions are met: -# -# 1. Redistributions of this script must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# -# THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED -# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO -# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, -# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; -# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, -# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR -# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF -# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -PRGNAM=libepoxy -VERSION=${VERSION:-1.3.1} -BUILD=${BUILD:-1} -TAG=${TAG:-_SBo} - -if [ -z "$ARCH" ]; then - case "$( uname -m )" in - i?86) export ARCH=i486 ;; - arm*) export ARCH=arm ;; - *) export ARCH=$( uname -m ) ;; - esac -fi - -CWD=$(pwd) -TMP=${TMP:-/tmp/SBo} -PKG=$TMP/package-$PRGNAM -OUTPUT=${OUTPUT:-/tmp} - -if [ "$ARCH" = "i486" ]; then - SLKCFLAGS="-O2 -march=i486 -mtune=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "i686" ]; then - SLKCFLAGS="-O2 -march=i686 -mtune=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "x86_64" ]; then - SLKCFLAGS="-O2 -fPIC" - LIBDIRSUFFIX="64" -else - SLKCFLAGS="-O2" - LIBDIRSUFFIX="" -fi - -set -e - -rm -rf $PKG -mkdir -p $TMP $PKG $OUTPUT -cd $TMP -rm -rf $PRGNAM-$VERSION -tar xvf $CWD/$PRGNAM-$VERSION.tar.bz2 -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 640 -o -perm 600 -o -perm 444 \ - -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; - -CFLAGS="$SLKCFLAGS" \ -CXXFLAGS="$SLKCFLAGS" \ -./configure \ - --prefix=/usr \ - --libdir=/usr/lib${LIBDIRSUFFIX} \ - --sysconfdir=/etc \ - --localstatedir=/var \ - --docdir=/usr/doc/$PRGNAM-$VERSION \ - --build=$ARCH-slackware-linux - -make -j3 -make install DESTDIR=$PKG - -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 README.md \ - $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 -[ -f $CWD/doinst.sh ] && cat $CWD/doinst.sh > $PKG/install/doinst.sh - -cd $PKG -/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz} diff --git a/libraries/libepoxy/libepoxy.info b/libraries/libepoxy/libepoxy.info deleted file mode 100644 index 8da270022c..0000000000 --- a/libraries/libepoxy/libepoxy.info +++ /dev/null @@ -1,10 +0,0 @@ -PRGNAM="libepoxy" -VERSION="1.3.1" -HOMEPAGE="https://github.com/anholt/libepoxy" -DOWNLOAD="https://github.com/anholt/libepoxy/releases/download/v1.3.1/libepoxy-1.3.1.tar.bz2" -MD5SUM="96f6620a9b005a503e7b44b0b528287d" -DOWNLOAD_x86_64="" -MD5SUM_x86_64="" -REQUIRES="" -MAINTAINER="James Powell" -EMAIL="james4591@hotmail.com" diff --git a/libraries/libepoxy/slack-desc b/libraries/libepoxy/slack-desc deleted file mode 100644 index 6f1108a947..0000000000 --- a/libraries/libepoxy/slack-desc +++ /dev/null @@ -1,19 +0,0 @@ -# HOW TO EDIT THIS FILE: -# The "handy ruler" below makes it easier to edit a package description. Line -# up the first '|' above the ':' following the base package name, and the '|' -# on the right side marks the last column you can put a character in. You must -# make exactly 11 lines for the formatting to be correct. It's also -# customary to leave one space after the ':'. - - |-----handy-ruler------------------------------------------------------| -libepoxy: libepoxy (OpenGL library) -libepoxy: -libepoxy: Epoxy is a library for handling OpenGL function pointer management -libepoxy: for you. It hides the complexity of dlopen(), dlsym(), -libepoxy: glXGetProcAddress(), eglGetProcAddress(), etc. from the app -libepoxy: developer, with very little knowledge needed on their part. They -libepoxy: get to read GL specs and write code using undecorated function -libepoxy: names like glCompileShader(). -libepoxy: -libepoxy: -libepoxy: Home: https://github.com/anholt/libepoxy diff --git a/libraries/libesedb/libesedb.SlackBuild b/libraries/libesedb/libesedb.SlackBuild index 1bc1518b2c..ba098c020d 100644 --- a/libraries/libesedb/libesedb.SlackBuild +++ b/libraries/libesedb/libesedb.SlackBuild @@ -72,8 +72,8 @@ 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 {} \; -CFLAGS="$SLKCFLAGS" \ -CXXFLAGS="$SLKCFLAGS" \ +CFLAGS="$SLKCFLAGS -std=gnu89" \ +CXXFLAGS="$SLKCFLAGS -std=gnu89" \ ./configure \ --prefix=/usr \ --libdir=/usr/lib${LIBDIRSUFFIX} \ diff --git a/libraries/libevt/libevt.SlackBuild b/libraries/libevt/libevt.SlackBuild index 09595532c0..eba6cb71a2 100644 --- a/libraries/libevt/libevt.SlackBuild +++ b/libraries/libevt/libevt.SlackBuild @@ -72,8 +72,8 @@ 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 {} \; -CFLAGS="$SLKCFLAGS" \ -CXXFLAGS="$SLKCFLAGS" \ +CFLAGS="$SLKCFLAGS -std=gnu89" \ +CXXFLAGS="$SLKCFLAGS -std=gnu89" \ ./configure \ --prefix=/usr \ --libdir=/usr/lib${LIBDIRSUFFIX} \ diff --git a/libraries/libevtx/libevtx.SlackBuild b/libraries/libevtx/libevtx.SlackBuild index abbff82330..ebd52efa0b 100644 --- a/libraries/libevtx/libevtx.SlackBuild +++ b/libraries/libevtx/libevtx.SlackBuild @@ -72,8 +72,8 @@ 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 {} \; -CFLAGS="$SLKCFLAGS" \ -CXXFLAGS="$SLKCFLAGS" \ +CFLAGS="$SLKCFLAGS -std=gnu89" \ +CXXFLAGS="$SLKCFLAGS -std=gnu89" \ ./configure \ --prefix=/usr \ --libdir=/usr/lib${LIBDIRSUFFIX} \ diff --git a/libraries/libewf/libewf.SlackBuild b/libraries/libewf/libewf.SlackBuild index 5ab18d63e4..b51deea6c7 100644 --- a/libraries/libewf/libewf.SlackBuild +++ b/libraries/libewf/libewf.SlackBuild @@ -72,8 +72,8 @@ 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 {} \; -CFLAGS="$SLKCFLAGS" \ -CXXFLAGS="$SLKCFLAGS" \ +CFLAGS="$SLKCFLAGS -std=gnu89" \ +CXXFLAGS="$SLKCFLAGS -std=gnu89" \ ./configure \ --prefix=/usr \ --libdir=/usr/lib${LIBDIRSUFFIX} \ diff --git a/libraries/libgda/libgda.SlackBuild b/libraries/libgda/libgda.SlackBuild index 81828266eb..071e1f3a45 100644 --- a/libraries/libgda/libgda.SlackBuild +++ b/libraries/libgda/libgda.SlackBuild @@ -23,8 +23,8 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=libgda -VERSION=${VERSION:-5.2.2} -BUILD=${BUILD:-2} +VERSION=${VERSION:-5.2.4} +BUILD=${BUILD:-1} TAG=${TAG:-_SBo} if [ -z "$ARCH" ]; then diff --git a/libraries/libgda/libgda.info b/libraries/libgda/libgda.info index ba6b8af9cf..a6b032478b 100644 --- a/libraries/libgda/libgda.info +++ b/libraries/libgda/libgda.info @@ -1,8 +1,8 @@ PRGNAM="libgda" -VERSION="5.2.2" +VERSION="5.2.4" HOMEPAGE="http://www.gnome.org/" -DOWNLOAD="http://ftp.gnome.org/pub/GNOME/sources/libgda/5.2/libgda-5.2.2.tar.xz" -MD5SUM="d2676630e621ddf5db6e336e62c23742" +DOWNLOAD="http://ftp.gnome.org/pub/GNOME/sources/libgda/5.2/libgda-5.2.4.tar.xz" +MD5SUM="d008c9e9af2e9cd35dfe550cfbfd99d6" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" diff --git a/libraries/libgdiplus/libgdiplus.SlackBuild b/libraries/libgdiplus/libgdiplus.SlackBuild index 79e7cb1da2..d3dea180a1 100644 --- a/libraries/libgdiplus/libgdiplus.SlackBuild +++ b/libraries/libgdiplus/libgdiplus.SlackBuild @@ -73,7 +73,7 @@ find -L . \ # Patch for latest giflib (current) # from https://github.com/pld-linux/libgdiplus/blob/master/libgdiplus-giflib.patch -# patch -p1 < $CWD/libgdiplus-giflib.patch +patch -p1 < $CWD/libgdiplus-giflib.patch CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ diff --git a/libraries/libgee/libgee.SlackBuild b/libraries/libgee/libgee.SlackBuild index 8d22f8e147..5cb601e402 100644 --- a/libraries/libgee/libgee.SlackBuild +++ b/libraries/libgee/libgee.SlackBuild @@ -24,7 +24,7 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=libgee -VERSION=${VERSION:-0.16.1} +VERSION=${VERSION:-0.18.0} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} diff --git a/libraries/libgee/libgee.info b/libraries/libgee/libgee.info index 2d12da6434..f766962462 100644 --- a/libraries/libgee/libgee.info +++ b/libraries/libgee/libgee.info @@ -1,8 +1,8 @@ PRGNAM="libgee" -VERSION="0.16.1" +VERSION="0.18.0" HOMEPAGE="http://live.gnome.org/Libgee" -DOWNLOAD="http://ftp.gnome.org/pub/gnome/sources/libgee/0.16/libgee-0.16.1.tar.xz" -MD5SUM="d30cf203784431b0fdc3216b1acd999c" +DOWNLOAD="http://ftp.gnome.org/pub/GNOME/sources/libgee/0.18/libgee-0.18.0.tar.xz" +MD5SUM="29ea6125e653d7e60b49a9a9544abc96" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="vala" diff --git a/libraries/libgexiv2/libgexiv2.SlackBuild b/libraries/libgexiv2/libgexiv2.SlackBuild index 0e4511fd4d..be7abf73da 100644 --- a/libraries/libgexiv2/libgexiv2.SlackBuild +++ b/libraries/libgexiv2/libgexiv2.SlackBuild @@ -24,8 +24,8 @@ PRGNAM=libgexiv2 SRCNAM=gexiv2 -VERSION=${VERSION:-0.7.0} -BUILD=${BUILD:-3} +VERSION=${VERSION:-0.10.3} +BUILD=${BUILD:-1} TAG=${TAG:-_SBo} if [ -z "$ARCH" ]; then @@ -70,28 +70,22 @@ 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 {} \; -sed -i "/^libdir/s|/lib$|/lib${LIBDIRSUFFIX}|" gexiv2.m4 - CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ ./configure \ --prefix=/usr \ - --build=$ARCH-slackware-linux \ + --libdir=/usr/lib${LIBDIRSUFFIX} \ --enable-introspection \ + --build=$ARCH-slackware-linux - -make \ - DESTDIR=$PKG \ - LIB=lib${LIBDIRSUFFIX} -make install \ - DESTDIR=$PKG \ - LIB=lib${LIBDIRSUFFIX} +make +make install DESTDIR=$PKG 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 AUTHORS COPYING INSTALLING MAINTAINERS NEWS README THANKS $PKG/usr/doc/$PRGNAM-$VERSION +cp -a AUTHORS COPYING NEWS README THANKS $PKG/usr/doc/$PRGNAM-$VERSION cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild mkdir -p $PKG/install diff --git a/libraries/libgexiv2/libgexiv2.info b/libraries/libgexiv2/libgexiv2.info index ee2c6b934c..6942a4f407 100644 --- a/libraries/libgexiv2/libgexiv2.info +++ b/libraries/libgexiv2/libgexiv2.info @@ -1,10 +1,10 @@ PRGNAM="libgexiv2" -VERSION="0.7.0" +VERSION="0.10.3" HOMEPAGE="https://wiki.gnome.org/gexiv2" -DOWNLOAD="http://ftp.gnome.org/pub/gnome/sources/gexiv2/0.7/gexiv2-0.7.0.tar.xz" -MD5SUM="de3619e5d2b621c19fdcf77b17d25d25" +DOWNLOAD="http://ftp.gnome.org/pub/GNOME/sources/gexiv2/0.10/gexiv2-0.10.3.tar.xz" +MD5SUM="f255100a009027d4eaa0f075bb79c655" DOWNLOAD_x86_64="" MD5SUM_x86_64="" -REQUIRES="" +REQUIRES="vala" MAINTAINER="Soydaner Ulker" EMAIL="soydaner@kahverengi.com" diff --git a/libraries/libgksu/libgksu.SlackBuild b/libraries/libgksu/libgksu.SlackBuild index 6d61b3fa2e..6bdbbe3bb9 100644 --- a/libraries/libgksu/libgksu.SlackBuild +++ b/libraries/libgksu/libgksu.SlackBuild @@ -86,7 +86,7 @@ fi touch NEWS README libtoolize --force --copy --install -autoreconf +autoreconf -vif CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ diff --git a/libraries/libglademm/libglademm.SlackBuild b/libraries/libglademm/libglademm.SlackBuild index 850ff2265e..85c8041e7c 100644 --- a/libraries/libglademm/libglademm.SlackBuild +++ b/libraries/libglademm/libglademm.SlackBuild @@ -70,7 +70,7 @@ find -L . \ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; CFLAGS="$SLKCFLAGS" \ -CXXFLAGS="$SLKCFLAGS" +CXXFLAGS="$SLKCFLAGS -std=c++11" \ ./configure \ --prefix=/usr \ --libdir=/usr/lib$LIBDIRSUFFIX \ diff --git a/libraries/libglpng/libglpng.SlackBuild b/libraries/libglpng/libglpng.SlackBuild index 2a4a063ee1..7fbc0afac0 100644 --- a/libraries/libglpng/libglpng.SlackBuild +++ b/libraries/libglpng/libglpng.SlackBuild @@ -69,7 +69,7 @@ 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 {} \; -patch -p1 < $CWD/libglpng-1.45-extra_cflags.patch +for i in $CWD/patches/* ; do patch -p1 < $i ; done make EXTRA_CFLAGS="$SLKCFLAGS" make install DOCDIR=$PKG/usr/doc/$PRGNAM-$VERSION DESTDIR=$PKG/usr diff --git a/libraries/libglpng/patches/libglpng-1.45-CVE-2010-1519.patch b/libraries/libglpng/patches/libglpng-1.45-CVE-2010-1519.patch new file mode 100644 index 0000000000..04869bbd99 --- /dev/null +++ b/libraries/libglpng/patches/libglpng-1.45-CVE-2010-1519.patch @@ -0,0 +1,159 @@ +diff -up libglpng-1.45.orig/src/glpng.c.cve libglpng-1.45.orig/src/glpng.c +--- libglpng-1.45.orig/src/glpng.c.cve 2010-09-10 14:13:37.105046660 +0200 ++++ libglpng-1.45.orig/src/glpng.c 2010-09-10 14:14:46.158045715 +0200 +@@ -28,6 +28,7 @@ + #include <GL/glpng.h> + #include <GL/gl.h>
+ #include <stdlib.h> ++#include <stdint.h> + #include <math.h> + #include <png.h> +
+@@ -259,9 +260,9 @@ int APIENTRY pngLoadRawF(FILE *fp, pngRa + png_structp png; + png_infop info; + png_infop endinfo; +- png_bytep data; +- png_bytep *row_p; +- double fileGamma; ++ png_bytep data = NULL; ++ png_bytep *row_p = NULL; ++ double fileGamma; + + png_uint_32 width, height; + int depth, color; +@@ -274,13 +275,19 @@ int APIENTRY pngLoadRawF(FILE *fp, pngRa + if (!png_check_sig(header, 8)) return 0; + + png = png_create_read_struct(PNG_LIBPNG_VER_STRING, NULL, NULL, NULL); ++ if (!png) return 0; + info = png_create_info_struct(png); ++ if (!info) return 0; + endinfo = png_create_info_struct(png); ++ if (!endinfo) return 0; + + // DH: added following lines
+ if (setjmp(png->jmpbuf))
+ {
++error: + png_destroy_read_struct(&png, &info, &endinfo);
++ free(data); ++ free(row_p); + return 0;
+ }
+ // ~DH
+@@ -303,8 +310,16 @@ int APIENTRY pngLoadRawF(FILE *fp, pngRa + + png_read_update_info(png, info); + ++ /* HDG: We allocate all the png data in one linear array, thus ++ height * png_get_rowbytes() may not be > PNG_UINT_32_MAX ! ++ This check fixes CVE-2010-1519. */ ++ if ((uint64_t)height * png_get_rowbytes(png, info) > PNG_UINT_32_MAX) ++ goto error; ++ + data = (png_bytep) malloc(png_get_rowbytes(png, info)*height); + row_p = (png_bytep *) malloc(sizeof(png_bytep)*height); ++ if (!data || !row_p) ++ goto error; +
+ for (i = 0; i < height; i++) { + if (StandardOrientation)
+@@ -315,6 +330,7 @@ int APIENTRY pngLoadRawF(FILE *fp, pngRa + + png_read_image(png, row_p); + free(row_p); ++ row_p = NULL; + + if (color == PNG_COLOR_TYPE_PALETTE) { + int cols; +@@ -365,9 +381,10 @@ int APIENTRY pngLoadF(FILE *fp, int mipm + png_structp png; + png_infop info; + png_infop endinfo; +- png_bytep data, data2; +- png_bytep *row_p; +- double fileGamma; ++ png_bytep data = NULL; ++ png_bytep data2 = NULL; ++ png_bytep *row_p = NULL; ++ double fileGamma; + + png_uint_32 width, height, rw, rh; + int depth, color; +@@ -378,13 +395,20 @@ int APIENTRY pngLoadF(FILE *fp, int mipm + if (!png_check_sig(header, 8)) return 0; + + png = png_create_read_struct(PNG_LIBPNG_VER_STRING, NULL, NULL, NULL); ++ if (!png) return 0; + info = png_create_info_struct(png); ++ if (!info) return 0; + endinfo = png_create_info_struct(png); ++ if (!endinfo) return 0; + + // DH: added following lines
+ if (setjmp(png->jmpbuf))
+ {
++error: + png_destroy_read_struct(&png, &info, &endinfo);
++ free(data); ++ free(data2); ++ free(row_p); + return 0;
+ }
+ // ~DH
+@@ -442,8 +466,16 @@ int APIENTRY pngLoadF(FILE *fp, int mipm + + png_read_update_info(png, info); + ++ /* HDG: We allocate all the png data in one linear array, thus ++ height * png_get_rowbytes() may not be > PNG_UINT_32_MAX ! ++ This check fixes CVE-2010-1519. */ ++ if ((uint64_t)height * png_get_rowbytes(png, info) > PNG_UINT_32_MAX) ++ goto error; ++ + data = (png_bytep) malloc(png_get_rowbytes(png, info)*height); + row_p = (png_bytep *) malloc(sizeof(png_bytep)*height); ++ if (!data || !row_p) ++ goto error; +
+ for (i = 0; i < height; i++) {
+ if (StandardOrientation) +@@ -454,6 +486,7 @@ int APIENTRY pngLoadF(FILE *fp, int mipm + + png_read_image(png, row_p); + free(row_p); ++ row_p = NULL; + + rw = SafeSize(width), rh = SafeSize(height); + +@@ -461,6 +494,8 @@ int APIENTRY pngLoadF(FILE *fp, int mipm + const int channels = png_get_rowbytes(png, info)/width; + + data2 = (png_bytep) malloc(rw*rh*channels); ++ if (!data2) ++ goto error; + + /* Doesn't work on certain sizes */ + /* if (gluScaleImage(glformat, width, height, GL_UNSIGNED_BYTE, data, rw, rh, GL_UNSIGNED_BYTE, data2) != 0) +@@ -471,6 +506,7 @@ int APIENTRY pngLoadF(FILE *fp, int mipm + width = rw, height = rh; + free(data); + data = data2; ++ data2 = NULL; + } + + { /* OpenGL stuff */
+@@ -540,6 +576,12 @@ int APIENTRY pngLoadF(FILE *fp, int mipm + png_bytep p, endp, q; + int r, g, b, a; + ++ /* HDG another potential 32 bit address overflow, the ++ original png had 3 channels and we are going to ++ 4 channels now! */ ++ if ((uint64_t)width * height > (PNG_UINT_32_MAX >> 2)) ++ goto error; ++ + p = data, endp = p+width*height*3; + q = data2 = (png_bytep) malloc(sizeof(png_byte)*width*height*4); + diff --git a/libraries/libglpng/libglpng-1.45-extra_cflags.patch b/libraries/libglpng/patches/libglpng-1.45-extra_cflags.patch index 16dd4db3fb..16dd4db3fb 100644 --- a/libraries/libglpng/libglpng-1.45-extra_cflags.patch +++ b/libraries/libglpng/patches/libglpng-1.45-extra_cflags.patch diff --git a/libraries/libglpng/patches/libglpng-1.45-libpng15.patch b/libraries/libglpng/patches/libglpng-1.45-libpng15.patch new file mode 100644 index 0000000000..9308633536 --- /dev/null +++ b/libraries/libglpng/patches/libglpng-1.45-libpng15.patch @@ -0,0 +1,48 @@ +diff -up libglpng-1.45.orig/include/GL/glpng.h~ libglpng-1.45.orig/include/GL/glpng.h +--- libglpng-1.45.orig/include/GL/glpng.h~ 2011-12-06 22:14:59.000000000 +0100 ++++ libglpng-1.45.orig/include/GL/glpng.h 2011-12-06 22:15:48.900673919 +0100 +@@ -57,7 +57,7 @@ extern "C" { + #define PNG_SIMPLEMIPMAP PNG_SIMPLEMIPMAPS
+ + /* Transparency parameters */
+-#define PNG_CALLBACK -3 /* Call the callback function to generate alpha */ ++#define PNG_CALLBACK_FUNC -3 /* Call the callback function to generate alpha */ + #define PNG_ALPHA -2 /* Use alpha channel in PNG file, if there is one */ + #define PNG_SOLID -1 /* No transparency */ + #define PNG_STENCIL 0 /* Sets alpha to 0 for r=g=b=0, 1 otherwise */ +diff -up libglpng-1.45.orig/src/glpng.c~ libglpng-1.45.orig/src/glpng.c +--- libglpng-1.45.orig/src/glpng.c~ 2011-12-06 19:38:53.000000000 +0100 ++++ libglpng-1.45.orig/src/glpng.c 2011-12-06 22:13:34.501354149 +0100 +@@ -282,7 +282,11 @@ int APIENTRY pngLoadRawF(FILE *fp, pngRa + if (!endinfo) return 0; + + // DH: added following lines
++#if PNG_LIBPNG_VER >= 10400
++ if (setjmp(png_jmpbuf(png)))
++#else
+ if (setjmp(png->jmpbuf))
++#endif
+ {
+ error: + png_destroy_read_struct(&png, &info, &endinfo);
+@@ -402,7 +406,11 @@ int APIENTRY pngLoadF(FILE *fp, int mipm + if (!endinfo) return 0; + + // DH: added following lines
++#if PNG_LIBPNG_VER >= 10400
++ if (setjmp(png_jmpbuf(png)))
++#else
+ if (setjmp(png->jmpbuf))
++#endif
+ {
+ error: + png_destroy_read_struct(&png, &info, &endinfo);
+@@ -603,7 +611,7 @@ error: + #define ALPHA *q + + switch (trans) { +- case PNG_CALLBACK: ++ case PNG_CALLBACK_FUNC: + FORSTART + ALPHA = AlphaCallback((unsigned char) r, (unsigned char) g, (unsigned char) b); + FOREND diff --git a/libraries/libgnomecanvasmm/libgnomecanvasmm.SlackBuild b/libraries/libgnomecanvasmm/libgnomecanvasmm.SlackBuild index 665f2b7d10..9facd842a7 100644 --- a/libraries/libgnomecanvasmm/libgnomecanvasmm.SlackBuild +++ b/libraries/libgnomecanvasmm/libgnomecanvasmm.SlackBuild @@ -70,7 +70,7 @@ find -L . \ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; CFLAGS="$SLKCFLAGS" \ -CXXFLAGS="$SLKCFLAGS" \ +CXXFLAGS="$SLKCFLAGS -std=c++11" \ ./configure \ --prefix=/usr \ --libdir=/usr/lib${LIBDIRSUFFIX} \ diff --git a/libraries/libgnomemm/libgnomemm.SlackBuild b/libraries/libgnomemm/libgnomemm.SlackBuild index 58181f8256..15f59ef3ea 100644 --- a/libraries/libgnomemm/libgnomemm.SlackBuild +++ b/libraries/libgnomemm/libgnomemm.SlackBuild @@ -74,7 +74,7 @@ sed -i "s|(libdir)/libgnomemm-2\.6/include|(includedir)/libgnomemm-2.6|" \ libgnome/Makefile.in CFLAGS="$SLKCFLAGS" \ -CXXFLAGS="$SLKCFLAGS" \ +CXXFLAGS="$SLKCFLAGS -std=c++11" \ ./configure \ --prefix=/usr \ --libdir=/usr/lib$LIBDIRSUFFIX \ diff --git a/libraries/libgnomeprint/libgnomeprint-2.18.8-bison3.patch b/libraries/libgnomeprint/libgnomeprint-2.18.8-bison3.patch new file mode 100644 index 0000000000..d9fbbdd84f --- /dev/null +++ b/libraries/libgnomeprint/libgnomeprint-2.18.8-bison3.patch @@ -0,0 +1,39 @@ +http://git.pld-linux.org/gitweb.cgi?p=packages/libgnomeprint.git;a=blob;f=bison3.patch + +--- libgnomeprint-2.18.8/libgnomeprint/grammar.y.orig 2010-02-09 13:32:51.000000000 +0100 ++++ libgnomeprint-2.18.8/libgnomeprint/grammar.y 2013-11-03 21:44:59.859877696 +0100 +@@ -6,8 +6,6 @@ + #include <libgnomeprint/types.h> + #include <libgnomeprint/gnome-print-filter.h> + +-#define YYPARSE_PARAM graph +- + static void + set_value_from_string (GParamSpec *pspec, GValue *v, const gchar *s) + { +@@ -99,7 +97,7 @@ + } + + static int yylex (void *lvalp); +-static int yyerror (const char *s); ++static int yyerror (graph_t *g, const char *s); + %} + + %union { +@@ -117,6 +115,7 @@ + %type <p> pool + + %pure_parser ++%parse-param { graph_t *graph } + + %start graph + %% +@@ -185,7 +184,7 @@ + %% + + static int +-yyerror (const char *s) ++yyerror (graph_t *g, const char *s) + { + return -1; + } diff --git a/libraries/libgnomeprint/libgnomeprint-2.18.8-cups-config.patch b/libraries/libgnomeprint/libgnomeprint-2.18.8-cups-config.patch new file mode 100644 index 0000000000..999c6f0752 --- /dev/null +++ b/libraries/libgnomeprint/libgnomeprint-2.18.8-cups-config.patch @@ -0,0 +1,39 @@ +From ffbc68cc8518c7e7263a42d4284b749b40c5e871 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org> +Date: Sun, 29 Jun 2014 10:47:41 +0200 +Subject: [PATCH] Use AC_PATH_TOOL to find proper cups-config. + +--- + configure.in | 9 +++++---- + 1 file changed, 5 insertions(+), 4 deletions(-) + +diff --git a/configure.in b/configure.in +index 729278d..186fabf 100644 +--- a/configure.in ++++ b/configure.in +@@ -223,17 +223,18 @@ AC_ARG_WITH(cups, + ) + if test "x$try_cups" = "xyes"; then + PKG_CHECK_MODULES(CUPS, "gmodule-2.0") ++ AC_PATH_TOOL(CUPS_CONFIG, cups-config) + AC_MSG_CHECKING(for CUPS libraries version >= 1.1.20) +- if cups-config --version --libs > /dev/null 2>&1; then +- verstxt=`cups-config --version` ++ if $CUPS_CONFIG --version --libs > /dev/null 2>&1; then ++ verstxt=`$CUPS_CONFIG --version` + vers=`echo "$verstxt" | \ + awk -F. '{ printf "%d", ($1 * 1000 + $2) * 1000 + $3;}'` + if test "$vers" -lt 1001020; then + AC_MSG_RESULT(Cups found but the version found is less than 1.1.20) + cups_msg="Version requirement not satisfied" + else +- CUPS_LIBS="$CUPS_LIBS `cups-config --ldflags` `cups-config --libs`" +- CUPS_CFLAGS="$CUPS_CFLAGS `cups-config --cflags`" ++ CUPS_LIBS="$CUPS_LIBS `$CUPS_CONFIG --ldflags` `$CUPS_CONFIG --libs`" ++ CUPS_CFLAGS="$CUPS_CFLAGS `$CUPS_CONFIG --cflags`" + AC_MSG_RESULT(Found version $verstxt) + fi + +-- +2.0.0 + diff --git a/libraries/libgnomeprint/libgnomeprint.SlackBuild b/libraries/libgnomeprint/libgnomeprint.SlackBuild index e2e508ec56..9795ed648b 100644 --- a/libraries/libgnomeprint/libgnomeprint.SlackBuild +++ b/libraries/libgnomeprint/libgnomeprint.SlackBuild @@ -71,7 +71,11 @@ find -L . \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ -exec chmod 644 {} \; +# Thanks to Gentoo for these three patches +# https://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo-x86/gnome-base/libgnomeprint/files/ patch -p1 -i $CWD/libgnomeprint-2.18.8-stdio-include.patch +patch -p1 -i $CWD/libgnomeprint-2.18.8-bison3.patch +patch -p1 -i $CWD/libgnomeprint-2.18.8-cups-config.patch CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ diff --git a/libraries/libgnomeprintui/libgnomeprintui-2.18.6-adwaita-icon-theme.patch b/libraries/libgnomeprintui/libgnomeprintui-2.18.6-adwaita-icon-theme.patch new file mode 100644 index 0000000000..f1fc4541db --- /dev/null +++ b/libraries/libgnomeprintui/libgnomeprintui-2.18.6-adwaita-icon-theme.patch @@ -0,0 +1,12 @@ +diff -up ./configure.in.orig ./configure.in +--- ./configure.in.orig 2014-05-04 11:07:55.308844477 +0300 ++++ ./configure.in 2014-05-04 11:08:26.884571685 +0300 +@@ -64,7 +64,7 @@ PKG_CHECK_MODULES(LIBGNOMEPRINTUI, [ + gtk+-2.0 >= 2.6.0 + libgnomeprint-2.2 >= 2.12.1 + libgnomecanvas-2.0 >= 1.117.0 +- gnome-icon-theme >= 1.1.92 ++ adwaita-icon-theme >= 1.1.92 + ]) + AC_SUBST(LIBGNOMEPRINTUI_CFLAGS) + AC_SUBST(LIBGNOMEPRINTUI_LIBS) diff --git a/libraries/libgnomeprintui/libgnomeprintui-2.18.6-orientation-for-preview.patch b/libraries/libgnomeprintui/libgnomeprintui-2.18.6-orientation-for-preview.patch new file mode 100644 index 0000000000..3a6aa63fe3 --- /dev/null +++ b/libraries/libgnomeprintui/libgnomeprintui-2.18.6-orientation-for-preview.patch @@ -0,0 +1,44 @@ +--- ./libgnomeprintui/gnome-print-job-preview.c.orig 2012-02-23 22:48:42.000000000 +0600 ++++ ./libgnomeprintui/gnome-print-job-preview.c 2012-02-25 00:18:43.000000000 +0600 +@@ -152,6 +152,7 @@ + GtkWidget *last; + GnomeCanvas *canvas; + GnomePrintConfig *config; ++ guchar *paper_orientation_save; + + guint current_page, current_offset; + +@@ -2187,6 +2188,19 @@ + if (jp->config) + g_object_unref (G_OBJECT (jp->config)); + jp->config = config; ++ if( config ) { ++ guchar *txt = gnome_print_config_get( jp->config, (const guchar*)GNOME_PRINT_KEY_PAGE_ORIENTATION ); ++ if( ( g_ascii_strcasecmp(( const gchar* )txt, "R90") == 0 ) || ++ ( g_ascii_strcasecmp(( const gchar* )txt, "R270") == 0 ) ) { ++ jp->paper_orientation_save = ++ gnome_print_config_get( jp->config, (const guchar*)GNOME_PRINT_KEY_PAPER_ORIENTATION ); ++ gnome_print_config_set( jp->config, (const guchar*)GNOME_PRINT_KEY_PAPER_ORIENTATION, txt ); ++ g_free ( txt ); ++ } ++ else { ++ jp->paper_orientation_save = NULL; ++ } ++ } + if (!jp->config) + return; + g_object_ref (G_OBJECT (jp->config)); +@@ -2389,6 +2403,13 @@ + { + GnomePrintJobPreview *jp = GNOME_PRINT_JOB_PREVIEW (object); + ++ if( jp->paper_orientation_save ) { ++ gnome_print_config_set( jp->config, (const guchar*)GNOME_PRINT_KEY_PAPER_ORIENTATION, ++ jp->paper_orientation_save ); ++ g_free ( jp->paper_orientation_save ); ++ jp->paper_orientation_save = NULL; ++ } ++ + gnome_print_job_preview_set_config (jp, NULL); + gnome_print_job_preview_set_job (jp, NULL); + diff --git a/libraries/libgnomeprintui/libgnomeprintui.SlackBuild b/libraries/libgnomeprintui/libgnomeprintui.SlackBuild index 7247bb3065..1372db20a9 100644 --- a/libraries/libgnomeprintui/libgnomeprintui.SlackBuild +++ b/libraries/libgnomeprintui/libgnomeprintui.SlackBuild @@ -71,6 +71,11 @@ find -L . \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ -exec chmod 644 {} \; +# Thanks to Mageia for these patches: +patch -p1 < $CWD/libgnomeprintui-2.18.6-adwaita-icon-theme.patch +patch -p1 < $CWD/libgnomeprintui-2.18.6-orientation-for-preview.patch +autoconf + CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ ./configure \ diff --git a/libraries/libgnomeuimm/libgnomeuimm.SlackBuild b/libraries/libgnomeuimm/libgnomeuimm.SlackBuild index f5f04e8a50..84380510d3 100644 --- a/libraries/libgnomeuimm/libgnomeuimm.SlackBuild +++ b/libraries/libgnomeuimm/libgnomeuimm.SlackBuild @@ -74,7 +74,7 @@ sed -i "s|(libdir)/libgnomeuimm-2\.6/include|(includedir)/libgnomeuimm-2.6|" \ libgnomeui/Makefile.in CFLAGS="$SLKCFLAGS" \ -CXXFLAGS="$SLKCFLAGS" \ +CXXFLAGS="$SLKCFLAGS -std=c++11" \ ./configure \ --prefix=/usr \ --libdir=/usr/lib$LIBDIRSUFFIX \ diff --git a/libraries/libimobiledevice/README b/libraries/libimobiledevice/README deleted file mode 100644 index 8726ac3502..0000000000 --- a/libraries/libimobiledevice/README +++ /dev/null @@ -1,2 +0,0 @@ -libimobiledevice is a library for connecting to Apple's iPhone -or iPod touch devices. diff --git a/libraries/libimobiledevice/libimobiledevice.info b/libraries/libimobiledevice/libimobiledevice.info deleted file mode 100644 index dcab68ec4d..0000000000 --- a/libraries/libimobiledevice/libimobiledevice.info +++ /dev/null @@ -1,10 +0,0 @@ -PRGNAM="libimobiledevice" -VERSION="1.1.5" -HOMEPAGE="http://www.libimobiledevice.org//" -DOWNLOAD="http://www.libimobiledevice.org/downloads/libimobiledevice-1.1.5.tar.bz2" -MD5SUM="d9debdcf71508dee2c85b60b28ccddd4" -DOWNLOAD_x86_64="" -MD5SUM_x86_64="" -REQUIRES="usbmuxd" -MAINTAINER="David Somero" -EMAIL="dsomero@hotmail.com" diff --git a/libraries/libimobiledevice/slack-desc b/libraries/libimobiledevice/slack-desc deleted file mode 100644 index 3ea570e23d..0000000000 --- a/libraries/libimobiledevice/slack-desc +++ /dev/null @@ -1,19 +0,0 @@ -# HOW TO EDIT THIS FILE: -# The "handy ruler" below makes it easier to edit a package description. -# Line up the first '|' above the ':' following the base package name, and -# the '|' on the right side marks the last column you can put a character in. -# You must make exactly 11 lines for the formatting to be correct. It's also -# customary to leave one space after the ':' except on otherwise blank lines. - - |-----handy-ruler------------------------------------------------------| -libimobiledevice: libimobiledevice (library for connecting to Apple's iPhone or iPod) -libimobiledevice: -libimobiledevice: libimobiledevice is a library for connecting to Apple's iPhone -libimobiledevice: or iPod touch devices -libimobiledevice: -libimobiledevice: -libimobiledevice: -libimobiledevice: -libimobiledevice: -libimobiledevice: -libimobiledevice: diff --git a/libraries/libjpeg-turbo/README b/libraries/libjpeg-turbo/README deleted file mode 100644 index d5e91790e9..0000000000 --- a/libraries/libjpeg-turbo/README +++ /dev/null @@ -1,9 +0,0 @@ -libjpeg-turbo is a version of libjpeg which uses MMX, SSE, and SSE2 -SIMD instructions to accelerate baseline JPEG compression and -decompression by about 2-4x on x86 and x86-64 platforms. It is based -on libjpeg/SIMD but has numerous enhancements. - -NOTE: -The package installs to /opt/libjpeg-turbo by default. -Pass PREFIX=/usr to the SlackBuild to build it system-wide, but it will -overwrite Slackware's libjpeg package. diff --git a/libraries/libjpeg-turbo/libjpeg-turbo.SlackBuild b/libraries/libjpeg-turbo/libjpeg-turbo.SlackBuild deleted file mode 100644 index e33fb35ee7..0000000000 --- a/libraries/libjpeg-turbo/libjpeg-turbo.SlackBuild +++ /dev/null @@ -1,100 +0,0 @@ -#!/bin/sh - -# Slackware build script for libjpeg-turbo - -# Copyright 2010 V'yacheslav Stetskevych <slava18 dont_spam_me gmail com> -# Copyright 2014-2015 Willy Sudiarto Raharjo <willysr@slackbuilds.org> -# All rights reserved. -# -# Redistribution and use of this script, with or without modification, is -# permitted provided that the following conditions are met: -# -# 1. Redistributions of this script must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# -# THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED -# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO -# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, -# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; -# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, -# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR -# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF -# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -PRGNAM=libjpeg-turbo -VERSION=${VERSION:-1.4.2} -BUILD=${BUILD:-1} -TAG=${TAG:-_SBo} - -# The default is to install the package to /opt/$PRGNAM, but you can override -# it here. Set PREFIX to /usr to overwrite the conventional libjpeg. -PREFIX=${PREFIX:-/opt/$PRGNAM} - -if [ -z "$ARCH" ]; then - case "$( uname -m )" in - i?86) ARCH=i486 ;; - arm*) ARCH=arm ;; - *) ARCH=$( uname -m ) ;; - esac -fi - -CWD=$(pwd) -TMP=${TMP:-/tmp/SBo} -PKG=$TMP/package-$PRGNAM -OUTPUT=${OUTPUT:-/tmp} - -if [ "$ARCH" = "i486" ]; then - SLKCFLAGS="-O2 -march=i486 -mtune=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "i686" ]; then - SLKCFLAGS="-O2 -march=i686 -mtune=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "x86_64" ]; then - SLKCFLAGS="-O2 -fPIC" - LIBDIRSUFFIX="64" -else - SLKCFLAGS="-O2" - LIBDIRSUFFIX="" -fi - -set -e - -rm -rf $PKG -mkdir -p $TMP $PKG $OUTPUT -cd $TMP -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 640 -o -perm 600 -o -perm 444 \ - -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; - -CFLAGS="$SLKCFLAGS" \ -CXXFLAGS="$SLKCFLAGS" \ -./configure \ - --prefix=$PREFIX \ - --libdir=$PREFIX/lib${LIBDIRSUFFIX} \ - --mandir=/usr/man \ - --enable-static=no \ - --build=$ARCH-slackware-linux - -make -make install-strip DESTDIR=$PKG - -find $PKG/usr/man -type f -exec gzip -9 {} \; -for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done - -mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION -cp -a *.txt README* $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 - -cd $PKG -/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz} diff --git a/libraries/libjpeg-turbo/libjpeg-turbo.info b/libraries/libjpeg-turbo/libjpeg-turbo.info deleted file mode 100644 index 3b26c3b8a5..0000000000 --- a/libraries/libjpeg-turbo/libjpeg-turbo.info +++ /dev/null @@ -1,10 +0,0 @@ -PRGNAM="libjpeg-turbo" -VERSION="1.4.2" -HOMEPAGE="http://libjpeg-turbo.virtualgl.org" -DOWNLOAD="http://downloads.sourceforge.net/libjpeg-turbo/libjpeg-turbo-1.4.2.tar.gz" -MD5SUM="86b0d5f7507c2e6c21c00219162c3c44" -DOWNLOAD_x86_64="" -MD5SUM_x86_64="" -REQUIRES="" -MAINTAINER="Willy Sudiarto Raharjo" -EMAIL="willysr@slackbuilds.org" diff --git a/libraries/libjpeg-turbo/slack-desc b/libraries/libjpeg-turbo/slack-desc deleted file mode 100644 index aeaac4e628..0000000000 --- a/libraries/libjpeg-turbo/slack-desc +++ /dev/null @@ -1,19 +0,0 @@ -# HOW TO EDIT THIS FILE: -# The "handy ruler" below makes it easier to edit a package description. -# Line up the first '|' above the ':' following the base package name, and -# the '|' on the right side marks the last column you can put a character in. -# You must make exactly 11 lines for the formatting to be correct. It's also -# customary to leave one space after the ':' except on otherwise blank lines. - - |-----handy-ruler------------------------------------------------------| -libjpeg-turbo: libjpeg-turbo (accelerated libjpeg) -libjpeg-turbo: -libjpeg-turbo: libjpeg-turbo is a version of libjpeg which uses MMX, SSE, and SSE2 -libjpeg-turbo: SIMD instructions to accelerate baseline JPEG compression and -libjpeg-turbo: decompression by about 2-4x on x86 and x86-64 platforms. It is based -libjpeg-turbo: on libjpeg/SIMD but has numerous enhancements. -libjpeg-turbo: See README-turbo.txt in /usr/doc/libjpeg-turbo* for usage hints. -libjpeg-turbo: -libjpeg-turbo: Homepage: http://libjpeg-turbo.virtualgl.org -libjpeg-turbo: -libjpeg-turbo: diff --git a/libraries/libkate/libkate-0.4.1-no-libfl.patch b/libraries/libkate/libkate-0.4.1-no-libfl.patch new file mode 100644 index 0000000000..a5183d2b82 --- /dev/null +++ b/libraries/libkate/libkate-0.4.1-no-libfl.patch @@ -0,0 +1,88 @@ +diff -u -r libkate-0.4.1-orig/Makefile.in libkate-0.4.1/Makefile.in +--- libkate-0.4.1-orig/Makefile.in 2011-08-21 23:46:58.000000000 +0100 ++++ libkate-0.4.1/Makefile.in 2015-05-28 23:52:21.389946971 +0100 +@@ -260,7 +260,6 @@ + LD = @LD@ + LDFLAGS = @LDFLAGS@ + LEX = @LEX@ +-LEXLIB = @LEXLIB@ + LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@ + LIBKATE_SHARED_VERSION = @LIBKATE_SHARED_VERSION@ + LIBOBJS = @LIBOBJS@ +diff -u -r libkate-0.4.1-orig/configure.ac libkate-0.4.1/configure.ac +--- libkate-0.4.1-orig/configure.ac 2011-08-21 23:44:32.000000000 +0100 ++++ libkate-0.4.1/configure.ac 2015-05-30 06:28:33.306682481 +0100 +@@ -7,7 +7,7 @@ + + AC_CANONICAL_TARGET + +-AM_INIT_AUTOMAKE([-Wall -Werror foreign subdir-objects]) ++AM_INIT_AUTOMAKE([-Wall foreign subdir-objects]) + AC_CONFIG_HEADERS([include/config.h]) + + ifdef([AM_SILENT_RULES],[AM_SILENT_RULES]) +diff -u -r libkate-0.4.1-orig/doc/Makefile.in libkate-0.4.1/doc/Makefile.in +--- libkate-0.4.1-orig/doc/Makefile.in 2011-08-21 23:47:10.000000000 +0100 ++++ libkate-0.4.1/doc/Makefile.in 2015-05-28 23:52:49.742054572 +0100 +@@ -125,7 +125,6 @@ + LD = @LD@ + LDFLAGS = @LDFLAGS@ + LEX = @LEX@ +-LEXLIB = @LEXLIB@ + LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@ + LIBKATE_SHARED_VERSION = @LIBKATE_SHARED_VERSION@ + LIBOBJS = @LIBOBJS@ +diff -u -r libkate-0.4.1-orig/tests/Makefile.in libkate-0.4.1/tests/Makefile.in +--- libkate-0.4.1-orig/tests/Makefile.in 2011-08-21 23:46:58.000000000 +0100 ++++ libkate-0.4.1/tests/Makefile.in 2015-05-28 23:52:36.542004463 +0100 +@@ -156,7 +156,6 @@ + LD = @LD@ + LDFLAGS = @LDFLAGS@ + LEX = @LEX@ +-LEXLIB = @LEXLIB@ + LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@ + LIBKATE_SHARED_VERSION = @LIBKATE_SHARED_VERSION@ + LIBOBJS = @LIBOBJS@ +diff -u -r libkate-0.4.1-orig/tools/KateDJ/Makefile.in libkate-0.4.1/tools/KateDJ/Makefile.in +--- libkate-0.4.1-orig/tools/KateDJ/Makefile.in 2011-08-21 23:46:58.000000000 +0100 ++++ libkate-0.4.1/tools/KateDJ/Makefile.in 2015-05-28 23:53:11.981139017 +0100 +@@ -99,7 +99,6 @@ + LD = @LD@ + LDFLAGS = @LDFLAGS@ + LEX = @LEX@ +-LEXLIB = @LEXLIB@ + LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@ + LIBKATE_SHARED_VERSION = @LIBKATE_SHARED_VERSION@ + LIBOBJS = @LIBOBJS@ +diff -u -r libkate-0.4.1-orig/tools/Makefile.am libkate-0.4.1/tools/Makefile.am +--- libkate-0.4.1-orig/tools/Makefile.am 2011-08-21 13:42:10.000000000 +0100 ++++ libkate-0.4.1/tools/Makefile.am 2015-05-28 23:54:03.293333914 +0100 +@@ -20,7 +20,7 @@ + endif + katedec_SOURCES=katedec.c kkate.c ksrt.c klrc.c kutil.c kfuzz.c kstream.c kread.c kstrings.c + katalyzer_SOURCES=katalyzer.c kutil.c kstream.c kread.c kstrings.c kstats.c +-kateenc_LDADD=../lib/liboggkate.la ../lib/libkate.la @OGG_LIBS@ @PNG_LIBS@ @LEXLIB@ ++kateenc_LDADD=../lib/liboggkate.la ../lib/libkate.la @OGG_LIBS@ @PNG_LIBS@ + katedec_LDADD=../lib/liboggkate.la ../lib/libkate.la @OGG_LIBS@ + katalyzer_LDADD=../lib/liboggkate.la ../lib/libkate.la @OGG_LIBS@ + kateenc_CFLAGS=@CWARNFLAGS_LIGHT@ @CFLAGS_FORTIFY_SOURCE@ @CFLAGS_DEBUG@ @OGG_CFLAGS@ @PNG_CFLAGS@ +diff -u -r libkate-0.4.1-orig/tools/Makefile.in libkate-0.4.1/tools/Makefile.in +--- libkate-0.4.1-orig/tools/Makefile.in 2011-08-21 23:46:58.000000000 +0100 ++++ libkate-0.4.1/tools/Makefile.in 2015-05-28 23:54:21.805404270 +0100 +@@ -223,7 +223,6 @@ + LD = @LD@ + LDFLAGS = @LDFLAGS@ + LEX = @LEX@ +-LEXLIB = @LEXLIB@ + LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@ + LIBKATE_SHARED_VERSION = @LIBKATE_SHARED_VERSION@ + LIBOBJS = @LIBOBJS@ +@@ -351,7 +350,7 @@ + @HAVE_OGG_TRUE@ $(am__append_1) + @HAVE_OGG_TRUE@katedec_SOURCES = katedec.c kkate.c ksrt.c klrc.c kutil.c kfuzz.c kstream.c kread.c kstrings.c + @HAVE_OGG_TRUE@katalyzer_SOURCES = katalyzer.c kutil.c kstream.c kread.c kstrings.c kstats.c +-@HAVE_OGG_TRUE@kateenc_LDADD = ../lib/liboggkate.la ../lib/libkate.la @OGG_LIBS@ @PNG_LIBS@ @LEXLIB@ ++@HAVE_OGG_TRUE@kateenc_LDADD = ../lib/liboggkate.la ../lib/libkate.la @OGG_LIBS@ @PNG_LIBS@ + @HAVE_OGG_TRUE@katedec_LDADD = ../lib/liboggkate.la ../lib/libkate.la @OGG_LIBS@ + @HAVE_OGG_TRUE@katalyzer_LDADD = ../lib/liboggkate.la ../lib/libkate.la @OGG_LIBS@ + @HAVE_OGG_TRUE@kateenc_CFLAGS = @CWARNFLAGS_LIGHT@ @CFLAGS_FORTIFY_SOURCE@ @CFLAGS_DEBUG@ @OGG_CFLAGS@ @PNG_CFLAGS@ diff --git a/libraries/libkate/libkate.SlackBuild b/libraries/libkate/libkate.SlackBuild index c218d25d78..c7e0dc2e16 100644 --- a/libraries/libkate/libkate.SlackBuild +++ b/libraries/libkate/libkate.SlackBuild @@ -72,6 +72,13 @@ find -L . \ \( -perm 777 -o -perm 755 -o -perm 711 -o -perm 700 -o -perm 555 -o -perm 511 -o -perm 500 \) \ -exec chmod 755 {} \; +# Don't link against flex (fix for -current) +set -x +patch -p1 < $CWD/libkate-0.4.1-no-libfl.patch +libtoolize --copy --force +aclocal +automake --add-missing --copy --force-missing + CFLAGS="$SLKCFLAGS" \ ./configure \ --prefix=/usr \ diff --git a/libraries/libkqueue/libkqueue.SlackBuild b/libraries/libkqueue/libkqueue.SlackBuild index 1b2f6d8fe7..a989d26944 100644 --- a/libraries/libkqueue/libkqueue.SlackBuild +++ b/libraries/libkqueue/libkqueue.SlackBuild @@ -25,7 +25,7 @@ # Modified by the slackbuilds.org project. PRGNAM=libkqueue -VERSION=${VERSION:-1.0.6} +VERSION=${VERSION:-2.0.1} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -83,14 +83,14 @@ CFLAGS="$SLKCFLAGS" \ --sysconfdir=/etc \ --localstatedir=/var -make +make -j1 make install DESTDIR=$PKG 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 ChangeLog $PKG/usr/doc/$PRGNAM-$VERSION +cp -a LICENSE $PKG/usr/doc/$PRGNAM-$VERSION cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild find $PKG/usr/man -type f -exec gzip -9 {} \; diff --git a/libraries/libkqueue/libkqueue.info b/libraries/libkqueue/libkqueue.info index f69fff7d73..ffabceb48f 100644 --- a/libraries/libkqueue/libkqueue.info +++ b/libraries/libkqueue/libkqueue.info @@ -1,8 +1,8 @@ PRGNAM="libkqueue" -VERSION="1.0.6" +VERSION="2.0.1" HOMEPAGE="http://mark.heily.com/project/libkqueue" -DOWNLOAD="http://sourceforge.net/projects/libkqueue/files/libkqueue-1.0/libkqueue-1.0.6.tar.gz" -MD5SUM="5aed2744982d0c1ed79055fa37560090" +DOWNLOAD="http://sourceforge.net/projects/libkqueue/files/libkqueue-2.0/libkqueue-2.0.1.tar.gz" +MD5SUM="3d939aa5fa83a870aee71f2181b22994" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" diff --git a/libraries/liblnk/liblnk.SlackBuild b/libraries/liblnk/liblnk.SlackBuild index 7ce9965e35..158470d97c 100644 --- a/libraries/liblnk/liblnk.SlackBuild +++ b/libraries/liblnk/liblnk.SlackBuild @@ -72,8 +72,8 @@ 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 {} \; -CFLAGS="$SLKCFLAGS" \ -CXXFLAGS="$SLKCFLAGS" \ +CFLAGS="$SLKCFLAGS -std=gnu89" \ +CXXFLAGS="$SLKCFLAGS -std=gnu89" \ ./configure \ --prefix=/usr \ --libdir=/usr/lib${LIBDIRSUFFIX} \ diff --git a/libraries/libmirage/libmirage.SlackBuild b/libraries/libmirage/libmirage.SlackBuild index 0576c2fe56..80fdf71759 100644 --- a/libraries/libmirage/libmirage.SlackBuild +++ b/libraries/libmirage/libmirage.SlackBuild @@ -23,10 +23,8 @@ # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -# Revision date: 2013/03/31 - PRGNAM=libmirage -VERSION=${VERSION:-2.0.0} +VERSION=${VERSION:-3.0.3} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -70,7 +68,7 @@ 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 {} \; mkdir -p build cd build diff --git a/libraries/libmirage/libmirage.info b/libraries/libmirage/libmirage.info index 97b36091a6..1027ea0ccd 100644 --- a/libraries/libmirage/libmirage.info +++ b/libraries/libmirage/libmirage.info @@ -1,8 +1,8 @@ PRGNAM="libmirage" -VERSION="2.0.0" +VERSION="3.0.3" HOMEPAGE="http://cdemu.sourceforge.net/about/libmirage/" -DOWNLOAD="http://downloads.sourceforge.net/cdemu/libmirage-2.0.0.tar.bz2" -MD5SUM="72007f3364cbf3aea782aaa1fdade238" +DOWNLOAD="http://downloads.sourceforge.net/cdemu/libmirage-3.0.3.tar.bz2" +MD5SUM="fd0009ced98ef47c94d2919eafcaa099" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" diff --git a/libraries/libmpd/libmpd-internal.h.patch b/libraries/libmpd/libmpd-internal.h.patch new file mode 100644 index 0000000000..c9be064075 --- /dev/null +++ b/libraries/libmpd/libmpd-internal.h.patch @@ -0,0 +1,14 @@ +X-Git-Url: http://repo.or.cz/w/libmpd.git/blobdiff_plain/604cbb97b24ea12881adc6c92e2fc14edfdf20da..4f946c01000fd97100e4a534b47f9c7ace0403df:/src/libmpd-internal.h + +diff --git a/src/libmpd-internal.h b/src/libmpd-internal.h +index c84c3a4..30cdc85 100644 +--- a/src/libmpd-internal.h ++++ b/src/libmpd-internal.h +@@ -21,6 +21,7 @@ + #define __MPD_INTERNAL_LIB_ + + #include "libmpdclient.h" ++#include <config.h> + struct _MpdData_real; + + typedef struct _MpdData_real { diff --git a/libraries/libmpd/libmpd.SlackBuild b/libraries/libmpd/libmpd.SlackBuild index 62dcbcfdb5..31a0fba0a2 100644 --- a/libraries/libmpd/libmpd.SlackBuild +++ b/libraries/libmpd/libmpd.SlackBuild @@ -73,6 +73,10 @@ 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 with gcc-4.9 and glibc-2.21 (Slackware-current) +# http://repo.or.cz/w/libmpd.git/commit/4f946c01000fd97100e4a534b47f9c7ace0403df +patch -p1 < $CWD/libmpd-internal.h.patch + CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ ./configure \ diff --git a/libraries/libmsiecf/libmsiecf.SlackBuild b/libraries/libmsiecf/libmsiecf.SlackBuild index 9a10ebef87..6538b25c72 100644 --- a/libraries/libmsiecf/libmsiecf.SlackBuild +++ b/libraries/libmsiecf/libmsiecf.SlackBuild @@ -72,8 +72,8 @@ 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 {} \; -CFLAGS="$SLKCFLAGS" \ -CXXFLAGS="$SLKCFLAGS" \ +CFLAGS="$SLKCFLAGS -std=gnu89" \ +CXXFLAGS="$SLKCFLAGS -std=gnu89" \ ./configure \ --prefix=/usr \ --libdir=/usr/lib${LIBDIRSUFFIX} \ diff --git a/libraries/libolecf/libolecf.SlackBuild b/libraries/libolecf/libolecf.SlackBuild index 66955c88ea..026b6c47a0 100644 --- a/libraries/libolecf/libolecf.SlackBuild +++ b/libraries/libolecf/libolecf.SlackBuild @@ -72,8 +72,8 @@ 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 {} \; -CFLAGS="$SLKCFLAGS" \ -CXXFLAGS="$SLKCFLAGS" \ +CFLAGS="$SLKCFLAGS -std=gnu89" \ +CXXFLAGS="$SLKCFLAGS -std=gnu89" \ ./configure \ --prefix=/usr \ --libdir=/usr/lib${LIBDIRSUFFIX} \ diff --git a/libraries/libpar2/libpar2.SlackBuild b/libraries/libpar2/libpar2.SlackBuild index b74d633106..e92dd502d4 100644 --- a/libraries/libpar2/libpar2.SlackBuild +++ b/libraries/libpar2/libpar2.SlackBuild @@ -73,7 +73,7 @@ find -L . \ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; CFLAGS="$SLKCFLAGS" \ -CXXFLAGS="$SLKCFLAGS" \ +CXXFLAGS="$SLKCFLAGS -std=c++11" \ ./configure \ --prefix=/usr \ --libdir=/usr/lib${LIBDIRSUFFIX} \ diff --git a/libraries/libpeas/README b/libraries/libpeas/README index 956614982b..4b4b051b1e 100644 --- a/libraries/libpeas/README +++ b/libraries/libpeas/README @@ -1,8 +1,10 @@ -libpeas (GObject Plugin System) - Libpeas is a gobject-based plugins engine, and is targetted at giving every application the chance to assume its own extensibility. It also has a set of features including, but not limited to: - multiple extension points - on demand (lazy) programming language support for C, Python and JS - simplicity of the API + +python3 is an optional (autodetected) dependency. +other two are lgi and luajit: if you have both in you system just the +second is used. diff --git a/libraries/libpeas/libpeas.SlackBuild b/libraries/libpeas/libpeas.SlackBuild index 61e862d023..9ab50bcfec 100644 --- a/libraries/libpeas/libpeas.SlackBuild +++ b/libraries/libpeas/libpeas.SlackBuild @@ -1,7 +1,7 @@ #!/bin/sh # Slackware build script for libpeas -# Copyright 2013 Matteo Bernardini <ponce@slackbuilds.org>, Pisa, Italy +# Copyright 2013-2015 Matteo Bernardini <ponce@slackbuilds.org>, Pisa, Italy # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -22,7 +22,7 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=libpeas -VERSION=${VERSION:-1.8.1} +VERSION=${VERSION:-1.16.0} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -53,7 +53,7 @@ else LIBDIRSUFFIX="" fi -DOCS="ABOUT-NLS AUTHORS COPYING ChangeLog NEWS README" +DOCS="AUTHORS COPYING ChangeLog NEWS README" set -e @@ -70,6 +70,8 @@ find -L . \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ -exec chmod 644 {} \; +sed -i -e 's|"lua5.1 |"lua |' -e 's|with_lua51=lua5.1|with_lua51=lua|' configure + CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ ./configure \ @@ -79,7 +81,6 @@ CXXFLAGS="$SLKCFLAGS" \ --localstatedir=/var \ --mandir=/usr/man \ --docdir=/usr/doc/$PRGNAM-$VERSION \ - --disable-deprecation \ --enable-gtk \ --build=$ARCH-slackware-linux diff --git a/libraries/libpeas/libpeas.info b/libraries/libpeas/libpeas.info index 72acc877e9..05d4ce37c4 100644 --- a/libraries/libpeas/libpeas.info +++ b/libraries/libpeas/libpeas.info @@ -1,8 +1,8 @@ PRGNAM="libpeas" -VERSION="1.8.1" +VERSION="1.16.0" HOMEPAGE="http://live.gnome.org/Libpeas" -DOWNLOAD="http://ftp.gnome.org/pub/GNOME/sources/libpeas/1.8/libpeas-1.8.1.tar.xz" -MD5SUM="f63d49ab7f72e1ab9eb398c1f0750790" +DOWNLOAD="http://ftp.gnome.org/pub/GNOME/sources/libpeas/1.16/libpeas-1.16.0.tar.xz" +MD5SUM="48c5b3da391da1ae390e9d45d88a6aeb" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" diff --git a/libraries/libpff/libpff.SlackBuild b/libraries/libpff/libpff.SlackBuild index 4b2952afd2..c4cf1e06eb 100644 --- a/libraries/libpff/libpff.SlackBuild +++ b/libraries/libpff/libpff.SlackBuild @@ -72,8 +72,8 @@ 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 {} \; -CFLAGS="$SLKCFLAGS" \ -CXXFLAGS="$SLKCFLAGS" \ +CFLAGS="$SLKCFLAGS -std=gnu89" \ +CXXFLAGS="$SLKCFLAGS -std=gnu89" \ ./configure \ --prefix=/usr \ --libdir=/usr/lib${LIBDIRSUFFIX} \ diff --git a/libraries/libqcow/libqcow.SlackBuild b/libraries/libqcow/libqcow.SlackBuild index c6ddc60a8f..43aabd80b8 100644 --- a/libraries/libqcow/libqcow.SlackBuild +++ b/libraries/libqcow/libqcow.SlackBuild @@ -72,8 +72,8 @@ 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 {} \; -CFLAGS="$SLKCFLAGS" \ -CXXFLAGS="$SLKCFLAGS" \ +CFLAGS="$SLKCFLAGS -std=gnu89" \ +CXXFLAGS="$SLKCFLAGS -std=gnu89" \ ./configure \ --prefix=/usr \ --libdir=/usr/lib${LIBDIRSUFFIX} \ diff --git a/libraries/libregf/libregf.SlackBuild b/libraries/libregf/libregf.SlackBuild index b8d64e72b2..81b1d134c9 100644 --- a/libraries/libregf/libregf.SlackBuild +++ b/libraries/libregf/libregf.SlackBuild @@ -72,8 +72,8 @@ 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 {} \; -CFLAGS="$SLKCFLAGS" \ -CXXFLAGS="$SLKCFLAGS" \ +CFLAGS="$SLKCFLAGS -std=gnu89" \ +CXXFLAGS="$SLKCFLAGS -std=gnu89" \ ./configure \ --prefix=/usr \ --libdir=/usr/lib${LIBDIRSUFFIX} \ diff --git a/libraries/librep/librep.SlackBuild b/libraries/librep/librep.SlackBuild index 17fcc4b200..2f6eb5700a 100644 --- a/libraries/librep/librep.SlackBuild +++ b/libraries/librep/librep.SlackBuild @@ -70,8 +70,8 @@ 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 {} \; -CFLAGS="$SLKCFLAGS" \ -CXXFLAGS="$SLKCFLAGS" \ +CFLAGS="$SLKCFLAGS -std=gnu89" \ +CXXFLAGS="$SLKCFLAGS -std=gnu89" \ ./configure \ --prefix=/usr \ --libdir=/usr/lib${LIBDIRSUFFIX} \ diff --git a/libraries/libsigc++/libsigc++.SlackBuild b/libraries/libsigc++/libsigc++.SlackBuild index a800841ad4..3272dc9e71 100644 --- a/libraries/libsigc++/libsigc++.SlackBuild +++ b/libraries/libsigc++/libsigc++.SlackBuild @@ -26,7 +26,7 @@ # Modified by Michien van Wessem, <michiel@slackbuilds.org> - 20081029 PRGNAM=libsigc++ -VERSION=2.2.11 +VERSION=${VERSION:-2.6.2} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -43,8 +43,6 @@ TMP=${TMP:-/tmp/SBo} PKG=$TMP/package-$PRGNAM OUTPUT=${OUTPUT:-/tmp} -DOCS="AUTHORS COPYING ChangeLog INSTALL NEWS README TODO" - if [ "$ARCH" = "i486" ]; then SLKCFLAGS="-O2 -march=i486 -mtune=i686" LIBDIRSUFFIX="" @@ -59,6 +57,8 @@ else LIBDIRSUFFIX="" fi +DOCS="AUTHORS COPYING ChangeLog INSTALL NEWS README" + set -e rm -rf $PKG diff --git a/libraries/libsigc++/libsigc++.info b/libraries/libsigc++/libsigc++.info index d84278aaee..43dbb9a4ab 100644 --- a/libraries/libsigc++/libsigc++.info +++ b/libraries/libsigc++/libsigc++.info @@ -1,8 +1,8 @@ PRGNAM="libsigc++" -VERSION="2.2.11" +VERSION="2.6.2" HOMEPAGE="http://libsigc.sourceforge.net/" -DOWNLOAD="http://ftp.gnome.org/pub/GNOME/sources/libsigc++/2.2/libsigc++-2.2.11.tar.xz" -MD5SUM="815d0c6d61601f51bbcaeef6826606b0" +DOWNLOAD="http://ftp.gnome.org/pub/GNOME/sources/libsigc++/2.6/libsigc++-2.6.2.tar.xz" +MD5SUM="d2f33ca0b4b012ef60669e3b3cebe956" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" diff --git a/libraries/libsigscan/libsigscan.SlackBuild b/libraries/libsigscan/libsigscan.SlackBuild index 39e3cd8847..889e46edd4 100644 --- a/libraries/libsigscan/libsigscan.SlackBuild +++ b/libraries/libsigscan/libsigscan.SlackBuild @@ -72,8 +72,8 @@ 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 {} \; -CFLAGS="$SLKCFLAGS" \ -CXXFLAGS="$SLKCFLAGS" \ +CFLAGS="$SLKCFLAGS -std=gnu89" \ +CXXFLAGS="$SLKCFLAGS -std=gnu89" \ ./configure \ --prefix=/usr \ --libdir=/usr/lib${LIBDIRSUFFIX} \ diff --git a/libraries/libsigsegv/README b/libraries/libsigsegv/README deleted file mode 100644 index 83a4a08cd4..0000000000 --- a/libraries/libsigsegv/README +++ /dev/null @@ -1,7 +0,0 @@ -libsigsegv is a library for handling page faults in user mode. A page fault -occurs when a program tries to access to a region of memory that is -currently not available. - -NOTE: -This overwrites /usr/include/sigsegv.h from clisp (included in Slackware), -but that should not cause any problems, as they are exactly the same. diff --git a/libraries/libsigsegv/libsigsegv.SlackBuild b/libraries/libsigsegv/libsigsegv.SlackBuild deleted file mode 100644 index 7a6403cc1e..0000000000 --- a/libraries/libsigsegv/libsigsegv.SlackBuild +++ /dev/null @@ -1,97 +0,0 @@ -#!/bin/sh - -# Slackware build script for libsigsegv - -# Copyright 2011, Niels Horn, Rio de Janeiro, RJ, Brazil -# All rights reserved. -# -# Redistribution and use of this script, with or without modification, is -# permitted provided that the following conditions are met: -# -# 1. Redistributions of this script must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# -# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED -# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO -# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, -# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; -# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, -# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR -# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF -# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -# -# Maintained by David Spencer <baildon.research@googlemail.com> - -PRGNAM=libsigsegv -VERSION=${VERSION:-2.10} -BUILD=${BUILD:-1} -TAG=${TAG:-_SBo} - -if [ -z "$ARCH" ]; then - case "$( uname -m )" in - i?86) ARCH=i486 ;; - arm*) ARCH=arm ;; - *) ARCH=$( uname -m ) ;; - esac -fi - -CWD=$(pwd) -TMP=${TMP:-/tmp/SBo} -PKG=$TMP/package-$PRGNAM -OUTPUT=${OUTPUT:-/tmp} - -if [ "$ARCH" = "i486" ]; then - SLKCFLAGS="-O2 -march=i486 -mtune=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "i686" ]; then - SLKCFLAGS="-O2 -march=i686 -mtune=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "x86_64" ]; then - SLKCFLAGS="-O2 -fPIC" - LIBDIRSUFFIX="64" -else - SLKCFLAGS="-O2" - LIBDIRSUFFIX="" -fi - -set -e - -rm -rf $PKG -mkdir -p $TMP $PKG $OUTPUT -cd $TMP -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 640 -o -perm 600 -o -perm 444 \ - -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; - -CFLAGS="$SLKCFLAGS" \ -./configure \ - --prefix=/usr \ - --libdir=/usr/lib${LIBDIRSUFFIX} \ - --enable-shared=yes \ - --build=$ARCH-slackware-linux - -make -make install prefix=$PKG/usr libdir=$PKG/usr/lib${LIBDIRSUFFIX} - -find $PKG | xargs 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 \ - AUTHORS COPYING ChangeLog INSTALL NEWS PORTING README \ - $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 - -cd $PKG -/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz} diff --git a/libraries/libsigsegv/libsigsegv.info b/libraries/libsigsegv/libsigsegv.info deleted file mode 100644 index 22029b43b4..0000000000 --- a/libraries/libsigsegv/libsigsegv.info +++ /dev/null @@ -1,10 +0,0 @@ -PRGNAM="libsigsegv" -VERSION="2.10" -HOMEPAGE="http://www.gnu.org/s/libsigsegv/" -DOWNLOAD="ftp://ftp.gnu.org/gnu/libsigsegv/libsigsegv-2.10.tar.gz" -MD5SUM="7f96fb1f65b3b8cbc1582fb7be774f0f" -DOWNLOAD_x86_64="" -MD5SUM_x86_64="" -REQUIRES="" -MAINTAINER="David Spencer" -EMAIL="baildon.research@googlemail.com" diff --git a/libraries/libsigsegv/slack-desc b/libraries/libsigsegv/slack-desc deleted file mode 100644 index 889be417fd..0000000000 --- a/libraries/libsigsegv/slack-desc +++ /dev/null @@ -1,19 +0,0 @@ -# HOW TO EDIT THIS FILE: -# The "handy ruler" below makes it easier to edit a package description. -# Line up the first '|' above the ':' following the base package name, and -# the '|' on the right side marks the last column you can put a character in. -# You must make exactly 11 lines for the formatting to be correct. It's also -# customary to leave one space after the ':' except on otherwise blank lines. - - |-----handy-ruler------------------------------------------------------| -libsigsegv: libsigsegv (handle page faults in user mode) -libsigsegv: -libsigsegv: libsigsegv is a library for handling page faults in user mode. A page -libsigsegv: fault occurs when a program tries to access to a region of memory that -libsigsegv: is currently not available. -libsigsegv: -libsigsegv: Homepage: http://www.gnu.org/s/libsigsegv/ -libsigsegv: -libsigsegv: -libsigsegv: -libsigsegv: diff --git a/libraries/libsmdev/libsmdev.SlackBuild b/libraries/libsmdev/libsmdev.SlackBuild index c70073df0b..0bf89800f6 100644 --- a/libraries/libsmdev/libsmdev.SlackBuild +++ b/libraries/libsmdev/libsmdev.SlackBuild @@ -72,8 +72,8 @@ 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 {} \; -CFLAGS="$SLKCFLAGS" \ -CXXFLAGS="$SLKCFLAGS" \ +CFLAGS="$SLKCFLAGS -std=gnu89" \ +CXXFLAGS="$SLKCFLAGS -std=gnu89" \ ./configure \ --prefix=/usr \ --libdir=/usr/lib${LIBDIRSUFFIX} \ diff --git a/libraries/libsmraw/libsmraw.SlackBuild b/libraries/libsmraw/libsmraw.SlackBuild index 8c801e9432..017a1e2e13 100644 --- a/libraries/libsmraw/libsmraw.SlackBuild +++ b/libraries/libsmraw/libsmraw.SlackBuild @@ -72,8 +72,8 @@ 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 {} \; -CFLAGS="$SLKCFLAGS" \ -CXXFLAGS="$SLKCFLAGS" \ +CFLAGS="$SLKCFLAGS -std=gnu89" \ +CXXFLAGS="$SLKCFLAGS -std=gnu89" \ ./configure \ --prefix=/usr \ --libdir=/usr/lib${LIBDIRSUFFIX} \ diff --git a/libraries/libssh2/README b/libraries/libssh2/README deleted file mode 100644 index 4525bb2234..0000000000 --- a/libraries/libssh2/README +++ /dev/null @@ -1,2 +0,0 @@ -libssh2 is a library implementing the SSH2 protocol, available under -the revised BSD license. diff --git a/libraries/libssh2/libssh2.SlackBuild b/libraries/libssh2/libssh2.SlackBuild deleted file mode 100644 index 9dac4db504..0000000000 --- a/libraries/libssh2/libssh2.SlackBuild +++ /dev/null @@ -1,87 +0,0 @@ -#!/bin/sh - -# Slackware build script for libssh2 -# Written by Diogo Leal (diogo@diogoleal.com) -# Maintained by Bogdan Radulescu (bogdan@nimblex.net) - -PRGNAM=libssh2 -VERSION=${VERSION:-1.4.3} -BUILD=${BUILD:-1} -TAG=${TAG:-_SBo} - -if [ -z "$ARCH" ]; then - case "$( uname -m )" in - i?86) ARCH=i486 ;; - arm*) ARCH=arm ;; - *) ARCH=$( uname -m ) ;; - esac -fi - -CWD=$(pwd) -TMP=${TMP:-/tmp/SBo} -PKG=$TMP/package-$PRGNAM -OUTPUT=${OUTPUT:-/tmp} - -if [ "$ARCH" = "i486" ]; then - SLKCFLAGS="-O2 -march=i486 -mtune=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "i686" ]; then - SLKCFLAGS="-O2 -march=i686 -mtune=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "x86_64" ]; then - SLKCFLAGS="-O2 -fPIC" - LIBDIRSUFFIX="64" -else - SLKCFLAGS="-O2" - LIBDIRSUFFIX="" -fi - -set -e - -rm -rf $PKG -mkdir -p $TMP $PKG $OUTPUT -cd $TMP -rm -rf $PRGNAM-$VERSION -tar zxf $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 {} \; - -CFLAGS="$SLKCFLAGS" \ -CXXFLAGS="$SLKCFLAGS" \ -./configure \ - --prefix=/usr \ - --enable-crypt-none \ - --enable-mac-none \ - --with-libgcrypt \ - --with-openssl \ - --with-libz \ - --libdir=/usr/lib${LIBDIRSUFFIX} \ - --sysconfdir=/etc \ - --localstatedir=/var \ - --mandir=/usr/man \ - --docdir=/usr/doc/$PRGNAM-$VERSION \ - --build=$ARCH-slackware-linux - -make -make install DESTDIR=$PKG - -find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \ - | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true - -find $PKG/usr/man -type f -exec gzip -9 {} \; -for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done - -mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION -cp -a COPYING README ChangeLog AUTHORS $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 - -cd $PKG -/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz} diff --git a/libraries/libssh2/libssh2.info b/libraries/libssh2/libssh2.info deleted file mode 100644 index c079f3a5ec..0000000000 --- a/libraries/libssh2/libssh2.info +++ /dev/null @@ -1,10 +0,0 @@ -PRGNAM="libssh2" -VERSION="1.4.3" -HOMEPAGE="http://www.libssh2.org" -DOWNLOAD="http://www.libssh2.org/download/libssh2-1.4.3.tar.gz" -MD5SUM="071004c60c5d6f90354ad1b701013a0b" -DOWNLOAD_x86_64="" -MD5SUM_x86_64="" -REQUIRES="" -MAINTAINER="Bogdan Radulescu" -EMAIL="bogdan@nimblex.net" diff --git a/libraries/libvdpau/README b/libraries/libvdpau/README deleted file mode 100644 index aab3af538c..0000000000 --- a/libraries/libvdpau/README +++ /dev/null @@ -1,14 +0,0 @@ -This package contains the libvdpau wrapper library and the libvdpau_trace -debugging library, along with the header files needed to build VDPAU -applications. To actually use a VDPAU device, you need a vendor-specific -implementation library, like the one shipped with nvidia's binary graphics -driver. - -NOTE: Be careful when using this together with the nvidia binary installer -(the .run file), as the same files included in this package are also included -in the binary installer. As upstream recommends splitting those files into a -separate package, this shouldn't cause any issues, but in case it does, you -have been warned. There is no such problem when using this together with the -nvidia-driver SlackBuild on SlackBuilds.org. - -graphviz is an optional dependency (for building the docs). diff --git a/libraries/libvdpau/libvdpau.SlackBuild b/libraries/libvdpau/libvdpau.SlackBuild deleted file mode 100644 index 76058c94f7..0000000000 --- a/libraries/libvdpau/libvdpau.SlackBuild +++ /dev/null @@ -1,106 +0,0 @@ -#!/bin/sh - -# Slackware build script for libvdpau - -# Copyright 2009-2011 Heinz Wiesinger, Amsterdam, The Netherlands -# Copyright 2012-2015 Edward Koenig, Vancouver, WA, USA -# All rights reserved. -# -# Redistribution and use of this script, with or without modification, is -# permitted provided that the following conditions are met: -# -# 1. Redistributions of this script must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# -# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ''AS IS'' AND ANY EXPRESS OR IMPLIED -# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO -# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, -# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; -# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, -# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR -# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF -# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -PRGNAM=libvdpau -VERSION=${VERSION:-1.1.1} -BUILD=${BUILD:-1} -TAG=${TAG:-_SBo} - -if [ -z "$ARCH" ]; then - case "$( uname -m )" in - i?86) ARCH=i486 ;; - arm*) ARCH=arm ;; - *) ARCH=$( uname -m ) ;; - esac -fi - -CWD=$(pwd) -TMP=${TMP:-/tmp/SBo} -PKG=$TMP/package-$PRGNAM -OUTPUT=${OUTPUT:-/tmp} - -if [ "$ARCH" = "i486" ]; then - SLKCFLAGS="-O2 -march=i486 -mtune=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "i686" ]; then - SLKCFLAGS="-O2 -march=i686 -mtune=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "x86_64" ]; then - SLKCFLAGS="-O2 -fPIC" - LIBDIRSUFFIX="64" -else - SLKCFLAGS="-O2" - LIBDIRSUFFIX="" -fi - -set -e - -rm -rf $PKG -mkdir -p $TMP $PKG $OUTPUT -cd $TMP -rm -rf $PRGNAM-$VERSION -tar xvf $CWD/$PRGNAM-$VERSION.tar.bz2 -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 640 -o -perm 600 -o -perm 444 \ - -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; - -#libtool version mismatch -autoreconf --force --install --symlink - -CFLAGS="$SLKCFLAGS" \ -CXXFLAGS="$SLKCFLAGS" \ -./configure \ - --prefix=/usr \ - --libdir=/usr/lib${LIBDIRSUFFIX} \ - --sysconfdir=/etc \ - --localstatedir=/var \ - --mandir=/usr/man \ - --docdir=/usr/doc/$PRGNAM-$VERSION \ - --disable-static \ - --build=$ARCH-slackware-linux - -make -make install-strip DESTDIR=$PKG - -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 - -# Don't clobber the config file on upgrades -mv $PKG/etc/vdpau_wrapper.cfg $PKG/etc/vdpau_wrapper.cfg.new - -mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION -cp -a AUTHORS COPYING $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 -cat $CWD/doinst.sh > $PKG/install/doinst.sh - -cd $PKG -/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz} diff --git a/libraries/libvdpau/libvdpau.info b/libraries/libvdpau/libvdpau.info deleted file mode 100644 index a7397fc2d0..0000000000 --- a/libraries/libvdpau/libvdpau.info +++ /dev/null @@ -1,10 +0,0 @@ -PRGNAM="libvdpau" -VERSION="1.1.1" -HOMEPAGE="http://cgit.freedesktop.org/~aplattner/libvdpau" -DOWNLOAD="http://people.freedesktop.org/~aplattner/vdpau/libvdpau-1.1.1.tar.bz2" -MD5SUM="2fa0b05a4f4d06791eec83bc9c854d14" -DOWNLOAD_x86_64="" -MD5SUM_x86_64="" -REQUIRES="" -MAINTAINER="Edward W. Koenig" -EMAIL="kingbeowulf@gmail.com" diff --git a/libraries/libvdpau/slack-desc b/libraries/libvdpau/slack-desc deleted file mode 100644 index a2628b91e8..0000000000 --- a/libraries/libvdpau/slack-desc +++ /dev/null @@ -1,19 +0,0 @@ -# HOW TO EDIT THIS FILE: -# The "handy ruler" below makes it easier to edit a package description. -# Line up the first '|' above the ':' following the base package name, and -# the '|' on the right side marks the last column you can put a character in. -# You must make exactly 11 lines for the formatting to be correct. It's also -# customary to leave one space after the ':' except on otherwise blank lines. - - |-----handy-ruler------------------------------------------------------| -libvdpau: libvdpau (VDPAU wrapper library) -libvdpau: -libvdpau: This package contains the libvdpau wrapper library and the -libvdpau: libvdpau_trace debugging library, along with the header files needed -libvdpau: to build VDPAU applications. To actually use a VDPAU device, you -libvdpau: need a vendor-specific implementation library, like the one -libvdpau: shipped with nvidia's binary graphics driver. -libvdpau: -libvdpau: Homepage: http://cgit.freedesktop.org/~aplattner/libvdpau -libvdpau: -libvdpau: diff --git a/libraries/libvhdi/libvhdi.SlackBuild b/libraries/libvhdi/libvhdi.SlackBuild index 23723c4d40..c2dbafd444 100644 --- a/libraries/libvhdi/libvhdi.SlackBuild +++ b/libraries/libvhdi/libvhdi.SlackBuild @@ -72,8 +72,8 @@ 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 {} \; -CFLAGS="$SLKCFLAGS" \ -CXXFLAGS="$SLKCFLAGS" \ +CFLAGS="$SLKCFLAGS -std=gnu89" \ +CXXFLAGS="$SLKCFLAGS -std=gnu89" \ ./configure \ --prefix=/usr \ --libdir=/usr/lib${LIBDIRSUFFIX} \ diff --git a/libraries/libvmdk/libvmdk.SlackBuild b/libraries/libvmdk/libvmdk.SlackBuild index e8ae6587f3..be84b06053 100644 --- a/libraries/libvmdk/libvmdk.SlackBuild +++ b/libraries/libvmdk/libvmdk.SlackBuild @@ -72,8 +72,8 @@ 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 {} \; -CFLAGS="$SLKCFLAGS" \ -CXXFLAGS="$SLKCFLAGS" \ +CFLAGS="$SLKCFLAGS -std=gnu89" \ +CXXFLAGS="$SLKCFLAGS -std=gnu89" \ ./configure \ --prefix=/usr \ --libdir=/usr/lib${LIBDIRSUFFIX} \ diff --git a/libraries/libvpx/README b/libraries/libvpx/README deleted file mode 100644 index 2a2c085eea..0000000000 --- a/libraries/libvpx/README +++ /dev/null @@ -1,3 +0,0 @@ -VP8 is an open video codec, originally developed by On2 and released -as open source by Google Inc. It is the successor of the VP3 codec, -on which the Theora codec was based. diff --git a/libraries/libvpx/libvpx.info b/libraries/libvpx/libvpx.info deleted file mode 100644 index 085c74999a..0000000000 --- a/libraries/libvpx/libvpx.info +++ /dev/null @@ -1,10 +0,0 @@ -PRGNAM="libvpx" -VERSION="1.3.0" -HOMEPAGE="http://www.webmproject.org/" -DOWNLOAD="http://webm.googlecode.com/files/libvpx-v1.3.0.tar.bz2" -MD5SUM="14783a148872f2d08629ff7c694eb31f" -DOWNLOAD_x86_64="" -MD5SUM_x86_64="" -REQUIRES="" -MAINTAINER="Matteo Bernardini" -EMAIL="ponce@slackbuilds.org" diff --git a/libraries/libvpx/slack-desc b/libraries/libvpx/slack-desc deleted file mode 100644 index f8c2393246..0000000000 --- a/libraries/libvpx/slack-desc +++ /dev/null @@ -1,19 +0,0 @@ -# HOW TO EDIT THIS FILE: -# The "handy ruler" below makes it easier to edit a package description. -# Line up the first '|' above the ':' following the base package name, and -# the '|' on the right side marks the last column you can put a character in. -# You must make exactly 11 lines for the formatting to be correct. It's also -# customary to leave one space after the ':' except on otherwise blank lines. - - |-----handy-ruler------------------------------------------------------| -libvpx: libvpx (VP8 video codec) -libvpx: -libvpx: VP8 is an open video codec, originally developed by On2 and released -libvpx: as open source by Google Inc. It is the successor of the VP3 codec, -libvpx: on which the Theora codec was based. -libvpx: -libvpx: Homepage: http://www.webmproject.org/ -libvpx: -libvpx: -libvpx: -libvpx: diff --git a/libraries/libvshadow/libvshadow.SlackBuild b/libraries/libvshadow/libvshadow.SlackBuild index 19835cfd44..7063838334 100644 --- a/libraries/libvshadow/libvshadow.SlackBuild +++ b/libraries/libvshadow/libvshadow.SlackBuild @@ -72,8 +72,8 @@ 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 {} \; -CFLAGS="$SLKCFLAGS" \ -CXXFLAGS="$SLKCFLAGS" \ +CFLAGS="$SLKCFLAGS -std=gnu89" \ +CXXFLAGS="$SLKCFLAGS -std=gnu89" \ ./configure \ --prefix=/usr \ --libdir=/usr/lib${LIBDIRSUFFIX} \ diff --git a/libraries/libwpg/README b/libraries/libwpg/README deleted file mode 100644 index 7c35635708..0000000000 --- a/libraries/libwpg/README +++ /dev/null @@ -1 +0,0 @@ -libwpg is a library for reading and converting WPG images diff --git a/libraries/libwpg/libwpg.SlackBuild b/libraries/libwpg/libwpg.SlackBuild deleted file mode 100644 index 9ea2158d49..0000000000 --- a/libraries/libwpg/libwpg.SlackBuild +++ /dev/null @@ -1,95 +0,0 @@ -#!/bin/sh - -# Slackware build script for libwpg - -# Copyright 2008-2012 Heinz Wiesinger, Amsterdam, The Netherlands -# All rights reserved. -# -# Redistribution and use of this script, with or without modification, is -# permitted provided that the following conditions are met: -# -# 1. Redistributions of this script must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# -# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ''AS IS'' AND ANY EXPRESS OR IMPLIED -# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO -# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, -# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; -# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, -# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR -# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF -# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -PRGNAM=libwpg -VERSION=${VERSION:-0.2.2} -BUILD=${BUILD:-1} -TAG=${TAG:-_SBo} - -if [ -z "$ARCH" ]; then - case "$( uname -m )" in - i?86) ARCH=i486 ;; - arm*) ARCH=arm ;; - *) ARCH=$( uname -m ) ;; - esac -fi - -CWD=$(pwd) -TMP=${TMP:-/tmp/SBo} -PKG=$TMP/package-$PRGNAM -OUTPUT=${OUTPUT:-/tmp} - -if [ "$ARCH" = "i486" ]; then - SLKCFLAGS="-O2 -march=i486 -mtune=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "i686" ]; then - SLKCFLAGS="-O2 -march=i686 -mtune=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "x86_64" ]; then - SLKCFLAGS="-O2 -fPIC" - LIBDIRSUFFIX="64" -else - SLKCFLAGS="-O2" - LIBDIRSUFFIX="" -fi - -set -e - -rm -rf $PKG -mkdir -p $TMP $PKG $OUTPUT -cd $TMP -rm -rf $PRGNAM-$VERSION -tar xvf $CWD/$PRGNAM-$VERSION.tar.bz2 -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 640 -o -perm 600 -o -perm 444 \ - -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; - -CFLAGS="$SLKCFLAGS" \ -CXXFLAGS="$SLKCFLAGS" \ -./configure \ - --prefix=/usr \ - --libdir=/usr/lib${LIBDIRSUFFIX} \ - --sysconfdir=/etc \ - --localstatedir=/var \ - --docdir=/usr/doc/$PRGNAM-$VERSION \ - --disable-static \ - --build=$ARCH-slackware-linux \ - --host=$ARCH-slackware-linux - -make -make install-strip DESTDIR=$PKG - -mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION -cp -a AUTHORS ChangeLog README $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 - -cd $PKG -/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz} diff --git a/libraries/libwpg/libwpg.info b/libraries/libwpg/libwpg.info deleted file mode 100644 index 1f8390b304..0000000000 --- a/libraries/libwpg/libwpg.info +++ /dev/null @@ -1,10 +0,0 @@ -PRGNAM="libwpg" -VERSION="0.2.2" -HOMEPAGE="http://libwpg.sourceforge.net/" -DOWNLOAD="http://downloads.sourceforge.net/libwpg/libwpg-0.2.2.tar.bz2" -MD5SUM="b85436266b2ac91d351ab5684b181151" -DOWNLOAD_x86_64="" -MD5SUM_x86_64="" -REQUIRES="" -MAINTAINER="Heinz Wiesinger" -EMAIL="pprkut@liwjatan.at" diff --git a/libraries/libxkbcommon/libxkbcommon.SlackBuild b/libraries/libxkbcommon/libxkbcommon.SlackBuild index 541c644db0..6eb26a0b11 100644 --- a/libraries/libxkbcommon/libxkbcommon.SlackBuild +++ b/libraries/libxkbcommon/libxkbcommon.SlackBuild @@ -23,7 +23,7 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=libxkbcommon -VERSION=${VERSION:-0.2.0} +VERSION=${VERSION:-0.5.0} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -60,8 +60,8 @@ rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT cd $TMP rm -rf $PRGNAM-$VERSION -tar xvf $CWD/$PRGNAM-$VERSION.tar.bz2 || exit 1 -cd $PRGNAM-$VERSION || exit 1 +tar xvf $CWD/$PRGNAM-$VERSION.tar.?z* +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 \) \ @@ -88,7 +88,7 @@ make install-strip DESTDIR=$PKG mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION cp -a \ - README INSTALL TODO COPYING ChangeLog \ + COPYING README.md NEWS \ $PKG/usr/doc/$PRGNAM-$VERSION cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild diff --git a/libraries/libxkbcommon/libxkbcommon.info b/libraries/libxkbcommon/libxkbcommon.info index ba06e032f3..6c0771501d 100644 --- a/libraries/libxkbcommon/libxkbcommon.info +++ b/libraries/libxkbcommon/libxkbcommon.info @@ -1,8 +1,8 @@ PRGNAM="libxkbcommon" -VERSION="0.2.0" +VERSION="0.5.0" HOMEPAGE="http://xkbcommon.org/" -DOWNLOAD="http://xkbcommon.org/download/libxkbcommon-0.2.0.tar.bz2" -MD5SUM="2be3d4a255d02c7d46fc6a9486f21f6a" +DOWNLOAD="http://xkbcommon.org/download/libxkbcommon-0.5.0.tar.xz" +MD5SUM="2e1faeafcc609c30af3a561a91e84158" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" diff --git a/libraries/libxml++/libxml++.SlackBuild b/libraries/libxml++/libxml++.SlackBuild index 8658201231..4f6e574065 100644 --- a/libraries/libxml++/libxml++.SlackBuild +++ b/libraries/libxml++/libxml++.SlackBuild @@ -7,7 +7,7 @@ # Updated by Diogo Leal<diogo@diogoleal.com> PRGNAM=libxml++ -VERSION=2.36.0 +VERSION=${VERSION:-2.40.1} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} diff --git a/libraries/libxml++/libxml++.info b/libraries/libxml++/libxml++.info index 0c3eafa410..f37e33e1ff 100644 --- a/libraries/libxml++/libxml++.info +++ b/libraries/libxml++/libxml++.info @@ -1,8 +1,8 @@ PRGNAM="libxml++" -VERSION="2.36.0" +VERSION="2.40.1" HOMEPAGE="http://libxmlplusplus.sourceforge.net" -DOWNLOAD="http://ftp.gnome.org/pub/GNOME/sources/libxml++/2.36/libxml++-2.36.0.tar.xz" -MD5SUM="72838890c773f89ec701ba1a57cf0802" +DOWNLOAD="http://ftp.gnome.org/pub/GNOME/sources/libxml++/2.40/libxml++-2.40.1.tar.xz" +MD5SUM="377a87bea899f2b4ff62df2418c3d8a6" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="glibmm mm-common" diff --git a/libraries/lua-curl/README b/libraries/lua-curl/README new file mode 100644 index 0000000000..9a93e32abf --- /dev/null +++ b/libraries/lua-curl/README @@ -0,0 +1,8 @@ +lua-curl (lua curl library) + +The intent of Lua-cURL is to adapt the + * Easy Interface + * Multi Interface + * Shared Interface +of libcurl to the functionality of Lua (for example by using iterators +instead of callbacks when possible). diff --git a/libraries/lua-curl/liblua-curl.pc b/libraries/lua-curl/liblua-curl.pc new file mode 100644 index 0000000000..4b02e4caf7 --- /dev/null +++ b/libraries/lua-curl/liblua-curl.pc @@ -0,0 +1,11 @@ +prefix=/usr +exec_prefix=${prefix} +includedir=${prefix}/include +libdir=${exec_prefix}/lib/lua/5.1 + +Name: liblua-curl +Description: liblua-curl - libcurl binding to Lua +Version: 0.3.0 +Cflags: -I${includedir} +Libs: -L${libdir} -L/usr/lib -llua-curl -llua -lm + diff --git a/libraries/libvpx/libvpx.SlackBuild b/libraries/lua-curl/lua-curl.SlackBuild index 8a6a0affab..c39e255630 100644 --- a/libraries/libvpx/libvpx.SlackBuild +++ b/libraries/lua-curl/lua-curl.SlackBuild @@ -1,8 +1,7 @@ #!/bin/sh -# Slackware build script for libvpx - -# Copyright 2013 Matteo Bernardini <ponce@slackbuilds.org>, Pisa, Italy +# Slackware build script for lua-curl +# Copyright Matteo Bernardini <ponce@slackbuilds.org>, Pisa, Italy, 2012 # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -22,12 +21,8 @@ # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -# based on slackbuilds.org default autotools-template - -# Modified by SlackBuilds.org - -PRGNAM=libvpx -VERSION=${VERSION:-1.3.0} +PRGNAM=lua-curl +VERSION=${VERSION:-0.3.0} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -47,64 +42,59 @@ OUTPUT=${OUTPUT:-/tmp} if [ "$ARCH" = "i486" ]; then SLKCFLAGS="-O2 -march=i486 -mtune=i686" LIBDIRSUFFIX="" - ARCHOPTS="--target=x86-linux-gcc" elif [ "$ARCH" = "i686" ]; then SLKCFLAGS="-O2 -march=i686 -mtune=i686" LIBDIRSUFFIX="" - ARCHOPTS="--target=x86-linux-gcc" elif [ "$ARCH" = "x86_64" ]; then SLKCFLAGS="-O2 -fPIC" LIBDIRSUFFIX="64" - ARCHOPTS="--target=x86_64-linux-gcc --enable-pic" else SLKCFLAGS="-O2" LIBDIRSUFFIX="" - ARCHOPTS="--target=${ARCH}-linux-gcc" fi -set -e +set -e # Exit on most errors rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT cd $TMP -rm -rf ${PRGNAM}-v${VERSION} -tar xvf $CWD/${PRGNAM}-v${VERSION}.tar.bz2 -cd ${PRGNAM}-v${VERSION} +rm -rf $PRGNAM-$VERSION +tar xvf $CWD/${PRGNAM}_${VERSION}.orig.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 \) \ +find . \ + \( -perm 777 -o -perm 775 -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 {} \; -# out of tree build -mkdir build-tmp -cd build-tmp - CFLAGS="$SLKCFLAGS" \ - CXXFLAGS="$SLKCFLAGS" \ - ../configure \ - --prefix=/usr \ - --libdir=/usr/lib${LIBDIRSUFFIX} \ - --disable-debug-libs \ - --disable-debug \ - --enable-postproc \ - --enable-vp8 \ - --enable-shared \ - --enable-runtime-cpu-detect \ - $ARCHOPTS - make - make install DESTDIR=$PKG -cd .. - -# remove the static version -rm $PKG/usr/lib${LIBDIRSUFFIX}/$PRGNAM.a - -find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \ +# This is from Debian, thanks +patch -p1 < $CWD/make.patch + +sed -i \ + -e "s|usr/local/|usr|" \ + -e "s|lua5\.1|lua|" \ + -e "s|-Wall -O2|-Wall|" \ + -e "s|includedir)/lua|includedir)|" \ + -e "s|share/doc/curl|doc/curl-$VERSION|" \ + -e "s|/lib/|/lib$LIBDIRSUFFIX|" \ + -e "s|liblua5.1-curl|liblua-curl|" \ + -e "s|\ \$(shell getconf LFS_CFLAGS)|${SLKCFLAGS}|" \ + Makefile + +make +install -m 0755 -D curl.so $PKG/usr/lib$LIBDIRSUFFIX/lua/5.1/lib$PRGNAM.so +( cd $PKG/usr/lib$LIBDIRSUFFIX ; ln -s lua/5.1/lib$PRGNAM.so lib$PRGNAM.so.0 ) + +install -m 0644 -D $CWD/lib$PRGNAM.pc $PKG/usr/lib$LIBDIRSUFFIX/pkgconfig/lib$PRGNAM.pc +install -m 0644 -D $PRGNAM.h $PKG/usr/include/$PRGNAM.h +sed -i "s|/lib|/lib$LIBDIRSUFFIX|" $PKG/usr/lib$LIBDIRSUFFIX/pkgconfig/lib$PRGNAM.pc + +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 AUTHORS CHANGELOG LICENSE PATENTS README build-tmp/docs/html \ - $PKG/usr/doc/$PRGNAM-$VERSION +cp -a doc/curl.html $PKG/usr/doc/$PRGNAM-$VERSION cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild mkdir -p $PKG/install diff --git a/libraries/lua-curl/lua-curl.info b/libraries/lua-curl/lua-curl.info new file mode 100644 index 0000000000..d441fcff18 --- /dev/null +++ b/libraries/lua-curl/lua-curl.info @@ -0,0 +1,10 @@ +PRGNAM="lua-curl" +VERSION="0.3.0" +HOMEPAGE="http://msva.github.com/lua-curl/" +DOWNLOAD="http://ponce.cc/slackware/sources/repo/lua-curl_0.3.0.orig.tar.gz" +MD5SUM="2a174d81bcfa7d663406b633195f2e89" +DOWNLOAD_x86_64="" +MD5SUM_x86_64="" +REQUIRES="lua" +MAINTAINER="Matteo Bernardini" +EMAIL="ponce@slackbuilds.org" diff --git a/libraries/lua-curl/make.patch b/libraries/lua-curl/make.patch new file mode 100644 index 0000000000..441e62e1cb --- /dev/null +++ b/libraries/lua-curl/make.patch @@ -0,0 +1,17 @@ +Author: Enrico Tassi <gareuselesinge@debian.org> +Description: fix regex to get auth options from curl.h +Index: lua-curl-0.3.0/Makefile +=================================================================== +--- lua-curl-0.3.0.orig/Makefile 2008-10-25 17:26:26.000000000 +0200 ++++ lua-curl-0.3.0/Makefile 2012-05-30 21:57:54.000000000 +0200 +@@ -119,8 +119,8 @@ + > curl_netrcopt.h + + curl_authopt.h:$(HEADER) +- $(H)cat $(HEADER) | grep "CURLAUTH_" | \ +- sed "s/#define *CURL/{\"/" | sed "s/ *\/\*.*\*\///" | \ ++ $(H)cat $(HEADER) | grep "define *CURLAUTH_" | \ ++ sed "s/#define *CURL/{\"/" | sed "s/ *\/\*.*//" | \ + sed "s/ /\",/" | sed "s/$$/},/" > curl_authopt.h + + curl_ftpauthopt.h:$(HEADER) diff --git a/libraries/lua-curl/slack-desc b/libraries/lua-curl/slack-desc new file mode 100644 index 0000000000..8c19468350 --- /dev/null +++ b/libraries/lua-curl/slack-desc @@ -0,0 +1,19 @@ +# HOW TO EDIT THIS FILE: +# The "handy ruler" below makes it easier to edit a package description. Line +# up the first '|' above the ':' following the base package name, and the '|' +# on the right side marks the last column you can put a character in. You must +# make exactly 11 lines for the formatting to be correct. It's also +# customary to leave one space after the ':' except on otherwise blank lines. + + |-----handy-ruler------------------------------------------------------| +lua-curl: lua-curl (lua curl library) +lua-curl: +lua-curl: The intent of Lua-cURL is to adapt the +lua-curl: * Easy Interface +lua-curl: * Multi Interface +lua-curl: * Shared Interface +lua-curl: of libcurl to the functionality of Lua (for example by using +lua-curl: iterators instead of callbacks when possible). +lua-curl: +lua-curl: homepage: http://msva.github.com/lua-curl/ +lua-curl: diff --git a/libraries/mathgl/mathgl.SlackBuild b/libraries/mathgl/mathgl.SlackBuild index b1682184d9..87dbc2451a 100644 --- a/libraries/mathgl/mathgl.SlackBuild +++ b/libraries/mathgl/mathgl.SlackBuild @@ -16,7 +16,7 @@ # SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=mathgl -VERSION=${VERSION:-2.0.3} +VERSION=${VERSION:-2.3.3} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -48,21 +48,21 @@ else fi # GSL support -if [[ ${GSL:-no} = "no" ]]; then +if [ ${GSL:-no} = "no" ]; then GSL_FLAG="NO" else GSL_FLAG="YES" fi # Octave support -if [[ ${OCTAVE:-no} = "no" ]]; then +if [ ${OCTAVE:-no} = "no" ]; then OCTAVE_FLAG="NO" else OCTAVE_FLAG="YES" fi -# Open MPI support -if [[ ${OPENMPI:-no} = "no" ]]; then +# OpenMPI support +if [ ${OPENMPI:-no} = "no" ]; then OPENMPI_FLAG="NO" else OPENMPI_FLAG="YES" @@ -88,6 +88,7 @@ cd build cmake -D CMAKE_C_FLAGS="$SLKCFLAGS" \ -D CMAKE_CXX_FLAGS="$SLKCFLAGS" \ -D CMAKE_INSTALL_PREFIX:PATH=/usr \ + -D MGL_LIB_INSTALL_DIR:STRING=lib$LIBDIRSUFFIX \ -D enable-doc:BOOL=OFF \ -D enable-double:BOOL=ON \ -D enable-gif:BOOL=ON \ @@ -100,9 +101,11 @@ cd build -D enable-mpi:BOOL=$OPENMPI_FLAG \ -D enable-python:BOOL=ON \ -D enable-pthread:BOOL=ON \ + -D enable-openmp:BOOL=OFF \ -D enable-octave:BOOL=$OCTAVE_FLAG \ -D enable-opengl:BOOL=ON \ -D enable-wx:BOOL=ON \ + -D enable-qt4:BOOL=ON \ -D CMAKE_BUILD_TYPE:STRING=$ARCH-slackware-linux .. -L make make install DESTDIR=$PKG diff --git a/libraries/mathgl/mathgl.info b/libraries/mathgl/mathgl.info index 44a7f2b8a2..df540155a2 100644 --- a/libraries/mathgl/mathgl.info +++ b/libraries/mathgl/mathgl.info @@ -1,10 +1,10 @@ PRGNAM="mathgl" -VERSION="2.0.3" +VERSION="2.3.3" HOMEPAGE="http://mathgl.sourceforge.net" -DOWNLOAD="http://downloads.sourceforge.net/mathgl/mathgl-2.0.3.tar.gz" -MD5SUM="37b7857594dd17306d34475afec87aa5" +DOWNLOAD="http://downloads.sourceforge.net/mathgl/mathgl-2.3.3.tar.gz" +MD5SUM="c37d6f42d4897675bf89fae635aa6868" DOWNLOAD_x86_64="" MD5SUM_x86_64="" -REQUIRES="wxPython" +REQUIRES="libharu wxPython" MAINTAINER="Jože Zobec" EMAIL="jozze.zepl@gmail.com" diff --git a/libraries/motif/README b/libraries/motif/README deleted file mode 100644 index 994cd2c7da..0000000000 --- a/libraries/motif/README +++ /dev/null @@ -1,13 +0,0 @@ -Motif is the freely available source code distribution for the Motif -user interface component toolkit. Motif is built on top of the standard -X Toolkit(Xt) and X11 libraries. - -This the first motif version that is released under LGPL v2.1. - -Postscript and PDF Documents (users guides and reference manuals) could be -downloaded at: http://www.opengroup.org/openmotif/docs/ - -This conflicts with the lesstif package that comes with Slackware; in other -words, only one should be installed at any given time. You will need to -recompile xpdf and any lesstif-dependent packages if you encounter problems -running them after installing motif. diff --git a/libraries/motif/motif.SlackBuild b/libraries/motif/motif.SlackBuild deleted file mode 100644 index eb65759cd8..0000000000 --- a/libraries/motif/motif.SlackBuild +++ /dev/null @@ -1,91 +0,0 @@ -#!/bin/sh - -# Slackware build script for motif -# Written by Vincent Batts, vbatts@batts.mine.nu -# Modified by Zhu Qun-Ying, zhu.qunying@gmail.com for motif -# Modified by SlackBuilds.org - -PRGNAM=motif -VERSION=2.3.4 -BUILD=${BUILD:-1} -TAG=${TAG:-_SBo} - -if [ -z "$ARCH" ]; then - case "$( uname -m )" in - i?86) ARCH=i486 ;; - arm*) ARCH=arm ;; - *) ARCH=$( uname -m ) ;; - esac -fi - -CWD=$(pwd) -TMP=${TMP:-/tmp/SBo} -PKG=$TMP/package-$PRGNAM -OUTPUT=${OUTPUT:-/tmp} - -if [ "$ARCH" = "i486" ]; then - SLKCFLAGS="-O2 -march=i486 -mtune=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "i686" ]; then - SLKCFLAGS="-O2 -march=i686 -mtune=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "x86_64" ]; then - SLKCFLAGS="-O2 -fPIC" - LIBDIRSUFFIX="64" -else - SLKCFLAGS="-O2" - LIBDIRSUFFIX="" -fi - -set -e - -rm -rf $PKG -mkdir -p $TMP $PKG $OUTPUT -cd $TMP -rm -rf $PRGNAM-$VERSION -tar xvf $CWD/$PRGNAM-$VERSION-src.tgz -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 {} \; || exit 1 - -./autogen.sh - -CFLAGS="$SLKCFLAGS" \ -CXXFLAGS="$SLKCFLAGS" \ -./configure \ - --prefix=/usr \ - --libdir=/usr/lib${LIBDIRSUFFIX} \ - --sysconfdir=/etc \ - --localstatedir=/var \ - --mandir=/usr/man \ - --enable-themes \ - --disable-static \ - --build=$ARCH-slackware-linux - -make -j1 -make install DESTDIR=$PKG - -# Let's not conflict with some already installed stuff in other packages -mv $PKG/usr/man/man3/Shell.3 $PKG/usr/man/man3/Shell.motif.3 - -find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \ - | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true - -find $PKG/usr/man -type f -exec gzip -9 {} \; -for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done - -mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION -cp -a \ - INSTALL* BUGREPORT ChangeLog COPYING README RELNOTES RELEASE \ - $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 - -cd $PKG -/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz} diff --git a/libraries/motif/motif.info b/libraries/motif/motif.info deleted file mode 100644 index 12246603ce..0000000000 --- a/libraries/motif/motif.info +++ /dev/null @@ -1,10 +0,0 @@ -PRGNAM="motif" -VERSION="2.3.4" -HOMEPAGE="http://motif.ics.com/motif" -DOWNLOAD="http://download.sourceforge.net/motif/motif-2.3.4-src.tgz" -MD5SUM="612bb8127d0d31da6e5474edf8a5c247" -DOWNLOAD_x86_64="" -MD5SUM_x86_64="" -REQUIRES="%README%" -MAINTAINER="Zhu Qun-Ying" -EMAIL="zhu.qunying@gmail.com" diff --git a/libraries/motif/slack-desc b/libraries/motif/slack-desc deleted file mode 100644 index 7cac7dbfbf..0000000000 --- a/libraries/motif/slack-desc +++ /dev/null @@ -1,19 +0,0 @@ -# HOW TO EDIT THIS FILE: -# The "handy ruler" below makes it easier to edit a package description. -# Line up the first '|' above the ':' following the base package name, and -# the '|' on the right side marks the last column you can put a character in. -# You must make exactly 11 lines for the formatting to be correct. It's also -# customary to leave one space after the ':' except on otherwise blank lines. - - |-----handy-ruler------------------------------------------------------| -motif: Motif (X libraries) -motif: -motif: Motif is the freely available source code distribution for the -motif: Motif user interface component toolkit. Motif is built on top -motif: of the standard X Toolkit(Xt) and X11 libraries. -motif: -motif: Postscript and PDF Documents (users guides and reference manuals) -motif: could be downloaded at: http://www.opengroup.org/openmotif/docs/ -motif: -motif: Homepage: http://motif.ics.com/motif -motif: diff --git a/libraries/newt/README b/libraries/newt/README deleted file mode 100644 index d8f818fe11..0000000000 --- a/libraries/newt/README +++ /dev/null @@ -1,4 +0,0 @@ -Newt is a programming library for color text mode, widget based user -interfaces. Newt can be used to add stacked windows, entry widgets, -checkboxes, radio buttons, labels, plain text fields, scrollbars, etc., to -text mode user interfaces. Newt is based on the S-Lang library. diff --git a/libraries/newt/newt.info b/libraries/newt/newt.info deleted file mode 100644 index b0c95526c3..0000000000 --- a/libraries/newt/newt.info +++ /dev/null @@ -1,10 +0,0 @@ -PRGNAM="newt" -VERSION="0.52.16" -HOMEPAGE="https://fedorahosted.org/newt/" -DOWNLOAD="https://fedorahosted.org/releases/n/e/newt/newt-0.52.16.tar.gz" -MD5SUM="6ce923015cf87ef2c17779d24692f573" -DOWNLOAD_x86_64="" -MD5SUM_x86_64="" -REQUIRES="" -MAINTAINER="Marco Bonetti" -EMAIL="sid77@slackware.it" diff --git a/libraries/openbabel/gcc-5.patch b/libraries/openbabel/gcc-5.patch new file mode 100644 index 0000000000..bd25e0df0b --- /dev/null +++ b/libraries/openbabel/gcc-5.patch @@ -0,0 +1,12 @@ +--- include/openbabel/shared_ptr.h.gcc5 2015-02-04 20:04:57.000000000 +0100 ++++ include/openbabel/shared_ptr.h 2015-02-07 22:10:37.433163644 +0100 +@@ -21,7 +21,7 @@ GNU General Public License for more deta + #define sharedptr boost::shared_ptr + #else + #include <memory> +- #if __GNUC__ == 4 //&& __GNUC_MINOR__ < 3 removed at the suggestion of Konstantin Tokarev ++ #if __GNUC__ >= 4 //&& __GNUC_MINOR__ < 3 removed at the suggestion of Konstantin Tokarev + #include <tr1/memory> + #endif + using std::tr1::shared_ptr; + diff --git a/libraries/openbabel/openbabel.SlackBuild b/libraries/openbabel/openbabel.SlackBuild index 66325ec6fa..7bd54ad595 100644 --- a/libraries/openbabel/openbabel.SlackBuild +++ b/libraries/openbabel/openbabel.SlackBuild @@ -25,7 +25,7 @@ # Thanks to Daniil Bratashov (dn2010@gmail.com) for the cmake conversion PRGNAM=openbabel -VERSION=2.3.1 +VERSION=${VERSION:-2.3.2} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -69,7 +69,10 @@ 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 {} \; + +# Patch for gcc-5 thanks to Arch +patch -p0 < $CWD/gcc-5.patch mkdir -p build cd build diff --git a/libraries/openbabel/openbabel.info b/libraries/openbabel/openbabel.info index a456bc2832..ff15c8591e 100644 --- a/libraries/openbabel/openbabel.info +++ b/libraries/openbabel/openbabel.info @@ -1,8 +1,8 @@ PRGNAM="openbabel" -VERSION="2.3.1" +VERSION="2.3.2" HOMEPAGE="http://openbabel.sourceforge.net" -DOWNLOAD="http://downloads.sourceforge.net/openbabel/openbabel-2.3.1.tar.gz" -MD5SUM="1f029b0add12a3b55582dc2c832b04f8" +DOWNLOAD="http://downloads.sourceforge.net/openbabel/openbabel-2.3.2.tar.gz" +MD5SUM="9b0007560d9d838b40ab4ad06daf5610" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="jdk" diff --git a/libraries/openjpeg/slack-desc b/libraries/openjpeg/slack-desc deleted file mode 100644 index 6f73ab7929..0000000000 --- a/libraries/openjpeg/slack-desc +++ /dev/null @@ -1,19 +0,0 @@ -# HOW TO EDIT THIS FILE: -# The "handy ruler" below makes it easier to edit a package description. -# Line up the first '|' above the ':' following the base package name, and -# the '|' on the right side marks the last column you can put a character in. -# You must make exactly 11 lines for the formatting to be correct. It's also -# customary to leave one space after the ':' except on otherwise blank lines. - - |-----handy-ruler------------------------------------------------------| -openjpeg: openjpeg (JPEG2000 Codec) -openjpeg: -openjpeg: The OpenJPEG library is an open-source JPEG 2000 codec. -openjpeg: -openjpeg: Homepage: http://www.openjpeg.org -openjpeg: -openjpeg: -openjpeg: -openjpeg: -openjpeg: -openjpeg: diff --git a/libraries/openjpeg/README b/libraries/openjpeg1/README index 4ebcb4a5fc..4ebcb4a5fc 100644 --- a/libraries/openjpeg/README +++ b/libraries/openjpeg1/README diff --git a/libraries/openjpeg/openjpeg.SlackBuild b/libraries/openjpeg1/openjpeg1.SlackBuild index 1c0cd23d05..f39bf8a044 100644 --- a/libraries/openjpeg/openjpeg.SlackBuild +++ b/libraries/openjpeg1/openjpeg1.SlackBuild @@ -1,6 +1,6 @@ #!/bin/sh -# Slackware build script for openjpeg +# Slackware build script for openjpeg1 # Copyright 2008-2014 Heinz Wiesinger, Amsterdam, The Netherlands # All rights reserved. @@ -22,7 +22,8 @@ # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -PRGNAM=openjpeg +PRGNAM=openjpeg1 +SRCNAM=openjpeg VERSION=1.5.2 BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -59,9 +60,9 @@ set -e rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT cd $TMP -rm -rf $PRGNAM-$VERSION -tar xvf $CWD/$PRGNAM-$VERSION.tar.gz -cd $PRGNAM-$VERSION +rm -rf $SRCNAM-$VERSION +tar xvf $CWD/$SRCNAM-$VERSION.tar.gz +cd $SRCNAM-$VERSION chown -R root:root . find -L . \ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \ @@ -93,9 +94,9 @@ find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \ find $PKG/usr/man -type f -exec gzip -9 {} \; -mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION -cp -a INSTALL README $PKG/usr/doc/$PRGNAM-$VERSION -cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild +mkdir -p $PKG/usr/doc/$SRCNAM-$VERSION +cp -a INSTALL README $PKG/usr/doc/$SRCNAM-$VERSION +cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$SRCNAM-$VERSION/$PRGNAM.SlackBuild mkdir -p $PKG/install cat $CWD/slack-desc > $PKG/install/slack-desc diff --git a/libraries/openjpeg/openjpeg.info b/libraries/openjpeg1/openjpeg1.info index e3d786e152..2dc033fe7a 100644 --- a/libraries/openjpeg/openjpeg.info +++ b/libraries/openjpeg1/openjpeg1.info @@ -1,4 +1,4 @@ -PRGNAM="openjpeg" +PRGNAM="openjpeg1" VERSION="1.5.2" HOMEPAGE="http://www.openjpeg.org" DOWNLOAD="http://downloads.sourceforge.net/openjpeg.mirror/openjpeg-1.5.2.tar.gz" diff --git a/desktop/libfakekey/slack-desc b/libraries/openjpeg1/slack-desc index 604b66ef29..416bd92506 100644 --- a/desktop/libfakekey/slack-desc +++ b/libraries/openjpeg1/slack-desc @@ -5,15 +5,15 @@ # You must make exactly 11 lines for the formatting to be correct. It's also # customary to leave one space after the ':' except on otherwise blank lines. - |-----handy-ruler------------------------------------------------------| -libfakekey: libfakekey (X Virtual Keyboard Library) -libfakekey: -libfakekey: X virtual keyboard library of the Matchbox WM project. -libfakekey: -libfakekey: -libfakekey: -libfakekey: -libfakekey: -libfakekey: -libfakekey: -libfakekey: + |-----handy-ruler------------------------------------------------------| +openjpeg1: openjpeg1 (JPEG2000 Codec) +openjpeg1: +openjpeg1: The OpenJPEG library is an open-source JPEG 2000 codec. +openjpeg1: +openjpeg1: Homepage: http://www.openjpeg.org +openjpeg1: +openjpeg1: +openjpeg1: +openjpeg1: +openjpeg1: +openjpeg1: diff --git a/libraries/openjpeg2/README b/libraries/openjpeg2/README deleted file mode 100644 index b3ec3850c5..0000000000 --- a/libraries/openjpeg2/README +++ /dev/null @@ -1,6 +0,0 @@ -openjpeg2 (open-source JPEG 2000 codec) - -The OpenJPEG library is an open-source JPEG 2000 codec. This is version -2.x of OpenJPEG, which is API-incompatible with the 1.x series. For the -1.x API, install the openjpeg build. Both openjpeg and openjpeg2 can be -installed on the same system with no conflicts. diff --git a/libraries/openjpeg2/openjpeg2.SlackBuild b/libraries/openjpeg2/openjpeg2.SlackBuild deleted file mode 100644 index 6a33d97b70..0000000000 --- a/libraries/openjpeg2/openjpeg2.SlackBuild +++ /dev/null @@ -1,89 +0,0 @@ -#!/bin/sh - -# Slackware build script for openjpeg2 - -# Written by B. Watson (yalhcru@gmail.com) - -# Licensed under the WTFPL. See http://www.wtfpl.net/txt/copying/ for details. - -PRGNAM=openjpeg2 -VERSION=${VERSION:-2.1.0} -BUILD=${BUILD:-1} -TAG=${TAG:-_SBo} - -if [ -z "$ARCH" ]; then - case "$( uname -m )" in - i?86) ARCH=i486 ;; - arm*) ARCH=arm ;; - *) ARCH=$( uname -m ) ;; - esac -fi - -CWD=$(pwd) -TMP=${TMP:-/tmp/SBo} -PKG=$TMP/package-$PRGNAM -OUTPUT=${OUTPUT:-/tmp} - -if [ "$ARCH" = "i486" ]; then - SLKCFLAGS="-O2 -march=i486 -mtune=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "i686" ]; then - SLKCFLAGS="-O2 -march=i686 -mtune=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "x86_64" ]; then - SLKCFLAGS="-O2 -fPIC" - LIBDIRSUFFIX="64" -else - SLKCFLAGS="-O2" - LIBDIRSUFFIX="" -fi - -set -e - -TARNAM=openjpeg - -rm -rf $PKG -mkdir -p $TMP $PKG $OUTPUT -cd $TMP -rm -rf $TARNAM-$VERSION -tar xvf $CWD/$TARNAM-$VERSION.tar.gz -cd $TARNAM-$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 640 -o -perm 600 -o -perm 444 \ - -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; - -mkdir -p build -cd build - cmake \ - -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \ - -DCMAKE_INSTALL_PREFIX=/usr \ - -DOPENJPEG_INSTALL_LIB_DIR=lib$LIBDIRSUFFIX \ - -DOPENJPEG_INSTALL_MAN_DIR=man \ - -DOPENJPEG_INSTALL_DOC_DIR=doc/$PRGNAM-$VERSION \ - -DCMAKE_BUILD_TYPE=Release .. - make - make install/strip DESTDIR=$PKG -cd .. - -# 2.0.0 installed the man pages, for some reason 2.1.0 doesn't. -cd doc/man - for dir in man?; do - mkdir -p $PKG/usr/man/$dir - for page in $dir/*.?; do - gzip -9c < $page > $PKG/usr/man/$dir/$( basename $page ).gz - done - done -cd - - -mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION -cp -a AUTHORS CHANGES LICENSE NEWS README THANKS $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 - -cd $PKG -/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz} diff --git a/libraries/openjpeg2/openjpeg2.info b/libraries/openjpeg2/openjpeg2.info deleted file mode 100644 index 31dc2d6d33..0000000000 --- a/libraries/openjpeg2/openjpeg2.info +++ /dev/null @@ -1,10 +0,0 @@ -PRGNAM="openjpeg2" -VERSION="2.1.0" -HOMEPAGE="http://www.openjpeg.org/" -DOWNLOAD="http://downloads.sourceforge.net/project/openjpeg.mirror/2.1.0/openjpeg-2.1.0.tar.gz" -MD5SUM="f6419fcc233df84f9a81eb36633c6db6" -DOWNLOAD_x86_64="" -MD5SUM_x86_64="" -REQUIRES="" -MAINTAINER="B. Watson" -EMAIL="yalhcru@gmail.com" diff --git a/libraries/pangomm/pangomm.SlackBuild b/libraries/pangomm/pangomm.SlackBuild index f4a9bd3254..2965285b01 100644 --- a/libraries/pangomm/pangomm.SlackBuild +++ b/libraries/pangomm/pangomm.SlackBuild @@ -23,7 +23,7 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=pangomm -VERSION=${VERSION:-2.34.0} +VERSION=${VERSION:-2.38.1} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} diff --git a/libraries/pangomm/pangomm.info b/libraries/pangomm/pangomm.info index c4b3152f9d..ae1cfbc41a 100644 --- a/libraries/pangomm/pangomm.info +++ b/libraries/pangomm/pangomm.info @@ -1,8 +1,8 @@ PRGNAM="pangomm" -VERSION="2.34.0" +VERSION="2.38.1" HOMEPAGE="http://www.gtkmm.org/" -DOWNLOAD="http://ftp.acc.umu.se/pub/gnome/sources/pangomm/2.34/pangomm-2.34.0.tar.xz" -MD5SUM="2c702caede167323c9ed9eed2b933098" +DOWNLOAD="http://ftp.gnome.org/pub/GNOME/sources/pangomm/2.38/pangomm-2.38.1.tar.xz" +MD5SUM="734fc6bf8f91c94383ca10d24705ce25" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="cairomm" diff --git a/libraries/php-pgsql/php-pgsql.SlackBuild b/libraries/php-pgsql/php-pgsql.SlackBuild index da79da23ef..e903190e94 100644 --- a/libraries/php-pgsql/php-pgsql.SlackBuild +++ b/libraries/php-pgsql/php-pgsql.SlackBuild @@ -24,7 +24,7 @@ SRCNAM=php PRGNAM=php-pgsql -VERSION=5.4.34 +VERSION=${VERSION:-5.6.11} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} diff --git a/libraries/php-pgsql/php-pgsql.info b/libraries/php-pgsql/php-pgsql.info index 87b17ec18d..9cf67cadb2 100644 --- a/libraries/php-pgsql/php-pgsql.info +++ b/libraries/php-pgsql/php-pgsql.info @@ -1,8 +1,8 @@ PRGNAM="php-pgsql" -VERSION="5.4.34" +VERSION="5.6.11" HOMEPAGE="http://php.net/manual/en/book.pgsql.php" -DOWNLOAD="https://php.net/distributions/php-5.4.34.tar.bz2" -MD5SUM="1afe3a10cefec9618acb785ef5064bf9" +DOWNLOAD="https://php.net/distributions/php-5.6.11.tar.bz2" +MD5SUM="a0c842c1d30fedbe972e1556ae9cee27" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="postgresql" diff --git a/libraries/ptlib/ptlib-2.10.10-mga-bison-parameter.patch b/libraries/ptlib/ptlib-2.10.10-mga-bison-parameter.patch new file mode 100644 index 0000000000..fcc8d0d2e7 --- /dev/null +++ b/libraries/ptlib/ptlib-2.10.10-mga-bison-parameter.patch @@ -0,0 +1,39 @@ +--- ptlib-2.10.11/./src/ptlib/common/getdate.y 2013-08-15 01:20:26.000000000 +0200 ++++ /mnt/chroot/cauldron/home/dan/rpm/BUILD/ptlib-2.10.11/src/ptlib/common/getdate.y 2013-12-15 00:24:27.866481490 +0100 +@@ -121,9 +121,9 @@ + static int yylex(); + + #ifdef __GNUC__ +-static int yyerror(char const *msg); ++static int yyerror(void *, char const *msg); + #else +-static void yyerror(char const *msg); ++static void yyerror(void *, char const *msg); + #endif + + +@@ -132,7 +132,8 @@ + + %} + +-%pure_parser ++%pure-parser ++%parse-param {void *parseParam} + + %union { + time_t Number; +@@ -1018,12 +1019,12 @@ + #endif + + #ifdef __GNUC__ +-int yyerror(const char * s) ++int yyerror(void *var, const char * s) + { + return 0; + } + #else +-static void yyerror(const char * s) ++static void yyerror(void *var, const char * s) + { + } + #endif diff --git a/libraries/ptlib/ptlib.SlackBuild b/libraries/ptlib/ptlib.SlackBuild index 4a837a394d..c5ff9be601 100644 --- a/libraries/ptlib/ptlib.SlackBuild +++ b/libraries/ptlib/ptlib.SlackBuild @@ -67,6 +67,10 @@ 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 building with bison-3.0.4 +# thanks to Dan Fandrich / OpalVOIP https://sourceforge.net/p/opalvoip/patches/259/ +patch -p1 < $CWD/ptlib-2.10.10-mga-bison-parameter.patch + # The "LIBS" variable is set to fix OpenLDAP support # # The --disable-avc is here to avoid build problems when both libdv and diff --git a/libraries/qt3/qt3-libpng14.diff b/libraries/qt3/qt3-libpng14.diff deleted file mode 100644 index c568dd0c4d..0000000000 --- a/libraries/qt3/qt3-libpng14.diff +++ /dev/null @@ -1,41 +0,0 @@ -http://groups.google.com/group/lucky.freebsd.ports.bugs/browse_thread/thread/a4a95255567dedfc - -System: FreeBSD elch.exwg.net 8.0-RELEASE-p2 FreeBSD 8.0-RELEASE-p2 #8: Sat Feb 20 21:36:50 CET 2010 c...@elch.exwg.net:/usr/obj/usr/src/sys/CMT amd64 - - png-1.4.1 - qt-3.3.8_11 (upgrading to qt-3.3.8_12) - ->Description: - - Build of x11-toolkits/qt33 fails due to the changed struct png_info - in libpng-1.4: - kernel/qpngio.cpp:162: error: 'struct png_info_struct' has no member named 'trans_values' - ->How-To-Repeat: - run portupgrade ->Fix: - - Add x11-toolkits/qt33/files/patch-src-kernel-qpngio.cpp - (also available at http://burggraben.net/hacks/patch-src-kernel-qpngio.cpp ) - ---- src/kernel/qpngio.cpp.orig 2010-03-28 12:55:28.000000000 +0200 -+++ src/kernel/qpngio.cpp 2010-03-28 12:56:44.000000000 +0200 -@@ -159,7 +159,7 @@ - image.setColor( i, qRgba(c,c,c,0xff) ); - } - if ( png_get_valid(png_ptr, info_ptr, PNG_INFO_tRNS) ) { -- const int g = info_ptr->trans_values.gray; -+ const int g = info_ptr->trans_color.gray; - if (g < ncols) { - image.setAlphaBuffer(TRUE); - image.setColor(g, image.color(g) & RGB_MASK); -@@ -187,7 +187,7 @@ - info_ptr->palette[i].red, - info_ptr->palette[i].green, - info_ptr->palette[i].blue, -- info_ptr->trans[i] -+ info_ptr->trans_alpha[i] - ) - ); - i++; - diff --git a/libraries/qt3/qt3-png15.patch b/libraries/qt3/qt3-png15.patch new file mode 100644 index 0000000000..e64fea36a4 --- /dev/null +++ b/libraries/qt3/qt3-png15.patch @@ -0,0 +1,212 @@ +$NetBSD: patch-as,v 1.5 2011/03/25 15:28:26 wiz Exp $ + +--- src/kernel/qpngio.cpp.orig 2007-02-02 10:01:15.000000000 -0400 ++++ src/kernel/qpngio.cpp +@@ -43,6 +43,7 @@ + #include "qiodevice.h" + + #include <png.h> ++#include <zlib.h> + + + #ifdef Q_OS_TEMP +@@ -123,9 +124,24 @@ void setup_qt( QImage& image, png_struct + png_get_IHDR(png_ptr, info_ptr, &width, &height, &bit_depth, &color_type, + 0, 0, 0); + ++ png_colorp info_ptr_palette = NULL; ++ int info_ptr_num_palette = 0; ++ if (png_get_valid(png_ptr, info_ptr, PNG_INFO_PLTE)) { ++ png_get_PLTE(png_ptr, info_ptr, &info_ptr_palette, &info_ptr_num_palette); ++ } ++ ++ png_bytep info_ptr_trans_alpha = NULL; ++ int info_ptr_num_trans = 0; ++ png_color_16p info_ptr_trans_color = NULL; ++ ++ if (png_get_valid(png_ptr, info_ptr, PNG_INFO_tRNS)) { ++ png_get_tRNS(png_ptr, info_ptr, &info_ptr_trans_alpha, &info_ptr_num_trans, &info_ptr_trans_color); ++ } ++ ++ + if ( color_type == PNG_COLOR_TYPE_GRAY ) { + // Black & White or 8-bit grayscale +- if ( bit_depth == 1 && info_ptr->channels == 1 ) { ++ if ( bit_depth == 1 && png_get_channels(png_ptr, info_ptr) == 1 ) { + png_set_invert_mono( png_ptr ); + png_read_update_info( png_ptr, info_ptr ); + if (!image.create( width, height, 1, 2, QImage::BigEndian )) +@@ -159,7 +175,7 @@ void setup_qt( QImage& image, png_struct + image.setColor( i, qRgba(c,c,c,0xff) ); + } + if ( png_get_valid(png_ptr, info_ptr, PNG_INFO_tRNS) ) { +- const int g = info_ptr->trans_values.gray; ++ const int g = info_ptr_trans_color->gray; + if (g < ncols) { + image.setAlphaBuffer(TRUE); + image.setColor(g, image.color(g) & RGB_MASK); +@@ -168,7 +184,7 @@ void setup_qt( QImage& image, png_struct + } + } else if ( color_type == PNG_COLOR_TYPE_PALETTE + && png_get_valid(png_ptr, info_ptr, PNG_INFO_PLTE) +- && info_ptr->num_palette <= 256 ) ++ && info_ptr_num_palette <= 256 ) + { + // 1-bit and 8-bit color + if ( bit_depth != 1 ) +@@ -176,28 +192,28 @@ void setup_qt( QImage& image, png_struct + png_read_update_info( png_ptr, info_ptr ); + png_get_IHDR(png_ptr, info_ptr, + &width, &height, &bit_depth, &color_type, 0, 0, 0); +- if (!image.create(width, height, bit_depth, info_ptr->num_palette, ++ if (!image.create(width, height, bit_depth, info_ptr_num_palette, + QImage::BigEndian)) + return; + int i = 0; + if ( png_get_valid(png_ptr, info_ptr, PNG_INFO_tRNS) ) { + image.setAlphaBuffer( TRUE ); +- while ( i < info_ptr->num_trans ) { ++ while ( i < info_ptr_num_trans ) { + image.setColor(i, qRgba( +- info_ptr->palette[i].red, +- info_ptr->palette[i].green, +- info_ptr->palette[i].blue, +- info_ptr->trans[i] ++ info_ptr_palette[i].red, ++ info_ptr_palette[i].green, ++ info_ptr_palette[i].blue, ++ info_ptr_trans_alpha[i] + ) + ); + i++; + } + } +- while ( i < info_ptr->num_palette ) { ++ while ( i < info_ptr_num_palette ) { + image.setColor(i, qRgba( +- info_ptr->palette[i].red, +- info_ptr->palette[i].green, +- info_ptr->palette[i].blue, ++ info_ptr_palette[i].red, ++ info_ptr_palette[i].green, ++ info_ptr_palette[i].blue, + 0xff + ) + ); +@@ -284,7 +300,7 @@ void read_png_image(QImageIO* iio) + return; + } + +- if (setjmp(png_ptr->jmpbuf)) { ++ if (setjmp(png_jmpbuf(png_ptr))) { + png_destroy_read_struct(&png_ptr, &info_ptr, &end_info); + iio->setStatus(-4); + return; +@@ -469,7 +485,7 @@ bool QPNGImageWriter::writeImage(const Q + return FALSE; + } + +- if (setjmp(png_ptr->jmpbuf)) { ++ if (setjmp(png_jmpbuf(png_ptr))) { + png_destroy_write_struct(&png_ptr, &info_ptr); + return FALSE; + } +@@ -491,10 +507,16 @@ bool QPNGImageWriter::writeImage(const Q + + png_set_write_fn(png_ptr, (void*)this, qpiw_write_fn, qpiw_flush_fn); + ++#warning XXXtnn not too sure about this ++/* ++according to png.h, channels is only used on read, not writes, so we ++should be able to comment this out. ++ + info_ptr->channels = + (image.depth() == 32) + ? (image.hasAlphaBuffer() ? 4 : 3) + : 1; ++*/ + + png_set_IHDR(png_ptr, info_ptr, image.width(), image.height(), + image.depth() == 1 ? 1 : 8 /* per channel */, +@@ -504,11 +526,12 @@ bool QPNGImageWriter::writeImage(const Q + : PNG_COLOR_TYPE_RGB + : PNG_COLOR_TYPE_PALETTE, 0, 0, 0); + ++ png_color_8 sig_bit; ++ sig_bit.red = 8; ++ sig_bit.green = 8; ++ sig_bit.blue = 8; ++ png_set_sBIT(png_ptr, info_ptr, &sig_bit); + +- //png_set_sBIT(png_ptr, info_ptr, 8); +- info_ptr->sig_bit.red = 8; +- info_ptr->sig_bit.green = 8; +- info_ptr->sig_bit.blue = 8; + + if (image.depth() == 1 && image.bitOrder() == QImage::LittleEndian) + png_set_packswap(png_ptr); +@@ -522,11 +545,14 @@ bool QPNGImageWriter::writeImage(const Q + png_set_PLTE(png_ptr, info_ptr, palette, num_palette); + int* trans = new int[num_palette]; + int num_trans = 0; ++ png_colorp info_ptr_palette = NULL; ++ int tmp; ++ png_get_PLTE(png_ptr, info_ptr, &info_ptr_palette, &tmp); + for (int i=0; i<num_palette; i++) { + QRgb rgb=image.color(i); +- info_ptr->palette[i].red = qRed(rgb); +- info_ptr->palette[i].green = qGreen(rgb); +- info_ptr->palette[i].blue = qBlue(rgb); ++ info_ptr_palette[i].red = qRed(rgb); ++ info_ptr_palette[i].green = qGreen(rgb); ++ info_ptr_palette[i].blue = qBlue(rgb); + if (image.hasAlphaBuffer()) { + trans[i] = rgb >> 24; + if (trans[i] < 255) { +@@ -534,6 +560,7 @@ bool QPNGImageWriter::writeImage(const Q + } + } + } ++ png_set_PLTE(png_ptr, info_ptr, info_ptr_palette, num_palette); + if (num_trans) { + copy_trans = new png_byte[num_trans]; + for (int i=0; i<num_trans; i++) +@@ -544,7 +571,10 @@ bool QPNGImageWriter::writeImage(const Q + } + + if ( image.hasAlphaBuffer() ) { +- info_ptr->sig_bit.alpha = 8; ++ png_color_8p sig_bit; ++ png_get_sBIT(png_ptr, info_ptr, &sig_bit); ++ sig_bit->alpha = 8; ++ png_set_sBIT(png_ptr, info_ptr, sig_bit); + } + + // Swap ARGB to RGBA (normal PNG format) before saving on +@@ -1030,7 +1060,7 @@ int QPNGFormat::decode(QImage& img, QIma + return -1; + } + +- if (setjmp((png_ptr)->jmpbuf)) { ++ if (setjmp(png_jmpbuf(png_ptr))) { + png_destroy_read_struct(&png_ptr, &info_ptr, 0); + image = 0; + return -1; +@@ -1057,7 +1087,7 @@ int QPNGFormat::decode(QImage& img, QIma + + if ( !png_ptr ) return 0; + +- if (setjmp(png_ptr->jmpbuf)) { ++ if (setjmp(png_jmpbuf(png_ptr))) { + png_destroy_read_struct(&png_ptr, &info_ptr, 0); + image = 0; + state = MovieStart; +@@ -1117,7 +1147,7 @@ void QPNGFormat::end(png_structp png, pn + consumer->frameDone(QPoint(offx,offy),r); + consumer->end(); + state = FrameStart; +- unused_data = (int)png->buffer_size; // Since libpng doesn't tell us ++ unused_data = png_process_data_pause(png, 0); + } + + #ifdef PNG_USER_CHUNKS_SUPPORTED diff --git a/libraries/qt3/qt3.SlackBuild b/libraries/qt3/qt3.SlackBuild index 403f302353..ef6f5f62f6 100644 --- a/libraries/qt3/qt3.SlackBuild +++ b/libraries/qt3/qt3.SlackBuild @@ -87,8 +87,8 @@ sed -i "/#define QT_BUILTIN_GIF_READER/s|0|1|" src/kernel/qgif.h # Fix location of mysql.h sed -i "s|mysql\.h|mysql/mysql\.h|" src/sql/drivers/mysql/qsql_mysql.h -# Build with libpng 1.4+: -patch -lp0 < $CWD/qt3-libpng14.diff +# Build with libpng 1.5+ (patch from Arch Linux) +patch -lp0 < $CWD/qt3-png15.patch # Patch for gcc-4.7+ (based on info from LFS) patch -p1 < $CWD/qt3_gcc47.patch diff --git a/libraries/qtmimetypes/README b/libraries/qtmimetypes/README new file mode 100644 index 0000000000..af82a375a4 --- /dev/null +++ b/libraries/qtmimetypes/README @@ -0,0 +1 @@ +Mimetype library for Qt4. diff --git a/libraries/QtGStreamer/QtGStreamer.SlackBuild b/libraries/qtmimetypes/qtmimetypes.SlackBuild index 7220576c6a..61ff2502d8 100644 --- a/libraries/QtGStreamer/QtGStreamer.SlackBuild +++ b/libraries/qtmimetypes/qtmimetypes.SlackBuild @@ -1,8 +1,8 @@ #!/bin/sh -# Slackware build script for QtGStreamer +# Slackware build script for qtmimetypes -# Copyright 2014 Willy Sudiarto Raharjo <willysr@slackbuilds.org> +# Copyright 2014 Matteo Bernardini <ponce@slackbuilds.org>, Pisa, Italy # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -22,9 +22,9 @@ # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -PRGNAM=QtGStreamer -SRCNAM=qt-gstreamer -VERSION=${VERSION:-0.10.3} +PRGNAM=qtmimetypes +SRCNAM=mimetypes +VERSION=${VERSION:-20140903_123e525} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -38,7 +38,7 @@ fi CWD=$(pwd) TMP=${TMP:-/tmp/SBo} -PKG=$TMP/package-$SRCNAM +PKG=$TMP/package-$PRGNAM OUTPUT=${OUTPUT:-/tmp} if [ "$ARCH" = "i486" ]; then @@ -55,13 +55,15 @@ else LIBDIRSUFFIX="" fi +DOCS="LICENSE.LGPL TODO.txt" + set -e rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT cd $TMP rm -rf $SRCNAM-$VERSION -tar xvf $CWD/$SRCNAM-$VERSION.tar.gz +tar xvf $CWD/$SRCNAM-$VERSION.tar.?z* cd $SRCNAM-$VERSION chown -R root:root . find -L . \ @@ -70,22 +72,17 @@ 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 {} \; -mkdir -p build -cd build - cmake \ - -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \ - -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \ - -DCMAKE_INSTALL_PREFIX=/usr \ - -DCMAKE_BUILD_TYPE=Release .. - make - make install DESTDIR=$PKG -cd .. +sed -i "s|/lib$|/lib$LIBDIRSUFFIX|" mimetypes-nolibs.pri +export CXXFLAGS="$SLKCFLAGS" +qmake +make +make INSTALL_ROOT=$PKG install 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 HACKING NEWS README $PKG/usr/doc/$PRGNAM-$VERSION +cp -a $DOCS $PKG/usr/doc/$PRGNAM-$VERSION cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild mkdir -p $PKG/install diff --git a/libraries/qtmimetypes/qtmimetypes.info b/libraries/qtmimetypes/qtmimetypes.info new file mode 100644 index 0000000000..1a31f70f8f --- /dev/null +++ b/libraries/qtmimetypes/qtmimetypes.info @@ -0,0 +1,10 @@ +PRGNAM="qtmimetypes" +VERSION="20140903_123e525" +HOMEPAGE="https://qt.gitorious.org/qtplayground/mimetypes" +DOWNLOAD="http://ponce.cc/slackware/sources/repo/lxqt/mimetypes-20140903_123e525.tar.xz" +MD5SUM="ddabb754a9af0e293e014f10bfdb0ff5" +DOWNLOAD_x86_64="" +MD5SUM_x86_64="" +REQUIRES="" +MAINTAINER="Matteo Bernardini" +EMAIL="ponce@slackbuilds.org" diff --git a/libraries/QtGStreamer/slack-desc b/libraries/qtmimetypes/slack-desc index 8b713af382..ae20d67c6a 100644 --- a/libraries/QtGStreamer/slack-desc +++ b/libraries/qtmimetypes/slack-desc @@ -6,14 +6,14 @@ # customary to leave one space after the ':' except on otherwise blank lines. |-----handy-ruler------------------------------------------------------| -QtGStreamer: QtGStreamer (C++ Bindings for GStreamer) -QtGStreamer: -QtGStreamer: QtGStreamer provides C++ bindings for GStreamer with a Qt-style API -QtGStreamer: plus some helper classes for integrating GStreamer better in -QtGStreamer: Qt applications. -QtGStreamer: -QtGStreamer: Homepage: http://gstreamer.freedesktop.org -QtGStreamer: -QtGStreamer: -QtGStreamer: -QtGStreamer: +qtmimetypes: qtmimetypes (qt4 mimetypes) +qtmimetypes: +qtmimetypes: Mimetype library for Qt4. +qtmimetypes: +qtmimetypes: homepage: https://qt.gitorious.org/qtplayground/mimetypes +qtmimetypes: +qtmimetypes: +qtmimetypes: +qtmimetypes: +qtmimetypes: +qtmimetypes: diff --git a/libraries/rest/rest.SlackBuild b/libraries/rest/rest.SlackBuild index b3fdccfed0..feb18be0d3 100644 --- a/libraries/rest/rest.SlackBuild +++ b/libraries/rest/rest.SlackBuild @@ -23,7 +23,7 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=rest -VERSION=${VERSION:-0.7.91} +VERSION=${VERSION:-0.7.93} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} diff --git a/libraries/rest/rest.info b/libraries/rest/rest.info index ccfef591c5..e5151279bd 100644 --- a/libraries/rest/rest.info +++ b/libraries/rest/rest.info @@ -1,8 +1,8 @@ PRGNAM="rest" -VERSION="0.7.91" +VERSION="0.7.93" HOMEPAGE="http://www.gtk.org/" -DOWNLOAD="http://ftp.gnome.org/pub/GNOME/sources/rest/0.7/rest-0.7.91.tar.xz" -MD5SUM="abd6211788b9b8dac432a26767099a27" +DOWNLOAD="http://ftp.gnome.org/pub/GNOME/sources/rest/0.7/rest-0.7.93.tar.xz" +MD5SUM="1c276e7808edf8e2e49ed854f741cd40" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" diff --git a/libraries/serf/README b/libraries/serf/README deleted file mode 100644 index de01cb4d90..0000000000 --- a/libraries/serf/README +++ /dev/null @@ -1,10 +0,0 @@ -The serf library is a high performance C-based HTTP client library built upon -the Apache Portable Runtime (APR) library. It is permissively licensed under -the Apache License, v2. - -Key features: -* multiplexed, asynchronous connections, -* SSL/TLS support, -* full HTTP pipelining, -* multiple authentication modes (Basic, Digest, Kerberos/NTLM), -* zero-copy support for increased throughput. diff --git a/libraries/serf/serf.info b/libraries/serf/serf.info deleted file mode 100644 index 5d3ef857fb..0000000000 --- a/libraries/serf/serf.info +++ /dev/null @@ -1,10 +0,0 @@ -PRGNAM="serf" -VERSION="1.3.5" -HOMEPAGE="http://code.google.com/p/serf/" -DOWNLOAD="http://serf.googlecode.com/svn/src_releases/serf-1.3.5.tar.bz2" -MD5SUM="5f642135442ae5a9658ab5c82bfc5209" -DOWNLOAD_x86_64="" -MD5SUM_x86_64="" -REQUIRES="scons" -MAINTAINER="Andrzej Telszewski" -EMAIL="atelszewski@gmail.com" diff --git a/libraries/serf/slack-desc b/libraries/serf/slack-desc deleted file mode 100644 index d914b8411a..0000000000 --- a/libraries/serf/slack-desc +++ /dev/null @@ -1,19 +0,0 @@ -# HOW TO EDIT THIS FILE: -# The "handy ruler" below makes it easier to edit a package description. -# Line up the first '|' above the ':' following the base package name, and -# the '|' on the right side marks the last column you can put a character in. -# You must make exactly 11 lines for the formatting to be correct. It's also -# customary to leave one space after the ':' except on otherwise blank lines. - - |-----handy-ruler------------------------------------------------------| -serf: serf (high-performance asynchronous HTTP client library) -serf: -serf: The serf library is a high performance C-based HTTP client library -serf: built upon the Apache Portable Runtime (APR) library. Key features: -serf: * multiplexed, asynchronous connections, -serf: * SSL/TLS support, full HTTP pipelining, -serf: * multiple authentication modes (Basic, Digest, Kerberos/NTLM), -serf: * zero-copy support for increased throughput. -serf: -serf: Homepage: http://code.google.com/p/serf/ -serf: diff --git a/libraries/suil/suil.SlackBuild b/libraries/suil/suil.SlackBuild index 4f0d072fbe..95aa37a684 100644 --- a/libraries/suil/suil.SlackBuild +++ b/libraries/suil/suil.SlackBuild @@ -2,7 +2,7 @@ # Slackware build script for suil -# Copyright 2012-2014 Heinz Wiesinger, Amsterdam, The Netherlands +# Copyright 2012-2015 Heinz Wiesinger, Amsterdam, The Netherlands # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -23,7 +23,7 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=suil -VERSION=${VERSION:-0.8.0} +VERSION=${VERSION:-0.8.2} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -65,7 +65,7 @@ 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 \ + -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 {} \; diff --git a/libraries/suil/suil.info b/libraries/suil/suil.info index e2ca7d3ec9..e8d45badc4 100644 --- a/libraries/suil/suil.info +++ b/libraries/suil/suil.info @@ -1,8 +1,8 @@ PRGNAM="suil" -VERSION="0.8.0" +VERSION="0.8.2" HOMEPAGE="http://drobilla.net/software/suil/" -DOWNLOAD="http://download.drobilla.net/suil-0.8.0.tar.bz2" -MD5SUM="8b6039593b2b8d6838b3b29e36874c1c" +DOWNLOAD="http://download.drobilla.net/suil-0.8.2.tar.bz2" +MD5SUM="1b06947b1fc028f9ffcbc16d30065aa5" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="lv2" diff --git a/libraries/t4k_common/libpng.patch b/libraries/t4k_common/libpng.patch new file mode 100644 index 0000000000..c6d66c0877 --- /dev/null +++ b/libraries/t4k_common/libpng.patch @@ -0,0 +1,17 @@ +diff -u -r t4k_common-0.1.1/src/t4k_loaders.c t4k_common-0.1.1-patched/src/t4k_loaders.c +--- t4k_common-0.1.1/src/t4k_loaders.c 2011-04-08 03:46:07.000000000 +0100 ++++ t4k_common-0.1.1-patched/src/t4k_loaders.c 2015-08-04 01:37:04.120998907 +0100 +@@ -1028,12 +1028,7 @@ + { + png_init_io(png_ptr, fi); + +- info_ptr->width = surf->w; +- info_ptr->height = surf->h; +- info_ptr->bit_depth = 8; +- info_ptr->color_type = PNG_COLOR_TYPE_RGB_ALPHA; +- info_ptr->interlace_type = 1; +- info_ptr->valid = 0; /* will be updated by various png_set_FOO() functions */ ++ png_set_IHDR(png_ptr, info_ptr, surf->w, surf->h, 8, PNG_COLOR_TYPE_RGB_ALPHA, PNG_INTERLACE_NONE, PNG_COMPRESSION_TYPE_DEFAULT, PNG_FILTER_TYPE_DEFAULT); + + png_set_sRGB_gAMA_and_cHRM(png_ptr, info_ptr, + PNG_sRGB_INTENT_PERCEPTUAL); diff --git a/libraries/t4k_common/t4k_common.SlackBuild b/libraries/t4k_common/t4k_common.SlackBuild index 2975a8ff48..9fb0cad487 100644 --- a/libraries/t4k_common/t4k_common.SlackBuild +++ b/libraries/t4k_common/t4k_common.SlackBuild @@ -51,6 +51,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 {} \; +# Patch for libpng16 (-current) (from Debian) +patch -p1 < $CWD/libpng.patch + CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ ./configure \ diff --git a/libraries/uriparser/README b/libraries/uriparser/README new file mode 100644 index 0000000000..bf3888be17 --- /dev/null +++ b/libraries/uriparser/README @@ -0,0 +1,3 @@ +uriparser is a strictly RFC 3986 compliant URI parsing and handling +library written in C. uriparser is cross-platform, fast, supports +Unicode and is licensed under the New BSD license. diff --git a/libraries/libdvdnav/slack-desc b/libraries/uriparser/slack-desc index a3ab05694f..eb9277b85f 100644 --- a/libraries/libdvdnav/slack-desc +++ b/libraries/uriparser/slack-desc @@ -6,14 +6,14 @@ # customary to leave one space after the ':' except on otherwise blank lines. |-----handy-ruler------------------------------------------------------| -libdvdnav: libdvdnav (DVD Navigation Library) -libdvdnav: -libdvdnav: This is mplayer's fork of libdvdnav. libdvdnav is a library that -libdvdnav: allows easy use of sophisticated DVD navigation features such as -libdvdnav: DVD menus, multiangle playback, and even interactive DVD games. -libdvdnav: -libdvdnav: Homepage: http://www.mplayerhq.hu/design7/news.html -libdvdnav: -libdvdnav: -libdvdnav: -libdvdnav: +uriparser: uriparser (URI parsing library) +uriparser: +uriparser: uriparser is a strictly RFC 3986 compliant URI parsing and handling +uriparser: library written in C. uriparser is cross-platform, fast, supports +uriparser: Unicode and is licensed under the New BSD license. +uriparser: +uriparser: homepage: http://uriparser.sourceforge.net +uriparser: +uriparser: +uriparser: +uriparser: diff --git a/libraries/gst1-plugins-good/gst1-plugins-good.SlackBuild b/libraries/uriparser/uriparser.SlackBuild index f9410eb3bf..7859fb2c72 100644 --- a/libraries/gst1-plugins-good/gst1-plugins-good.SlackBuild +++ b/libraries/uriparser/uriparser.SlackBuild @@ -1,8 +1,8 @@ #!/bin/sh -# Slackware build script for gst1-plugins-good +# Slackware build script for uriparser -# Copyright 2013-2015 Robby Workman, Tuscaloosa, Alabama, USA +# Copyright 2015 Matteo Bernardini <ponce@slackbuilds.org>, Pisa, Italy # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -22,13 +22,11 @@ # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -PRGNAM=gst1-plugins-good -VERSION=${VERSION:-1.4.5} +PRGNAM=uriparser +VERSION=${VERSION:-0.8.2} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} -SRCNAM=gst-plugins-good - if [ -z "$ARCH" ]; then case "$( uname -m )" in i?86) ARCH=i486 ;; @@ -56,18 +54,20 @@ else LIBDIRSUFFIX="" fi +DOCS="AUTHORS COPYING ChangeLog THANKS" + set -e rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT cd $TMP -rm -rf $SRCNAM-$VERSION -tar xvf $CWD/$SRCNAM-$VERSION.tar.xz -cd $SRCNAM-$VERSION +rm -rf $PRGNAM-$VERSION +tar xvf $CWD/$PRGNAM-$VERSION.tar.?z* +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 \ + -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 {} \; @@ -78,20 +78,18 @@ CXXFLAGS="$SLKCFLAGS" \ --libdir=/usr/lib${LIBDIRSUFFIX} \ --sysconfdir=/etc \ --localstatedir=/var \ - --mandir=/usr/man \ --docdir=/usr/doc/$PRGNAM-$VERSION \ + --disable-test \ --build=$ARCH-slackware-linux make make install DESTDIR=$PKG -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 +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 \ - AUTHORS COPYING* ChangeLog INSTALL NEWS RE* \ - $PKG/usr/doc/$PRGNAM-$VERSION +cp -a $DOCS $PKG/usr/doc/$PRGNAM-$VERSION cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild mkdir -p $PKG/install diff --git a/libraries/uriparser/uriparser.info b/libraries/uriparser/uriparser.info new file mode 100644 index 0000000000..679a0a3277 --- /dev/null +++ b/libraries/uriparser/uriparser.info @@ -0,0 +1,10 @@ +PRGNAM="uriparser" +VERSION="0.8.2" +HOMEPAGE="http://uriparser.sourceforge.net" +DOWNLOAD="http://downloads.sf.net/uriparser/uriparser-0.8.2.tar.bz2" +MD5SUM="c5cf6b3941d887deb7defc2a86c40f1d" +DOWNLOAD_x86_64="" +MD5SUM_x86_64="" +REQUIRES="graphviz" +MAINTAINER="Matteo Bernardini" +EMAIL="ponce@slackbuilds.org" diff --git a/libraries/vte3/vte3.SlackBuild b/libraries/vte3/vte3.SlackBuild index 27d0d09e63..1f642d8ea6 100644 --- a/libraries/vte3/vte3.SlackBuild +++ b/libraries/vte3/vte3.SlackBuild @@ -24,7 +24,7 @@ SRCNAM=vte PRGNAM=vte3 -VERSION=${VERSION:-0.36.3} +VERSION=${VERSION:-0.36.5} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} diff --git a/libraries/vte3/vte3.info b/libraries/vte3/vte3.info index c8bb08d559..343dd44ccb 100644 --- a/libraries/vte3/vte3.info +++ b/libraries/vte3/vte3.info @@ -1,8 +1,8 @@ PRGNAM="vte3" -VERSION="0.36.3" +VERSION="0.36.5" HOMEPAGE="http://www.gnome.org/" -DOWNLOAD="http://ftp.gnome.org/pub/GNOME/sources/vte/0.36/vte-0.36.3.tar.xz" -MD5SUM="3f9df4c9a67b09bf5c660bf5c3bae109" +DOWNLOAD="http://ftp.gnome.org/pub/GNOME/sources/vte/0.36/vte-0.36.5.tar.xz" +MD5SUM="96f102ef9e178b6238edcfdb1fa9dbcc" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" diff --git a/libraries/webkitgtk/webkitgtk.SlackBuild b/libraries/webkitgtk/webkitgtk.SlackBuild index e6b0950f6b..34a5215f47 100644 --- a/libraries/webkitgtk/webkitgtk.SlackBuild +++ b/libraries/webkitgtk/webkitgtk.SlackBuild @@ -83,7 +83,7 @@ CXXFLAGS="$SLKCFLAGS" \ --enable-geolocation=$GEOCLUE \ --build=$ARCH-slackware-linux -make -j1 +make make install-strip DESTDIR=$PKG mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION diff --git a/libraries/webkitgtk3/webkitgtk3.SlackBuild b/libraries/webkitgtk3/webkitgtk3.SlackBuild index a6c3553ba8..6f5892745c 100644 --- a/libraries/webkitgtk3/webkitgtk3.SlackBuild +++ b/libraries/webkitgtk3/webkitgtk3.SlackBuild @@ -90,7 +90,7 @@ CXXFLAGS="$SLKCFLAGS" \ --build=$ARCH-slackware-linux make clean -make -j1 Programs_DumpRenderTree_LDFLAGS="-no-fast-install -no-install -lfontconfig" +make Programs_DumpRenderTree_LDFLAGS="-no-fast-install -no-install -lfontconfig" make install-strip DESTDIR=$PKG mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION diff --git a/libraries/xapian-core/README b/libraries/xapian-core/README deleted file mode 100644 index 22a074b49b..0000000000 --- a/libraries/xapian-core/README +++ /dev/null @@ -1,7 +0,0 @@ -Xapian is an Open Source Search Engine Library released under the GPL. -It's written in C++, with bindings to allow use from Perl, Python, PHP, -Java, Tcl, C#, and Ruby (so far!). Xapian is a highly adaptable toolkit -which allows developers to easily add advanced indexing and search -facilities to their own applications. It supports the Probabilistic -Information Retrieval model and also supports a rich set of boolean -query operators. diff --git a/libraries/xapian-core/slack-desc b/libraries/xapian-core/slack-desc deleted file mode 100644 index f6a3611da2..0000000000 --- a/libraries/xapian-core/slack-desc +++ /dev/null @@ -1,19 +0,0 @@ -# HOW TO EDIT THIS FILE: -# The "handy ruler" below makes it easier to edit a package description. -# Line up the first '|' above the ':' following the base package name, and -# the '|' on the right side marks the last column you can put a character in. -# You must make exactly 11 lines for the formatting to be correct. It's also -# customary to leave one space after the ':' except on otherwise blank lines. - - |-----handy-ruler------------------------------------------------------| -xapian-core: xapian-core (search engine library) -xapian-core: -xapian-core: Xapian is an Open Source Search Engine Library released under the GPL. -xapian-core: It's written in C++, with bindings to allow use from Perl, Python, -xapian-core: PHP, Java, Tcl, C#, and Ruby (so far!). Xapian is a highly adaptable -xapian-core: toolkit which allows developers to easily add advanced indexing and -xapian-core: search facilities to their own applications. It supports the -xapian-core: Probabilistic Information Retrieval model and also supports a rich -xapian-core: set of boolean query operators. -xapian-core: -xapian-core: http://www.xapian.org/ diff --git a/libraries/xapian-core/xapian-core.SlackBuild b/libraries/xapian-core/xapian-core.SlackBuild deleted file mode 100644 index 95e73c6f95..0000000000 --- a/libraries/xapian-core/xapian-core.SlackBuild +++ /dev/null @@ -1,105 +0,0 @@ -#!/bin/sh - -# Slackware build script for xapian-core - -# Written by titopoquito (titopoquito@gmail.com) - -# Permission to use, copy, modify, and distribute this software for -# any purpose with or without fee is hereby granted, provided that -# the above copyright notice and this permission notice appear in all -# copies. -# -# THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED -# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. -# IN NO EVENT SHALL THE AUTHORS AND COPYRIGHT HOLDERS AND THEIR -# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF -# USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND -# ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, -# OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT -# OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF -# SUCH DAMAGE. - -PRGNAM=xapian-core -VERSION=${VERSION:-1.2.21} -BUILD=${BUILD:-1} -TAG=${TAG:-_SBo} - -if [ -z "$ARCH" ]; then - case "$( uname -m )" in - i?86) ARCH=i486 ;; - arm*) ARCH=arm ;; - *) ARCH=$( uname -m ) ;; - esac -fi - -CWD=$(pwd) -TMP=${TMP:-/tmp/SBo} -PKG=$TMP/package-$PRGNAM -OUTPUT=${OUTPUT:-/tmp} - -if [ "$ARCH" = "i486" ]; then - SLKCFLAGS="-O2 -march=i486 -mtune=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "i686" ]; then - SLKCFLAGS="-O2 -march=i686 -mtune=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "x86_64" ]; then - SLKCFLAGS="-O2 -fPIC" - LIBDIRSUFFIX="64" -else - SLKCFLAGS="-O2" - LIBDIRSUFFIX="" -fi - -set -e - -rm -rf $PKG -mkdir -p $TMP $PKG $OUTPUT -cd $TMP -rm -rf $PRGNAM-$VERSION -tar xvf $CWD/$PRGNAM-$VERSION.tar.xz -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 640 -o -perm 600 -o -perm 444 \ - -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; - -CFLAGS="$SLKCFLAGS" \ -CXXFLAGS="$SLKCFLAGS" \ -./configure \ - --prefix=/usr \ - --libdir=/usr/lib${LIBDIRSUFFIX} \ - --sysconfdir=/etc \ - --localstatedir=/var \ - --mandir=/usr/man \ - --docdir=/usr/doc/$PRGNAM-$VERSION \ - --disable-static \ - --build=$ARCH-slackware-linux - -make -make install DESTDIR=$PKG - -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 - -find $PKG/usr/man -type f -exec gzip -9 {} \; -for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done - -mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION -cp -a AUTHORS COPYING ChangeLog INSTALL NEWS HACKING PLATFORMS README \ - $PKG/usr/doc/$PRGNAM-$VERSION -cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild - -# We don't need api docs, I don't think --rworkman -rm -rf $PKG/usr/doc/$PRGNAM-$VERSION/apidoc - -mkdir -p $PKG/install -cat $CWD/slack-desc > $PKG/install/slack-desc - -cd $PKG -/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz} diff --git a/libraries/xapian-core/xapian-core.info b/libraries/xapian-core/xapian-core.info deleted file mode 100644 index e4bb0dbe59..0000000000 --- a/libraries/xapian-core/xapian-core.info +++ /dev/null @@ -1,10 +0,0 @@ -PRGNAM="xapian-core" -VERSION="1.2.21" -HOMEPAGE="http://www.xapian.org/" -DOWNLOAD="http://oligarchy.co.uk/xapian/1.2.21/xapian-core-1.2.21.tar.xz" -MD5SUM="276497a458a8ae63e7dceb372cc1bc37" -DOWNLOAD_x86_64="" -MD5SUM_x86_64="" -REQUIRES="" -MAINTAINER="titopoquito" -EMAIL="titopoquito@gmail.com" diff --git a/libraries/xulrunner/gold/gold b/libraries/xulrunner/gold/gold new file mode 100644 index 0000000000..8c86d3b06b --- /dev/null +++ b/libraries/xulrunner/gold/gold @@ -0,0 +1,2 @@ +#!/bin/bash +/usr/bin/ld.gold "$@" diff --git a/libraries/xulrunner/gold/ld b/libraries/xulrunner/gold/ld new file mode 100644 index 0000000000..8c86d3b06b --- /dev/null +++ b/libraries/xulrunner/gold/ld @@ -0,0 +1,2 @@ +#!/bin/bash +/usr/bin/ld.gold "$@" diff --git a/libraries/xulrunner/xulrunner.SlackBuild b/libraries/xulrunner/xulrunner.SlackBuild index 51241b368a..12631ac511 100644 --- a/libraries/xulrunner/xulrunner.SlackBuild +++ b/libraries/xulrunner/xulrunner.SlackBuild @@ -28,7 +28,7 @@ PRGNAM=xulrunner -VERSION=${VERSION:-15.0.1} +VERSION=${VERSION:-40.0.2} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -46,17 +46,29 @@ PKG=$TMP/package-$PRGNAM OUTPUT=${OUTPUT:-/tmp} if [ "$ARCH" = "i486" ]; then - SLKCFLAGS="-O2 -march=i486 -mtune=i686" + SLKCFLAGS="" LIBDIRSUFFIX="" + OPTIMIZE=" --enable-optimize=-O2 " + # On IA32, use gold since GNU ld runs out of memory linking libxul.so: + PATH="$(pwd)/gold:$PATH" + export CC="gcc -B$(pwd)/gold" + export CXX="g++ -B$(pwd)/gold" elif [ "$ARCH" = "i686" ]; then - SLKCFLAGS="-O2 -march=i686 -mtune=i686" + SLKCFLAGS="" LIBDIRSUFFIX="" + OPTIMIZE=" --enable-optimize=-O2 " + # On IA32, use gold since GNU ld runs out of memory linking libxul.so: + PATH="$(pwd)/gold:$PATH" + export CC="gcc -B$(pwd)/gold" + export CXX="g++ -B$(pwd)/gold" elif [ "$ARCH" = "x86_64" ]; then SLKCFLAGS="-O2 -fPIC" LIBDIRSUFFIX="64" + OPTIMIZE=" --enable-optimize=-O2 " else SLKCFLAGS="-O2" LIBDIRSUFFIX="" + OPTIMIZE=" --enable-optimize=-O2 " fi set -e @@ -76,16 +88,14 @@ find -L . \ # Don't use --enable-system-cairo # https://bugzilla.mozilla.org/show_bug.cgi?id=722975 -CFLAGS="$SLKCFLAGS" \ -CXXFLAGS="$SLKCFLAGS" \ -./configure \ +OPTIONS="\ --prefix=/usr \ --libdir=/usr/lib${LIBDIRSUFFIX} \ --sysconfdir=/etc \ --localstatedir=/var \ --mandir=/usr/man \ --enable-default-toolkit=cairo-gtk2 \ - --enable-optimize="${CFLAGS}" \ + $OPTIMIZE \ --enable-application=xulrunner \ --enable-javaxpcom \ --enable-libxul \ @@ -94,23 +104,44 @@ CXXFLAGS="$SLKCFLAGS" \ --enable-image-decoders=all \ --enable-system-lcms \ --with-system-zlib \ - --with-system-jpeg \ --with-system-bz2 \ - --with-system-nss \ - --with-system-nspr \ --enable-system-ffi \ --disable-system-sqlite \ --disable-crashreporter \ --disable-debug \ + --disable-pulseaudio \ --disable-mailnews \ --disable-installer \ --disable-updater \ --build=$ARCH-slackware-linux \ --host=$ARCH-slackware-linux \ - --target=$ARCH-slackware-linux + --target=$ARCH-slackware-linux" -make -make install DESTDIR=$PKG +export CFLAGS="$SLKCFLAGS" +export CXXFLAGS="$SLKCFLAGS" +export MOZ_MAKE_FLAGS="$MAKEFLAGS" + +unset DBUS_SESSION_BUS_ADDRESS ORBIT_SOCKETDIR SESSION_MANAGER \ + XDG_SESSION_COOKIE XAUTHORITY MAKEFLAGS + +echo ". \$topsrcdir/browser/config/mozconfig" > .mozconfig + +# Mozilla devs enforce using an objdir for building +# https://developer.mozilla.org/en/Configuring_Build_Options#Building_with_an_objdir +mkdir obj +echo "mk_add_options MOZ_OBJDIR=$(pwd)/obj" >> .mozconfig + +if [ "$MOZLOCALIZE" ]; then + echo "mk_add_options MOZ_CO_LOCALES=\"$MOZLOCALIZE\"" >> .mozconfig +fi + +# Write in it the options above +for option in $OPTIONS; do echo "ac_add_options $option" >> .mozconfig; done + +echo "ac_add_options --disable-tests" >> .mozconfig +make -f client.mk build + +make -f client.mk install DESTDIR=$PKG find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \ | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true diff --git a/libraries/xulrunner/xulrunner.info b/libraries/xulrunner/xulrunner.info index f254477275..fc985249c2 100644 --- a/libraries/xulrunner/xulrunner.info +++ b/libraries/xulrunner/xulrunner.info @@ -1,8 +1,8 @@ PRGNAM="xulrunner" -VERSION="15.0.1" +VERSION="40.0.2" HOMEPAGE="https://developer.mozilla.org/en/Getting_started_with_XULRunner" -DOWNLOAD="https://ftp.mozilla.org/pub/mozilla.org/mozilla.org/xulrunner/releases/15.0.1/source/xulrunner-15.0.1.source.tar.bz2" -MD5SUM="e06cf648577c16d99f230b3569413e24" +DOWNLOAD="https://ftp.mozilla.org/pub/mozilla.org/xulrunner/releases/40.0.2/source/xulrunner-40.0.2.source.tar.bz2" +MD5SUM="1de6e7522b494ca3bba5f2e941bc293e" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="jdk" diff --git a/misc/fribid/fribid.SlackBuild b/misc/fribid/fribid.SlackBuild index 9537a426c1..b7d0fc7db4 100644 --- a/misc/fribid/fribid.SlackBuild +++ b/misc/fribid/fribid.SlackBuild @@ -24,7 +24,7 @@ PRGNAM=fribid -VERSION=${VERSION:-0.3.0} +VERSION=${VERSION:-1.0.4} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} # Should we build PKCS#11 smartcard support YES RUNTIME or nothing. @@ -80,6 +80,18 @@ find -L . \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ -exec chmod 644 {} \; +# Deborkage thanks to Arch Linux +sed -i \ + -e 's/-DGTK_DISABLE_DEPRECATED=1//g' \ + -e 's/-DGDK_DISABLE_DEPRECATED=1//g' \ + -e 's/-DG_DISABLE_DEPRECATED=1//g' \ + client/Makefile +sed -i \ + -e 's/strndup/strndup_/' \ + plugin/pluginutil.c +sed -i \ + 's/_BSD_SOURCE/_DEFAULT_SOURCE/g' \ + common/*.c plugin/*.c client/*.c CFLAGS="$SLKCFLAGS" \ ./configure \ diff --git a/misc/fribid/fribid.info b/misc/fribid/fribid.info index 6d6a253aa5..7d9f7992fc 100644 --- a/misc/fribid/fribid.info +++ b/misc/fribid/fribid.info @@ -1,8 +1,8 @@ PRGNAM="fribid" -VERSION="0.3.0" +VERSION="1.0.4" HOMEPAGE="http://www.fribid.se" -DOWNLOAD="http://www.fribid.se/releases/source/fribid-0.3.0.tar.bz2" -MD5SUM="18657422f71f7a35f2e2d35d5bcdabcd" +DOWNLOAD="http://www.fribid.se/releases/source/fribid-1.0.4.tar.bz2" +MD5SUM="253e1eee92bebd5b37e0a508bda770cb" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" diff --git a/misc/gprename/gprename.SlackBuild b/misc/gprename/gprename.SlackBuild index 82b5fa6f04..3e9141581f 100644 --- a/misc/gprename/gprename.SlackBuild +++ b/misc/gprename/gprename.SlackBuild @@ -49,7 +49,7 @@ 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 {} \; -make install DESTDIR=$PKG/usr PREFIX=/usr +make -j1 install DESTDIR=$PKG/usr PREFIX=/usr find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \ | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true diff --git a/multimedia/dvdauthor/0001-compat.h-needs-stuff-from-config.h-so-include-it-the.patch b/multimedia/dvdauthor/0001-compat.h-needs-stuff-from-config.h-so-include-it-the.patch new file mode 100644 index 0000000000..a06f67fd34 --- /dev/null +++ b/multimedia/dvdauthor/0001-compat.h-needs-stuff-from-config.h-so-include-it-the.patch @@ -0,0 +1,165 @@ +From 5b890b47aaf6f692c876faf435e6bf8990e7a45d Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Ville=20Skytt=C3=A4?= <ville.skytta@iki.fi> +Date: Sat, 19 Jul 2014 21:06:58 +0300 +Subject: [PATCH 361/361] compat.h needs stuff from config.h so include it + there + +This was brought up by dvdvml.* not including it and thus causing a +build failure on Fedora (22) devel. While at it, uninclude config.h +from files where it was included just for compat.h reasons. +--- + src/compat.h | 2 ++ + src/conffile.c | 1 - + src/dvdauthor.c | 2 -- + src/dvdcompile.c | 2 -- + src/dvdpgc.c | 1 - + src/dvdunauthor.c | 2 -- + src/dvduncompile.c | 1 - + src/dvdvob.c | 2 -- + src/readxml.c | 2 -- + src/spuunmux.c | 1 - + src/subgen-encode.c | 2 -- + 11 files changed, 2 insertions(+), 16 deletions(-) + +diff --git a/src/compat.h b/src/compat.h +index 126dcd7..93de081 100644 +--- a/src/compat.h ++++ b/src/compat.h +@@ -1,6 +1,8 @@ + // basic headers + #define _GNU_SOURCE /* really just for strndup */ + ++#include "config.h" ++ + #ifdef HAVE_STDBOOL_H + # include <stdbool.h> + #else +diff --git a/src/conffile.c b/src/conffile.c +index cab661a..36ded07 100644 +--- a/src/conffile.c ++++ b/src/conffile.c +@@ -21,7 +21,6 @@ + * MA 02110-1301 USA. + */ + +-#include "config.h" + #include "compat.h" + #include <errno.h> + #include "conffile.h" +diff --git a/src/dvdauthor.c b/src/dvdauthor.c +index d591d68..4860258 100644 +--- a/src/dvdauthor.c ++++ b/src/dvdauthor.c +@@ -20,8 +20,6 @@ + * MA 02110-1301 USA. + */ + +-#include "config.h" +- + #include "compat.h" + + #include <sys/types.h> +diff --git a/src/dvdcompile.c b/src/dvdcompile.c +index fd232b6..47f13e5 100644 +--- a/src/dvdcompile.c ++++ b/src/dvdcompile.c +@@ -20,8 +20,6 @@ + * MA 02110-1301 USA. + */ + +-#include "config.h" +- + #include "compat.h" + #include <assert.h> + +diff --git a/src/dvdpgc.c b/src/dvdpgc.c +index e0adc61..cf6eb04 100644 +--- a/src/dvdpgc.c ++++ b/src/dvdpgc.c +@@ -20,7 +20,6 @@ + * MA 02110-1301 USA. + */ + +-#include "config.h" + #include "compat.h" + #include <errno.h> + #include <assert.h> +diff --git a/src/dvdunauthor.c b/src/dvdunauthor.c +index ccd422f..f988cdf 100644 +--- a/src/dvdunauthor.c ++++ b/src/dvdunauthor.c +@@ -23,8 +23,6 @@ + * MA 02110-1301 USA. + */ + +-#include "config.h" +- + #include "compat.h" + + #include <ctype.h> +diff --git a/src/dvduncompile.c b/src/dvduncompile.c +index 0c5eaf1..a064011 100644 +--- a/src/dvduncompile.c ++++ b/src/dvduncompile.c +@@ -22,7 +22,6 @@ + * MA 02110-1301 USA. + */ + +-#include "config.h" + #include "compat.h" + + #include <stdio.h> +diff --git a/src/dvdvob.c b/src/dvdvob.c +index 2d7e2b8..2146689 100644 +--- a/src/dvdvob.c ++++ b/src/dvdvob.c +@@ -20,8 +20,6 @@ + * MA 02110-1301 USA. + */ + +-#include "config.h" +- + #include "compat.h" + + #include <assert.h> +diff --git a/src/readxml.c b/src/readxml.c +index 61ff0a1..3b83f07 100644 +--- a/src/readxml.c ++++ b/src/readxml.c +@@ -20,8 +20,6 @@ + * MA 02110-1301 USA. + */ + +-#include "config.h" +- + #include "compat.h" + + #include <assert.h> +diff --git a/src/spuunmux.c b/src/spuunmux.c +index 1981e41..94fcb10 100644 +--- a/src/spuunmux.c ++++ b/src/spuunmux.c +@@ -31,7 +31,6 @@ + * MA 02110-1301 USA. + */ + +-#include "config.h" + #include "compat.h" + + #include <fcntl.h> +diff --git a/src/subgen-encode.c b/src/subgen-encode.c +index 53ed4b2..962e902 100644 +--- a/src/subgen-encode.c ++++ b/src/subgen-encode.c +@@ -21,8 +21,6 @@ + * MA 02110-1301 USA. + */ + +-#include "config.h" +- + #include "compat.h" + + #include <assert.h> +-- +2.1.3 + diff --git a/multimedia/dvdauthor/dvdauthor.SlackBuild b/multimedia/dvdauthor/dvdauthor.SlackBuild index 829bc055c1..f40e829d33 100644 --- a/multimedia/dvdauthor/dvdauthor.SlackBuild +++ b/multimedia/dvdauthor/dvdauthor.SlackBuild @@ -79,6 +79,8 @@ cd src patch -p0 < $CWD/config.patch ) +patch -p1 < $CWD/0001-compat.h-needs-stuff-from-config.h-so-include-it-the.patch + CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ ./configure \ diff --git a/multimedia/ffmpeg/ffmpeg-libvpxenc-remove-some-unused-ctrl-id-mappings.patch b/multimedia/ffmpeg/ffmpeg-libvpxenc-remove-some-unused-ctrl-id-mappings.patch new file mode 100644 index 0000000000..15d2600d1c --- /dev/null +++ b/multimedia/ffmpeg/ffmpeg-libvpxenc-remove-some-unused-ctrl-id-mappings.patch @@ -0,0 +1,41 @@ +From 6540fe04a3f9a11ba7084a49b3ee5fa2fc5b32ab Mon Sep 17 00:00:00 2001 +From: James Zern <jzern@google.com> +Date: Mon, 19 Oct 2015 22:44:11 -0700 +Subject: [PATCH] libvpxenc: remove some unused ctrl id mappings + +VP8E_UPD_ENTROPY, VP8E_UPD_REFERENCE, VP8E_USE_REFERENCE were removed +from libvpx and the remaining values were never used here + +Reviewed-by: Michael Niedermayer <michael@niedermayer.cc> +Signed-off-by: James Zern <jzern@google.com> +--- + libavcodec/libvpxenc.c | 8 -------- + 1 file changed, 8 deletions(-) + +diff --git a/libavcodec/libvpxenc.c b/libavcodec/libvpxenc.c +index 5f39783..992122c 100644 +--- a/libavcodec/libvpxenc.c ++++ b/libavcodec/libvpxenc.c +@@ -104,19 +104,11 @@ typedef struct VP8EncoderContext { + + /** String mappings for enum vp8e_enc_control_id */ + static const char *const ctlidstr[] = { +- [VP8E_UPD_ENTROPY] = "VP8E_UPD_ENTROPY", +- [VP8E_UPD_REFERENCE] = "VP8E_UPD_REFERENCE", +- [VP8E_USE_REFERENCE] = "VP8E_USE_REFERENCE", +- [VP8E_SET_ROI_MAP] = "VP8E_SET_ROI_MAP", +- [VP8E_SET_ACTIVEMAP] = "VP8E_SET_ACTIVEMAP", +- [VP8E_SET_SCALEMODE] = "VP8E_SET_SCALEMODE", + [VP8E_SET_CPUUSED] = "VP8E_SET_CPUUSED", + [VP8E_SET_ENABLEAUTOALTREF] = "VP8E_SET_ENABLEAUTOALTREF", + [VP8E_SET_NOISE_SENSITIVITY] = "VP8E_SET_NOISE_SENSITIVITY", +- [VP8E_SET_SHARPNESS] = "VP8E_SET_SHARPNESS", + [VP8E_SET_STATIC_THRESHOLD] = "VP8E_SET_STATIC_THRESHOLD", + [VP8E_SET_TOKEN_PARTITIONS] = "VP8E_SET_TOKEN_PARTITIONS", +- [VP8E_GET_LAST_QUANTIZER] = "VP8E_GET_LAST_QUANTIZER", + [VP8E_SET_ARNR_MAXFRAMES] = "VP8E_SET_ARNR_MAXFRAMES", + [VP8E_SET_ARNR_STRENGTH] = "VP8E_SET_ARNR_STRENGTH", + [VP8E_SET_ARNR_TYPE] = "VP8E_SET_ARNR_TYPE", +-- +1.7.10.4 + diff --git a/multimedia/ffmpeg/ffmpeg.SlackBuild b/multimedia/ffmpeg/ffmpeg.SlackBuild index feb7d2a770..16dfd0e6c5 100644 --- a/multimedia/ffmpeg/ffmpeg.SlackBuild +++ b/multimedia/ffmpeg/ffmpeg.SlackBuild @@ -26,7 +26,7 @@ # Modified by Robby Workman <rworkman@slackbuilds.org> PRGNAM=ffmpeg -VERSION=${VERSION:-2.6.3} +VERSION=${VERSION:-2.6.4} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -141,6 +141,9 @@ find -L . \ sed -i "s| -lflite\"| -lflite -lm -lasound\"|" \ ./configure +# Some variables are removed from newer libvpx releases +patch -p1 < $CWD/ffmpeg-libvpxenc-remove-some-unused-ctrl-id-mappings.patch + CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ ./configure \ diff --git a/multimedia/ffmpeg/ffmpeg.info b/multimedia/ffmpeg/ffmpeg.info index f13ce573ae..b18741546e 100644 --- a/multimedia/ffmpeg/ffmpeg.info +++ b/multimedia/ffmpeg/ffmpeg.info @@ -1,8 +1,8 @@ PRGNAM="ffmpeg" -VERSION="2.6.3" +VERSION="2.6.4" HOMEPAGE="http://www.ffmpeg.org" -DOWNLOAD="http://www.ffmpeg.org/releases/ffmpeg-2.6.3.tar.bz2" -MD5SUM="e2cc3c209f91393d35ab58598e41cf22" +DOWNLOAD="http://www.ffmpeg.org/releases/ffmpeg-2.6.4.tar.bz2" +MD5SUM="ecee79582cb9ce71a6a79954876ec08b" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="%README%" diff --git a/multimedia/ffmpeg010/README b/multimedia/ffmpeg010/README new file mode 100644 index 0000000000..b7ffab79ac --- /dev/null +++ b/multimedia/ffmpeg010/README @@ -0,0 +1,33 @@ +FFmpeg is a complete solution to record, convert and stream audio +and video. It includes libavcodec, the leading audio/video codec +library. + +You can enable a lot of optional (not-autodetected) features by +passing variables to the script (VAR=yes/no ./ffmpeg.SlackBuild): +ASS=yes|no (default: no), requires libass +BLURAY=yes|no (default: no), requires libbluray +CELT=yes|no (default: no), requires celt +DC1394=yes|no (default: no), requires libdc1394 +FAAC=yes|no (default: no), requires faac (creates non-redistributable binary) +FREI0R=yes|no (default: no), requires frei0r +GSM=yes|no (default: no), requires gsm +JP2=yes|no (default: no), requires openjpeg +LAME=yes|no (default: yes), requires lame +OPENAL=yes|no (default: no), requires OpenAL +OPENCORE=yes|no (default: no), requires opencore-amr +OPENSSL=yes|no (default: no), creates non-redistributable binary +RTMP=yes|no (default: no), requires rtmpdump +SCHROEDINGER=yes|no (default: no), requires schroedinger +SPEEX=yes|no (default: no), requires speex +VPX=yes|no (default: no), requires libvpx +X264=yes|no (default: yes), requires x264 +XVID=yes|no (default: no), requires xvidcore + +Make sure to run this script in a real root shell ("su -") and that you +have either tetex or texlive installed. + +All of the mentioned requirements are available from SlackBuilds.org + +This is the 0.10.x branch, still needed by some software: you +can't use the resulting package for software that needs ffmpeg, +as this installs stuff in non-standard locations. diff --git a/multimedia/ffmpeg010/ffmpeg010.SlackBuild b/multimedia/ffmpeg010/ffmpeg010.SlackBuild new file mode 100644 index 0000000000..ddb46bcea0 --- /dev/null +++ b/multimedia/ffmpeg010/ffmpeg010.SlackBuild @@ -0,0 +1,172 @@ +#!/bin/sh + +# Slackware build script for ffmpeg, 0.10.x branch + +# Written by core (eroc@linuxmail.org) +# Modified by Robby Workman <rworkman@slackbuilds.org> +# Modified by Heinz Wiesinger <pprkut@liwjatan.org> +# Modified by Matteo Bernardini <ponce@slackbuilds.org> + +PRGNAM=ffmpeg010 +SRCNAM=ffmpeg +VERSION=${VERSION:-0.10.9} +BUILD=${BUILD:-1} +TAG=${TAG:-_SBo} + +if [ -z "$ARCH" ]; then + case "$( uname -m )" in + i?86) ARCH=i486 ;; + arm*) ARCH=arm ;; + *) ARCH=$( uname -m ) ;; + esac +fi + +CWD=$(pwd) +TMP=${TMP:-/tmp/SBo} +PKG=$TMP/package-$PRGNAM +OUTPUT=${OUTPUT:-/tmp} + +if [ "$ARCH" = "i486" ]; then + SLKCFLAGS="-O2 -march=i486 -mtune=i686" + LIBDIRSUFFIX="" +elif [ "$ARCH" = "i686" ]; then + SLKCFLAGS="-O2 -march=i686 -mtune=i686" + LIBDIRSUFFIX="" +elif [ "$ARCH" = "x86_64" ]; then + SLKCFLAGS="-O2 -fPIC" + LIBDIRSUFFIX="64" +else + SLKCFLAGS="-O2" + LIBDIRSUFFIX="" +fi + +# environment sanity checks +TEXI2HTML=$(which texi2html 2>/dev/null) + +if [ "$TEXI2HTML" = "" ]; then + echo "Could not find texi2html! Please make sure to have tetex or texlive installed" + echo "and that texi2html is in PATH." + exit 1 +fi + +# --enable-runtime-cpu is meant for libswscale only and +# has no influence on the other parts of ffmpeg so there's +# not really a point in bothering +PKGARCH=$(uname -m)_custom + +# Configure ffmpeg features not autodetected by default +# Unfortunately ffmpeg's configure doesn't support --enable-feature=yes +# syntax, so we have to do it the complicated way :/ + +libcelt="" ; [ "${CELT:-no}" != "no" ] && libcelt="--enable-libcelt" +libdc1394="" ; [ "${DC1394:-no}" != "no" ] && libdc1394="--enable-libdc1394" +libfrei0r="" ; [ "${FREI0R:-no}" != "no" ] && libfrei0r="--enable-frei0r" +libgsm="" ; [ "${GSM:-no}" != "no" ] && libgsm="--enable-libgsm" +librtmp="" ; [ "${RTMP:-no}" != "no" ] && librtmp="--enable-librtmp" +dirac_fast="" ; [ "${SCHROEDINGER:-no}" != "no" ] && dirac_fast="--enable-libschroedinger" +libspeex="" ; [ "${SPEEX:-no}" != "no" ] && libspeex="--enable-libspeex" +libvpx="" ; [ "${VPX:-no}" != "no" ] && libvpx="--enable-libvpx" +libxvid="" ; [ "${XVID:-no}" != "no" ] && libxvid="--enable-libxvid" +libbluray="" ; [ "${BLURAY:-no}" != "no" ] && libbluray="--enable-libbluray" +libass="" ; [ "${ASS:-no}" != "no" ] && libass="--enable-libass" +libopenal="" ; [ "${OPENAL:-no}" != "no" ] && libopenal="--enable-openal" + +opencore_amr="" ; [ "${OPENCORE:-no}" != "no" ] && \ + opencore_amr="--enable-libopencore-amrnb --enable-libopencore-amrwb" +libfaac="" ; [ "${FAAC:-no}" != "no" ] && \ + { libfaac="--enable-libfaac" ; non_free="--enable-nonfree" ; } +ssl="" ; [ "${OPENSSL:-no}" != "no" ] && \ + { ssl="--enable-openssl" ; non_free="--enable-nonfree" ; } +openjpeg="" ; [ "${JP2:-no}" != "no" ] && \ + { openjpeg="--enable-libopenjpeg" ; \ + SLKCFLAGS="$SLKCFLAGS -I/usr/include/openjpeg-1.5" ; } + +mp3lame="--enable-libmp3lame" ; [ "${LAME:-yes}" != "yes" ] && mp3lame="" +libx264="--enable-libx264" ; [ "${X264:-yes}" != "yes" ] && libx264="" + +# opencv support is currently broken: http://code.opencv.org/issues/1925 +#libopencv="" ; [ "${OPENCV:-no}" != "no" ] && libopencv="--enable-libopencv" + +set -e + +rm -rf $PKG +mkdir -p $TMP $PKG $OUTPUT +cd $TMP +rm -rf $SRCNAM-$VERSION +tar xvf $CWD/$SRCNAM-$VERSION.tar.?z* +cd $SRCNAM-$VERSION +chown -R root:root . +chmod -R u+w,go+r-w,a-s . + +CFLAGS="$SLKCFLAGS" \ +CXXFLAGS="$SLKCFLAGS" \ +./configure \ + --prefix=/usr \ + --incdir=/usr/include/$PRGNAM \ + --libdir=/usr/lib${LIBDIRSUFFIX}/$PRGNAM \ + --shlibdir=/usr/lib${LIBDIRSUFFIX}/$PRGNAM \ + --datadir=/usr/share/$PRGNAM \ + --progs-suffix=010 \ + --mandir=/usr/man \ + --disable-debug \ + --enable-shared \ + --disable-static \ + --enable-pthreads \ + --enable-libtheora \ + --enable-libvorbis \ + --enable-gpl \ + --enable-version3 \ + --enable-postproc \ + --enable-swscale \ + --enable-x11grab \ + --enable-avfilter \ + --enable-gnutls \ + --arch=$ARCH \ + $openjpeg \ + $libdc1394 \ + $mp3lame \ + $libfaac \ + $libxvid \ + $libx264 \ + $libspeex \ + $dirac_fast \ + $non_free \ + $libgsm \ + $libvpx \ + $librtmp \ + $opencore_amr \ + $libfrei0r \ + $libcelt \ + $libbluray \ + $libass \ + $libopenal \ + $ssl + +make +make install DESTDIR=$PKG +make install-man DESTDIR=$PKG + +mv $PKG/usr/lib${LIBDIRSUFFIX}/$PRGNAM/pkgconfig $PKG/usr/lib${LIBDIRSUFFIX}/pkgconfig +( cd $PKG/usr/lib${LIBDIRSUFFIX}/pkgconfig + for i in avfilter avcodec swresample avutil avdevice postproc avformat swscale; do + mv lib${i}.pc lib${i}010.pc + done ) + +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 + +( cd $PKG/usr/man/man1 + for i in play mpeg server probe; do mv ff${i}.1 ff${i}010.1; done ) +find $PKG/usr/man -type f -exec gzip -9 {} \; + +mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION +cp -a Changelog COPYING* CREDITS INSTALL LICENSE MAINTAINERS README RELEASE \ + VERSION doc/RELEASE_NOTES doc/*.txt $PKG/usr/doc/$PRGNAM-$VERSION +cp -a doc/*.html $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 + +cd $PKG +/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$PKGARCH-$BUILD$TAG.${PKGTYPE:-tgz} diff --git a/multimedia/ffmpeg010/ffmpeg010.info b/multimedia/ffmpeg010/ffmpeg010.info new file mode 100644 index 0000000000..76df8a9cd8 --- /dev/null +++ b/multimedia/ffmpeg010/ffmpeg010.info @@ -0,0 +1,10 @@ +PRGNAM="ffmpeg010" +VERSION="0.10.9" +HOMEPAGE="http://www.ffmpeg.org" +DOWNLOAD="http://ffmpeg.org/releases/ffmpeg-0.10.9.tar.bz2" +MD5SUM="6d2bf390f21dd26c2dd972e62082250a" +DOWNLOAD_x86_64="" +MD5SUM_x86_64="" +REQUIRES="%README% lame x264" +MAINTAINER="Matteo Bernardini" +EMAIL="ponce@slackbuilds.org" diff --git a/multimedia/ffmpeg010/slack-desc b/multimedia/ffmpeg010/slack-desc new file mode 100644 index 0000000000..ab67c7494a --- /dev/null +++ b/multimedia/ffmpeg010/slack-desc @@ -0,0 +1,19 @@ +# HOW TO EDIT THIS FILE: +# The "handy ruler" below makes it easier to edit a package description. Line +# up the first '|' above the ':' following the base package name, and the '|' +# on the right side marks the last column you can put a character in. You must +# make exactly 11 lines for the formatting to be correct. It's also +# customary to leave one space after the ':'. + + |-----handy-ruler------------------------------------------------------| +ffmpeg010: FFmpeg (Software to record, convert and stream audio and video) +ffmpeg010: +ffmpeg010: FFmpeg is a complete solution to record, convert and stream audio +ffmpeg010: and video. It includes libavcodec, the leading audio/video codec +ffmpeg010: library. FFmpeg is developed under Linux, but it can compiled +ffmpeg010: under most operating systems, including Windows. +ffmpeg010: This is the 0.11.x branch, still needed by some software. +ffmpeg010: +ffmpeg010: Homepage: http://ffmpeg.org +ffmpeg010: +ffmpeg010: diff --git a/multimedia/ffmpeg2theora/ffmpeg2theora.SlackBuild b/multimedia/ffmpeg2theora/ffmpeg2theora.SlackBuild index aae5c080f8..f2efde2012 100644 --- a/multimedia/ffmpeg2theora/ffmpeg2theora.SlackBuild +++ b/multimedia/ffmpeg2theora/ffmpeg2theora.SlackBuild @@ -73,6 +73,9 @@ for diff in $CWD/patches/*.diff; do echo $diff patch -p1 < $diff done +# Fix underlinking on -current +# thanks to Debian https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=768674 +patch -p1 < $CWD/link-libm.patch scons install APPEND_CCFLAGS="$SLKCFLAGS" prefix=/usr destdir=$PKG diff --git a/multimedia/ffmpeg2theora/link-libm.patch b/multimedia/ffmpeg2theora/link-libm.patch new file mode 100644 index 0000000000..326889be08 --- /dev/null +++ b/multimedia/ffmpeg2theora/link-libm.patch @@ -0,0 +1,16 @@ +Description: Link libm for ceil +Author: Sebastian Ramacher <sramacher@debian.org> +Last-Update: 2014-11-09 +Bug-Debian: https://bugs.debian.org/768674 + +--- ffmpeg2theora-0.29.0~git+20140316.orig/SConstruct ++++ ffmpeg2theora-0.29.0~git+20140316/SConstruct +@@ -221,6 +221,8 @@ if not env.GetOption('clean'): + env.Append(LIBS=['m']) + elif env['static']: + env.Append(LIBS=['m', 'dl']) ++ else: ++ env.Append(LIBS=['m']) + + + env = conf.Finish() diff --git a/multimedia/flvtool2/flvtool2.SlackBuild b/multimedia/flvtool2/flvtool2.SlackBuild index 1f20b403e7..765d2a6f53 100644 --- a/multimedia/flvtool2/flvtool2.SlackBuild +++ b/multimedia/flvtool2/flvtool2.SlackBuild @@ -72,6 +72,11 @@ find -L . \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ -exec chmod 644 {} \; +# Fix build with ruby-1.9 (it dislikes the Mac detritus in the tarball) +find . -name '._*' -delete +# Fix renamed Config -> RbConfig +sed -i -e 's/::Config::CONFIG/::RbConfig::CONFIG/' setup.rb + ruby setup.rb config ruby setup.rb setup ruby setup.rb install --prefix=$PKG diff --git a/multimedia/freshplayerplugin/README b/multimedia/freshplayerplugin/README new file mode 100644 index 0000000000..9659a07b8a --- /dev/null +++ b/multimedia/freshplayerplugin/README @@ -0,0 +1,14 @@ +The main goal of this project is to get PPAPI (Pepper) Flash player +working in Firefox. This is done by impementing a wrapper, some kind +of adapter which will look like browser to PPAPI plugin and look like +NPAPI plugin for browser. + +When loaded by browser it will search for libpepflashplayer.so in a +directory where it can be: if you have google-chrome from /extra or +chromium-pepperflash-plugin from Alien Bob installed it will find +those versions. If for any reason it doesn't find your installed +version of the plugin, specify the full path in +~/.config/freshwrapper.conf. +You may find a sample configuration file in the docs folder of the +resulting package to copy in the above location: check it also to +enable hardware acceleration (disabled by default). diff --git a/multimedia/freshplayerplugin/freshplayerplugin.SlackBuild b/multimedia/freshplayerplugin/freshplayerplugin.SlackBuild new file mode 100644 index 0000000000..bb2bd377a7 --- /dev/null +++ b/multimedia/freshplayerplugin/freshplayerplugin.SlackBuild @@ -0,0 +1,96 @@ +#!/bin/sh + +# Slackware build script for freshplayerplugin + +# Copyright 2015 Matteo Bernardini <ponce@slackbuilds.org>, Pisa, Italy +# All rights reserved. +# +# Redistribution and use of this script, with or without modification, is +# permitted provided that the following conditions are met: +# +# 1. Redistributions of this script must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# +# THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED +# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF +# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO +# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, +# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; +# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, +# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR +# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF +# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +PRGNAM=freshplayerplugin +VERSION=${VERSION:-0.3.3} +BUILD=${BUILD:-1} +TAG=${TAG:-_SBo} + +if [ -z "$ARCH" ]; then + case "$( uname -m )" in + i?86) ARCH=i486 ;; + arm*) ARCH=arm ;; + *) ARCH=$( uname -m ) ;; + esac +fi + +CWD=$(pwd) +TMP=${TMP:-/tmp/SBo} +PKG=$TMP/package-$PRGNAM +OUTPUT=${OUTPUT:-/tmp} + +if [ "$ARCH" = "i486" ]; then + SLKCFLAGS="-O2 -march=i486 -mtune=i686" + LIBDIRSUFFIX="" +elif [ "$ARCH" = "i686" ]; then + SLKCFLAGS="-O2 -march=i686 -mtune=i686" + LIBDIRSUFFIX="" +elif [ "$ARCH" = "x86_64" ]; then + SLKCFLAGS="-O2 -fPIC" + LIBDIRSUFFIX="64" +else + SLKCFLAGS="-O2" + LIBDIRSUFFIX="" +fi + +DOCS="COPYING ChangeLog LICENSE README.md data/freshwrapper.conf.example" + +set -e + +rm -rf $PKG +mkdir -p $TMP $PKG $OUTPUT +cd $TMP +rm -rf $PRGNAM-$VERSION +tar xvf $CWD/$PRGNAM-$VERSION.tar.?z* || tar xvf $CWD/v$VERSION.tar.?z* +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 640 -o -perm 600 -o -perm 444 \ + -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; + +mkdir -p build +cd build + cmake \ + -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \ + -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \ + -DCMAKE_BUILD_TYPE=RelWithDebInfo .. + make + install -D -m 0644 libfreshwrapper-flashplayer.so \ + $PKG/usr/lib$LIBDIRSUFFIX/mozilla/plugins/libfreshwrapper-flashplayer.so +cd .. + +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 $DOCS $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 + +cd $PKG +/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz} diff --git a/multimedia/freshplayerplugin/freshplayerplugin.info b/multimedia/freshplayerplugin/freshplayerplugin.info new file mode 100644 index 0000000000..6a02be817a --- /dev/null +++ b/multimedia/freshplayerplugin/freshplayerplugin.info @@ -0,0 +1,10 @@ +PRGNAM="freshplayerplugin" +VERSION="0.3.3" +HOMEPAGE="https://github.com/i-rinat/freshplayerplugin" +DOWNLOAD="https://github.com/i-rinat/freshplayerplugin/archive/v0.3.3.tar.gz" +MD5SUM="c9960fd1e419d3d495fe6a9186286718" +DOWNLOAD_x86_64="" +MD5SUM_x86_64="" +REQUIRES="ffmpeg libconfig ragel uriparser" +MAINTAINER="Matteo Bernardini" +EMAIL="ponce@slackbuilds.org" diff --git a/multimedia/freshplayerplugin/slack-desc b/multimedia/freshplayerplugin/slack-desc new file mode 100644 index 0000000000..605a9702fe --- /dev/null +++ b/multimedia/freshplayerplugin/slack-desc @@ -0,0 +1,19 @@ +# HOW TO EDIT THIS FILE: +# The "handy ruler" below makes it easier to edit a package description. +# Line up the first '|' above the ':' following the base package name, and +# the '|' on the right side marks the last column you can put a character in. +# You must make exactly 11 lines for the formatting to be correct. It's also +# customary to leave one space after the ':' except on otherwise blank lines. + + |-----handy-ruler------------------------------------------------------| +freshplayerplugin: freshplayerplugin (PPAPI-host NPAPI-plugin adapter) +freshplayerplugin: +freshplayerplugin: The main goal of this project is to get PPAPI (Pepper) Flash player +freshplayerplugin: working in Firefox. This is done by impementing a wrapper, some kind +freshplayerplugin: of adapter which will look like browser to PPAPI plugin and look like +freshplayerplugin: NPAPI plugin for browser. +freshplayerplugin: +freshplayerplugin: homepage: https://github.com/i-rinat/freshplayerplugin +freshplayerplugin: +freshplayerplugin: +freshplayerplugin: diff --git a/multimedia/gecko-mediaplayer/gecko-mediaplayer.SlackBuild b/multimedia/gecko-mediaplayer/gecko-mediaplayer.SlackBuild index f037ed5c80..f6ebb029f1 100644 --- a/multimedia/gecko-mediaplayer/gecko-mediaplayer.SlackBuild +++ b/multimedia/gecko-mediaplayer/gecko-mediaplayer.SlackBuild @@ -50,6 +50,10 @@ find -L . \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 \ -o -perm 400 \) -exec chmod 644 {} \; +# Fix for -current (20150722 dbs) +# This patch comes from Debian's 1.0.9-2 package (thanks!) +patch -p1 < $CWD/np_loadds.patch + CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ ./configure \ diff --git a/multimedia/gecko-mediaplayer/np_loadds.patch b/multimedia/gecko-mediaplayer/np_loadds.patch new file mode 100644 index 0000000000..de406963fa --- /dev/null +++ b/multimedia/gecko-mediaplayer/np_loadds.patch @@ -0,0 +1,16 @@ +Description: Define NP_LOADDS if it doesn't exist +Author: Sebastian Ramacher <sramacher@debian.org> +Last-Update: 2014-06-14 + +--- gecko-mediaplayer-1.0.9.orig/src/npupp.h ++++ gecko-mediaplayer-1.0.9/src/npupp.h +@@ -63,6 +63,9 @@ + + #include "npruntime.h" + ++#ifndef NP_LOADDS ++#define NP_LOADDS ++#endif + + /****************************************************************************************** + plug-in function table macros diff --git a/multimedia/gigedit/gigedit.SlackBuild b/multimedia/gigedit/gigedit.SlackBuild index d78c9e1680..a8ef3a0771 100644 --- a/multimedia/gigedit/gigedit.SlackBuild +++ b/multimedia/gigedit/gigedit.SlackBuild @@ -52,7 +52,7 @@ find -L . \ LDFLAGS="-lsigc-2.0" \ CFLAGS="$SLKCFLAGS" \ -CXXFLAGS="$SLKCFLAGS" \ +CXXFLAGS="$SLKCFLAGS -std=c++11" \ ./configure \ --prefix=/usr \ --libdir=/usr/lib${LIBDIRSUFFIX} \ diff --git a/multimedia/gnash/gnash.SlackBuild b/multimedia/gnash/gnash.SlackBuild index f8e3f42c8e..8f72007ba4 100644 --- a/multimedia/gnash/gnash.SlackBuild +++ b/multimedia/gnash/gnash.SlackBuild @@ -94,6 +94,11 @@ patch -p1 < $CWD/patch/gnash-0.8.10-klash.patch patch -p1 < $CWD/patch/gnash-0.8.10-kde4-libdir.patch patch -p1 < $CWD/patch/gnash-0.8.10-cve-2012-1175.patch +# Fix building with giflib-5.0 +# Also ripped from gentoo :-) +patch -p1 < $CWD/patch/58dcdd9338d965e54c8f03ce3d2757388d82b7a3.patch +patch -p1 < $CWD/patch/cc22f2d0597f3a9547980f4786d918f8b5635472.patch + # The FFmpeg engine doesn't compile with FFmpeg 0.11.1. Patches welcome. # In the meantime, set --enable-media=gst to avoid autodetecting FFmpeg. autoreconf diff --git a/multimedia/gnash/patch/58dcdd9338d965e54c8f03ce3d2757388d82b7a3.patch b/multimedia/gnash/patch/58dcdd9338d965e54c8f03ce3d2757388d82b7a3.patch new file mode 100644 index 0000000000..b3242ce0d3 --- /dev/null +++ b/multimedia/gnash/patch/58dcdd9338d965e54c8f03ce3d2757388d82b7a3.patch @@ -0,0 +1,25 @@ +From 58dcdd9338d965e54c8f03ce3d2757388d82b7a3 Mon Sep 17 00:00:00 2001 +From: gustavo <gbuschle@hotmail.com> +Date: Thu, 11 Sep 2014 14:12:17 +0000 +Subject: Add support for giflib 5.1 + +--- +diff --git a/libbase/GnashImageGif.cpp b/libbase/GnashImageGif.cpp +index 84b09ce..2ae5ddb 100644 +--- a/libbase/GnashImageGif.cpp ++++ b/libbase/GnashImageGif.cpp +@@ -120,7 +120,11 @@ GifInput::GifInput(std::shared_ptr<IOChannel> in) + GifInput::~GifInput() + { + // Clean up allocated data. +- DGifCloseFile(_gif); ++#if GIFLIB_MAJOR==5 && GIFLIB_MINOR==1 ++ DGifCloseFile(_gif, 0); ++#else ++ DGifCloseFile(_gif); ++#endif + } + + size_t +-- +cgit v0.9.0.2 diff --git a/multimedia/gnash/patch/cc22f2d0597f3a9547980f4786d918f8b5635472.patch b/multimedia/gnash/patch/cc22f2d0597f3a9547980f4786d918f8b5635472.patch new file mode 100644 index 0000000000..6e90737d51 --- /dev/null +++ b/multimedia/gnash/patch/cc22f2d0597f3a9547980f4786d918f8b5635472.patch @@ -0,0 +1,31 @@ +From cc22f2d0597f3a9547980f4786d918f8b5635472 Mon Sep 17 00:00:00 2001 +From: OBATA Akio <obata@lins.jp> +Date: Mon, 15 Jul 2013 07:16:39 +0000 +Subject: Add support fir GIFLIB-5.0 (bug #39482) + +Signed-off-by: Sandro Santilli <strk@keybit.net> +--- +diff --git a/libbase/GnashImageGif.cpp b/libbase/GnashImageGif.cpp +index eeba4b7..26865c1 100644 +--- a/libbase/GnashImageGif.cpp ++++ b/libbase/GnashImageGif.cpp +@@ -269,7 +269,17 @@ GifInput::processRecord(GifRecordType record) + void + GifInput::read() + { ++#if GIFLIB_MAJOR >= 5 ++ int errorCode; ++ _gif = DGifOpen(_inStream.get(), &readData, &errorCode); ++#else + _gif = DGifOpen(_inStream.get(), &readData); ++#endif ++ ++ if ( ! _gif ) { ++ // TODO: decode errorCode if available ++ throw ParserException("Could not open input GIF stream"); ++ } + + GifRecordType record; + +-- +cgit v0.9.0.2 diff --git a/multimedia/gst-plugins-bad/drop-vpx-compat-defines.patch b/multimedia/gst-plugins-bad/drop-vpx-compat-defines.patch new file mode 100644 index 0000000000..599ec08a18 --- /dev/null +++ b/multimedia/gst-plugins-bad/drop-vpx-compat-defines.patch @@ -0,0 +1,27 @@ +diff -up gst-plugins-bad-0.10.23/ext/vp8/gstvp8utils.h.drop-compat-defines gst-plugins-bad-0.10.23/ext/vp8/gstvp8utils.h +--- gst-plugins-bad-0.10.23/ext/vp8/gstvp8utils.h.drop-compat-defines 2015-04-07 09:28:01.637679239 -0400 ++++ gst-plugins-bad-0.10.23/ext/vp8/gstvp8utils.h 2015-04-07 09:28:10.397622550 -0400 +@@ -25,23 +25,6 @@ + + G_BEGIN_DECLS + +-/* Some compatibility defines for older libvpx versions */ +-#ifndef VPX_IMG_FMT_I420 +-#define VPX_IMG_FMT_I420 IMG_FMT_I420 +-#endif +- +-#ifndef VPX_PLANE_Y +-#define VPX_PLANE_Y PLANE_Y +-#endif +- +-#ifndef VPX_PLANE_U +-#define VPX_PLANE_U PLANE_U +-#endif +- +-#ifndef VPX_PLANE_V +-#define VPX_PLANE_V PLANE_V +-#endif +- + const char * gst_vpx_error_name (vpx_codec_err_t status); + + G_END_DECLS diff --git a/multimedia/gst-plugins-bad/gst-plugins-bad.SlackBuild b/multimedia/gst-plugins-bad/gst-plugins-bad.SlackBuild index 5b6ad3b4a6..e972cc9c3c 100644 --- a/multimedia/gst-plugins-bad/gst-plugins-bad.SlackBuild +++ b/multimedia/gst-plugins-bad/gst-plugins-bad.SlackBuild @@ -26,7 +26,7 @@ PRGNAM=gst-plugins-bad VERSION=${VERSION:-0.10.23} -BUILD=${BUILD:-3} +BUILD=${BUILD:-4} TAG=${TAG:-_SBo} if [ -z "$ARCH" ]; then @@ -74,6 +74,9 @@ find -L . \ # Fix libmodplug include directory. patch -p1 < $CWD/libmodplug-include.patch +# Fix build against libvpx 1.4.0. +patch -p1 < $CWD/drop-vpx-compat-defines.patch + CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ ./configure \ diff --git a/multimedia/gst-plugins-ugly/cdio-cd-text-api.patch b/multimedia/gst-plugins-ugly/cdio-cd-text-api.patch new file mode 100644 index 0000000000..cbd16b8e48 --- /dev/null +++ b/multimedia/gst-plugins-ugly/cdio-cd-text-api.patch @@ -0,0 +1,183 @@ +From 649bd92cd2600719862ad5189899212409dd0a67 Mon Sep 17 00:00:00 2001 +From: Leon Merten Lohse <leon@green-side.de> +Date: Thu, 03 May 2012 22:50:30 +0000 +Subject: cdio: compensate for libcdio's recent cd-text api changes + +https://bugzilla.gnome.org/show_bug.cgi?id=675112 + +Conflicts: + + ext/cdio/gstcdiocddasrc.c +--- +diff --git a/ext/cdio/gstcdio.c b/ext/cdio/gstcdio.c +index 2f58d18..483ebf5 100644 +--- a/ext/cdio/gstcdio.c ++++ b/ext/cdio/gstcdio.c +@@ -30,12 +30,16 @@ + GST_DEBUG_CATEGORY (gst_cdio_debug); + + void +-gst_cdio_add_cdtext_field (GstObject * src, cdtext_t * cdtext, ++gst_cdio_add_cdtext_field (GstObject * src, cdtext_t * cdtext, track_t track, + cdtext_field_t field, const gchar * gst_tag, GstTagList ** p_tags) + { + const gchar *txt; + ++#if LIBCDIO_VERSION_NUM > 83 ++ txt = cdtext_get_const (cdtext, field, track); ++#else + txt = cdtext_get_const (field, cdtext); ++#endif + if (txt == NULL || *txt == '\0') { + GST_DEBUG_OBJECT (src, "empty CD-TEXT field %u (%s)", field, gst_tag); + return; +@@ -57,6 +61,12 @@ gst_cdio_add_cdtext_field (GstObject * src, cdtext_t * cdtext, + } + + GstTagList * ++#if LIBCDIO_VERSION_NUM > 83 ++gst_cdio_get_cdtext (GstObject * src, cdtext_t * t, track_t track) ++{ ++ GstTagList *tags = NULL; ++ ++#else + gst_cdio_get_cdtext (GstObject * src, CdIo * cdio, track_t track) + { + GstTagList *tags = NULL; +@@ -67,14 +77,22 @@ gst_cdio_get_cdtext (GstObject * src, CdIo * cdio, track_t track) + GST_DEBUG_OBJECT (src, "no CD-TEXT for track %u", track); + return NULL; + } ++#endif + +- gst_cdio_add_cdtext_field (src, t, CDTEXT_PERFORMER, GST_TAG_ARTIST, &tags); +- gst_cdio_add_cdtext_field (src, t, CDTEXT_TITLE, GST_TAG_TITLE, &tags); ++ gst_cdio_add_cdtext_field (src, t, track, CDTEXT_FIELD_PERFORMER, ++ GST_TAG_ARTIST, &tags); ++ gst_cdio_add_cdtext_field (src, t, track, CDTEXT_FIELD_TITLE, GST_TAG_TITLE, ++ &tags); + + return tags; + } + + void ++#if LIBCDIO_VERSION_NUM > 83 ++gst_cdio_add_cdtext_album_tags (GstObject * src, cdtext_t * t, ++ GstTagList * tags) ++{ ++#else + gst_cdio_add_cdtext_album_tags (GstObject * src, CdIo * cdio, GstTagList * tags) + { + cdtext_t *t; +@@ -84,11 +102,14 @@ gst_cdio_add_cdtext_album_tags (GstObject * src, CdIo * cdio, GstTagList * tags) + GST_DEBUG_OBJECT (src, "no CD-TEXT for album"); + return; + } ++#endif + +- /* FIXME: map CDTEXT_PERFORMER to GST_TAG_ALBUM_ARTIST once we have that */ +- gst_cdio_add_cdtext_field (src, t, CDTEXT_TITLE, GST_TAG_ALBUM, &tags); +- gst_cdio_add_cdtext_field (src, t, CDTEXT_GENRE, GST_TAG_GENRE, &tags); +- ++ gst_cdio_add_cdtext_field (src, t, 0, CDTEXT_FIELD_PERFORMER, ++ GST_TAG_ALBUM_ARTIST, &tags); ++ gst_cdio_add_cdtext_field (src, t, 0, CDTEXT_FIELD_TITLE, GST_TAG_ALBUM, ++ &tags); ++ gst_cdio_add_cdtext_field (src, t, 0, CDTEXT_FIELD_GENRE, GST_TAG_GENRE, ++ &tags); + GST_DEBUG ("CD-TEXT album tags: %" GST_PTR_FORMAT, tags); + } + +diff --git a/ext/cdio/gstcdio.h b/ext/cdio/gstcdio.h +index ef31ed0..c6da580 100644 +--- a/ext/cdio/gstcdio.h ++++ b/ext/cdio/gstcdio.h +@@ -24,22 +24,38 @@ + #include <gst/gst.h> + #include <cdio/cdio.h> + #include <cdio/cdtext.h> ++#include <cdio/version.h> ++ ++#if LIBCDIO_VERSION_NUM <= 83 ++ #define CDTEXT_FIELD_PERFORMER CDTEXT_PERFORMER ++ #define CDTEXT_FIELD_GENRE CDTEXT_GENRE ++ #define CDTEXT_FIELD_TITLE CDTEXT_TITLE ++#endif + + GST_DEBUG_CATEGORY_EXTERN (gst_cdio_debug); + #define GST_CAT_DEFAULT gst_cdio_debug + + void gst_cdio_add_cdtext_field (GstObject * src, + cdtext_t * cdtext, ++ track_t track, + cdtext_field_t field, + const gchar * gst_tag, + GstTagList ** p_tags); + + GstTagList * gst_cdio_get_cdtext (GstObject * src, ++#if LIBCDIO_VERSION_NUM > 83 ++ cdtext_t * t, ++#else + CdIo * cdio, ++#endif + track_t track); + + void gst_cdio_add_cdtext_album_tags (GstObject * src, ++#if LIBCDIO_VERSION_NUM > 83 ++ cdtext_t * t, ++#else + CdIo * cdio, ++#endif + GstTagList * tags); + + #endif /* __GST_CDIO_H__ */ +diff --git a/ext/cdio/gstcdiocddasrc.c b/ext/cdio/gstcdiocddasrc.c +index 615a0c8..830839e 100644 +--- a/ext/cdio/gstcdiocddasrc.c ++++ b/ext/cdio/gstcdiocddasrc.c +@@ -206,6 +206,9 @@ gst_cdio_cdda_src_open (GstAudioCdSrc * audiocdsrc, const gchar * device) + GstCdioCddaSrc *src; + discmode_t discmode; + gint first_track, num_tracks, i; ++#if LIBCDIO_VERSION_NUM > 83 ++ cdtext_t *cdtext; ++#endif + + src = GST_CDIO_CDDA_SRC (audiocdsrc); + +@@ -232,8 +235,18 @@ gst_cdio_cdda_src_open (GstAudioCdSrc * audiocdsrc, const gchar * device) + if (src->read_speed != -1) + cdio_set_speed (src->cdio, src->read_speed); + ++#if LIBCDIO_VERSION_NUM > 83 ++ cdtext = cdio_get_cdtext (src->cdio); ++ ++ if (NULL == cdtext) ++ GST_DEBUG_OBJECT (src, "no CD-TEXT on disc"); ++ else ++ gst_cdio_add_cdtext_album_tags (GST_OBJECT_CAST (src), cdtext, ++ cddabasesrc->tags); ++#else + gst_cdio_add_cdtext_album_tags (GST_OBJECT_CAST (src), src->cdio, + cddabasesrc->tags); ++#endif + + GST_LOG_OBJECT (src, "%u tracks, first track: %d", num_tracks, first_track); + +@@ -250,8 +263,14 @@ gst_cdio_cdda_src_open (GstAudioCdSrc * audiocdsrc, const gchar * device) + * the right thing here (for cddb id calculations etc. as well) */ + track.start = cdio_get_track_lsn (src->cdio, i + first_track); + track.end = track.start + len_sectors - 1; /* -1? */ ++#if LIBCDIO_VERSION_NUM > 83 ++ if (NULL != cdtext) ++ track.tags = gst_cdio_get_cdtext (GST_OBJECT (src), cdtext, ++ i + first_track); ++#else + track.tags = gst_cdio_get_cdtext (GST_OBJECT (src), src->cdio, + i + first_track); ++#endif + + gst_audio_cd_src_add_track (GST_AUDIO_CD_SRC (src), &track); + } +-- +cgit v0.9.0.2-2-gbebe diff --git a/multimedia/gst-plugins-ugly/gst-plugins-ugly.SlackBuild b/multimedia/gst-plugins-ugly/gst-plugins-ugly.SlackBuild index ac2c1e2fff..87f5ba79f8 100644 --- a/multimedia/gst-plugins-ugly/gst-plugins-ugly.SlackBuild +++ b/multimedia/gst-plugins-ugly/gst-plugins-ugly.SlackBuild @@ -77,6 +77,9 @@ sed -i "s|interf_enc.h|opencore-amrnb/interf_enc.h|" ext/amrnb/amrnbenc.h sed -i "s|dec_if.h|opencore-amrwb/dec_if.h|" ext/amrwbdec/amrwbdec.h sed -i "s|if_rom.h|opencore-amrwb/if_rom.h|" ext/amrwbdec/amrwbdec.h +# patch for the newer libcdio +patch -p1 < $CWD/cdio-cd-text-api.patch + CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ ./configure \ diff --git a/multimedia/mlt/mlt.SlackBuild b/multimedia/mlt/mlt.SlackBuild index a45452f28c..3e353e0391 100644 --- a/multimedia/mlt/mlt.SlackBuild +++ b/multimedia/mlt/mlt.SlackBuild @@ -72,9 +72,10 @@ if [ -f "$(which lua)" ]; then lua="lua"; else lua=""; fi if [ -f "$(which perl)" ]; then perl="perl"; else perl=""; fi if [ -f "$(which php)" ]; then php="php"; else php=""; fi if [ -f "$(which python)" ]; then python="python"; else python=""; fi -if [ -f "$(which ruby)" ]; then ruby="ruby"; else ruby=""; fi if [ -h "$(which tclsh)" ]; then tcl="tcl"; else tcl=""; fi if [ -f "$(which csharp)" ]; then csharp="csharp"; else csharp=""; fi +# ruby-2.2 gives issues... probably more recent mlt versions will fix this +ruby="" #if [ -f "$(which ruby)" ]; then ruby="ruby"; else ruby=""; fi if pkg-config --exists vdpau ; then vdpau="--avformat-vdpau" ; else vdpau="" ; fi @@ -139,7 +140,7 @@ if [ "$perl" ]; then install -D -m 0755 play.pl $PKG/usr/share/perl5/play.pl install -D -m 0755 blib/arch/auto/mlt/mlt.so \ $PKG/usr/lib$LIBDIRSUFFIX/perl5/auto/mlt/mlt.so - install -D -m 0644 blib/arch/auto/mlt/mlt.bs \ + install -D -m 0644 mlt.bs \ $PKG/usr/lib$LIBDIRSUFFIX/perl5/auto/mlt/mlt.bs ) fi diff --git a/multimedia/subtitleeditor/glib-single-include.patch b/multimedia/subtitleeditor/glib-single-include.patch deleted file mode 100644 index 35f8bd49cc..0000000000 --- a/multimedia/subtitleeditor/glib-single-include.patch +++ /dev/null @@ -1,13 +0,0 @@ -Index: subtitleeditor-0.40.0/plugins/actions/findandreplace/findandreplace.cc -=================================================================== ---- subtitleeditor-0.40.0.orig/plugins/actions/findandreplace/findandreplace.cc -+++ subtitleeditor-0.40.0/plugins/actions/findandreplace/findandreplace.cc -@@ -26,7 +26,7 @@ - #include <gui/dialogutility.h> - #include <gtkmm_utility.h> - #include <widget_config_utility.h> --#include <glib/gregex.h> -+#include <glib.h> - - /* - * FIXME: diff --git a/multimedia/subtitleeditor/subtitleeditor.SlackBuild b/multimedia/subtitleeditor/subtitleeditor.SlackBuild index 977caedd26..b935ab47ee 100644 --- a/multimedia/subtitleeditor/subtitleeditor.SlackBuild +++ b/multimedia/subtitleeditor/subtitleeditor.SlackBuild @@ -23,7 +23,7 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=subtitleeditor -VERSION=${VERSION:-0.40.0} +VERSION=${VERSION:-0.52.1} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -69,10 +69,6 @@ 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 {} \; -# Starting with glib 2.32 it is now mandatory to -# include glib.h instead of individual headers. -patch -p1 -i $CWD/glib-single-include.patch - CFLAGS="$SLKCFLAGS" \ ./configure \ --prefix=/usr \ diff --git a/multimedia/subtitleeditor/subtitleeditor.info b/multimedia/subtitleeditor/subtitleeditor.info index a4d9f1bc90..ee3851c688 100644 --- a/multimedia/subtitleeditor/subtitleeditor.info +++ b/multimedia/subtitleeditor/subtitleeditor.info @@ -1,8 +1,8 @@ PRGNAM="subtitleeditor" -VERSION="0.40.0" +VERSION="0.52.1" HOMEPAGE="http://home.gna.org/subtitleeditor/" -DOWNLOAD="http://download.gna.org/subtitleeditor/0.40/subtitleeditor-0.40.0.tar.gz" -MD5SUM="cb8a5dec7eeea8357ad5a9e977e5d5bd" +DOWNLOAD="http://download.gna.org/subtitleeditor/0.52/subtitleeditor-0.52.1.tar.gz" +MD5SUM="d25a3f6966f4d6355485d3dfbcfb437a" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="gstreamermm" diff --git a/multimedia/tvtime/patches/dqbuf-fix.patch b/multimedia/tvtime/patches/dqbuf-fix.patch deleted file mode 100644 index b875d21d32..0000000000 --- a/multimedia/tvtime/patches/dqbuf-fix.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff -Nur tvtime-1.0.2-old/src/videoinput.c tvtime-1.0.2/src/videoinput.c ---- tvtime-1.0.2-old/src/videoinput.c 2007-07-08 14:29:13.539465861 +0300 -+++ tvtime-1.0.2/src/videoinput.c 2007-07-08 14:42:32.776963292 +0300 -@@ -377,6 +377,7 @@ - wait_for_frame_v4l2( vidin ); - - cur_buf.type = vidin->capbuffers[ 0 ].vidbuf.type; -+ cur_buf.memory = vidin->capbuffers[ 0 ].vidbuf.memory; - if( ioctl( vidin->grab_fd, VIDIOC_DQBUF, &cur_buf ) < 0 ) { - /* some drivers return EIO when there is no signal */ - if( errno != EIO ) { diff --git a/multimedia/tvtime/patches/glibc-2.10.patch b/multimedia/tvtime/patches/glibc-2.10.patch deleted file mode 100644 index c3d8ad87d7..0000000000 --- a/multimedia/tvtime/patches/glibc-2.10.patch +++ /dev/null @@ -1,24 +0,0 @@ -diff -Naur tvtime-1.0.2.org/src/xmltv.c tvtime-1.0.2/src/xmltv.c ---- tvtime-1.0.2.org/src/xmltv.c 2009-07-02 21:48:49.426191088 +0200 -+++ tvtime-1.0.2/src/xmltv.c 2009-07-02 21:50:20.842066085 +0200 -@@ -118,9 +118,9 @@ - typedef struct { - const char *code; - const char *name; --} locale_t; -+} tvtime_locale_t; - --static locale_t locale_table[] = { -+static tvtime_locale_t locale_table[] = { - {"AA", "Afar"}, {"AB", "Abkhazian"}, {"AF", "Afrikaans"}, - {"AM", "Amharic"}, {"AR", "Arabic"}, {"AS", "Assamese"}, - {"AY", "Aymara"}, {"AZ", "Azerbaijani"}, {"BA", "Bashkir"}, -@@ -168,7 +168,7 @@ - {"XH", "Xhosa"}, {"YO", "Yoruba"}, {"ZH", "Chinese"}, - {"ZU", "Zulu"} }; - --const int num_locales = sizeof( locale_table ) / sizeof( locale_t ); -+const int num_locales = sizeof( locale_table ) / sizeof( tvtime_locale_t ); - - /** - * Timezone parsing code based loosely on the algorithm in diff --git a/multimedia/tvtime/patches/kernel-headers.patch b/multimedia/tvtime/patches/kernel-headers.patch deleted file mode 100644 index d0772783d4..0000000000 --- a/multimedia/tvtime/patches/kernel-headers.patch +++ /dev/null @@ -1,16 +0,0 @@ -Index: tvtime-1.0.2/src/videoinput.c -=================================================================== ---- tvtime-1.0.2.orig/src/videoinput.c -+++ tvtime-1.0.2/src/videoinput.c -@@ -35,8 +35,9 @@ - #ifdef HAVE_CONFIG_H - # include "config.h" - #endif --#include "videodev.h" --#include "videodev2.h" -+#include <libv4l1-videodev.h> -+#include <linux/videodev2.h> -+#define BASE_VIDIOCPRIVATE 192 /* 192-255 are private */ - #include "videoinput.h" - #include "mixer.h" - diff --git a/multimedia/tvtime/patches/tvtime-1.0.2-gcc41.patch b/multimedia/tvtime/patches/tvtime-1.0.2-gcc41.patch deleted file mode 100644 index 58e9bb204e..0000000000 --- a/multimedia/tvtime/patches/tvtime-1.0.2-gcc41.patch +++ /dev/null @@ -1,57 +0,0 @@ -diff -Naur tvtime-1.0.1/plugins/greedyh.asm tvtime-1.0.1-gcc41/plugins/greedyh.asm ---- tvtime-1.0.1/plugins/greedyh.asm 2005-08-14 18:16:43.000000000 +0200 -+++ tvtime-1.0.1-gcc41/plugins/greedyh.asm 2005-11-28 17:53:09.210774544 +0100 -@@ -18,7 +18,7 @@ - - #include "x86-64_macros.inc" - --void DScalerFilterGreedyH::FUNCT_NAME(TDeinterlaceInfo* pInfo) -+void FUNCT_NAME(TDeinterlaceInfo* pInfo) - { - int64_t i; - bool InfoIsOdd = (pInfo->PictureHistory[0]->Flags & PICTURE_INTERLACED_ODD) ? 1 : 0; -diff -Naur tvtime-1.0.1/plugins/tomsmocomp/TomsMoCompAll2.inc tvtime-1.0.1-gcc41/plugins/tomsmocomp/TomsMoCompAll2.inc ---- tvtime-1.0.1/plugins/tomsmocomp/TomsMoCompAll2.inc 2004-10-20 17:31:05.000000000 +0200 -+++ tvtime-1.0.1-gcc41/plugins/tomsmocomp/TomsMoCompAll2.inc 2005-11-28 17:53:33.251119856 +0100 -@@ -5,9 +5,9 @@ - #endif - - #ifdef USE_STRANGE_BOB --#define SEARCH_EFFORT_FUNC(n) DScalerFilterTomsMoComp::SEFUNC(n##_SB) -+#define SEARCH_EFFORT_FUNC(n) SEFUNC(n##_SB) - #else --#define SEARCH_EFFORT_FUNC(n) DScalerFilterTomsMoComp::SEFUNC(n) -+#define SEARCH_EFFORT_FUNC(n) SEFUNC(n) - #endif - - int SEARCH_EFFORT_FUNC(0) // we don't try at all ;-) -diff -Naur tvtime-1.0.1/plugins/tomsmocomp.cpp tvtime-1.0.1-gcc41/plugins/tomsmocomp.cpp ---- tvtime-1.0.1/plugins/tomsmocomp.cpp 2004-10-20 19:38:04.000000000 +0200 -+++ tvtime-1.0.1-gcc41/plugins/tomsmocomp.cpp 2005-11-28 17:52:53.862107896 +0100 -@@ -31,7 +31,7 @@ - - #define IS_MMX - #define SSE_TYPE MMX --#define FUNCT_NAME DScalerFilterTomsMoComp::filterDScaler_MMX -+#define FUNCT_NAME filterDScaler_MMX - #include "tomsmocomp/TomsMoCompAll.inc" - #undef IS_MMX - #undef SSE_TYPE -@@ -39,7 +39,7 @@ - - #define IS_3DNOW - #define SSE_TYPE 3DNOW --#define FUNCT_NAME DScalerFilterTomsMoComp::filterDScaler_3DNOW -+#define FUNCT_NAME filterDScaler_3DNOW - #include "tomsmocomp/TomsMoCompAll.inc" - #undef IS_3DNOW - #undef SSE_TYPE -@@ -47,7 +47,7 @@ - - #define IS_SSE - #define SSE_TYPE SSE --#define FUNCT_NAME DScalerFilterTomsMoComp::filterDScaler_SSE -+#define FUNCT_NAME filterDScaler_SSE - #include "tomsmocomp/TomsMoCompAll.inc" - #undef IS_SSE - #undef SSE_TYPE diff --git a/multimedia/tvtime/patches/tvtime-1.0.2-tr_po.patch b/multimedia/tvtime/patches/tvtime-1.0.2-tr_po.patch deleted file mode 100644 index a7faf00e3b..0000000000 --- a/multimedia/tvtime/patches/tvtime-1.0.2-tr_po.patch +++ /dev/null @@ -1,1289 +0,0 @@ -diff -Nur tvtime-1.0.2-old/po/LINGUAS tvtime-1.0.2/po/LINGUAS ---- tvtime-1.0.2-old/po/LINGUAS 2006-04-19 18:33:17.000000000 +0300 -+++ tvtime-1.0.2/po/LINGUAS 2006-04-19 18:37:34.000000000 +0300 -@@ -1 +1 @@ --cs de es fi fr hu ko nl nn pl pt ru sv -+cs de es fi fr hu ko nl nn pl pt ru sv tr -diff -Nur tvtime-1.0.2-old/po/tr.po tvtime-1.0.2/po/tr.po ---- tvtime-1.0.2-old/po/tr.po 1970-01-01 02:00:00.000000000 +0200 -+++ tvtime-1.0.2/po/tr.po 2006-04-19 18:33:28.000000000 +0300 -@@ -0,0 +1,1279 @@ -+# translation of tvtime1.0.2.po to Türkçe -+# Copyright (C) YEAR Billy Biggs -+# This file is distributed under the same license as the PACKAGE package. -+# -+# Server Acim <sacim@kde.org.tr>, 2006. -+msgid "" -+msgstr "" -+"Project-Id-Version: tvtime1.0.2\n" -+"Report-Msgid-Bugs-To: http://tvtime.net/\n" -+"POT-Creation-Date: 2005-11-09 21:48-0500\n" -+"PO-Revision-Date: 2006-04-17 13:40+0300\n" -+"Last-Translator: Server Acim <sacim@kde.org.tr>\n" -+"Language-Team: Türkçe <yerellestirme@kde.org.tr>\n" -+"MIME-Version: 1.0\n" -+"Content-Type: text/plain; charset=UTF-8\n" -+"Content-Transfer-Encoding: 8bit\n" -+"X-Generator: KBabel 1.11\n" -+ -+#: src/tvtime.c:792 src/commands.c:1463 src/commands.c:1488 -+msgid "Deinterlacer configuration" -+msgstr "Karıştırıcı yapılandırması" -+ -+#: src/tvtime.c:822 src/tvtime.c:841 src/tvtime.c:876 src/tvtime.c:957 -+#: src/tvtime.c:985 src/tvtime.c:1120 src/commands.c:408 src/commands.c:449 -+#: src/commands.c:650 src/commands.c:684 src/commands.c:704 src/commands.c:773 -+#: src/commands.c:808 src/commands.c:866 src/commands.c:941 src/commands.c:958 -+#: src/commands.c:985 src/commands.c:1034 src/commands.c:1288 -+#: src/commands.c:1340 src/commands.c:1408 src/commands.c:1480 -+#: src/commands.c:1560 src/commands.c:1572 src/commands.c:1628 -+#: src/commands.c:1641 src/commands.c:1672 src/commands.c:1705 -+#: src/commands.c:1738 src/commands.c:1770 -+msgid "Back" -+msgstr "Geri" -+ -+#: src/tvtime.c:854 src/tvtime.c:997 -+#, c-format -+msgid "Full rate: %.2f fps" -+msgstr "Tüm biçim: %.2f fps" -+ -+#: src/tvtime.c:862 src/tvtime.c:1001 -+#, c-format -+msgid "Half rate, deinterlace top fields: %.2f fps" -+msgstr "Yarım biçim, karıştırıcı üst alanları: %.2f fps" -+ -+#: src/tvtime.c:869 src/tvtime.c:1005 -+#, c-format -+msgid "Half rate, deinterlace bottom fields: %.2f fps" -+msgstr "Yarım biçim, karıştırıcı alt alanları: %.2f fps" -+ -+#: src/tvtime.c:894 -+msgid "Overscan setting" -+msgstr "Çerçeve dışı ayarı" -+ -+#: src/tvtime.c:901 src/commands.c:1440 -+msgid "Apply matte" -+msgstr "Matlık uygula" -+ -+#: src/tvtime.c:909 -+msgid "16:9 output" -+msgstr "Çıktı 16:9" -+ -+#: src/tvtime.c:916 -+msgid "Resize window to match contents" -+msgstr "İçeriklere uyacak biçimde pencereyi yeniden boyutlandır" -+ -+#: src/tvtime.c:925 -+msgid "Fullscreen" -+msgstr "Tam ekran" -+ -+#: src/tvtime.c:932 -+msgid "Set fullscreen position" -+msgstr "Tam ekran konumunu ayarla" -+ -+#: src/tvtime.c:942 -+msgid "Always-on-top" -+msgstr "Daima üstte" -+ -+#: src/tvtime.c:951 -+msgid "Quiet screenshots" -+msgstr "Sessiz ekran görüntüleri" -+ -+#: src/tvtime.c:968 -+msgid "Centre" -+msgstr "Merkez" -+ -+#: src/tvtime.c:975 -+msgid "Top" -+msgstr "Üst" -+ -+#: src/tvtime.c:981 -+msgid "Bottom" -+msgstr "Alt" -+ -+#: src/tvtime.c:995 src/commands.c:1472 src/commands.c:1502 -+msgid "Attempted framerate" -+msgstr "Uygulanmış çerçeve biçimi" -+ -+#: src/tvtime.c:1022 -+msgid "Performance estimates" -+msgstr "Uygulama tahminleri" -+ -+#: src/tvtime.c:1024 -+msgid "Deinterlacer" -+msgstr "Karıştırıcı" -+ -+#: src/tvtime.c:1027 -+#, c-format -+msgid "Input: %s at %dx%d pixels" -+msgstr "Girdi: %s e %dx%d piksel" -+ -+#: src/tvtime.c:1031 -+#, c-format -+msgid "Attempted framerate: %.2f fps" -+msgstr "Uygulanmış çerçeve biçimi: %.2f fps" -+ -+#: src/tvtime.c:1035 -+#, c-format -+msgid "Average blit time: %.2f ms (%.0f MB/sec)" -+msgstr "Ortalama birleşim süresi: %.2f ms (%.0f MB/sec)" -+ -+#: src/tvtime.c:1039 -+#, c-format -+msgid "Average render time: %5.2f ms" -+msgstr "Ortalama işleme süresi: %5.2f ms" -+ -+#: src/tvtime.c:1043 -+#, c-format -+msgid "Dropped frames: %d" -+msgstr "Bırakılmış çerçeveler: %d" -+ -+#: src/tvtime.c:1049 -+#, c-format -+msgid "Blit spacing: %4.1f/%4.1f ms (want %4.1f ms)" -+msgstr "Birleşim boşluğu: %4.1f/%4.1f ms (istenen %4.1f ms)" -+ -+#: src/tvtime.c:1068 src/tvtime.c:1130 -+msgid "16:9 + Overscan" -+msgstr "16:9 + Çerçeve dışı" -+ -+#: src/tvtime.c:1073 src/tvtime.c:1109 -+msgid "1.85:1" -+msgstr "1.85:1" -+ -+#: src/tvtime.c:1078 src/tvtime.c:1114 -+msgid "2.35:1" -+msgstr "2.35:1" -+ -+#: src/tvtime.c:1083 src/tvtime.c:1133 -+msgid "4:3 centre" -+msgstr "4:3 merkez" -+ -+#: src/tvtime.c:1088 src/tvtime.c:1104 -+msgid "16:10" -+msgstr "16:10" -+ -+#: src/tvtime.c:1094 src/tvtime.c:1137 -+msgid "4:3 + Overscan" -+msgstr "4:3 + Çerçeve dışı" -+ -+#: src/tvtime.c:1099 -+msgid "16:9" -+msgstr "16:9" -+ -+#: src/tvtime.c:1129 -+msgid "Matte setting (Anamorphic input)" -+msgstr "Matlık ayarı (Dönüştürme girişi)" -+ -+#: src/tvtime.c:1136 -+msgid "Matte setting (4:3 input)" -+msgstr "Matlık ayarı (4:3 giriş)" -+ -+#: src/tvtime.c:1216 src/tvtime.c:1258 src/tvtime.c:1303 src/tvtime.c:1311 -+#: src/tvtime.c:1434 src/tvtime.c:1484 src/tvtime.c:1505 src/tvtime.c:1519 -+#: src/tvtime.c:1533 src/tvtimeconf.c:962 src/tvtimeconf.c:1148 -+#: src/tvtime-command.c:56 src/tvtime-command.c:71 src/tvtime-configure.c:48 -+#: src/tvtime-scanner.c:62 src/tvtime-scanner.c:98 -+#, c-format -+msgid "%s: Cannot allocate memory.\n" -+msgstr "%s: Hafızayı ayıramaz.\n" -+ -+#: src/tvtime.c:1327 -+#, c-format -+msgid "Cannot open capture device %s." -+msgstr "Görüntü aygıtını açamıyor %s." -+ -+#: src/tvtime.c:1332 -+#, c-format -+msgid "" -+"\n" -+" Your capture card driver, %s, does not seem\n" -+" to support full framerate capture. Please check to see if it is\n" -+" misconfigured, or if you have selected the wrong capture\n" -+" device (%s).\n" -+"\n" -+msgstr "" -+"\n" -+" Görüntü kart sürücünüz, %s,tam ekran\n" -+" görüntüsünü desteklemiyor. Lütfen kontrol ediniz belki\n" -+" yanlış yapılandırılmış, veya siz yanlış görüntü aygıtını\n" -+" seçmiş olabilirsiniz (%s).\n" -+"\n" -+ -+#: src/tvtime.c:1392 -+#, c-format -+msgid "" -+"\n" -+" You are using the bttv driver, but have not configured enough\n" -+" buffers for tvtime to process the video optimally. This is\n" -+" true by default with bttv in kernels before 2.4.21. Please\n" -+" set the option gbuffers=4 when loading bttv. For more\n" -+" information see our support page at %s\n" -+"\n" -+msgstr "" -+"\n" -+" bttv sürücünü kullanmaktasınız, fakat bunu henüz ayarlamadınız\n" -+" tvtime'ın videoyu en iyi şekilde işlemesi için yeterli önbellek yok.Bu\n" -+" 2.4.21 öncesi çekirdeklerde bttv'de varsayılan olarak vardı. Lütfen\n" -+" bttv'yi yüklerken gbuffers=4 yapın. " -+"Daha fazla \n" -+" bilgi için %s sayfamızdaki yardıma bakın\n" -+"\n" -+ -+#: src/tvtime.c:1399 -+#, c-format -+msgid "" -+"\n" -+" Your capture card driver, %s, is not providing\n" -+" enough buffers for tvtime to process the video. Please check with\n" -+" your driver documentation to see if you can increase the number\n" -+" of buffers provided to applications, and report this to the tvtime\n" -+" bug tracker at %s\n" -+"\n" -+msgstr "" -+"\n" -+" Ekran kartı sürücünüz, %s, tvtime'ın görüntüyü işlemesi için\n" -+" yeterli önbelleği sağlayamamaktadır." -+"Lütfen\n" -+" sürücü belgenizi kontrol edin, belki bu sayede önbelleğinizin\n" -+" uygulamalar için sayısal gücünü arttırabilirsiniz, ve bunu tvtime\n" -+" hata izleyicisine rapor edebilirsiniz. Rapor etmek için %s\n" -+"\n" -+ -+#: src/tvtime.c:1453 -+msgid "On screen display failed to initialize, disabled.\n" -+msgstr "Görünüm ekranında sıfırlamak başarılamadı, devre dışı bırakıldı.\n" -+ -+#: src/tvtime.c:1465 -+msgid "No video source" -+msgstr "Görüntü kaynağı yok" -+ -+#: src/tvtime.c:1509 -+msgid "Cannot create FIFO, remote control of tvtime disabled.\n" -+msgstr "FIFO yaratamaz, tvtime uzaktan kumanda devre dışı bırakıldı.\n" -+ -+#: src/tvtime.c:1527 -+msgid "Closed caption display failed to initialize, disabled.\n" -+msgstr "Kapanmış başlık görüntüsü sıfırlanamadı, devre dışı bırakıldı.\n" -+ -+#: src/tvtime.c:1751 -+msgid "Always-on-top enabled." -+msgstr "Daima üstte etkin." -+ -+#: src/tvtime.c:1756 -+msgid "Always-on-top disabled." -+msgstr "Daima üstte devre dışı" -+ -+#: src/tvtime.c:1776 -+msgid "16:9 display mode active." -+msgstr "16:9 görüntüleme kipi etkin" -+ -+#: src/tvtime.c:1785 -+msgid "4:3 display mode active." -+msgstr "4:3 görüntüleme kipi etkin" -+ -+#: src/tvtime.c:1835 -+msgid "Screenshot messages disabled." -+msgstr "Ekran görüntüsü iletileri devre dışı bırakıldı." -+ -+#: src/tvtime.c:1837 -+msgid "Screenshot messages enabled." -+msgstr "Ekran görüntüsü iletileri etkinleştirildi." -+ -+#: src/tvtime.c:1928 -+msgid "2-3 pulldown inversion disabled." -+msgstr "2-3 indirme çevrimi devre dışı bırakıldı." -+ -+#: src/tvtime.c:1931 -+msgid "2-3 pulldown inversion enabled." -+msgstr "2-3 indirme çevrimi etkinleştirildi." -+ -+#: src/tvtime.c:1937 -+msgid "2-3 pulldown inversion is not valid with your TV norm." -+msgstr "2-3 indirme çevrimi TV standardınızda geçerli değil." -+ -+#: src/tvtime.c:2336 src/tvtime.c:2481 -+#, c-format -+msgid "Screenshot: %s" -+msgstr "Ekran görüntüsü: %s" -+ -+#: src/tvtime.c:2636 -+msgid "Restarting tvtime.\n" -+msgstr "tvtime yeniden başlıyor.\n" -+ -+#: src/tvtime.c:2640 -+msgid "Thank you for using tvtime.\n" -+msgstr "tvtime'ı kullandığınız için teşekkür ederiz.\n" -+ -+#: src/tvtime.c:2658 src/tvtime.c:2717 -+#, c-format -+msgid "" -+"\n" -+" Failed to drop root privileges: %s.\n" -+" tvtime will now exit to avoid security problems.\n" -+"\n" -+msgstr "" -+"\n" -+" root ayrıcalıklarına geçemedi: %s.\n" -+" tvtime şimdi güvenlik problemlerini önlemek için kapanacak.\n" -+"\n" -+ -+#: src/tvtime.c:2676 -+#, c-format -+msgid "Running %s.\n" -+msgstr "Çalışıyor %s.\n" -+ -+#: src/commands.c:182 src/commands.c:969 src/commands.c:1272 -+#: src/commands.c:1656 src/commands.c:1689 src/commands.c:1722 -+#: src/commands.c:1755 -+msgid "Current" -+msgstr "Şimdiki" -+ -+#. TRANSLATORS: This refers to a TV program, not a computer program. -+#: src/commands.c:214 src/commands.c:221 -+msgid "No program information available" -+msgstr "Program bilgisi yok." -+ -+#: src/commands.c:277 -+#, c-format -+msgid "Next: %s" -+msgstr "Sonraki: %s" -+ -+#: src/commands.c:320 -+msgid "Renumber current channel" -+msgstr "Geçerli kanalı yeniden numaralandırın" -+ -+#: src/commands.c:328 src/commands.c:331 -+msgid "Current channel active in list" -+msgstr "Şu anki kanal, listede etkin" -+ -+#: src/commands.c:341 -+msgid "Stop channel scan" -+msgstr "Kanal taramasını durdur" -+ -+#: src/commands.c:345 -+msgid "Scan channels for signal" -+msgstr "Sinyal için kanalları tara" -+ -+#: src/commands.c:353 -+msgid "Reset all channels as active" -+msgstr "Etkin tüm kanalları sıfırla" -+ -+#: src/commands.c:359 -+msgid "Finetune current channel" -+msgstr "Şu anki kanala ince ayar yap" -+ -+#: src/commands.c:366 -+msgid "Change NTSC cable mode" -+msgstr "NTSC kablolu yayın kipini değiştir" -+ -+#: src/commands.c:372 -+msgid "Set current channel as SECAM" -+msgstr "Şu anki kanalı SECAM kipine ayarla" -+ -+#: src/commands.c:373 -+msgid "Set current channel as PAL" -+msgstr "Şu anki kanalı PAL kipine ayarla" -+ -+#: src/commands.c:388 -+msgid "Switch audio standard" -+msgstr "Standart ses ayarına dön" -+ -+#: src/commands.c:395 -+msgid "Change frequency table" -+msgstr "Frekans tablosunu değiştir" -+ -+#: src/commands.c:401 -+msgid "Disable signal detection" -+msgstr "Sinyal bulmayı devre dışı bırak" -+ -+#: src/commands.c:402 -+msgid "Enable signal detection" -+msgstr "Sinyal bulmayı etkinleştir" -+ -+#: src/commands.c:426 src/commands.c:2069 -+msgid "Default language" -+msgstr "Varsayılan dil" -+ -+#: src/commands.c:442 src/commands.c:2074 -+msgid "Unknown language" -+msgstr "Bilinmeyen dil" -+ -+#: src/commands.c:610 src/commands.c:1310 src/commands.c:1377 -+#: src/commands.c:1826 -+msgid "Preferred audio mode" -+msgstr "Tercih edilen ses kipi" -+ -+#: src/commands.c:625 -+msgid "Change default audio standard" -+msgstr "Varsayılan ses standardını değiştir" -+ -+#: src/commands.c:632 src/commands.c:1315 src/commands.c:1390 -+msgid "Audio volume boost" -+msgstr "Ses gürlüğü arttırımı" -+ -+#: src/commands.c:638 src/commands.c:1320 src/commands.c:1399 -+msgid "Television standard" -+msgstr "Televizyon Standardı" -+ -+#: src/commands.c:644 src/commands.c:1325 src/commands.c:1367 -+msgid "Horizontal resolution" -+msgstr "Yatay çözünürlük" -+ -+#: src/commands.c:664 src/commands.c:691 -+msgid "Cable" -+msgstr "Kablo" -+ -+#: src/commands.c:672 src/commands.c:699 -+msgid "Broadcast" -+msgstr "Yayın" -+ -+#: src/commands.c:679 -+msgid "Cable with channels 100+" -+msgstr "Kablolu yayın kanalları 100+" -+ -+#: src/commands.c:711 -+msgid "Europe" -+msgstr "Avrupa" -+ -+#: src/commands.c:719 -+msgid "Russia" -+msgstr "Rusya" -+ -+#: src/commands.c:726 -+msgid "France" -+msgstr "Fransa" -+ -+#: src/commands.c:733 -+msgid "Australia" -+msgstr "Avustralya" -+ -+#: src/commands.c:740 -+msgid "Australia (Optus)" -+msgstr "Avustralya (Optus)" -+ -+#: src/commands.c:747 -+msgid "New Zealand" -+msgstr "Yeni Zelanda" -+ -+#: src/commands.c:754 -+msgid "China Broadcast" -+msgstr "Çin Yayını" -+ -+#: src/commands.c:761 -+msgid "South Africa" -+msgstr "Güney Afrika" -+ -+#: src/commands.c:768 -+msgid "Custom (first run tvtime-scanner)" -+msgstr "Özel (ilk tvtime tarayıcısı)" -+ -+#: src/commands.c:785 -+msgid "Disabled" -+msgstr "Devre dışı bırakıldı" -+ -+#: src/commands.c:791 -+msgid "Quiet" -+msgstr "Sessiz" -+ -+#: src/commands.c:797 -+msgid "Medium" -+msgstr "Orta" -+ -+#: src/commands.c:803 -+msgid "Full" -+msgstr "Tam" -+ -+#: src/commands.c:819 -+#, c-format -+msgid "%s Current: %d pixels" -+msgstr "%s Şu an: %d piksel" -+ -+#: src/commands.c:826 -+msgid "Low (360 pixels)" -+msgstr "Düşük (360 piksel)" -+ -+#: src/commands.c:832 -+msgid "Moderate (576 pixels)" -+msgstr "Orta (576 piksel)" -+ -+#: src/commands.c:838 -+msgid "Standard (720 pixels)" -+msgstr "Standart (720 piksel)" -+ -+#: src/commands.c:844 -+msgid "High (768 pixels)" -+msgstr "Yüksek (768 piksel)" -+ -+#: src/commands.c:850 -+#, c-format -+msgid "%s Maximum (%d pixels)" -+msgstr "%s En fazla (%d piksel)" -+ -+#: src/commands.c:860 src/commands.c:1403 -+msgid "Restart with new settings" -+msgstr "Yeni ayarlarla yeniden başlat" -+ -+#: src/commands.c:922 src/commands.c:1827 -+msgid "Mono" -+msgstr "Mono" -+ -+#: src/commands.c:929 src/commands.c:1828 -+msgid "Stereo" -+msgstr "Stereo" -+ -+#: src/commands.c:937 src/commands.c:1830 -+msgid "SAP" -+msgstr "SAP" -+ -+#: src/commands.c:948 src/commands.c:1830 -+msgid "Primary Language" -+msgstr "Birincil Dil" -+ -+#: src/commands.c:953 src/commands.c:1831 -+msgid "Secondary Language" -+msgstr "İkincil Dil" -+ -+#: src/commands.c:975 src/commands.c:1278 src/commands.c:1662 -+#: src/commands.c:1695 src/commands.c:1728 src/commands.c:1760 -+msgid "Increase" -+msgstr "Arttır" -+ -+#: src/commands.c:980 src/commands.c:1283 src/commands.c:1667 -+#: src/commands.c:1700 src/commands.c:1733 src/commands.c:1765 -+msgid "Decrease" -+msgstr "Azalt" -+ -+#: src/commands.c:1003 -+msgid "2-3 pulldown inversion" -+msgstr "2-3 indirme çevrimi" -+ -+#: src/commands.c:1012 -+msgid "Colour invert" -+msgstr "Renk çevrimi" -+ -+#: src/commands.c:1020 -+msgid "Mirror" -+msgstr "Ayna" -+ -+#: src/commands.c:1028 -+msgid "Chroma killer" -+msgstr "Krom yok edici" -+ -+#: src/commands.c:1169 src/commands.c:1204 src/commands.c:1236 -+#: src/commands.c:1256 src/commands.c:1268 src/commands.c:1296 -+#: src/commands.c:1349 src/commands.c:1367 src/commands.c:1377 -+#: src/commands.c:1390 src/commands.c:1399 src/commands.c:1434 -+#: src/commands.c:1440 src/commands.c:1446 src/commands.c:1453 -+#: src/commands.c:1459 src/commands.c:1487 src/commands.c:1493 -+#: src/commands.c:1501 src/commands.c:1507 src/commands.c:1518 -+#: src/commands.c:1579 src/commands.c:1652 src/commands.c:1685 -+#: src/commands.c:1718 src/commands.c:1751 -+msgid "Setup" -+msgstr "Ayar" -+ -+#: src/commands.c:1172 src/commands.c:1236 src/commands.c:1257 -+#: src/commands.c:1269 -+msgid "Channel management" -+msgstr "Kanal yönetimi" -+ -+#: src/commands.c:1177 src/commands.c:1208 src/commands.c:1297 -+#: src/commands.c:1349 src/commands.c:1367 src/commands.c:1377 -+#: src/commands.c:1390 src/commands.c:1399 -+msgid "Input configuration" -+msgstr "Girdi yapılandırması" -+ -+#: src/commands.c:1182 src/commands.c:1213 -+msgid "Picture settings" -+msgstr "Resim ayarları" -+ -+#: src/commands.c:1187 src/commands.c:1218 src/commands.c:1459 -+#: src/commands.c:1488 src/commands.c:1494 src/commands.c:1502 -+#: src/commands.c:1508 -+msgid "Video processing" -+msgstr "Görüntü işleme" -+ -+#: src/commands.c:1192 src/commands.c:1223 src/commands.c:1434 -+#: src/commands.c:1440 src/commands.c:1446 src/commands.c:1453 -+msgid "Output configuration" -+msgstr "Çıktı yapılandırması" -+ -+#: src/commands.c:1197 src/commands.c:1228 -+msgid "Exit menu" -+msgstr "Menüden çıkış" -+ -+#: src/commands.c:1257 -+msgid "Frequency table" -+msgstr "Frekans tablosu" -+ -+#: src/commands.c:1269 src/commands.c:3003 -+msgid "Finetune" -+msgstr "İnce ayar" -+ -+#: src/commands.c:1301 src/commands.c:1304 src/commands.c:1353 -+#: src/commands.c:1356 src/commands.c:3115 src/commands.c:3145 -+msgid "Change video source" -+msgstr "Görüntü kaynağını değiştir" -+ -+#: src/commands.c:1330 -+msgid "Toggle closed captions" -+msgstr "Kapalı başlıkları değiştir" -+ -+#: src/commands.c:1335 -+msgid "Toggle XDS decoding" -+msgstr "XDS kod çözümünü değiştir" -+ -+#: src/commands.c:1446 -+msgid "Overscan" -+msgstr "Çerçeve dışı" -+ -+#: src/commands.c:1453 -+msgid "Fullscreen position" -+msgstr "Tam ekran konumu" -+ -+#: src/commands.c:1468 -+msgid "Current deinterlacer description" -+msgstr "Şu anki karıştırıcı tanımı" -+ -+#: src/commands.c:1476 src/commands.c:1508 -+msgid "Input filters" -+msgstr "Girdi filtreleri" -+ -+#: src/commands.c:1494 -+msgid "Deinterlacer description" -+msgstr "Karıştırıcı tanımı" -+ -+#: src/commands.c:1518 src/commands.c:1579 src/commands.c:1652 -+#: src/commands.c:1685 src/commands.c:1718 src/commands.c:1751 -+msgid "Picture" -+msgstr "Resim" -+ -+#: src/commands.c:1522 src/commands.c:1584 src/commands.c:1652 -+#: src/commands.c:3175 src/commands.c:3216 -+msgid "Brightness" -+msgstr "Parlaklık" -+ -+#: src/commands.c:1527 src/commands.c:1589 src/commands.c:1685 -+#: src/commands.c:3189 src/commands.c:3219 -+msgid "Contrast" -+msgstr "Zıtlık" -+ -+#: src/commands.c:1531 src/commands.c:1593 src/commands.c:1718 -+#: src/commands.c:3203 src/commands.c:3222 -+msgid "Saturation" -+msgstr "Doyum" -+ -+#: src/commands.c:1539 src/commands.c:1600 src/commands.c:1751 -+#: src/commands.c:3161 src/commands.c:3225 -+msgid "Hue" -+msgstr "Renk Özü" -+ -+#: src/commands.c:1548 -+msgid "Save current settings as defaults" -+msgstr "Geçerli ayarları varsayılan olarak kaydet" -+ -+#: src/commands.c:1554 src/commands.c:1566 src/commands.c:1622 -+#: src/commands.c:1635 -+msgid "Reset to global defaults" -+msgstr "Küresel varsayılanlara sıfırla" -+ -+#: src/commands.c:1609 -+msgid "Save current settings as global defaults" -+msgstr "Şu anki ayarları küresel varsayılanlar olarak kaydet" -+ -+#: src/commands.c:1616 -+msgid "Save current settings as channel defaults" -+msgstr "Şu anki ayarları varsayılan kanallar olarak kaydet" -+ -+#: src/commands.c:1784 src/commands.c:2068 -+msgid "Preferred XMLTV language" -+msgstr "Tercih edilen XMLTV dili" -+ -+#: src/commands.c:1900 -+msgid "Favorites" -+msgstr "Favoriler" -+ -+#: src/commands.c:1907 -+msgid "Add current channel" -+msgstr "Şu anki kanalı ekle" -+ -+#: src/commands.c:1909 -+msgid "Exit" -+msgstr "Çıkış" -+ -+#: src/commands.c:2206 -+#, c-format -+msgid "Sleep in %d minutes." -+msgstr "Uykuya %d dakika içinde dal." -+ -+#: src/commands.c:2209 -+#, c-format -+msgid "Sleep off." -+msgstr "Uyu." -+ -+#: src/commands.c:2248 -+#, c-format -+msgid "Using PAL-I audio decoding for this channel." -+msgstr "Bu kanal için PAL-I ses kod çözücüsünü kullanıyor." -+ -+#: src/commands.c:2251 -+#, c-format -+msgid "Using PAL-DK audio decoding for this channel." -+msgstr "Bu kanal için PAL-DK ses kod çözücüsünü kullanıyor." -+ -+#: src/commands.c:2254 -+#, c-format -+msgid "Using PAL-BG audio decoding for this channel." -+msgstr "Bu kanal için PAL-BG ses kod çözücüsünü kullanıyor." -+ -+#: src/commands.c:2285 -+#, c-format -+msgid "Defaulting to PAL-I audio decoding." -+msgstr "PAL-I ses kod çözücüsünü varsayılan yapıyor." -+ -+#: src/commands.c:2288 -+#, c-format -+msgid "Defaulting to PAL-DK audio decoding." -+msgstr "PAL-DK ses kod çözücüsünü varsayılan yapıyor." -+ -+#: src/commands.c:2291 -+#, c-format -+msgid "Defaulting to PAL-BG audio decoding." -+msgstr "Defaulting to PAL-BG audio decoding." -+ -+#: src/commands.c:2319 -+msgid "Channel marked as active in the browse list." -+msgstr "Kanal gezinme listesinde etkin olarak işaretlendi." -+ -+#: src/commands.c:2322 -+msgid "Channel disabled from the browse list." -+msgstr "Kanal gezinme listesinde etkisizleştirildi." -+ -+#: src/commands.c:2354 -+#, c-format -+msgid "Capture card volume will not be set by tvtime." -+msgstr "Görüntü kart ses yüksekliği tvtime tarafından ayarlanmış olmayacak." -+ -+#: src/commands.c:2357 -+#, c-format -+msgid "Setting capture card volume to %d%%." -+msgstr "Görüntü kart ses şiddeti ayarı %d%%." -+ -+#: src/commands.c:2390 -+msgid "Processing every input field." -+msgstr "Her giriş alanını işliyor." -+ -+#: src/commands.c:2393 -+msgid "Processing every top field." -+msgstr "Her üst alanı işliyor." -+ -+#: src/commands.c:2396 -+msgid "Processing every bottom field." -+msgstr "Her alt alanı işliyor." -+ -+#: src/commands.c:2412 -+#, c-format -+msgid "Horizontal resolution will be %d pixels on restart." -+msgstr "Yeniden başlamada yatay çözünürlük %d piksel olacak." -+ -+#: src/commands.c:2469 -+#, c-format -+msgid "Television standard will be %s on restart." -+msgstr "Yeniden başlamada televizyon standardı %s olacak." -+ -+#: src/commands.c:2497 -+#, c-format -+msgid "Using default language for XMLTV data." -+msgstr "XMLTV verisi için varsayılan dili kullanıyor." -+ -+#: src/commands.c:2500 -+#, c-format -+msgid "Using unknown language (%s) for XMLTV data." -+msgstr "Bilinmeyen dili kullanıyor (%s) XMLTV verisi için." -+ -+#: src/commands.c:2504 -+#, c-format -+msgid "XMLTV language set to %s (%s)." -+msgstr "XMLTV dili şuna ayarlandı %s (%s)." -+ -+#: src/commands.c:2539 -+msgid "All channels re-activated." -+msgstr "Bütün kanallar yeniden etkinleştirildi." -+ -+#: src/commands.c:2560 -+#, c-format -+msgid "Remapping %d. Enter new channel number." -+msgstr "Yeniliyor %d. Yeni kanal numarası girin." -+ -+#: src/commands.c:2572 -+msgid "Scanner unavailable with signal checking disabled." -+msgstr "Sinyal denetimi devre dışı bırakıldığından tarayıcı kullanılamaz." -+ -+#: src/commands.c:2602 -+msgid "Scanning for channels being broadcast." -+msgstr "Yayındaki kanalları bulmak için tarıyor." -+ -+#: src/commands.c:2620 -+msgid "Closed captions disabled." -+msgstr "Kapalı başlıklar devre dışı bırakıldı." -+ -+#: src/commands.c:2626 -+msgid "Closed captions enabled." -+msgstr "Kapalı başlıklar etkinleştirildi." -+ -+#: src/commands.c:2638 -+msgid "No VBI device configured for CC decoding." -+msgstr "CC kod çözümü için herhangi bir VBI aygıtı yapılandırılmadı." -+ -+#: src/commands.c:2654 -+#, c-format -+msgid "Colour decoding for this channel set to %s." -+msgstr "Bu kanal için renk kod çözücü %s 'e ayarlandı." -+ -+#: src/commands.c:2702 -+#, c-format -+msgid "Running: %s" -+msgstr "Yürüyor: %s" -+ -+#: src/commands.c:2782 -+msgid "Signal detection enabled." -+msgstr "Sinyal algılama etkinleştirildi." -+ -+#: src/commands.c:2785 -+msgid "Signal detection disabled." -+msgstr "Sinyal algılama devre dışı bırakıldı." -+ -+#: src/commands.c:2798 -+msgid "XDS decoding enabled." -+msgstr "XDS kod çözümü etkinleştirildi." -+ -+#: src/commands.c:2801 -+msgid "XDS decoding disabled." -+msgstr "XDS kod çözümü devre dışı bırakıldı." -+ -+#: src/commands.c:2846 -+msgid "Colour invert enabled." -+msgstr "Renk çevrimi etkinleştirildi." -+ -+#: src/commands.c:2848 -+msgid "Colour invert disabled." -+msgstr "Renk çevrimi devre dışı bırakıldı." -+ -+#: src/commands.c:2869 -+msgid "Mirror enabled." -+msgstr "Ayna etkinleştirildi." -+ -+#: src/commands.c:2871 -+msgid "Mirror disabled." -+msgstr "Ayna devre dışı bırakıldı." -+ -+#: src/commands.c:2892 -+msgid "Chroma kill enabled." -+msgstr "Krom kesmesi etkinleştirildi." -+ -+#: src/commands.c:2894 -+msgid "Chroma kill disabled." -+msgstr "Krom kesmesi devre dışı bırakıldı." -+ -+#: src/commands.c:2906 -+#, c-format -+msgid "Overscan: %.1f%%" -+msgstr "Çevrçeve dışı: %.1f%%" -+ -+#: src/commands.c:2938 -+msgid "Picture settings reset to defaults." -+msgstr "Resim ayarları varsayılanlara sıfırlandı." -+ -+#: src/commands.c:2966 -+msgid "Using nominal NTSC cable frequencies." -+msgstr "Nominal NTSC kablo frekanslarını kullanıyor." -+ -+#: src/commands.c:2972 -+msgid "Using IRC cable frequencies." -+msgstr "IRC kablo frekanslarını kullanıyor." -+ -+#: src/commands.c:2978 -+msgid "Using HRC cable frequencies." -+msgstr "HRC kablo frekanslarını kullanıyor." -+ -+#: src/commands.c:3062 src/commands.c:3082 -+msgid "Volume" -+msgstr "Ses şiddeti" -+ -+#: src/commands.c:3262 -+msgid "Saved current picture settings as global defaults.\n" -+msgstr "Geçerli resim ayarlarını küresel varsayılanlar olarak kaydetti.\n" -+ -+#: src/commands.c:3275 -+#, c-format -+msgid "Saved current picture settings on channel %d.\n" -+msgstr "Geçerli resim ayarlarını kanala kaydetti %d.\n" -+ -+#: src/commands.c:3362 -+msgid "Paused." -+msgstr "Durduruldu." -+ -+#: src/commands.c:3362 -+msgid "Resumed." -+msgstr "Sürdürüldü." -+ -+#: src/tvtimeconf.c:472 -+#, c-format -+msgid "Error parsing configuration file %s.\n" -+msgstr "Yapılandırma dosyasını çözümlemede hata %s.\n" -+ -+#: src/tvtimeconf.c:479 -+#, c-format -+msgid "No XML root element found in %s.\n" -+msgstr "%s da XML kök ögesi bulunamadı.\n" -+ -+#: src/tvtimeconf.c:487 src/tvtimeconf.c:561 -+#, c-format -+msgid "%s is not a tvtime configuration file.\n" -+msgstr "%s bir tvtime yapılandırma dosyası değildir.\n" -+ -+#: src/tvtimeconf.c:519 -+msgid "Config file cannot be parsed. Settings will not be saved.\n" -+msgstr "Yapılandırma dosyası incelenemez. Ayarlar kaydedilmeyecek.\n" -+ -+#: src/tvtimeconf.c:526 -+msgid "Could not create new config file.\n" -+msgstr "Yeni yapılandırma dosyası yaratamaz.\n" -+ -+#: src/tvtimeconf.c:550 -+msgid "Error creating configuration file.\n" -+msgstr "Yapılandırma dosyası yaratmakta hata.\n" -+ -+#: src/tvtimeconf.c:571 src/utils.c:134 -+#, c-format -+msgid "Cannot change owner of %s: %s.\n" -+msgstr "Sahibi değiştirilemiyor %s:%s.\n" -+ -+#: src/tvtimeconf.c:580 -+msgid "" -+"\n" -+"tvtime is free software, written by Billy Biggs, Doug Bell and many\n" -+"others. For details and copying conditions, please see our website\n" -+"at http://tvtime.net/\n" -+"\n" -+"tvtime is Copyright (C) 2001, 2002, 2003 by Billy Biggs, Doug Bell,\n" -+"Alexander S. Belov, and Achim Schneider.\n" -+msgstr "" -+"\n" -+"tvtime özgür yazılımdır Billy Biggs, Doug Bell ve başka\n" -+"kişiler tarafından yazılmıştır. Ayrıntılar ve kopyalama şartları için lütfen " -+"şu web sayfasına bakınız\n" -+"http://tvtime.net/\n" -+"\n" -+"tvtime Telif Hakları (C) 2001, 2002, 2003 by Billy Biggs, Doug Bell,\n" -+"Alexander S. Belov, ve Achim Schneider.\n" -+ -+#: src/tvtimeconf.c:591 src/tvtimeconf.c:643 src/tvtimeconf.c:691 -+#, c-format -+msgid "" -+"usage: %s [OPTION]...\n" -+"\n" -+msgstr "" -+"kullanım: %s [SEÇENEK]...\n" -+"\n" -+ -+#: src/tvtimeconf.c:592 src/tvtimeconf.c:644 -+msgid " -a, --widescreen 16:9 mode.\n" -+msgstr " -a, --widescreen 16:9 kipi.\n" -+ -+#: src/tvtimeconf.c:593 src/tvtimeconf.c:645 -+msgid " -A, --nowidescreen 4:3 mode.\n" -+msgstr " -A, --nowidescreen 4:3 kipi.\n" -+ -+#: src/tvtimeconf.c:594 src/tvtimeconf.c:646 -+msgid " -b, --vbidevice=DEVICE VBI device (defaults to /dev/vbi0).\n" -+msgstr " -b, --vbidevice=AYGIT VBI aygıtı (varsayılanlar buraya /dev/vbi0).\n" -+ -+#: src/tvtimeconf.c:595 src/tvtimeconf.c:647 -+msgid " -c, --channel=CHANNEL Tune to the specified channel on startup.\n" -+msgstr " -c, --channel=KANAL Başlangışta belirlenmiş kanala ayarlayın.\n" -+ -+#: src/tvtimeconf.c:596 src/tvtimeconf.c:648 src/tvtimeconf.c:692 -+msgid " -d, --device=DEVICE video4linux device (defaults to /dev/video0).\n" -+msgstr " -d, --device=AYGIT video4linux aygıtı (varsayılanlar şuna /dev/video0).\n" -+ -+#: src/tvtimeconf.c:597 src/tvtimeconf.c:649 -+msgid "" -+" -f, --frequencies=NAME The frequency table to use for the tuner.\n" -+" (defaults to us-cable).\n" -+"\n" -+" Valid values are:\n" -+" us-cable\n" -+" us-cable100\n" -+" us-broadcast\n" -+" china-broadcast\n" -+" southafrica\n" -+" japan-cable\n" -+" japan-broadcast\n" -+" europe\n" -+" australia\n" -+" australia-optus\n" -+" newzealand\n" -+" france\n" -+" russia\n" -+" custom (first run tvtime-scanner)\n" -+"\n" -+msgstr "" -+" -f, --frequencies=AD İstasyonlar için kullanılacak frekanslar.\n" -+" (varsayılanlar amerikan-kablo).\n" -+"\n" -+" Geçerli değerler:\n" -+" us-cable (amerikan-kablo)\n" -+" us-cable100 (amerikan-kablo100)\n" -+" us-broadcast (amerika-yayını)\n" -+" china-broadcast (çin-yayını)\n" -+" southafrica (güney afrika)\n" -+" japan-cable (japon-kablo)\n" -+" japan-broadcast (japon-yayını)\n" -+" europe (avrupa)\n" -+" australia (avustralya)\n" -+" australia-optus (avustralya-optus)\n" -+" newzealand (yenizelanda)\n" -+" france (fransa)\n" -+" russia (rusya)\n" -+" custom (ilk tarama tvtime-tarayıcı)\n" -+"\n" -+ -+#: src/tvtimeconf.c:614 src/tvtimeconf.c:666 src/tvtimeconf.c:693 -+msgid " -F, --configfile=FILE Additional config file to load settings from.\n" -+msgstr " -F, --configfile=DOSYA Ayarları yüklemek için ek yapılandırma dosyası.\n" -+ -+#: src/tvtimeconf.c:615 src/tvtimeconf.c:667 src/tvtimeconf.c:694 -+msgid " -h, --help Show this help message.\n" -+msgstr " -h, --help Bu yardım dosyasını göster.\n" -+ -+#: src/tvtimeconf.c:616 src/tvtimeconf.c:668 -+msgid " -g, --geometry=GEOMETRY Sets the output window size.\n" -+msgstr " -g, --geometry=GEOMETRİ Çıktı pencere boyutunu ayarlar.\n" -+ -+#: src/tvtimeconf.c:617 src/tvtimeconf.c:669 src/tvtimeconf.c:695 -+msgid " -i, --input=INPUTNUM video4linux input number (defaults to 0).\n" -+msgstr " -i, --input=GİRİŞNUMARASI video4linux giriş numarası (varsayılan 0).\n" -+ -+#: src/tvtimeconf.c:618 src/tvtimeconf.c:670 -+msgid "" -+" -I, --inputwidth=SAMPLING Horizontal resolution of input\n" -+" (defaults to 720 pixels).\n" -+msgstr "" -+" -I, --inputwidth=ÖRNEKLEME Girdinin yatay çözünürlüğü\n" -+" (varsayılan 720 piksel).\n" -+ -+#: src/tvtimeconf.c:620 -+msgid "" -+" -k, --slave Disables input handling in tvtime (slave " -+"mode).\n" -+msgstr "" -+" -k, --slave Tvtime'da giriş çözümü (köle " -+"kipi).\n" -+ -+#: src/tvtimeconf.c:621 src/tvtimeconf.c:672 -+msgid " -m, --fullscreen Start tvtime in fullscreen mode.\n" -+msgstr " -m, --fullscreen Tvtime'ı tam ekran kipinde başlat.\n" -+ -+#: src/tvtimeconf.c:622 src/tvtimeconf.c:673 -+msgid " -M, --window Start tvtime in window mode.\n" -+msgstr " -M, --window Tvtime'ı pencere kipinde başlat.\n" -+ -+#: src/tvtimeconf.c:623 src/tvtimeconf.c:674 src/tvtimeconf.c:696 -+msgid "" -+" -n, --norm=NORM The norm to use for the input. tvtime " -+"supports:\n" -+" NTSC, NTSC-JP, SECAM, PAL, PAL-Nc, PAL-M,\n" -+" PAL-N or PAL-60 (defaults to NTSC).\n" -+msgstr "" -+" -n, --norm=NORM Tvtimeiçin kullanılacak giriş normu. tvtime " -+"destekleri:\n" -+" NTSC, NTSC-JP, SECAM, PAL, PAL-Nc, PAL-M,\n" -+" PAL-N or PAL-60 (varsayılan ayar NTSC).\n" -+ -+#: src/tvtimeconf.c:626 -+msgid " -s, --showdrops Print stats on frame drops (for debugging).\n" -+msgstr " -s, --showdrops Çerçevede durumu göster (hata ayıklama için).\n" -+ -+#: src/tvtimeconf.c:627 -+msgid " -S, --saveoptions Save command line options to the config file.\n" -+msgstr " -S, --saveoptions Config dosyasına komut satırı seçeneklerini kaydet.\n" -+ -+#: src/tvtimeconf.c:628 src/tvtimeconf.c:678 -+msgid " -t, --xmltv=FILE Read XMLTV listings from the given file.\n" -+msgstr " -t, --xmltv=DOSYA Verilmiş dosyadan XMLTV listelemesini oku.\n" -+ -+#: src/tvtimeconf.c:629 src/tvtimeconf.c:679 -+msgid "" -+" -l, --xmltvlanguage=LANG Use XMLTV data in given language, if " -+"available.\n" -+msgstr " -l, --xmltvlanguage=DİL Verilmiş dilde XMLTV verisini kullan, if uygunsa.\n" -+ -+#: src/tvtimeconf.c:630 -+msgid " -v, --verbose Print debugging messages to stderr.\n" -+msgstr " -v, --verbose Hata ayıklama iletilerini stderr'e yaz.\n" -+ -+#: src/tvtimeconf.c:631 -+msgid " -X, --display=DISPLAY Use the given X display to connect to.\n" -+msgstr " -X, --display=GÖRÜNTÜ Bağlanmak için verilmiş X görüntüsünü kullan.\n" -+ -+#: src/tvtimeconf.c:632 src/tvtimeconf.c:680 -+msgid "" -+" -x, --mixer=DEVICE[:CH] The mixer device and channel to control.\n" -+" (defaults to /dev/mixer:line)\n" -+"\n" -+" Valid channels are:\n" -+" vol, bass, treble, synth, pcm, speaker, " -+"line,\n" -+" mic, cd, mix, pcm2, rec, igain, ogain, " -+"line1,\n" -+" line2, line3, dig1, dig2, dig3, phin, " -+"phout,\n" -+" video, radio, monitor\n" -+msgstr "" -+" -x, --mixer=AYGIT[:CH] Karıştırıcı aygıtı ve denetim kanalı.\n" -+" (varsayılan /dev/mixer:line)\n" -+"\n" -+" Uygun kanallar:\n" -+" gürlük, bas, tiz, synth, pcm, hoparlör, " -+"hat,\n" -+" mic, cd, mix, pcm2, rec, igain, ogain, " -+"line1,\n" -+" line2, line3, dig1, dig2, dig3, phin, " -+"phçıkışı,\n" -+" video, radio, ekran\n" -+ -+#: src/tvtimeconf.c:677 -+msgid " -R, --priority=PRI Sets the process priority to run tvtime at.\n" -+msgstr " -R, --priority=PRI Tvtime'ı işleme önceliği ayarı.\n" -+ -+#: src/tvtimeconf.c:858 src/tvtimeconf.c:867 src/tvtimeconf.c:931 -+#: src/tvtimeconf.c:1064 src/tvtimeconf.c:1229 -+#, c-format -+msgid "Reading configuration from %s\n" -+msgstr "%s dan yapılandırmayı okuyor.\n" -+ -+#: src/tvtimeconf.c:969 -+msgid "Cannot run two instances of tvtime with the same configuration.\n" -+msgstr "Aynı yapılandırma ile iki tvtime uygulaması yürütülemez.\n" -+ -+#: src/tvtimeconf.c:980 -+msgid "Saving command line options.\n" -+msgstr "Komut satırı seçeneklerini kaydediyor.\n" -+ -+#: src/tvtimeconf.c:1155 -+msgid "Cannot update configuration while tvtime running.\n" -+msgstr "Tvtime çalışırken yapılandırmayı güncelleyemez.\n" -+ -+#: src/tvtimeosd.c:344 src/tvtime-scanner.c:145 -+msgid "No signal" -+msgstr "Sinyal yok" -+ -+#: src/tvtimeosd.c:455 -+msgid "Mute" -+msgstr "Sesi kapat" -+ -+#: src/utils.c:118 -+#, c-format -+msgid "Cannot create %s: %s\n" -+msgstr "Yaratamaz %s: %s\n" -+ -+#: src/utils.c:124 -+#, c-format -+msgid "Cannot open %s: %s\n" -+msgstr "Açamaz %s: %s\n" -+ -+#: src/utils.c:656 -+#, c-format -+msgid "Failed to initialize UTF-8 to %s converter: iconv_open failed (%s).\n" -+msgstr "UTF-8'i %s dönüştürücüye sıfırlama başarısız: iconv_açılamadı(%s).\n" -+ -+#: src/utils.c:667 -+#, c-format -+msgid "" -+"\n" -+" Failed to enter UTF-8 mode using bind_textdomain_codeset()\n" -+" (returned %s.) This may cause messages\n" -+" to be displayed incorrectly! Please report this bug at\n" -+" %s.\n" -+"\n" -+msgstr "" -+"\n" -+" Metinesaslı_kodayarına_bağlantı kullanılarak UTF-8 kipine girilemedi.()\n" -+" (döndü %s.) Bu mesajların\n" -+" doğru görüntülenememesine yıl açtı! Lütfen bu hatayı şuraya bildirin\n" -+" %s.\n" -+"\n" -+ -+#: src/tvtime-command.c:61 -+#, c-format -+msgid "" -+"\n" -+"Available commands:\n" -+msgstr "" -+"\n" -+"Uygun komutlar:\n" -+ -+#: src/tvtime-command.c:80 -+#, c-format -+msgid "tvtime not running.\n" -+msgstr "tvtime çalışmıyor.\n" -+ -+#: src/tvtime-command.c:82 src/tvtime-command.c:92 -+#, c-format -+msgid "%s: Cannot open %s: %s\n" -+msgstr "%s: Açamaz %s: %s\n" -+ -+#: src/tvtime-command.c:103 -+#, c-format -+msgid "%s: Invalid command '%s'\n" -+msgstr "%s: Geçersiz komut '%s'\n" -+ -+#: src/tvtime-command.c:108 -+#, c-format -+msgid "%s: Sending command %s with argument %s.\n" -+msgstr "%s: Komutu gönderiyor %s bu tartışmayla birlikte %s.\n" -+ -+#: src/tvtime-command.c:113 -+#, c-format -+msgid "%s: Sending command %s.\n" -+msgstr "%s:Komutu gönderiyor %s.\n" -+ -+#: src/tvtime-scanner.c:92 -+#, c-format -+msgid "Scanning using TV standard %s.\n" -+msgstr "TV standardını kullanarak tarıyor %s.\n" -+ -+#: src/tvtime-scanner.c:116 -+#, c-format -+msgid "" -+"\n" -+" No tuner found on input %d. If you have a tuner, please\n" -+" select a different input using --input=<num>.\n" -+"\n" -+msgstr "" -+"\n" -+" Girdide radyo bulunamadı %d. eğer bir radyonuz varsa; lütfen\n" -+" farklı bir giriş seçiniz bunu kullanarak --input=<num>.\n" -+"\n" -+ -+#: src/tvtime-scanner.c:127 -+#, c-format -+msgid "Scanning from %6.2f MHz to %6.2f MHz.\n" -+msgstr "Tarıyor %6.2f MHz ile %6.2f MHz arasını.\n" -+ -+#: src/tvtime-scanner.c:138 -+#, c-format -+msgid "Checking %6.2f MHz:" -+msgstr "Denetliyor %6.2f MHz:" -+ -+#: src/tvtime-scanner.c:149 src/tvtime-scanner.c:156 -+msgid "Signal detected" -+msgstr "Sinyal bulundu" -+ -+#: src/tvtime-scanner.c:168 -+#, c-format -+msgid "Found a channel at %6.2f MHz (%.2f - %.2f MHz), adding to channel list.\n" -+msgstr " %6.2f MHz'de bir kanal buldu(%.2f - %.2f MHz), kanal listesine ekliyor.\n" -+ -+ diff --git a/multimedia/tvtime/patches/tvtime-pic.patch b/multimedia/tvtime/patches/tvtime-pic.patch deleted file mode 100644 index ec3779a87b..0000000000 --- a/multimedia/tvtime/patches/tvtime-pic.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- tvtime/src/cpu_accel.c -+++ tvtime/src/cpu_accel.c -@@ -35,7 +35,7 @@ - int AMD; - uint32_t caps; - --#ifndef PIC -+#if !defined(PIC) && !defined(__PIC__) - #define cpuid(op,eax,ebx,ecx,edx) \ - __asm__ ("cpuid" \ - : "=a" (eax), \ diff --git a/multimedia/tvtime/patches/videodev2.patch b/multimedia/tvtime/patches/videodev2.patch deleted file mode 100644 index 0ffa169159..0000000000 --- a/multimedia/tvtime/patches/videodev2.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff -Nur tvtime-1.0.2-old/src/videodev2.h tvtime-1.0.2/src/videodev2.h ---- tvtime-1.0.2-old/src/videodev2.h 2007-07-08 14:29:13.684443820 +0300 -+++ tvtime-1.0.2/src/videodev2.h 2007-07-08 14:38:12.531526612 +0300 -@@ -16,7 +16,6 @@ - #ifdef __KERNEL__ - #include <linux/time.h> /* need struct timeval */ - #endif --#include <linux/compiler.h> /* need __user */ - - /* for kernel versions 2.4.26 and below: */ - #ifndef __user diff --git a/multimedia/tvtime/tvtime.SlackBuild b/multimedia/tvtime/tvtime.SlackBuild index abb8fa25a4..ed2d612d24 100644 --- a/multimedia/tvtime/tvtime.SlackBuild +++ b/multimedia/tvtime/tvtime.SlackBuild @@ -23,8 +23,8 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=tvtime -VERSION=${VERSION:-1.0.2} -BUILD=${BUILD:-4} +VERSION=${VERSION:-1.0.7} +BUILD=${BUILD:-1} TAG=${TAG:-_SBo} if [ -z "$ARCH" ]; then @@ -71,13 +71,6 @@ 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 {} \; -# Apply some bugfix patches from Pardus and Gentoo -# http://paketler.pardus.org.tr/2007/source/tvtime.html -# http://bugs.gentoo.org/attachment.cgi?id=196423 -for foo in $CWD/patches/* ; do - patch -p1 < $foo ; -done - CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ ./configure \ @@ -85,6 +78,8 @@ CXXFLAGS="$SLKCFLAGS" \ --libdir=/usr/lib${LIBDIRSUFFIX} \ --sysconfdir=/etc \ --localstatedir=/var \ + --mandir=/usr/man \ + --docdir=/usr/doc/$PRGNAM-$VERSION \ --with-x \ --enable-static=no \ --build=$ARCH-slackware-linux diff --git a/multimedia/tvtime/tvtime.info b/multimedia/tvtime/tvtime.info index 1a877c8f01..366e36ce63 100644 --- a/multimedia/tvtime/tvtime.info +++ b/multimedia/tvtime/tvtime.info @@ -1,8 +1,8 @@ PRGNAM="tvtime" -VERSION="1.0.2" +VERSION="1.0.7" HOMEPAGE="http://tvtime.sourceforge.net/" -DOWNLOAD="http://downloads.sourceforge.net/tvtime/tvtime-1.0.2.tar.gz" -MD5SUM="4b3d03afe61be239b08b5e522cd8afed" +DOWNLOAD="http://linuxtv.org/downloads/tvtime/tvtime-1.0.7.tar.gz" +MD5SUM="d3cea3053ce8ff0d555da82fad138b44" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" diff --git a/network/NetworkManager-openconnect/NetworkManager-openconnect-0.9.8.6-libopenconnect5.patch b/network/NetworkManager-openconnect/NetworkManager-openconnect-0.9.8.6-libopenconnect5.patch deleted file mode 100644 index 21a6800044..0000000000 --- a/network/NetworkManager-openconnect/NetworkManager-openconnect-0.9.8.6-libopenconnect5.patch +++ /dev/null @@ -1,836 +0,0 @@ -commit a965a00b2b4ba93a6ddbd7ff9dbf2d5ac08e2a66 -Author: David Woodhouse <David.Woodhouse@intel.com> -Date: Mon Nov 3 17:39:43 2014 +0000 - - Update to new hash handling, fix to match stored certs only for the same host/port - - (cherry picked from commit 2dc45e25b200e1b70e862f46c9f7ad652e59c8a2) - - Conflicts: - auth-dialog/main.c - -commit eb0bbb7254a3623b0bee32f30d31bcff7b91fb5d -Author: David Woodhouse <David.Woodhouse@intel.com> -Date: Thu Oct 30 23:16:20 2014 +0000 - - Drop support for libopenconnect.so.1 - - (cherry picked from commit b8c7e773204d3b4a85a27d7d2ae58dfc1939e1a8) - - Conflicts: - auth-dialog/main.c - -commit 9e4b394da0c29d77de9a110603aefa437c6b4173 -Author: David Woodhouse <David.Woodhouse@intel.com> -Date: Thu Oct 30 23:09:14 2014 +0000 - - Support libopenconnect.so.4 - - (cherry picked from commit 58944a3ef9c92f7afa07cbb539d062e1956bafc0) - -commit b3709a279c7e82dab34462bfc311d7d080255fc0 -Author: David Woodhouse <David.Woodhouse@intel.com> -Date: Tue Aug 12 14:58:05 2014 +0100 - - Always return success from auth-dialog - - We want to store the secrets even when we ultimately failed to log in. - This was slightly suboptimal even before, when we were failing to remember - things like the 'autoconnect' and 'certsigs' secrets. But now with HOTP - it's particularly important that we keep track of which tokens have been - used *even* if we end up failing to log in. - - Even if we don't get a valid login cookie, it's OK to return success. - - (cherry picked from commit 5e899ec0dfff56ac15f9e19cccb8b8d17f792afd) - -commit 48530310d1a5d68c285343261eb4acfa55f3bdcb -Author: David Woodhouse <David.Woodhouse@intel.com> -Date: Tue Aug 12 14:55:39 2014 +0100 - - Add HOTP support - - This requires migrating the token_secret from a config item to a secret, - which thankfully doesn't seem to be too diffcult. - - (cherry picked from commit b3815e96635c8f89c6161bdb6de53cd3c01c8535) - -commit b5cbc8ca833353b8b712220c6cc7eab492d59835 -Author: Jiřà Klimeš <jklimes@redhat.com> -Date: Fri May 30 12:06:52 2014 +0200 - - properties: use a real GError domain instead of 0 in export() - - (cherry picked from commit d16e7d1ea954516d0a12a7b4b8ebf67c15a11746) - -commit a90c1cd297aaa6120f253e0c13e70c1c09fa21bd -Author: Dan Williams <dcbw@redhat.com> -Date: Thu Apr 10 12:22:28 2014 -0500 - - properties: don't overwrite a GError and use real GError domains - - Fixes warnings when importing connections. - -commit c78853ced9a61e6bb91a7ea75f95f2ea94f3e535 -Author: Piotr Drąg <piotrdrag@gmail.com> -Date: Fri Mar 14 17:14:03 2014 +0100 - - Updated Polish translation -diff --git a/auth-dialog/main.c b/auth-dialog/main.c -index bc03cba..49c4ce0 100644 ---- a/auth-dialog/main.c -+++ b/auth-dialog/main.c -@@ -48,20 +48,6 @@ - - #include "openconnect.h" - --#if OPENCONNECT_API_VERSION_MAJOR == 1 --#define openconnect_vpninfo_new openconnect_vpninfo_new_with_cbdata --#define openconnect_init_ssl openconnect_init_openssl --#endif -- --#ifndef OPENCONNECT_CHECK_VER --#define OPENCONNECT_CHECK_VER(x,y) 0 --#endif -- --#if !OPENCONNECT_CHECK_VER(1,5) --#define OPENCONNECT_X509 X509 --#define OPENCONNECT_OPENSSL --#endif -- - #if !OPENCONNECT_CHECK_VER(2,1) - #define __openconnect_set_token_mode(...) -EOPNOTSUPP - #elif !OPENCONNECT_CHECK_VER(2,2) -@@ -88,10 +74,19 @@ - #define OC_FORM_RESULT_NEWGROUP 2 - #endif - --#ifdef OPENCONNECT_OPENSSL --#include <openssl/ssl.h> --#include <openssl/bio.h> --#include <openssl/ui.h> -+#if OPENCONNECT_CHECK_VER(4,0) -+#define dup_option_value(opt) g_strdup((opt)->_value); -+#define OC3DUP(x) (x) -+#define write_config_const const -+#else -+#define dup_option_value(opt) g_strdup((opt)->value); -+#define openconnect_set_option_value(opt, val) do { \ -+ struct oc_form_opt *_o = (opt); \ -+ free(_o->value); _o->value = g_strdup(val); \ -+ } while (0) -+#define openconnect_free_cert_info(v, x) free(x) -+#define OC3DUP(x) g_strdup(x) -+#define write_config_const /* */ - #endif - - static const GnomeKeyringPasswordSchema OPENCONNECT_SCHEMA_DEF = { -@@ -184,7 +179,6 @@ typedef struct auth_ui_data { - GtkWidget *last_notice_icon; - GtkTextBuffer *log; - -- int retval; - int cookie_retval; - - int cancel_pipes[2]; -@@ -305,9 +299,6 @@ typedef struct ui_fragment_data { - GtkWidget *entry; - gpointer find_request; - auth_ui_data *ui_data; --#ifdef OPENCONNECT_OPENSSL -- UI_STRING *uis; --#endif - struct oc_form_opt *opt; - char *entry_text; - int initial_selection; -@@ -319,27 +310,9 @@ static void entry_activate_cb(GtkWidget *widget, auth_ui_data *ui_data) - gtk_dialog_response(GTK_DIALOG(ui_data->dialog), AUTH_DIALOG_RESPONSE_LOGIN); - } - --#ifdef OPENCONNECT_OPENSSL --static void do_check_visibility(ui_fragment_data *data, gboolean *visible) --{ -- int min_len; -- -- if (!data->uis) -- return; -- -- min_len = UI_get_result_minsize(data->uis); -- -- if (min_len && (!data->entry_text || strlen(data->entry_text) < min_len)) -- *visible = FALSE; --} --#endif - static void evaluate_login_visibility(auth_ui_data *ui_data) - { - gboolean visible = TRUE; --#ifdef OPENCONNECT_OPENSSL -- g_queue_foreach(ui_data->form_entries, (GFunc)do_check_visibility, -- &visible); --#endif - gtk_widget_set_sensitive (ui_data->login_button, visible); - } - -@@ -347,9 +320,6 @@ static void entry_changed(GtkEntry *entry, ui_fragment_data *data) - { - g_free (data->entry_text); - data->entry_text = g_strdup(gtk_entry_get_text(entry)); --#ifdef OPENCONNECT_OPENSSL -- evaluate_login_visibility(data->ui_data); --#endif - } - - static void do_override_label(ui_fragment_data *data, struct oc_choice *choice) -@@ -391,26 +361,6 @@ static void combo_changed(GtkComboBox *combo, ui_fragment_data *data) - FORMCHOICE(sopt, entry)); - } - --#ifdef OPENCONNECT_OPENSSL --static gboolean ui_write_error (ui_fragment_data *data) --{ -- ssl_box_add_error(data->ui_data, UI_get0_output_string(data->uis)); -- -- g_slice_free (ui_fragment_data, data); -- -- return FALSE; --} -- --static gboolean ui_write_info (ui_fragment_data *data) --{ -- ssl_box_add_info(data->ui_data, UI_get0_output_string(data->uis)); -- -- g_slice_free (ui_fragment_data, data); -- -- return FALSE; --} --#endif -- - static gboolean ui_write_prompt (ui_fragment_data *data) - { - auth_ui_data *ui_data = _ui_data; /* FIXME global */ -@@ -418,16 +368,8 @@ static gboolean ui_write_prompt (ui_fragment_data *data) - int visible; - const char *label; - --#ifdef OPENCONNECT_OPENSSL -- if (data->uis) { -- label = UI_get0_output_string(data->uis); -- visible = UI_get_input_flags(data->uis) & UI_INPUT_FLAG_ECHO; -- } else --#endif -- { -- label = data->opt->label; -- visible = (data->opt->type == OC_FORM_OPT_TEXT); -- } -+ label = data->opt->label; -+ visible = (data->opt->type == OC_FORM_OPT_TEXT); - - #if GTK_CHECK_VERSION(3,1,6) - hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0); -@@ -524,128 +466,6 @@ static gboolean ui_show (auth_ui_data *ui_data) - return FALSE; - } - --#ifdef OPENCONNECT_OPENSSL --/* runs in worker thread */ --static int ui_open(UI *ui) --{ -- auth_ui_data *ui_data = _ui_data; /* FIXME global */ -- -- UI_add_user_data(ui, ui_data); -- -- return 1; --} -- --/* runs in worker thread */ --static int ui_write(UI *ui, UI_STRING *uis) --{ -- auth_ui_data *ui_data; -- ui_fragment_data *data; -- -- ui_data = UI_get0_user_data(ui); -- -- /* return if a new host has been selected */ -- if (ui_data->cancelled) { -- return 1; -- } -- -- data = g_slice_new0 (ui_fragment_data); -- data->ui_data = ui_data; -- data->uis = uis; -- -- switch(UI_get_string_type(uis)) { -- case UIT_ERROR: -- g_idle_add ((GSourceFunc)ui_write_error, data); -- break; -- -- case UIT_INFO: -- g_idle_add ((GSourceFunc)ui_write_info, data); -- break; -- -- case UIT_PROMPT: -- case UIT_VERIFY: -- g_mutex_lock (ui_data->form_mutex); -- g_queue_push_head(ui_data->form_entries, data); -- g_mutex_unlock (ui_data->form_mutex); -- -- g_idle_add ((GSourceFunc)ui_write_prompt, data); -- break; -- -- case UIT_BOOLEAN: -- /* FIXME */ -- case UIT_NONE: -- default: -- g_slice_free (ui_fragment_data, data); -- } -- return 1; --} -- --/* runs in worker thread */ --static int ui_flush(UI* ui) --{ -- auth_ui_data *ui_data; -- int response; -- -- ui_data = UI_get0_user_data(ui); -- -- g_idle_add((GSourceFunc)ui_show, ui_data); -- g_mutex_lock(ui_data->form_mutex); -- /* wait for ui to show */ -- while (!ui_data->form_shown) { -- g_cond_wait(ui_data->form_shown_changed, ui_data->form_mutex); -- } -- ui_data->form_shown = FALSE; -- -- if (!ui_data->cancelled) { -- /* wait for form submission or cancel */ -- while (!ui_data->form_retval) { -- g_cond_wait(ui_data->form_retval_changed, ui_data->form_mutex); -- } -- response = GPOINTER_TO_INT (ui_data->form_retval); -- ui_data->form_retval = NULL; -- } else -- response = AUTH_DIALOG_RESPONSE_CANCEL; -- -- /* set entry results and free temporary data structures */ -- while (!g_queue_is_empty (ui_data->form_entries)) { -- ui_fragment_data *data; -- data = g_queue_pop_tail (ui_data->form_entries); -- if (data->entry_text) { -- UI_set_result(ui, data->uis, data->entry_text); -- } -- if (data->find_request) { -- gnome_keyring_cancel_request(data->find_request); -- } -- g_slice_free (ui_fragment_data, data); -- } -- ui_data->form_grabbed = 0; -- g_mutex_unlock(ui_data->form_mutex); -- -- /* -1 = cancel, -- * 0 = failure, -- * 1 = success */ -- return (response == AUTH_DIALOG_RESPONSE_LOGIN ? 1 : -1); --} -- --/* runs in worker thread */ --static int ui_close(UI *ui) --{ -- return 1; --} -- --static int init_openssl_ui(void) --{ -- UI_METHOD *ui_method = UI_create_method("OpenConnect VPN UI (gtk)"); -- -- UI_method_set_opener(ui_method, ui_open); -- UI_method_set_flusher(ui_method, ui_flush); -- UI_method_set_writer(ui_method, ui_write); -- UI_method_set_closer(ui_method, ui_close); -- -- UI_set_default_method(ui_method); -- return 0; --} --#endif /* OPENCONNECT_OPENSSL */ -- - static char *find_form_answer(GHashTable *secrets, struct oc_auth_form *form, - struct oc_form_opt *opt) - { -@@ -723,7 +543,7 @@ static gboolean ui_form (struct oc_auth_form *form) - data->entry_text = g_strdup (find_form_answer(ui_data->secrets, - form, opt)); - if (!data->entry_text) -- data->entry_text = g_strdup (opt->value); -+ data->entry_text = dup_option_value(opt); - } else { - data->find_request = gnome_keyring_find_password( - OPENCONNECT_SCHEMA, -@@ -786,8 +606,7 @@ static gboolean set_initial_authgroup (auth_ui_data *ui_data, struct oc_auth_for - for (i = 0; i < sopt->nr_choices; i++) { - struct oc_choice *ch = FORMCHOICE(sopt, i); - if (!strcmp(saved_group, ch->name) && i != AUTHGROUP_SELECTION(form)) { -- free(opt->value); -- opt->value = g_strdup(saved_group); -+ openconnect_set_option_value(opt, saved_group); - return TRUE; - } - } -@@ -833,7 +652,7 @@ static int nm_process_auth_form (void *cbdata, struct oc_auth_form *form) - gnome_keyring_cancel_request(data->find_request); - - if (data->entry_text) { -- data->opt->value = g_strdup (data->entry_text); -+ openconnect_set_option_value(data->opt, data->entry_text); - - if (data->opt->type == OC_FORM_OPT_TEXT || - data->opt->type == OC_FORM_OPT_SELECT) { -@@ -884,7 +703,7 @@ static char* get_title(const char *vpn_name) - - typedef struct cert_data { - auth_ui_data *ui_data; -- OPENCONNECT_X509 *peer_cert; -+ char *cert_details; - const char *reason; - } cert_data; - -@@ -912,13 +731,10 @@ static gboolean user_validate_cert(cert_data *data) - { - auth_ui_data *ui_data = _ui_data; /* FIXME global */ - char *title; -- char *details; - GtkWidget *dlg, *text, *scroll; - GtkTextBuffer *buffer; - int result; - -- details = openconnect_get_cert_details(ui_data->vpninfo, data->peer_cert); -- - title = get_title(data->ui_data->vpn_name); - dlg = gtk_message_dialog_new(NULL, 0, GTK_MESSAGE_QUESTION, - GTK_BUTTONS_OK_CANCEL, -@@ -941,8 +757,7 @@ static gboolean user_validate_cert(cert_data *data) - - text = gtk_text_view_new(); - buffer = gtk_text_view_get_buffer(GTK_TEXT_VIEW(text)); -- gtk_text_buffer_set_text(buffer, details, -1); -- free(details); -+ gtk_text_buffer_set_text(buffer, data->cert_details, -1); - gtk_text_view_set_editable(GTK_TEXT_VIEW(text), 0); - gtk_text_view_set_cursor_visible(GTK_TEXT_VIEW(text), FALSE); - gtk_container_add(GTK_CONTAINER(scroll), text); -@@ -965,36 +780,40 @@ static gboolean user_validate_cert(cert_data *data) - - /* runs in worker thread */ - static int validate_peer_cert(void *cbdata, -- OPENCONNECT_X509 *peer_cert, const char *reason) -+#if !OPENCONNECT_CHECK_VER(5,0) -+ OPENCONNECT_X509 *peer_cert, -+#endif -+ const char *reason) - { - auth_ui_data *ui_data = cbdata; -- char fingerprint[41]; -- char *certs_data; - int ret = 0; - cert_data *data; -+ char *certkey; -+ char *accepted_hash = NULL; -+#if OPENCONNECT_CHECK_VER(5,0) -+ const char *fingerprint = openconnect_get_peer_cert_hash(ui_data->vpninfo); -+#else -+ char fingerprint[41]; - - ret = openconnect_get_cert_sha1(ui_data->vpninfo, peer_cert, fingerprint); - if (ret) - return ret; - -- certs_data = g_hash_table_lookup (ui_data->secrets, "certsigs"); -- if (certs_data) { -- char **certs = g_strsplit_set(certs_data, "\t", 0); -- char **this = certs; -+#define openconnect_check_peer_cert_hash(v, h) strcmp(h, fingerprint) -+#define openconnect_get_peer_cert_details(v) openconnect_get_cert_details(v, peer_cert); -+#endif - -- while (*this) { -- if (!strcmp(*this, fingerprint)) { -- g_strfreev(certs); -- goto out; -- } -- this++; -- } -- g_strfreev(certs); -- } -+ certkey = g_strdup_printf ("certificate:%s:%d", -+ openconnect_get_hostname(ui_data->vpninfo), -+ openconnect_get_port(ui_data->vpninfo)); -+ -+ accepted_hash = g_hash_table_lookup (ui_data->secrets, certkey); -+ if (accepted_hash && !openconnect_check_peer_cert_hash(ui_data->vpninfo, accepted_hash)) -+ goto accepted; - - data = g_slice_new(cert_data); - data->ui_data = ui_data; /* FIXME uses global */ -- data->peer_cert = peer_cert; -+ data->cert_details = openconnect_get_peer_cert_details(ui_data->vpninfo); - data->reason = reason; - - g_mutex_lock(ui_data->form_mutex); -@@ -1006,24 +825,25 @@ static int validate_peer_cert(void *cbdata, - while (ui_data->cert_response == CERT_USER_NOT_READY) { - g_cond_wait(ui_data->cert_response_changed, ui_data->form_mutex); - } -- if (ui_data->cert_response == CERT_ACCEPTED) { -- if (certs_data) { -- char *new = g_strdup_printf("%s\t%s", certs_data, fingerprint); -- g_hash_table_insert (ui_data->secrets, -- g_strdup ("certsigs"), new); -- } else { -- g_hash_table_insert (ui_data->secrets, g_strdup ("certsigs"), -- g_strdup (fingerprint)); -- } -+ -+ openconnect_free_cert_info(data->ui_data->vpninfo, data->cert_details); -+ g_slice_free(cert_data, data); -+ -+ if (ui_data->cert_response == CERT_ACCEPTED) - ret = 0; -- } else { -+ else - ret = -EINVAL; -- } -+ - g_mutex_unlock (ui_data->form_mutex); - -- g_slice_free(cert_data, data); -+ accepted: -+ if (!ret) { -+ g_hash_table_insert (ui_data->secrets, certkey, -+ g_strdup(fingerprint)); -+ certkey = NULL; -+ } - -- out: -+ g_free (certkey); - return ret; - } - -@@ -1176,7 +996,7 @@ static int get_config (GHashTable *options, GHashTable *secrets, - - cafile = g_hash_table_lookup (options, NM_OPENCONNECT_KEY_CACERT); - if (cafile) -- openconnect_set_cafile(vpninfo, g_strdup (cafile)); -+ openconnect_set_cafile(vpninfo, OC3DUP (cafile)); - - csd = g_hash_table_lookup (options, NM_OPENCONNECT_KEY_CSD_ENABLE); - if (csd && !strcmp(csd, "yes")) { -@@ -1186,16 +1006,16 @@ static int get_config (GHashTable *options, GHashTable *secrets, - if (csd_wrapper && !csd_wrapper[0]) - csd_wrapper = NULL; - -- openconnect_setup_csd(vpninfo, getuid(), 1, g_strdup (csd_wrapper)); -+ openconnect_setup_csd(vpninfo, getuid(), 1, OC3DUP (csd_wrapper)); - } - - proxy = g_hash_table_lookup (options, NM_OPENCONNECT_KEY_PROXY); -- if (proxy && proxy[0] && openconnect_set_http_proxy(vpninfo, g_strdup (proxy))) -+ if (proxy && proxy[0] && openconnect_set_http_proxy(vpninfo, OC3DUP (proxy))) - return -EINVAL; - - cert = g_hash_table_lookup (options, NM_OPENCONNECT_KEY_USERCERT); - sslkey = g_hash_table_lookup (options, NM_OPENCONNECT_KEY_PRIVKEY); -- openconnect_set_client_cert (vpninfo, g_strdup (cert), g_strdup (sslkey)); -+ openconnect_set_client_cert (vpninfo, OC3DUP (cert), OC3DUP (sslkey)); - - pem_passphrase_fsid = g_hash_table_lookup (options, - NM_OPENCONNECT_KEY_PEM_PASSPHRASE_FSID); -@@ -1203,7 +1023,9 @@ static int get_config (GHashTable *options, GHashTable *secrets, - openconnect_passphrase_from_fsid(vpninfo); - - token_mode = g_hash_table_lookup (options, NM_OPENCONNECT_KEY_TOKEN_MODE); -- token_secret = g_hash_table_lookup (options, NM_OPENCONNECT_KEY_TOKEN_SECRET); -+ token_secret = g_hash_table_lookup (secrets, NM_OPENCONNECT_KEY_TOKEN_SECRET); -+ if (!token_secret || !token_secret[0]) -+ token_secret = g_hash_table_lookup (options, NM_OPENCONNECT_KEY_TOKEN_SECRET); - if (token_mode) { - int ret = 0; - -@@ -1213,6 +1035,10 @@ static int get_config (GHashTable *options, GHashTable *secrets, - ret = __openconnect_set_token_mode(vpninfo, OC_TOKEN_MODE_STOKEN, NULL); - else if (!strcmp(token_mode, "totp") && token_secret) - ret = __openconnect_set_token_mode(vpninfo, OC_TOKEN_MODE_TOTP, token_secret); -+#if OPENCONNECT_CHECK_VER(3,4) -+ else if (!strcmp(token_mode, "hotp") && token_secret) -+ ret = __openconnect_set_token_mode(vpninfo, OC_TOKEN_MODE_HOTP, token_secret); -+#endif - - if (ret) - fprintf(stderr, "Failed to initialize software token: %d\n", ret); -@@ -1238,7 +1064,18 @@ static void populate_vpnhost_combo(auth_ui_data *ui_data) - } - } - --static int write_new_config(void *cbdata, char *buf, int buflen) -+#if OPENCONNECT_CHECK_VER(3,4) -+static int update_token(void *cbdata, const char *tok) -+{ -+ auth_ui_data *ui_data = cbdata; -+ g_hash_table_insert (ui_data->secrets, g_strdup (NM_OPENCONNECT_KEY_TOKEN_SECRET), -+ g_strdup(tok)); -+ -+ return 0; -+} -+#endif -+ -+static int write_new_config(void *cbdata, write_config_const char *buf, int buflen) - { - auth_ui_data *ui_data = cbdata; - g_hash_table_insert (ui_data->secrets, g_strdup ("xmlconfig"), -@@ -1387,9 +1224,8 @@ static gboolean cookie_obtained(auth_ui_data *ui_data) - gtk_widget_show_all(ui_data->ssl_box); - gtk_widget_set_sensitive(ui_data->cancel_button, FALSE); - } -- ui_data->retval = 1; - } else if (!ui_data->cookie_retval) { -- OPENCONNECT_X509 *cert; -+ const void *cert; - gchar *key, *value; - - /* got cookie */ -@@ -1411,26 +1247,32 @@ static gboolean cookie_obtained(auth_ui_data *ui_data) - g_hash_table_insert (ui_data->secrets, key, value); - openconnect_clear_cookie(ui_data->vpninfo); - -+#if OPENCONNECT_CHECK_VER(5,0) -+ cert = openconnect_get_peer_cert_hash (ui_data->vpninfo); -+ if (cert) { -+ key = g_strdup (NM_OPENCONNECT_KEY_GWCERT); -+ value = g_strdup (cert); -+ g_hash_table_insert (ui_data->secrets, key, value); -+ } -+#else - cert = openconnect_get_peer_cert (ui_data->vpninfo); - if (cert) { - key = g_strdup (NM_OPENCONNECT_KEY_GWCERT); - value = g_malloc0 (41); -- openconnect_get_cert_sha1(ui_data->vpninfo, cert, value); -+ openconnect_get_cert_sha1(ui_data->vpninfo, (void *)cert, value); - g_hash_table_insert (ui_data->secrets, key, value); - } -- -+#endif - if (get_save_passwords(ui_data->secrets)) { - g_hash_table_foreach(ui_data->success_passwords, - keyring_store_passwords, - NULL); - } -- ui_data->retval = 0; - - gtk_main_quit(); - } else { - /* no cookie; user cancellation */ - gtk_widget_show (ui_data->no_form_label); -- ui_data->retval = 1; - } - - g_hash_table_remove_all (ui_data->success_secrets); -@@ -1487,11 +1329,11 @@ static void connect_host(auth_ui_data *ui_data) - if (openconnect_parse_url(ui_data->vpninfo, host->hostaddress)) { - fprintf(stderr, "Failed to parse server URL '%s'\n", - host->hostaddress); -- openconnect_set_hostname (ui_data->vpninfo, g_strdup(host->hostaddress)); -+ openconnect_set_hostname (ui_data->vpninfo, OC3DUP (host->hostaddress)); - } - - if (!openconnect_get_urlpath(ui_data->vpninfo) && host->usergroup) -- openconnect_set_urlpath(ui_data->vpninfo, g_strdup(host->usergroup)); -+ openconnect_set_urlpath(ui_data->vpninfo, OC3DUP (host->usergroup)); - - - g_hash_table_insert (ui_data->success_secrets, g_strdup("lasthost"), -@@ -1708,7 +1550,6 @@ static auth_ui_data *init_ui_data (char *vpn_name, GHashTable *options, GHashTab - auth_ui_data *ui_data; - - ui_data = g_slice_new0(auth_ui_data); -- ui_data->retval = 1; - - ui_data->form_entries = g_queue_new(); - #if GLIB_CHECK_VERSION(2,31,0) -@@ -1868,11 +1709,13 @@ int main (int argc, char **argv) - fprintf(stderr, "Failed to find VPN UUID %s\n", vpn_uuid); - return 1; - } -- build_main_dialog(_ui_data); - --#ifdef OPENCONNECT_OPENSSL -- init_openssl_ui(); -+#if OPENCONNECT_CHECK_VER(3,4) -+ openconnect_set_token_callbacks (_ui_data->vpninfo, _ui_data, NULL, update_token); - #endif -+ -+ build_main_dialog(_ui_data); -+ - openconnect_init_ssl(); - - /* Start connecting now if there's only one host. Or if configured to */ -@@ -1893,5 +1736,5 @@ int main (int argc, char **argv) - - wait_for_quit (); - -- return _ui_data->retval; -+ return 0; - } -diff --git a/properties/nm-openconnect-dialog.ui b/properties/nm-openconnect-dialog.ui -index b3401db..4643b73 100644 ---- a/properties/nm-openconnect-dialog.ui -+++ b/properties/nm-openconnect-dialog.ui -@@ -766,6 +766,12 @@ - <col id="2" translatable="no">totp</col> - <col id="3" translatable="no">True</col> - </row> -+ <row> -+ <col id="0" translatable="yes">HOTP - manually entered</col> -+ <col id="1" translatable="no">hotp</col> -+ <col id="2" translatable="no">hotp</col> -+ <col id="3" translatable="no">True</col> -+ </row> - </data> - </object> - </interface> -diff --git a/properties/nm-openconnect.c b/properties/nm-openconnect.c -index 3a9f69f..dfd5f5c 100644 ---- a/properties/nm-openconnect.c -+++ b/properties/nm-openconnect.c -@@ -95,6 +95,26 @@ typedef struct { - #define COL_AUTH_PAGE 1 - #define COL_AUTH_TYPE 2 - -+/************** import/export **************/ -+ -+typedef enum { -+ NM_OPENCONNECT_IMPORT_EXPORT_ERROR_UNKNOWN = 0, -+ NM_OPENCONNECT_IMPORT_EXPORT_ERROR_NOT_OPENCONNECT, -+ NM_OPENCONNECT_IMPORT_EXPORT_ERROR_BAD_DATA, -+} NMOpenconnectImportError; -+ -+#define NM_OPENCONNECT_IMPORT_EXPORT_ERROR nm_openconnect_import_export_error_quark () -+ -+static GQuark -+nm_openconnect_import_export_error_quark (void) -+{ -+ static GQuark quark = 0; -+ -+ if (G_UNLIKELY (quark == 0)) -+ quark = g_quark_from_static_string ("nm-openconnect-import-export-error-quark"); -+ return quark; -+} -+ - static NMConnection * - import (NMVpnPluginUiInterface *iface, const char *path, GError **error) - { -@@ -110,8 +130,12 @@ import (NMVpnPluginUiInterface *iface, const char *path, GError **error) - keyfile = g_key_file_new (); - flags = G_KEY_FILE_KEEP_COMMENTS | G_KEY_FILE_KEEP_TRANSLATIONS; - -- if (!g_key_file_load_from_file (keyfile, path, flags, error)) { -- g_set_error (error, 0, 0, "does not look like a %s VPN connection (parse failed)", OPENCONNECT_PLUGIN_NAME); -+ if (!g_key_file_load_from_file (keyfile, path, flags, NULL)) { -+ g_set_error (error, -+ NM_OPENCONNECT_IMPORT_EXPORT_ERROR, -+ NM_OPENCONNECT_IMPORT_EXPORT_ERROR_NOT_OPENCONNECT, -+ "does not look like a %s VPN connection (parse failed)", -+ OPENCONNECT_PLUGIN_NAME); - return NULL; - } - -@@ -131,7 +155,11 @@ import (NMVpnPluginUiInterface *iface, const char *path, GError **error) - if (buf) { - nm_setting_vpn_add_data_item (s_vpn, NM_OPENCONNECT_KEY_GATEWAY, buf); - } else { -- g_set_error (error, 0, 0, "does not look like a %s VPN connection (no Host)", OPENCONNECT_PLUGIN_NAME); -+ g_set_error (error, -+ NM_OPENCONNECT_IMPORT_EXPORT_ERROR, -+ NM_OPENCONNECT_IMPORT_EXPORT_ERROR_BAD_DATA, -+ "does not look like a %s VPN connection (no Host)", -+ OPENCONNECT_PLUGIN_NAME); - g_object_unref (connection); - return NULL; - } -@@ -186,7 +214,7 @@ import (NMVpnPluginUiInterface *iface, const char *path, GError **error) - /* Soft token secret */ - buf = g_key_file_get_string (keyfile, "openconnect", "StokenString", NULL); - if (buf) -- nm_setting_vpn_add_data_item (s_vpn, NM_OPENCONNECT_KEY_TOKEN_SECRET, buf); -+ nm_setting_vpn_add_secret (s_vpn, NM_OPENCONNECT_KEY_TOKEN_SECRET, buf); - - return connection; - } -@@ -215,7 +243,10 @@ export (NMVpnPluginUiInterface *iface, - - f = fopen (path, "w"); - if (!f) { -- g_set_error (error, 0, 0, "could not open file for writing"); -+ g_set_error_literal (error, -+ NM_OPENCONNECT_IMPORT_EXPORT_ERROR, -+ NM_OPENCONNECT_IMPORT_EXPORT_ERROR_UNKNOWN, -+ "could not open file for writing"); - return FALSE; - } - -@@ -227,7 +258,10 @@ export (NMVpnPluginUiInterface *iface, - if (value && strlen (value)) - gateway = value; - else { -- g_set_error (error, 0, 0, "connection was incomplete (missing gateway)"); -+ g_set_error_literal (error, -+ NM_OPENCONNECT_IMPORT_EXPORT_ERROR, -+ NM_OPENCONNECT_IMPORT_EXPORT_ERROR_BAD_DATA, -+ "connection was incomplete (missing gateway)"); - goto done; - } - -@@ -263,9 +297,14 @@ export (NMVpnPluginUiInterface *iface, - if (value && strlen (value)) - token_mode = value; - -- value = nm_setting_vpn_get_data_item (s_vpn, NM_OPENCONNECT_KEY_TOKEN_SECRET); -+ value = nm_setting_vpn_get_secret (s_vpn, NM_OPENCONNECT_KEY_TOKEN_SECRET); - if (value && strlen (value)) - token_secret = value; -+ else { -+ value = nm_setting_vpn_get_data_item (s_vpn, NM_OPENCONNECT_KEY_TOKEN_SECRET); -+ if (value && strlen (value)) -+ token_secret = value; -+ } - - fprintf (f, - "[openconnect]\n" -@@ -393,6 +432,9 @@ init_token_mode_options (GtkComboBox *token_mode) - iter_valid = gtk_list_store_remove (token_mode_list, &iter); - else if (!strcmp (token_type, "totp") && !openconnect_has_oath_support ()) - iter_valid = gtk_list_store_remove (token_mode_list, &iter); -+ else if (!strcmp (token_type, "hotp") && -+ (!openconnect_has_oath_support () || !OPENCONNECT_CHECK_VER(3,4))) -+ iter_valid = gtk_list_store_remove (token_mode_list, &iter); - else { - iter_valid = gtk_tree_model_iter_next (model, &iter); - valid_rows++; -@@ -458,7 +500,9 @@ init_token_ui (OpenconnectPluginUiWidget *self, - if (!buffer) - return FALSE; - if (s_vpn) { -- value = nm_setting_vpn_get_data_item (s_vpn, NM_OPENCONNECT_KEY_TOKEN_SECRET); -+ value = nm_setting_vpn_get_secret (s_vpn, NM_OPENCONNECT_KEY_TOKEN_SECRET); -+ if (!value) -+ value = nm_setting_vpn_get_data_item (s_vpn, NM_OPENCONNECT_KEY_TOKEN_SECRET); - if (value) - gtk_text_buffer_set_text (buffer, value, -1); - } -@@ -619,7 +663,7 @@ update_connection (NMVpnPluginUiWidgetInterface *iface, - *dst = 0; - - if (strlen (str)) -- nm_setting_vpn_add_data_item (s_vpn, NM_OPENCONNECT_KEY_TOKEN_SECRET, str); -+ nm_setting_vpn_add_secret (s_vpn, NM_OPENCONNECT_KEY_TOKEN_SECRET, str); - } - - if (!check_validity (self, error)) diff --git a/network/NetworkManager-openconnect/NetworkManager-openconnect.SlackBuild b/network/NetworkManager-openconnect/NetworkManager-openconnect.SlackBuild index 98cdc52f56..9b13edac95 100644 --- a/network/NetworkManager-openconnect/NetworkManager-openconnect.SlackBuild +++ b/network/NetworkManager-openconnect/NetworkManager-openconnect.SlackBuild @@ -23,7 +23,7 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=NetworkManager-openconnect -VERSION=${VERSION:-0.9.8.6} +VERSION=${VERSION:-1.0.2} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -69,9 +69,6 @@ find -L . \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ -exec chmod 644 {} \; -# Support openconnect-7.x -patch -p1 < $CWD/NetworkManager-openconnect-0.9.8.6-libopenconnect5.patch - # Remove mention of an extraneous user account from the dbus config file patch -p1 < $CWD/nm-openconnect-service.conf.diff diff --git a/network/NetworkManager-openconnect/NetworkManager-openconnect.info b/network/NetworkManager-openconnect/NetworkManager-openconnect.info index d8af13bf73..d11fdaa225 100644 --- a/network/NetworkManager-openconnect/NetworkManager-openconnect.info +++ b/network/NetworkManager-openconnect/NetworkManager-openconnect.info @@ -1,8 +1,8 @@ PRGNAM="NetworkManager-openconnect" -VERSION="0.9.8.6" +VERSION="1.0.2" HOMEPAGE="http://projects.gnome.org/NetworkManager/" -DOWNLOAD="http://ftp.gnome.org/pub/GNOME/sources/NetworkManager-openconnect/0.9/NetworkManager-openconnect-0.9.8.6.tar.xz" -MD5SUM="f0c8b87704af77ea764f70d5bdef91ca" +DOWNLOAD="http://ftp.gnome.org/pub/GNOME/sources/NetworkManager-openconnect/1.0/NetworkManager-openconnect-1.0.2.tar.xz" +MD5SUM="90e5bdbcf976558a6eb4756fb62b641e" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="openconnect" diff --git a/network/NetworkManager-openvpn/NetworkManager-openvpn.SlackBuild b/network/NetworkManager-openvpn/NetworkManager-openvpn.SlackBuild index 6fc156beac..554c923ed3 100644 --- a/network/NetworkManager-openvpn/NetworkManager-openvpn.SlackBuild +++ b/network/NetworkManager-openvpn/NetworkManager-openvpn.SlackBuild @@ -23,7 +23,7 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=NetworkManager-openvpn -VERSION=${VERSION:-0.9.8.4} +VERSION=${VERSION:-1.0.2} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} diff --git a/network/NetworkManager-openvpn/NetworkManager-openvpn.info b/network/NetworkManager-openvpn/NetworkManager-openvpn.info index ef5e1a87c4..beef3cfc2c 100644 --- a/network/NetworkManager-openvpn/NetworkManager-openvpn.info +++ b/network/NetworkManager-openvpn/NetworkManager-openvpn.info @@ -1,8 +1,8 @@ PRGNAM="NetworkManager-openvpn" -VERSION="0.9.8.4" +VERSION="1.0.2" HOMEPAGE="http://projects.gnome.org/NetworkManager/" -DOWNLOAD="http://ftp.gnome.org/pub/GNOME/sources/NetworkManager-openvpn/0.9/NetworkManager-openvpn-0.9.8.4.tar.xz" -MD5SUM="afe11c50ce63bd251e50a2f1b20af654" +DOWNLOAD="http://ftp.gnome.org/pub/GNOME/sources/NetworkManager-openvpn/1.0/NetworkManager-openvpn-1.0.2.tar.xz" +MD5SUM="511eae0d4ac17c6d2659a3da2646296f" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" diff --git a/network/NetworkManager-pptp/NetworkManager-pptp.SlackBuild b/network/NetworkManager-pptp/NetworkManager-pptp.SlackBuild index b2a06dd4f5..d47d1376e5 100644 --- a/network/NetworkManager-pptp/NetworkManager-pptp.SlackBuild +++ b/network/NetworkManager-pptp/NetworkManager-pptp.SlackBuild @@ -23,7 +23,7 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=NetworkManager-pptp -VERSION=${VERSION:-0.9.8.4} +VERSION=${VERSION:-1.0.2} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} diff --git a/network/NetworkManager-pptp/NetworkManager-pptp.info b/network/NetworkManager-pptp/NetworkManager-pptp.info index 05ccb6e344..f2f2e1d05b 100644 --- a/network/NetworkManager-pptp/NetworkManager-pptp.info +++ b/network/NetworkManager-pptp/NetworkManager-pptp.info @@ -1,8 +1,8 @@ PRGNAM="NetworkManager-pptp" -VERSION="0.9.8.4" +VERSION="1.0.2" HOMEPAGE="http://projects.gnome.org/NetworkManager/" -DOWNLOAD="http://ftp.gnome.org/pub/GNOME/sources/NetworkManager-pptp/0.9/NetworkManager-pptp-0.9.8.4.tar.xz" -MD5SUM="2d1f48ab2383aaba1cc4acb43a187320" +DOWNLOAD="http://ftp.gnome.org/pub/GNOME/sources/NetworkManager-pptp/1.0/NetworkManager-pptp-1.0.2.tar.xz" +MD5SUM="1e3bf62f7971d356c76f6a7fb094e20a" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="pptp" diff --git a/network/NetworkManager-vpnc/NetworkManager-vpnc.SlackBuild b/network/NetworkManager-vpnc/NetworkManager-vpnc.SlackBuild index 93c98e2ac1..8570d4c709 100644 --- a/network/NetworkManager-vpnc/NetworkManager-vpnc.SlackBuild +++ b/network/NetworkManager-vpnc/NetworkManager-vpnc.SlackBuild @@ -23,7 +23,7 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=NetworkManager-vpnc -VERSION=${VERSION:-0.9.8.6} +VERSION=${VERSION:-1.0.2} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} diff --git a/network/NetworkManager-vpnc/NetworkManager-vpnc.info b/network/NetworkManager-vpnc/NetworkManager-vpnc.info index c237012226..945823e235 100644 --- a/network/NetworkManager-vpnc/NetworkManager-vpnc.info +++ b/network/NetworkManager-vpnc/NetworkManager-vpnc.info @@ -1,8 +1,8 @@ PRGNAM="NetworkManager-vpnc" -VERSION="0.9.8.6" +VERSION="1.0.2" HOMEPAGE="http://projects.gnome.org/NetworkManager/" -DOWNLOAD="http://ftp.gnome.org/pub/GNOME/sources/NetworkManager-vpnc/0.9/NetworkManager-vpnc-0.9.8.6.tar.xz" -MD5SUM="ae7751aa3738fcd954d863d25e3720e2" +DOWNLOAD="http://ftp.gnome.org/pub/GNOME/sources/NetworkManager-vpnc/1.0/NetworkManager-vpnc-1.0.2.tar.xz" +MD5SUM="24560f75ec9f1a45bc10192c3c431417" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="vpnc" diff --git a/network/airpwn/airpwn.SlackBuild b/network/airpwn/airpwn.SlackBuild index da190bd1dc..b09a5958d5 100644 --- a/network/airpwn/airpwn.SlackBuild +++ b/network/airpwn/airpwn.SlackBuild @@ -86,7 +86,7 @@ done sed -i "s|Python2.4|Python${PYTHON_VERSION1}|g" configure.ac sed -i "s|PYTHON2_4|PYTHON${PYTHON_VERSION2}|g" config.h.in -autoreconf +autoreconf -vif CFLAGS="$SLKCFLAGS" \ LDFLAGS="-L${PKG}/usr/lib${LIBDIRSUFFIX}" \ diff --git a/network/avahi/avahi.SlackBuild b/network/avahi/avahi.SlackBuild index f478df2952..8f9dcfe8ef 100644 --- a/network/avahi/avahi.SlackBuild +++ b/network/avahi/avahi.SlackBuild @@ -99,6 +99,11 @@ find -L . \ # Thanks to Robby Workman for this patch. patch -p1 --verbose < $CWD/fixup_avahi-dnsconfd.action.patch +# Permit deprecated functions, see https://bugzilla.redhat.com/show_bug.cgi?id=1001676#c9 +# There's a cmake option for this, but no configure option, +# so thanks to Arch Linux for this one-liner: +sed 's:-DG[^ ]*_DISABLE_DEPRECATED=1::g' -i avahi-ui/Makefile.* + CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ ./configure \ diff --git a/network/chromium/chromium.SlackBuild b/network/chromium/chromium.SlackBuild index 1052a4997f..f8b8f0dff1 100644 --- a/network/chromium/chromium.SlackBuild +++ b/network/chromium/chromium.SlackBuild @@ -114,6 +114,8 @@ build/gyp_chromium -f make build/all.gyp --depth=. \ -Duse_system_yasm=1 \ -Ddisable_nacl=1 \ -Drelease_extra_cflags="$CFLAGS" \ + -Dsystem_libdir=lib64 \ + -Dpython_ver=2.7 \ $DDSSE make chrome chrome_sandbox BUILDTYPE=Release V=1 diff --git a/network/dobbscoin/dobbscoin.SlackBuild b/network/dobbscoin/dobbscoin.SlackBuild index 74844905d3..6e94cf07c4 100644 --- a/network/dobbscoin/dobbscoin.SlackBuild +++ b/network/dobbscoin/dobbscoin.SlackBuild @@ -80,9 +80,9 @@ find -L . \ # build dobbscoin-qt qmake \ QMAKE_CFLAGS+="$SLKCFLAGS" \ - QMAKE_CXXFLAGS+="$SLKCFLAGS" \ - "USE_UPNP=$UPNP" \ - USE_QRCODE=$QRCODE \ + QMAKE_CXXFLAGS+="$SLKCFLAGS -DBOOST_VARIANT_USE_RELAXED_GET_BY_DEFAULT=1" \ + USE_UPNP="$UPNP" \ + USE_QRCODE="$QRCODE" \ USE_SSL=1 make @@ -99,10 +99,11 @@ cd src sed -i 's/Bstatic/Bdynamic/g' makefile.unix CFLAGS="$SLKCFLAGS" \ - CXXFLAGS="$SLKCFLAGS" \ + CXXFLAGS="$SLKCFLAGS -DBOOST_VARIANT_USE_RELAXED_GET_BY_DEFAULT=1" \ make -f makefile.unix \ dobbscoind \ USE_SSL=1 + cd - mkdir -p $PKG/usr/bin diff --git a/network/dogecoin/dogecoin.SlackBuild b/network/dogecoin/dogecoin.SlackBuild index 91fd5eb5c9..6733350de6 100644 --- a/network/dogecoin/dogecoin.SlackBuild +++ b/network/dogecoin/dogecoin.SlackBuild @@ -77,10 +77,6 @@ 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 {} \; -LDFLAGS="$SLKLDFLAGS" \ -CXXFLAGS="$SLKCFLAGS" \ -CFLAGS="$SLKCFLAGS" \ - # Detect miniupnpc if [ -x /usr/bin/upnpc ]; then UPNP=1; else UPNP="-"; fi @@ -91,9 +87,9 @@ if [ -x /usr/bin/qrencode ]; then QRCODE=1; else QRCODE=0; fi echo Building dogecoin-qt ... qmake \ QMAKE_CFLAGS+="$SLKCFLAGS" \ - QMAKE_CXXFLAGS+="$SLKCFLAGS" \ - "USE_UPNP=$UPNP" \ - USE_QRCODE=$QRCODE \ + QMAKE_CXXFLAGS+="$SLKCFLAGS -DBOOST_VARIANT_USE_RELAXED_GET_BY_DEFAULT=1" \ + USE_UPNP="$UPNP" \ + USE_QRCODE="$QRCODE" \ USE_SSL=1 make @@ -110,10 +106,11 @@ cd src sed -i 's/Bstatic/Bdynamic/g' makefile.unix CFLAGS="$SLKCFLAGS" \ - CXXFLAGS="$SLKCFLAGS" \ + CXXFLAGS="$SLKCFLAGS -DBOOST_VARIANT_USE_RELAXED_GET_BY_DEFAULT=1" \ make -f makefile.unix \ dogecoind \ USE_SSL=1 + cd - mkdir -p $PKG/usr/{bin,man/man{1,5}} diff --git a/network/dwb/dwb.SlackBuild b/network/dwb/dwb.SlackBuild index 3a84b368b5..c60ae28851 100644 --- a/network/dwb/dwb.SlackBuild +++ b/network/dwb/dwb.SlackBuild @@ -3,7 +3,7 @@ # Slackware build script for dwb by Marcin Herda <mherda@slackword.net> PRGNAM=dwb -VERSION=${VERSION:-2013.03.30} +VERSION=${VERSION:-20150419_8ba11e5} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} diff --git a/network/dwb/dwb.info b/network/dwb/dwb.info index f9100e012d..ffb4f91c1b 100644 --- a/network/dwb/dwb.info +++ b/network/dwb/dwb.info @@ -1,8 +1,8 @@ PRGNAM="dwb" -VERSION="2013.03.30" +VERSION="20150419_8ba11e5" HOMEPAGE="http://portix.bitbucket.org/dwb/" -DOWNLOAD="https://bitbucket.org/portix/dwb/downloads/dwb-2013.03.30.tar.gz" -MD5SUM="bed54418cc6a560e3e6818e44e52a7bb" +DOWNLOAD="http://ponce.cc/slackware/sources/repo/dwb-20150419_8ba11e5.tar.gz" +MD5SUM="65f3dd6352989feedf94e9a07e2c23d0" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="webkitgtk json-c" diff --git a/network/ekiga/ekiga.SlackBuild b/network/ekiga/ekiga.SlackBuild index b9c274a1a2..1496a539af 100644 --- a/network/ekiga/ekiga.SlackBuild +++ b/network/ekiga/ekiga.SlackBuild @@ -107,6 +107,11 @@ 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 for -current (20150722 dbs) +sed -e 's/gnome-icon-theme/adwaita-icon-theme/g' -i configure.ac +autoconf + CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ ./configure \ diff --git a/network/filezilla-old/README b/network/filezilla-old/README new file mode 100644 index 0000000000..79ca6a496f --- /dev/null +++ b/network/filezilla-old/README @@ -0,0 +1,10 @@ +FileZilla Client is a fast and reliable cross-platform FTP, FTPS and +SFTP client with lots of useful features and an intuitive graphical +user interface. + +tinyxml is an optional dependency - to use an installed version of +tinyxml, run the script as "TINYXML=yes ./filezilla.SlackBuild" +otherwise, the build will use an included copy of tinyxml. + +*NOTE* +this conflicts with the filezilla script: install only one of the two! diff --git a/graphics/comix/doinst.sh b/network/filezilla-old/doinst.sh index 3e5691a052..9830478e8c 100644 --- a/graphics/comix/doinst.sh +++ b/network/filezilla-old/doinst.sh @@ -2,8 +2,13 @@ if [ -x /usr/bin/update-desktop-database ]; then /usr/bin/update-desktop-database -q usr/share/applications >/dev/null 2>&1 fi +if [ -x /usr/bin/update-mime-database ]; then + /usr/bin/update-mime-database usr/share/mime >/dev/null 2>&1 +fi + if [ -e usr/share/icons/hicolor/icon-theme.cache ]; then if [ -x /usr/bin/gtk-update-icon-cache ]; then /usr/bin/gtk-update-icon-cache usr/share/icons/hicolor >/dev/null 2>&1 fi fi + diff --git a/network/filezilla-old/filezilla-old.SlackBuild b/network/filezilla-old/filezilla-old.SlackBuild new file mode 100644 index 0000000000..d8c48759d8 --- /dev/null +++ b/network/filezilla-old/filezilla-old.SlackBuild @@ -0,0 +1,121 @@ +#!/bin/sh +# Slackware build script for filezilla-old + +# Copyright 2007-2009 Grigorios Bouzakis <grbzks@xsmail.com> +# Copyright 2010-2014 Willy Sudiarto Raharjo <willysr@slackbuilds.org> +# Copyright 2015 Matteo Bernardini <ponce@slackbuilds.org> +# All rights reserved. +# +# Permission to use, copy, modify, and distribute this software for any purpose +# with or without fee is hereby granted, provided that the above copyright +# notice and this permission notice appear in all copies. +# +# THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED WARRANTIES, +# INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND +# FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE +# AUTHORS AND COPYRIGHT HOLDERS AND THEIR CONTRIBUTORS BE LIABLE FOR ANY +# DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES +# (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; +# LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND +# ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF +# THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +PRGNAM=filezilla-old +SRCNAM=filezilla +VERSION=${VERSION:-3.8.1} +BUILD=${BUILD:-1} +TAG=${TAG:-_SBo} + +if [ -z "$ARCH" ]; then + case "$( uname -m )" in + i?86) ARCH=i486 ;; + arm*) ARCH=arm ;; + *) ARCH=$( uname -m ) ;; + esac +fi + +CWD=$(pwd) +TMP=${TMP:-/tmp/SBo} +PKG=$TMP/package-$PRGNAM +OUTPUT=${OUTPUT:-/tmp} + +if [ "$ARCH" = "i486" ]; then + SLKCFLAGS="-O2 -march=i486 -mtune=i686" + LIBDIRSUFFIX="" +elif [ "$ARCH" = "i686" ]; then + SLKCFLAGS="-O2 -march=i686 -mtune=i686" + LIBDIRSUFFIX="" +elif [ "$ARCH" = "x86_64" ]; then + SLKCFLAGS="-O2 -fPIC" + LIBDIRSUFFIX="64" +else + SLKCFLAGS="-O2" + LIBDIRSUFFIX="" +fi + +DOCS="AUTHORS COPYING ChangeLog INSTALL NEWS README GPL.html" + +# Check if we have tinyxml package +if [ "${TINYXML:-no}" = "yes" ]; then + tinyxml="" +else + tinyxml="--with-tinyxml=builtin" +fi + +set -e + +rm -rf $PKG +mkdir -p $TMP $PKG $OUTPUT +cd $TMP +rm -rf $SRCNAM-$VERSION +tar xvf $CWD/FileZilla_${VERSION}_src.tar.bz2 +cd $SRCNAM-$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 640 -o -perm 600 -o -perm 444 \ + -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; + +# Added LDFLAGS to make it compilable, thanks to LQ +# http://www.linuxquestions.org/questions/slackware-14/libsndfile-from-slackbuilds-org-fails-to-build-695456/ +LDFLAGS="-ldl" \ +CFLAGS="$SLKCFLAGS" \ +CXXFLAGS="$SLKCFLAGS" \ +./configure \ + --prefix=/usr \ + --libdir=/usr/lib${LIBDIRSUFFIX} \ + --sysconfdir=/etc \ + --localstatedir=/var \ + --mandir=/usr/man \ + --docdir=/usr/doc/$SRCNAM-$VERSION \ + --disable-static \ + --disable-manualupdatecheck \ + --disable-autoupdatecheck \ + --enable-locales \ + $tinyxml \ + --build=$ARCH-slackware-linux + +make +make install DESTDIR=$PKG + +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 + +find $PKG/usr/man -type f -exec gzip -9 {} \; +for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done + +mkdir -p $PKG/usr/doc/$SRCNAM-$VERSION +cp -a $DOCS $PKG/usr/doc/$SRCNAM-$VERSION +cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$SRCNAM-$VERSION/$PRGNAM.SlackBuild +mv $PKG/usr/share/$SRCNAM/docs/fzdefaults.xml.example $PKG/usr/doc/$SRCNAM-$VERSION +# remove empty docdir +rmdir $PKG/usr/share/$SRCNAM/docs + +mkdir -p $PKG/install +cat $CWD/slack-desc > $PKG/install/slack-desc +cat $CWD/doinst.sh > $PKG/install/doinst.sh + +cd $PKG +/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz} diff --git a/network/filezilla-old/filezilla-old.info b/network/filezilla-old/filezilla-old.info new file mode 100644 index 0000000000..86a2996fba --- /dev/null +++ b/network/filezilla-old/filezilla-old.info @@ -0,0 +1,10 @@ +PRGNAM="filezilla-old" +VERSION="3.8.1" +HOMEPAGE="http://filezilla-project.org/" +DOWNLOAD="http://downloads.sourceforge.net/filezilla/FileZilla_3.8.1_src.tar.bz2" +MD5SUM="b4bce64b8db97419cfefa04468afc9fb" +DOWNLOAD_x86_64="" +MD5SUM_x86_64="" +REQUIRES="wxPython" +MAINTAINER="Matteo Bernardini" +EMAIL="ponce@slackbuilds.org" diff --git a/network/filezilla-old/slack-desc b/network/filezilla-old/slack-desc new file mode 100644 index 0000000000..b61fb01016 --- /dev/null +++ b/network/filezilla-old/slack-desc @@ -0,0 +1,19 @@ +# HOW TO EDIT THIS FILE: +# The "handy ruler" below makes it easier to edit a package description. +# Line up the first '|' above the ':' following the base package name, and +# the '|' on the right side marks the last column you can put a character in. +# You must make exactly 11 lines for the formatting to be correct. It's also +# customary to leave one space after the ':' except on otherwise blank lines. + + |-----handy-ruler------------------------------------------------------| +filezilla-old: filezilla-old (the free FTP solution) +filezilla-old: +filezilla-old: FileZilla is a fast and reliable cross-platform FTP, FTPS, and SFTP +filezilla-old: client with lots of useful features and an intuitive user interface. +filezilla-old: +filezilla-old: This is the last version still depending on wxPython (newer ones +filezilla-old: depend on wxGTK3). +filezilla-old: +filezilla-old: homepage: http://filezilla-project.org +filezilla-old: +filezilla-old: diff --git a/network/freerdp/freerdp.SlackBuild b/network/freerdp/freerdp.SlackBuild index 9a19604f68..f3ce3deea5 100644 --- a/network/freerdp/freerdp.SlackBuild +++ b/network/freerdp/freerdp.SlackBuild @@ -96,7 +96,7 @@ patch -p1 <$CWD/patches/freerdp-cmake-3.1.patch mkdir -p build cd build cmake \ - -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \ + -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS $(pkg-config --cflags gstreamer-base-1.0)" \ -DCMAKE_INSTALL_PREFIX=/usr \ -DLIB_SUFFIX=${LIBDIRSUFFIX} \ -DWITH_CUPS=ON \ diff --git a/network/heimdal/heimdal.SlackBuild b/network/heimdal/heimdal.SlackBuild index 6ea71738e8..fe121bbff0 100644 --- a/network/heimdal/heimdal.SlackBuild +++ b/network/heimdal/heimdal.SlackBuild @@ -59,6 +59,7 @@ find -L . \ CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ +LDFLAGS="-lpthread" \ ./configure \ --prefix=/usr/heimdal \ --libdir=/usr/lib${LIBDIRSUFFIX} \ diff --git a/network/icecat/icecat.SlackBuild b/network/icecat/icecat.SlackBuild index 99140feaee..ddab69d15e 100644 --- a/network/icecat/icecat.SlackBuild +++ b/network/icecat/icecat.SlackBuild @@ -86,15 +86,10 @@ rm -rf $PRGNAM-$VERSION tar xvf $CWD/${PRGNAM}-$VERSION-gnu1.tar.bz2 cd ${PRGNAM}-$VERSION -# Fix a long standing bug that's prevented staying current on GTK+. -# Thanks to the BLFS folks. :-) -cat << EOF >> layout/build/Makefile.in - -ifdef MOZ_ENABLE_CANVAS -EXTRA_DSO_LDOPTS += \$(XLDFLAGS) -lX11 -lXrender -endif - -EOF +# https://bugzilla.mozilla.org/show_bug.cgi?id=1194520 +sed -e '/^ftglyph.h/i ftfntfmt.h' \ + -e '/^freetype\/ftcache.h/a freetype\/ftfntfmt.h' \ + -i config/system-headers chown -R root:root . find -L . \ diff --git a/network/kadu/kadu.SlackBuild b/network/kadu/kadu.SlackBuild index 83402980ec..b24650c777 100644 --- a/network/kadu/kadu.SlackBuild +++ b/network/kadu/kadu.SlackBuild @@ -49,9 +49,10 @@ 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 {} \; patch -p1 < $CWD/kadu.patch + mkdir -p build cd build cmake .. \ @@ -76,11 +77,11 @@ find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \ | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true # Remove all license files -find $(INSTALL_DIR) -name '[lL][iI][cC][eE][nN][sS][eE].txt' -delete +find "$PKG" -name '[lL][iI][cC][eE][nN][sS][eE].txt' -delete # Move cmake files in the proper place mv $PKG/usr/share/cmake \ - $PKG/usr/share/cmake-$(cmake --version | cut -d\ -f3 | cut -d. -f1-2) + $PKG/usr/share/cmake-$(cmake --version | head -1 | cut -d\ -f3 | cut -d. -f1-2) # Move this away too... mv $PKG/usr/sdk $PKG/usr/share/$PRGNAM/ diff --git a/network/kmess/giflib-5.0.patch b/network/kmess/giflib-5.0.patch new file mode 100644 index 0000000000..cc568fdf8a --- /dev/null +++ b/network/kmess/giflib-5.0.patch @@ -0,0 +1,95 @@ +--- contrib/isf-qt/src/isfqt.cpp.orig 2014-06-11 13:10:43.137321400 +0000 ++++ contrib/isf-qt/src/isfqt.cpp 2014-06-11 13:12:23.123474616 +0000 +@@ -249,7 +249,7 @@ + qWarning() << "Couldn't initialize GIF library!"; + } + +- DGifCloseFile( gifImage ); ++ DGifCloseFile( gifImage, NULL ); + gifData.close(); + */ + +@@ -484,12 +484,13 @@ + int width = isfImage.width(); + int numColors = 0; + bool gifError = true; ++ int gifErrCode; + + // Convert the image to GIF using libgif + + // Open the gif file + gifData.open( QIODevice::WriteOnly ); +- gifImage = EGifOpen( (void*)&gifData, GifWriteToByteArray ); ++ gifImage = EGifOpen( (void*)&gifData, GifWriteToByteArray, &gifErrCode ); + if( gifImage == 0 ) + { + qWarning() << "Couldn't initialize gif library!"; +@@ -503,7 +504,7 @@ + numColors = 256; + } + +- cmap = MakeMapObject( numColors, NULL ); ++ cmap = GifMakeMapObject( numColors, NULL ); + if( cmap == 0 && isfImage.numColors() > 1 ) + { + qWarning() << "Couldn't create map object for gif conversion (colors:" << isfImage.numColors() << ")!"; +@@ -576,7 +577,7 @@ + else + { + // Write the extension +- if( EGifPutExtensionFirst( gifImage, COMMENT_EXT_FUNC_CODE, MAX_GIF_BYTE, isfData.left( MAX_GIF_BYTE ).data() ) == GIF_ERROR ) ++ if( EGifPutExtensionLeader( gifImage, COMMENT_EXT_FUNC_CODE) == GIF_ERROR ) + { + qWarning() << "EGifPutExtensionFirst failed!"; + goto writeError; +@@ -590,9 +591,9 @@ + // Write all the full data blocks + while( length >= MAX_GIF_BYTE ) + { +- if( EGifPutExtensionNext( gifImage, 0, MAX_GIF_BYTE, isfData.mid( pos, MAX_GIF_BYTE ).data() ) == GIF_ERROR ) ++ if( EGifPutExtensionBlock( gifImage, MAX_GIF_BYTE, isfData.mid( pos, MAX_GIF_BYTE ).data() ) == GIF_ERROR ) + { +- qWarning() << "EGifPutExtensionNext failed!"; ++ qWarning() << "EGifPutExtensionBlock failed!"; + goto writeError; + } + +@@ -603,17 +604,17 @@ + // Write the last block + if( length > 0 ) + { +- if( EGifPutExtensionLast( gifImage, 0, length, isfData.mid( pos, MAX_GIF_BYTE ).data() ) == GIF_ERROR ) ++ if( EGifPutExtensionTrailer( gifImage ) == GIF_ERROR ) + { +- qWarning() << "EGifPutExtensionLast (n) failed!"; ++ qWarning() << "EGifPutExtensionTrailer (n) failed!"; + goto writeError; + } + } + else + { +- if( EGifPutExtensionLast( gifImage, 0, 0, 0 ) == GIF_ERROR ) ++ if( EGifPutExtensionTrailer( gifImage ) == GIF_ERROR ) + { +- qWarning() << "EGifPutExtensionLast (0) failed!"; ++ qWarning() << "EGifPutExtensionTrailer (0) failed!"; + goto writeError; + } + } +@@ -623,13 +624,13 @@ + + writeError: + // Clean up the GIF converter etc +- EGifCloseFile( gifImage ); +- FreeMapObject( cmap ); ++ EGifCloseFile( gifImage, NULL ); ++ GifFreeMapObject( cmap ); + gifData.close(); + + if( gifError ) + { +- qWarning() << "GIF error code:" << GifLastError(); ++ qWarning() << "GIF error code:" << GifErrorString(gifErrCode); + } + else + { diff --git a/network/kmess/kmess.SlackBuild b/network/kmess/kmess.SlackBuild index ca6f475d60..27c6a9e73b 100644 --- a/network/kmess/kmess.SlackBuild +++ b/network/kmess/kmess.SlackBuild @@ -68,6 +68,9 @@ find -L . \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ -exec chmod 644 {} \; +# Fix for building with new giflib (thanks to Arch) +patch -p1 contrib/isf-qt/src/isfqt.cpp < $CWD/giflib-5.0.patch + mkdir -p build cd build cmake \ diff --git a/network/libnftnl/README b/network/libnftnl/README deleted file mode 100644 index acc52c6ece..0000000000 --- a/network/libnftnl/README +++ /dev/null @@ -1,8 +0,0 @@ -libnftnl (pre-requisite for nftables) - -libnftnl is a userspace library providing a low-level netlink interface (API) to -the in-kernel nf_tables subsystem. The library libnftnl has been previously -known as libnftables. This library is currently used by nftables. - -To benefit from libnftnl (but not to build it), you need a kernel that includes -the nf_tables subsystem (initial support >= 3.14). diff --git a/network/libnftnl/libnftnl.info b/network/libnftnl/libnftnl.info deleted file mode 100644 index 8a66dbb634..0000000000 --- a/network/libnftnl/libnftnl.info +++ /dev/null @@ -1,10 +0,0 @@ -PRGNAM="libnftnl" -VERSION="1.0.5" -HOMEPAGE="http://www.netfilter.org/projects/libnftnl/" -DOWNLOAD="http://www.netfilter.org/projects/libnftnl/files/libnftnl-1.0.5.tar.bz2" -MD5SUM="af0c62ce6bbd7a7d39def0996c1c17c9" -DOWNLOAD_x86_64="" -MD5SUM_x86_64="" -REQUIRES="" -MAINTAINER="Duncan Roe" -EMAIL="duncan_roe@acslink.net.au" diff --git a/network/libnftnl/slack-desc b/network/libnftnl/slack-desc deleted file mode 100644 index a398990b90..0000000000 --- a/network/libnftnl/slack-desc +++ /dev/null @@ -1,19 +0,0 @@ -# HOW TO EDIT THIS FILE: -# The "handy ruler" below makes it easier to edit a package description. Line -# up the first '|' above the ':' following the base package name, and the '|' -# on the right side marks the last column you can put a character in. You must -# make exactly 11 lines for the formatting to be correct. It's also -# customary to leave one space after the ':'. - - |-----handy-ruler------------------------------------------------------| -libnftnl: libnftnl (pre-requisite for nftables) -libnftnl: -libnftnl: libnftnl is a userspace library providing a low-level netlink -libnftnl: interface (API) to the in-kernel nf_tables subsystem. The library -libnftnl: libnftnl has been previously known as libnftables. This library is -libnftnl: currently used by nftables. -libnftnl: -libnftnl: To actually use libnftnl needs a kernel that includes the nf_tables -libnftnl: subsystem (initial support >= 3.14). -libnftnl: -libnftnl: Homepage: http://www.netfilter.org/projects/libnftnl/ diff --git a/network/lighttpd/lighttpd.SlackBuild b/network/lighttpd/lighttpd.SlackBuild index 76bae07e38..2784fb9437 100644 --- a/network/lighttpd/lighttpd.SlackBuild +++ b/network/lighttpd/lighttpd.SlackBuild @@ -23,7 +23,7 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=lighttpd -VERSION=${VERSION:-1.4.35} +VERSION=${VERSION:-1.4.37} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} diff --git a/network/lighttpd/lighttpd.info b/network/lighttpd/lighttpd.info index 5246876a81..14563b3577 100644 --- a/network/lighttpd/lighttpd.info +++ b/network/lighttpd/lighttpd.info @@ -1,8 +1,8 @@ PRGNAM="lighttpd" -VERSION="1.4.35" +VERSION="1.4.37" HOMEPAGE="http://www.lighttpd.net/" -DOWNLOAD="http://download.lighttpd.net/lighttpd/releases-1.4.x/lighttpd-1.4.35.tar.xz" -MD5SUM="c7ae774eab4cb7ac85e41b712f4ee9ba" +DOWNLOAD="http://download.lighttpd.net/lighttpd/releases-1.4.x/lighttpd-1.4.37.tar.xz" +MD5SUM="ca40168f54b46ee29475868ced8507d6" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" diff --git a/network/lighttpd2/README b/network/lighttpd2/README index 24892feefc..42605cf886 100644 --- a/network/lighttpd2/README +++ b/network/lighttpd2/README @@ -2,6 +2,8 @@ lighttpd2 is a fast, secure, and flexible webserver. It is optimized for high-performance environments, and provides an extensive feature set, including FastCGI, CGI, Auth, output compression, and URL rewriting support. +this version currently is a work in progress: it's not ready for +production: only for interested people. By default, this package uses the "lighttpd" user and group to run lighttpd as a unpriviliged process. The script will exit if these @@ -12,4 +14,5 @@ and groups, nor with any added by other SlackBuilds.org scripts. Group: lighttpd GID: 208 Be sure to see README.SLACKWARE (in this directory, and also installed -with the package documentation) for configuration and setup information. +with the package documentation) for configuration and setup +information. diff --git a/network/lighttpd2/lighttpd2.SlackBuild b/network/lighttpd2/lighttpd2.SlackBuild index fefcab2cd0..26a1b7331d 100644 --- a/network/lighttpd2/lighttpd2.SlackBuild +++ b/network/lighttpd2/lighttpd2.SlackBuild @@ -26,7 +26,7 @@ # Twisted for lighttpd2 by Matteo Bernardini <ponce@slackbuilds.org> PRGNAM=lighttpd2 -VERSION=${VERSION:-20150125_6b22f2f} +VERSION=${VERSION:-20150810_d2c6a28} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} diff --git a/network/lighttpd2/lighttpd2.info b/network/lighttpd2/lighttpd2.info index 0eb23452df..390e31595b 100644 --- a/network/lighttpd2/lighttpd2.info +++ b/network/lighttpd2/lighttpd2.info @@ -1,8 +1,8 @@ PRGNAM="lighttpd2" -VERSION="20150125_6b22f2f" +VERSION="20150810_d2c6a28" HOMEPAGE="http://www.lighttpd.net/" -DOWNLOAD="http://ponce.cc/slackware/sources/repo/lighttpd2-20150125_6b22f2f.tar.xz" -MD5SUM="d10e9d2c419f5e62458fb31549948727" +DOWNLOAD="http://ponce.cc/slackware/sources/repo/lighttpd2-20150810_d2c6a28.tar.xz" +MD5SUM="722b4e11230381c1fb4c89ea66dd2eed" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="libev lua ragel" diff --git a/network/ndiswrapper-kernel/kernel-3.14.patch b/network/ndiswrapper-kernel/kernel-3.14.patch new file mode 100644 index 0000000000..cc40e5c87c --- /dev/null +++ b/network/ndiswrapper-kernel/kernel-3.14.patch @@ -0,0 +1,53 @@ +Description: Kernel 3.14 changes + +This is a diff consisting of upstream revisions 3199, 3201, 3203. + +* Use prandom_seed() instead of net_srandom() on Linux 3.8+ +net_srandom() is going away. + +* Avoid preempt_enable_no_resched(), it's no longer available for modules +Use preempt_enable() instead. This makes nt_spin_unlock_irqrestore() +fully complementary to nt_spin_lock_irqsave(). + +* Define reinit_completion() based on the kernel version +Checking for INIT_COMPLETION was a temporary hack needed before Linux +3.13-rc1 was released. + +The last patch might not be really related to kernel 3.14, but is included +as well. + +Origin: upstream, http://sourceforge.net/p/ndiswrapper/code/ + +--- a/driver/crt.c ++++ b/driver/crt.c +@@ -467,7 +467,7 @@ noregparm int WIN_FUNC(_win_memcmp,3) + noregparm void WIN_FUNC(_win_srand,1) + (UINT seed) + { +- net_srandom(seed); ++ prandom_seed((__force u32)(seed)); + } + + noregparm int WIN_FUNC(rand,0) +--- a/driver/ntoskernel.h ++++ b/driver/ntoskernel.h +@@ -347,7 +347,7 @@ static inline void netif_poll_disable(st + #define netdev_notifier_info_to_dev(x) ((struct net_device *)(x)) + #endif + +-#ifdef INIT_COMPLETION ++#if LINUX_VERSION_CODE < KERNEL_VERSION(3,13,0) + static inline void reinit_completion(struct completion *x) + { + INIT_COMPLETION(*x); +@@ -797,9 +797,8 @@ do { \ + #define nt_spin_unlock_irqrestore(lock, flags) \ + do { \ + nt_spin_unlock(lock); \ +- preempt_enable_no_resched(); \ ++ preempt_enable(); \ + local_irq_restore(flags); \ +- preempt_check_resched(); \ + } while (0) + + static inline ULONG SPAN_PAGES(void *ptr, SIZE_T length) diff --git a/network/ndiswrapper-kernel/kernel-4.0.patch b/network/ndiswrapper-kernel/kernel-4.0.patch new file mode 100644 index 0000000000..97ef75d3ed --- /dev/null +++ b/network/ndiswrapper-kernel/kernel-4.0.patch @@ -0,0 +1,41 @@ +From: Julian Andres Klode <jak@debian.org> +Date: Tue, 12 May 2015 17:11:11 +0200 +Subject: Support kernel 4.0 + +--- + driver/ndis.c | 8 ++++++-- + 1 file changed, 6 insertions(+), 2 deletions(-) + +diff --git a/driver/ndis.c b/driver/ndis.c +index 9ace34b..fafd2e7 100644 +--- a/driver/ndis.c ++++ b/driver/ndis.c +@@ -25,6 +25,10 @@ + #define MAX_ALLOCATED_NDIS_PACKETS TX_RING_SIZE + #define MAX_ALLOCATED_NDIS_BUFFERS TX_RING_SIZE + ++#if LINUX_VERSION_CODE < KERNEL_VERSION(4,0,0) ++#define strncasecmp strnicmp ++#endif ++ + static struct work_struct ndis_work; + static struct nt_list ndis_work_list; + static spinlock_t ndis_work_list_lock; +@@ -438,7 +442,7 @@ static int read_setting(struct nt_list *setting_list, char *keyname, int length, + struct wrap_device_setting *setting; + mutex_lock(&loader_mutex); + nt_list_for_each_entry(setting, setting_list, list) { +- if (strnicmp(keyname, setting->name, length) == 0) { ++ if (strncasecmp(keyname, setting->name, length) == 0) { + TRACE2("setting %s='%s'", keyname, setting->value); + mutex_unlock(&loader_mutex); + *param = ndis_encode_setting(setting, type); +@@ -502,7 +506,7 @@ wstdcall void WIN_FUNC(NdisWriteConfiguration,4) + + mutex_lock(&loader_mutex); + nt_list_for_each_entry(setting, &nmb->wnd->wd->settings, list) { +- if (strnicmp(keyname, setting->name, ansi.length) == 0) { ++ if (strncasecmp(keyname, setting->name, ansi.length) == 0) { + mutex_unlock(&loader_mutex); + if (ndis_decode_setting(setting, param)) + *status = NDIS_STATUS_FAILURE; diff --git a/network/ndiswrapper-kernel/ndiswrapper-kernel.SlackBuild b/network/ndiswrapper-kernel/ndiswrapper-kernel.SlackBuild index 6082814f3f..0f59df1f70 100644 --- a/network/ndiswrapper-kernel/ndiswrapper-kernel.SlackBuild +++ b/network/ndiswrapper-kernel/ndiswrapper-kernel.SlackBuild @@ -78,6 +78,10 @@ find -L . \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ -exec chmod 644 {} \; +# Fixes for recent kernels (thanks to Arch) +patch -p1 < $CWD/kernel-3.14.patch +patch -p1 < $CWD/kernel-4.0.patch + EXTRA_CFLAGS="$SLKCFLAGS" \ make -C driver KVERS=$KERNEL V=1 make install -C driver KVERS=$KERNEL DESTDIR=$PKG diff --git a/network/netsurf/netsurf.SlackBuild b/network/netsurf/netsurf.SlackBuild index 738a5511bf..ed5e52a26a 100644 --- a/network/netsurf/netsurf.SlackBuild +++ b/network/netsurf/netsurf.SlackBuild @@ -54,14 +54,14 @@ else LIBDIRSUFFIX="" fi -set -e +set -e rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT cd $TMP -rm -rf $PRGNAM-$VERSION -tar xvf $CWD/$PRGNAM-all-$VERSION.tar.gz -cd $PRGNAM-all-$VERSION +rm -rf netsurf-all-$VERSION +tar xvf $CWD/netsurf-all-$VERSION.tar.gz +cd netsurf-all-$VERSION chown -R root:root . find -L . \ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 -o -perm 511 \) \ @@ -73,12 +73,17 @@ if [ "${NETSURF_USE_VIDEO:-NO}"=="YES" ]; then patch --verbose -p1 < $CWD/enable-deprecated.diff fi +sed \ + -e 's:_BSD_SOURCE:_DEFAULT_SOURCE:' \ + -e 's:(WARNFLAGS) -Werror:(WARNFLAGS):' \ + -i */Makefile */*/Makefile.target + make install DESTDIR=$PKG PREFIX=/usr \ NETSURF_USE_MOZJS=${NETSURF_USE_MOZJS:-YES} \ NETSURF_USE_WEBP=${NETSURF_USE_WEBP:-NO} \ NETSURF_USE_VIDEO=${NETSURF_USE_VIDEO:-NO} -mkdir $PKG/usr/share/pixmaps +mkdir -p $PKG/usr/share/pixmaps cp netsurf/gtk/res/netsurf.png $PKG/usr/share/pixmaps cp netsurf/gtk/res/netsurf.xpm $PKG/usr/share/pixmaps diff --git a/network/nft/README b/network/nft/README deleted file mode 100644 index 653e9c0d9f..0000000000 --- a/network/nft/README +++ /dev/null @@ -1,16 +0,0 @@ -nft (nftables command-line interface) - -nftables is the project that aims to replace the existing {ip,ip6,arp,eb}tables -framework. Basically, this project provides a new packet filtering framework, a -new userspace utility and also a compatibility layer for {ip,ip6}tables. -nftables is built upon the building blocks of the Netfilter infrastructure such -as the existing hooks, the connection tracking system, the userspace queueing -component and the logging subsystem. - -In order to use nft, you need a Linux kernel >= 3.14 with nftables configured; -however at least one feature of nft 0.5 requires >= 4.2. - -There is a comprehensive HOWTO for nftables at -http://wiki.nftables.org/wiki-nftables/index.php/Main_Page - -nftables is currently under development, so for experimenters only! diff --git a/network/nft/doinst.sh b/network/nft/doinst.sh deleted file mode 100644 index 606a6d8d20..0000000000 --- a/network/nft/doinst.sh +++ /dev/null @@ -1,21 +0,0 @@ -config() { - NEW="$1" - OLD="$(dirname $NEW)/$(basename $NEW .new)" - # If there's no config file by that name, mv it over: - if [ ! -r $OLD ]; then - mv $NEW $OLD - elif [ "$(cat $OLD | md5sum)" = "$(cat $NEW | md5sum)" ]; then - # toss the redundant copy - rm $NEW - fi - # Otherwise, we leave the .new copy for the admin to consider... -} - -config etc/nftables/bridge-filter.new -config etc/nftables/ipv4-filter.new -config etc/nftables/ipv4-mangle.new -config etc/nftables/ipv6-nat.new -config etc/nftables/ipv6-mangle.new -config etc/nftables/ipv4-nat.new -config etc/nftables/ipv6-filter.new -config etc/nftables/inet-filter.new diff --git a/network/nft/nft.SlackBuild b/network/nft/nft.SlackBuild deleted file mode 100644 index 7da9ef1c67..0000000000 --- a/network/nft/nft.SlackBuild +++ /dev/null @@ -1,114 +0,0 @@ -#!/bin/sh - -# Slackware build script for nft - -# Copyright 2014,2015 Duncan Roe Melbourne, Australia -# All rights reserved. -# -# Redistribution and use of this script, with or without modification, is -# permitted provided that the following conditions are met: -# -# 1. Redistributions of this script must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# -# THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED -# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO -# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, -# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; -# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, -# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR -# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF -# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -PRGNAM=nft -PKGNAM=nftables -VERSION=${VERSION:-0.5} -BUILD=${BUILD:-1} -TAG=${TAG:-_SBo} - -if [ -z "$ARCH" ]; then - case "$( uname -m )" in - i?86) ARCH=i486 ;; - arm*) ARCH=arm ;; - *) ARCH=$( uname -m ) ;; - esac -fi - -CWD=$(pwd) -TMP=${TMP:-/tmp/SBo} -PKG=$TMP/package-$PRGNAM -OUTPUT=${OUTPUT:-/tmp} - -DOCUMENTATION="COPYING INSTALL TODO" -if [ "$ARCH" = "i486" ]; then - SLKCFLAGS="-O2 -march=i486 -mtune=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "i686" ]; then - SLKCFLAGS="-O2 -march=i686 -mtune=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "x86_64" ]; then - SLKCFLAGS="-O2 -fPIC" - LIBDIRSUFFIX="64" -else - SLKCFLAGS="-O2" - LIBDIRSUFFIX="" -fi - -set -e - -rm -rf $PKG -mkdir -p $TMP $PKG $OUTPUT -cd $TMP -rm -rf $PKGNAM-$VERSION -tar xvf $CWD/$PKGNAM-$VERSION.tar.bz2 -cd $PKGNAM-$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 640 -o -perm 600 -o -perm 444 \ - -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; - -LDFLAGS="-lncurses" \ -CFLAGS="$SLKCFLAGS" \ -CXXFLAGS="$SLKCFLAGS" \ -./configure \ - --prefix=/usr \ - --libdir=/usr/lib${LIBDIRSUFFIX} \ - --sysconfdir=/etc \ - --localstatedir=/var \ - --mandir=/usr/man \ - --docdir=/usr/doc/$PRGNAM-$VERSION \ - --disable-debug \ - --build=$ARCH-slackware-linux - -make -make install DESTDIR=$PKG - -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 - -find $PKG/usr/man -type f -exec gzip -9 {} \; - -mv $PKG/etc/nftables/bridge-filter $PKG/etc/nftables/bridge-filter.new -mv $PKG/etc/nftables/ipv4-filter $PKG/etc/nftables/ipv4-filter.new -mv $PKG/etc/nftables/ipv4-mangle $PKG/etc/nftables/ipv4-mangle.new -mv $PKG/etc/nftables/ipv6-nat $PKG/etc/nftables/ipv6-nat.new -mv $PKG/etc/nftables/ipv6-mangle $PKG/etc/nftables/ipv6-mangle.new -mv $PKG/etc/nftables/ipv4-nat $PKG/etc/nftables/ipv4-nat.new -mv $PKG/etc/nftables/ipv6-filter $PKG/etc/nftables/ipv6-filter.new -mv $PKG/etc/nftables/inet-filter $PKG/etc/nftables/inet-filter.new - -DOCSDIR=$PKG/usr/doc/$PRGNAM-$VERSION -mkdir -p $DOCSDIR -cp -a $DOCUMENTATION $DOCSDIR -cat $CWD/$PRGNAM.SlackBuild > $DOCSDIR/$PRGNAM.SlackBuild - -mkdir -p $PKG/install -cat $CWD/slack-desc > $PKG/install/slack-desc -cat $CWD/doinst.sh > $PKG/install/doinst.sh - -cd $PKG -/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz} diff --git a/network/nft/nft.info b/network/nft/nft.info deleted file mode 100644 index 6636469aea..0000000000 --- a/network/nft/nft.info +++ /dev/null @@ -1,10 +0,0 @@ -PRGNAM="nft" -VERSION="0.5" -HOMEPAGE="http://www.netfilter.org/projects/nftables/" -DOWNLOAD="http://www.netfilter.org/projects/nftables/files/nftables-0.5.tar.bz2" -MD5SUM="94bfe1c54bcb9f6ed974835f2fca8069" -DOWNLOAD_x86_64="" -MD5SUM_x86_64="" -REQUIRES="libnftnl" -MAINTAINER="Duncan Roe" -EMAIL="duncan_roe@acslink.net.au" diff --git a/network/nft/slack-desc b/network/nft/slack-desc deleted file mode 100644 index d1bf7dfe40..0000000000 --- a/network/nft/slack-desc +++ /dev/null @@ -1,19 +0,0 @@ -# HOW TO EDIT THIS FILE: -# The "handy ruler" below makes it easier to edit a package description. -# Line up the first '|' above the ':' following the base package name, and -# the '|' on the right side marks the last column you can put a character in. -# You must make exactly 11 lines for the formatting to be correct. It's also -# customary to leave one space after the ':' except on otherwise blank lines. - - |-----handy-ruler------------------------------------------------------| -nft: nft (nftables command-line interface) -nft: -nft: nftables is the project that aims to replace the existing -nft: {ip,ip6,arp,eb}tables framework. Basically, this project provides a -nft: new packet filtering framework, a new userspace utility and also a -nft: compatibility layer for {ip,ip6}tables. -nft: -nft: nftables is currently under development, so for experimenters only! -nft: -nft: Homepage: http://www.netfilter.org/projects/nft/ -nft: diff --git a/network/redir/README b/network/redir/README new file mode 100644 index 0000000000..21a66f706f --- /dev/null +++ b/network/redir/README @@ -0,0 +1,3 @@ +redir is all you need to redirect traffic across firewalls. +The functionality of inetd/tcpd and "redir" will allow you to +do everything you need without screwy telnet/ftp etc gateways. diff --git a/network/redir/patches/01_fix_max_bandwidth_docs.dpatch b/network/redir/patches/01_fix_max_bandwidth_docs.dpatch new file mode 100644 index 0000000000..1ff9a7e6d5 --- /dev/null +++ b/network/redir/patches/01_fix_max_bandwidth_docs.dpatch @@ -0,0 +1,61 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 01_fix_max_bandwidth_docs.dpatch by Daniel Kahn Gillmor <dkg@fifthhorseman.net> +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: Fix docs and --help to show --max_bandwidth instead of --maxbandwidth + +@DPATCH@ +diff -urNad redir-2.2.1~/redir.c redir-2.2.1/redir.c +--- redir-2.2.1~/redir.c 1999-12-26 15:50:06.000000000 -0500 ++++ redir-2.2.1/redir.c 2005-10-22 21:21:56.849499952 -0400 +@@ -233,7 +233,7 @@ + #ifndef NO_SHAPER + /* options for bandwidth */ + fprintf(stderr, "\t\t--bufsize=<octets>\tsize of the buffer\n"); +- fprintf(stderr, "\t\t--maxbandwidth=<bit-per-sec>\tlimit the bandwidth\n"); ++ fprintf(stderr, "\t\t--max_bandwidth=<bit-per-sec>\tlimit the bandwidth\n"); + fprintf(stderr, "\t\t--random_wait=<millisec>\twait before each packet\n"); + fprintf(stderr, "\t\t--wait_in_out=<flag>\t1 wait for in, 2 out, 3 in&out\n"); + /* end options for bandwidth */ +diff -urNad redir-2.2.1~/redir.man redir-2.2.1/redir.man +--- redir-2.2.1~/redir.man 1999-12-26 15:52:24.000000000 -0500 ++++ redir-2.2.1/redir.man 2005-10-22 21:22:28.882630176 -0400 +@@ -18,7 +18,7 @@ + .I --lport=port + .I --cport=port + .RB [ \--bufsize=n ] +-.RB [ \--maxbandwidth=n ] ++.RB [ \--max_bandwidth=n ] + .RB [ \--random_wait=n ] + .RB [ \--wait_in_out=n ] + .ll -8 +@@ -35,7 +35,7 @@ + .RB [ \--connect=host:port ] + .I --cport=port + .RB [ \--bufsize=n ] +-.RB [ \--maxbandwidth=n ] ++.RB [ \--max_bandwidth=n ] + .RB [ \--random_wait=n ] + .RB [ \--wait_in_out=n ] + .ll -8 +@@ -102,9 +102,9 @@ + .TP + .B \--bufsize n + Set the bufsize (defaut 4096) in bytes. Can be used combined with +---maxbandwidth or --random_wait to simulate a slow connection. ++--max_bandwidth or --random_wait to simulate a slow connection. + .TP +-.B \--maxbandwidth n ++.B \--max_bandwidth n + Reduce the bandwidth to be no more than n bits/sec. The algorithme is + basic, the goal is to simulate a slow connection, so there is no pic + acceptance. +@@ -115,7 +115,7 @@ + than the bufsize (see also --bufsize). + .TP + .B \--wait_in_out n +-Apply --maxbandwidth and --random_wait for input if n=1, output if n=2 and ++Apply --max_bandwidth and --random_wait for input if n=1, output if n=2 and + both if n=3. + .SH "SEE ALSO" + inetd(1) diff --git a/network/redir/patches/02_use_ntohs.dpatch b/network/redir/patches/02_use_ntohs.dpatch new file mode 100644 index 0000000000..58622b0ddf --- /dev/null +++ b/network/redir/patches/02_use_ntohs.dpatch @@ -0,0 +1,50 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 02_use_ntohs.dpatch by Daniel Kahn Gillmor <dkg@fifthhorseman.net> +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: use ntohs() to generate comprehensible debug()s and syslog()s. + +@DPATCH@ +diff -urNad redir-2.2.1~/redir.c redir-2.2.1/redir.c +--- redir-2.2.1~/redir.c 1999-12-26 15:50:06.000000000 -0500 ++++ redir-2.2.1/redir.c 2005-10-22 21:29:55.491735272 -0400 +@@ -745,7 +745,7 @@ + } + + debug1("peer IP is %s\n", inet_ntoa(client.sin_addr)); +- debug1("peer socket is %d\n", client.sin_port); ++ debug1("peer socket is %d\n", ntohs(client.sin_port)); + + /* + * Double fork here so we don't have to wait later +@@ -871,8 +871,8 @@ + strcpy(tmp2, inet_ntoa(target->sin_addr)); + + syslog(LOG_NOTICE, "connecting %s/%d to %s/%d", +- tmp1, client.sin_port, +- tmp2, target->sin_port); ++ tmp1, ntohs(client.sin_port), ++ tmp2, ntohs(target->sin_port)); + } + + /* do proxy stuff */ +@@ -1066,7 +1066,7 @@ + + if (!getpeername(0, (struct sockaddr *) &client, &client_size)) { + debug1("peer IP is %s\n", inet_ntoa(client.sin_addr)); +- debug1("peer socket is %d\n", client.sin_port); ++ debug1("peer socket is %d\n", ntohs(client.sin_port)); + } + if ((targetsock = socket(AF_INET, SOCK_STREAM, 0)) < 0) { + perror("target: socket"); +@@ -1109,8 +1109,8 @@ + + if (dosyslog) { + syslog(LOG_NOTICE, "connecting %s/%d to %s/%d", +- inet_ntoa(client.sin_addr), client.sin_port, +- target_ip, target.sin_port); ++ inet_ntoa(client.sin_addr), ntohs(client.sin_port), ++ target_ip, ntohs(target.sin_port)); + } + + /* Just start copying - one side of the loop is stdin - 0 */ diff --git a/network/redir/patches/03_fix_tcp_wrappers.dpatch b/network/redir/patches/03_fix_tcp_wrappers.dpatch new file mode 100644 index 0000000000..8709432ea2 --- /dev/null +++ b/network/redir/patches/03_fix_tcp_wrappers.dpatch @@ -0,0 +1,32 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 03_fix_tcp_wrappers.dpatch by Daniel Kahn Gillmor <dkg@fifthhorseman.net> +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: fix calls to tcp wrappers + +@DPATCH@ +diff -urNad redir-2.2.1~/redir.c redir-2.2.1/redir.c +--- redir-2.2.1~/redir.c 2005-10-22 22:10:11.439455392 -0400 ++++ redir-2.2.1/redir.c 2005-10-22 22:10:51.625346208 -0400 +@@ -802,8 +802,8 @@ + #ifdef USE_TCP_WRAPPERS + request_init(&request, RQ_DAEMON, ident, RQ_FILE, clisock, 0); + sock_host(&request); +- sock_hostname(&request); +- sock_hostaddr(&request); ++ sock_hostname(request.client); ++ sock_hostaddr(request.client); + + if (!hosts_access(&request)) { + refuse(&request); +@@ -1057,8 +1057,8 @@ + #ifdef USE_TCP_WRAPPERS + request_init(&request, RQ_DAEMON, ident, RQ_FILE, 0, 0); + sock_host(&request); +- sock_hostname(&request); +- sock_hostaddr(&request); ++ sock_hostname(request.client); ++ sock_hostaddr(request.client); + + if (!hosts_access(&request)) + refuse(&request); diff --git a/network/redir/patches/04_fix_timeouts.dpatch b/network/redir/patches/04_fix_timeouts.dpatch new file mode 100644 index 0000000000..87c1984517 --- /dev/null +++ b/network/redir/patches/04_fix_timeouts.dpatch @@ -0,0 +1,45 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 04_fix_timeouts.dpatch by Daniel Kahn Gillmor <dkg@fifthhorseman.net> +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: Apply a close approximation of Robert de Bath's patch for bug #142382 + +@DPATCH@ +diff -urNad redir-2.2.1~/redir.c redir-2.2.1/redir.c +--- redir-2.2.1~/redir.c 2005-10-22 22:44:39.504061784 -0400 ++++ redir-2.2.1/redir.c 2005-10-22 22:47:14.746461352 -0400 +@@ -598,10 +598,6 @@ + /* Record start time */ + start_time = (unsigned int) time(NULL); + +- /* Set up timeout */ +- timeout.tv_sec = timeout_secs; +- timeout.tv_usec = 0; +- + /* file descriptor bits */ + FD_ZERO(&iofds); + FD_SET(insock, &iofds); +@@ -618,14 +614,21 @@ + while(1) { + (void) memcpy(&c_iofds, &iofds, sizeof(iofds)); + ++ /* Set up timeout, Linux returns seconds left in this structure ++ * so we have to reset it before each select(). */ ++ timeout.tv_sec = timeout_secs; ++ timeout.tv_usec = 0; ++ + + if (select(max_fd + 1, + &c_iofds, + (fd_set *)0, + (fd_set *)0, + (timeout_secs ? &timeout : NULL)) <= 0) { +- /* syslog(LLEV,"connection timeout: %d sec",timeout.tv_sec);*/ +- break; ++ if (dosyslog) { ++ syslog(LOG_NOTICE,"connection timeout: %d sec",timeout_secs); ++ } ++ break; + } + + if(FD_ISSET(insock, &c_iofds)) { diff --git a/network/redir/patches/05_pedantic.dpatch b/network/redir/patches/05_pedantic.dpatch new file mode 100644 index 0000000000..ff7b1a9fbf --- /dev/null +++ b/network/redir/patches/05_pedantic.dpatch @@ -0,0 +1,183 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 05_pedantic.dpatch by Daniel Kahn Gillmor <dkg@fifthhorseman.net> +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: changes to make clean up compilation + +@DPATCH@ +diff -urNad redir-2.2.1~/Makefile redir-2.2.1/Makefile +--- redir-2.2.1~/Makefile 2005-10-22 23:11:41.000000000 -0400 ++++ redir-2.2.1/Makefile 2005-10-22 23:11:48.818368360 -0400 +@@ -32,7 +32,7 @@ + # if your system lacks getopt_long, remove the comment from this line + OBJS = redir.o $(GETOPT_OBJS) + +-CFLAGS = -O2 -Wall $(STR_CFLAGS) $(WRAP_CFLAGS) $(EXTRA_CFLAGS) ++CFLAGS = -O2 -Wall --pedantic $(STR_CFLAGS) $(WRAP_CFLAGS) $(EXTRA_CFLAGS) + LDFLAGS = -s + + # solaris, and others, may also need these libraries to link +diff -urNad redir-2.2.1~/redir.c redir-2.2.1/redir.c +--- redir-2.2.1~/redir.c 2005-10-22 23:11:48.282449832 -0400 ++++ redir-2.2.1/redir.c 2005-10-22 23:12:23.201141384 -0400 +@@ -73,6 +73,7 @@ + #include <sys/types.h> + #include <sys/socket.h> + #include <sys/time.h> ++#include <time.h> + #include <sys/wait.h> + #include <netinet/in.h> + #include <arpa/inet.h> +@@ -460,7 +461,7 @@ + int lport, rport; + int remip[4]; + int localsock; +- int socksize = sizeof(struct sockaddr_in); ++ size_t socksize = sizeof(struct sockaddr_in); + + struct sockaddr_in newsession; + struct sockaddr_in sockname; +@@ -509,7 +510,7 @@ + if(getsockname(localsock, (struct sockaddr *)&sockname, &socksize) < 0) { + perror("getsockname"); + if (dosyslog) +- syslog(LOG_ERR, "getsockname failed: %m"); ++ syslog(LOG_ERR, "getsockname failed: %s",strerror(errno)); + exit(1); + } + +@@ -562,7 +563,7 @@ + switch(fork()) + { + case -1: /* Error */ +- syslog(LOG_ERR, "Couldn't fork: %m"); ++ syslog(LOG_ERR, "Couldn't fork: %s",strerror(errno)); + _exit(1); + case 0: /* Child */ + { +@@ -723,7 +724,7 @@ + int clisock; + int targetsock; + struct sockaddr_in client; +- int clientlen = sizeof(client); ++ size_t clientlen = sizeof(client); + int accept_errno; + + debug("top of accept loop\n"); +@@ -734,7 +735,7 @@ + perror("server: accept"); + + if (dosyslog) +- syslog(LOG_ERR, "accept failed: %m"); ++ syslog(LOG_ERR, "accept failed: %s",strerror(errno)); + + /* determine if this error is fatal */ + switch(accept_errno) { +@@ -768,7 +769,7 @@ + perror("(server) fork"); + + if (dosyslog) +- syslog(LOG_ERR, "(server) fork failed: %m"); ++ syslog(LOG_ERR, "(server) fork failed: %s",strerror(errno)); + + _exit(1); + case 0: /* Child */ +@@ -795,7 +796,7 @@ + perror("(child) fork"); + + if (dosyslog) +- syslog(LOG_ERR, "(child) fork failed: %m"); ++ syslog(LOG_ERR, "(child) fork failed: %s",strerror(errno)); + + _exit(1); + case 0: /* Child */ +@@ -826,7 +827,7 @@ + perror("target: socket"); + + if (dosyslog) +- syslog(LOG_ERR, "socket failed: %m"); ++ syslog(LOG_ERR, "socket failed: %s",strerror(errno)); + + _exit(1); + } +@@ -850,7 +851,7 @@ + only be different if the input value is 0 (let the system pick a + port) */ + if (dosyslog) +- syslog(LOG_ERR, "bind failed: %m"); ++ syslog(LOG_ERR, "bind failed: %s",strerror(errno)); + + _exit(1); + } +@@ -862,7 +863,7 @@ + perror("target: connect"); + + if (dosyslog) +- syslog(LOG_ERR, "bind failed: %m"); ++ syslog(LOG_ERR, "bind failed: %s",strerror(errno)); + + _exit(1); + } +@@ -923,7 +924,7 @@ + perror("server: socket"); + + if (dosyslog) +- syslog(LOG_ERR, "socket failed: %m"); ++ syslog(LOG_ERR, "socket failed: %s",strerror(errno)); + + exit(1); + } +@@ -962,7 +963,7 @@ + perror("server: bind"); + + if (dosyslog) +- syslog(LOG_ERR, "bind failed: %m"); ++ syslog(LOG_ERR, "bind failed: %s",strerror(errno)); + + exit(1); + } +@@ -980,7 +981,7 @@ + perror("server: listen"); + + if (dosyslog) +- syslog(LOG_ERR, "listen failed: %m"); ++ syslog(LOG_ERR, "listen failed: %s",strerror(errno)); + + exit(1); + } +@@ -1059,7 +1060,7 @@ + if (inetd) { + int targetsock; + struct sockaddr_in client; +- int client_size = sizeof(client); ++ size_t client_size = sizeof(client); + + #ifdef USE_TCP_WRAPPERS + request_init(&request, RQ_DAEMON, ident, RQ_FILE, 0, 0); +@@ -1079,7 +1080,7 @@ + perror("target: socket"); + + if (dosyslog) +- syslog(LOG_ERR, "targetsock failed: %m"); ++ syslog(LOG_ERR, "targetsock failed: %s",strerror(errno)); + + exit(1); + } +@@ -1097,7 +1098,7 @@ + perror("bind_addr: cannot bind to forcerd outgoing addr"); + + if (dosyslog) +- syslog(LOG_ERR, "bind failed: %m"); ++ syslog(LOG_ERR, "bind failed: %s",strerror(errno)); + + exit(1); + } +@@ -1109,7 +1110,7 @@ + perror("target: connect"); + + if (dosyslog) +- syslog(LOG_ERR, "connect failed: %m"); ++ syslog(LOG_ERR, "connect failed: %s",strerror(errno)); + + exit(1); + } diff --git a/network/redir/patches/06_fix_shaper_buffer.dpatch b/network/redir/patches/06_fix_shaper_buffer.dpatch new file mode 100644 index 0000000000..47c1e132ea --- /dev/null +++ b/network/redir/patches/06_fix_shaper_buffer.dpatch @@ -0,0 +1,63 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 06_fix_shaper_buffer.dpatch by Daniel Kahn Gillmor <dkg@fifthhorseman.net> +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: properly allocate copyloop buffer + +@DPATCH@ +diff -urNad redir-2.2.1~/redir.c redir-2.2.1/redir.c +--- redir-2.2.1~/redir.c 2005-10-22 23:20:05.235901424 -0400 ++++ redir-2.2.1/redir.c 2005-10-22 23:22:20.198384008 -0400 +@@ -260,7 +260,7 @@ + #endif + int *transproxy, + #ifndef NO_SHAPER +- unsigned int * bufsize, ++ unsigned int * bufsizeout, + int * max_bandwidth, + int * random_wait, + int * wait_in_out, +@@ -367,7 +367,7 @@ + + #ifndef NO_SHAPER + case 'z': +- *bufsize = (unsigned int)atol(optarg); ++ *bufsizeout = (unsigned int)atol(optarg); + break; + + case 'm': +@@ -594,7 +594,7 @@ + unsigned long bytes_in = 0; + unsigned long bytes_out = 0; + unsigned int start_time, end_time; +- char buf[bufsize]; ++ char* buf = malloc(bufsize); + + /* Record start time */ + start_time = (unsigned int) time(NULL); +@@ -637,7 +637,7 @@ + } + + if(FD_ISSET(insock, &c_iofds)) { +- if((bytes = read(insock, buf, sizeof(buf))) <= 0) ++ if((bytes = read(insock, buf, bufsize)) <= 0) + break; + #ifndef NO_FTP + if (ftp & FTP_PORT) +@@ -652,7 +652,7 @@ + bytes_out += bytes; + } + if(FD_ISSET(outsock, &c_iofds)) { +- if((bytes = read(outsock, buf, sizeof(buf))) <= 0) ++ if((bytes = read(outsock, buf, bufsize)) <= 0) + break; + /* if we're correcting for PASV on ftp redirections, then + fix buf and bytes to have the new address, among other +@@ -689,6 +689,7 @@ + syslog(LOG_NOTICE, "disconnect %d secs, %ld in %ld out", + (end_time - start_time), bytes_in, bytes_out); + } ++ free(buf); + return; + } + diff --git a/network/redir/patches/07_cosmetics.dpatch b/network/redir/patches/07_cosmetics.dpatch new file mode 100644 index 0000000000..a692c73815 --- /dev/null +++ b/network/redir/patches/07_cosmetics.dpatch @@ -0,0 +1,28 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 07_cosmetics.dpatch by Daniel Kahn Gillmor <dkg@fifthhorseman.net> +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: Cosmetic fixes which could be applied upstream + +@DPATCH@ +diff -urNad redir-2.2.1~/redir.man redir-2.2.1/redir.man +--- redir-2.2.1~/redir.man 2005-10-22 21:41:51.284918168 -0400 ++++ redir-2.2.1/redir.man 2005-10-22 21:42:42.115190792 -0400 +@@ -73,7 +73,7 @@ + Specify program name to be used for TCP wrapper checks and syslog logging. + .TP + .B --timeout +-Timeout and close the connection after n seconds on inactivity. ++Timeout and close the connection after n seconds of inactivity. + .TP + .B \--syslog + Log information to syslog. +@@ -90,7 +90,7 @@ + undesirable. + .TP + .B \--transproxy +-On a linux system with transparany proxying enables, causes redir to ++On a linux system with transparent proxying enabled, causes redir to + make connections appear as if they had come from their true origin. + (see transproxy.txt in the source archive) + .TP diff --git a/network/redir/patches/08_add_wrappers.dpatch b/network/redir/patches/08_add_wrappers.dpatch new file mode 100644 index 0000000000..57e4e7a875 --- /dev/null +++ b/network/redir/patches/08_add_wrappers.dpatch @@ -0,0 +1,22 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 08_add_wrappers.dpatch by Daniel Kahn Gillmor <dkg@fifthhorseman.net> +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: Enabling TCP wrapper support + +@DPATCH@ + +--- redir-2.2.1.orig/Makefile ++++ redir-2.2.1/Makefile +@@ -9,8 +9,8 @@ + # if you would like support for TCP wrappers (and have libwrap.a + # installed), remove these comments. + +-WRAP_CFLAGS = # -DUSE_TCP_WRAPPERS +-WRAP_LIBS = # -lwrap ++WRAP_CFLAGS = -DUSE_TCP_WRAPPERS ++WRAP_LIBS = -lwrap + + # if your system needs any additional libraries (solaris, for example, + # needs the ones commented out below), edit this line. + diff --git a/network/redir/patches/09_add_linux_software_map.dpatch b/network/redir/patches/09_add_linux_software_map.dpatch new file mode 100644 index 0000000000..0274957ca7 --- /dev/null +++ b/network/redir/patches/09_add_linux_software_map.dpatch @@ -0,0 +1,23 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 09_add_linux_software_map.dpatch by Daniel Kahn Gillmor <dkg@fifthhorseman.net> +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: Add linux software map file + +@DPATCH@ + +--- redir-2.2.1.orig/redir-2.2.lsm ++++ redir-2.2.1/redir-2.2.lsm +@@ -0,0 +1,11 @@ ++Begin3 ++Title: redir ++Version: 2.2 ++Entered-date: 15DEC1999 ++Description: TCP Port redirector (for firewalls etc). ++Keywords: tcp port redirector bouncer proxy ++Author: sammy@oh.verio.com ++Primary-site: sunsite.unc.edu /pub/Linux/system/Network/daemons ++ 39936 redir-2.2.tar.gz ++Copying-policy: GPL ++End + diff --git a/network/redir/patches/15_deb_cosmetics.dpatch b/network/redir/patches/15_deb_cosmetics.dpatch new file mode 100644 index 0000000000..840d800125 --- /dev/null +++ b/network/redir/patches/15_deb_cosmetics.dpatch @@ -0,0 +1,19 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 15_deb_cosmetics.dpatch by Daniel Kahn Gillmor <dkg@fifthhorseman.net> +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: Cosmetic changes applicable only to debian + +@DPATCH@ +diff -urNad redir-2.2.1~/redir.man redir-2.2.1/redir.man +--- redir-2.2.1~/redir.man 2005-10-22 21:47:44.067287096 -0400 ++++ redir-2.2.1/redir.man 2005-10-22 21:48:34.218662928 -0400 +@@ -92,7 +92,7 @@ + .B \--transproxy + On a linux system with transparent proxying enabled, causes redir to + make connections appear as if they had come from their true origin. +-(see transproxy.txt in the source archive) ++(see /usr/share/doc/redir/transproxy.txt) + .TP + .B \--connect + Redirects connections through an HTTP proxy which supports the CONNECT diff --git a/network/redir/patches/20_do_not_strip.dpatch b/network/redir/patches/20_do_not_strip.dpatch new file mode 100644 index 0000000000..c47e13e1b0 --- /dev/null +++ b/network/redir/patches/20_do_not_strip.dpatch @@ -0,0 +1,19 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 20_do_not_strip.dpatch by Daniel Kahn Gillmor <dkg@fifthhorseman.net> +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: don't strip by default. let dh_strip take care of it. + +@DPATCH@ +diff -urNad redir-2.2.1~/Makefile redir-2.2.1/Makefile +--- redir-2.2.1~/Makefile 2007-08-15 14:53:41.908911693 -0400 ++++ redir-2.2.1/Makefile 2007-08-15 14:53:59.409909018 -0400 +@@ -33,7 +33,7 @@ + OBJS = redir.o $(GETOPT_OBJS) + + CFLAGS = -O2 -Wall --pedantic $(STR_CFLAGS) $(WRAP_CFLAGS) $(EXTRA_CFLAGS) +-LDFLAGS = -s ++LDFLAGS = # -s + + # solaris, and others, may also need these libraries to link + # also edit here if you're using the TCP wrappers code diff --git a/network/redir/patches/25_fix_setsockopt.dpatch b/network/redir/patches/25_fix_setsockopt.dpatch new file mode 100644 index 0000000000..0623198f72 --- /dev/null +++ b/network/redir/patches/25_fix_setsockopt.dpatch @@ -0,0 +1,62 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 25_fix_setsockopt.dpatch by Daniel Kahn Gillmor <dkg@fifthhorseman.net> +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: Ensure that the server socket has SO_REUSEADDR and SO_LINGER set properly. + +@DPATCH@ +diff -urNad redir~/redir.c redir/redir.c +--- redir~/redir.c 2009-03-03 17:35:12.022427586 -0500 ++++ redir/redir.c 2009-03-03 17:45:28.998426896 -0500 +@@ -90,8 +90,8 @@ + /* let's set up some globals... */ + int dodebug = 0; + int dosyslog = 0; +-unsigned char reuse_addr = 1; +-unsigned char linger_opt = 0; ++int reuse_addr = 1; /* allow address reuse */ ++struct linger linger_opt = { 0, 0}; /* do not linger */ + char * bind_addr = NULL; + struct sockaddr_in addr_out; + int timeout = 0; +@@ -906,6 +906,7 @@ + + int servsock; + struct sockaddr_in server; ++ int ret; + + /* + * Get a socket to work with. This socket will +@@ -944,8 +945,30 @@ + server.sin_addr.s_addr = htonl(inet_addr("0.0.0.0")); + } + +- setsockopt(servsock, SOL_SOCKET, SO_REUSEADDR, &reuse_addr, sizeof(reuse_addr)); +- setsockopt(servsock, SOL_SOCKET, SO_LINGER, &linger_opt, sizeof(SO_LINGER)); ++ ret = setsockopt(servsock, SOL_SOCKET, SO_REUSEADDR, &reuse_addr, sizeof(reuse_addr)); ++ if (ret != 0) { ++ if(fail) { ++ return -1; ++ } ++ else { ++ perror("server: setsockopt (SO_REUSEADDR)"); ++ if (dosyslog) ++ syslog(LOG_ERR, "setsockopt failed with SO_REUSEADDR: %s",strerror(errno)); ++ exit(1); ++ } ++ } ++ ret = setsockopt(servsock, SOL_SOCKET, SO_LINGER, &linger_opt, sizeof(linger_opt)); ++ if (ret != 0) { ++ if(fail) { ++ return -1; ++ } ++ else { ++ perror("server: setsockopt (SO_LINGER)"); ++ if (dosyslog) ++ syslog(LOG_ERR, "setsockopt failed with SO_LINGER: %s",strerror(errno)); ++ exit(1); ++ } ++ } + + /* + * Try to bind the address to the socket. diff --git a/network/redir/patches/30_fix_manpage.dpatch b/network/redir/patches/30_fix_manpage.dpatch new file mode 100644 index 0000000000..3a36bc30ea --- /dev/null +++ b/network/redir/patches/30_fix_manpage.dpatch @@ -0,0 +1,183 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 30_fix_manpage.dpatch by Daniel Kahn Gillmor <dkg@fifthhorseman.net> +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: Clean up questionable formatting in man page. + +@DPATCH@ +diff -urNad redir~/redir.man redir/redir.man +--- redir~/redir.man 2009-03-03 18:55:37.790428922 -0500 ++++ redir/redir.man 2009-03-03 18:58:48.486428715 -0500 +@@ -1,43 +1,42 @@ +-.PU + .TH REDIR 1 local + .SH NAME +-redir \- redirect tcp connections ++redir - redirect tcp connections + .SH SYNOPSIS + .ll +8 + .B redir +-.RB [ \--laddr=incoming.ip.address ] +-.RB [ \--caddr=host ] +-.RB [ \--debug ] +-.RB [ \--syslog +-.RB [ \--name=str ] +-.RB [ \--timeout=n ] +-.RB [ \--bind_addr=my.other.ip.address ] +-.RB [ \--ftp=type ] +-.RB [ \--transproxy ] +-.RB [ \--connect=host:port ] +-.I --lport=port +-.I --cport=port +-.RB [ \--bufsize=n ] +-.RB [ \--max_bandwidth=n ] +-.RB [ \--random_wait=n ] +-.RB [ \--wait_in_out=n ] ++.RB [ \-\-laddr=incoming.ip.address ] ++.RB [ \-\-caddr=host ] ++.RB [ \-\-debug ] ++.RB [ \-\-syslog ] ++.RB [ \-\-name=str ] ++.RB [ \-\-timeout=n ] ++.RB [ \-\-bind_addr=my.other.ip.address ] ++.RB [ \-\-ftp=type ] ++.RB [ \-\-transproxy ] ++.RB [ \-\-connect=host:port ] ++.I \-\-lport=port ++.I \-\-cport=port ++.RB [ \-\-bufsize=n ] ++.RB [ \-\-max_bandwidth=n ] ++.RB [ \-\-random_wait=n ] ++.RB [ \-\-wait_in_out=n ] + .ll -8 + .br + .B redir +-.RB \--inetd +-.RB [ \--caddr=host ] +-.RB [ \--debug ] +-.RB [ \--syslog +-.RB [ \--name=str ] +-.RB [ \--timeout=n ] +-.RB [ \--ftp=type ] +-.RB [ \--transproxy ] +-.RB [ \--connect=host:port ] +-.I --cport=port +-.RB [ \--bufsize=n ] +-.RB [ \--max_bandwidth=n ] +-.RB [ \--random_wait=n ] +-.RB [ \--wait_in_out=n ] ++.RB \-\-inetd ++.RB [ \-\-caddr=host ] ++.RB [ \-\-debug ] ++.RB [ \-\-syslog ] ++.RB [ \-\-name=str ] ++.RB [ \-\-timeout=n ] ++.RB [ \-\-ftp=type ] ++.RB [ \-\-transproxy ] ++.RB [ \-\-connect=host:port ] ++.I \-\-cport=port ++.RB [ \-\-bufsize=n ] ++.RB [ \-\-max_bandwidth=n ] ++.RB [ \-\-random_wait=n ] ++.RB [ \-\-wait_in_out=n ] + .ll -8 + .br + .SH DESCRIPTION +@@ -49,74 +48,73 @@ + Depending on how redir was compiled, not all options may be available. + .SH OPTIONS + .TP +-.B \--lport ++.B \-\-lport + Specifies port to listen for connections on (when not running from inetd) + .TP +-.B \--laddr ++.B \-\-laddr + IP address to bind to when listening for connections (when not + running from inetd) + .TP +-.B \--cport ++.B \-\-cport + Specifies port to connect to. + .TP +-.B \--caddr ++.B \-\-caddr + Specifies remote host to connect to. (localhost if omitted) + .TP +-.B \--inetd ++.B \-\-inetd + Run as a process started from inetd, with the connection passed as stdin + and stdout on startup. + .TP +-.B \--debug ++.B \-\-debug + Write debug output to stderr or syslog. + .TP +-.B \--name ++.B \-\-name + Specify program name to be used for TCP wrapper checks and syslog logging. + .TP +-.B --timeout ++.B \-\-timeout + Timeout and close the connection after n seconds of inactivity. + .TP +-.B \--syslog ++.B \-\-syslog + Log information to syslog. + .TP +-.B \--bind_addr ++.B \-\-bind_addr + Forces redir to pick a specific address/interface to bind to when it listens + for incoming connections. + .TP +-.B \--ftp ++.B \-\-ftp + When using redir for an FTP server, this will cause redir to also + redirect ftp connections. Type should be specified as either "port", + "pasv", or "both", to specify what type of FTP connection to handle. +-Note that --transproxy often makes one or the other (generally port) ++Note that \-\-transproxy often makes one or the other (generally port) + undesirable. + .TP +-.B \--transproxy ++.B \-\-transproxy + On a linux system with transparent proxying enabled, causes redir to + make connections appear as if they had come from their true origin. + (see /usr/share/doc/redir/transproxy.txt) + .TP +-.B \--connect ++.B \-\-connect + Redirects connections through an HTTP proxy which supports the CONNECT +-command. Specify the address and port of the proxy using --caddr and +---cport. --connect requires the hostname and port which the HTTP ++command. Specify the address and port of the proxy using \-\-caddr and ++\-\-cport. \-\-connect requires the hostname and port which the HTTP + proxy will be asked to connect to. + .TP +-.B \--bufsize n ++.B \-\-bufsize n + Set the bufsize (defaut 4096) in bytes. Can be used combined with +---max_bandwidth or --random_wait to simulate a slow connection. ++\-\-max_bandwidth or \-\-random_wait to simulate a slow connection. + .TP +-.B \--max_bandwidth n ++.B \-\-max_bandwidth n + Reduce the bandwidth to be no more than n bits/sec. The algorithme is + basic, the goal is to simulate a slow connection, so there is no pic + acceptance. + .TP +-.B \--random_wait n ++.B \-\-random_wait n + Wait between 0 and 2 x n milliseconds before each "packet". A "packet" is + a bloc of data read in one time by redir. A "packet" size is always less +-than the bufsize (see also --bufsize). ++than the bufsize (see also \-\-bufsize). + .TP +-.B \--wait_in_out n +-Apply --max_bandwidth and --random_wait for input if n=1, output if n=2 and ++.B \-\-wait_in_out n ++Apply \-\-max_bandwidth and \-\-random_wait for input if n=1, output if n=2 and + both if n=3. + .SH "SEE ALSO" + inetd(1) +- diff --git a/network/libnftnl/libnftnl.SlackBuild b/network/redir/redir.SlackBuild index d8be93ab1f..74c1345ac0 100644 --- a/network/libnftnl/libnftnl.SlackBuild +++ b/network/redir/redir.SlackBuild @@ -1,8 +1,8 @@ #!/bin/sh -# Slackware build script for libnftnl +# Slackware build script for redir -# Copyright 2014,2015 Duncan Roe Melbourne, Australia +# Copyright 2013 Matteo Bernardini <ponce@slackbuilds.org>, Pisa, Italy # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -22,8 +22,8 @@ # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -PRGNAM=libnftnl -VERSION=${VERSION:-1.0.5} +PRGNAM=redir +VERSION=${VERSION:-2.2.1} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -40,7 +40,6 @@ TMP=${TMP:-/tmp/SBo} PKG=$TMP/package-$PRGNAM OUTPUT=${OUTPUT:-/tmp} -DOCUMENTATION="COPYING" if [ "$ARCH" = "i486" ]; then SLKCFLAGS="-O2 -march=i486 -mtune=i686" LIBDIRSUFFIX="" @@ -55,40 +54,41 @@ else LIBDIRSUFFIX="" fi +DOCS="CHANGES COPYING README contrib transproxy.txt" + set -e rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT cd $TMP rm -rf $PRGNAM-$VERSION -tar xvf $CWD/$PRGNAM-$VERSION.tar.bz2 +tar xvf $CWD/$PRGNAM-$VERSION.tar.?z* cd $PRGNAM-$VERSION chown -R root:root . -chmod -R a-s,u+w,go+r-w . +find . \ + \( -perm 777 -o -perm 775 -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 {} \; + +for i in $CWD/patches/* ; do patch -p1 < $i ; done + +sed -i "s|^EXTRA_LIBS.*|EXTRA_LIBS = -lnsl|" Makefile CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ -./configure \ - --prefix=/usr \ - --libdir=/usr/lib${LIBDIRSUFFIX} \ - --sysconfdir=/etc \ - --localstatedir=/var \ - --mandir=/usr/man \ - --docdir=/usr/doc/$PRGNAM-$VERSION \ - --build=$ARCH-slackware-linux - make -make install DESTDIR=$PKG +install -D -m 0755 $PRGNAM $PKG/usr/bin/$PRGNAM 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 -# libnftnl doesn't have man pages +mkdir -p $PKG/usr/man/man1 +gzip -9c $PRGNAM.man > $PKG/usr/man/man1/$PRGNAM.1.gz -DOCSDIR=$PKG/usr/doc/$PRGNAM-$VERSION -mkdir -p $DOCSDIR -cp -l $DOCUMENTATION $DOCSDIR -cat $CWD/$PRGNAM.SlackBuild > $DOCSDIR/$PRGNAM.SlackBuild +mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION +cp -a $DOCS $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/network/redir/redir.info b/network/redir/redir.info new file mode 100644 index 0000000000..3280819247 --- /dev/null +++ b/network/redir/redir.info @@ -0,0 +1,10 @@ +PRGNAM="redir" +VERSION="2.2.1" +HOMEPAGE="http://sammy.net/~sammy/hacks/" +DOWNLOAD="http://sammy.net/~sammy/hacks/redir-2.2.1.tar.gz" +MD5SUM="4342fadac30504c86c8db7beefe01995" +DOWNLOAD_x86_64="" +MD5SUM_x86_64="" +REQUIRES="" +MAINTAINER="Matteo Bernardini" +EMAIL="ponce@slackbuilds.org" diff --git a/ruby/ruby2/slack-desc b/network/redir/slack-desc index 5411949ec6..b201e42c75 100644 --- a/ruby/ruby2/slack-desc +++ b/network/redir/slack-desc @@ -6,14 +6,14 @@ # customary to leave one space after the ':' except on otherwise blank lines. |-----handy-ruler------------------------------------------------------| -ruby2: ruby2 (Interpreted object-oriented scripting language) -ruby2: -ruby2: Ruby is an interpreted scripting language for quick and easy -ruby2: object-oriented programming. It has many features to process text -ruby2: files and to do system management tasks (as in Perl). It is simple, -ruby2: straight-forward, and extensible. -ruby2: -ruby2: Visit the Ruby project online at http://www.ruby-lang.org/ -ruby2: -ruby2: -ruby2: +redir: redir (Redirect TCP connections) +redir: +redir: redir is all you need to redirect traffic across firewalls. +redir: The functionality of inetd/tcpd and "redir" will allow you to +redir: do everything you need without screwy telnet/ftp etc gateways. +redir: +redir: homepage: http://sammy.net/~sammy/hacks/ +redir: +redir: +redir: +redir: diff --git a/network/rekonq/rekonq.SlackBuild b/network/rekonq/rekonq.SlackBuild index 1a3c39e769..3fbcbc83b6 100644 --- a/network/rekonq/rekonq.SlackBuild +++ b/network/rekonq/rekonq.SlackBuild @@ -5,7 +5,7 @@ # Written by Branko Grubic <branko.grubic@gmail.com> PRGNAM=rekonq -VERSION=${VERSION:-2.4.0} +VERSION=${VERSION:-2.4.2} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} diff --git a/network/rekonq/rekonq.info b/network/rekonq/rekonq.info index cc17db0790..c6e28d3c90 100644 --- a/network/rekonq/rekonq.info +++ b/network/rekonq/rekonq.info @@ -1,8 +1,8 @@ PRGNAM="rekonq" -VERSION="2.4.0" +VERSION="2.4.2" HOMEPAGE="http://rekonq.kde.org/" -DOWNLOAD="http://sourceforge.net/projects/rekonq/files/2.0/rekonq-2.4.0.tar.xz" -MD5SUM="1cb82ad866681db888daf40485fd4ce2" +DOWNLOAD="http://downloads.sourceforge.net/rekonq/rekonq-2.4.2.tar.xz" +MD5SUM="5d2a5ce7817813f68144203c14419669" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" diff --git a/network/remmina/remmina.SlackBuild b/network/remmina/remmina.SlackBuild index 80f30cabef..c5c0543fbe 100644 --- a/network/remmina/remmina.SlackBuild +++ b/network/remmina/remmina.SlackBuild @@ -88,6 +88,10 @@ sed "s|/lib/remmina|/lib$LIBDIRSUFFIX/remmina|g" -i CMakeLists.txt LIBSSH_INSTDIR=$TMP/$SRCNAM-${TARVERSION#v}/libssh tar xvf $CWD/libssh-0.6.4.tar.gz cd libssh-0.6.4 + +# Fix for the newer gcc, see https://gcc.gnu.org/gcc-5/porting_to.html +sed -i "s|__FUNCTION__|__func__|" include/libssh/{,pki_}priv.h src/auth.c + mkdir build cd build cmake \ diff --git a/network/roger-router/roger-router.SlackBuild b/network/roger-router/roger-router.SlackBuild index 9d87ccfd12..9306c78dad 100644 --- a/network/roger-router/roger-router.SlackBuild +++ b/network/roger-router/roger-router.SlackBuild @@ -81,8 +81,9 @@ find -L . \ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; ./autogen.sh -CXXFLAGS="$SLKCFLAGS" \ -CFLAGS="$SLKCFLAGS" \ + +CFLAGS="$SLKCFLAGS -Wno-error=deprecated-declarations" \ +CXXFLAGS="$SLKCFLAGS -Wno-error=deprecated-declarations" \ ./configure \ --prefix=/usr \ --libdir=/usr/lib${LIBDIRSUFFIX} \ diff --git a/network/rubygem-showterm/rubygem-showterm.SlackBuild b/network/rubygem-showterm/rubygem-showterm.SlackBuild index c664cbce08..dee37f0c0a 100644 --- a/network/rubygem-showterm/rubygem-showterm.SlackBuild +++ b/network/rubygem-showterm/rubygem-showterm.SlackBuild @@ -56,7 +56,7 @@ else LIBDIRSUFFIX="" fi -set -e +set -e rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT @@ -78,8 +78,7 @@ path = sprintf("%s/%s/gems/%s", c["libdir"], c["RUBY_INSTALL_NAME"], c["ruby_version"]) -sys_gemspecs = Dir.glob(path + "/specifications/*").map {|g| gs = Gem::Specification.load(g); gs.name -} +sys_gemspecs = Dir.glob(path + "/specifications/**/*.gemspec").map {|g| gs = Gem::Specification.load(g); gs.name } obj = Gem::Specification.from_yaml($stdin) obj.dependencies.each {|dep| if not(dep.type == :runtime) diff --git a/network/sks-keyserver/sks-keyserver.SlackBuild b/network/sks-keyserver/sks-keyserver.SlackBuild index d40a536eea..6ad1458e18 100644 --- a/network/sks-keyserver/sks-keyserver.SlackBuild +++ b/network/sks-keyserver/sks-keyserver.SlackBuild @@ -108,8 +108,8 @@ find -L . \ cp -v Makefile.local.unused Makefile.local -make dep -make all +make -j1 dep +make -j1 all make install PREFIX=$PKG/usr MANDIR=$PKG/usr/man install -D -m 0644 ${CWD}/rc.sks $PKG/etc/rc.d/rc.sks.new diff --git a/network/smb4k/README b/network/smb4k/README new file mode 100644 index 0000000000..a47fd61932 --- /dev/null +++ b/network/smb4k/README @@ -0,0 +1,3 @@ +Smb4K is an advanced network neighborhood browser for KDE and a frontend +to the programs of the Samba software suite. Its purpose is to provide +a program that's easy to use and has as many features as possible. diff --git a/network/smb4k/doinst.sh b/network/smb4k/doinst.sh new file mode 100644 index 0000000000..53c90287d1 --- /dev/null +++ b/network/smb4k/doinst.sh @@ -0,0 +1,30 @@ +config() { + NEW="$1" + OLD="$(dirname $NEW)/$(basename $NEW .new)" + # If there's no config file by that name, mv it over: + if [ ! -r $OLD ]; then + mv $NEW $OLD + elif [ "$(cat $OLD | md5sum)" = "$(cat $NEW | md5sum)" ]; then + # toss the redundant copy + rm $NEW + fi + # Otherwise, we leave the .new copy for the admin to consider... +} + +config etc/dbus-1/system.d/net.sourceforge.smb4k.mounthelper.conf.new + +if [ -x /usr/bin/update-desktop-database ]; then + /usr/bin/update-desktop-database -q usr/share/applications >/dev/null 2>&1 +fi + +if [ -e usr/share/icons/hicolor/icon-theme.cache ]; then + if [ -x /usr/bin/gtk-update-icon-cache ]; then + /usr/bin/gtk-update-icon-cache usr/share/icons/hicolor >/dev/null 2>&1 + fi +fi + +# Reload messagebus service +if [ -x etc/rc.d/rc.messagebus ]; then + chroot . /etc/rc.d/rc.messagebus reload +fi + diff --git a/graphics/comix/slack-desc b/network/smb4k/slack-desc index d81debbdf7..392f44fb1d 100644 --- a/graphics/comix/slack-desc +++ b/network/smb4k/slack-desc @@ -6,14 +6,14 @@ # customary to leave one space after the ':' except on otherwise blank lines. |-----handy-ruler------------------------------------------------------| -comix: comix (Viewer for archived images) -comix: -comix: Cartoons are, most of the time, archived. -comix: comix opens an archive file and displays images in it, removing -comix: the need to decompress comicbook files. -comix: It reads images in zip, rar, or tar(gzip or bzip2) archives. -comix: It is written in Python and uses GTK+ through the PyGTK bindings. -comix: -comix: Website : http://comix.sourceforge.net/ -comix: -comix: +smb4k: smb4k (A SMB Share Browser) +smb4k: +smb4k: Smb4K is an advanced network neighborhood browser for KDE and a +smb4k: frontend to the programs of the Samba software suite. Its purpose is +smb4k: to provide a program that's easy to use and has as many features as +smb4k: possible. +smb4k: +smb4k: Homepage: http://smb4k.sourceforge.net/ +smb4k: +smb4k: +smb4k: diff --git a/libraries/newt/newt.SlackBuild b/network/smb4k/smb4k.SlackBuild index 3c30ab2e28..7a3b8dff9b 100644 --- a/libraries/newt/newt.SlackBuild +++ b/network/smb4k/smb4k.SlackBuild @@ -1,8 +1,9 @@ #!/bin/sh -# Slackware build script for Newt. +# Slackware build script for smb4k + +# Copyright 2008-2013 Roberto Neri, Palermo, Italy # -# Copyright 2010-2011 Marco Bonetti <sid77@slackware.it> # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -22,8 +23,8 @@ # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -PRGNAM=newt -VERSION=${VERSION:-0.52.16} +PRGNAM=smb4k +VERSION=${VERSION:-1.1.0} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -40,8 +41,6 @@ TMP=${TMP:-/tmp/SBo} PKG=$TMP/package-$PRGNAM OUTPUT=${OUTPUT:-/tmp} -DOCS="CHANGES COPYING" - if [ "$ARCH" = "i486" ]; then SLKCFLAGS="-O2 -march=i486 -mtune=i686" LIBDIRSUFFIX="" @@ -62,9 +61,8 @@ rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT cd $TMP rm -rf $PRGNAM-$VERSION -tar xvf $CWD/$PRGNAM-$VERSION.tar.gz +tar xvf $CWD/$PRGNAM-$VERSION.tar.bz2 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 \) \ @@ -72,33 +70,35 @@ find -L . \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ -exec chmod 644 {} \; -# Use our CFLAGS also when building the python snackmodule -sed -i "s|PIFLAGS\ \$\$PCFLAGS|PIFLAGS \$\$PCFLAGS ${SLKCFLAGS}|" Makefile.in - -CFLAGS="$SLKCFLAGS" \ -CXXFLAGS="$SLKCFLAGS" \ -./configure \ - --prefix=/usr \ - --libdir=/usr/lib${LIBDIRSUFFIX} \ - --mandir=/usr/man \ - --sysconfdir=/etc \ - --localstatedir=/var \ - --build=$ARCH-slackware-linux - -make -make install instroot=$PKG - -find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \ +mkdir build +cd build + cmake \ + -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \ + -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DMAN_INSTALL_DIR=/usr/man \ + -DSYSCONF_INSTALL_DIR=/etc \ + -DLIB_SUFFIX=${LIBDIRSUFFIX} \ + .. + make + make install DESTDIR=$PKG +cd .. + +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 -find $PKG/usr/man -type f -exec gzip -9 {} \; -for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done +mv $PKG/etc/dbus-1/system.d/net.sourceforge.smb4k.mounthelper.conf \ + $PKG/etc/dbus-1/system.d/net.sourceforge.smb4k.mounthelper.conf.new mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION -cp -a $DOCS $PKG/usr/doc/$PRGNAM-$VERSION +cp -a \ + AUTHORS BUGS ChangeLog COPYING README \ + $PKG/usr/doc/$PRGNAM-$VERSION cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild mkdir -p $PKG/install +cat $CWD/doinst.sh > $PKG/install/doinst.sh cat $CWD/slack-desc > $PKG/install/slack-desc cd $PKG diff --git a/network/smb4k/smb4k.info b/network/smb4k/smb4k.info new file mode 100644 index 0000000000..24f7f10227 --- /dev/null +++ b/network/smb4k/smb4k.info @@ -0,0 +1,10 @@ +PRGNAM="smb4k" +VERSION="1.1.0" +HOMEPAGE="http://smb4k.sourceforge.net/" +DOWNLOAD="http://downloads.sourceforge.net/smb4k/smb4k-1.1.0.tar.bz2" +MD5SUM="2ccd1f4eda732654460ff03b77738a96" +DOWNLOAD_x86_64="" +MD5SUM_x86_64="" +REQUIRES="" +MAINTAINER="nobody" +EMAIL="nobody@nowhere" diff --git a/network/socat/socat.SlackBuild b/network/socat/socat.SlackBuild index 724c4e1dc0..22db8ca72a 100644 --- a/network/socat/socat.SlackBuild +++ b/network/socat/socat.SlackBuild @@ -22,7 +22,7 @@ # THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=socat -VERSION=${VERSION:-1.7.2.4} +VERSION=${VERSION:-1.7.3.0} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} diff --git a/network/socat/socat.info b/network/socat/socat.info index b4c8bf2262..847eee4e2d 100644 --- a/network/socat/socat.info +++ b/network/socat/socat.info @@ -1,8 +1,8 @@ PRGNAM="socat" -VERSION="1.7.2.4" +VERSION="1.7.3.0" HOMEPAGE="http://www.dest-unreach.org/socat" -DOWNLOAD="http://www.dest-unreach.org/socat/download/socat-1.7.2.4.tar.bz2" -MD5SUM="69b8155dd442a6f24e28ef5407d868eb" +DOWNLOAD="http://www.dest-unreach.org/socat/download/socat-1.7.3.0.tar.bz2" +MD5SUM="b607edb65bc6c57f4a43f06247504274" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" diff --git a/network/spice-gtk/spice-gtk.SlackBuild b/network/spice-gtk/spice-gtk.SlackBuild index 0e9ef7f4c7..437992b5e5 100644 --- a/network/spice-gtk/spice-gtk.SlackBuild +++ b/network/spice-gtk/spice-gtk.SlackBuild @@ -22,7 +22,7 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=spice-gtk -VERSION=${VERSION:-0.28} +VERSION=${VERSION:-0.30} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -79,7 +79,6 @@ find -L . \ # Disable broken tests sed -i 's/ tests//' Makefile.am Makefile.in -rm gtk/controller/controller.c gtk/controller/controller.vala.stamp gtk/controller/menu.c export VALAC=$(which valac) export VAPIGEN=$(which vapigen) diff --git a/network/spice-gtk/spice-gtk.info b/network/spice-gtk/spice-gtk.info index c3bceeb39d..4da50cf413 100644 --- a/network/spice-gtk/spice-gtk.info +++ b/network/spice-gtk/spice-gtk.info @@ -1,8 +1,8 @@ PRGNAM="spice-gtk" -VERSION="0.28" +VERSION="0.30" HOMEPAGE="http://spice-space.org" -DOWNLOAD="http://spice-space.org/download/gtk/spice-gtk-0.28.tar.bz2" -MD5SUM="ad07d438ce6dfbb038aa8e28f5a2fb81" +DOWNLOAD="http://spice-space.org/download/gtk/spice-gtk-0.30.tar.bz2" +MD5SUM="723e0e9ce9d507ba5d6cd331a3a9b7fb" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="gst1-plugins-base spice vala" diff --git a/network/spice/spice.SlackBuild b/network/spice/spice.SlackBuild index 224bcb7c03..5443e4fa56 100644 --- a/network/spice/spice.SlackBuild +++ b/network/spice/spice.SlackBuild @@ -22,7 +22,7 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=spice -VERSION=${VERSION:-0.12.5} +VERSION=${VERSION:-0.12.6} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} diff --git a/network/spice/spice.info b/network/spice/spice.info index 119d6fd84f..0a14b47110 100644 --- a/network/spice/spice.info +++ b/network/spice/spice.info @@ -1,10 +1,10 @@ PRGNAM="spice" -VERSION="0.12.5" +VERSION="0.12.6" HOMEPAGE="http://spice-space.org" -DOWNLOAD="http://spice-space.org/download/releases/spice-0.12.5.tar.bz2" -MD5SUM="1256286214fe402703c0a01bd3a85319" +DOWNLOAD="http://spice-space.org/download/releases/spice-0.12.6.tar.bz2" +MD5SUM="605a8c8ea80bc95076c4b3539c6dd026" DOWNLOAD_x86_64="" MD5SUM_x86_64="" -REQUIRES="celt051 pyparsing spice-protocol" +REQUIRES="celt051 pyparsing six spice-protocol" MAINTAINER="Matteo Bernardini" EMAIL="ponce@slackbuilds.org" diff --git a/network/thrift/thrift.SlackBuild b/network/thrift/thrift.SlackBuild index 81135d111e..f76fb6b52c 100644 --- a/network/thrift/thrift.SlackBuild +++ b/network/thrift/thrift.SlackBuild @@ -17,7 +17,7 @@ # OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. PRGNAM=thrift -VERSION=${VERSION:-0.6.0} +VERSION=${VERSION:-0.9.2} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -58,10 +58,12 @@ 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 {} \; + +# Disable unit tests: https://issues.apache.org/jira/browse/THRIFT-3249 CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ @@ -74,6 +76,7 @@ CXXFLAGS="$SLKCFLAGS" \ --without-ruby \ --without-php \ --without-php_extension \ + --disable-tests \ --build=$ARCH-slackware-linux make @@ -81,7 +84,7 @@ make install-strip DESTDIR=$PKG mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION cp -a \ - CHANGES CONTRIBUTORS DISCLAIMER LICENSE NEWS NOTICE README \ + CHANGES LICENSE NOTICE README.md \ $PKG/usr/doc/$PRGNAM-$VERSION cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild diff --git a/network/thrift/thrift.info b/network/thrift/thrift.info index 4fb4576c9e..ec2179291c 100644 --- a/network/thrift/thrift.info +++ b/network/thrift/thrift.info @@ -1,8 +1,8 @@ PRGNAM="thrift" -VERSION="0.6.0" +VERSION="0.9.2" HOMEPAGE="http://thrift.apache.org" -DOWNLOAD="http://archive.apache.org/dist/thrift/0.6.0/thrift-0.6.0.tar.gz" -MD5SUM="c1a9c679bc75d038ce5ef447bf6e4c75" +DOWNLOAD="http://archive.apache.org/dist/thrift/0.9.2/thrift-0.9.2.tar.gz" +MD5SUM="89f63cc4d0100912f4a1f8a9dee63678" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" diff --git a/network/urlview/README b/network/urlview/README new file mode 100644 index 0000000000..a89983e2c4 --- /dev/null +++ b/network/urlview/README @@ -0,0 +1,10 @@ +urlview is a curses program for extracting URLs from text files and +displaying a menu from which you can select a specific URL to view using +your favorite browser program. + +It was originally part of mutt. See /etc/urlview.conf on how to configure +mutt, tin, or your default browser. + +Please be aware that /etc/urlview.conf and /usr/bin/url_handler.sh are +configuration files, so they are not overwritten on upgrades. Be sure to +merge/move the .new files after each upgrade. diff --git a/libraries/libvdpau/doinst.sh b/network/urlview/doinst.sh index 15cd7163be..4cf8309066 100644 --- a/libraries/libvdpau/doinst.sh +++ b/network/urlview/doinst.sh @@ -11,5 +11,5 @@ config() { # Otherwise, we leave the .new copy for the admin to consider... } -config etc/vdpau_wrapper.cfg.new - +config etc/urlview.conf.new +config usr/bin/url_handler.sh.new diff --git a/network/urlview/patches/Makefile.in.diff b/network/urlview/patches/Makefile.in.diff new file mode 100644 index 0000000000..2bb0334b83 --- /dev/null +++ b/network/urlview/patches/Makefile.in.diff @@ -0,0 +1,12 @@ +--- Makefile.in~ 2007-06-08 14:09:57.000000000 +0200 ++++ Makefile.in 2007-06-08 14:33:40.000000000 +0200 +@@ -318,7 +318,8 @@ + + + install-data-local: +- $(INSTALL_DATA) urlview.man $(mandir)/man1/urlview.1 ++ $(mkinstalldirs) $(DESTDIR)$(mandir)/man1 ++ $(INSTALL_DATA) urlview.man ${DESTDIR}$(mandir)/man1/urlview.1 + + # how to create a target for uninstall-data-local??? + diff --git a/network/urlview/patches/include-fix.diff b/network/urlview/patches/include-fix.diff new file mode 100644 index 0000000000..f4708e337a --- /dev/null +++ b/network/urlview/patches/include-fix.diff @@ -0,0 +1,11 @@ +--- urlview.c ++++ urlview.c +@@ -40,6 +40,8 @@ + #include <fcntl.h> + #include <sys/stat.h> + ++#include "quote.h" ++ + #ifdef HAVE_REGEX_H + #include <regex.h> + #else diff --git a/network/urlview/patches/sample.urlview.diff b/network/urlview/patches/sample.urlview.diff new file mode 100644 index 0000000000..111719f5e5 --- /dev/null +++ b/network/urlview/patches/sample.urlview.diff @@ -0,0 +1,15 @@ +--- sample.urlview~ 2007-06-08 14:11:09.000000000 +0200 ++++ sample.urlview 2007-06-08 14:11:33.000000000 +0200 +@@ -19,10 +19,10 @@ + #REGEXP (((http|https|ftp|gopher)|mailto):(//)?[^ >"\t]*|www\.[-a-z0-9.]+)[^ .,;\t>">\):] + REGEXP (((http|https|ftp|gopher)|mailto)[.:][^ >"\t]*|www\.[-a-z0-9.]+)[^ .,;\t>">\):] + +-# Command to invoke for selected URL. Use lynx, netscape, or url_handler.sh ++# Command to invoke for selected URL. Use lynx, firefox, or url_handler.sh + # shell script. + + #COMMAND lynx %s +-#COMMAND netscape -remote 'openURL(%s)' ++#COMMAND firefox -remote 'openURL(%s)' + COMMAND url_handler.sh + diff --git a/network/urlview/patches/url_handler.sh.diff b/network/urlview/patches/url_handler.sh.diff new file mode 100644 index 0000000000..d976e3c90b --- /dev/null +++ b/network/urlview/patches/url_handler.sh.diff @@ -0,0 +1,15 @@ +--- url_handler.sh~ 2007-06-08 14:12:20.000000000 +0200 ++++ url_handler.sh 2007-06-08 14:14:06.000000000 +0200 +@@ -28,8 +28,10 @@ + # VT: Launch in the same terminal + + # The lists of programs to be executed are +-https_prgs="/usr/X11R6/bin/netscape:XW /usr/bin/lynx:XT" +-http_prgs="/usr/bin/lynx:XT /usr/X11R6/bin/netscape:XW" ++https_prgs="/usr/bin/firefox:XW /usr/bin/lynx:XT" ++https_prgs="/usr/bin/firefox:XW /usr/bin/lynx:XT" ++http_prgs="/usr/bin/lynx:XT /usr/bin/firefox:XW" ++http_prgs="/usr/bin/lynx:XT /usr/bin/firefox:XW" + mailto_prgs="/usr/bin/mutt:VT /usr/bin/elm:VT /usr/bin/pine:VT /usr/bin/mail:VT" + gopher_prgs="/usr/bin/lynx:XT /usr/bin/gopher:XT" + ftp_prgs="/usr/bin/lynx:XT /usr/bin/ncftp:XT" diff --git a/libraries/libssh2/slack-desc b/network/urlview/slack-desc index 37d8b27d3e..25cb759b22 100644 --- a/libraries/libssh2/slack-desc +++ b/network/urlview/slack-desc @@ -6,14 +6,14 @@ # customary to leave one space after the ':' except on otherwise blank lines. |-----handy-ruler------------------------------------------------------| -libssh2: libssh2 (SSH2 library) -libssh2: -libssh2: libssh2 is a library implementing the SSH2 protocol, available under -libssh2: the revised BSD license. -libssh2: -libssh2: Website: http://www.libssh2.org/ -libssh2: Mailing List: http://cool.haxx.se/mailman/listinfo/libssh2-devel -libssh2: -libssh2: -libssh2: -libssh2: +urlview: urlview (extract URLs from text files) +urlview: +urlview: urlview is a curses program for extracting URLs from text files and +urlview: displaying a menu from which you can select a specific URL to view +urlview: using your favorite browser program. +urlview: +urlview: It was originally a part of mutt. +urlview: +urlview: +urlview: +urlview: diff --git a/office/qpdf/qpdf.SlackBuild b/network/urlview/urlview.SlackBuild index ac6175c38b..fc1673d0af 100644 --- a/office/qpdf/qpdf.SlackBuild +++ b/network/urlview/urlview.SlackBuild @@ -1,9 +1,8 @@ #!/bin/sh - -# Slackware build script for qpdf - -# Copyright 2011-2012 Binh Nguyen <binhvng@gmail.com> -# Copyright 2014-2015 Willy Sudiarto Raharjo <willysr@slackbuilds.org> +# +# Slackware build script for urlview +# (C) 2007 Michael Wagner <lapinours@web.de> +# Copyright 2015 Matteo Bernardini <ponce@slackbuilds.org>, Pisa, Italy # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -12,7 +11,7 @@ # 1. Redistributions of this script must retain the above copyright # notice, this list of conditions and the following disclaimer. # -# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED +# THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED # WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF # MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO # EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, @@ -23,8 +22,8 @@ # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -PRGNAM=qpdf -VERSION=${VERSION:-6.0.0} +PRGNAM=urlview +VERSION=0.9 BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -41,6 +40,8 @@ TMP=${TMP:-/tmp/SBo} PKG=$TMP/package-$PRGNAM OUTPUT=${OUTPUT:-/tmp} +DOCS="AUTHORS COPYING ChangeLog INSTALL README" + if [ "$ARCH" = "i486" ]; then SLKCFLAGS="-O2 -march=i486 -mtune=i686" LIBDIRSUFFIX="" @@ -55,8 +56,6 @@ else LIBDIRSUFFIX="" fi -set -e - rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT cd $TMP @@ -70,20 +69,17 @@ 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 {} \; +# Apply patches for DESTDIR and mostly path fixes: +for i in $CWD/patches/*.diff; do + patch -p0 < $i || exit 1 +done + CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ ./configure \ --prefix=/usr \ - --libdir=/usr/lib${LIBDIRSUFFIX} \ - --sysconfdir=/etc \ - --localstatedir=/var \ - --mandir=/usr/man \ - --infodir=/usr/info \ - --docdir=/usr/doc/$PRGNAM-$VERSION \ - --localedir=/usr/share/locale \ - --disable-static \ - --build=$ARCH-slackware-linux - + --libdir=/usr/lib${LIBDIRSUFFIX} + make make install DESTDIR=$PKG @@ -93,12 +89,20 @@ find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | gr find $PKG/usr/man -type f -exec gzip -9 {} \; for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done +# Use sample.urlview as system-wide default configuration: +install -D -m 0644 sample.urlview $PKG/etc/urlview.conf.new + +# Let url_handler.sh do what it is supposed to be, handle URL events: +install -m 0755 url_handler.sh $PKG/usr/bin/url_handler.sh.new + mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION -cp -a Artistic-2.0 ChangeLog INSTALL README* TODO $PKG/usr/doc/$PRGNAM-$VERSION +cp -a $DOCS $PKG/usr/doc/$PRGNAM-$VERSION cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild +chmod 644 $PKG/usr/doc/$PRGNAM-$VERSION/* mkdir -p $PKG/install cat $CWD/slack-desc > $PKG/install/slack-desc +cat $CWD/doinst.sh > $PKG/install/doinst.sh cd $PKG /sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz} diff --git a/network/urlview/urlview.info b/network/urlview/urlview.info new file mode 100644 index 0000000000..d7c5429dd0 --- /dev/null +++ b/network/urlview/urlview.info @@ -0,0 +1,10 @@ +PRGNAM="urlview" +VERSION="0.9" +HOMEPAGE="ftp://ftp.mutt.org/pub/mutt/contrib/urlview-0.9.README" +DOWNLOAD="http://ponce.cc/slackware/sources/repo/urlview-0.9.tar.gz" +MD5SUM="67731f73e69297ffd106b65c8aebb2ab" +DOWNLOAD_x86_64="" +MD5SUM_x86_64="" +REQUIRES="" +MAINTAINER="Matteo Bernardini" +EMAIL="ponce@slackbuilds.org" diff --git a/network/varnish/varnish.SlackBuild b/network/varnish/varnish.SlackBuild index a58eb7116b..950474649c 100644 --- a/network/varnish/varnish.SlackBuild +++ b/network/varnish/varnish.SlackBuild @@ -5,7 +5,7 @@ # Written by Matt Schurenko <matt.schurenko@gmail.com> PRGNAM=varnish -VERSION=${VERSION:-2.1.5} +VERSION=${VERSION:-4.0.3} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -46,20 +46,20 @@ 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 {} \; + +sh ./autogen.sh CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ -./autogen.sh - ./configure \ --prefix=/usr \ --libdir=/usr/lib${LIBDIRSUFFIX} \ --sysconfdir=/etc \ - --localstatedir=/var \ + --localstatedir=/var/lib \ --mandir=/usr/man \ --docdir=/usr/doc/$PRGNAM-$VERSION \ --build=$ARCH-slackware-linux @@ -81,10 +81,10 @@ mkdir -p $PKG/install cat $CWD/slack-desc > $PKG/install/slack-desc cat $CWD/doinst.sh > $PKG/install/doinst.sh -# copy rc.varnish into ./etc/rc.d/ -mkdir $PKG/etc/rc.d/ +mkdir -p $PKG/etc/varnish/ +cp $PKG/usr/doc/$PRGNAM-$VERSION/example.vcl $PKG/etc/varnish/default.vcl.new +mkdir -p $PKG/etc/rc.d/ cp -p $CWD/rc.varnishd $PKG/etc/rc.d/rc.varnishd.new -mv $PKG/etc/varnish/default.vcl{,.new} cd $PKG /sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz} diff --git a/network/varnish/varnish.info b/network/varnish/varnish.info index bf791b653f..16a1cbae82 100644 --- a/network/varnish/varnish.info +++ b/network/varnish/varnish.info @@ -1,10 +1,10 @@ PRGNAM="varnish" -VERSION="2.1.5" +VERSION="4.0.3" HOMEPAGE="https://www.varnish-cache.org/" -DOWNLOAD="http://repo.varnish-cache.org/source/varnish-2.1.5.tar.gz" -MD5SUM="2d2f227da36a2a240c475304c717b8e3" +DOWNLOAD="https://repo.varnish-cache.org/source/varnish-4.0.3.tar.gz" +MD5SUM="16a683f2e41f7d80219cec5d4649380c" DOWNLOAD_x86_64="" MD5SUM_x86_64="" -REQUIRES="" +REQUIRES="docutils" MAINTAINER="Matt Schurenko" EMAIL="matt.schurenko@gmail.com" diff --git a/network/vde2/vde2.SlackBuild b/network/vde2/vde2.SlackBuild index 7b7c5b2565..78e45757bc 100644 --- a/network/vde2/vde2.SlackBuild +++ b/network/vde2/vde2.SlackBuild @@ -96,7 +96,7 @@ CXXFLAGS="$SLKCFLAGS" \ $OPTIONS \ --build=$ARCH-slackware-linux -make all +make -j1 all make install-strip DESTDIR=$PKG ( cd $PKG/usr/man diff --git a/office/evince/evince.SlackBuild b/office/evince/evince.SlackBuild index d019fa108d..285c39cc29 100644 --- a/office/evince/evince.SlackBuild +++ b/office/evince/evince.SlackBuild @@ -24,7 +24,7 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=evince -VERSION=${VERSION:-3.12.2} +VERSION=${VERSION:-3.18.2} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} diff --git a/office/evince/evince.info b/office/evince/evince.info index e2d6dce8a4..2f61252728 100644 --- a/office/evince/evince.info +++ b/office/evince/evince.info @@ -1,8 +1,8 @@ PRGNAM="evince" -VERSION="3.12.2" +VERSION="3.18.2" HOMEPAGE="http://projects.gnome.org/evince/" -DOWNLOAD="http://ftp.gnome.org/pub/gnome/sources/evince/3.12/evince-3.12.2.tar.xz" -MD5SUM="f8ea3cb5ba39c75a0b28b34a9c508cd4" +DOWNLOAD="http://ftp.gnome.org/pub/GNOME/sources/evince/3.18/evince-3.18.2.tar.xz" +MD5SUM="c39af6b8b1c44d4393ef8ac9dab99c0b" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" diff --git a/office/gbgoffice/gbgoffice.SlackBuild b/office/gbgoffice/gbgoffice.SlackBuild index 895219dab5..b059c3e5bb 100644 --- a/office/gbgoffice/gbgoffice.SlackBuild +++ b/office/gbgoffice/gbgoffice.SlackBuild @@ -80,7 +80,7 @@ patch -p1 -i $CWD/patches/10_workhelper-buttonbox.patch patch -p1 -i $CWD/patches/11_explicit-linkage.patch CFLAGS="$SLKCFLAGS" \ -CXXFLAGS="$SLKCFLAGS" \ +CXXFLAGS="$SLKCFLAGS -std=c++11" \ ./configure \ --prefix=/usr \ --libdir=/usr/lib${LIBDIRSUFFIX} \ diff --git a/office/pdfchain/pdfchain.SlackBuild b/office/pdfchain/pdfchain.SlackBuild index c51a7eafce..76db9bba82 100644 --- a/office/pdfchain/pdfchain.SlackBuild +++ b/office/pdfchain/pdfchain.SlackBuild @@ -70,7 +70,7 @@ find -L . \ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; CFLAGS="$SLKCFLAGS" \ -CXXFLAGS="$SLKCFLAGS" \ +CXXFLAGS="$SLKCFLAGS -std=c++11" \ ./configure \ --prefix=/usr \ --libdir=/usr/lib${LIBDIRSUFFIX} \ diff --git a/office/qpdf/README b/office/qpdf/README deleted file mode 100644 index 02efdffb38..0000000000 --- a/office/qpdf/README +++ /dev/null @@ -1,12 +0,0 @@ -QPDF is a program that does structural, content-preserving -transformations on PDF files. It could have been called something -like pdf-to-pdf. It also provides many useful capabilities to -developers of PDF-producing software or for people who just want to -look at the innards of a PDF file to learn more about how they work. - -QPDF offers many capabilities such as linearization (web -optimization), encrypt, and decription of PDF files. Note that QPDF -does not have the capability to create PDF files from scratch; it is -only used to create PDF files with special characteristics starting -from other PDF files or to inspect or extract information from -existing PDF files. diff --git a/office/qpdf/qpdf.info b/office/qpdf/qpdf.info deleted file mode 100644 index 6f1138be67..0000000000 --- a/office/qpdf/qpdf.info +++ /dev/null @@ -1,10 +0,0 @@ -PRGNAM="qpdf" -VERSION="6.0.0" -HOMEPAGE="http://qpdf.sourceforge.net/" -DOWNLOAD="http://downloads.sourceforge.net/qpdf/qpdf-6.0.0.tar.gz" -MD5SUM="e014bd3ecf1c4d1a520bbc14d84ac20e" -DOWNLOAD_x86_64="" -MD5SUM_x86_64="" -REQUIRES="" -MAINTAINER="Willy Sudiarto Raharjo" -EMAIL="willysr@slackbuilds.org" diff --git a/office/qpdf/slack-desc b/office/qpdf/slack-desc deleted file mode 100644 index 0ff13b9c1f..0000000000 --- a/office/qpdf/slack-desc +++ /dev/null @@ -1,19 +0,0 @@ -# HOW TO EDIT THIS FILE: -# The "handy ruler" below makes it easier to edit a package description. -# Line up the first '|' above the ':' following the base package name, and -# the '|' on the right side marks the last column you can put a character in. -# You must make exactly 11 lines for the formatting to be correct. It's also -# customary to leave one space after the ':' except on otherwise blank lines. - - |-----handy-ruler------------------------------------------------------| -qpdf: qpdf (Command-line tools and library for transforming PDF files) -qpdf: -qpdf: QPDF is a program that does structural, content-preserving -qpdf: transformations on PDF files. It could have been called something -qpdf: like pdf-to-pdf. It also provides many useful capabilities to -qpdf: developers of PDF-producing software or for people who just want to -qpdf: look at the innards of a PDF file to learn more about how they work. -qpdf: -qpdf: Homepage: http://qpdf.sourceforge.net/ -qpdf: -qpdf: diff --git a/office/referencer/referencer.SlackBuild b/office/referencer/referencer.SlackBuild index 99e152144c..c9359e5c86 100644 --- a/office/referencer/referencer.SlackBuild +++ b/office/referencer/referencer.SlackBuild @@ -70,7 +70,7 @@ find -L . \ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; CFLAGS="$SLKCFLAGS" \ -CXXFLAGS="$SLKCFLAGS" \ +CXXFLAGS="$SLKCFLAGS -std=c++11" \ ./configure \ --prefix=/usr \ --libdir=/usr/lib${LIBDIRSUFFIX} \ diff --git a/office/scribus/scribus.SlackBuild b/office/scribus/scribus.SlackBuild index fdddc483e7..3d1ecc6a46 100644 --- a/office/scribus/scribus.SlackBuild +++ b/office/scribus/scribus.SlackBuild @@ -27,7 +27,7 @@ # Including input by Yalla-One and some code cleanup by rworkman PRGNAM=scribus -VERSION=${VERSION:-1.4.4} +VERSION=${VERSION:-1.4.5} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -64,7 +64,7 @@ rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT cd $TMP rm -rf $PRGNAM-$VERSION -tar xvf $CWD/$PRGNAM-$VERSION.tar.xz +tar xvf $CWD/$PRGNAM-$VERSION.tar.?z* cd $PRGNAM-$VERSION chown -R root:root . find -L . \ diff --git a/office/scribus/scribus.info b/office/scribus/scribus.info index 802d4033ac..82d3682d5a 100644 --- a/office/scribus/scribus.info +++ b/office/scribus/scribus.info @@ -1,8 +1,8 @@ PRGNAM="scribus" -VERSION="1.4.4" +VERSION="1.4.5" HOMEPAGE="http://www.scribus.net" -DOWNLOAD="http://downloads.sourceforge.net/scribus/scribus-1.4.4.tar.xz" -MD5SUM="a5714ee53074d4b8b77b59612f5e27a8" +DOWNLOAD="http://downloads.sourceforge.net/scribus/scribus-1.4.5.tar.bz2" +MD5SUM="3ea3b8a660ef0a2573636a79952063ba" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" diff --git a/office/taskjuggler/taskjuggler.SlackBuild b/office/taskjuggler/taskjuggler.SlackBuild index a54787360c..1f1890151b 100644 --- a/office/taskjuggler/taskjuggler.SlackBuild +++ b/office/taskjuggler/taskjuggler.SlackBuild @@ -71,12 +71,12 @@ printf("%s/%s/gems/%s\n", gem specification $CWD/$PRGNAM-$VERSION.gem | \ ruby -r yaml -r rbconfig -e ' -c = Config::CONFIG +c = RbConfig::CONFIG path = sprintf("%s/%s/gems/%s", c["libdir"], c["RUBY_INSTALL_NAME"], c["ruby_version"]) -sys_gemspecs = Dir.glob(path + "/specifications/*").map {|g| gs = Gem::Specification.load(g); gs.name } +sys_gemspecs = Dir.glob(path + "/specifications/**/*.gemspec").map {|g| gs = Gem::Specification.load(g); gs.name } obj = Gem::Specification.from_yaml($stdin) obj.dependencies.each {|dep| if not(dep.type == :runtime) diff --git a/office/timetrap/timetrap.SlackBuild b/office/timetrap/timetrap.SlackBuild index 95381e531a..e0113ac3f2 100644 --- a/office/timetrap/timetrap.SlackBuild +++ b/office/timetrap/timetrap.SlackBuild @@ -71,12 +71,12 @@ printf("%s/%s/gems/%s\n", gem specification $CWD/$PRGNAM-$VERSION.gem | \ ruby -r yaml -r rbconfig -e ' -c = Config::CONFIG +c = RbConfig::CONFIG path = sprintf("%s/%s/gems/%s", c["libdir"], c["RUBY_INSTALL_NAME"], c["ruby_version"]) -sys_gemspecs = Dir.glob(path + "/specifications/*").map {|g| gs = Gem::Specification.load(g); gs.name } +sys_gemspecs = Dir.glob(path + "/specifications/**/*.gemspec").map {|g| gs = Gem::Specification.load(g); gs.name } obj = Gem::Specification.from_yaml($stdin) obj.dependencies.each {|dep| if not(dep.type == :runtime) diff --git a/perl/perl-Convert-UUlib/perl-Convert-UUlib.SlackBuild b/perl/perl-Convert-UUlib/perl-Convert-UUlib.SlackBuild index 6d6eeab8ce..c2fce3929e 100644 --- a/perl/perl-Convert-UUlib/perl-Convert-UUlib.SlackBuild +++ b/perl/perl-Convert-UUlib/perl-Convert-UUlib.SlackBuild @@ -75,6 +75,8 @@ 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 {} \; +export PERL_CANARY_STABILITY_NOPROMPT=1 + perl Makefile.PL \ PREFIX=/usr \ INSTALLDIRS=vendor \ diff --git a/perl/perl-Date-Manip/perl-Date-Manip.SlackBuild b/perl/perl-Date-Manip/perl-Date-Manip.SlackBuild index 9d019bc443..fb5384127f 100644 --- a/perl/perl-Date-Manip/perl-Date-Manip.SlackBuild +++ b/perl/perl-Date-Manip/perl-Date-Manip.SlackBuild @@ -24,7 +24,7 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=perl-Date-Manip -VERSION=${VERSION:-6.50} +VERSION=${VERSION:-6.52} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -72,15 +72,14 @@ 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 {} \; -perl Build.PL \ - prefix=/usr \ - installdirs=vendor \ - destdir=$PKG -./Build -./Build test -./Build install \ - --install_path bindoc=/usr/man/man1 \ - --install_path libdoc=/usr/man/man3 +perl Makefile.PL \ + PREFIX=/usr \ + INSTALLDIRS=vendor \ + INSTALLVENDORMAN1DIR=/usr/man/man1 \ + INSTALLVENDORMAN3DIR=/usr/man/man3 +make +make test +make install DESTDIR=$PKG find $PKG/usr/man -type f -exec gzip -9 {} \; diff --git a/perl/perl-Date-Manip/perl-Date-Manip.info b/perl/perl-Date-Manip/perl-Date-Manip.info index 89c7d8fde1..220967888d 100644 --- a/perl/perl-Date-Manip/perl-Date-Manip.info +++ b/perl/perl-Date-Manip/perl-Date-Manip.info @@ -1,8 +1,8 @@ PRGNAM="perl-Date-Manip" -VERSION="6.50" +VERSION="6.52" HOMEPAGE="https://metacpan.org/pod/distribution/Date-Manip/lib/Date/Manip.pod" -DOWNLOAD="https://cpan.metacpan.org/authors/id/S/SB/SBECK/Date-Manip-6.50.tar.gz" -MD5SUM="62c86841f9c57ebe663178195c1df272" +DOWNLOAD="https://cpan.metacpan.org/authors/id/S/SB/SBECK/Date-Manip-6.52.tar.gz" +MD5SUM="cd901896b1fae6e389dce7facfe715f6" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="perl-Test-Inter perl-Test-Pod perl-Test-Pod-Coverage perl-YAML-Syck" diff --git a/perl/perl-Net-SMTP-SSL/perl-Net-SMTP-SSL.SlackBuild b/perl/perl-Net-SMTP-SSL/perl-Net-SMTP-SSL.SlackBuild index e34c7cc100..83c6794864 100644 --- a/perl/perl-Net-SMTP-SSL/perl-Net-SMTP-SSL.SlackBuild +++ b/perl/perl-Net-SMTP-SSL/perl-Net-SMTP-SSL.SlackBuild @@ -24,7 +24,7 @@ SRCNAM=Net-SMTP-SSL PRGNAM=perl-$SRCNAM -VERSION=${VERSION:-1.01} +VERSION=${VERSION:-1.03} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} diff --git a/perl/perl-Net-SMTP-SSL/perl-Net-SMTP-SSL.info b/perl/perl-Net-SMTP-SSL/perl-Net-SMTP-SSL.info index 02649bbda0..1ffb1292df 100644 --- a/perl/perl-Net-SMTP-SSL/perl-Net-SMTP-SSL.info +++ b/perl/perl-Net-SMTP-SSL/perl-Net-SMTP-SSL.info @@ -1,8 +1,8 @@ PRGNAM="perl-Net-SMTP-SSL" -VERSION="1.01" +VERSION="1.03" HOMEPAGE="https://metacpan.org/pod/Net::SMTP::SSL" -DOWNLOAD="http://www.cpan.org/authors/id/C/CW/CWEST/Net-SMTP-SSL-1.01.tar.gz" -MD5SUM="ba039288ebf7a343feecacd374da8c1a" +DOWNLOAD="https://cpan.metacpan.org/authors/id/R/RJ/RJBS/Net-SMTP-SSL-1.03.tar.gz" +MD5SUM="75c80e6af5583630ba074b25c0b5ee84" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="perl-IO-Socket-SSL" diff --git a/perl/perl-Net-SMTP-SSL/slack-desc b/perl/perl-Net-SMTP-SSL/slack-desc index c063ef2335..e1654a59a2 100644 --- a/perl/perl-Net-SMTP-SSL/slack-desc +++ b/perl/perl-Net-SMTP-SSL/slack-desc @@ -11,7 +11,7 @@ perl-Net-SMTP-SSL: perl-Net-SMTP-SSL: perl-Net-SMTP-SSL is a perl module that implements the same API as perl-Net-SMTP-SSL: Net::SMTP, but uses IO::Socket::SSL for its network operations. perl-Net-SMTP-SSL: -perl-Net-SMTP-SSL: homepage: http://search.cpan.org/~cwest/Net-SMTP-SSL-1.01/ +perl-Net-SMTP-SSL: homepage: https://metacpan.org/pod/Net::SMTP::SSL perl-Net-SMTP-SSL: perl-Net-SMTP-SSL: perl-Net-SMTP-SSL: diff --git a/perl/perl-NetPacket/perl-NetPacket.SlackBuild b/perl/perl-NetPacket/perl-NetPacket.SlackBuild index a76b2fa057..5d2e479e2c 100644 --- a/perl/perl-NetPacket/perl-NetPacket.SlackBuild +++ b/perl/perl-NetPacket/perl-NetPacket.SlackBuild @@ -23,7 +23,7 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=perl-NetPacket -VERSION=${VERSION:-1.4.3} +VERSION=${VERSION:-1.6.0} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -72,15 +72,14 @@ 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 {} \; -perl Build.PL -./Build -./Build test -./Build install install_base=$PKG/usr - -# sigh... -if [ ! -z "${LIBDIRSUFFIX}" ]; then - mv $PKG/usr/lib $PKG/usr/lib${LIBDIRSUFFIX} -fi +perl Makefile.PL \ + PREFIX=/usr \ + INSTALLDIRS=vendor \ + INSTALLVENDORMAN1DIR=/usr/man/man1 \ + INSTALLVENDORMAN3DIR=/usr/man/man3 +make +make test +make install DESTDIR=$PKG find $PKG/usr/man -type f -exec gzip -9 {} \; for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done diff --git a/perl/perl-NetPacket/perl-NetPacket.info b/perl/perl-NetPacket/perl-NetPacket.info index aa85afb50c..63bf98d84a 100644 --- a/perl/perl-NetPacket/perl-NetPacket.info +++ b/perl/perl-NetPacket/perl-NetPacket.info @@ -1,8 +1,8 @@ PRGNAM="perl-NetPacket" -VERSION="1.4.3" +VERSION="1.6.0" HOMEPAGE="https://metacpan.org/pod/NetPacket" -DOWNLOAD="http://ponce.cc/slackware/sources/repo/NetPacket-1.4.3.tar.gz" -MD5SUM="9ca7dfe00957a3bcb54f3bb10671eaef" +DOWNLOAD="https://cpan.metacpan.org/authors/id/Y/YA/YANICK/NetPacket-1.6.0.tar.gz" +MD5SUM="17ba0407dada096f046f513387e88818" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" diff --git a/perl/perl-Ogg-Vorbis-Header-PurePerl/eliminate_deprecated_use_of_array_as_reference_rt_cpan_org_96578.diff b/perl/perl-Ogg-Vorbis-Header-PurePerl/eliminate_deprecated_use_of_array_as_reference_rt_cpan_org_96578.diff new file mode 100644 index 0000000000..1811c35dae --- /dev/null +++ b/perl/perl-Ogg-Vorbis-Header-PurePerl/eliminate_deprecated_use_of_array_as_reference_rt_cpan_org_96578.diff @@ -0,0 +1,22 @@ +--- /home/jkeenan/Downloads/Ogg-Vorbis-Header-PurePerl-1.0/test.pl 2007-01-04 17:12:23.000000000 -0500 ++++ ./test.pl 2015-04-06 21:44:12.970890513 -0400 +@@ -19,16 +19,16 @@ + # Try all the routines + ok($ogg->info->{'rate'} == 44100); + ok($ogg->comment_tags); +-ok(@{$ogg->comment('artist')}->[0] == 'maloi'); ++ok($ogg->comment('artist')->[0] == 'maloi'); + + $ogg = 0; + + # See if full load works + ok(my $ogg = Ogg::Vorbis::Header::PurePerl->new('test.ogg')); +-ok(@{$ogg->comment('artist')}->[0] == 'maloi'); ++ok($ogg->comment('artist')->[0] == 'maloi'); + + # and see if we can get comments including the '=' character +-ok(@{$ogg->comment('album')}->[0] == 'this=that'); ++ok($ogg->comment('album')->[0] == 'this=that'); + + # Make sure we're getting the right track length + ok($ogg->info->{'length'} == 0); diff --git a/perl/perl-Ogg-Vorbis-Header-PurePerl/perl-Ogg-Vorbis-Header-PurePerl.SlackBuild b/perl/perl-Ogg-Vorbis-Header-PurePerl/perl-Ogg-Vorbis-Header-PurePerl.SlackBuild index a3823fbd00..500ee14a78 100644 --- a/perl/perl-Ogg-Vorbis-Header-PurePerl/perl-Ogg-Vorbis-Header-PurePerl.SlackBuild +++ b/perl/perl-Ogg-Vorbis-Header-PurePerl/perl-Ogg-Vorbis-Header-PurePerl.SlackBuild @@ -52,6 +52,10 @@ find -L . \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ -exec chmod 644 {} \; +# Fix for perl-5.22 +# https://rt.cpan.org/Public/Bug/Display.html?id=96578 +patch -p1 < $CWD/eliminate_deprecated_use_of_array_as_reference_rt_cpan_org_96578.diff + perl Makefile.PL \ PREFIX=/usr \ INSTALLDIRS=vendor \ diff --git a/perl/perl-Path-Class/perl-Path-Class.SlackBuild b/perl/perl-Path-Class/perl-Path-Class.SlackBuild index b0d4be0d73..1da00f63fa 100644 --- a/perl/perl-Path-Class/perl-Path-Class.SlackBuild +++ b/perl/perl-Path-Class/perl-Path-Class.SlackBuild @@ -23,7 +23,7 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=perl-Path-Class -VERSION=${VERSION:-0.33} +VERSION=${VERSION:-0.35} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -71,15 +71,14 @@ 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 {} \; -perl Build.PL \ - prefix=/usr \ - installdirs=vendor \ - destdir=$PKG -./Build -./Build test -./Build install \ - --install_path bindoc=/usr/man/man1 \ - --install_path libdoc=/usr/man/man3 +perl Makefile.PL \ + PREFIX=/usr \ + INSTALLDIRS=vendor \ + INSTALLVENDORMAN1DIR=/usr/man/man1 \ + INSTALLVENDORMAN3DIR=/usr/man/man3 +make +make test +make install DESTDIR=$PKG 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 diff --git a/perl/perl-Path-Class/perl-Path-Class.info b/perl/perl-Path-Class/perl-Path-Class.info index 8271ce5f3d..3ae848b0d1 100644 --- a/perl/perl-Path-Class/perl-Path-Class.info +++ b/perl/perl-Path-Class/perl-Path-Class.info @@ -1,8 +1,8 @@ PRGNAM="perl-Path-Class" -VERSION="0.33" +VERSION="0.35" HOMEPAGE="https://metacpan.org/release/Path-Class" -DOWNLOAD="http://cpan.metacpan.org/authors/id/K/KW/KWILLIAMS/Path-Class-0.33.tar.gz" -MD5SUM="bac152fffe772252bbcfc2f15dc3bb34" +DOWNLOAD="http://cpan.metacpan.org/authors/id/K/KW/KWILLIAMS/Path-Class-0.35.tar.gz" +MD5SUM="575b60a5c5e22e259c1df62a59fdfe85" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" diff --git a/perl/perl-Test-Number-Delta/perl-Test-Number-Delta.SlackBuild b/perl/perl-Test-Number-Delta/perl-Test-Number-Delta.SlackBuild index a541af816d..dc9277d953 100644 --- a/perl/perl-Test-Number-Delta/perl-Test-Number-Delta.SlackBuild +++ b/perl/perl-Test-Number-Delta/perl-Test-Number-Delta.SlackBuild @@ -23,7 +23,7 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=perl-Test-Number-Delta -VERSION=${VERSION:-1.03} +VERSION=${VERSION:-1.06} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -71,15 +71,14 @@ find -L . \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ -exec chmod 644 {} \; -perl Build.PL \ - prefix=/usr \ - installdirs=vendor \ - destdir=$PKG -./Build -./Build test -./Build install \ - --install_path bindoc=/usr/man/man1 \ - --install_path libdoc=/usr/man/man3 +perl Makefile.PL \ + PREFIX=/usr \ + INSTALLDIRS=vendor \ + INSTALLVENDORMAN1DIR=/usr/man/man1 \ + INSTALLVENDORMAN3DIR=/usr/man/man3 +make +make test +make install DESTDIR=$PKG 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 @@ -93,7 +92,7 @@ find $PKG -depth -type d -empty -delete || true mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION cp -a \ - Changes LICENSE README Todo \ + CONTRIBUTING.mkdn Changes LICENSE README \ $PKG/usr/doc/$PRGNAM-$VERSION cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild diff --git a/perl/perl-Test-Number-Delta/perl-Test-Number-Delta.info b/perl/perl-Test-Number-Delta/perl-Test-Number-Delta.info index 5f91e8a816..26fb9c32e2 100644 --- a/perl/perl-Test-Number-Delta/perl-Test-Number-Delta.info +++ b/perl/perl-Test-Number-Delta/perl-Test-Number-Delta.info @@ -1,8 +1,8 @@ PRGNAM="perl-Test-Number-Delta" -VERSION="1.03" +VERSION="1.06" HOMEPAGE="https://metacpan.org/pod/Test::Number::Delta" -DOWNLOAD="http://www.cpan.org/authors/id/D/DA/DAGOLDEN/Test-Number-Delta-1.03.tar.gz" -MD5SUM="17d3eec2d5bbe012c4a797af8e75ae39" +DOWNLOAD="http://www.cpan.org/authors/id/D/DA/DAGOLDEN/Test-Number-Delta-1.06.tar.gz" +MD5SUM="f0d420e7f679a0bc593713d21c25f51e" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" diff --git a/perl/perl-Test-SharedFork/perl-Test-SharedFork.SlackBuild b/perl/perl-Test-SharedFork/perl-Test-SharedFork.SlackBuild index c09b36b570..76effbc902 100644 --- a/perl/perl-Test-SharedFork/perl-Test-SharedFork.SlackBuild +++ b/perl/perl-Test-SharedFork/perl-Test-SharedFork.SlackBuild @@ -27,7 +27,7 @@ PRGNAM="perl-Test-SharedFork" -VERSION=${VERSION:-0.24} +VERSION=${VERSION:-0.34} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -77,15 +77,14 @@ find -L . \ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; CFLAGS="$SLKCFLAGS" \ -perl Build.PL \ - prefix=/usr \ - installdirs=vendor \ - destdir=$PKG -./Build -./Build test -./Build install \ - --install_path bindoc=/usr/man/man1 \ - --install_path libdoc=/usr/man/man3 +perl Makefile.PL \ + PREFIX=/usr \ + INSTALLDIRS=vendor \ + INSTALLVENDORMAN1DIR=/usr/man/man1 \ + INSTALLVENDORMAN3DIR=/usr/man/man3 +make +make test +make install DESTDIR=$PKG ### putting essential docs mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION diff --git a/perl/perl-Test-SharedFork/perl-Test-SharedFork.info b/perl/perl-Test-SharedFork/perl-Test-SharedFork.info index 1fdfcb02e0..f35d981cfe 100644 --- a/perl/perl-Test-SharedFork/perl-Test-SharedFork.info +++ b/perl/perl-Test-SharedFork/perl-Test-SharedFork.info @@ -1,8 +1,8 @@ PRGNAM="perl-Test-SharedFork" -VERSION="0.24" +VERSION="0.34" HOMEPAGE="https://metacpan.org/pod/Test::SharedFork" -DOWNLOAD="http://www.cpan.org/authors/id/T/TO/TOKUHIROM/Test-SharedFork-0.24.tar.gz" -MD5SUM="6cdefc061e885e7ce56ee0c3a1ede9a3" +DOWNLOAD="http://www.cpan.org/authors/id/E/EX/EXODIST/Test-SharedFork-0.34.tar.gz" +MD5SUM="40b7dd32228f7e6c2e31c41fb863df16" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="perl-Test-Requires" diff --git a/perl/perl-Test-TCP/perl-Test-TCP.SlackBuild b/perl/perl-Test-TCP/perl-Test-TCP.SlackBuild index d7d555e061..64d05f07b7 100644 --- a/perl/perl-Test-TCP/perl-Test-TCP.SlackBuild +++ b/perl/perl-Test-TCP/perl-Test-TCP.SlackBuild @@ -26,7 +26,7 @@ # SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM="perl-Test-TCP" -VERSION=${VERSION:-2.02} +VERSION=${VERSION:-2.14} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -63,15 +63,14 @@ 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 {} \; -perl Build.PL \ - prefix=/usr \ - installdirs=vendor \ - destdir=$PKG -./Build -./Build test -./Build install \ - --install_path bindoc=/usr/man/man1 \ - --install_path libdoc=/usr/man/man3 +perl Makefile.PL \ + PREFIX=/usr \ + INSTALLDIRS=vendor \ + INSTALLVENDORMAN1DIR=/usr/man/man1 \ + INSTALLVENDORMAN3DIR=/usr/man/man3 +make +make test +make install DESTDIR=$PKG ### putting essential docs mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION diff --git a/perl/perl-Test-TCP/perl-Test-TCP.info b/perl/perl-Test-TCP/perl-Test-TCP.info index 78a34e1ef4..379349a68d 100644 --- a/perl/perl-Test-TCP/perl-Test-TCP.info +++ b/perl/perl-Test-TCP/perl-Test-TCP.info @@ -1,8 +1,8 @@ PRGNAM="perl-Test-TCP" -VERSION="2.02" +VERSION="2.14" HOMEPAGE="https://metacpan.org/pod/Test::TCP" -DOWNLOAD="http://www.cpan.org/authors/id/T/TO/TOKUHIROM/Test-TCP-2.02.tar.gz" -MD5SUM="9014b0858868530a0786ddf4b1c9b151" +DOWNLOAD="http://www.cpan.org/authors/id/T/TO/TOKUHIROM/Test-TCP-2.14.tar.gz" +MD5SUM="402e78138e3269dde973960dd3d44d09" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="perl-Test-SharedFork" diff --git a/perl/perl-Test-Trap/perl-Test-Trap.SlackBuild b/perl/perl-Test-Trap/perl-Test-Trap.SlackBuild index 839fc005db..81f03c4eac 100644 --- a/perl/perl-Test-Trap/perl-Test-Trap.SlackBuild +++ b/perl/perl-Test-Trap/perl-Test-Trap.SlackBuild @@ -53,15 +53,14 @@ 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 {} \; -perl Build.PL \ - prefix=/usr \ - installdirs=vendor \ - destdir=$PKG -./Build -./Build test -./Build install \ - --install_path bindoc=/usr/man/man1 \ - --install_path libdoc=/usr/man/man3 +perl Makefile.PL \ + PREFIX=/usr \ + INSTALLDIRS=vendor \ + INSTALLVENDORMAN1DIR=/usr/man/man1 \ + INSTALLVENDORMAN3DIR=/usr/man/man3 +make +make test +make install DESTDIR=$PKG 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 diff --git a/perl/perl-Unicode-String/perl-Unicode-String.SlackBuild b/perl/perl-Unicode-String/perl-Unicode-String.SlackBuild index 327af614a1..b1cc1b90ff 100644 --- a/perl/perl-Unicode-String/perl-Unicode-String.SlackBuild +++ b/perl/perl-Unicode-String/perl-Unicode-String.SlackBuild @@ -53,6 +53,11 @@ find -L . \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ -exec chmod 644 {} \; +# Fix deprecation warning caused by defined(%hash) use (thanks to Arch) +sed -i \ + -e 's/_init_names() unless defined/_init_names() unless/' \ + lib/Unicode/CharName.pm + perl Makefile.PL \ PREFIX=/usr \ INSTALLDIRS=vendor \ diff --git a/perl/perl-class-accessor-chained/README b/perl/perl-class-accessor-chained/README new file mode 100644 index 0000000000..cd1ae2b36e --- /dev/null +++ b/perl/perl-class-accessor-chained/README @@ -0,0 +1,5 @@ +A chained accessor is one that always returns the object when called +with parameters (to set), and the value of the field when called +with no arguments. +This module subclasses Class::Accessor in order to provide the same +mk_accessors interface. diff --git a/libraries/gst1-plugins-base/gst1-plugins-base.SlackBuild b/perl/perl-class-accessor-chained/perl-class-accessor-chained.SlackBuild index 3310dcdcf5..b54093eeaf 100644 --- a/libraries/gst1-plugins-base/gst1-plugins-base.SlackBuild +++ b/perl/perl-class-accessor-chained/perl-class-accessor-chained.SlackBuild @@ -1,8 +1,8 @@ #!/bin/sh -# Slackware build script for gst1-plugins-base +# Slackware build script for perl-class-accessor-chained -# Copyright 2013-2015 Robby Workman, Tuscaloosa, Alabama, USA +# Copyright 2014 Matteo Bernardini <ponce@slackbuilds.org>, Pisa, Italy # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -22,13 +22,12 @@ # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -PRGNAM=gst1-plugins-base -VERSION=${VERSION:-1.4.5} +PRGNAM=perl-class-accessor-chained +SRCNAM=Class-Accessor-Chained +VERSION=${VERSION:-0.01} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} -SRCNAM=gst-plugins-base - if [ -z "$ARCH" ]; then case "$( uname -m )" in i?86) ARCH=i486 ;; @@ -62,7 +61,7 @@ rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT cd $TMP rm -rf $SRCNAM-$VERSION -tar xvf $CWD/$SRCNAM-$VERSION.tar.xz +tar xvf $CWD/$SRCNAM-$VERSION.tar.gz cd $SRCNAM-$VERSION chown -R root:root . find -L . \ @@ -71,30 +70,26 @@ find -L . \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ -exec chmod 644 {} \; -CFLAGS="$SLKCFLAGS" \ -CXXFLAGS="$SLKCFLAGS" \ -./configure \ - --prefix=/usr \ - --libdir=/usr/lib${LIBDIRSUFFIX} \ - --sysconfdir=/etc \ - --localstatedir=/var \ - --mandir=/usr/man \ - --docdir=/usr/doc/$PRGNAM-$VERSION \ - --build=$ARCH-slackware-linux - +perl Makefile.PL \ + PREFIX=/usr \ + INSTALLDIRS=vendor \ + INSTALLVENDORMAN3DIR=/usr/man/man3 make +make test make install DESTDIR=$PKG -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 +find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \ + | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true find $PKG/usr/man -type f -exec gzip -9 {} \; for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done +find $PKG -name perllocal.pod -o -name ".packlist" -o -name "*.bs" | xargs rm -f || true + +find $PKG -depth -type d -empty -delete || true + mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION -cp -a \ - AUTHORS COPYING* ChangeLog INSTALL NEWS RE* \ - $PKG/usr/doc/$PRGNAM-$VERSION +cp -a Changes README $PKG/usr/doc/$PRGNAM-$VERSION cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild mkdir -p $PKG/install diff --git a/perl/perl-class-accessor-chained/perl-class-accessor-chained.info b/perl/perl-class-accessor-chained/perl-class-accessor-chained.info new file mode 100644 index 0000000000..dcda1a9d42 --- /dev/null +++ b/perl/perl-class-accessor-chained/perl-class-accessor-chained.info @@ -0,0 +1,10 @@ +PRGNAM="perl-class-accessor-chained" +VERSION="0.01" +HOMEPAGE="http://search.cpan.org/~rclamp/Class-Accessor-Chained/" +DOWNLOAD="http://search.cpan.org/CPAN/authors/id/R/RC/RCLAMP/Class-Accessor-Chained-0.01.tar.gz" +MD5SUM="9825a1f30a70e55e61bb5660b2bd7365" +DOWNLOAD_x86_64="" +MD5SUM_x86_64="" +REQUIRES="perl-class-accessor" +MAINTAINER="Matteo Bernardini" +EMAIL="ponce@slackbuilds.org" diff --git a/perl/perl-class-accessor-chained/slack-desc b/perl/perl-class-accessor-chained/slack-desc new file mode 100644 index 0000000000..875489fe9c --- /dev/null +++ b/perl/perl-class-accessor-chained/slack-desc @@ -0,0 +1,19 @@ +# HOW TO EDIT THIS FILE: +# The "handy ruler" below makes it easier to edit a package description. +# Line up the first '|' above the ':' following the base package name, and +# the '|' on the right side marks the last column you can put a character in. +# You must make exactly 11 lines for the formatting to be correct. It's also +# customary to leave one space after the ':' except on otherwise blank lines. + + |-----handy-ruler------------------------------------------------------| +perl-class-accessor-chained: perl-class-accessor-chained (make chained accessors) +perl-class-accessor-chained: +perl-class-accessor-chained: A chained accessor is one that always returns the object when called +perl-class-accessor-chained: with parameters (to set), and the value of the field when called +perl-class-accessor-chained: with no arguments. +perl-class-accessor-chained: This module subclasses Class::Accessor in order to provide the same +perl-class-accessor-chained: mk_accessors interface. +perl-class-accessor-chained: +perl-class-accessor-chained: homepage: http://search.cpan.org/~rclamp/Class-Accessor-Chained/ +perl-class-accessor-chained: +perl-class-accessor-chained: diff --git a/perl/perl-data-page-pageset/README b/perl/perl-data-page-pageset/README new file mode 100644 index 0000000000..872933f26e --- /dev/null +++ b/perl/perl-data-page-pageset/README @@ -0,0 +1,2 @@ +This module lets you change long page list to be shorter and well +navigate. diff --git a/perl/perl-data-page-pageset/perl-data-page-pageset.SlackBuild b/perl/perl-data-page-pageset/perl-data-page-pageset.SlackBuild new file mode 100644 index 0000000000..12a55bce70 --- /dev/null +++ b/perl/perl-data-page-pageset/perl-data-page-pageset.SlackBuild @@ -0,0 +1,98 @@ +#!/bin/sh + +# Slackware build script for perl-data-page-pageset + +# Copyright 2014 Matteo Bernardini <ponce@slackbuilds.org>, Pisa, Italy +# All rights reserved. +# +# Redistribution and use of this script, with or without modification, is +# permitted provided that the following conditions are met: +# +# 1. Redistributions of this script must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# +# THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED +# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF +# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO +# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, +# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; +# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, +# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR +# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF +# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +PRGNAM=perl-data-page-pageset +SRCNAM=Data-Page-Pageset +VERSION=${VERSION:-1.02} +BUILD=${BUILD:-1} +TAG=${TAG:-_SBo} + +if [ -z "$ARCH" ]; then + case "$( uname -m )" in + i?86) ARCH=i486 ;; + arm*) ARCH=arm ;; + *) ARCH=$( uname -m ) ;; + esac +fi + +CWD=$(pwd) +TMP=${TMP:-/tmp/SBo} +PKG=$TMP/package-$PRGNAM +OUTPUT=${OUTPUT:-/tmp} + +if [ "$ARCH" = "i486" ]; then + SLKCFLAGS="-O2 -march=i486 -mtune=i686" + LIBDIRSUFFIX="" +elif [ "$ARCH" = "i686" ]; then + SLKCFLAGS="-O2 -march=i686 -mtune=i686" + LIBDIRSUFFIX="" +elif [ "$ARCH" = "x86_64" ]; then + SLKCFLAGS="-O2 -fPIC" + LIBDIRSUFFIX="64" +else + SLKCFLAGS="-O2" + LIBDIRSUFFIX="" +fi + +set -e + +rm -rf $PKG +mkdir -p $TMP $PKG $OUTPUT +cd $TMP +rm -rf $SRCNAM-$VERSION +tar xvf $CWD/$SRCNAM-$VERSION.tar.?z* +cd $SRCNAM-$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 640 -o -perm 600 -o -perm 444 \ + -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; + +perl Makefile.PL \ + PREFIX=/usr \ + INSTALLDIRS=vendor \ + INSTALLVENDORMAN3DIR=/usr/man/man3 +make +make test +make install DESTDIR=$PKG + +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 + +find $PKG/usr/man -type f -exec gzip -9 {} \; +for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done + +find $PKG -name perllocal.pod -o -name ".packlist" -o -name "*.bs" | xargs rm -f || true + +find $PKG -depth -type d -empty -delete || true + +mkdir -p $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 + +cd $PKG +/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz} diff --git a/perl/perl-data-page-pageset/perl-data-page-pageset.info b/perl/perl-data-page-pageset/perl-data-page-pageset.info new file mode 100644 index 0000000000..2f581eb3f4 --- /dev/null +++ b/perl/perl-data-page-pageset/perl-data-page-pageset.info @@ -0,0 +1,10 @@ +PRGNAM="perl-data-page-pageset" +VERSION="1.02" +HOMEPAGE="http://search.cpan.org/~chunzi/Data-Page-Pageset/" +DOWNLOAD="http://search.cpan.org/CPAN/authors/id/C/CH/CHUNZI/Data-Page-Pageset-1.02.tar.gz" +MD5SUM="859bb3abdfa710ef38b1140274eae051" +DOWNLOAD_x86_64="" +MD5SUM_x86_64="" +REQUIRES="perl-data-page" +MAINTAINER="Matteo Bernardini" +EMAIL="ponce@slackbuilds.org" diff --git a/perl/perl-data-page-pageset/slack-desc b/perl/perl-data-page-pageset/slack-desc new file mode 100644 index 0000000000..b1e4f87e00 --- /dev/null +++ b/perl/perl-data-page-pageset/slack-desc @@ -0,0 +1,19 @@ +# HOW TO EDIT THIS FILE: +# The "handy ruler" below makes it easier to edit a package description. +# Line up the first '|' above the ':' following the base package name, and +# the '|' on the right side marks the last column you can put a character in. +# You must make exactly 11 lines for the formatting to be correct. It's also +# customary to leave one space after the ':' except on otherwise blank lines. + + |-----handy-ruler------------------------------------------------------| +perl-data-page-pageset: perl-data-page-pageset (shorten page lists) +perl-data-page-pageset: +perl-data-page-pageset: This module lets you change long page list to be shorter and well +perl-data-page-pageset: navigate. +perl-data-page-pageset: +perl-data-page-pageset: homepage: http://search.cpan.org/~chunzi/Data-Page-Pageset/ +perl-data-page-pageset: +perl-data-page-pageset: +perl-data-page-pageset: +perl-data-page-pageset: +perl-data-page-pageset: diff --git a/perl/perl-data-page/README b/perl/perl-data-page/README new file mode 100644 index 0000000000..f581ac3135 --- /dev/null +++ b/perl/perl-data-page/README @@ -0,0 +1,5 @@ +When searching through large amounts of data, it is often the case +that a result set is returned that is larger than we want to display +on one page. +This results in wanting to page through various pages of data. +The maths behind this is unfortunately fiddly, hence this module. diff --git a/perl/perl-data-page/perl-data-page.SlackBuild b/perl/perl-data-page/perl-data-page.SlackBuild new file mode 100644 index 0000000000..59f10a9260 --- /dev/null +++ b/perl/perl-data-page/perl-data-page.SlackBuild @@ -0,0 +1,99 @@ +#!/bin/sh + +# Slackware build script for perl-data-page + +# Copyright 2014 Matteo Bernardini <ponce@slackbuilds.org>, Pisa, Italy +# All rights reserved. +# +# Redistribution and use of this script, with or without modification, is +# permitted provided that the following conditions are met: +# +# 1. Redistributions of this script must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# +# THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED +# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF +# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO +# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, +# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; +# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, +# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR +# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF +# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +PRGNAM=perl-data-page +SRCNAM=Data-Page +VERSION=${VERSION:-2.02} +BUILD=${BUILD:-1} +TAG=${TAG:-_SBo} + +if [ -z "$ARCH" ]; then + case "$( uname -m )" in + i?86) ARCH=i486 ;; + arm*) ARCH=arm ;; + *) ARCH=$( uname -m ) ;; + esac +fi + +CWD=$(pwd) +TMP=${TMP:-/tmp/SBo} +PKG=$TMP/package-$PRGNAM +OUTPUT=${OUTPUT:-/tmp} + +if [ "$ARCH" = "i486" ]; then + SLKCFLAGS="-O2 -march=i486 -mtune=i686" + LIBDIRSUFFIX="" +elif [ "$ARCH" = "i686" ]; then + SLKCFLAGS="-O2 -march=i686 -mtune=i686" + LIBDIRSUFFIX="" +elif [ "$ARCH" = "x86_64" ]; then + SLKCFLAGS="-O2 -fPIC" + LIBDIRSUFFIX="64" +else + SLKCFLAGS="-O2" + LIBDIRSUFFIX="" +fi + +set -e + +rm -rf $PKG +mkdir -p $TMP $PKG $OUTPUT +cd $TMP +rm -rf $SRCNAM-$VERSION +tar xvf $CWD/$SRCNAM-$VERSION.tar.?z* +cd $SRCNAM-$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 640 -o -perm 600 -o -perm 444 \ + -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; + +perl Makefile.PL \ + PREFIX=/usr \ + INSTALLDIRS=vendor \ + INSTALLVENDORMAN3DIR=/usr/man/man3 +make +make test +make install DESTDIR=$PKG + +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 + +find $PKG/usr/man -type f -exec gzip -9 {} \; +for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done + +find $PKG -name perllocal.pod -o -name ".packlist" -o -name "*.bs" | xargs rm -f || true + +find $PKG -depth -type d -empty -delete || true + +mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION +cp -a README NINJA CHANGES $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 + +cd $PKG +/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz} diff --git a/perl/perl-data-page/perl-data-page.info b/perl/perl-data-page/perl-data-page.info new file mode 100644 index 0000000000..3690bac686 --- /dev/null +++ b/perl/perl-data-page/perl-data-page.info @@ -0,0 +1,10 @@ +PRGNAM="perl-data-page" +VERSION="2.02" +HOMEPAGE="http://search.cpan.org/~lbrocard/Data-Page/" +DOWNLOAD="http://search.cpan.org/CPAN/authors/id/L/LB/LBROCARD/Data-Page-2.02.tar.gz" +MD5SUM="57f9aed8a79687a2712adf7bf2f9cc4d" +DOWNLOAD_x86_64="" +MD5SUM_x86_64="" +REQUIRES="perl-class-accessor-chained perl-Test-Exception" +MAINTAINER="Matteo Bernardini" +EMAIL="ponce@slackbuilds.org" diff --git a/perl/perl-data-page/slack-desc b/perl/perl-data-page/slack-desc new file mode 100644 index 0000000000..f9386a3fee --- /dev/null +++ b/perl/perl-data-page/slack-desc @@ -0,0 +1,19 @@ +# HOW TO EDIT THIS FILE: +# The "handy ruler" below makes it easier to edit a package description. +# Line up the first '|' above the ':' following the base package name, and +# the '|' on the right side marks the last column you can put a character in. +# You must make exactly 11 lines for the formatting to be correct. It's also +# customary to leave one space after the ':' except on otherwise blank lines. + + |-----handy-ruler------------------------------------------------------| +perl-data-page: perl-data-page (help when paging through sets of results) +perl-data-page: +perl-data-page: When searching through large amounts of data, it is often the case +perl-data-page: that a result set is returned that is larger than we want to display +perl-data-page: on one page. +perl-data-page: This results in wanting to page through various pages of data. +perl-data-page: The maths behind this is unfortunately fiddly, hence this module. +perl-data-page: +perl-data-page: homepage: http://search.cpan.org/~lbrocard/Data-Page/ +perl-data-page: +perl-data-page: diff --git a/python/pygobject3/README b/python/pygobject3/README deleted file mode 100644 index 40f7f4e359..0000000000 --- a/python/pygobject3/README +++ /dev/null @@ -1,7 +0,0 @@ -This archive contains bindings for the GObject, to be used in Python. -It is a fairly complete set of bindings, it's already rather useful, -and is usable to write moderately complex programs. - -Note: -If you have python3 installed, then you will need an additional -dependencies: gnome-common and py3cairo diff --git a/python/pygobject3/pygobject3.SlackBuild b/python/pygobject3/pygobject3.SlackBuild deleted file mode 100644 index e4a8fff48a..0000000000 --- a/python/pygobject3/pygobject3.SlackBuild +++ /dev/null @@ -1,104 +0,0 @@ -#!/bin/sh - -# Copyright 2007, 2008 Erik Hanson erik@slackbuilds.org -# Copyright 2008, 2009, 2010 Patrick J. Volkerding, Sebeka, MN, USA -# All rights reserved. -# -# Redistribution and use of this script, with or without modification, is -# permitted provided that the following conditions are met: -# -# Redistributions of this script must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# -# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED -# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO -# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, -# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; -# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, -# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR -# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF -# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - - -PRGNAM=pygobject3 -SRCNAM=pygobject -VERSION=${VERSION:-3.10.2} -BUILD=${BUILD:-2} -TAG=${TAG:-_SBo} - -if [ -z "$ARCH" ]; then - case "$( uname -m )" in - i?86) ARCH=i486 ;; - arm*) ARCH=arm ;; - *) ARCH=$( uname -m ) ;; - esac -fi - -CWD=$(pwd) -TMP=${TMP:-/tmp/SBo} -PKG=$TMP/package-$PRGNAM -OUTPUT=${OUTPUT:-/tmp} - -if [ "$ARCH" = "i486" ]; then - SLKCFLAGS="-O2 -march=i486 -mtune=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "i686" ]; then - SLKCFLAGS="-O2 -march=i686 -mtune=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "x86_64" ]; then - SLKCFLAGS="-O2 -fPIC" - LIBDIRSUFFIX="64" -else - SLKCFLAGS="-O2" - LIBDIRSUFFIX="" -fi - -set -e - -rm -rf $PKG -mkdir -p $TMP $PKG $OUTPUT -cd $TMP -rm -rf $SRCNAM-$VERSION -tar xvf $CWD/$SRCNAM-$VERSION.tar.xz -cd $SRCNAM-$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 640 -o -perm 600 -o -perm 444 \ - -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; - -if $(python3 -c 'import sys' 2>/dev/null); then - patch -p1 < $CWD/python3.4.patch - PYTHON=python3 - ./autogen.sh -fi - -CFLAGS="$SLKCFLAGS" \ -./configure \ - --prefix=/usr \ - --libdir=/usr/lib${LIBDIRSUFFIX} \ - --sysconfdir=/etc \ - --localstatedir=/var \ - --build=$ARCH-slackware-linux - -make -make install DESTDIR=$PKG - -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 INSTALL AUTHORS COPYING* NEWS README* \ - $PKG/usr/doc/$PRGNAM-$VERSION -( cd $PKG/usr/doc/$PRGNAM-$VERSION - ln -s ../../share/gtk-doc/html/pygobject html -) - -mkdir -p $PKG/install -cat $CWD/slack-desc > $PKG/install/slack-desc - -cd $PKG -/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz} diff --git a/python/pygobject3/pygobject3.info b/python/pygobject3/pygobject3.info deleted file mode 100644 index 0b26e704c2..0000000000 --- a/python/pygobject3/pygobject3.info +++ /dev/null @@ -1,10 +0,0 @@ -PRGNAM="pygobject3" -VERSION="3.10.2" -HOMEPAGE="http://www.pygtk.org/" -DOWNLOAD="http://ftp.gnome.org/pub/GNOME/sources/pygobject/3.10/pygobject-3.10.2.tar.xz" -MD5SUM="f311155be8510df6ad8e4edf1cb463d4" -DOWNLOAD_x86_64="" -MD5SUM_x86_64="" -REQUIRES="" -MAINTAINER="Robby Workman" -EMAIL="rworkman@slackbuilds.org" diff --git a/python/pygobject3/python3.4.patch b/python/pygobject3/python3.4.patch deleted file mode 100644 index c71af55b50..0000000000 --- a/python/pygobject3/python3.4.patch +++ /dev/null @@ -1,96 +0,0 @@ -From 2ff095ea0b0c05fbf6cc332eeadf26cfeb9e69f7 Mon Sep 17 00:00:00 2001 -From: Colin Watson <cjwatson@ubuntu.com> -Date: Tue, 24 Dec 2013 22:19:02 +0000 -Subject: build: Avoid clash between gi/types.py and stdlib - -Use non-recursive make for the Python modules in gi/ to work around a -clash between gi/types.py and the standard library's types module when -running py-compile. - -https://bugzilla.gnome.org/show_bug.cgi?id=721025 - -Signed-off-by: Martin Pitt <martinpitt@gnome.org> - -diff --git a/Makefile.am b/Makefile.am -index 5051b54..58d720f 100644 ---- a/Makefile.am -+++ b/Makefile.am -@@ -1,6 +1,9 @@ - ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS} - AUTOMAKE_OPTIONS = 1.7 - -+# Part of the gi subdirectory is handled with non-recursive make to avoid -+# py-compile getting confused between gi/types.py and Python's standard -+# types module. - SUBDIRS = examples gi tests pygtkcompat - - PLATFORM_VERSION = 3.0 -@@ -49,6 +52,27 @@ MAINTAINERCLEANFILES = \ - BUILT_EXTRA_DIST = \ - ChangeLog - -+nobase_pyexec_PYTHON = \ -+ gi/__init__.py \ -+ gi/types.py \ -+ gi/module.py \ -+ gi/importer.py \ -+ gi/pygtkcompat.py \ -+ gi/docstring.py -+ -+# if we build in a separate tree, we need to symlink the *.py files from the -+# source tree; Python does not accept the extensions and modules in different -+# paths -+build_pylinks: -+ for f in $(nobase_pyexec_PYTHON); do \ -+ [ -e $(builddir)/$$f ] || \ -+ $(LN_S) $(abs_srcdir)/$$f $(builddir)/$$f; \ -+ done -+ -+all-local: build_pylinks -+ -+check-local: build_pylinks -+ - # pkg-config files - pkgconfigdir = $(libdir)/pkgconfig - pkgconfig_DATA = pygobject-$(PLATFORM_VERSION).pc -diff --git a/gi/Makefile.am b/gi/Makefile.am -index fc11ff8..aa91a46 100644 ---- a/gi/Makefile.am -+++ b/gi/Makefile.am -@@ -26,14 +26,6 @@ endif - - pygidir = $(pyexecdir)/gi - --pygi_PYTHON = \ -- __init__.py \ -- types.py \ -- module.py \ -- importer.py \ -- pygtkcompat.py \ -- docstring.py -- - pygi_LTLIBRARIES = _gi.la - - _gi_la_SOURCES = \ -@@ -118,16 +110,8 @@ _gi_cairo_la_LDFLAGS = \ - %$(PYTHON_SO): %.la - $(LN_S) -f .libs/$@ $@ - --# if we build in a separate tree, we need to symlink the *.py files from the --# source tree; Python does not accept the extensions and modules in different --# paths --build_pylinks: -- for f in $(pygi_PYTHON); do \ -- [ -e $(builddir)/$$f ] || $(LN_S) $(srcdir)/$$f $(builddir)/$$f; \ -- done -- --all-local: $(LTLIBRARIES:.la=$(PYTHON_SO)) build_pylinks -+all-local: $(LTLIBRARIES:.la=$(PYTHON_SO)) - --check-local: $(LTLIBRARIES:.la=$(PYTHON_SO)) build_pylinks -+check-local: $(LTLIBRARIES:.la=$(PYTHON_SO)) - clean-local: - rm -f $(LTLIBRARIES:.la=$(PYTHON_SO)) --- -cgit v0.10.1 - diff --git a/python/pygobject3/slack-desc b/python/pygobject3/slack-desc deleted file mode 100644 index b944511f4c..0000000000 --- a/python/pygobject3/slack-desc +++ /dev/null @@ -1,19 +0,0 @@ -# HOW TO EDIT THIS FILE: -# The "handy ruler" below makes it easier to edit a package description. -# Line up the first '|' above the ':' following the base package name, and -# the '|' on the right side marks the last column you can put a character in. -# You must make exactly 11 lines for the formatting to be correct. It's also -# customary to leave one space after the ':' except on otherwise blank lines. - - |-----handy-ruler------------------------------------------------------| -pygobject3: pygobject3 (GObject bindings for Python) -pygobject3: -pygobject3: This archive contains bindings for the GObject, to be used in Python. -pygobject3: It is a fairly complete set of bindings, it's already rather useful, -pygobject3: and is usable to write moderately complex programs. -pygobject3: -pygobject3: pygobject's home page: http://www.pygtk.org/ -pygobject3: -pygobject3: -pygobject3: -pygobject3: diff --git a/python/pysetuptools/README b/python/pysetuptools/README deleted file mode 100644 index 1cee00b116..0000000000 --- a/python/pysetuptools/README +++ /dev/null @@ -1,8 +0,0 @@ -pysetuptools (a collection of enhancements to Python distutils) -Note: the name of the source package is 'setuptools'. Since -'setuptools' is such a generic name, this package uses the name -'pysetuptools' to avoid any potential future conflicts. The actual -installation paths and file names are not modified in any way. - -setuptools allow you to more easily build and distribute Python -packages, especially ones that have dependencies on other packages. diff --git a/python/pysetuptools/pysetuptools.info b/python/pysetuptools/pysetuptools.info deleted file mode 100644 index c459daab00..0000000000 --- a/python/pysetuptools/pysetuptools.info +++ /dev/null @@ -1,10 +0,0 @@ -PRGNAM="pysetuptools" -VERSION="18.2" -HOMEPAGE="https://pypi.python.org/pypi/setuptools" -DOWNLOAD="https://pypi.python.org/packages/source/s/setuptools/setuptools-18.2.tar.gz" -MD5SUM="52b4e48939ef311d7204f8fe940764f4" -DOWNLOAD_x86_64="" -MD5SUM_x86_64="" -REQUIRES="" -MAINTAINER="Audrius Kažukauskas" -EMAIL="audrius@neutrino.lt" diff --git a/python/pysetuptools/slack-desc b/python/pysetuptools/slack-desc deleted file mode 100644 index f17cc0b281..0000000000 --- a/python/pysetuptools/slack-desc +++ /dev/null @@ -1,19 +0,0 @@ -# HOW TO EDIT THIS FILE: -# The "handy ruler" below makes it easier to edit a package description. -# Line up the first '|' above the ':' following the base package name, and -# the '|' on the right side marks the last column you can put a character in. -# You must make exactly 11 lines for the formatting to be correct. It's also -# customary to leave one space after the ':' except on otherwise blank lines. - - |-----handy-ruler------------------------------------------------------| -pysetuptools: pysetuptools (a collection of enhancements to Python distutils) -pysetuptools: -pysetuptools: Easily build, install, upgrade, and uninstall Python packages! -pysetuptools: -pysetuptools: Setuptools is a fully-featured, actively-maintained, and stable -pysetuptools: library designed to facilitate packaging Python projects, where -pysetuptools: packaging includes Python package and module definitions, -pysetuptools: distribution package metadata, test hooks, project installation, -pysetuptools: platform-specific details, and Python 3 support. -pysetuptools: -pysetuptools: diff --git a/python/tagpy/tagpy-0.94.8-taglib-1.8_compat.patch b/python/tagpy/tagpy-0.94.8-taglib-1.8_compat.patch deleted file mode 100644 index e6c9bef1d0..0000000000 --- a/python/tagpy/tagpy-0.94.8-taglib-1.8_compat.patch +++ /dev/null @@ -1,30 +0,0 @@ -https://github.com/inducer/tagpy/commit/d0759c0ec7d24ae8d1af395a1032521eb00b4d1f -https://github.com/inducer/tagpy/commit/813ec4f03bb4411c7ffd15dcb3974da04a3f109c - ---- tagpy-0.94.8/src/wrapper/id3.cpp -+++ tagpy-0.94.8/src/wrapper/id3.cpp -@@ -79,6 +79,10 @@ - MF_OL(setVolumeAdjustment, 1, 2); - MF_OL(setPeakVolume, 1, 2); - -+ #if (TAGPY_TAGLIB_HEX_VERSION >= 0x10800) -+ MF_OL(render, 0, 1) -+ #endif -+ - // ------------------------------------------------------------- - // MPEG - // ------------------------------------------------------------- -@@ -212,7 +216,12 @@ - .DEF_SIMPLE_METHOD(removeFrame) - .DEF_SIMPLE_METHOD(removeFrames) - -- .DEF_SIMPLE_METHOD(render) -+ #if (TAGPY_TAGLIB_HEX_VERSION >= 0x10800) -+ .DEF_OVERLOADED_METHOD(render, ByteVector (cl::*)() const) -+ .DEF_OVERLOADED_METHOD(render, ByteVector (cl::*)(int) const) -+ #else -+ .def("render", (ByteVector (cl::*)() const) &cl::render) -+ #endif - ; - } - diff --git a/python/tagpy/tagpy.SlackBuild b/python/tagpy/tagpy.SlackBuild index 7952f52f95..b4f8b61bb0 100644 --- a/python/tagpy/tagpy.SlackBuild +++ b/python/tagpy/tagpy.SlackBuild @@ -23,7 +23,7 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=tagpy -VERSION=${VERSION:-0.94.8} +VERSION=${VERSION:-2013.1} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -67,8 +67,6 @@ find -L . \ # Remove ez_setup. We don't want to download distribute. sed -i -e '/distribute_setup/d' -e "s/^if.*/if False:/" aksetup_helper.py -patch -p1 < $CWD/tagpy-0.94.8-taglib-1.8_compat.patch - ./configure.py \ --taglib-inc-dir="/usr/include/taglib" \ --boost-python-libname="boost_python" \ diff --git a/python/tagpy/tagpy.info b/python/tagpy/tagpy.info index 460a02c27f..1c78588cf1 100644 --- a/python/tagpy/tagpy.info +++ b/python/tagpy/tagpy.info @@ -1,8 +1,8 @@ PRGNAM="tagpy" -VERSION="0.94.8" +VERSION="2013.1" HOMEPAGE="http://mathema.tician.de/software/tagpy" -DOWNLOAD="http://pypi.python.org/packages/source/t/tagpy/tagpy-0.94.8.tar.gz" -MD5SUM="6baff63318cf90b9bc5a2497a0597802" +DOWNLOAD="https://pypi.python.org/packages/source/t/tagpy/tagpy-2013.1.tar.gz" +MD5SUM="96cbbd8adb8a6c0b9c21851979cc7c64" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="pysetuptools" diff --git a/ruby/chronic/chronic.SlackBuild b/ruby/chronic/chronic.SlackBuild index e7f38605d7..9dbd3b4aa7 100644 --- a/ruby/chronic/chronic.SlackBuild +++ b/ruby/chronic/chronic.SlackBuild @@ -71,12 +71,12 @@ printf("%s/%s/gems/%s\n", gem specification $CWD/$PRGNAM-$VERSION.gem | \ ruby -r yaml -r rbconfig -e ' -c = Config::CONFIG +c = RbConfig::CONFIG path = sprintf("%s/%s/gems/%s", c["libdir"], c["RUBY_INSTALL_NAME"], c["ruby_version"]) -sys_gemspecs = Dir.glob(path + "/specifications/*").map {|g| gs = Gem::Specification.load(g); gs.name } +sys_gemspecs = Dir.glob(path + "/specifications/**/*.gemspec").map {|g| gs = Gem::Specification.load(g); gs.name } obj = Gem::Specification.from_yaml($stdin) obj.dependencies.each {|dep| if not(dep.type == :runtime) diff --git a/ruby/passenger/passenger.SlackBuild b/ruby/passenger/passenger.SlackBuild index 6766e23b56..52b1e5bfc6 100644 --- a/ruby/passenger/passenger.SlackBuild +++ b/ruby/passenger/passenger.SlackBuild @@ -76,7 +76,7 @@ path = sprintf("%s/%s/gems/%s", c["libdir"], c["RUBY_INSTALL_NAME"], c["ruby_version"]) -sys_gemspecs = Dir.glob(path + "/specifications/*").map {|g| gs = Gem::Specification.load(g); gs.name } +sys_gemspecs = Dir.glob(path + "/specifications/**/*.gemspec").map {|g| gs = Gem::Specification.load(g); gs.name } obj = Gem::Specification.from_yaml($stdin) obj.dependencies.each {|dep| if not(dep.type == :runtime) diff --git a/ruby/ruby-faraday/ruby-faraday.SlackBuild b/ruby/ruby-faraday/ruby-faraday.SlackBuild index 760d06d62e..37c82d9cec 100644 --- a/ruby/ruby-faraday/ruby-faraday.SlackBuild +++ b/ruby/ruby-faraday/ruby-faraday.SlackBuild @@ -80,12 +80,12 @@ printf("%s/%s/gems/%s\n", gem specification $CWD/$SRCNAM-$VERSION.gem | \ ruby -r yaml -r rbconfig -e ' -c = Config::CONFIG +c = RbConfig::CONFIG path = sprintf("%s/%s/gems/%s", c["libdir"], c["RUBY_INSTALL_NAME"], c["ruby_version"]) -sys_gemspecs = Dir.glob(path + "/specifications/*").map {|g| gs = Gem::Specification.load(g); gs.name } +sys_gemspecs = Dir.glob(path + "/specifications/**/*.gemspec").map {|g| gs = Gem::Specification.load(g); gs.name } obj = Gem::Specification.from_yaml($stdin) obj.dependencies.each {|dep| if not(dep.type == :runtime) @@ -117,4 +117,4 @@ mkdir -p $PKG/install cat $CWD/slack-desc > $PKG/install/slack-desc cd $PKG -/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
\ No newline at end of file +/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz} diff --git a/ruby/ruby-haste/ruby-haste.SlackBuild b/ruby/ruby-haste/ruby-haste.SlackBuild index 97fc6c6004..4e99681957 100644 --- a/ruby/ruby-haste/ruby-haste.SlackBuild +++ b/ruby/ruby-haste/ruby-haste.SlackBuild @@ -80,12 +80,12 @@ printf("%s/%s/gems/%s\n", gem specification $CWD/$SRCNAM-$VERSION.gem | \ ruby -r yaml -r rbconfig -e ' -c = Config::CONFIG +c = RbConfig::CONFIG path = sprintf("%s/%s/gems/%s", c["libdir"], c["RUBY_INSTALL_NAME"], c["ruby_version"]) -sys_gemspecs = Dir.glob(path + "/specifications/*").map {|g| gs = Gem::Specification.load(g); gs.name } +sys_gemspecs = Dir.glob(path + "/specifications/**/*.gemspec").map {|g| gs = Gem::Specification.load(g); gs.name } obj = Gem::Specification.from_yaml($stdin) obj.dependencies.each {|dep| if not(dep.type == :runtime) @@ -117,4 +117,4 @@ mkdir -p $PKG/install cat $CWD/slack-desc > $PKG/install/slack-desc cd $PKG -/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
\ No newline at end of file +/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz} diff --git a/ruby/ruby-json/ruby-json.SlackBuild b/ruby/ruby-json/ruby-json.SlackBuild index 16d6443c71..1dcb342724 100644 --- a/ruby/ruby-json/ruby-json.SlackBuild +++ b/ruby/ruby-json/ruby-json.SlackBuild @@ -80,12 +80,12 @@ printf("%s/%s/gems/%s\n", gem specification $CWD/$SRCNAM-$VERSION.gem | \ ruby -r yaml -r rbconfig -e ' -c = Config::CONFIG +c = RbConfig::CONFIG path = sprintf("%s/%s/gems/%s", c["libdir"], c["RUBY_INSTALL_NAME"], c["ruby_version"]) -sys_gemspecs = Dir.glob(path + "/specifications/*").map {|g| gs = Gem::Specification.load(g); gs.name } +sys_gemspecs = Dir.glob(path + "/specifications/**/*.gemspec").map {|g| gs = Gem::Specification.load(g); gs.name } obj = Gem::Specification.from_yaml($stdin) obj.dependencies.each {|dep| if not(dep.type == :runtime) @@ -117,4 +117,4 @@ mkdir -p $PKG/install cat $CWD/slack-desc > $PKG/install/slack-desc cd $PKG -/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
\ No newline at end of file +/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz} diff --git a/ruby/ruby-multipart-post/ruby-multipart-post.SlackBuild b/ruby/ruby-multipart-post/ruby-multipart-post.SlackBuild index 844e80b7ff..2ddc4ae094 100644 --- a/ruby/ruby-multipart-post/ruby-multipart-post.SlackBuild +++ b/ruby/ruby-multipart-post/ruby-multipart-post.SlackBuild @@ -80,12 +80,12 @@ printf("%s/%s/gems/%s\n", gem specification $CWD/$SRCNAM-$VERSION.gem | \ ruby -r yaml -r rbconfig -e ' -c = Config::CONFIG +c = RbConfig::CONFIG path = sprintf("%s/%s/gems/%s", c["libdir"], c["RUBY_INSTALL_NAME"], c["ruby_version"]) -sys_gemspecs = Dir.glob(path + "/specifications/*").map {|g| gs = Gem::Specification.load(g); gs.name } +sys_gemspecs = Dir.glob(path + "/specifications/**/*.gemspec").map {|g| gs = Gem::Specification.load(g); gs.name } obj = Gem::Specification.from_yaml($stdin) obj.dependencies.each {|dep| if not(dep.type == :runtime) diff --git a/ruby/ruby2/README b/ruby/ruby2/README deleted file mode 100644 index 8016fdaeef..0000000000 --- a/ruby/ruby2/README +++ /dev/null @@ -1,19 +0,0 @@ -Ruby is an interpreted scripting language for quick and easy -object-oriented programming. It has many features to process text -files and to do system management tasks (as in Perl). It is simple, -straight-forward, and extensible. - -Notes -====== - -This build script will install a newer version of ruby alongside -the provided official Slackware ruby package, however it will overwrite -/usr/lib{64}/libruby.so, so make sure to reinstall ruby package -when you remove this package. - -This package is not required, as the standard Slackware -system does provide a version of ruby. - -Execute using '/usr/bin/ruby2' to utilize. All binaries -installed by this package are installed with an added "2" at the -end of each. (ruby2, rake2, irb2, gem2, erb2, rdoc2, ri2) diff --git a/ruby/ruby2/ruby2.SlackBuild b/ruby/ruby2/ruby2.SlackBuild deleted file mode 100644 index 4cc787e09a..0000000000 --- a/ruby/ruby2/ruby2.SlackBuild +++ /dev/null @@ -1,140 +0,0 @@ -#!/bin/sh - -# Copyright 2015 Brenton Earl <brent@exitstatusone.com>, Tooele, UT, USA -# All rights reserved. -# -# Modified the Official Slackware 14.1 Slackbuild -# -# Copyright 2008, 2009, 2010, 2011, 2012, 2013 Patrick J. Volkerding, Sebeka, MN, USA -# All rights reserved. -# -# Parts taken from Daniel Romero's Ruby 2.0 Slackbuild script -# Copyright 2013 Daniel Romero <infoslack@gmail.com>, Fortaleza, CE, BRA -# All rights reserved. -# -# Redistribution and use of this script, with or without modification, is -# permitted provided that the following conditions are met: -# -# 1. Redistributions of this script must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# -# THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED -# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO -# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, -# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; -# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, -# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR -# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF -# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -PRGNAM=ruby2 -SRCNAM=ruby -VERSION=${VERSION:-2.2.3} -BUILD=${BUILD:-1} -TAG=${TAG:-_SBo} - -if [ -z "$ARCH" ]; then - case "$( uname -m )" in - i?86) ARCH=i486 ;; - arm*) ARCH=arm ;; - *) ARCH=$( uname -m ) ;; - esac -fi - -CWD=$(pwd) -TMP=${TMP:-/tmp/SBo} -PKG=$TMP/package-$PRGNAM -OUTPUT=${OUTPUT:-/tmp} - -if [ "$ARCH" = "i486" ]; then - SLKCFLAGS="-march=i486 -mtune=i686 -O3 -fno-strict-aliasing" - OPTFLAGS=-O3 - LIBDIRSUFFIX="" -elif [ "$ARCH" = "s390" ]; then - SLKCFLAGS="-O3 -fno-strict-aliasing" - OPTFLAGS=-O3 - LIBDIRSUFFIX="" -elif [ "$ARCH" = "x86_64" ]; then - SLKCFLAGS="-O3 -fPIC -fno-strict-aliasing" - OPTFLAGS=-O3 - LIBDIRSUFFIX="64" -fi - -set -e - -rm -rf $PKG -mkdir -p $TMP $PKG $OUTPUT -cd $TMP -rm -rf $SRCNAM-$VERSION -tar xvf $CWD/$SRCNAM-$VERSION.tar.gz -cd $SRCNAM-$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 640 -o -perm 600 -o -perm 444 \ - -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; - -CFLAGS="$SLKCFLAGS" \ -optflags=$OPTFLAGS \ -./configure \ - --prefix=/usr \ - --libdir=/usr/lib${LIBDIRSUFFIX} \ - --mandir=/usr/man \ - --datadir=/usr/share \ - --docdir=/usr/doc/$PRGNAM-$VERSION \ - --enable-shared \ - --enable-pthread \ - --disable-install-capi \ - --build=$ARCH-slackware-linux - -make -make install DESTDIR=$PKG - -# Maintaining compatibility with another version of Ruby that is already installed -# Remove this block if you want to just keep this version -( cd $PKG/usr/bin - mv ruby ruby2 - mv rake rake2 - sed -i '0,/ruby/{s/ruby/ruby2/}' rake2 - mv irb irb2 - sed -i '0,/ruby/{s/ruby/ruby2/}' irb2 - mv gem gem2 - sed -i '0,/ruby/{s/ruby/ruby2/}' gem2 - mv erb erb2 - sed -i '0,/ruby/{s/ruby/ruby2/}' erb2 - mv rdoc rdoc2 - sed -i '0,/ruby/{s/ruby/ruby2/}' rdoc2 - mv ri ri2 - sed -i '0,/ruby/{s/ruby/ruby2/}' ri2 -) - -mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION -cp -a BSDL CONTRIBUTING* COPYING* *GPL* ChangeLog LEGAL NEWS README* \ - $PKG/usr/doc/$PRGNAM-$VERSION - -# Remove static file so it will not overwrite Slackware's ruby -rm -f $PKG/usr/lib${LIBDIRSUFFIX}/libruby-static.a - -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 - -# Rename man files so it will not overwrite Slackware's ruby man files -cd $PKG/usr/man/man1 -mv erb.1 erb2.1 -mv irb.1 irb2.1 -mv rake.1 rake2.1 -mv ri.1 ri2.1 -mv ruby.1 ruby2.1 - -cd $TMP/$SRCNAM-$VERSION -find $PKG/usr/man -type f -exec gzip -9 {} \; -for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done - -mkdir -p $PKG/install -cat $CWD/slack-desc > $PKG/install/slack-desc - -cd $PKG -/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz} diff --git a/ruby/ruby2/ruby2.info b/ruby/ruby2/ruby2.info deleted file mode 100644 index b2b6af2d2c..0000000000 --- a/ruby/ruby2/ruby2.info +++ /dev/null @@ -1,10 +0,0 @@ -PRGNAM="ruby2" -VERSION="2.2.3" -HOMEPAGE="http://www.ruby-lang.org" -DOWNLOAD="https://cache.ruby-lang.org/pub/ruby/2.2/ruby-2.2.3.tar.gz" -MD5SUM="150a5efc5f5d8a8011f30aa2594a7654" -DOWNLOAD_x86_64="" -MD5SUM_x86_64="" -REQUIRES="%README%" -MAINTAINER="Brenton Earl" -EMAIL="brent@exitstatusone.com" diff --git a/ruby/rubygem-atk/rubygem-atk.SlackBuild b/ruby/rubygem-atk/rubygem-atk.SlackBuild index 1188b0e2e0..8c3f3461a0 100644 --- a/ruby/rubygem-atk/rubygem-atk.SlackBuild +++ b/ruby/rubygem-atk/rubygem-atk.SlackBuild @@ -82,7 +82,7 @@ path = sprintf("%s/%s/gems/%s", c["libdir"], c["RUBY_INSTALL_NAME"], c["ruby_version"]) -sys_gemspecs = Dir.glob(path + "/specifications/*").map {|g| gs = Gem::Specification.load(g); gs.name } +sys_gemspecs = Dir.glob(path + "/specifications/**/*.gemspec").map {|g| gs = Gem::Specification.load(g); gs.name } obj = Gem::Specification.from_yaml($stdin) obj.dependencies.each {|dep| if not(dep.type == :runtime) diff --git a/ruby/rubygem-cairo/rubygem-cairo.SlackBuild b/ruby/rubygem-cairo/rubygem-cairo.SlackBuild index 4c6344a971..ab38ce501a 100644 --- a/ruby/rubygem-cairo/rubygem-cairo.SlackBuild +++ b/ruby/rubygem-cairo/rubygem-cairo.SlackBuild @@ -82,7 +82,7 @@ path = sprintf("%s/%s/gems/%s", c["libdir"], c["RUBY_INSTALL_NAME"], c["ruby_version"]) -sys_gemspecs = Dir.glob(path + "/specifications/*").map {|g| gs = Gem::Specification.load(g); gs.name } +sys_gemspecs = Dir.glob(path + "/specifications/**/*.gemspec").map {|g| gs = Gem::Specification.load(g); gs.name } obj = Gem::Specification.from_yaml($stdin) obj.dependencies.each {|dep| if not(dep.type == :runtime) diff --git a/ruby/rubygem-cool.io/rubygem-cool.io.SlackBuild b/ruby/rubygem-cool.io/rubygem-cool.io.SlackBuild index 199fa02c41..54022ccc7e 100644 --- a/ruby/rubygem-cool.io/rubygem-cool.io.SlackBuild +++ b/ruby/rubygem-cool.io/rubygem-cool.io.SlackBuild @@ -78,7 +78,7 @@ path = sprintf("%s/%s/gems/%s", c["libdir"], c["RUBY_INSTALL_NAME"], c["ruby_version"]) -sys_gemspecs = Dir.glob(path + "/specifications/*").map {|g| gs = Gem::Specification.load(g); gs.name } +sys_gemspecs = Dir.glob(path + "/specifications/**/*.gemspec").map {|g| gs = Gem::Specification.load(g); gs.name } obj = Gem::Specification.from_yaml($stdin) obj.dependencies.each {|dep| if not(dep.type == :runtime) diff --git a/ruby/rubygem-fastercsv/rubygem-fastercsv.SlackBuild b/ruby/rubygem-fastercsv/rubygem-fastercsv.SlackBuild index bdbf6ff5fd..89ef2e9b01 100644 --- a/ruby/rubygem-fastercsv/rubygem-fastercsv.SlackBuild +++ b/ruby/rubygem-fastercsv/rubygem-fastercsv.SlackBuild @@ -73,12 +73,12 @@ printf("%s/%s/gems/%s\n", # print a friendly warning of unsatisfied ":runtime" dependencies gem specification $CWD/$SRCNAM-$VERSION.gem | \ ruby -r yaml -r rbconfig -e ' -c = Config::CONFIG +c = RbConfig::CONFIG path = sprintf("%s/%s/gems/%s", c["libdir"], c["RUBY_INSTALL_NAME"], c["ruby_version"]) -sys_gemspecs = Dir.glob(path + "/specifications/*").map {|g| gs = Gem::Specification.load(g); gs.name } +sys_gemspecs = Dir.glob(path + "/specifications/**/*.gemspec").map {|g| gs = Gem::Specification.load(g); gs.name } obj = Gem::Specification.from_yaml($stdin) obj.dependencies.each {|dep| if not(dep.type == :runtime) diff --git a/ruby/rubygem-fluentd/rubygem-fluentd.SlackBuild b/ruby/rubygem-fluentd/rubygem-fluentd.SlackBuild index 9346f4cb52..be655ec839 100644 --- a/ruby/rubygem-fluentd/rubygem-fluentd.SlackBuild +++ b/ruby/rubygem-fluentd/rubygem-fluentd.SlackBuild @@ -78,7 +78,7 @@ path = sprintf("%s/%s/gems/%s", c["libdir"], c["RUBY_INSTALL_NAME"], c["ruby_version"]) -sys_gemspecs = Dir.glob(path + "/specifications/*").map {|g| gs = Gem::Specification.load(g); gs.name } +sys_gemspecs = Dir.glob(path + "/specifications/**/*.gemspec").map {|g| gs = Gem::Specification.load(g); gs.name } obj = Gem::Specification.from_yaml($stdin) obj.dependencies.each {|dep| if not(dep.type == :runtime) diff --git a/ruby/rubygem-gdk_pixbuf2/rubygem-gdk_pixbuf2.SlackBuild b/ruby/rubygem-gdk_pixbuf2/rubygem-gdk_pixbuf2.SlackBuild index 539c020b75..bda8980f03 100644 --- a/ruby/rubygem-gdk_pixbuf2/rubygem-gdk_pixbuf2.SlackBuild +++ b/ruby/rubygem-gdk_pixbuf2/rubygem-gdk_pixbuf2.SlackBuild @@ -82,7 +82,7 @@ path = sprintf("%s/%s/gems/%s", c["libdir"], c["RUBY_INSTALL_NAME"], c["ruby_version"]) -sys_gemspecs = Dir.glob(path + "/specifications/*").map {|g| gs = Gem::Specification.load(g); gs.name } +sys_gemspecs = Dir.glob(path + "/specifications/**/*.gemspec").map {|g| gs = Gem::Specification.load(g); gs.name } obj = Gem::Specification.from_yaml($stdin) obj.dependencies.each {|dep| if not(dep.type == :runtime) diff --git a/ruby/rubygem-glib2/rubygem-glib2.SlackBuild b/ruby/rubygem-glib2/rubygem-glib2.SlackBuild index a711ab78af..fbe36c9342 100644 --- a/ruby/rubygem-glib2/rubygem-glib2.SlackBuild +++ b/ruby/rubygem-glib2/rubygem-glib2.SlackBuild @@ -82,7 +82,7 @@ path = sprintf("%s/%s/gems/%s", c["libdir"], c["RUBY_INSTALL_NAME"], c["ruby_version"]) -sys_gemspecs = Dir.glob(path + "/specifications/*").map {|g| gs = Gem::Specification.load(g); gs.name } +sys_gemspecs = Dir.glob(path + "/specifications/**/*.gemspec").map {|g| gs = Gem::Specification.load(g); gs.name } obj = Gem::Specification.from_yaml($stdin) obj.dependencies.each {|dep| if not(dep.type == :runtime) diff --git a/ruby/rubygem-gtk2/rubygem-gtk2.SlackBuild b/ruby/rubygem-gtk2/rubygem-gtk2.SlackBuild index 4018f2f4c2..4cd86cf2c9 100644 --- a/ruby/rubygem-gtk2/rubygem-gtk2.SlackBuild +++ b/ruby/rubygem-gtk2/rubygem-gtk2.SlackBuild @@ -82,7 +82,7 @@ path = sprintf("%s/%s/gems/%s", c["libdir"], c["RUBY_INSTALL_NAME"], c["ruby_version"]) -sys_gemspecs = Dir.glob(path + "/specifications/*").map {|g| gs = Gem::Specification.load(g); gs.name } +sys_gemspecs = Dir.glob(path + "/specifications/**/*.gemspec").map {|g| gs = Gem::Specification.load(g); gs.name } obj = Gem::Specification.from_yaml($stdin) obj.dependencies.each {|dep| if not(dep.type == :runtime) diff --git a/ruby/rubygem-highline/rubygem-highline.SlackBuild b/ruby/rubygem-highline/rubygem-highline.SlackBuild index a04c7c4cf4..394106eb96 100644 --- a/ruby/rubygem-highline/rubygem-highline.SlackBuild +++ b/ruby/rubygem-highline/rubygem-highline.SlackBuild @@ -73,12 +73,12 @@ printf("%s/%s/gems/%s\n", # print a friendly warning of unsatisfied ":runtime" dependencies gem specification $CWD/$SRCNAM-$VERSION.gem | \ ruby -r yaml -r rbconfig -e ' -c = Config::CONFIG +c = RbConfig::CONFIG path = sprintf("%s/%s/gems/%s", c["libdir"], c["RUBY_INSTALL_NAME"], c["ruby_version"]) -sys_gemspecs = Dir.glob(path + "/specifications/*").map {|g| gs = Gem::Specification.load(g); gs.name } +sys_gemspecs = Dir.glob(path + "/specifications/**/*.gemspec").map {|g| gs = Gem::Specification.load(g); gs.name } obj = Gem::Specification.from_yaml($stdin) obj.dependencies.each {|dep| if not(dep.type == :runtime) diff --git a/ruby/rubygem-http_parser.rb/rubygem-http_parser.rb.SlackBuild b/ruby/rubygem-http_parser.rb/rubygem-http_parser.rb.SlackBuild index 821720b651..5446ad22bd 100644 --- a/ruby/rubygem-http_parser.rb/rubygem-http_parser.rb.SlackBuild +++ b/ruby/rubygem-http_parser.rb/rubygem-http_parser.rb.SlackBuild @@ -78,7 +78,7 @@ path = sprintf("%s/%s/gems/%s", c["libdir"], c["RUBY_INSTALL_NAME"], c["ruby_version"]) -sys_gemspecs = Dir.glob(path + "/specifications/*").map {|g| gs = Gem::Specification.load(g); gs.name } +sys_gemspecs = Dir.glob(path + "/specifications/**/*.gemspec").map {|g| gs = Gem::Specification.load(g); gs.name } obj = Gem::Specification.from_yaml($stdin) obj.dependencies.each {|dep| if not(dep.type == :runtime) diff --git a/ruby/rubygem-msgpack/rubygem-msgpack.SlackBuild b/ruby/rubygem-msgpack/rubygem-msgpack.SlackBuild index c2291781a2..b8d3ab7867 100644 --- a/ruby/rubygem-msgpack/rubygem-msgpack.SlackBuild +++ b/ruby/rubygem-msgpack/rubygem-msgpack.SlackBuild @@ -78,7 +78,7 @@ path = sprintf("%s/%s/gems/%s", c["libdir"], c["RUBY_INSTALL_NAME"], c["ruby_version"]) -sys_gemspecs = Dir.glob(path + "/specifications/*").map {|g| gs = Gem::Specification.load(g); gs.name } +sys_gemspecs = Dir.glob(path + "/specifications/**/*.gemspec").map {|g| gs = Gem::Specification.load(g); gs.name } obj = Gem::Specification.from_yaml($stdin) obj.dependencies.each {|dep| if not(dep.type == :runtime) diff --git a/ruby/rubygem-pango/rubygem-pango.SlackBuild b/ruby/rubygem-pango/rubygem-pango.SlackBuild index 919f159cd3..d95941cf28 100644 --- a/ruby/rubygem-pango/rubygem-pango.SlackBuild +++ b/ruby/rubygem-pango/rubygem-pango.SlackBuild @@ -82,7 +82,7 @@ path = sprintf("%s/%s/gems/%s", c["libdir"], c["RUBY_INSTALL_NAME"], c["ruby_version"]) -sys_gemspecs = Dir.glob(path + "/specifications/*").map {|g| gs = Gem::Specification.load(g); gs.name } +sys_gemspecs = Dir.glob(path + "/specifications/**/*.gemspec").map {|g| gs = Gem::Specification.load(g); gs.name } obj = Gem::Specification.from_yaml($stdin) obj.dependencies.each {|dep| if not(dep.type == :runtime) diff --git a/ruby/rubygem-pkg-config/rubygem-pkg-config.SlackBuild b/ruby/rubygem-pkg-config/rubygem-pkg-config.SlackBuild index 4010eb2541..19e35c6b71 100644 --- a/ruby/rubygem-pkg-config/rubygem-pkg-config.SlackBuild +++ b/ruby/rubygem-pkg-config/rubygem-pkg-config.SlackBuild @@ -74,12 +74,12 @@ printf("%s/%s/gems/%s\n", # print a friendly warning of unsatisfied dependencies gem specification $CWD/$SRCNAM-$VERSION.gem | \ ruby -r yaml -r rbconfig -e ' -c = Config::CONFIG +c = RbConfig::CONFIG path = sprintf("%s/%s/gems/%s", c["libdir"], c["RUBY_INSTALL_NAME"], c["ruby_version"]) -sys_gemspecs = Dir.glob(path + "/specifications/*").map {|g| gs = Gem::Specification.load(g); gs.name } +sys_gemspecs = Dir.glob(path + "/specifications/**/*.gemspec").map {|g| gs = Gem::Specification.load(g); gs.name } obj = Gem::Specification.from_yaml($stdin) obj.dependencies.each {|dep| if not(dep.type == :runtime) diff --git a/ruby/rubygem-rack/rubygem-rack.SlackBuild b/ruby/rubygem-rack/rubygem-rack.SlackBuild index 1dcdd09b85..2fa8bfc917 100644 --- a/ruby/rubygem-rack/rubygem-rack.SlackBuild +++ b/ruby/rubygem-rack/rubygem-rack.SlackBuild @@ -78,7 +78,7 @@ path = sprintf("%s/%s/gems/%s", c["libdir"], c["RUBY_INSTALL_NAME"], c["ruby_version"]) -sys_gemspecs = Dir.glob(path + "/specifications/*").map {|g| gs = Gem::Specification.load(g); gs.name } +sys_gemspecs = Dir.glob(path + "/specifications/**/*.gemspec").map {|g| gs = Gem::Specification.load(g); gs.name } obj = Gem::Specification.from_yaml($stdin) obj.dependencies.each {|dep| if not(dep.type == :runtime) diff --git a/ruby/rubygem-sigdump/rubygem-sigdump.SlackBuild b/ruby/rubygem-sigdump/rubygem-sigdump.SlackBuild index da254bed5d..18ab4d39ba 100644 --- a/ruby/rubygem-sigdump/rubygem-sigdump.SlackBuild +++ b/ruby/rubygem-sigdump/rubygem-sigdump.SlackBuild @@ -78,7 +78,7 @@ path = sprintf("%s/%s/gems/%s", c["libdir"], c["RUBY_INSTALL_NAME"], c["ruby_version"]) -sys_gemspecs = Dir.glob(path + "/specifications/*").map {|g| gs = Gem::Specification.load(g); gs.name } +sys_gemspecs = Dir.glob(path + "/specifications/**/*.gemspec").map {|g| gs = Gem::Specification.load(g); gs.name } obj = Gem::Specification.from_yaml($stdin) obj.dependencies.each {|dep| if not(dep.type == :runtime) diff --git a/ruby/rubygem-string-scrub/rubygem-string-scrub.SlackBuild b/ruby/rubygem-string-scrub/rubygem-string-scrub.SlackBuild index 29c8a9b7ea..b173b86171 100644 --- a/ruby/rubygem-string-scrub/rubygem-string-scrub.SlackBuild +++ b/ruby/rubygem-string-scrub/rubygem-string-scrub.SlackBuild @@ -78,7 +78,7 @@ path = sprintf("%s/%s/gems/%s", c["libdir"], c["RUBY_INSTALL_NAME"], c["ruby_version"]) -sys_gemspecs = Dir.glob(path + "/specifications/*").map {|g| gs = Gem::Specification.load(g); gs.name } +sys_gemspecs = Dir.glob(path + "/specifications/**/*.gemspec").map {|g| gs = Gem::Specification.load(g); gs.name } obj = Gem::Specification.from_yaml($stdin) obj.dependencies.each {|dep| if not(dep.type == :runtime) diff --git a/ruby/rubygem-terminal-table/rubygem-terminal-table.SlackBuild b/ruby/rubygem-terminal-table/rubygem-terminal-table.SlackBuild index db5a24f3e9..775b3fc1ae 100644 --- a/ruby/rubygem-terminal-table/rubygem-terminal-table.SlackBuild +++ b/ruby/rubygem-terminal-table/rubygem-terminal-table.SlackBuild @@ -73,12 +73,12 @@ printf("%s/%s/gems/%s\n", # print a friendly warning of unsatisfied ":runtime" dependencies gem specification $CWD/$SRCNAM-$VERSION.gem | \ ruby -r yaml -r rbconfig -e ' -c = Config::CONFIG +c = RbConfig::CONFIG path = sprintf("%s/%s/gems/%s", c["libdir"], c["RUBY_INSTALL_NAME"], c["ruby_version"]) -sys_gemspecs = Dir.glob(path + "/specifications/*").map {|g| gs = Gem::Specification.load(g); gs.name } +sys_gemspecs = Dir.glob(path + "/specifications/**/*.gemspec").map {|g| gs = Gem::Specification.load(g); gs.name } obj = Gem::Specification.from_yaml($stdin) obj.dependencies.each {|dep| if not(dep.type == :runtime) diff --git a/ruby/rubygem-thread_safe/rubygem-thread_safe.SlackBuild b/ruby/rubygem-thread_safe/rubygem-thread_safe.SlackBuild index aa16851ede..7421b6b39f 100644 --- a/ruby/rubygem-thread_safe/rubygem-thread_safe.SlackBuild +++ b/ruby/rubygem-thread_safe/rubygem-thread_safe.SlackBuild @@ -78,7 +78,7 @@ path = sprintf("%s/%s/gems/%s", c["libdir"], c["RUBY_INSTALL_NAME"], c["ruby_version"]) -sys_gemspecs = Dir.glob(path + "/specifications/*").map {|g| gs = Gem::Specification.load(g); gs.name } +sys_gemspecs = Dir.glob(path + "/specifications/**/*.gemspec").map {|g| gs = Gem::Specification.load(g); gs.name } obj = Gem::Specification.from_yaml($stdin) obj.dependencies.each {|dep| if not(dep.type == :runtime) diff --git a/ruby/rubygem-tzinfo-data/rubygem-tzinfo-data.SlackBuild b/ruby/rubygem-tzinfo-data/rubygem-tzinfo-data.SlackBuild index 34305de75e..a9dce0e403 100644 --- a/ruby/rubygem-tzinfo-data/rubygem-tzinfo-data.SlackBuild +++ b/ruby/rubygem-tzinfo-data/rubygem-tzinfo-data.SlackBuild @@ -78,7 +78,7 @@ path = sprintf("%s/%s/gems/%s", c["libdir"], c["RUBY_INSTALL_NAME"], c["ruby_version"]) -sys_gemspecs = Dir.glob(path + "/specifications/*").map {|g| gs = Gem::Specification.load(g); gs.name } +sys_gemspecs = Dir.glob(path + "/specifications/**/*.gemspec").map {|g| gs = Gem::Specification.load(g); gs.name } obj = Gem::Specification.from_yaml($stdin) obj.dependencies.each {|dep| if not(dep.type == :runtime) diff --git a/ruby/rubygem-tzinfo/rubygem-tzinfo.SlackBuild b/ruby/rubygem-tzinfo/rubygem-tzinfo.SlackBuild index 51e4838b70..74d6ba6437 100644 --- a/ruby/rubygem-tzinfo/rubygem-tzinfo.SlackBuild +++ b/ruby/rubygem-tzinfo/rubygem-tzinfo.SlackBuild @@ -78,7 +78,7 @@ path = sprintf("%s/%s/gems/%s", c["libdir"], c["RUBY_INSTALL_NAME"], c["ruby_version"]) -sys_gemspecs = Dir.glob(path + "/specifications/*").map {|g| gs = Gem::Specification.load(g); gs.name } +sys_gemspecs = Dir.glob(path + "/specifications/**/*.gemspec").map {|g| gs = Gem::Specification.load(g); gs.name } obj = Gem::Specification.from_yaml($stdin) obj.dependencies.each {|dep| if not(dep.type == :runtime) diff --git a/ruby/rubygem-yajl-ruby/rubygem-yajl-ruby.SlackBuild b/ruby/rubygem-yajl-ruby/rubygem-yajl-ruby.SlackBuild index b75dc74410..fce657d784 100644 --- a/ruby/rubygem-yajl-ruby/rubygem-yajl-ruby.SlackBuild +++ b/ruby/rubygem-yajl-ruby/rubygem-yajl-ruby.SlackBuild @@ -78,7 +78,7 @@ path = sprintf("%s/%s/gems/%s", c["libdir"], c["RUBY_INSTALL_NAME"], c["ruby_version"]) -sys_gemspecs = Dir.glob(path + "/specifications/*").map {|g| gs = Gem::Specification.load(g); gs.name } +sys_gemspecs = Dir.glob(path + "/specifications/**/*.gemspec").map {|g| gs = Gem::Specification.load(g); gs.name } obj = Gem::Specification.from_yaml($stdin) obj.dependencies.each {|dep| if not(dep.type == :runtime) diff --git a/ruby/sequel/sequel.SlackBuild b/ruby/sequel/sequel.SlackBuild index b22a5d9971..e52ccdd50d 100644 --- a/ruby/sequel/sequel.SlackBuild +++ b/ruby/sequel/sequel.SlackBuild @@ -71,12 +71,12 @@ printf("%s/%s/gems/%s\n", gem specification $CWD/$PRGNAM-$VERSION.gem | \ ruby -r yaml -r rbconfig -e ' -c = Config::CONFIG +c = RbConfig::CONFIG path = sprintf("%s/%s/gems/%s", c["libdir"], c["RUBY_INSTALL_NAME"], c["ruby_version"]) -sys_gemspecs = Dir.glob(path + "/specifications/*").map {|g| gs = Gem::Specification.load(g); gs.name } +sys_gemspecs = Dir.glob(path + "/specifications/**/*.gemspec").map {|g| gs = Gem::Specification.load(g); gs.name } obj = Gem::Specification.from_yaml($stdin) obj.dependencies.each {|dep| if not(dep.type == :runtime) diff --git a/ruby/sqlite3/sqlite3.SlackBuild b/ruby/sqlite3/sqlite3.SlackBuild index f57f3adb52..43ce0fdcd3 100644 --- a/ruby/sqlite3/sqlite3.SlackBuild +++ b/ruby/sqlite3/sqlite3.SlackBuild @@ -71,12 +71,12 @@ printf("%s/%s/gems/%s\n", gem specification $CWD/$PRGNAM-$VERSION.gem | \ ruby -r yaml -r rbconfig -e ' -c = Config::CONFIG +c = RbConfig::CONFIG path = sprintf("%s/%s/gems/%s", c["libdir"], c["RUBY_INSTALL_NAME"], c["ruby_version"]) -sys_gemspecs = Dir.glob(path + "/specifications/*").map {|g| gs = Gem::Specification.load(g); gs.name } +sys_gemspecs = Dir.glob(path + "/specifications/**/*.gemspec").map {|g| gs = Gem::Specification.load(g); gs.name } obj = Gem::Specification.from_yaml($stdin) obj.dependencies.each {|dep| if not(dep.type == :runtime) diff --git a/system/cdemu-client/cdemu-client.SlackBuild b/system/cdemu-client/cdemu-client.SlackBuild index 33e96881d4..27b288e728 100644 --- a/system/cdemu-client/cdemu-client.SlackBuild +++ b/system/cdemu-client/cdemu-client.SlackBuild @@ -23,10 +23,8 @@ # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -# Revision date: 2013/03/31 - PRGNAM=cdemu-client -VERSION=${VERSION:-2.0.0} +VERSION=${VERSION:-3.0.0} ARCH=noarch BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -51,7 +49,7 @@ 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 {} \; mkdir -p build cd build diff --git a/system/cdemu-client/cdemu-client.info b/system/cdemu-client/cdemu-client.info index 2608974f10..b7effb60e0 100644 --- a/system/cdemu-client/cdemu-client.info +++ b/system/cdemu-client/cdemu-client.info @@ -1,8 +1,8 @@ PRGNAM="cdemu-client" -VERSION="2.0.0" +VERSION="3.0.0" HOMEPAGE="http://cdemu.sourceforge.net/about/client/" -DOWNLOAD="http://downloads.sourceforge.net/cdemu/cdemu-client-2.0.0.tar.bz2" -MD5SUM="ceeec43270c28ea02c7e8a5a7009f3e0" +DOWNLOAD="http://downloads.sourceforge.net/cdemu/cdemu-client-3.0.0.tar.bz2" +MD5SUM="4e188ec42b1db005ed96b81db52a20ed" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="cdemu-daemon" diff --git a/system/cdemu-daemon/cdemu-daemon.SlackBuild b/system/cdemu-daemon/cdemu-daemon.SlackBuild index 9289c4aeef..9043928316 100644 --- a/system/cdemu-daemon/cdemu-daemon.SlackBuild +++ b/system/cdemu-daemon/cdemu-daemon.SlackBuild @@ -23,10 +23,8 @@ # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -# Revision date: 2013/03/31 - PRGNAM=cdemu-daemon -VERSION=${VERSION:-2.0.0} +VERSION=${VERSION:-3.0.2} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -72,7 +70,7 @@ 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 {} \; mkdir -p build cd build diff --git a/system/cdemu-daemon/cdemu-daemon.info b/system/cdemu-daemon/cdemu-daemon.info index 639a2c3178..b5f48d82a5 100644 --- a/system/cdemu-daemon/cdemu-daemon.info +++ b/system/cdemu-daemon/cdemu-daemon.info @@ -1,8 +1,8 @@ PRGNAM="cdemu-daemon" -VERSION="2.0.0" +VERSION="3.0.2" HOMEPAGE="http://cdemu.sourceforge.net/about/daemon/" -DOWNLOAD="http://downloads.sourceforge.net/cdemu/cdemu-daemon-2.0.0.tar.bz2" -MD5SUM="8f6ad3a9f758938e1572046bccc30417" +DOWNLOAD="http://downloads.sourceforge.net/cdemu/cdemu-daemon-3.0.2.tar.bz2" +MD5SUM="ada2ec2ff2e1bbbc10c596414b4ba77d" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="libmirage vhba-module" diff --git a/system/conky/conky.info b/system/conky/conky.info index 3662771408..462cfc7e62 100644 --- a/system/conky/conky.info +++ b/system/conky/conky.info @@ -5,6 +5,6 @@ DOWNLOAD="http://downloads.sourceforge.net/conky/conky-1.9.0.tar.bz2" MD5SUM="d3de615f43aadc98d555e05ad9e902c2" DOWNLOAD_x86_64="" MD5SUM_x86_64="" -REQUIRES="" +REQUIRES="libaudclient" MAINTAINER="M.Dinslage" EMAIL="daedra1980@gmail.com" diff --git a/system/d-feet/README b/system/d-feet/README index d91d5122e9..53cfec895f 100644 --- a/system/d-feet/README +++ b/system/d-feet/README @@ -1 +1,5 @@ -D-Feet is a D-Bus debugger written in PyGtk by John (J5) Palmieri. +D-Feet is a D-Bus debugger originally written in PyGtk +by John (J5) Palmieri and now rewritten basing on +gobject-introspection and gdbus by Thomas Bechtold. + +pep8 is an optional dependency to enable build-time tests. diff --git a/system/d-feet/d-feet.SlackBuild b/system/d-feet/d-feet.SlackBuild index 571de4bd05..24f6482498 100644 --- a/system/d-feet/d-feet.SlackBuild +++ b/system/d-feet/d-feet.SlackBuild @@ -23,7 +23,7 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=d-feet -VERSION=0.1.12 +VERSION=${VERSION:-0.3.10} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -40,13 +40,29 @@ TMP=${TMP:-/tmp/SBo} PKG=$TMP/package-$PRGNAM OUTPUT=${OUTPUT:-/tmp} +if [ "$ARCH" = "i486" ]; then + SLKCFLAGS="-O2 -march=i486 -mtune=i686" + LIBDIRSUFFIX="" +elif [ "$ARCH" = "i686" ]; then + SLKCFLAGS="-O2 -march=i686 -mtune=i686" + LIBDIRSUFFIX="" +elif [ "$ARCH" = "x86_64" ]; then + SLKCFLAGS="-O2 -fPIC" + LIBDIRSUFFIX="64" +else + SLKCFLAGS="-O2" + LIBDIRSUFFIX="" +fi + +tests="--disable-tests" ; [ $(which pep8) ] && tests="" + set -e rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT cd $TMP rm -rf $PRGNAM-$VERSION -tar xvf $CWD/$PRGNAM-$VERSION.tar.bz2 +tar xvf $CWD/$PRGNAM-$VERSION.tar.?z* cd $PRGNAM-$VERSION chown -R root:root . find -L . \ @@ -55,14 +71,25 @@ find -L . \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ -exec chmod 644 {} \; -python setup.py install --root=$PKG +CFLAGS="$SLKCFLAGS" \ +CXXFLAGS="$SLKCFLAGS" \ +./configure \ + --prefix=/usr \ + --libdir=/usr/lib${LIBDIRSUFFIX} \ + --sysconfdir=/etc \ + --localstatedir=/var \ + --docdir=/usr/doc/$PRGNAM-$VERSION \ + --build=$ARCH-slackware-linux + +make +make install DESTDIR=$PKG -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 \ - AUTHORS COPYING PKG-INFO README \ + AUTHORS COPYING NEWS README TODO \ $PKG/usr/doc/$PRGNAM-$VERSION cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild diff --git a/system/d-feet/d-feet.info b/system/d-feet/d-feet.info index 3370ca44d9..a725f96cf2 100644 --- a/system/d-feet/d-feet.info +++ b/system/d-feet/d-feet.info @@ -1,10 +1,10 @@ PRGNAM="d-feet" -VERSION="0.1.12" +VERSION="0.3.10" HOMEPAGE="http://live.gnome.org/DFeet/" -DOWNLOAD="ftp://ftp.gnome.org/pub/gnome/sources/d-feet/0.1/d-feet-0.1.12.tar.bz2" -MD5SUM="01b0296277b26330bc430742ad4e758a" +DOWNLOAD="http://download.gnome.org/sources/d-feet/0.3/d-feet-0.3.10.tar.xz" +MD5SUM="a1ad05205cc68650c2770eeeb7c81953" DOWNLOAD_x86_64="" MD5SUM_x86_64="" -REQUIRES="pysetuptools" +REQUIRES="" MAINTAINER="Robby Workman" EMAIL="rworkman@slackbuilds.org" diff --git a/system/d-feet/slack-desc b/system/d-feet/slack-desc index 0f08cf96a3..e120c2eedf 100644 --- a/system/d-feet/slack-desc +++ b/system/d-feet/slack-desc @@ -8,7 +8,7 @@ |-----handy-ruler------------------------------------------------------| d-feet: D-Feet (D-Bus Debugger) d-feet: -d-feet: D-Feet is a D-Bus debugger written in PyGtk. +d-feet: D-Feet is a D-Bus debugger. d-feet: d-feet: Current features include: d-feet: - View names on any bus diff --git a/system/dynamips/dynamips.SlackBuild b/system/dynamips/dynamips.SlackBuild index 77685c3673..a9edf005e9 100644 --- a/system/dynamips/dynamips.SlackBuild +++ b/system/dynamips/dynamips.SlackBuild @@ -74,7 +74,6 @@ find -L . \ CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ -sed -i 's/<\(libelf.h\)>/<libelf\/\1>/' common/dynamips.h common/rom2c.c sed -i 's/^\(\.PHONY: all dynamips\)/# \1/' Makefile if [ $ARCH == "x86_64" ] diff --git a/system/emelfm2/emelfm2.SlackBuild b/system/emelfm2/emelfm2.SlackBuild index cf7f1454bb..e617d17a43 100644 --- a/system/emelfm2/emelfm2.SlackBuild +++ b/system/emelfm2/emelfm2.SlackBuild @@ -23,7 +23,7 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=emelfm2 -VERSION=0.8.1 +VERSION=${VERSION:-0.9.1} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} diff --git a/system/emelfm2/emelfm2.info b/system/emelfm2/emelfm2.info index 5763dcd630..eefb293c3b 100644 --- a/system/emelfm2/emelfm2.info +++ b/system/emelfm2/emelfm2.info @@ -1,8 +1,8 @@ PRGNAM="emelfm2" -VERSION="0.8.1" +VERSION="0.9.1" HOMEPAGE="http://www.emelfm2.net" -DOWNLOAD="http://emelfm2.net/rel/emelfm2-0.8.1.tar.bz2" -MD5SUM="00368bca4c88733e7d70f46cc4db890c" +DOWNLOAD="http://emelfm2.net/rel/emelfm2-0.9.1.tar.bz2" +MD5SUM="ea83b73d76edf1cea5bce00ec630af6f" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" diff --git a/system/epson-inkjet-printer-escpr/epson-inkjet-printer-escpr.SlackBuild b/system/epson-inkjet-printer-escpr/epson-inkjet-printer-escpr.SlackBuild index b05b640454..97b8d16a24 100644 --- a/system/epson-inkjet-printer-escpr/epson-inkjet-printer-escpr.SlackBuild +++ b/system/epson-inkjet-printer-escpr/epson-inkjet-printer-escpr.SlackBuild @@ -70,6 +70,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 {} \; +# Upstream script needs to be more assertive with Autotools :-) +sed -e 's/autoconf/autoreconf -vif/' -i bootstrap + ./bootstrap CFLAGS="$SLKCFLAGS" \ diff --git a/system/file-roller/file-roller.SlackBuild b/system/file-roller/file-roller.SlackBuild index 39d43d77a2..e2fc1781a4 100644 --- a/system/file-roller/file-roller.SlackBuild +++ b/system/file-roller/file-roller.SlackBuild @@ -25,7 +25,7 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=file-roller -VERSION=${VERSION:-2.32.2} +VERSION=${VERSION:-3.16.4} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -81,8 +81,7 @@ CFLAGS="$SLKCFLAGS" \ --infodir=/usr/info \ --docdir=/usr/doc/$PRGNAM-$VERSION \ --localedir=/usr/share/locale \ - --disable-scrollkeeper \ - --with-gtk=2.0 \ + --enable-libarchive \ --disable-static \ --enable-shared \ --build=$ARCH-slackware-linux diff --git a/system/file-roller/file-roller.info b/system/file-roller/file-roller.info index 47424fce5f..0624797c37 100644 --- a/system/file-roller/file-roller.info +++ b/system/file-roller/file-roller.info @@ -1,8 +1,8 @@ PRGNAM="file-roller" -VERSION="2.32.2" +VERSION="3.16.4" HOMEPAGE="http://fileroller.sourceforge.net/" -DOWNLOAD="http://ftp.gnome.org/pub/gnome/sources/file-roller/2.32/file-roller-2.32.2.tar.bz2" -MD5SUM="2ec596e237c2f3af1d7d3f5b9c12884f" +DOWNLOAD="http://ftp.gnome.org/pub/GNOME/sources/file-roller/3.16/file-roller-3.16.4.tar.xz" +MD5SUM="a704c852134041de81f50a3eeec31d50" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" diff --git a/system/gcdemu/gcdemu.SlackBuild b/system/gcdemu/gcdemu.SlackBuild index 0048d51840..3b664074b7 100644 --- a/system/gcdemu/gcdemu.SlackBuild +++ b/system/gcdemu/gcdemu.SlackBuild @@ -22,10 +22,8 @@ # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -# Revision date: 2013/03/31 - PRGNAM=gcdemu -VERSION=${VERSION:-2.0.0} +VERSION=${VERSION:-3.0.0} ARCH=noarch BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -48,7 +46,7 @@ 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 {} \; mkdir -p build cd build diff --git a/system/gcdemu/gcdemu.info b/system/gcdemu/gcdemu.info index 834d282223..7463ee8b33 100644 --- a/system/gcdemu/gcdemu.info +++ b/system/gcdemu/gcdemu.info @@ -1,8 +1,8 @@ PRGNAM="gcdemu" -VERSION="2.0.0" +VERSION="3.0.0" HOMEPAGE="http://cdemu.sourceforge.net/about/gcdemu/" -DOWNLOAD="http://downloads.sourceforge.net/cdemu/gcdemu-2.0.0.tar.bz2" -MD5SUM="31691b368ffa9e34b6b776cb7adeebd9" +DOWNLOAD="http://downloads.sourceforge.net/cdemu/gcdemu-3.0.0.tar.bz2" +MD5SUM="e64a5b9a9d704e948958fe983de621c8" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="cdemu-daemon gnome-python pygobject3" diff --git a/system/gentoo/gentoo.SlackBuild b/system/gentoo/gentoo.SlackBuild index 1c75f1e35a..e4f65129c1 100644 --- a/system/gentoo/gentoo.SlackBuild +++ b/system/gentoo/gentoo.SlackBuild @@ -23,7 +23,7 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=gentoo -VERSION=${VERSION:-0.20.4} +VERSION=${VERSION:-0.20.6} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} diff --git a/system/gentoo/gentoo.info b/system/gentoo/gentoo.info index 1838fc26f4..07727771cf 100644 --- a/system/gentoo/gentoo.info +++ b/system/gentoo/gentoo.info @@ -1,8 +1,8 @@ PRGNAM="gentoo" -VERSION="0.20.4" +VERSION="0.20.6" HOMEPAGE="http://obsession.se/gentoo/" -DOWNLOAD="http://sourceforge.net/projects/gentoo/files/gentoo/0.20.4/gentoo-0.20.4.tar.gz" -MD5SUM="9e10f5ad00613b63eb02cde89506153d" +DOWNLOAD="http://sourceforge.net/projects/gentoo/files/gentoo/0.20.6/gentoo-0.20.6.tar.gz" +MD5SUM="3532dfc03abacbe06ba6639160ed46d7" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" diff --git a/system/gsmartcontrol/04_glib2.31.patch b/system/gsmartcontrol/04_glib2.31.patch deleted file mode 100644 index 9f5073c192..0000000000 --- a/system/gsmartcontrol/04_glib2.31.patch +++ /dev/null @@ -1,42 +0,0 @@ -Description: Fixed compilation under Glib 2.31.x. -Origin: Upstream, http://svn.berlios.de/viewvc/gsmartcontrol/trunk/gsmartcontrol/src/hz/sync_policy_glib.h?r1=27&r2=72&view=patch -Author: Alexander Shaduri -Bug-Ubuntu: https://bugs.launchpad.net/bugs/935155 -Bug-Debian: http://bugs.debian.org/665677 - ---- gsmartcontrol/src/hz/sync_policy_glib.h 2011/03/06 10:43:38 27 -+++ gsmartcontrol/src/hz/sync_policy_glib.h 2011/11/02 16:00:39 72 -@@ -17,30 +17,14 @@ - // Glib-based policy. - - --// Note: g_static_mutex_*lock() functions may give warnings about breaking strict-aliasing rules. --// The warnings are completely harmless and visible on some versions of glib only. --// However, due to their number, I decided to implement this workaround. -- --#ifndef _WIN32 -- // same as stock version, but an additional cast to (void*) is added. -- #define hz_glib_static_mutex_get_mutex(mutex) \ -- ( g_thread_use_default_impl ? ((GMutex*) ((void*)((mutex)->static_mutex.pad))) : \ -- g_static_mutex_get_mutex_impl_shortcut(&((mutex)->runtime_mutex)) ) -- --#else -- // win32 has different definition of this macro, so default to stock version. -- #define hz_glib_static_mutex_get_mutex(mutex) g_static_mutex_get_mutex(mutex) --#endif -- -- - #define hz_glib_static_mutex_lock(mutex) \ -- g_mutex_lock(hz_glib_static_mutex_get_mutex(mutex)) -+ g_mutex_lock(g_static_mutex_get_mutex(mutex)) - - #define hz_glib_static_mutex_trylock(mutex) \ -- g_mutex_trylock(hz_glib_static_mutex_get_mutex(mutex)) -+ g_mutex_trylock(g_static_mutex_get_mutex(mutex)) - - #define hz_glib_static_mutex_unlock(mutex) \ -- g_mutex_unlock(hz_glib_static_mutex_get_mutex(mutex)) -+ g_mutex_unlock(g_static_mutex_get_mutex(mutex)) - - - diff --git a/system/gsmartcontrol/gsmartcontrol.SlackBuild b/system/gsmartcontrol/gsmartcontrol.SlackBuild index f2973f5b9e..d25a0871c8 100644 --- a/system/gsmartcontrol/gsmartcontrol.SlackBuild +++ b/system/gsmartcontrol/gsmartcontrol.SlackBuild @@ -67,7 +67,7 @@ find -L . \ sed -i "s/\tdestroy/\tthis->destroy/" src/gsc_text_window.h CFLAGS="$SLKCFLAGS" \ -CXXFLAGS="$SLKCFLAGS" \ +CXXFLAGS="$SLKCFLAGS -std=c++11" \ ./configure \ --prefix=/usr \ --sysconfdir=/etc \ diff --git a/system/gtklp/gtklp.SlackBuild b/system/gtklp/gtklp.SlackBuild index 1b1de127e5..09a4d851e6 100644 --- a/system/gtklp/gtklp.SlackBuild +++ b/system/gtklp/gtklp.SlackBuild @@ -5,8 +5,8 @@ # Written by Luis Henrique <lmello.009@gmail.com> PRGNAM=gtklp -VERSION=${VERSION:-1.2.9} -BUILD=${BUILD:-2} +VERSION=${VERSION:-1.3.1} +BUILD=${BUILD:-1} TAG=${TAG:-_SBo} if [ -z "$ARCH" ]; then @@ -45,6 +45,8 @@ find -L . \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ -exec chmod 644 {} \; +autoreconf -vif + CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ ./configure \ diff --git a/system/gtklp/gtklp.info b/system/gtklp/gtklp.info index 33e09f2555..1b67c7506a 100644 --- a/system/gtklp/gtklp.info +++ b/system/gtklp/gtklp.info @@ -1,8 +1,8 @@ PRGNAM="gtklp" -VERSION="1.2.9" +VERSION="1.3.1" HOMEPAGE="http://gtklp.sirtobi.com/" -DOWNLOAD="http://downloads.sourceforge.net/gtklp/gtklp-1.2.9.src.tar.gz" -MD5SUM="822b04c9eba65aa14c1d6fd4a3454a37" +DOWNLOAD="http://downloads.sourceforge.net/gtklp/gtklp-1.3.1.src.tar.gz" +MD5SUM="4b77d070aafeab45d134a4f9a12883bb" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" diff --git a/system/image-analyzer/image-analyzer.SlackBuild b/system/image-analyzer/image-analyzer.SlackBuild index 7701f49436..9281c59193 100644 --- a/system/image-analyzer/image-analyzer.SlackBuild +++ b/system/image-analyzer/image-analyzer.SlackBuild @@ -23,10 +23,8 @@ # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -# Revision date: 2013/03/31 - PRGNAM=image-analyzer -VERSION=${VERSION:-2.0.0} +VERSION=${VERSION:-3.0.0} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -72,7 +70,7 @@ 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 {} \; mkdir -p build cd build diff --git a/system/image-analyzer/image-analyzer.info b/system/image-analyzer/image-analyzer.info index 51e06ef6e0..e5927d90b3 100644 --- a/system/image-analyzer/image-analyzer.info +++ b/system/image-analyzer/image-analyzer.info @@ -1,8 +1,8 @@ PRGNAM="image-analyzer" -VERSION="2.0.0" +VERSION="3.0.0" HOMEPAGE="http://cdemu.sourceforge.net/about/analyzer/" -DOWNLOAD="http://downloads.sourceforge.net/cdemu/image-analyzer-2.0.0.tar.bz2" -MD5SUM="ede5b4757a32897e53c627e0a7eb9e65" +DOWNLOAD="http://downloads.sourceforge.net/cdemu/image-analyzer-3.0.0.tar.bz2" +MD5SUM="13a3c4ebd30d9087df3ae498fd59e267" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="libmirage" diff --git a/system/libnatspec/libnatspec.SlackBuild b/system/libnatspec/libnatspec.SlackBuild index 073c274af3..33b5926127 100644 --- a/system/libnatspec/libnatspec.SlackBuild +++ b/system/libnatspec/libnatspec.SlackBuild @@ -69,8 +69,7 @@ find -L . \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ -exec chmod 644 {} \; -libtoolize --copy --force -autoreconf +autoreconf -vif CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ diff --git a/system/lxterminal/README b/system/lxterminal/README index c584a22873..9ccde49589 100644 --- a/system/lxterminal/README +++ b/system/lxterminal/README @@ -3,3 +3,7 @@ lxterminal (LXDE terminal emulator) LXTerminal is a quick configurable terminal emulator, based on vte libs. It uses a single process for each window/tab so it's very light on resources. + +Pass the script the variable GTK3=yes if you want to link this against +gtk+3 instead of the default gtk+2 (in this case you will need the +optional dependency vte3). diff --git a/system/lxterminal/lxterminal.SlackBuild b/system/lxterminal/lxterminal.SlackBuild index be46e6cade..6f1909c3c1 100644 --- a/system/lxterminal/lxterminal.SlackBuild +++ b/system/lxterminal/lxterminal.SlackBuild @@ -53,6 +53,8 @@ # * Update. # 0.2.0: 04/dec/2014 by Matteo Bernardini <ponce@slackbuilds.org> # * Update. +# 20151110_967256e: 17/nov/2015 by Matteo Bernardini <ponce@slackbuilds.org> +# * Update. # # Run 'sh lxterminal.SlackBuild' to build a Slackware package. # The package is created in /tmp . @@ -63,7 +65,7 @@ # Set initial variables: PRGNAM=lxterminal -VERSION=${VERSION:-0.2.0} +VERSION=${VERSION:-20151110_967256e} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -96,6 +98,8 @@ else LIBDIRSUFFIX="" fi +gtk3="" ; [ "${GTK3:-no}" = "yes" ] && gtk3="--enable-gtk3" + set -e rm -rf $PKG @@ -124,6 +128,7 @@ CFLAGS="$SLKCFLAGS" \ --mandir=/usr/man \ --program-prefix= \ --program-suffix= \ + $gtk3 \ --build=$ARCH-slackware-linux make make install-strip DESTDIR=$PKG diff --git a/system/lxterminal/lxterminal.info b/system/lxterminal/lxterminal.info index a6793419d5..90ea89a162 100644 --- a/system/lxterminal/lxterminal.info +++ b/system/lxterminal/lxterminal.info @@ -1,8 +1,8 @@ PRGNAM="lxterminal" -VERSION="0.2.0" +VERSION="20151110_967256e" HOMEPAGE="http://wiki.lxde.org/en/LXTerminal" -DOWNLOAD="http://downloads.sf.net/lxde/lxterminal-0.2.0.tar.gz" -MD5SUM="e80ad1b6e26212f3d43908c2ad87ba4d" +DOWNLOAD="http://ponce.cc/slackware/sources/repo/lxde/lxterminal-20151110_967256e.tar.xz" +MD5SUM="74dc06a87a1d8b4e0c1ce5c1b5f09595" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" diff --git a/system/lzip/README b/system/lzip/README deleted file mode 100644 index c0ebf2736c..0000000000 --- a/system/lzip/README +++ /dev/null @@ -1,6 +0,0 @@ -Lzip is a lossless data compressor based on the LZMA (Lempel-Ziv-Markov -chain-Algorithm) algorithm designed by Igor Pavlov. Lzip decompresses -almost as fast as gzip and compresses better than bzip2, but requires -more memory and time during compression. These features make lzip well -suited for software distribution and data archival. -Lzip has a user interface similar to the one of gzip or bzip2. diff --git a/system/lzip/lzip.SlackBuild b/system/lzip/lzip.SlackBuild deleted file mode 100644 index ba3af43f84..0000000000 --- a/system/lzip/lzip.SlackBuild +++ /dev/null @@ -1,104 +0,0 @@ -#!/bin/sh - -# Slackware build script for lzip - -# Copyright 2011 Barry J. Grundy <bgrundy(at)linuxleo.com> -# All rights reserved. -# -# Redistribution and use of this script, with or without modification, is -# permitted provided that the following conditions are met: -# -# 1. Redistributions of this script must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# -# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ''AS IS'' AND ANY EXPRESS OR IMPLIED -# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO -# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, -# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; -# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, -# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR -# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF -# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -# Updated for version 1.16 November 2014. - -PRGNAM=lzip -VERSION=${VERSION:-1.16} -BUILD=${BUILD:-1} -TAG=${TAG:-_SBo} - -if [ -z "$ARCH" ]; then - case "$( uname -m )" in - i?86) ARCH=i486 ;; - arm*) ARCH=arm ;; - *) ARCH=$( uname -m ) ;; - esac -fi - -CWD=$(pwd) -TMP=${TMP:-/tmp/SBo} -PKG=$TMP/package-$PRGNAM -OUTPUT=${OUTPUT:-/tmp} - -if [ "$ARCH" = "i486" ]; then - SLKCFLAGS="-O2 -march=i486 -mtune=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "i686" ]; then - SLKCFLAGS="-O2 -march=i686 -mtune=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "x86_64" ]; then - SLKCFLAGS="-O2 -fPIC" - LIBDIRSUFFIX="64" -else - SLKCFLAGS="-O2" - LIBDIRSUFFIX="" -fi - -set -e # exit on most errors - -rm -rf $PKG -mkdir -p $TMP $PKG $OUTPUT -rm -rf $TMP/$PRGNAM-$VERSION -cd $TMP -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 {} \; - -CFLAGS="$SLKCFLAGS" \ -CXXFLAGS="$SLKCFLAGS" \ - ./configure \ - --prefix=/usr \ - --mandir=/usr/man \ - --infodir=/usr/info \ - -make CFLAGS+="$SLKCFLAGS" CXXFLAGS="$SLKCFLAGS" -make install DESTDIR=$PKG - -find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \ - | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true - -find $PKG/usr/man -type f -exec gzip -9 {} \; -for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done - -rm -f $PKG/usr/info/dir -gzip -9 $PKG/usr/info/* - -mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION -cp -ar \ - AUTHORS COPYING ChangeLog INSTALL NEWS README doc/ \ - $PKG/usr/doc/$PRGNAM-$VERSION -cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild -find $PKG/usr/doc -type f -exec chmod 644 {} \; - -mkdir -p $PKG/install -cat $CWD/slack-desc > $PKG/install/slack-desc - -cd $PKG -/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz} diff --git a/system/lzip/lzip.info b/system/lzip/lzip.info deleted file mode 100644 index 8608a3ca86..0000000000 --- a/system/lzip/lzip.info +++ /dev/null @@ -1,10 +0,0 @@ -PRGNAM="lzip" -VERSION="1.16" -HOMEPAGE="http://www.nongnu.org/lzip/lzip.html" -DOWNLOAD="http://download.savannah.gnu.org/releases/lzip/lzip-1.16.tar.gz" -MD5SUM="716a9876dc595ec52d4f3bda81e42471" -DOWNLOAD_x86_64="" -MD5SUM_x86_64="" -REQUIRES="" -MAINTAINER="Barry J. Grundy" -EMAIL="bgrundy<at>linuxleo.com" diff --git a/system/lzip/slack-desc b/system/lzip/slack-desc deleted file mode 100644 index 5c7e5f4ac1..0000000000 --- a/system/lzip/slack-desc +++ /dev/null @@ -1,19 +0,0 @@ -# HOW TO EDIT THIS FILE: -# The "handy ruler" below makes it easier to edit a package description. -# Line up the first '|' above the ':' following the base package name, and -# the '|' on the right side marks the last column you can put a character in. -# You must make exactly 11 lines for the formatting to be correct. It's also -# customary to leave one space after the ':' except on otherwise blank lines. - - |-----handy-ruler------------------------------------------------------| -lzip: lzip (lossless data compression tool) -lzip: -lzip: Lzip is a lossless data compressor based on the LZMA (Lempel-Ziv-Markov -lzip: chain-Algorithm) algorithm designed by Igor Pavlov. Lzip decompresses -lzip: almost as fast as gzip and compresses better than bzip2, but requires -lzip: more memory and time during compression. These features make lzip well -lzip: suited for software distribution and data archival. -lzip: Lzip has a user interface similar to the one of gzip or bzip2. -lzip: -lzip: Homepage: http://www.nongnu.org/lzip/lzip.html -lzip: diff --git a/system/macemu/README b/system/macemu/README new file mode 100644 index 0000000000..2345e13672 --- /dev/null +++ b/system/macemu/README @@ -0,0 +1,5 @@ +BasiliskII and SheepShaver are two Open Source 68k and PowerPC +Macintosh emulators. +They allow you to run 68k and PowerPC MacOS software on your computer, +however you still need a copy of MacOS and a Macintosh ROM image to +use it. diff --git a/system/macemu/doinst.sh b/system/macemu/doinst.sh new file mode 100644 index 0000000000..5fb28930db --- /dev/null +++ b/system/macemu/doinst.sh @@ -0,0 +1,3 @@ +if [ -x /usr/bin/update-desktop-database ]; then + /usr/bin/update-desktop-database -q usr/share/applications >/dev/null 2>&1 +fi diff --git a/system/macemu/files/BasiliskII.desktop b/system/macemu/files/BasiliskII.desktop new file mode 100644 index 0000000000..966b04efbf --- /dev/null +++ b/system/macemu/files/BasiliskII.desktop @@ -0,0 +1,9 @@ +[Desktop Entry] +Name=Basilisk II +Comment=68k Macintosh Emulator +Exec=BasiliskII +Icon=BasiliskII.svg +Terminal=false +Type=Application +Categories=Application;Utility; +Encoding=UTF-8 diff --git a/system/macemu/files/BasiliskII.svg b/system/macemu/files/BasiliskII.svg new file mode 100644 index 0000000000..4eac158b62 --- /dev/null +++ b/system/macemu/files/BasiliskII.svg @@ -0,0 +1,106 @@ +<?xml version="1.0" encoding="UTF-8" standalone="no"?> +<!-- Created with Inkscape (http://www.inkscape.org/) --> + +<svg + xmlns:dc="http://purl.org/dc/elements/1.1/" + xmlns:cc="http://creativecommons.org/ns#" + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" + xmlns:svg="http://www.w3.org/2000/svg" + xmlns="http://www.w3.org/2000/svg" + xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" + xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" + width="485.43735" + height="562.31342" + id="svg2" + version="1.1" + inkscape:version="0.48.2 r9819" + sodipodi:docname="disegno.svg"> + <defs + id="defs4" /> + <sodipodi:namedview + id="base" + pagecolor="#ffffff" + bordercolor="#666666" + borderopacity="1.0" + inkscape:pageopacity="0.0" + inkscape:pageshadow="2" + inkscape:zoom="0.66833139" + inkscape:cx="-212.4745" + inkscape:cy="-6.9383877" + inkscape:document-units="px" + inkscape:current-layer="layer1" + showgrid="false" + inkscape:window-width="1648" + inkscape:window-height="1032" + inkscape:window-x="0" + inkscape:window-y="0" + inkscape:window-maximized="1" + fit-margin-top="5" + fit-margin-left="5" + fit-margin-right="5" + fit-margin-bottom="5" /> + <metadata + id="metadata7"> + <rdf:RDF> + <cc:Work + rdf:about=""> + <dc:format>image/svg+xml</dc:format> + <dc:type + rdf:resource="http://purl.org/dc/dcmitype/StillImage" /> + <dc:title></dc:title> + </cc:Work> + </rdf:RDF> + </metadata> + <g + inkscape:label="Livello 1" + inkscape:groupmode="layer" + id="layer1" + transform="translate(-16.349841,-20.361317)"> + <g + id="g3948" + transform="translate(1119.2053,1.4962637)"> + <path + sodipodi:nodetypes="ccccc" + inkscape:connector-curvature="0" + id="path3147" + d="m -870.21277,158.95793 c 0,0 48.51402,-2.23911 85.83249,-41.79669 36.5721,-47.767646 28.36204,-93.296187 28.36204,-93.296187 0,0 -49.26038,2.239109 -86.57885,46.274907 -32.46234,40.60896 -27.61568,88.81797 -27.61568,88.81797 z" + style="fill:#61bb46;fill-opacity:1;stroke:none" /> + <path + sodipodi:nodetypes="ccccccc" + inkscape:connector-curvature="0" + id="path3149" + d="m -1073.2253,221.65296 415.72783,0 c 5.97096,-5.97096 10.44918,-8.21006 19.40561,-11.19554 0,0 -43.99764,-58.21682 -109.71631,-58.21682 -54.48497,0 -52.97061,23.88383 -104.49173,23.88383 -51.58596,0 -49.70135,-24.6302 -108.22357,-24.6302 -65.71863,0 -112.70183,70.15873 -112.70183,70.15873 z" + style="fill:#61bb46;fill-opacity:1;stroke:none" /> + <path + sodipodi:nodetypes="ccccc" + inkscape:connector-curvature="0" + id="path3151" + d="m -1073.2253,221.65296 c -10.4491,16.42013 -20.8983,50.75312 -23.8838,71.65147 l 397.81494,0 c 3.73185,-22.39108 23.88382,-59.70956 41.79669,-71.65147 z" + style="fill:#fdb827;fill-opacity:1;stroke:none" /> + <path + sodipodi:nodetypes="ccccc" + inkscape:connector-curvature="0" + id="path3153" + d="m -1097.1091,292.55806 c -1.4927,23.13745 -0.7464,43.28943 2.2391,70.9051 l 403.78591,0 c -8.95643,-26.12293 -11.94192,-45.52854 -8.21007,-70.15873 z" + style="fill:#f5821f;fill-opacity:1;stroke:none" /> + <path + sodipodi:nodetypes="cccccc" + inkscape:connector-curvature="0" + id="path3174" + d="m -1094.87,363.46316 404.53228,0 c 10.44917,32.09389 40.30395,55.97772 67.91962,64.18778 l -2.23911,5.97095 -450.80719,0 c -11.1955,-23.13745 -15.6737,-46.27491 -19.4056,-70.15873 z" + style="fill:#e03a3e;fill-opacity:1;stroke:none" /> + <path + sodipodi:nodetypes="ccccc" + inkscape:connector-curvature="0" + id="path3176" + d="m -1076.2107,433.62189 450.80712,0 c -8.21006,24.63019 -25.37656,51.49949 -38.06484,69.41236 l -375.42388,0 c -14.181,-19.40561 -29.8548,-45.52854 -37.3184,-69.41236 z" + style="fill:#963d97;fill-opacity:1;stroke:none" /> + <path + sodipodi:nodetypes="cccccc" + inkscape:connector-curvature="0" + id="path3178" + d="m -1038.8923,503.03425 375.42388,0 c 0,0 -44.78217,73.14421 -93.29619,73.14421 -41.05032,0 -47.01515,-23.88382 -92.54981,-23.88382 -47.77348,0 -54.3187,23.88382 -96.28166,23.88382 -38.87575,0 -80.60792,-47.76765 -93.29622,-73.14421 z" + style="fill:#009ddc;fill-opacity:1;stroke:none" /> + </g> + </g> +</svg> diff --git a/system/macemu/files/SheepShaver.desktop b/system/macemu/files/SheepShaver.desktop new file mode 100644 index 0000000000..1664f188cf --- /dev/null +++ b/system/macemu/files/SheepShaver.desktop @@ -0,0 +1,9 @@ +[Desktop Entry] +Name=SheepShaver +Comment=An Open Source PowerPC MacOS run-time environment +Icon=SheepShaver +Exec=SheepShaver +Terminal=false +Type=Application +Categories=System; +StartupNotify=true diff --git a/system/macemu/files/SheepShaver.png b/system/macemu/files/SheepShaver.png Binary files differnew file mode 100644 index 0000000000..957a29542a --- /dev/null +++ b/system/macemu/files/SheepShaver.png diff --git a/system/macemu/macemu.SlackBuild b/system/macemu/macemu.SlackBuild new file mode 100644 index 0000000000..bfef813278 --- /dev/null +++ b/system/macemu/macemu.SlackBuild @@ -0,0 +1,157 @@ +#!/bin/sh + +# Slackware build script for macemu (BasiliskII and SheepShaver) +# Copyright 2014-2015 Matteo Bernardini <ponce@slackbuilds.org>, Pisa, Italy +# All rights reserved. +# +# Redistribution and use of this script, with or without modification, is +# permitted provided that the following conditions are met: +# +# 1. Redistributions of this script must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# +# THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED +# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF +# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO +# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, +# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; +# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, +# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR +# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF +# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +PRGNAM=macemu +VERSION=${VERSION:-20140919_c2b519e} +BUILD=${BUILD:-1} +TAG=${TAG:-_SBo} + +if [ -z "$ARCH" ]; then + case "$( uname -m )" in + i?86) ARCH=i486 ;; + arm*) ARCH=arm ;; + *) ARCH=$( uname -m ) ;; + esac +fi + +CWD=$(pwd) +TMP=${TMP:-/tmp/SBo} +PKG=$TMP/package-$PRGNAM +OUTPUT=${OUTPUT:-/tmp} + +if [ "$ARCH" = "i486" ]; then + SLKCFLAGS="-O2 -march=i486 -mtune=i686" + LIBDIRSUFFIX="" +elif [ "$ARCH" = "i686" ]; then + SLKCFLAGS="-O2 -march=i686 -mtune=i686" + LIBDIRSUFFIX="" +elif [ "$ARCH" = "x86_64" ]; then + SLKCFLAGS="-O2 -fPIC" + LIBDIRSUFFIX="64" +else + SLKCFLAGS="-O2" + LIBDIRSUFFIX="" +fi + +PRGNAM1=BasiliskII +PRGNAM2=SheepShaver +DOCS1="COPYING ChangeLog README TECH TODO" +DOCS2="COPYING NEWS doc/Linux doc/PowerPC-Testsuite.txt" + +set -e # Exit on most errors + +rm -rf $PKG +mkdir -p $TMP $PKG $OUTPUT +cd $TMP +rm -rf $PRGNAM-$VERSION +tar xvf $CWD/$PRGNAM-$VERSION.tar.?z* +cd $PRGNAM-$VERSION +chown -R root:root . +find . \ + \( -perm 777 -o -perm 775 -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 {} \; + +# Build BasiliskII +cd $PRGNAM1/src/Unix + +NO_CONFIGURE=1 ./autogen.sh + +#LDFLAGS="-L/usr/lib$LIBDIRSUFFIX -lXext -lX11" \ +CFLAGS="$SLKCFLAGS" \ +CXXFLAGS="$SLKCFLAGS" \ +./configure \ + --prefix=/usr \ + --mandir=/usr/man \ + --enable-jit=yes \ + --disable-vosf \ + --enable-sdl-audio=yes \ + --enable-sdl-video=yes \ + --with-mon=no \ + --with-x \ + --without-esd \ + --host=$ARCH-slackware-linux \ + --build=$ARCH-slackware-linux + +make +make install DESTDIR=$PKG +cd - + +# SheepShaver is built with jit disabled by default on x86_64 +# or we get a relocation error +if [ "$ARCH" = "x86_64" ]; then jit="no"; else jit="yes"; fi + +cd $PRGNAM2/src/Unix + +NO_CONFIGURE=1 ./autogen.sh + +CFLAGS="$SLKCFLAGS" \ +CXXFLAGS="$SLKCFLAGS" \ +./configure \ + --prefix=/usr \ + --mandir=/usr/man \ + --enable-jit=$jit \ + --disable-vosf \ + --enable-sdl-audio=yes \ + --enable-sdl-video=yes \ + --with-mon=no \ + --with-x \ + --without-esd \ + --host=$ARCH-slackware-linux \ + --build=$ARCH-slackware-linux + +make +make install DESTDIR=$PKG +cd - + +# Install some desktop files and icons +install -m 0644 -D $CWD/files/$PRGNAM2.desktop \ + $PKG/usr/share/applications/$PRGNAM2.desktop +install -m 0644 -D $CWD/files/$PRGNAM2.png \ + $PKG/usr/share/pixmaps/$PRGNAM2.png +install -m 0644 -D $CWD/files/$PRGNAM1.desktop \ + $PKG/usr/share/applications/$PRGNAM1.desktop +install -m 0644 -D $CWD/files/$PRGNAM1.svg \ + $PKG/usr/share/pixmaps/$PRGNAM1.svg + +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 + +find $PKG/usr/man -type f -exec gzip -9 {} \; +for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done + +mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM1 +( cd $PRGNAM1 + cp -a $DOCS1 $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM1 ) +( cd $PRGNAM2 + mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM2 + cp -a $DOCS2 $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM2 ) +cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild + +mkdir -p $PKG/install +cat $CWD/slack-desc > $PKG/install/slack-desc +cat $CWD/doinst.sh > $PKG/install/doinst.sh + +cd $PKG +/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz} diff --git a/system/macemu/macemu.info b/system/macemu/macemu.info new file mode 100644 index 0000000000..6e9a651e28 --- /dev/null +++ b/system/macemu/macemu.info @@ -0,0 +1,10 @@ +PRGNAM="macemu" +VERSION="20140919_c2b519e" +HOMEPAGE="http://basilisk.cebix.net/" +DOWNLOAD="http://ponce.cc/slackware/sources/repo/macemu-20140919_c2b519e.tar.xz" +MD5SUM="bfec35f83efe8a71f059872cf23698fd" +DOWNLOAD_x86_64="" +MD5SUM_x86_64="" +REQUIRES="" +MAINTAINER="Matteo Bernardini" +EMAIL="ponce@slackbuilds.org" diff --git a/system/macemu/slack-desc b/system/macemu/slack-desc new file mode 100644 index 0000000000..afc90df7a7 --- /dev/null +++ b/system/macemu/slack-desc @@ -0,0 +1,19 @@ +# HOW TO EDIT THIS FILE: +# The "handy ruler" below makes it easier to edit a package description. Line +# up the first '|' above the ':' following the base package name, and the '|' +# on the right side marks the last column you can put a character in. You must +# make exactly 11 lines for the formatting to be correct. It's also +# customary to leave one space after the ':' except on otherwise blank lines. + + |-----handy-ruler------------------------------------------------------| +macemu: macemu (68k Macintosh Emulator) +macemu: +macemu: BasiliskII and SheepShaver are two Open Source 68k and PowerPC +macemu: Macintosh emulators. +macemu: They allow you to run 68k and PowerPC MacOS software on your computer, +macemu: however you still need a copy of MacOS and a Macintosh ROM image to +macemu: use it. +macemu: +macemu: homepage: http://basilisk.cebix.net/ +macemu: http://sheepshaver.cebix.net/ +macemu: diff --git a/system/nvidia-legacy173-kernel/nvidia-legacy173-kernel.SlackBuild b/system/nvidia-legacy173-kernel/nvidia-legacy173-kernel.SlackBuild index 80e3e188d4..9fde2d4d5d 100644 --- a/system/nvidia-legacy173-kernel/nvidia-legacy173-kernel.SlackBuild +++ b/system/nvidia-legacy173-kernel/nvidia-legacy173-kernel.SlackBuild @@ -3,6 +3,7 @@ # Slackware build script for nvidia-legacy173-kernel # Copyright 2007-2010 Heinz Wiesinger, Amsterdam, The Netherlands + # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -23,8 +24,9 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. # Thanks to Robby Workman for suggestions to improve this script. +# Thanks to previous maintainer Edward Koenig <kingbeowulf[at]gmail.com> -# Maintainer Edward Koenig <kingbeowulf[at]gmail.com> +# Maintainer for 14.2: David Spencer <baildon.research@googlemail.com> PRGNAM=nvidia-legacy173-kernel VERSION=173.14.38 @@ -46,6 +48,11 @@ if [ -z "$ARCH" ]; then esac fi +CWD=$(pwd) +TMP=${TMP:-/tmp/SBo} +PKG=${PKG:-$TMP/package-$PRGNAM} +OUTPUT=${OUTPUT:-/tmp} + if [ "$ARCH" = "i486" ]; then TARGET="x86" elif [ "$ARCH" = "i686" ]; then @@ -53,33 +60,35 @@ elif [ "$ARCH" = "i686" ]; then elif [ "$ARCH" = "x86_64" ]; then TARGET="x86_64" NVPKG="pkg2" +else + echo "Unsupported ARCH: $ARCH" + exit 1 fi - unset ARCH -SRCNAM=NVIDIA-Linux-$TARGET-$VERSION-$NVPKG +set -e -CWD=$(pwd) -TMP=${TMP:-/tmp/SBo} -PKG=${PKG:-$TMP/package-$PRGNAM} -OUTPUT=${OUTPUT:-/tmp} +SRCNAM=NVIDIA-Linux-$TARGET-$VERSION-$NVPKG rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT -cd $TMP || exit 1 +cd $TMP rm -rf $SRCNAM -sh $CWD/$SRCNAM.run --extract-only || exit 1 -cd $SRCNAM || exit 1 +sh $CWD/$SRCNAM.run --extract-only +cd $SRCNAM 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 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 {} \; + +# Consolidated patch to build against Linux kernel 4.0 +patch -p1 < $CWD/nvidia-legacy173_kernel-4.0.patch -cd usr/src/nv/ || exit 1 +cd usr/src/nv/ -make SYSSRC=$KERNELPATH module || exit 1 +make SYSSRC=$KERNELPATH module mkdir -p $PKG/lib/modules/$KERNEL/kernel/drivers/video install -m 0664 nvidia.ko $PKG/lib/modules/$KERNEL/kernel/drivers/video/ diff --git a/system/nvidia-legacy173-kernel/nvidia-legacy173-kernel.info b/system/nvidia-legacy173-kernel/nvidia-legacy173-kernel.info index 0914fa8074..d8b6a83fd5 100644 --- a/system/nvidia-legacy173-kernel/nvidia-legacy173-kernel.info +++ b/system/nvidia-legacy173-kernel/nvidia-legacy173-kernel.info @@ -6,5 +6,5 @@ MD5SUM="5bd4542cce1d81ef2b69f6df809df683" DOWNLOAD_x86_64="ftp://download.nvidia.com/XFree86/Linux-x86_64/173.14.38/NVIDIA-Linux-x86_64-173.14.38-pkg2.run" MD5SUM_x86_64="1a323da89be7d37e324b44e22b423692" REQUIRES="" -MAINTAINER="Edward W. Koenig" -EMAIL="kingbeowulf@gmail.com" +MAINTAINER="David Spencer" +EMAIL="baildon.research@googlemail.com" diff --git a/system/nvidia-legacy173-kernel/nvidia-legacy173_kernel-4.0.patch b/system/nvidia-legacy173-kernel/nvidia-legacy173_kernel-4.0.patch new file mode 100644 index 0000000000..89ab9e592b --- /dev/null +++ b/system/nvidia-legacy173-kernel/nvidia-legacy173_kernel-4.0.patch @@ -0,0 +1,206 @@ +diff -u -r NVIDIA-Linux-x86_64-173.14.38-pkg2/usr/src/nv/Makefile.kbuild NVIDIA-Linux-x86_64-173.14.38-pkg2-patched/usr/src/nv/Makefile.kbuild +--- NVIDIA-Linux-x86_64-173.14.38-pkg2/usr/src/nv/Makefile.kbuild 2013-08-28 21:53:41.000000000 +0100 ++++ NVIDIA-Linux-x86_64-173.14.38-pkg2-patched/usr/src/nv/Makefile.kbuild 2015-08-28 10:37:23.726119728 +0100 +@@ -163,7 +163,6 @@ + ioremap_wc \ + proc_dir_entry \ + acpi_walk_namespace \ +- acpi_os_wait_events_complete \ + agp_memory \ + scatterlist \ + file_operations \ +diff -u -r NVIDIA-Linux-x86_64-173.14.38-pkg2/usr/src/nv/conftest.sh NVIDIA-Linux-x86_64-173.14.38-pkg2-patched/usr/src/nv/conftest.sh +--- NVIDIA-Linux-x86_64-173.14.38-pkg2/usr/src/nv/conftest.sh 2013-08-28 21:53:41.000000000 +0100 ++++ NVIDIA-Linux-x86_64-173.14.38-pkg2-patched/usr/src/nv/conftest.sh 2015-08-28 10:37:29.870148375 +0100 +@@ -943,7 +943,7 @@ + # and how many arguments it takes. + # + echo "$CONFTEST_PREAMBLE +- #include <acpi/acpi.h> ++ #include <linux/acpi.h> + void conftest_acpi_walk_namespace(void) { + acpi_walk_namespace(); + }" > conftest$$.c +@@ -958,7 +958,7 @@ + fi + + echo "$CONFTEST_PREAMBLE +- #include <acpi/acpi.h> ++ #include <linux/acpi.h> + void conftest_acpi_walk_namespace(void) { + acpi_walk_namespace(0, NULL, 0, NULL, NULL, NULL, NULL); + }" > conftest$$.c +@@ -974,7 +974,7 @@ + fi + + echo "$CONFTEST_PREAMBLE +- #include <acpi/acpi.h> ++ #include <linux/acpi.h> + void conftest_acpi_walk_namespace(void) { + acpi_walk_namespace(0, NULL, 0, NULL, NULL, NULL); + }" > conftest$$.c +@@ -992,61 +992,6 @@ + fi + ;; + +- acpi_os_wait_events_complete) +- # +- # Determine if the acpi_os_wait_events_complete() function +- # is present and how many arguments it takes. +- # +- echo "$CONFTEST_PREAMBLE +- #include <linux/acpi.h> +- void conftest_acpi_os_wait_events_complete(void) { +- acpi_os_wait_events_complete(NULL, NULL); +- }" > conftest$$.c +- +- $CC $CFLAGS -c conftest$$.c > /dev/null 2>&1 +- rm -f conftest$$.c +- +- if [ -f conftest$$.o ]; then +- rm -f conftest$$.o +- echo "#undef NV_ACPI_OS_WAIT_EVENTS_COMPLETE_PRESENT" >> conftest.h +- return +- fi +- +- echo "$CONFTEST_PREAMBLE +- #include <linux/acpi.h> +- void conftest_acpi_os_wait_events_complete(void) { +- acpi_os_wait_events_complete(NULL); +- }" > conftest$$.c +- +- $CC $CFLAGS -c conftest$$.c > /dev/null 2>&1 +- rm -f conftest$$.c +- +- if [ -f conftest$$.o ]; then +- rm -f conftest$$.o +- echo "#define NV_ACPI_OS_WAIT_EVENTS_COMPLETE_PRESENT" >> conftest.h +- echo "#define NV_ACPI_OS_WAIT_EVENTS_COMPLETE_ARGUMENT_COUNT 1" >> conftest.h +- return +- fi +- +- echo "$CONFTEST_PREAMBLE +- #include <linux/acpi.h> +- void conftest_acpi_os_wait_events_complete(void) { +- acpi_os_wait_events_complete(); +- }" > conftest$$.c +- +- $CC $CFLAGS -c conftest$$.c > /dev/null 2>&1 +- rm -f conftest$$.c +- +- if [ -f conftest$$.o ]; then +- rm -f conftest$$.o +- echo "#define NV_ACPI_OS_WAIT_EVENTS_COMPLETE_PRESENT" >> conftest.h +- echo "#define NV_ACPI_OS_WAIT_EVENTS_COMPLETE_ARGUMENT_COUNT 0" >> conftest.h +- return +- else +- echo "#error acpi_os_wait_events_complete() conftest failed!" >> conftest.h +- fi +- ;; +- + ioremap_cache) + # + # Determine if the ioremap_cache() function is present. +diff -u -r NVIDIA-Linux-x86_64-173.14.38-pkg2/usr/src/nv/nv-linux.h NVIDIA-Linux-x86_64-173.14.38-pkg2-patched/usr/src/nv/nv-linux.h +--- NVIDIA-Linux-x86_64-173.14.38-pkg2/usr/src/nv/nv-linux.h 2013-08-28 21:53:41.000000000 +0100 ++++ NVIDIA-Linux-x86_64-173.14.38-pkg2-patched/usr/src/nv/nv-linux.h 2015-08-28 10:37:23.727119733 +0100 +@@ -206,8 +206,7 @@ + #endif + + #if defined(CONFIG_ACPI) +-#include <acpi/acpi.h> +-#include <acpi/acpi_drivers.h> ++#include <linux/acpi.h> + #if defined(NV_ACPI_DEVICE_OPS_HAS_MATCH) || defined(ACPI_VIDEO_HID) + #define NV_LINUX_ACPI_EVENTS_SUPPORTED 1 + #endif +@@ -225,19 +224,6 @@ + #error "NV_ACPI_WALK_NAMESPACE_ARGUMENT_COUNT value unrecognized!" + #endif + +-#if defined(NV_LINUX_ACPI_EVENTS_SUPPORTED) +-#if defined(KERNEL_2_4) || \ +- (NV_ACPI_OS_WAIT_EVENTS_COMPLETE_ARGUMENT_COUNT == 1) +-#define NV_ACPI_OS_WAIT_EVENTS_COMPLETE() \ +- acpi_os_wait_events_complete(NULL) +-#elif (NV_ACPI_OS_WAIT_EVENTS_COMPLETE_ARGUMENT_COUNT == 0) +-#define NV_ACPI_OS_WAIT_EVENTS_COMPLETE() \ +- acpi_os_wait_events_complete() +-#else +-#error "NV_ACPI_OS_WAIT_EVENTS_COMPLETE_ARGUMENT_COUNT value unrecognized!" +-#endif +-#endif +- + #if defined(CONFIG_PREEMPT_RT) + typedef atomic_spinlock_t nv_spinlock_t; + #define NV_SPIN_LOCK_INIT(lock) atomic_spin_lock_init(lock) +diff -u -r NVIDIA-Linux-x86_64-173.14.38-pkg2/usr/src/nv/nv.c NVIDIA-Linux-x86_64-173.14.38-pkg2-patched/usr/src/nv/nv.c +--- NVIDIA-Linux-x86_64-173.14.38-pkg2/usr/src/nv/nv.c 2013-08-28 21:53:41.000000000 +0100 ++++ NVIDIA-Linux-x86_64-173.14.38-pkg2-patched/usr/src/nv/nv.c 2015-08-28 10:37:41.374201994 +0100 +@@ -841,8 +841,13 @@ + unsigned long cr0 = read_cr0(); + write_cr0(((cr0 & (0xdfffffff)) | 0x40000000)); + wbinvd(); ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4,0,0) ++ *cr4 = __read_cr4(); ++ if (*cr4 & 0x80) __write_cr4(*cr4 & ~0x80); ++#else + *cr4 = read_cr4(); + if (*cr4 & 0x80) write_cr4(*cr4 & ~0x80); ++#endif + __flush_tlb(); + } + +@@ -852,7 +857,11 @@ + wbinvd(); + __flush_tlb(); + write_cr0((cr0 & 0x9fffffff)); ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4,0,0) ++ if (cr4 & 0x80) __write_cr4(cr4); ++#else + if (cr4 & 0x80) write_cr4(cr4); ++#endif + } + + static int __determine_pat_mode() +@@ -2746,7 +2755,7 @@ + unsigned long i_arg + ) + { +- return nv_kern_ioctl(file->f_dentry->d_inode, file, cmd, i_arg); ++ return nv_kern_ioctl(file->f_path.dentry->d_inode, file, cmd, i_arg); + } + + long nv_kern_compat_ioctl( +@@ -2755,7 +2764,7 @@ + unsigned long i_arg + ) + { +- return nv_kern_ioctl(file->f_dentry->d_inode, file, cmd, i_arg); ++ return nv_kern_ioctl(file->f_path.dentry->d_inode, file, cmd, i_arg); + } + + /* +diff -u -r NVIDIA-Linux-x86_64-173.14.38-pkg2/usr/src/nv/nvacpi.c NVIDIA-Linux-x86_64-173.14.38-pkg2-patched/usr/src/nv/nvacpi.c +--- NVIDIA-Linux-x86_64-173.14.38-pkg2/usr/src/nv/nvacpi.c 2013-08-28 21:53:41.000000000 +0100 ++++ NVIDIA-Linux-x86_64-173.14.38-pkg2-patched/usr/src/nv/nvacpi.c 2015-08-28 10:37:23.726119728 +0100 +@@ -14,6 +14,10 @@ + #include "os-interface.h" + #include "nv-linux.h" + ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 13, 0) && defined(ACPI_HANDLE) ++#define DEVICE_ACPI_HANDLE(a) ACPI_HANDLE(a) ++#endif ++ + #if defined(NV_LINUX_ACPI_EVENTS_SUPPORTED) + + /* +@@ -259,8 +263,6 @@ + + if (pNvAcpiObject->notify_handler_installed) + { +- NV_ACPI_OS_WAIT_EVENTS_COMPLETE(); +- + // remove event notifier + status = acpi_remove_notify_handler(device->handle, ACPI_DEVICE_NOTIFY, nv_acpi_event); + } diff --git a/system/nvidia-legacy96-kernel/nvidia-legacy96-kernel.SlackBuild b/system/nvidia-legacy96-kernel/nvidia-legacy96-kernel.SlackBuild index 736b14a069..837e6209fb 100644 --- a/system/nvidia-legacy96-kernel/nvidia-legacy96-kernel.SlackBuild +++ b/system/nvidia-legacy96-kernel/nvidia-legacy96-kernel.SlackBuild @@ -24,8 +24,9 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. # Thanks to Robby Workman for suggestions to improve this script. +# Thanks to previous maintainer Edward Koenig <kingbeowulf[at]gmail.com> -# Maintainer: Edward Koenig <kingbeowulf[at]gmail.com> +# Maintainer for 14.2: David Spencer <baildon.research@googlemail.com> PRGNAM=nvidia-legacy96-kernel VERSION=96.43.23 @@ -47,6 +48,10 @@ if [ -z "$ARCH" ]; then esac fi +CWD=$(pwd) +TMP=${TMP:-/tmp/SBo} +PKG=${PKG:-$TMP/package-$PRGNAM} +OUTPUT=${OUTPUT:-/tmp} if [ "$ARCH" = "i486" ]; then TARGET="x86" @@ -55,37 +60,35 @@ elif [ "$ARCH" = "i686" ]; then elif [ "$ARCH" = "x86_64" ]; then TARGET="x86_64" NVPKG="pkg2" +else + echo "Unsupported ARCH: $ARCH" + exit 1 fi - unset ARCH -SRCNAM=NVIDIA-Linux-$TARGET-$VERSION-$NVPKG +set -e -CWD=$(pwd) -TMP=${TMP:-/tmp/SBo} -PKG=${PKG:-$TMP/package-$PRGNAM} -OUTPUT=${OUTPUT:-/tmp} +SRCNAM=NVIDIA-Linux-$TARGET-$VERSION-$NVPKG rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT -cd $TMP || exit 1 +cd $TMP rm -rf $SRCNAM -sh $CWD/$SRCNAM.run --extract-only || exit 1 -cd $SRCNAM || exit 1 +sh $CWD/$SRCNAM.run --extract-only +cd $SRCNAM 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 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 {} \; -cd usr/src/nv/ || exit 1 +# Consolidated patch to build against Linux kernel 4.0 +patch -p1 < $CWD/nvidia-legacy96_kernel-4.0.patch -# backported patches courtesy of https://aur.archlinux.org/packages/nvidia-96xx/ -patch -p1 -i $CWD/patches/173.14.36-37.patch || exit 1 -patch -p1 -i $CWD/patches/173.14.37-38.patch || exit 1 +cd usr/src/nv/ -make SYSSRC=$KERNELPATH module || exit 1 +make SYSSRC=$KERNELPATH module mkdir -p $PKG/lib/modules/$KERNEL/kernel/drivers/video install -m 0664 nvidia.ko $PKG/lib/modules/$KERNEL/kernel/drivers/video/ diff --git a/system/nvidia-legacy96-kernel/nvidia-legacy96-kernel.info b/system/nvidia-legacy96-kernel/nvidia-legacy96-kernel.info index b3d93e9698..e51ce26e06 100644 --- a/system/nvidia-legacy96-kernel/nvidia-legacy96-kernel.info +++ b/system/nvidia-legacy96-kernel/nvidia-legacy96-kernel.info @@ -6,5 +6,5 @@ MD5SUM="21f6eb657e651a83ff4271438122b379" DOWNLOAD_x86_64="ftp://download.nvidia.com/XFree86/Linux-x86_64/96.43.23/NVIDIA-Linux-x86_64-96.43.23-pkg2.run" MD5SUM_x86_64="dd8546e5ae7d10da072306e5f13952b8" REQUIRES="" -MAINTAINER="Edward W. Koenig" -EMAIL="kingbeowulf@gmail.com" +MAINTAINER="David Spencer" +EMAIL="baildon.research@googlemail.com" diff --git a/system/nvidia-legacy96-kernel/patches/173.14.37-38.patch b/system/nvidia-legacy96-kernel/nvidia-legacy96_kernel-4.0.patch index bd8e94ce95..f3aac5677e 100644 --- a/system/nvidia-legacy96-kernel/patches/173.14.37-38.patch +++ b/system/nvidia-legacy96-kernel/nvidia-legacy96_kernel-4.0.patch @@ -1,7 +1,97 @@ -diff -pur 1/conftest.sh 2/conftest.sh ---- 1/conftest.sh 2012-09-01 02:04:44.000000000 +0400 -+++ 2/conftest.sh 2013-09-17 20:11:54.586886368 +0400 -@@ -1202,6 +1202,99 @@ compile_test() { +diff -u -r NVIDIA-Linux-x86_64-96.43.23-pkg2/usr/src/nv/Makefile.kbuild NVIDIA-Linux-x86_64-96.43.23-pkg2-patched/usr/src/nv/Makefile.kbuild +--- NVIDIA-Linux-x86_64-96.43.23-pkg2/usr/src/nv/Makefile.kbuild 2012-09-01 11:48:26.000000000 +0100 ++++ NVIDIA-Linux-x86_64-96.43.23-pkg2-patched/usr/src/nv/Makefile.kbuild 2015-08-28 10:57:54.455966846 +0100 +@@ -189,7 +189,11 @@ + agp_memory \ + scatterlist \ + file_operations \ +- sg_init_table ++ sg_init_table \ ++ proc_create_data \ ++ pde_data \ ++ proc_remove \ ++ get_num_physpages + else + COMPILE_TESTS = \ + remap_page_range \ +diff -u -r NVIDIA-Linux-x86_64-96.43.23-pkg2/usr/src/nv/Makefile.nvidia NVIDIA-Linux-x86_64-96.43.23-pkg2-patched/usr/src/nv/Makefile.nvidia +--- NVIDIA-Linux-x86_64-96.43.23-pkg2/usr/src/nv/Makefile.nvidia 2012-09-01 11:48:26.000000000 +0100 ++++ NVIDIA-Linux-x86_64-96.43.23-pkg2-patched/usr/src/nv/Makefile.nvidia 2015-08-28 10:57:54.455966846 +0100 +@@ -62,7 +62,10 @@ + smp_call_function \ + proc_dir_entry \ + scatterlist \ +- file_operations ++ file_operations \ ++ proc_create_data \ ++ pde_data \ ++ proc_remove + + DEFINES+=$(EXTRA_DEFINES) + +diff -u -r NVIDIA-Linux-x86_64-96.43.23-pkg2/usr/src/nv/conftest.sh NVIDIA-Linux-x86_64-96.43.23-pkg2-patched/usr/src/nv/conftest.sh +--- NVIDIA-Linux-x86_64-96.43.23-pkg2/usr/src/nv/conftest.sh 2012-09-01 11:48:26.000000000 +0100 ++++ NVIDIA-Linux-x86_64-96.43.23-pkg2-patched/usr/src/nv/conftest.sh 2015-08-28 10:58:10.815050413 +0100 +@@ -128,6 +128,7 @@ + if [ "$ARCH" = "i386" -o "$ARCH" = "x86_64" ]; then + MACH_CFLAGS="$MACH_CFLAGS -I$HEADERS/asm-x86/mach-default" + MACH_CFLAGS="$MACH_CFLAGS -I$SOURCES/arch/x86/include/asm/mach-default" ++ MACH_CFLAGS="$MACH_CFLAGS -I$HEADERS/arch/x86/include/uapi" + fi + if [ "$XEN_PRESENT" != "0" ]; then + MACH_CFLAGS="-I$HEADERS/asm-$ARCH/mach-xen $MACH_CFLAGS" +@@ -137,16 +138,21 @@ + if [ "$ARCH" = "i386" -o "$ARCH" = "x86_64" ]; then + MACH_CFLAGS="$MACH_CFLAGS -I$HEADERS/asm-x86/mach-default" + MACH_CFLAGS="$MACH_CFLAGS -I$SOURCES/arch/x86/include/asm/mach-default" ++ MACH_CFLAGS="$MACH_CFLAGS -I$HEADERS/arch/x86/include/uapi" + fi + if [ "$XEN_PRESENT" != "0" ]; then + MACH_CFLAGS="-I$HEADERS/asm/mach-xen $MACH_CFLAGS" + fi + fi + +- CFLAGS="$BASE_CFLAGS $MACH_CFLAGS $OUTPUT_CFLAGS -I$HEADERS $AUTOCONF_CFLAGS" ++ CFLAGS="$BASE_CFLAGS $MACH_CFLAGS $OUTPUT_CFLAGS $AUTOCONF_CFLAGS" ++ CFLAGS="$CFLAGS -I$HEADERS -I$HEADERS/uapi -I$OUTPUT/include/generated/uapi" + + if [ "$ARCH" = "i386" -o "$ARCH" = "x86_64" ]; then +- CFLAGS="$CFLAGS -I$SOURCES/arch/x86/include -I$OUTPUT/arch/x86/include/generated" ++ CFLAGS="$CFLAGS -I$SOURCES/arch/x86/include" ++ CFLAGS="$CFLAGS -I$SOURCES/arch/x86/include/uapi" ++ CFLAGS="$CFLAGS -I$OUTPUT/arch/x86/include/generated" ++ CFLAGS="$CFLAGS -I$OUTPUT/arch/x86/include/generated/uapi" + fi + if [ -n "$BUILD_PARAMS" ]; then + CFLAGS="$CFLAGS -D$BUILD_PARAMS" +@@ -938,7 +944,7 @@ + # and how many arguments it takes. + # + echo "$CONFTEST_PREAMBLE +- #include <acpi/acpi.h> ++ #include <linux/acpi.h> + void conftest_acpi_walk_namespace(void) { + acpi_walk_namespace(); + }" > conftest$$.c +@@ -953,7 +959,7 @@ + fi + + echo "$CONFTEST_PREAMBLE +- #include <acpi/acpi.h> ++ #include <linux/acpi.h> + void conftest_acpi_walk_namespace(void) { + acpi_walk_namespace(0, NULL, 0, NULL, NULL, NULL, NULL); + }" > conftest$$.c +@@ -969,7 +975,7 @@ + fi + + echo "$CONFTEST_PREAMBLE +- #include <acpi/acpi.h> ++ #include <linux/acpi.h> + void conftest_acpi_walk_namespace(void) { + acpi_walk_namespace(0, NULL, 0, NULL, NULL, NULL); + }" > conftest$$.c +@@ -1202,6 +1208,99 @@ fi ;; @@ -101,41 +191,83 @@ diff -pur 1/conftest.sh 2/conftest.sh esac } -diff -pur 1/Makefile.kbuild 2/Makefile.kbuild ---- 1/Makefile.kbuild 2012-09-01 02:04:44.000000000 +0400 -+++ 2/Makefile.kbuild 2013-09-17 20:11:54.586886368 +0400 -@@ -189,7 +189,11 @@ ifneq ($(PATCHLEVEL), 4) - agp_memory \ - scatterlist \ - file_operations \ -- sg_init_table -+ sg_init_table \ -+ proc_create_data \ -+ pde_data \ -+ proc_remove \ -+ get_num_physpages - else - COMPILE_TESTS = \ - remap_page_range \ -diff -pur 1/Makefile.nvidia 2/Makefile.nvidia ---- 1/Makefile.nvidia 2012-09-01 02:04:44.000000000 +0400 -+++ 2/Makefile.nvidia 2013-09-17 20:11:54.586886368 +0400 -@@ -62,7 +62,10 @@ COMPILE_TESTS = \ - smp_call_function \ - proc_dir_entry \ - scatterlist \ -- file_operations -+ file_operations \ -+ proc_create_data \ -+ pde_data \ -+ proc_remove +@@ -1407,7 +1506,8 @@ + FILE="linux/version.h" + SELECTED_MAKEFILE="" - DEFINES+=$(EXTRA_DEFINES) +- if [ -f $HEADERS/$FILE -o -f $OUTPUT/include/$FILE ]; then ++ if [ -f $HEADERS/$FILE -o -f $OUTPUT/include/$FILE -o \ ++ -f $OUTPUT/include/generated/uapi/$FILE ]; then + # + # We are either looking at a configured kernel source + # tree or at headers shipped for a specific kernel. +diff -u -r NVIDIA-Linux-x86_64-96.43.23-pkg2/usr/src/nv/nv-i2c.c NVIDIA-Linux-x86_64-96.43.23-pkg2-patched/usr/src/nv/nv-i2c.c +--- NVIDIA-Linux-x86_64-96.43.23-pkg2/usr/src/nv/nv-i2c.c 2012-09-01 11:48:26.000000000 +0100 ++++ NVIDIA-Linux-x86_64-96.43.23-pkg2-patched/usr/src/nv/nv-i2c.c 2015-08-28 10:57:54.456966851 +0100 +@@ -285,8 +285,6 @@ + BOOL NV_API_CALL nv_i2c_del_adapter(nv_state_t *nv, void *data) + { + struct i2c_adapter *pI2cAdapter = (struct i2c_adapter *)data; +- int osstatus = 0; +- BOOL wasReleased = FALSE; -diff -pur 1/nv.c 2/nv.c ---- 1/nv.c 2012-09-01 02:04:44.000000000 +0400 -+++ 2/nv.c 2013-09-17 20:25:21.970607458 +0400 -@@ -163,6 +163,91 @@ static int nvl_remove_alloc(nv_ + #if defined(KERNEL_2_4) + if (!NV_WEAK_SYMBOL_PRESENT(i2c_add_adapter)) +@@ -297,16 +295,11 @@ + + if (!pI2cAdapter) return FALSE; + +- // attempt release with the OS +- osstatus = i2c_del_adapter(pI2cAdapter); ++ // release with the OS ++ i2c_del_adapter(pI2cAdapter); ++ os_free_mem(pI2cAdapter); + +- if (!osstatus) +- { +- os_free_mem(pI2cAdapter); +- wasReleased = TRUE; +- } +- +- return wasReleased; ++ return TRUE; + } + + #else // (defined(CONFIG_I2C) || defined(CONFIG_I2C_MODULE)) +diff -u -r NVIDIA-Linux-x86_64-96.43.23-pkg2/usr/src/nv/nv-linux.h NVIDIA-Linux-x86_64-96.43.23-pkg2-patched/usr/src/nv/nv-linux.h +--- NVIDIA-Linux-x86_64-96.43.23-pkg2/usr/src/nv/nv-linux.h 2012-09-01 11:48:26.000000000 +0100 ++++ NVIDIA-Linux-x86_64-96.43.23-pkg2-patched/usr/src/nv/nv-linux.h 2015-08-28 10:57:54.457966856 +0100 +@@ -64,6 +64,18 @@ + #include <linux/module.h> + #include <linux/kmod.h> + ++#include <linux/mm.h> ++ ++#if !defined(VM_RESERVED) ++#define VM_RESERVED 0x00000000 ++#endif ++#if !defined(VM_DONTEXPAND) ++#define VM_DONTEXPAND 0x00000000 ++#endif ++#if !defined(VM_DONTDUMP) ++#define VM_DONTDUMP 0x00000000 ++#endif ++ + #include <linux/init.h> /* module_init, module_exit */ + #include <linux/types.h> /* pic_t, size_t, __u32, etc */ + #include <linux/errno.h> /* error codes */ +@@ -128,6 +140,7 @@ + + #ifdef CONFIG_PROC_FS + #include <linux/proc_fs.h> ++#include <linux/seq_file.h> + #endif + + #ifdef CONFIG_MTRR +diff -u -r NVIDIA-Linux-x86_64-96.43.23-pkg2/usr/src/nv/nv.c NVIDIA-Linux-x86_64-96.43.23-pkg2-patched/usr/src/nv/nv.c +--- NVIDIA-Linux-x86_64-96.43.23-pkg2/usr/src/nv/nv.c 2012-09-01 11:48:26.000000000 +0100 ++++ NVIDIA-Linux-x86_64-96.43.23-pkg2-patched/usr/src/nv/nv.c 2015-08-28 10:58:21.135103128 +0100 +@@ -163,6 +163,91 @@ /* lock-related functions that should only be called from this file */ static void nv_lock_init_locks(nv_state_t *nv); @@ -227,7 +359,7 @@ diff -pur 1/nv.c 2/nv.c /*** *** EXPORTS to Linux Kernel -@@ -190,13 +275,6 @@ void nv_kern_rc_timer(unsigned +@@ -190,13 +275,6 @@ static int nv_kern_apm_event(struct pm_dev *, pm_request_t, void *); #endif @@ -241,7 +373,7 @@ diff -pur 1/nv.c 2/nv.c int nv_kern_ctl_open(struct inode *, struct file *); int nv_kern_ctl_close(struct inode *, struct file *); unsigned int nv_kern_ctl_poll(struct file *, poll_table *); -@@ -490,156 +568,17 @@ static struct pci_dev* nv_get_pci_device +@@ -490,156 +568,17 @@ return NULL; } @@ -406,7 +538,7 @@ diff -pur 1/nv.c 2/nv.c static void nvos_proc_add_text_file( struct proc_dir_entry *parent, -@@ -647,26 +586,15 @@ nvos_proc_add_text_file( +@@ -647,26 +586,15 @@ const char *text ) { @@ -437,7 +569,7 @@ diff -pur 1/nv.c 2/nv.c while (entry) { struct proc_dir_entry *next = entry->next; if (entry->subdir) -@@ -676,6 +604,7 @@ static void nvos_proc_remove_all(struct +@@ -676,6 +604,7 @@ break; entry = next; } @@ -445,7 +577,71 @@ diff -pur 1/nv.c 2/nv.c } #endif -@@ -2848,18 +2777,17 @@ void NV_API_CALL nv_set_dma_address_s +@@ -797,8 +726,13 @@ + unsigned long cr0 = read_cr0(); + write_cr0(((cr0 & (0xdfffffff)) | 0x40000000)); + wbinvd(); ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4,0,0) ++ *cr4 = __read_cr4(); ++ if (*cr4 & 0x80) __write_cr4(*cr4 & ~0x80); ++#else + *cr4 = read_cr4(); + if (*cr4 & 0x80) write_cr4(*cr4 & ~0x80); ++#endif + __flush_tlb(); + } + +@@ -808,7 +742,11 @@ + wbinvd(); + __flush_tlb(); + write_cr0((cr0 & 0x9fffffff)); ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4,0,0) ++ if (cr4 & 0x80) __write_cr4(cr4); ++#else + if (cr4 & 0x80) write_cr4(cr4); ++#endif + } + + static int __determine_pat_mode() +@@ -2348,9 +2286,8 @@ + NV_PRINT_AT(NV_DBG_MEMINFO, at); + nv_vm_list_page_count(&at->page_table[i], pages); + +- /* prevent the swapper from swapping it out */ +- /* mark the memory i/o so the buffers aren't dumped on core dumps */ + vma->vm_flags |= (VM_IO | VM_LOCKED | VM_RESERVED); ++ vma->vm_flags |= (VM_DONTEXPAND | VM_DONTDUMP); + } + + NV_VMA_FILE(vma) = file; +@@ -2370,7 +2307,7 @@ + + nvl = NVL_FROM_FILEP(file); + +- if (NV_IS_CONTROL_DEVICE(file->f_dentry->d_inode)) ++ if (NV_IS_CONTROL_DEVICE(file->f_path.dentry->d_inode)) + return nv_kern_ctl_poll(file, wait); + + nvfp = NV_GET_NVFP(file); +@@ -2565,7 +2502,7 @@ + unsigned long i_arg + ) + { +- return nv_kern_ioctl(file->f_dentry->d_inode, file, cmd, i_arg); ++ return nv_kern_ioctl(file->f_path.dentry->d_inode, file, cmd, i_arg); + } + + long nv_kern_compat_ioctl( +@@ -2574,7 +2511,7 @@ + unsigned long i_arg + ) + { +- return nv_kern_ioctl(file->f_dentry->d_inode, file, cmd, i_arg); ++ return nv_kern_ioctl(file->f_path.dentry->d_inode, file, cmd, i_arg); + } + + /* +@@ -2848,18 +2785,17 @@ } static int @@ -470,7 +666,7 @@ diff -pur 1/nv.c 2/nv.c dev = nv_get_pci_device(nv); if (!dev) return 0; -@@ -2869,61 +2797,61 @@ nv_kern_read_cardinfo(char *page, char * +@@ -2869,61 +2805,61 @@ strcpy (tmpstr, "Unknown"); } @@ -559,7 +755,7 @@ diff -pur 1/nv.c 2/nv.c if (nv) { dev = nv_get_pci_device(nv); -@@ -2934,13 +2862,12 @@ nv_kern_read_agpinfo(char *page, char ** +@@ -2934,13 +2870,12 @@ if (!dev) return 0; @@ -576,7 +772,7 @@ diff -pur 1/nv.c 2/nv.c #endif } -@@ -2953,40 +2880,40 @@ nv_kern_read_agpinfo(char *page, char ** +@@ -2953,40 +2888,40 @@ fw = (status & 0x00000010) ? "Supported" : "Not Supported"; sba = (status & 0x00000200) ? "Supported" : "Not Supported"; @@ -630,7 +826,7 @@ diff -pur 1/nv.c 2/nv.c dev = nvos_get_agp_device_by_class(PCI_CLASS_BRIDGE_HOST); if (!dev) return 0; -@@ -3007,10 +2934,10 @@ nv_kern_read_status(char *page, char **s +@@ -3007,10 +2942,10 @@ command &= scratch; if (NV_AGP_ENABLED(nv) && (command & 0x100)) { @@ -643,7 +839,7 @@ diff -pur 1/nv.c 2/nv.c // mask off agp rate. // If this is agp 3.0, we need to shift the value -@@ -3018,17 +2945,17 @@ nv_kern_read_status(char *page, char **s +@@ -3018,17 +2953,17 @@ if (status & 0x8) // agp 3.0 agp_rate <<= 2; @@ -665,7 +861,7 @@ diff -pur 1/nv.c 2/nv.c /* * If we find AGP is disabled, but the RM registry indicates it -@@ -3042,7 +2969,7 @@ nv_kern_read_status(char *page, char **s +@@ -3042,7 +2977,7 @@ rm_read_registry_dword(nv, "NVreg", "XNvAGP", &agp_config); if (agp_config != NVOS_AGP_CONFIG_DISABLE_AGP && NV_AGP_FAILED(nv)) { @@ -674,7 +870,7 @@ diff -pur 1/nv.c 2/nv.c "AGP initialization failed, please check the ouput \n" "of the 'dmesg' command and/or your system log file \n" "for additional information on this problem. \n"); -@@ -3050,35 +2977,133 @@ nv_kern_read_status(char *page, char **s +@@ -3050,35 +2985,133 @@ } NV_PCI_DEV_PUT(dev); @@ -822,54 +1018,10 @@ diff -pur 1/nv.c 2/nv.c } /*** -diff -pur 1/nv-i2c.c 2/nv-i2c.c ---- 1/nv-i2c.c 2012-09-01 02:04:44.000000000 +0400 -+++ 2/nv-i2c.c 2013-09-17 20:11:54.590219538 +0400 -@@ -285,8 +285,6 @@ void* NV_API_CALL nv_i2c_add_adapter(nv_ - BOOL NV_API_CALL nv_i2c_del_adapter(nv_state_t *nv, void *data) - { - struct i2c_adapter *pI2cAdapter = (struct i2c_adapter *)data; -- int osstatus = 0; -- BOOL wasReleased = FALSE; - - #if defined(KERNEL_2_4) - if (!NV_WEAK_SYMBOL_PRESENT(i2c_add_adapter)) -@@ -297,16 +295,11 @@ BOOL NV_API_CALL nv_i2c_del_adapter(nv_s - - if (!pI2cAdapter) return FALSE; - -- // attempt release with the OS -- osstatus = i2c_del_adapter(pI2cAdapter); -+ // release with the OS -+ i2c_del_adapter(pI2cAdapter); -+ os_free_mem(pI2cAdapter); - -- if (!osstatus) -- { -- os_free_mem(pI2cAdapter); -- wasReleased = TRUE; -- } -- -- return wasReleased; -+ return TRUE; - } - - #else // (defined(CONFIG_I2C) || defined(CONFIG_I2C_MODULE)) -diff -pur 1/nv-linux.h 2/nv-linux.h ---- 1/nv-linux.h 2012-09-01 02:04:44.000000000 +0400 -+++ 2/nv-linux.h 2013-09-17 20:11:54.590219538 +0400 -@@ -128,6 +128,7 @@ - - #ifdef CONFIG_PROC_FS - #include <linux/proc_fs.h> -+#include <linux/seq_file.h> - #endif - - #ifdef CONFIG_MTRR -diff -pur 1/os-interface.c 2/os-interface.c ---- 1/os-interface.c 2012-09-01 02:04:44.000000000 +0400 -+++ 2/os-interface.c 2013-09-17 20:11:54.590219538 +0400 -@@ -261,7 +261,15 @@ NvU64 NV_API_CALL os_get_page_mask(void) +diff -u -r NVIDIA-Linux-x86_64-96.43.23-pkg2/usr/src/nv/os-interface.c NVIDIA-Linux-x86_64-96.43.23-pkg2-patched/usr/src/nv/os-interface.c +--- NVIDIA-Linux-x86_64-96.43.23-pkg2/usr/src/nv/os-interface.c 2012-09-01 11:48:26.000000000 +0100 ++++ NVIDIA-Linux-x86_64-96.43.23-pkg2-patched/usr/src/nv/os-interface.c 2015-08-28 10:57:54.457966856 +0100 +@@ -261,7 +261,15 @@ NvU64 NV_API_CALL os_get_system_memory_size(void) { diff --git a/system/nvidia-legacy96-kernel/patches/173.14.36-37.patch b/system/nvidia-legacy96-kernel/patches/173.14.36-37.patch deleted file mode 100644 index 843259aea7..0000000000 --- a/system/nvidia-legacy96-kernel/patches/173.14.36-37.patch +++ /dev/null @@ -1,81 +0,0 @@ -diff -pur 173.14.36/conftest.sh 173.14.37/conftest.sh ---- 173.14.36/conftest.sh 2012-09-11 23:36:21.000000000 +0400 -+++ 173.14.37/conftest.sh 2013-03-07 05:17:45.000000000 +0400 -@@ -127,6 +127,7 @@ build_cflags() { - if [ "$ARCH" = "i386" -o "$ARCH" = "x86_64" ]; then - MACH_CFLAGS="$MACH_CFLAGS -I$HEADERS/asm-x86/mach-default" - MACH_CFLAGS="$MACH_CFLAGS -I$SOURCES/arch/x86/include/asm/mach-default" -+ MACH_CFLAGS="$MACH_CFLAGS -I$HEADERS/arch/x86/include/uapi" - fi - if [ "$XEN_PRESENT" != "0" ]; then - MACH_CFLAGS="-I$HEADERS/asm-$ARCH/mach-xen $MACH_CFLAGS" -@@ -136,16 +137,21 @@ build_cflags() { - if [ "$ARCH" = "i386" -o "$ARCH" = "x86_64" ]; then - MACH_CFLAGS="$MACH_CFLAGS -I$HEADERS/asm-x86/mach-default" - MACH_CFLAGS="$MACH_CFLAGS -I$SOURCES/arch/x86/include/asm/mach-default" -+ MACH_CFLAGS="$MACH_CFLAGS -I$HEADERS/arch/x86/include/uapi" - fi - if [ "$XEN_PRESENT" != "0" ]; then - MACH_CFLAGS="-I$HEADERS/asm/mach-xen $MACH_CFLAGS" - fi - fi - -- CFLAGS="$BASE_CFLAGS $MACH_CFLAGS $OUTPUT_CFLAGS -I$HEADERS $AUTOCONF_CFLAGS" -+ CFLAGS="$BASE_CFLAGS $MACH_CFLAGS $OUTPUT_CFLAGS $AUTOCONF_CFLAGS" -+ CFLAGS="$CFLAGS -I$HEADERS -I$HEADERS/uapi -I$OUTPUT/include/generated/uapi" - - if [ "$ARCH" = "i386" -o "$ARCH" = "x86_64" ]; then -- CFLAGS="$CFLAGS -I$SOURCES/arch/x86/include -I$OUTPUT/arch/x86/include/generated" -+ CFLAGS="$CFLAGS -I$SOURCES/arch/x86/include" -+ CFLAGS="$CFLAGS -I$SOURCES/arch/x86/include/uapi" -+ CFLAGS="$CFLAGS -I$OUTPUT/arch/x86/include/generated" -+ CFLAGS="$CFLAGS -I$OUTPUT/arch/x86/include/generated/uapi" - fi - if [ -n "$BUILD_PARAMS" ]; then - CFLAGS="$CFLAGS -D$BUILD_PARAMS" -@@ -1453,7 +1459,8 @@ case "$6" in - FILE="linux/version.h" - SELECTED_MAKEFILE="" - -- if [ -f $HEADERS/$FILE -o -f $OUTPUT/include/$FILE ]; then -+ if [ -f $HEADERS/$FILE -o -f $OUTPUT/include/$FILE -o \ -+ -f $OUTPUT/include/generated/uapi/$FILE ]; then - # - # We are either looking at a configured kernel source - # tree or at headers shipped for a specific kernel. -diff -pur 173.14.36/nv.c 173.14.37/nv.c ---- 173.14.36/nv.c 2012-09-11 23:36:21.000000000 +0400 -+++ 173.14.37/nv.c 2013-03-07 05:17:44.000000000 +0400 -@@ -2607,9 +2607,8 @@ int nv_kern_mmap( - NV_PRINT_AT(NV_DBG_MEMINFO, at); - nv_vm_list_page_count(&at->page_table[i], pages); - -- /* prevent the swapper from swapping it out */ -- /* mark the memory i/o so the buffers aren't dumped on core dumps */ - vma->vm_flags |= (VM_IO | VM_LOCKED | VM_RESERVED); -+ vma->vm_flags |= (VM_DONTEXPAND | VM_DONTDUMP); - } - - NV_VMA_FILE(vma) = file; -diff -pur 173.14.36/nv-linux.h 173.14.37/nv-linux.h ---- 173.14.36/nv-linux.h 2012-09-11 23:36:21.000000000 +0400 -+++ 173.14.37/nv-linux.h 2013-03-07 05:17:45.000000000 +0400 -@@ -64,6 +64,18 @@ - #include <linux/module.h> - #include <linux/kmod.h> - -+#include <linux/mm.h> -+ -+#if !defined(VM_RESERVED) -+#define VM_RESERVED 0x00000000 -+#endif -+#if !defined(VM_DONTEXPAND) -+#define VM_DONTEXPAND 0x00000000 -+#endif -+#if !defined(VM_DONTDUMP) -+#define VM_DONTDUMP 0x00000000 -+#endif -+ - #include <linux/init.h> /* module_init, module_exit */ - #include <linux/types.h> /* pic_t, size_t, __u32, etc */ - #include <linux/errno.h> /* error codes */ diff --git a/system/qemu/qemu.SlackBuild b/system/qemu/qemu.SlackBuild index a06d2ec635..20fe39c12b 100644 --- a/system/qemu/qemu.SlackBuild +++ b/system/qemu/qemu.SlackBuild @@ -45,7 +45,7 @@ # 3.0 05-SEP-2015 uprgraded to new version PRGNAM=qemu -VERSION=${VERSION:-2.4.0} +VERSION=${VERSION:-2.4.1} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} diff --git a/system/qemu/qemu.info b/system/qemu/qemu.info index 2967356d4a..aafd04cbd3 100644 --- a/system/qemu/qemu.info +++ b/system/qemu/qemu.info @@ -1,9 +1,9 @@ PRGNAM="qemu" -VERSION="2.4.0" +VERSION="2.4.1" HOMEPAGE="http://wiki.qemu.org/Main_Page" -DOWNLOAD="http://wiki.qemu.org/download/qemu-2.4.0.tar.bz2 \ +DOWNLOAD="http://wiki.qemu.org/download/qemu-2.4.1.tar.bz2 \ http://harrier.slackbuilds.org/misc/libusb-1.0.19.tar.xz" -MD5SUM="186ee8194140a484a455f8e3c74589f4 \ +MD5SUM="a895e93ec1dafc34bc64ed676f0d55a6 \ 30fcf0865e8945a39d7d136f907e933c" DOWNLOAD_x86_64="" MD5SUM_x86_64="" diff --git a/system/seahorse/seahorse.SlackBuild b/system/seahorse/seahorse.SlackBuild index 60367a1102..7a5520cb3b 100644 --- a/system/seahorse/seahorse.SlackBuild +++ b/system/seahorse/seahorse.SlackBuild @@ -6,7 +6,7 @@ # Updated to version 3.8.1 by Andrew Rowland PRGNAM=seahorse -VERSION=${VERSION:-3.8.1} +VERSION=${VERSION:-3.18.0} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} diff --git a/system/seahorse/seahorse.info b/system/seahorse/seahorse.info index 42fe25e313..39a0da1d79 100644 --- a/system/seahorse/seahorse.info +++ b/system/seahorse/seahorse.info @@ -1,8 +1,8 @@ PRGNAM="seahorse" -VERSION="3.8.1" +VERSION="3.18.0" HOMEPAGE="http://projects.gnome.org/seahorse/" -DOWNLOAD="http://ftp.gnome.org/pub/GNOME/sources/seahorse/3.8/seahorse-3.8.1.tar.xz" -MD5SUM="5f80effb99f418d09fffaf701409620c" +DOWNLOAD="http://ftp.gnome.org/pub/GNOME/sources/seahorse/3.18/seahorse-3.18.0.tar.xz" +MD5SUM="758204ac248e1fb3b3767ce84d2795b4" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" diff --git a/system/secure-delete/secure-delete.SlackBuild b/system/secure-delete/secure-delete.SlackBuild index 77f8b37131..bcaca870f2 100644 --- a/system/secure-delete/secure-delete.SlackBuild +++ b/system/secure-delete/secure-delete.SlackBuild @@ -77,7 +77,7 @@ sed -i -e "/strip/d" Makefile patch < $CWD/secure-delete-3.1-do-not-use-the-kernel-module.patch patch < $CWD/secure-delete-3.1-makefile.patch -make prefix=/usr DESTDIR=$PKG +make -j1 prefix=/usr DESTDIR=$PKG 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 diff --git a/system/slack-utils/slack-utils.SlackBuild b/system/slack-utils/slack-utils.SlackBuild index c0ad4f9e7b..0aecd16e22 100644 --- a/system/slack-utils/slack-utils.SlackBuild +++ b/system/slack-utils/slack-utils.SlackBuild @@ -49,6 +49,9 @@ rm -rf $PRGNAM-$VERSION tar xvf $CWD/$PRGNAM-$VERSION.tar.gz cd $PRGNAM-$VERSION +# Fix renamed Config -> RbConfig +sed -i -e 's/::Config::CONFIG/::RbConfig::CONFIG/' setup.rb + ruby setup.rb config \ --prefix=/usr \ --sysconfdir=/etc \ diff --git a/system/spice-vdagent/README b/system/spice-vdagent/README new file mode 100644 index 0000000000..07292e9f81 --- /dev/null +++ b/system/spice-vdagent/README @@ -0,0 +1,8 @@ +spice-vdagent (spice agent for Linux vms) + +spice-vdagent enhanches interactions with your Linux virtual guests: +- client mouse mode +- automatic adjustment of the X-session resolution to the client's one +- support of copy and paste +- limited support for multiple displays using Xinerama +- full support for multiple displays using Xrandr diff --git a/system/spice-vdagent/doinst.sh b/system/spice-vdagent/doinst.sh new file mode 100644 index 0000000000..97bb4e39c5 --- /dev/null +++ b/system/spice-vdagent/doinst.sh @@ -0,0 +1,37 @@ +config() { + NEW="$1" + OLD="$(dirname $NEW)/$(basename $NEW .new)" + # If there's no config file by that name, mv it over: + if [ ! -r $OLD ]; then + mv $NEW $OLD + elif [ "$(cat $OLD | md5sum)" = "$(cat $NEW | md5sum)" ]; then + # toss the redundant copy + rm $NEW + fi + # Otherwise, we leave the .new copy for the admin to consider... +} + +preserve_perms() { + NEW="$1" + OLD="$(dirname $NEW)/$(basename $NEW .new)" + if [ -e $OLD ]; then + cp -a $OLD ${NEW}.incoming + cat $NEW > ${NEW}.incoming + mv ${NEW}.incoming $NEW + fi + config $NEW +} + +preserve_perms etc/rc.d/rc.spice-vdagent.new +config usr/share/X11/xorg.conf.d/06-spice-vdagent.conf.new + +# If not already there, start the daemon from /etc/rc.d/rc.local +if [ ! "$(grep rc\.spice-vdagent etc/rc.d/rc.local)" ]; then + cat << EOF >> etc/rc.d/rc.local + +# Start spice-vdagent: +if [ -x /etc/rc.d/rc.spice-vdagent ]; then + /etc/rc.d/rc.spice-vdagent start +fi +EOF +fi diff --git a/system/spice-vdagent/files/06-spice-vdagent.conf b/system/spice-vdagent/files/06-spice-vdagent.conf new file mode 100644 index 0000000000..f74be0db09 --- /dev/null +++ b/system/spice-vdagent/files/06-spice-vdagent.conf @@ -0,0 +1,37 @@ +Section "ServerLayout" + Identifier "Default Layout" + Screen 0 "Screen0" 0 0 + InputDevice "Keyboard0" "CoreKeyboard" + InputDevice "Mouse" "CorePointer" + InputDevice "Tablet" "SendCoreEvents" +EndSection + +Section "InputDevice" + Identifier "Keyboard0" + Driver "kbd" + Option "XkbModel" "pc105" + Option "XkbLayout" "us" +EndSection + +Section "InputDevice" + Identifier "Mouse" + Driver "mouse" + Option "Device" "/dev/input/mice" + #Option "Emulate3Buttons" "yes" +EndSection + +Section "InputDevice" + Identifier "Tablet" + Driver "evdev" + Option "Device" "/dev/input/event3" +EndSection + +Section "Screen" + Identifier "Screen0" + Device "XSPICE" + DefaultDepth 24 + SubSection "Display" + Viewport 0 0 + Depth 24 + EndSubSection +EndSection diff --git a/system/spice-vdagent/files/rc.spice-vdagent b/system/spice-vdagent/files/rc.spice-vdagent new file mode 100644 index 0000000000..9c3ff19cc8 --- /dev/null +++ b/system/spice-vdagent/files/rc.spice-vdagent @@ -0,0 +1,64 @@ +#!/bin/sh +# +# spice-vdagentd Agent daemon for Spice guests +# +# Red Hat specific script slightly adapted for the Slackware init system +# by Matteo Bernardini <ponce@slackbuilds.org> +# +# Description: Together with a per X-session agent process the spice agent +# daemon enhances the spice guest user experience with client +# mouse mode, guest <-> client copy and paste support and more. + +exec="/usr/sbin/spice-vdagentd" +prog="spice-vdagentd" +port="/dev/virtio-ports/com.redhat.spice.0" +pid="/var/run/spice-vdagentd/spice-vdagentd.pid" + +lockfile=/var/lock/subsys/$prog + +start() { + /sbin/modprobe uinput > /dev/null 2>&1 + # In case the previous running vdagentd crashed + /usr/bin/rm -f /var/run/spice-vdagentd/spice-vdagent-sock + /usr/bin/echo "Starting $prog: " + $exec -s $port + retval=$? + /usr/bin/echo + [ $retval -eq 0 ] && echo "$(pidof $prog)" > $pid && /usr/bin/touch $lockfile + return $retval +} + +stop() { + if [ "$(pidof $prog)" ]; then + /usr/bin/echo "Stopping $prog: " + /bin/kill $pid + else + /usr/bin/echo "$prog not running" + return 1 + fi + retval=$? + /usr/bin/echo + [ $retval -eq 0 ] && rm -f $lockfile $pid + return $retval +} + +restart() { + stop + start +} + +case "$1" in + start) + $1 + ;; + stop) + $1 + ;; + restart) + $1 + ;; + *) + /usr/bin/echo $"Usage: $0 {start|stop|restart}" + exit 2 +esac +exit $? diff --git a/system/spice-vdagent/slack-desc b/system/spice-vdagent/slack-desc new file mode 100644 index 0000000000..f058ca3eb1 --- /dev/null +++ b/system/spice-vdagent/slack-desc @@ -0,0 +1,19 @@ +# HOW TO EDIT THIS FILE: +# The "handy ruler" below makes it easier to edit a package description. +# Line up the first '|' above the ':' following the base package name, and +# the '|' on the right side marks the last column you can put a character in. +# You must make exactly 11 lines for the formatting to be correct. It's also +# customary to leave one space after the ':' except on otherwise blank lines. + + |-----handy-ruler------------------------------------------------------| +spice-vdagent: spice-vdagent (spice agent for Linux vms) +spice-vdagent: +spice-vdagent: spice-vdagent enhanches interactions with your Linux virtual guests: +spice-vdagent: - client mouse mode +spice-vdagent: - automatic adjustment of the X-session resolution to the client's one +spice-vdagent: - support of copy and paste +spice-vdagent: - limited support for multiple displays using Xinerama +spice-vdagent: - full support for multiple displays using Xrandr +spice-vdagent: +spice-vdagent: homepage: http://spice-space.org +spice-vdagent: diff --git a/libraries/libimobiledevice/libimobiledevice.SlackBuild b/system/spice-vdagent/spice-vdagent.SlackBuild index ab74d6466e..0db5a0472e 100644 --- a/libraries/libimobiledevice/libimobiledevice.SlackBuild +++ b/system/spice-vdagent/spice-vdagent.SlackBuild @@ -1,12 +1,7 @@ #!/bin/sh -# Slackware build script for libimobiledevice - -# Written by David Somero <dsomero@hotmail.com> -# Derived from Slackware's Slackbuilds. -# -# Copyright 2008, 2009 Patrick J. Volkerding, Sebeka, Minnesota, USA -# Copyright 2010-2011 David Somero (dsomero@hotmail.com) Athens, TN, USA +# Slackware build script for spice-vdagent +# Copyright Matteo Bernardini <ponce@slackbuilds.org>, 2012 # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -15,7 +10,7 @@ # 1. Redistributions of this script must retain the above copyright # notice, this list of conditions and the following disclaimer. # -# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED +# THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED # WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF # MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO # EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, @@ -26,9 +21,8 @@ # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -PRGNAM=libimobiledevice -VERSION=${VERSION:-1.1.5} +PRGNAM=spice-vdagent +VERSION=${VERSION:-0.12.0} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -59,17 +53,19 @@ else LIBDIRSUFFIX="" fi -set -e +DOCS="COPYING ChangeLog README TODO" + +set -e # Exit on most errors rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT cd $TMP rm -rf $PRGNAM-$VERSION -tar xvf $CWD/$PRGNAM-$VERSION.tar.bz2 +tar xvf $CWD/$PRGNAM-$VERSION.tar.?z* 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 \) \ +find . \ + \( -perm 777 -o -perm 775 -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 {} \; @@ -81,27 +77,28 @@ CXXFLAGS="$SLKCFLAGS" \ --libdir=/usr/lib${LIBDIRSUFFIX} \ --sysconfdir=/etc \ --localstatedir=/var \ - --mandir=/usr/man \ --docdir=/usr/doc/$PRGNAM-$VERSION \ --build=$ARCH-slackware-linux make make install DESTDIR=$PKG -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 -find $PKG/usr/man -type f -exec gzip -9 {} \; -for i in $(find $PKG/usr/man -type l); do ln -s $(readlink $i).gz $i.gz; rm $i; done +# Install an init script and an X.org configuration file +install -m 0755 -D $CWD/files/rc.spice-vdagent \ + $PKG/etc/rc.d/rc.spice-vdagent.new +install -m 0644 -D $CWD/files/06-spice-vdagent.conf \ + $PKG/usr/share/X11/xorg.conf.d/06-spice-vdagent.conf.new mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION -cp -a \ - COPYING* README AUTHORS docs/* \ - $PKG/usr/doc/$PRGNAM-$VERSION +cp -a $DOCS $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 +cat $CWD/doinst.sh > $PKG/install/doinst.sh cd $PKG /sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz} diff --git a/system/spice-vdagent/spice-vdagent.info b/system/spice-vdagent/spice-vdagent.info new file mode 100644 index 0000000000..10de6d1b70 --- /dev/null +++ b/system/spice-vdagent/spice-vdagent.info @@ -0,0 +1,10 @@ +PRGNAM="spice-vdagent" +VERSION="0.12.0" +HOMEPAGE="http://spice-space.org" +DOWNLOAD="http://spice-space.org/download/releases/spice-vdagent-0.12.0.tar.bz2" +MD5SUM="a7de4d6682099b7af9c289ef3e2996f7" +DOWNLOAD_x86_64="" +MD5SUM_x86_64="" +REQUIRES="spice xf86-video-qxl" +MAINTAINER="Matteo Bernardini" +EMAIL="ponce@slackbuilds.org" diff --git a/system/spkg/README b/system/spkg/README new file mode 100644 index 0000000000..7fa5b16865 --- /dev/null +++ b/system/spkg/README @@ -0,0 +1,4 @@ +spkg is an extremly fast package manager based on the idea +of Slackware's pkgtools. +It's implemented in C (everything is libified) and optimized +for speed. diff --git a/libraries/newt/slack-desc b/system/spkg/slack-desc index 58acda21ed..2345362d6e 100644 --- a/libraries/newt/slack-desc +++ b/system/spkg/slack-desc @@ -6,14 +6,14 @@ # customary to leave one space after the ':' except on otherwise blank lines. |-----handy-ruler------------------------------------------------------| -newt: Newt (graphic library) -newt: -newt: Newt is a programming library for color text mode, widget based user -newt: interfaces. -newt: -newt: -newt: -newt: -newt: -newt: https://fedorahosted.org/newt/ -newt: +spkg: spkg (The Unofficial Slackware Linux Package Manager) +spkg: +spkg: spkg is an extremly fast package manager based on the idea +spkg: of Slackware's pkgtools. +spkg: It's implemented in C (everything is libified) and optimized +spkg: for speed. +spkg: +spkg: homepage: http://spkg.megous.com +spkg: +spkg: +spkg: diff --git a/libraries/gstreamer1/gstreamer1.SlackBuild b/system/spkg/spkg.SlackBuild index 4025eca73d..36395aa2aa 100644 --- a/libraries/gstreamer1/gstreamer1.SlackBuild +++ b/system/spkg/spkg.SlackBuild @@ -1,8 +1,8 @@ #!/bin/sh -# Slackware build script for gstreamer1 +# Slackware build script for spkg -# Copyright 2013-2015 Robby Workman, Tuscaloosa, Alabama, USA +# Copyright 2013 Matteo Bernardini <ponce@slackbuilds.org>, Pisa, Italy # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -22,13 +22,11 @@ # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -PRGNAM=gstreamer1 -VERSION=${VERSION:-1.4.5} +PRGNAM=spkg +VERSION=${VERSION:-1.0.1} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} -SRCNAM=gstreamer - if [ -z "$ARCH" ]; then case "$( uname -m )" in i?86) ARCH=i486 ;; @@ -61,13 +59,13 @@ set -e rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT cd $TMP -rm -rf $SRCNAM-$VERSION -tar xvf $CWD/$SRCNAM-$VERSION.tar.xz -cd $SRCNAM-$VERSION +rm -rf $PRGNAM-$VERSION +tar xvf $CWD/$PRGNAM-$VERSION.tar.?z* +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 \ + -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 {} \; @@ -85,15 +83,13 @@ CXXFLAGS="$SLKCFLAGS" \ make make install DESTDIR=$PKG -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 +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 find $PKG/usr/man -type f -exec gzip -9 {} \; for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION -cp -a AUTHORS COPYING INSTALL MAINTAINERS NEWS README RELEASE TODO \ - $PKG/usr/doc/$PRGNAM-$VERSION cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild mkdir -p $PKG/install diff --git a/system/spkg/spkg.info b/system/spkg/spkg.info new file mode 100644 index 0000000000..528bc275bd --- /dev/null +++ b/system/spkg/spkg.info @@ -0,0 +1,10 @@ +PRGNAM="spkg" +VERSION="1.0.1" +HOMEPAGE="http://spkg.megous.com" +DOWNLOAD="http://spkg.megous.com/dl/releases/spkg-1.0.1.tar.bz2" +MD5SUM="96f52157593a30dd3b059ba8d8590fad" +DOWNLOAD_x86_64="" +MD5SUM_x86_64="" +REQUIRES="judy" +MAINTAINER="Matteo Bernardini" +EMAIL="ponce@slackbuilds.org" diff --git a/system/truecrypt/truecrypt.SlackBuild b/system/truecrypt/truecrypt.SlackBuild index d7c95da069..a0d55c176f 100644 --- a/system/truecrypt/truecrypt.SlackBuild +++ b/system/truecrypt/truecrypt.SlackBuild @@ -49,13 +49,12 @@ set -e if [ "$ARCH" = "i486" ]; then SLKCFLAGS="-O2 -march=i486 -mtune=i686" - LIBDIRSUFFIX="" + SLKLDFLAGS="" elif [ "$ARCH" = "i686" ]; then SLKCFLAGS="-O2 -march=i686 -mtune=i686" - LIBDIRSUFFIX="" + SLKLDFLAGS="" elif [ "$ARCH" = "x86_64" ]; then SLKCFLAGS="-O2 -fPIC" - LIBDIRSUFFIX="64" SLKLDFLAGS="-L/usr/lib64" fi @@ -71,15 +70,13 @@ 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 {} \; - -if [ $ARCH = "x86_64" ]; then - export LDFLAGS="$SLKLDFLAGS" -fi -export CXXFLAGS="$SLKCFLAGS" -export CFLAGS="$SLKCFLAGS" + -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; # Assume wxWidgets is already installed and we're linking dynamically. + +TC_EXTRA_CFLAGS="$SLKCFLAGS" \ +TC_EXTRA_CXXFLAGS="$SLKCFLAGS" \ +TC_EXTRA_LFLAGS="$SLKLDFLAGS -ldl" \ make mkdir -p $PKG/usr/bin diff --git a/system/usbmuxd/85-usbmuxd.rules b/system/usbmuxd/85-usbmuxd.rules deleted file mode 100644 index 2fbf92c8a9..0000000000 --- a/system/usbmuxd/85-usbmuxd.rules +++ /dev/null @@ -1,7 +0,0 @@ -# usbmuxd (iPhone "Apple Mobile Device" MUXer listening on /var/run/usbmuxd) - -# Forces iPhone 1.0, 3G, 3GS and iPodTouch 1 and 2 to USB configuration 3 and run usbmuxd -ACTION=="add", SUBSYSTEM=="usb", GROUP="plugdev", MODE="770", OWNER="usbmux", ATTR{idVendor}=="05ac", ATTR{idProduct}=="129[0-9]", ATTR{bConfigurationValue}!="$attr{bNumConfigurations}", ATTR{bConfigurationValue}="$attr{bNumConfigurations}", RUN+="/usr/sbin/usbmuxd -u --user=usbmux" - -# Exit usbmuxd when the last phone is removed -ACTION=="remove", SUBSYSTEM=="usb", ENV{PRODUCT}=="5ac/129[0-9]/*", ENV{INTERFACE}=="255/*", RUN+="/usr/sbin/usbmuxd -x" diff --git a/system/usbmuxd/README b/system/usbmuxd/README deleted file mode 100644 index fee3129706..0000000000 --- a/system/usbmuxd/README +++ /dev/null @@ -1,7 +0,0 @@ -usbmuxd: USB Multiplex Daemon. This bit of software is in charge of -talking to your iPhone or iPod Touch over USB and coordinating access to -its services by other applications. - -Before running this script, create a usbmux user with: - useradd -u 277 -g plugdev -d /dev/null -s /bin/false usbmux - diff --git a/system/usbmuxd/doinst.sh b/system/usbmuxd/doinst.sh deleted file mode 100644 index 687cfbae4d..0000000000 --- a/system/usbmuxd/doinst.sh +++ /dev/null @@ -1 +0,0 @@ -chroot . /etc/rc.d/rc.udev reload diff --git a/system/usbmuxd/slack-desc b/system/usbmuxd/slack-desc deleted file mode 100644 index 0c02337984..0000000000 --- a/system/usbmuxd/slack-desc +++ /dev/null @@ -1,19 +0,0 @@ -# HOW TO EDIT THIS FILE: -# The "handy ruler" below makes it easier to edit a package description. -# Line up the first '|' above the ':' following the base package name, and -# the '|' on the right side marks the last column you can put a character in. -# You must make exactly 11 lines for the formatting to be correct. It's also -# customary to leave one space after the ':' except on otherwise blank lines. - - |-----handy-ruler------------------------------------------------------| -usbmuxd: usbmuxd (USB Multiplex Daemon) -usbmuxd: -usbmuxd: usbmuxd USB Multiplex Daemon. This bit of software is in charge of -usbmuxd: talking to your iPhone or iPod Touch over USB and coordinating -usbmuxd: access to its services by other applications. -usbmuxd: -usbmuxd: -usbmuxd: -usbmuxd: -usbmuxd: -usbmuxd: diff --git a/system/usbmuxd/usbmuxd.SlackBuild b/system/usbmuxd/usbmuxd.SlackBuild deleted file mode 100644 index b27c9c1daf..0000000000 --- a/system/usbmuxd/usbmuxd.SlackBuild +++ /dev/null @@ -1,111 +0,0 @@ -#!/bin/sh - -# Slackware build script for usbmuxd - -# Written by David Somero <dsomero@hotmail.com> -# Derived from Slackware's Slackbuilds. -# -# Copyright 2008, 2009 Patrick J. Volkerding, Sebeka, Minnesota, USA -# Copyright 2010-2011 David Somero (dsomero@hotmail.com) Athens, TN, USA -# All rights reserved. -# -# Redistribution and use of this script, with or without modification, is -# permitted provided that the following conditions are met: -# -# 1. Redistributions of this script must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# -# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED -# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO -# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, -# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; -# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, -# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR -# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF -# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -PRGNAM=usbmuxd -VERSION=${VERSION:-1.0.8} -BUILD=${BUILD:-1} -TAG=${TAG:-_SBo} - -if [ -z "$ARCH" ]; then - case "$( uname -m )" in - i?86) ARCH=i486 ;; - arm*) ARCH=arm ;; - *) ARCH=$( uname -m ) ;; - esac -fi - -CWD=$(pwd) -TMP=${TMP:-/tmp/SBo} -PKG=$TMP/package-$PRGNAM -OUTPUT=${OUTPUT:-/tmp} - -if [ "$ARCH" = "i486" ]; then - SLKCFLAGS="-O2 -march=i486 -mtune=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "i686" ]; then - SLKCFLAGS="-O2 -march=i686 -mtune=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "x86_64" ]; then - SLKCFLAGS="-O2 -fPIC" - LIBDIRSUFFIX="64" -else - SLKCFLAGS="-O2" - LIBDIRSUFFIX="" -fi - -if ! grep -q ^usbmux: /etc/passwd 2>/dev/null ; then - echo " Error: usbmux user doesn't exist." - echo " Create one with: useradd -u 277 -g plugdev -d /dev/null -s /bin/false usbmux" - exit 1 -fi - -set -e - -rm -rf $PKG -mkdir -p $TMP $PKG $OUTPUT -cd $TMP -rm -rf $PRGNAM-$VERSION -tar xvf $CWD/$PRGNAM-$VERSION.tar.bz2 -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 {} \; - -mkdir build -( cd build - cmake \ - -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \ - -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \ - -DCMAKE_BUILD_TYPE=Release \ - -DCMAKE_INSTALL_PREFIX=/usr \ - -DLIB_SUFFIX=${LIBDIRSUFFIX} .. - - make - make install DESTDIR=$PKG -) || exit - -find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \ - | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true - -cat $CWD/85-usbmuxd.rules > $PKG/lib/udev/rules.d/85-usbmuxd.rules - -mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION -cp -a \ - README* COPYING* AUTHORS \ - $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 -cat $CWD/doinst.sh > $PKG/install/doinst.sh - -cd $PKG -/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz} diff --git a/system/usbmuxd/usbmuxd.info b/system/usbmuxd/usbmuxd.info deleted file mode 100644 index 52a41daeb3..0000000000 --- a/system/usbmuxd/usbmuxd.info +++ /dev/null @@ -1,10 +0,0 @@ -PRGNAM="usbmuxd" -VERSION="1.0.8" -HOMEPAGE="http://marcansoft.com/blog/iphonelinux/usbmuxd/" -DOWNLOAD="http://www.libimobiledevice.org/downloads/usbmuxd-1.0.8.tar.bz2" -MD5SUM="4b33cc78e479e0f9a6745f9b9a8b60a8" -DOWNLOAD_x86_64="" -MD5SUM_x86_64="" -REQUIRES="" -MAINTAINER="David Somero" -EMAIL="dsomero@hotmail.com" diff --git a/system/vhba-module/slack-desc b/system/vhba-module/slack-desc index f8bd56491d..8f4aaa353c 100644 --- a/system/vhba-module/slack-desc +++ b/system/vhba-module/slack-desc @@ -14,6 +14,6 @@ vhba-module: the SCSI layer with a virtual SCSI adapter which can have vhba-module: multiple virtual devices. It is part of the userspace-cdemu vhba-module: suite, a free, GPL CD/DVD-ROM device emulator for linux. vhba-module: -vhba-module: Homepage: http://cdemu.sourceforge.net/pkg_vhba.php +vhba-module: Homepage: http://cdemu.sourceforge.net/about/vhba/ vhba-module: vhba-module: diff --git a/system/vhba-module/vhba-module.SlackBuild b/system/vhba-module/vhba-module.SlackBuild index b96cfbacfd..a3f2501c22 100644 --- a/system/vhba-module/vhba-module.SlackBuild +++ b/system/vhba-module/vhba-module.SlackBuild @@ -23,20 +23,18 @@ # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -# Revision date: 2012/09/15 - PRGNAM=vhba-module -VERSION=${VERSION:-20120422} +VERSION=${VERSION:-20140928} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} -if [ -z "$ARCH" ]; then - case "$( uname -m )" in - i?86) ARCH=i486 ;; - arm*) ARCH=arm ;; - *) ARCH=$( uname -m ) ;; - esac -fi +# Setting ARCH is not supported (and the build crashes if ARCH is exported). +unset ARCH +case "$( uname -m )" in + i?86) SLKARCH=i486 ;; + arm*) SLKARCH=arm ;; + *) SLKARCH=$( uname -m ) ;; +esac KERNEL=${KERNEL:-$(uname -r)} PKGKERNEL=$(echo $KERNEL | tr - _) @@ -51,18 +49,17 @@ set -e rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT cd $TMP -rm -rf $PRGNAM-$SRC_VERSION -tar xvf $CWD/$PRGNAM-$VERSION.tar.bz2 +rm -rf $PRGNAM-$VERSION +tar xvf $CWD/$PRGNAM-$VERSION.tar.?z* 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 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 {} \; -# Use -j1 to avoid problems if larger number of jobs is defined in MAKEFLAGS -make -j1 KERNELRELEASE=$KERNEL +make KERNELRELEASE=$KERNEL mkdir -p $PKG/lib/modules/$KERNEL/extra install -m 0644 vhba.ko $PKG/lib/modules/$KERNEL/extra/ @@ -78,4 +75,4 @@ cat $CWD/slack-desc > $PKG/install/slack-desc cat $CWD/doinst.sh > $PKG/install/doinst.sh cd $PKG -/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-${VERSION}_$PKGKERNEL-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz} +/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-${VERSION}_$PKGKERNEL-$SLKARCH-$BUILD$TAG.${PKGTYPE:-tgz} diff --git a/system/vhba-module/vhba-module.info b/system/vhba-module/vhba-module.info index 26f2e056ce..3c2b69591a 100644 --- a/system/vhba-module/vhba-module.info +++ b/system/vhba-module/vhba-module.info @@ -1,8 +1,8 @@ PRGNAM="vhba-module" -VERSION="20120422" -HOMEPAGE="http://cdemu.sourceforge.net/pkg_vhba.php" -DOWNLOAD="http://downloads.sourceforge.net/cdemu/vhba-module-20120422.tar.bz2" -MD5SUM="d97372da1d270d1605742b2995fb6678" +VERSION="20140928" +HOMEPAGE="http://cdemu.sourceforge.net/about/vhba/" +DOWNLOAD="http://downloads.sourceforge.net/cdemu/vhba-module-20140928.tar.bz2" +MD5SUM="967007230bb028424216d9b35da422c0" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" diff --git a/system/vice/README b/system/vice/README index 2f731cb82e..d083b9685b 100644 --- a/system/vice/README +++ b/system/vice/README @@ -1,2 +1,6 @@ VICE is the one and only Versatile Commodore Emulator. It provides emulation of the Commodore C64, C128, VIC20, PET, PLUS4 and CBM-II computers. + +To enable recording of videos you have to build with this an internal +(static) version of ffmpeg: enable this passing to the script the parameter +FFMPEG=yes diff --git a/system/vice/patches/vice-2.3.21-64bit.patch b/system/vice/patches/vice-2.3.21-64bit.patch deleted file mode 100644 index b78ea51bc8..0000000000 --- a/system/vice/patches/vice-2.3.21-64bit.patch +++ /dev/null @@ -1,129 +0,0 @@ -diff -Naur vice-2.3.21.orig/doc/vice.guide vice-2.3.21/doc/vice.guide ---- vice-2.3.21.orig/doc/vice.guide 2012-08-06 00:41:54.000000000 +0200 -+++ vice-2.3.21/doc/vice.guide 2012-08-06 09:44:36.288562655 +0200 -@@ -1292,7 +1292,7 @@ - `Directory' resource, which is a colon (`:')-separated search path - list, like the UNIX `PATH' environment variable. The default value is - -- PREFIX/lib/vice/EMU:$HOME/.vice/EMU:BOOTPATH/EMU -+ PREFIX/lib64/vice/EMU:$HOME/.vice/EMU:BOOTPATH/EMU - - Where `PREFIX' is the installation prefix (usually `/usr/local'), `EMU' - is the name of the emulated machine (`C64', `C64DTV', `C128', `PET', -@@ -1306,12 +1306,12 @@ - - then the value will be - -- /usr/local/lib/vice/C64:$HOME/.vice/C64:/usr/local/bin/C64 -+ /usr/local/lib64/vice/C64:$HOME/.vice/C64:/usr/local/bin/C64 - - And system files will be searched for under the following directories, - in the specified order: - -- 1. `/usr/local/lib/VICE/C64' -+ 1. `/usr/local/lib64/VICE/C64' - - 2. `$HOME/.vice/C64' - -@@ -4010,7 +4010,7 @@ - where: - - * `LIBDIR' is the VICE installation directory (usually -- `/usr/local/lib/vice', `/usr/lib/vice' or `/opt/vice/lib'); -+ `/usr/local/lib64/vice', `/usr/lib64/vice' or `/opt/vice/lib'); - - * `EMUID' is the emulation identification string (`C64', - `C128', `VIC20' or `PET'); -diff -Naur vice-2.3.21.orig/doc/vice.texi vice-2.3.21/doc/vice.texi ---- vice-2.3.21.orig/doc/vice.texi 2012-07-24 04:08:09.000000000 +0200 -+++ vice-2.3.21/doc/vice.texi 2012-08-06 09:44:36.291562619 +0200 -@@ -1364,7 +1364,7 @@ - default value is - - @example --PREFIX/lib/vice/EMU:$HOME/.vice/EMU:BOOTPATH/EMU -+PREFIX/lib64/vice/EMU:$HOME/.vice/EMU:BOOTPATH/EMU - @end example - - Where @code{PREFIX} is the installation prefix (usually -@@ -1383,7 +1383,7 @@ - then the value will be - - @example --/usr/local/lib/vice/C64:$HOME/.vice/C64:/usr/local/bin/C64 -+/usr/local/lib64/vice/C64:$HOME/.vice/C64:/usr/local/bin/C64 - @end example - - And system files will be searched for under the following directories, -@@ -1391,7 +1391,7 @@ - - @enumerate 1 - @item --@code{/usr/local/lib/VICE/C64} -+@code{/usr/local/lib64/VICE/C64} - @item - @code{$HOME/.vice/C64} - @item -diff -Naur vice-2.3.21.orig/doc/vice.txt vice-2.3.21/doc/vice.txt ---- vice-2.3.21.orig/doc/vice.txt 2012-08-06 02:23:21.000000000 +0200 -+++ vice-2.3.21/doc/vice.txt 2012-08-06 09:44:36.296562563 +0200 -@@ -1056,7 +1056,7 @@ - `Directory' resource, which is a colon (`:')-separated search path - list, like the UNIX `PATH' environment variable. The default value is - --PREFIX/lib/vice/EMU:$HOME/.vice/EMU:BOOTPATH/EMU -+PREFIX/lib64/vice/EMU:$HOME/.vice/EMU:BOOTPATH/EMU - - Where `PREFIX' is the installation prefix (usually `/usr/local'), `EMU' - is the name of the emulated machine (`C64', `C64DTV', `C128', `PET', -@@ -1070,12 +1070,12 @@ - - then the value will be - --/usr/local/lib/vice/C64:$HOME/.vice/C64:/usr/local/bin/C64 -+/usr/local/lib64/vice/C64:$HOME/.vice/C64:/usr/local/bin/C64 - - And system files will be searched for under the following directories, - in the specified order: - --1. `/usr/local/lib/VICE/C64' -+1. `/usr/local/lib64/VICE/C64' - - 2. `$HOME/.vice/C64' - -diff -Naur vice-2.3.21.orig/INSTALL vice-2.3.21/INSTALL ---- vice-2.3.21.orig/INSTALL 2011-01-29 14:17:50.000000000 +0100 -+++ vice-2.3.21/INSTALL 2012-08-06 09:44:36.299562529 +0200 -@@ -301,7 +301,7 @@ - - make install - -- The binaries and support files will all go under PREFIX/lib/vice. -+ The binaries and support files will all go under PREFIX/lib64/vice. - You must of course have write permissions for the directories where - VICE is to be installed. Normally only the system administrator - has write access to /usr/local, the default PREFIX. Either ask -diff -Naur vice-2.3.21.orig/src/arch/sdl/archdep_unix.h vice-2.3.21/src/arch/sdl/archdep_unix.h ---- vice-2.3.21.orig/src/arch/sdl/archdep_unix.h 2011-07-21 05:10:28.000000000 +0200 -+++ vice-2.3.21/src/arch/sdl/archdep_unix.h 2012-08-06 09:42:11.970323196 +0200 -@@ -88,7 +88,7 @@ - #ifdef __NetBSD__ - #define LIBDIR PREFIX "/share/vice" - #else --#define LIBDIR PREFIX "/lib/vice" -+#define LIBDIR PREFIX "/lib64/vice" - #endif - - #if defined(__FreeBSD__) || defined(__NetBSD__) -diff -Naur vice-2.3.21.orig/src/arch/unix/archdep.h vice-2.3.21/src/arch/unix/archdep.h ---- vice-2.3.21.orig/src/arch/unix/archdep.h 2010-10-06 18:17:43.000000000 +0200 -+++ vice-2.3.21/src/arch/unix/archdep.h 2012-08-06 09:42:46.474902531 +0200 -@@ -127,7 +127,7 @@ - #ifdef __NetBSD__ - #define LIBDIR PREFIX "/share/vice" - #else --#define LIBDIR PREFIX "/lib/vice" -+#define LIBDIR PREFIX "/lib64/vice" - #endif - - #if defined(__FreeBSD__) || defined(__NetBSD__) diff --git a/system/vice/patches/vice-2.3.21-docs-fixes.patch b/system/vice/patches/vice-2.3.21-docs-fixes.patch deleted file mode 100644 index 84ed74ca7f..0000000000 --- a/system/vice/patches/vice-2.3.21-docs-fixes.patch +++ /dev/null @@ -1,32 +0,0 @@ -diff -Naur vice-2.3.21.orig/configure.in vice-2.3.21/configure.in ---- vice-2.3.21.orig/configure.in 2012-08-06 02:23:21.000000000 +0200 -+++ vice-2.3.21/configure.in 2012-08-06 11:35:40.509403194 +0200 -@@ -288,13 +288,7 @@ - - AC_CHECK_PROGS(MAKEINFO, makeinfo, no) - --AC_CHECK_PROGS(TEXI2DVI, texi2dvi, no) --AC_CHECK_PROGS(PDFTEX, pdftex, no) --if test x"$TEXI2DVI" = "xno" -o x"$PDFTEX" = "xno"; then -- AM_CONDITIONAL(BUILD_PDF, false) --else -- AM_CONDITIONAL(BUILD_PDF, true) --fi -+AM_CONDITIONAL(BUILD_PDF, false) - - AC_CHECK_PROGS(DOS2UNIX, dos2unix, dos2unix) - -diff -Naur vice-2.3.21.orig/doc/html/Makefile.am vice-2.3.21/doc/html/Makefile.am ---- vice-2.3.21.orig/doc/html/Makefile.am 2012-06-30 05:31:11.000000000 +0200 -+++ vice-2.3.21/doc/html/Makefile.am 2012-08-06 11:32:11.953905072 +0200 -@@ -45,10 +45,6 @@ - vice_14.html \ - vice_15.html \ - vice_16.html \ -- vice_17.html \ -- vice_18.html \ -- vice_19.html \ -- vice_20.html \ - vice_toc.html - - EXTRA_DIST = $(doc_DATA) \ diff --git a/system/vice/patches/vice-2.4.18-64bit.patch b/system/vice/patches/vice-2.4.18-64bit.patch new file mode 100644 index 0000000000..ee07f3f2b9 --- /dev/null +++ b/system/vice/patches/vice-2.4.18-64bit.patch @@ -0,0 +1,84 @@ +diff -Naur vice-2.4.18.orig/doc/vice.guide vice-2.4.18/doc/vice.guide +--- vice-2.4.18.orig/doc/vice.guide 2015-02-23 19:11:07.000000000 +0100 ++++ vice-2.4.18/doc/vice.guide 2015-03-06 17:40:53.822159935 +0100 +@@ -1339,7 +1339,7 @@ + `Directory' resource, which is a colon (`:')-separated search path + list, like the UNIX `PATH' environment variable. The default value is + +- PREFIX/lib/vice/EMU:$HOME/.vice/EMU:BOOTPATH/EMU ++ PREFIX/lib64/vice/EMU:$HOME/.vice/EMU:BOOTPATH/EMU + + Where `PREFIX' is the installation prefix (usually `/usr/local'), `EMU' + is the name of the emulated machine (`C64', `C64DTV', `C128', `PET', +@@ -1354,12 +1354,12 @@ + + then the value will be + +- /usr/local/lib/vice/C64:$HOME/.vice/C64:/usr/local/bin/C64 ++ /usr/local/lib64/vice/C64:$HOME/.vice/C64:/usr/local/bin/C64 + + And system files will be searched for under the following directories, + in the specified order: + +- 1. `/usr/local/lib/VICE/C64' ++ 1. `/usr/local/lib64/VICE/C64' + + 2. `$HOME/.vice/C64' + +diff -Naur vice-2.4.18.orig/doc/vice.texi vice-2.4.18/doc/vice.texi +--- vice-2.4.18.orig/doc/vice.texi 2015-02-17 20:32:19.000000000 +0100 ++++ vice-2.4.18/doc/vice.texi 2015-03-06 17:40:53.829159935 +0100 +@@ -1502,7 +1502,7 @@ + default value is + + @example +-PREFIX/lib/vice/EMU:$HOME/.vice/EMU:BOOTPATH/EMU ++PREFIX/lib64/vice/EMU:$HOME/.vice/EMU:BOOTPATH/EMU + @end example + + Where @code{PREFIX} is the installation prefix (usually +@@ -1521,7 +1521,7 @@ + then the value will be + + @example +-/usr/local/lib/vice/C64:$HOME/.vice/C64:/usr/local/bin/C64 ++/usr/local/lib64/vice/C64:$HOME/.vice/C64:/usr/local/bin/C64 + @end example + + And system files will be searched for under the following directories, +@@ -1529,7 +1529,7 @@ + + @enumerate 1 + @item +-@code{/usr/local/lib/VICE/C64} ++@code{/usr/local/lib64/VICE/C64} + @item + @code{$HOME/.vice/C64} + @item +diff -Naur vice-2.4.18.orig/doc/vice.txt vice-2.4.18/doc/vice.txt +--- vice-2.4.18.orig/doc/vice.txt 2015-02-23 19:11:07.000000000 +0100 ++++ vice-2.4.18/doc/vice.txt 2015-03-06 17:40:53.834159935 +0100 +@@ -1094,7 +1094,7 @@ + `Directory' resource, which is a colon (`:')-separated search path + list, like the UNIX `PATH' environment variable. The default value is + +-PREFIX/lib/vice/EMU:$HOME/.vice/EMU:BOOTPATH/EMU ++PREFIX/lib64/vice/EMU:$HOME/.vice/EMU:BOOTPATH/EMU + + Where `PREFIX' is the installation prefix (usually `/usr/local'), `EMU' + is the name of the emulated machine (`C64', `C64DTV', `C128', `PET', +@@ -1109,12 +1109,12 @@ + + then the value will be + +-/usr/local/lib/vice/C64:$HOME/.vice/C64:/usr/local/bin/C64 ++/usr/local/lib64/vice/C64:$HOME/.vice/C64:/usr/local/bin/C64 + + And system files will be searched for under the following directories, + in the specified order: + +-1. `/usr/local/lib/VICE/C64' ++1. `/usr/local/lib64/VICE/C64' + + 2. `$HOME/.vice/C64' + diff --git a/system/vice/patches/vice-2.4.4-no-pdf.patch b/system/vice/patches/vice-2.4.4-no-pdf.patch new file mode 100644 index 0000000000..51e9fd015f --- /dev/null +++ b/system/vice/patches/vice-2.4.4-no-pdf.patch @@ -0,0 +1,16 @@ +diff -Naur vice-2.4.4.orig/configure.proto vice-2.4.4/configure.proto +--- vice-2.4.4.orig/configure.proto 2013-06-02 02:37:13.000000000 +0200 ++++ vice-2.4.4/configure.proto 2013-06-03 11:58:05.355979729 +0200 +@@ -349,11 +349,7 @@ + + AC_CHECK_PROGS(TEXI2DVI, texi2dvi, no) + AC_CHECK_PROGS(PDFTEX, pdftex, no) +-if test x"$TEXI2DVI" = "xno" -o x"$PDFTEX" = "xno"; then +- AM_CONDITIONAL(BUILD_PDF, false) +-else +- AM_CONDITIONAL(BUILD_PDF, true) +-fi ++AM_CONDITIONAL(BUILD_PDF, false) + + AC_CHECK_PROGS(DOS2UNIX, dos2unix, dos2unix) + diff --git a/system/vice/patches/vice-fix-help.patch b/system/vice/patches/vice-fix-help.patch index 1312fe8399..e2bfe04f4f 100644 --- a/system/vice/patches/vice-fix-help.patch +++ b/system/vice/patches/vice-fix-help.patch @@ -1,21 +1,21 @@ -diff -urpN vice-1.22/man/vice.1 vice-1.22-fixdoc/man/vice.1 ---- vice-1.22/man/vice.1 2005-08-21 21:15:04.000000000 +0200 -+++ vice-1.22-fixdoc/man/vice.1 2008-02-16 19:40:11.000000000 +0100 -@@ -40,7 +40,7 @@ a Commodore BASIC de-tokenizer; +diff -Naur vice-2.4.1.orig/man/vice.1 vice-2.4.1/man/vice.1 +--- vice-2.4.1.orig/man/vice.1 2012-11-29 12:44:39.000000000 +0100 ++++ vice-2.4.1/man/vice.1 2013-01-23 19:48:47.065865099 +0100 +@@ -43,7 +43,7 @@ .PP The whole documentation for these programs is available in HTML format; the main file should be installed on your system as --/usr/local/lib/VICE/doc/vice_toc.html. -+/usr/doc/vice/html/vice_toc.html. +-/usr/local/lib/vice/doc/vice_toc.html. ++/usr/doc/vice-@VERSION@/html/vice_toc.html. .P For up to date news about VICE, have a look at the official home page at -diff -urpN vice-1.22/src/arch/unix/gui/uicommands.c vice-1.22-fixdoc/src/arch/unix/gui/uicommands.c ---- vice-1.22/src/arch/unix/gui/uicommands.c 2007-04-01 17:02:44.000000000 +0200 -+++ vice-1.22-fixdoc/src/arch/unix/gui/uicommands.c 2008-02-16 19:31:10.000000000 +0100 -@@ -160,7 +160,7 @@ static UI_CALLBACK(browse_manual) +diff -Naur vice-2.4.1.orig/src/arch/unix/gui/uicommands.c vice-2.4.1/src/arch/unix/gui/uicommands.c +--- vice-2.4.1.orig/src/arch/unix/gui/uicommands.c 2012-12-30 15:12:52.000000000 +0100 ++++ vice-2.4.1/src/arch/unix/gui/uicommands.c 2013-01-23 19:50:01.276832152 +0100 +@@ -162,7 +162,7 @@ char *manual_path; - manual_path = util_concat(boot_path,"/../doc/vice_toc.html",NULL); + manual_path = util_concat(boot_path, "/../doc/vice_toc.html", NULL); #else - static const char manual_path[] = DOCDIR "/vice_toc.html"; + static const char manual_path[] = DOCDIR "/html/vice_toc.html"; diff --git a/system/vice/slack-desc b/system/vice/slack-desc index 67c624c9b4..c1c323dda7 100644 --- a/system/vice/slack-desc +++ b/system/vice/slack-desc @@ -14,6 +14,6 @@ vice: programs intended for the old 8-bit computers. The current version vice: emulates the C64, the C128, the VIC20, almost all PET models, the vice: PLUS4 and the CBM-II (aka C610). vice: -vice: Homepage: http://www.viceteam.org/ +vice: Homepage: http://vice-emu.sourceforge.net vice: vice: diff --git a/system/vice/vice.SlackBuild b/system/vice/vice.SlackBuild index 4affd7be5c..7003d78209 100644 --- a/system/vice/vice.SlackBuild +++ b/system/vice/vice.SlackBuild @@ -23,7 +23,7 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=vice -VERSION=${VERSION:-2.3.22} +VERSION=${VERSION:-2.4.21} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -54,6 +54,9 @@ else LIBDIRSUFFIX="" fi +# Only the internal ffmpeg libraries seems to work ATM +if [ "${FFMPEG:-no}" = "yes" ]; then ffmpeg="--enable-static-ffmpeg"; else ffmpeg=""; fi + set -e rm -rf $PKG @@ -73,11 +76,11 @@ find -L . \ # folder (the folder set up by "make install" is quite broken). patch -p1 <$CWD/patches/vice-fix-help.patch -# Small fixes for html doc building, avoid pdf (broken) -patch -p1 < $CWD/patches/vice-2.3.21-docs-fixes.patch +# A small fix to avoid avoid building the pdf (broken, we use the one provided) +patch -p1 < $CWD/patches/vice-2.4.4-no-pdf.patch # Use /usr/lib64 on 64-bit Slackware -[ "$ARCH" == "x86_64" ] && patch -p1 < $CWD/patches/vice-2.3.21-64bit.patch +[ "$ARCH" = "x86_64" ] && patch -p1 < $CWD/patches/vice-2.4.18-64bit.patch sh autogen.sh || true @@ -89,13 +92,13 @@ CXXFLAGS="$SLKCFLAGS" \ --enable-gnomeui \ --mandir=/usr/man \ --infodir=/usr/info \ - --disable-ffmpeg \ + $ffmpeg \ --build=$ARCH-slackware-linux make make install DESTDIR=$PKG -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 find $PKG/usr/man -type f -exec gzip -9 {} \; diff --git a/system/vice/vice.info b/system/vice/vice.info index f3889031c4..dabfa9fe17 100644 --- a/system/vice/vice.info +++ b/system/vice/vice.info @@ -1,8 +1,8 @@ PRGNAM="vice" -VERSION="2.3.22" -HOMEPAGE="http://www.viceteam.org/" -DOWNLOAD="http://ponce.cc/slackware/sources/repo/vice-2.3.22.tar.xz" -MD5SUM="44290700d30fca06f8655bab8c2ce86f" +VERSION="2.4.21" +HOMEPAGE="http://vice-emu.sourceforge.net" +DOWNLOAD="http://ponce.cc/slackware/sources/repo/vice-2.4.21.tar.xz" +MD5SUM="d5dd6d53dc8e8c3abb66c2ce487f146f" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" diff --git a/system/yelp-tools/yelp-tools.SlackBuild b/system/yelp-tools/yelp-tools.SlackBuild index e65d3133bc..b9f8060dc5 100644 --- a/system/yelp-tools/yelp-tools.SlackBuild +++ b/system/yelp-tools/yelp-tools.SlackBuild @@ -23,7 +23,7 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=yelp-tools -VERSION=${VERSION:-3.12.1} +VERSION=${VERSION:-3.16.1} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -65,7 +65,7 @@ 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 \ + -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 {} \; diff --git a/system/yelp-tools/yelp-tools.info b/system/yelp-tools/yelp-tools.info index 4163fd6f7f..91db9cdee2 100644 --- a/system/yelp-tools/yelp-tools.info +++ b/system/yelp-tools/yelp-tools.info @@ -1,8 +1,8 @@ PRGNAM="yelp-tools" -VERSION="3.12.1" +VERSION="3.16.1" HOMEPAGE="http://projects.gnome.org/yelp/" -DOWNLOAD="http://ftp.acc.umu.se/pub/gnome/sources/yelp-tools/3.12/yelp-tools-3.12.1.tar.xz" -MD5SUM="a3e16769e0c4e9bf776b3e424b12b1c2" +DOWNLOAD="http://ftp.gnome.org/pub/GNOME/sources/yelp-tools/3.16/yelp-tools-3.16.1.tar.xz" +MD5SUM="2430db2d69241d217fe0af5c1458aa30" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="yelp-xsl" diff --git a/system/yelp-xsl/yelp-xsl.SlackBuild b/system/yelp-xsl/yelp-xsl.SlackBuild index d044b75cac..8d25f99d3e 100644 --- a/system/yelp-xsl/yelp-xsl.SlackBuild +++ b/system/yelp-xsl/yelp-xsl.SlackBuild @@ -23,7 +23,7 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=yelp-xsl -VERSION=${VERSION:-3.12.0} +VERSION=${VERSION:-3.16.1} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -65,7 +65,7 @@ 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 \ + -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 {} \; diff --git a/system/yelp-xsl/yelp-xsl.info b/system/yelp-xsl/yelp-xsl.info index 3f0c646bf9..e21212b0df 100644 --- a/system/yelp-xsl/yelp-xsl.info +++ b/system/yelp-xsl/yelp-xsl.info @@ -1,8 +1,8 @@ PRGNAM="yelp-xsl" -VERSION="3.12.0" +VERSION="3.16.1" HOMEPAGE="http://projects.gnome.org/yelp/" -DOWNLOAD="http://ftp.acc.umu.se/pub/gnome/sources/yelp-xsl/3.12/yelp-xsl-3.12.0.tar.xz" -MD5SUM="662317dc4f6aeafce0d4ffb2b3766115" +DOWNLOAD="http://ftp.gnome.org/pub/GNOME/sources/yelp-xsl/3.16/yelp-xsl-3.16.1.tar.xz" +MD5SUM="92871729425199f9a4374b8035f60a03" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" diff --git a/system/yelp/yelp.SlackBuild b/system/yelp/yelp.SlackBuild index fbb7c1a6ad..8c9f8e3708 100644 --- a/system/yelp/yelp.SlackBuild +++ b/system/yelp/yelp.SlackBuild @@ -23,7 +23,7 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=yelp -VERSION=${VERSION:-3.12.0} +VERSION=${VERSION:-3.16.1} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -65,7 +65,7 @@ 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 \ + -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 {} \; diff --git a/system/yelp/yelp.info b/system/yelp/yelp.info index 4856240915..171212ab1c 100644 --- a/system/yelp/yelp.info +++ b/system/yelp/yelp.info @@ -1,8 +1,8 @@ PRGNAM="yelp" -VERSION="3.12.0" +VERSION="3.16.1" HOMEPAGE="http://projects.gnome.org/yelp/" -DOWNLOAD="http://ftp.acc.umu.se/pub/gnome/sources/yelp/3.12/yelp-3.12.0.tar.xz" -MD5SUM="02f0383b02960766ea46059b9a02cf85" +DOWNLOAD="http://ftp.gnome.org/pub/GNOME/sources/yelp/3.16/yelp-3.16.1.tar.xz" +MD5SUM="528302ce066f3798d40e9c5e2fcedfc4" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="yelp-tools webkitgtk3" |
