From cf02daefd1f54c19a4678a7f50422800bdaef14e Mon Sep 17 00:00:00 2001 From: Larry Hajali Date: Sat, 11 Aug 2012 14:15:16 -0400 Subject: academic/avogadro: Updated with patches for newer gcc and boost. Signed-off-by: dsomero --- academic/avogadro/avogadro.SlackBuild | 11 ++++- academic/avogadro/avogadro.info | 2 +- .../patches/avogadro-1.0.3-mkspecs-dir.patch | 12 +++++ academic/avogadro/patches/boost-1.48.patch | 56 ++++++++++++++++++++++ academic/avogadro/patches/gcc-4.7.patch | 22 +++++++++ 5 files changed, 100 insertions(+), 3 deletions(-) create mode 100644 academic/avogadro/patches/avogadro-1.0.3-mkspecs-dir.patch create mode 100644 academic/avogadro/patches/boost-1.48.patch create mode 100644 academic/avogadro/patches/gcc-4.7.patch (limited to 'academic/avogadro') diff --git a/academic/avogadro/avogadro.SlackBuild b/academic/avogadro/avogadro.SlackBuild index f8021e664e..009b66ccd8 100644 --- a/academic/avogadro/avogadro.SlackBuild +++ b/academic/avogadro/avogadro.SlackBuild @@ -6,7 +6,7 @@ PRGNAM=avogadro VERSION=1.0.3 -BUILD=${BUILD:-1} +BUILD=${BUILD:-2} TAG=${TAG:-_SBo} if [ -z "$ARCH" ]; then @@ -51,6 +51,13 @@ find . \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ -exec chmod 644 {} \; +# Fix gcc-4.7.x build issues. +patch -p1 < $CWD/patches/gcc-4.7.patch +# Fix for newer boost. +patch -p1 < $CWD/patches/boost-1.48.patch +# Fix mkspecs directory. +patch -p1 < $CWD/patches/avogadro-1.0.3-mkspecs-dir.patch + # Fix manpage directory. sed -i 's|share/man|man|' doc/CMakeLists.txt @@ -63,7 +70,7 @@ cd build -DLIB_SUFFIX=${LIBDIRSUFFIX} \ -DENABLE_RPATH=OFF \ -DCMAKE_SKIP_RPATH=YES \ - -DENABLE_GLSL=ON \ + -DENABLE_GLSL:BOOL=ON \ -DENABLE_UPDATE_CHECKER=OFF \ -DCMAKE_BUILD_TYPE=Release .. diff --git a/academic/avogadro/avogadro.info b/academic/avogadro/avogadro.info index 26775e2226..210dca5f17 100644 --- a/academic/avogadro/avogadro.info +++ b/academic/avogadro/avogadro.info @@ -7,4 +7,4 @@ DOWNLOAD_x86_64="" MD5SUM_x86_64="" MAINTAINER="Larry Hajali" EMAIL="larryhaja[at]gmail[dot]com" -APPROVED="dsomero,Niels Horn" +APPROVED="dsomero" diff --git a/academic/avogadro/patches/avogadro-1.0.3-mkspecs-dir.patch b/academic/avogadro/patches/avogadro-1.0.3-mkspecs-dir.patch new file mode 100644 index 0000000000..a1e9ec92bd --- /dev/null +++ b/academic/avogadro/patches/avogadro-1.0.3-mkspecs-dir.patch @@ -0,0 +1,12 @@ +diff -ur avogadro-1.0.3/CMakeLists.txt avogadro-1.0.3-mkspecs-dir/CMakeLists.txt +--- avogadro-1.0.3/CMakeLists.txt 2011-04-25 07:29:58.000000000 +0200 ++++ avogadro-1.0.3-mkspecs-dir/CMakeLists.txt 2011-04-27 02:42:26.000000000 +0200 +@@ -491,7 +491,7 @@ + if(QT_MKSPECS_DIR AND INSTALL_QMAKE_PRF) + install(FILES + "${CMAKE_CURRENT_BINARY_DIR}/avogadro.prf" +- DESTINATION "${CMAKE_INSTALL_PREFIX}/${QT_MKSPECS_RELATIVE}/features" ++ DESTINATION "${QT_MKSPECS_DIR}/features" + ) + else(QT_MKSPECS_DIR AND INSTALL_QMAKE_PRF) + message(WARNING "Qt mkspecs directory not found. File 'avogadro.prf' will be installed to ${SHARE_INSTALL_PREFIX}/avogadro/qmake.") diff --git a/academic/avogadro/patches/boost-1.48.patch b/academic/avogadro/patches/boost-1.48.patch new file mode 100644 index 0000000000..380af0c938 --- /dev/null +++ b/academic/avogadro/patches/boost-1.48.patch @@ -0,0 +1,56 @@ +diff -Naur avogadro-1.0.3.orig/libavogadro/src/extensions/pythonterminal.h avogadro-1.0.3/libavogadro/src/extensions/pythonterminal.h +--- avogadro-1.0.3.orig/libavogadro/src/extensions/pythonterminal.h 2011-04-25 05:22:18.000000000 +0000 ++++ avogadro-1.0.3/libavogadro/src/extensions/pythonterminal.h 2012-07-12 02:35:19.324975289 +0000 +@@ -23,6 +23,10 @@ + #ifndef PYTHONTERMINAL_H + #define PYTHONTERMINAL_H + ++#ifdef Q_MOC_RUN ++#define BOOST_TT_HAS_OPERATOR_HPP_INCLUDED ++#endif ++ + #include + #include + #include +diff -Naur avogadro-1.0.3.orig/libavogadro/src/pythonengine_p.h avogadro-1.0.3/libavogadro/src/pythonengine_p.h +--- avogadro-1.0.3.orig/libavogadro/src/pythonengine_p.h 2011-04-25 05:22:18.000000000 +0000 ++++ avogadro-1.0.3/libavogadro/src/pythonengine_p.h 2012-07-12 02:32:39.429980751 +0000 +@@ -25,6 +25,10 @@ + #ifndef PYTHONENGINE_H + #define PYTHONENGINE_H + ++#ifdef Q_MOC_RUN ++#define BOOST_TT_HAS_OPERATOR_HPP_INCLUDED ++#endif ++ + #include + #include + #include +diff -Naur avogadro-1.0.3.orig/libavogadro/src/pythonextension_p.h avogadro-1.0.3/libavogadro/src/pythonextension_p.h +--- avogadro-1.0.3.orig/libavogadro/src/pythonextension_p.h 2011-04-25 05:22:18.000000000 +0000 ++++ avogadro-1.0.3/libavogadro/src/pythonextension_p.h 2012-07-12 02:33:46.838978444 +0000 +@@ -26,6 +26,10 @@ + #ifndef PYTHONEXTENSION_H + #define PYTHONEXTENSION_H + ++#ifdef Q_MOC_RUN ++#define BOOST_TT_HAS_OPERATOR_HPP_INCLUDED ++#endif ++ + #include + #include + #include +diff -Naur avogadro-1.0.3.orig/libavogadro/src/pythontool_p.h avogadro-1.0.3/libavogadro/src/pythontool_p.h +--- avogadro-1.0.3.orig/libavogadro/src/pythontool_p.h 2011-04-25 05:22:18.000000000 +0000 ++++ avogadro-1.0.3/libavogadro/src/pythontool_p.h 2012-07-12 02:34:14.068977512 +0000 +@@ -25,6 +25,10 @@ + #ifndef PYTHONTOOL_H + #define PYTHONTOOL_H + ++#ifdef Q_MOC_RUN ++#define BOOST_TT_HAS_OPERATOR_HPP_INCLUDED ++#endif ++ + #include + #include + #include diff --git a/academic/avogadro/patches/gcc-4.7.patch b/academic/avogadro/patches/gcc-4.7.patch new file mode 100644 index 0000000000..ffa4cd9439 --- /dev/null +++ b/academic/avogadro/patches/gcc-4.7.patch @@ -0,0 +1,22 @@ +diff -Naur avogadro-1.0.3.orig/avogadro/src/mainwindow.h avogadro-1.0.3/avogadro/src/mainwindow.h +--- avogadro-1.0.3.orig/avogadro/src/mainwindow.h 2011-04-25 05:22:18.000000000 +0000 ++++ avogadro-1.0.3/avogadro/src/mainwindow.h 2012-07-11 13:57:36.624006453 +0000 +@@ -24,6 +24,7 @@ + #ifndef MAINWINDOW_H + #define MAINWINDOW_H + ++#include + #include + #include "ui_mainwindow.h" + #include "flattabwidget.h" +diff -Naur avogadro-1.0.3.orig/libavogadro/src/tools/eyecandy.h avogadro-1.0.3/libavogadro/src/tools/eyecandy.h +--- avogadro-1.0.3.orig/libavogadro/src/tools/eyecandy.h 2011-04-25 05:22:18.000000000 +0000 ++++ avogadro-1.0.3/libavogadro/src/tools/eyecandy.h 2012-07-11 13:43:22.892050693 +0000 +@@ -25,6 +25,7 @@ + #ifndef EYECANDY_H + #define EYECANDY_H + ++#include + #include + + namespace Avogadro { -- cgit v1.2.3