Commit 58492272 authored by abveritas's avatar abveritas

lyx & avogadro rebuild for boost

parent c2f7356d
#
# Apps Packages for Chakra, part of chakra-project.org
#
# maintainer: Giuseppe Calà <jiveaxe@gmail.com>
# maintainer abveritas[at]chakra-project[dog]org>
pkgname=avogadro
pkgver=1.1.0
pkgrel=1
pkgrel=3
pkgdesc="An advanced molecular editor based on Qt"
arch=('i686' 'x86_64')
arch=('x86_64')
url="http://avogadro.openmolecules.net/wiki/Main_Page"
license=('GPL2')
depends=('eigen' 'openbabel' 'pyqt' 'boost-libs' 'glew' 'python-numpy')
makedepends=('cmake' 'boost')
makedepends=('cmake' 'boost' 'mesa')
categories=('education')
screenshot=('http://avogadro.openmolecules.net/w/images/7/75/Avogadro-unitcell.png')
source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.bz2")
md5sums=('f4fbef5ffc69cc312b2316426c36a78d')
......
post_install() {
update-desktop-database -q
}
post_upgrade() {
post_install $1
}
post_remove() {
post_install $1
}
--- avogadro-1.0.3/libavogadro/src/CMakeLists.txt~ 2011-11-29 18:33:01.777291627 +0000
+++ avogadro-1.0.3/libavogadro/src/CMakeLists.txt 2011-11-29 18:33:23.480814612 +0000
@@ -149,7 +149,7 @@
endforeach(P_ITEM ${PYTHON_SRCS})
endif(NOT ENABLE_PYTHON OR NOT ALL_PYTHON_FOUND)
-QT4_WRAP_CPP(libavogadro_MOC_SRCS ${libavogadro_MOC_HDRS})
+QT4_WRAP_CPP(libavogadro_MOC_SRCS ${libavogadro_MOC_HDRS} OPTIONS -DBOOST_TT_HAS_OPERATOR_HPP_INCLUDED)
# you have to add link_directories before you add the target
if(ENABLE_PYTHON AND ALL_PYTHON_FOUND)
--- avogadro-1.0.3/libavogadro/src/python/CMakeLists.txt~ 2011-11-29 18:37:15.449506548 +0000
+++ avogadro-1.0.3/libavogadro/src/python/CMakeLists.txt 2011-11-29 18:37:52.729831744 +0000
@@ -11,7 +11,7 @@
# use all cpp files in this directory
FILE(GLOB wrapper_SRCS "*.cpp")
-QT4_WRAP_CPP(MOC_SRCS moleculelist.h)
+QT4_WRAP_CPP(MOC_SRCS moleculelist.h OPTIONS -DBOOST_TT_HAS_OPERATOR_HPP_INCLUDED)
ADD_LIBRARY(python-module MODULE ${wrapper_SRCS} ${MOC_SRCS})
SET_TARGET_PROPERTIES(python-module PROPERTIES OUTPUT_NAME Avogadro)
--- avogadro-1.0.3/libavogadro/CMakeLists.txt~ 2011-11-29 19:41:34.066938217 +0000
+++ avogadro-1.0.3/libavogadro/CMakeLists.txt 2011-11-29 19:42:53.084320315 +0000
@@ -18,7 +18,7 @@
# Assume all MOC stuff is in the headers, replace .cpp and use qt4_wrap_cpp
# We should probably scan the header to verify the Q_OBJECT macro is used
string(REPLACE ".cpp" ".h" hdr_list "${src_list}")
- qt4_wrap_cpp(moc_files ${hdr_list})
+ qt4_wrap_cpp(moc_files ${hdr_list} OPTIONS -DBOOST_TT_HAS_OPERATOR_HPP_INCLUDED)
# Now sort out the ui and qrc files, process them as appropriate
set(ui_plugin_files)
set(qrc_plugin_files)
This diff is collapsed.
--- libavogadro/src/python/sip.cpp~ 2010-05-02 18:31:22.000000000 +0200
+++ libavogadro/src/python/sip.cpp 2010-09-14 19:13:31.000000000 +0200
@@ -204,7 +204,11 @@
sipWrapper *wrapper = reinterpret_cast<sipWrapper*>(obj_ptr);
#endif
// return the C++ pointer
+#if SIP_API_MAJOR_NR >= 8
+ return wrapper->data;
+#else
return wrapper->u.cppPtr;
+#endif
}
QClass_converters()
......@@ -4,7 +4,7 @@
# maintainer: Neophytos Kolokotronis <tetris4@gmail.com>
pkgname=lyx
pkgver=2.0.4
pkgver=2.0.5.1
pkgrel=2
pkgdesc="An advanced open-source document processor."
arch=('x86_64')
......@@ -17,7 +17,7 @@ license=('GPL')
source=("ftp://ftp.lyx.org/pub/lyx/stable/2.0.x/$pkgname-$pkgver.tar.xz" \
'lyx.desktop')
screenshot=('http://www.lyx.org/images/about/main_window.png')
md5sums=('3c0a5216270d6ac8637c667ff59ca12b'
md5sums=('6db0968c9491d0730e0b957984343699'
'0a7a76d3d9682f8d18ef0ed002b6d6e8')
build() {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment