diff options
50 files changed, 1647 insertions, 185 deletions
diff --git a/community-staging/glom/PKGBUILD b/community-staging/glom/PKGBUILD new file mode 100644 index 000000000..8947063e6 --- /dev/null +++ b/community-staging/glom/PKGBUILD @@ -0,0 +1,37 @@ +# $Id: PKGBUILD 73448 2012-07-07 19:54:15Z jlichtblau $ +# Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org> +# Contributor: Roman Kyrylych <Roman.Kyrylych@gmail.com> +# Contributor: William Rea <sillywilly@gmail.com> +# Contributor: Jaroslav Lichtblau <dragonlord@aur.archlinux.org> + +pkgname=glom +pkgver=1.22.0 +pkgrel=2 +pkgdesc="An easy-to-use database designer and user interface" +arch=('i686' 'x86_64') +url="http://www.glom.org/" +license=('GPL') +depends=('gettext' 'boost-libs' 'libgdamm' 'libxml++' 'python2-gobject' 'libepc' 'goocanvasmm' 'gtksourceviewmm' 'evince' 'postgresql') +makedepends=('intltool' 'gnome-doc-utils' 'python-sphinx' 'boost') +options=('!libtool') +install=$pkgname.install +source=(http://ftp.gnome.org/pub/GNOME/sources/glom/${pkgver%.*}/$pkgname-$pkgver.tar.xz) +sha256sums=('e6ce1b0c76cec8c85beba4900a80f257de3cc23a2c65908262fd8be87c2e546a') + +build() { + cd "$srcdir/$pkgname-$pkgver" + + ./configure --prefix=/usr \ + --with-postgres-utils=/usr/bin \ + --disable-scrollkeeper \ + --disable-update-mime-database \ + --disable-static \ + PYTHON=python2 + make +} + +package() { + cd "$srcdir/$pkgname-$pkgver" + + make DESTDIR="$pkgdir" install +} diff --git a/community-staging/glom/glom.install b/community-staging/glom/glom.install new file mode 100644 index 000000000..2b88145e3 --- /dev/null +++ b/community-staging/glom/glom.install @@ -0,0 +1,13 @@ +post_install() { + gtk-update-icon-cache -q -t -f usr/share/icons/hicolor + update-desktop-database -q + update-mime-database usr/share/mime > /dev/null +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} diff --git a/community-staging/pion-net/PKGBUILD b/community-staging/pion-net/PKGBUILD new file mode 100644 index 000000000..5b223c9b1 --- /dev/null +++ b/community-staging/pion-net/PKGBUILD @@ -0,0 +1,47 @@ +# $Id: PKGBUILD 73445 2012-07-07 19:16:54Z stativ $ +# Maintainer: Lukas Jirkovsky <l.jirkovsky@gmail.com> +# Contributor: David Watzke <david@watzke.cz> +pkgname=pion-net +pkgver=4.0.12 +pkgrel=2 +pkgdesc="A C++ development library for implementing lightweight HTTP interfaces" +url="http://www.pion.org/projects/pion-network-library" +arch=('i686' 'x86_64') +license=('custom:Boost') +depends=('boost-libs' 'openssl' 'log4cpp') +makedepends=('boost') +source=("http://www.pion.org/files/$pkgname-$pkgver.tar.bz2" \ + gcc_4.7_fix.diff boost_1.50_support.diff) +md5sums=('baf0b6a006660dc4051c824e4660cb9d' + 'd6c5314678709184e983b301cea11566' + 'a77d35019e21f3956771c6caa2f01fbf') + +build() { + cd "$srcdir/$pkgname-$pkgver" + + # override configure bug (forces debug even when nobody asked for it) + sed -i "s/ -ggdb//g" configure + # override Makefile bug + sed -i "/docs:/ s/doxygen-doc//" Makefile.in + # fix compilation with new versions of gcc + patch -Np1 < "$srcdir"/gcc_4.7_fix.diff || true + # fix build with boost 1.50 - port to filesystem v3 + patch -Np1 < "$srcdir"/boost_1.50_support.diff || true + + ./configure --prefix=/usr --disable-doxygen-doc + + make +} + +check() { + cd "$srcdir/$pkgname-$pkgver" + make -k check +} + +package() { + cd "$srcdir/$pkgname-$pkgver" + make DESTDIR="$pkgdir" install + + # install license + install -D -m0755 COPYING "$pkgdir/usr/share/licenses/$pkgname/Boost" +} diff --git a/community-staging/pion-net/boost_1.50_support.diff b/community-staging/pion-net/boost_1.50_support.diff new file mode 100644 index 000000000..5143044f1 --- /dev/null +++ b/community-staging/pion-net/boost_1.50_support.diff @@ -0,0 +1,223 @@ +diff -rup pion-net-4.0.12/common/src/PionPlugin.cpp pion-net-4.0.12-new/common/src/PionPlugin.cpp +--- pion-net-4.0.12/common/src/PionPlugin.cpp 2011-03-22 04:35:12.000000000 +0100 ++++ pion-net-4.0.12-new/common/src/PionPlugin.cpp 2012-07-07 20:42:22.084660696 +0200 +@@ -58,7 +58,7 @@ void PionPlugin::addPluginDirectory(cons + if (! boost::filesystem::exists(plugin_path) ) + throw DirectoryNotFoundException(dir); + boost::mutex::scoped_lock plugin_lock(m_plugin_mutex); +- m_plugin_dirs.push_back(plugin_path.directory_string()); ++ m_plugin_dirs.push_back(plugin_path.string()); + } + + void PionPlugin::resetPluginDirectories(void) +@@ -204,7 +204,7 @@ bool PionPlugin::checkForFile(std::strin + try { + // is_regular may throw if directory is not readable + if (boost::filesystem::is_regular(test_path)) { +- final_path = test_path.file_string(); ++ final_path = test_path.string(); + return true; + } + } catch (...) {} +@@ -225,7 +225,7 @@ bool PionPlugin::checkForFile(std::strin + try { + // is_regular may throw if directory is not readable + if (boost::filesystem::is_regular(test_path)) { +- final_path = test_path.file_string(); ++ final_path = test_path.string(); + return true; + } + } catch (...) {} +@@ -291,7 +291,7 @@ void PionPlugin::getAllPluginNames(std:: + for (boost::filesystem::directory_iterator it2(*it); it2 != end; ++it2) { + if (boost::filesystem::is_regular(*it2)) { + if (boost::filesystem::extension(it2->path()) == PionPlugin::PION_PLUGIN_EXTENSION) { +- plugin_names.push_back(PionPlugin::getPluginName(it2->path().leaf())); ++ plugin_names.push_back(PionPlugin::getPluginName(it2->path().leaf().string())); + } + } + } +@@ -309,11 +309,11 @@ void *PionPlugin::loadDynamicLibrary(con + #else + // convert into a full/absolute/complete path since dlopen() + // does not always search the CWD on some operating systems +- const boost::filesystem::path full_path = boost::filesystem::complete(plugin_file); ++ const boost::filesystem::path full_path = boost::filesystem::absolute(plugin_file); + // NOTE: you must load shared libraries using RTLD_GLOBAL on Unix platforms + // due to a bug in GCC (or Boost::any, depending on which crowd you want to believe). + // see: http://svn.boost.org/trac/boost/ticket/754 +- return dlopen(full_path.file_string().c_str(), RTLD_LAZY | RTLD_GLOBAL); ++ return dlopen(full_path.string().c_str(), RTLD_LAZY | RTLD_GLOBAL); + #endif + } + +diff -rup pion-net-4.0.12/common/src/PionScheduler.cpp pion-net-4.0.12-new/common/src/PionScheduler.cpp +--- pion-net-4.0.12/common/src/PionScheduler.cpp 2008-11-08 00:41:17.000000000 +0100 ++++ pion-net-4.0.12-new/common/src/PionScheduler.cpp 2012-07-07 20:42:22.084660696 +0200 +@@ -102,7 +102,7 @@ boost::xtime PionScheduler::getWakeupTim + boost::uint32_t sleep_nsec) + { + boost::xtime wakeup_time; +- boost::xtime_get(&wakeup_time, boost::TIME_UTC); ++ boost::xtime_get(&wakeup_time, boost::TIME_UTC_); + wakeup_time.sec += sleep_sec; + wakeup_time.nsec += sleep_nsec; + if (static_cast<boost::uint32_t>(wakeup_time.nsec) >= NSEC_IN_SECOND) { +diff -rup pion-net-4.0.12/common/tests/PionPluginPtrTests.cpp pion-net-4.0.12-new/common/tests/PionPluginPtrTests.cpp +--- pion-net-4.0.12/common/tests/PionPluginPtrTests.cpp 2009-10-13 18:20:43.000000000 +0200 ++++ pion-net-4.0.12-new/common/tests/PionPluginPtrTests.cpp 2012-07-07 20:42:22.084660696 +0200 +@@ -230,7 +230,7 @@ BOOST_AUTO_TEST_SUITE_END() + class Sandbox_F { + public: + Sandbox_F() { +- m_cwd = boost::filesystem::current_path().directory_string(); ++ m_cwd = boost::filesystem::current_path().string(); + boost::filesystem::remove_all("sandbox"); + BOOST_REQUIRE(boost::filesystem::create_directory("sandbox")); + BOOST_REQUIRE(boost::filesystem::create_directory("sandbox/dir1")); +diff -rup pion-net-4.0.12/configure pion-net-4.0.12-new/configure +--- pion-net-4.0.12/configure 2012-03-24 08:00:10.000000000 +0100 ++++ pion-net-4.0.12-new/configure 2012-07-07 20:42:22.094660551 +0200 +@@ -22091,7 +22091,7 @@ fi + + + # AC_MSG_NOTICE(Boost home directory: $BOOST_HOME_DIR) +-CPPFLAGS="$CPPFLAGS $BOOST_CPPFLAGS -DBOOST_FILESYSTEM_VERSION=2" ++CPPFLAGS="$CPPFLAGS $BOOST_CPPFLAGS -DBOOST_FILESYSTEM_VERSION=3" + LDFLAGS="$LDFLAGS $BOOST_LDFLAGS" + + # Check for Boost library extension +@@ -22197,7 +22197,7 @@ LIBS="$LIBS_SAVED" + BOOST_TRY_LIB=thread + BOOST_TRY_LINK="boost_${BOOST_TRY_LIB}${BOOST_LIB_EXTENSION}" + LIBS_SAVED="$LIBS" +-LIBS="$LIBS_SAVED -l${BOOST_TRY_LINK} ${BOOST_DATE_TIME_LIB}" ++LIBS="$LIBS_SAVED -lboost_system -l${BOOST_TRY_LINK} ${BOOST_DATE_TIME_LIB}" + echo "$as_me:$LINENO: checking for boost::${BOOST_TRY_LIB} library" >&5 + echo $ECHO_N "checking for boost::${BOOST_TRY_LIB} library... $ECHO_C" >&6 + cat >conftest.$ac_ext <<_ACEOF +diff -rup pion-net-4.0.12/net/include/pion/net/TCPConnection.hpp pion-net-4.0.12-new/net/include/pion/net/TCPConnection.hpp +--- pion-net-4.0.12/net/include/pion/net/TCPConnection.hpp 2012-01-12 17:30:03.000000000 +0100 ++++ pion-net-4.0.12-new/net/include/pion/net/TCPConnection.hpp 2012-07-07 20:43:34.530273709 +0200 +@@ -26,6 +26,7 @@ + #include <boost/array.hpp> + #include <boost/function.hpp> + #include <boost/function/function1.hpp> ++#include <boost/system/system_error.hpp> + #include <pion/PionConfig.hpp> + #include <string> + +diff -rup pion-net-4.0.12/net/services/FileService.cpp pion-net-4.0.12-new/net/services/FileService.cpp +--- pion-net-4.0.12/net/services/FileService.cpp 2009-08-06 20:58:13.000000000 +0200 ++++ pion-net-4.0.12-new/net/services/FileService.cpp 2012-07-07 20:42:22.097993836 +0200 +@@ -137,8 +137,8 @@ void FileService::operator()(HTTPRequest + + // make sure that the requested file is within the configured directory + file_path.normalize(); +- std::string file_string = file_path.file_string(); +- if (file_string.find(m_directory.directory_string()) != 0) { ++ std::string file_string = file_path.string(); ++ if (file_string.find(m_directory.string()) != 0) { + PION_LOG_WARN(m_logger, "Request for file outside of directory (" + << getResource() << "): " << relative_path); + static const std::string FORBIDDEN_HTML_START = +@@ -319,7 +319,7 @@ void FileService::operator()(HTTPRequest + << getResource() << "): " << relative_path); + + // determine the MIME type +- response_file.setMimeType(findMIMEType( response_file.getFilePath().leaf() )); ++ response_file.setMimeType(findMIMEType( response_file.getFilePath().leaf().string() )); + + // get the file_size and last_modified timestamp + response_file.update(); +@@ -597,7 +597,7 @@ void FileService::stop(void) + void FileService::scanDirectory(const boost::filesystem::path& dir_path) + { + PION_LOG_DEBUG(m_logger, "Scanning directory (" << getResource() << "): " +- << dir_path.directory_string()); ++ << dir_path.string()); + + // iterate through items in the directory + boost::filesystem::directory_iterator end_itr; +@@ -614,8 +614,8 @@ void FileService::scanDirectory(const bo + // item is a regular file + + // figure out relative path to the file +- std::string file_path_string( itr->path().file_string() ); +- std::string relative_path( file_path_string.substr(m_directory.directory_string().size() + 1) ); ++ std::string file_path_string( itr->path().string() ); ++ std::string relative_path( file_path_string.substr(m_directory.string().size() + 1) ); + + // add item to cache (use placeholder if scan == 1) + addCacheEntry(relative_path, *itr, m_scan_setting == 1); +@@ -628,7 +628,7 @@ FileService::addCacheEntry(const std::st + const boost::filesystem::path& file_path, + const bool placeholder) + { +- DiskFile cache_entry(file_path, NULL, 0, 0, findMIMEType(file_path.leaf())); ++ DiskFile cache_entry(file_path, NULL, 0, 0, findMIMEType(file_path.leaf().string())); + if (! placeholder) { + cache_entry.update(); + // only read the file if its size is <= max_cache_size +@@ -636,7 +636,7 @@ FileService::addCacheEntry(const std::st + try { cache_entry.read(); } + catch (std::exception&) { + PION_LOG_ERROR(m_logger, "Unable to add file to cache: " +- << file_path.file_string()); ++ << file_path.string()); + return std::make_pair(m_cache_map.end(), false); + } + } +@@ -647,10 +647,10 @@ FileService::addCacheEntry(const std::st + + if (add_entry_result.second) { + PION_LOG_DEBUG(m_logger, "Added file to cache: " +- << file_path.file_string()); ++ << file_path.string()); + } else { + PION_LOG_ERROR(m_logger, "Unable to insert cache entry for file: " +- << file_path.file_string()); ++ << file_path.string()); + } + + return add_entry_result; +@@ -713,7 +713,7 @@ void DiskFile::read(void) + + // read the file into memory + if (!file_stream.is_open() || !file_stream.read(m_file_content.get(), m_file_size)) +- throw FileService::FileReadException(m_file_path.file_string()); ++ throw FileService::FileReadException(m_file_path.string()); + } + + bool DiskFile::checkUpdated(void) +@@ -751,7 +751,7 @@ DiskFileSender::DiskFileSender(DiskFile& + { + PION_LOG_DEBUG(m_logger, "Preparing to send file" + << (m_disk_file.hasFileContent() ? " (cached): " : ": ") +- << m_disk_file.getFilePath().file_string()); ++ << m_disk_file.getFilePath().string()); + + // set the Content-Type HTTP header using the file's MIME type + m_writer->getResponse().setContentType(m_disk_file.getMimeType()); +@@ -795,7 +795,7 @@ void DiskFileSender::send(void) + m_file_stream.open(m_disk_file.getFilePath(), std::ios::in | std::ios::binary); + if (! m_file_stream.is_open()) { + PION_LOG_ERROR(m_logger, "Unable to open file: " +- << m_disk_file.getFilePath().file_string()); ++ << m_disk_file.getFilePath().string()); + return; + } + } +@@ -811,10 +811,10 @@ void DiskFileSender::send(void) + if (! m_file_stream.read(m_content_buf.get(), m_file_bytes_to_send)) { + if (m_file_stream.gcount() > 0) { + PION_LOG_ERROR(m_logger, "File size inconsistency: " +- << m_disk_file.getFilePath().file_string()); ++ << m_disk_file.getFilePath().string()); + } else { + PION_LOG_ERROR(m_logger, "Unable to read file: " +- << m_disk_file.getFilePath().file_string()); ++ << m_disk_file.getFilePath().string()); + } + return; + } diff --git a/community-staging/pion-net/gcc_4.7_fix.diff b/community-staging/pion-net/gcc_4.7_fix.diff new file mode 100644 index 000000000..5c2ed3cfe --- /dev/null +++ b/community-staging/pion-net/gcc_4.7_fix.diff @@ -0,0 +1,12 @@ +diff -rup pion-net-4.0.12/common/include/pion/PluginManager.hpp pion-net-4.0.12-new/common/include/pion/PluginManager.hpp +--- pion-net-4.0.12/common/include/pion/PluginManager.hpp 2011-02-12 01:46:50.000000000 +0100 ++++ pion-net-4.0.12-new/common/include/pion/PluginManager.hpp 2012-07-07 16:54:22.470284487 +0200 +@@ -420,7 +420,7 @@ inline void PluginManager<PLUGIN_TYPE>:: + delete i->second.first; + } + } +- erase(std::map<std::string, std::pair<PLUGIN_TYPE *, PionPluginPtr<PLUGIN_TYPE> > >::begin(), ++ this->erase(std::map<std::string, std::pair<PLUGIN_TYPE *, PionPluginPtr<PLUGIN_TYPE> > >::begin(), + std::map<std::string, std::pair<PLUGIN_TYPE *, PionPluginPtr<PLUGIN_TYPE> > >::end()); + } + } diff --git a/community-staging/tagpy/PKGBUILD b/community-staging/tagpy/PKGBUILD new file mode 100644 index 000000000..95c398585 --- /dev/null +++ b/community-staging/tagpy/PKGBUILD @@ -0,0 +1,36 @@ +# $Id: PKGBUILD 73441 2012-07-07 18:57:56Z tdziedzic $ +# Maintainer: Andrea Scarpino <andrea@archlinux.org> +# Contributor: Callan Barrett <wizzomafizzo@gmail.com> +# Contributor: Scott Horowitz <stonecrest@gmail.com> + +pkgname=tagpy +pkgver=0.94.8 +pkgrel=8 +pkgdesc="Python bindings for TagLib" +arch=('i686' 'x86_64') +url="http://pypi.python.org/pypi/tagpy" +license=('MIT') +depends=('python2' 'taglib' 'boost-libs') +makedepends=('python2-distribute' 'boost') +source=("http://pypi.python.org/packages/source/t/$pkgname/$pkgname-$pkgver.tar.gz") +md5sums=('6baff63318cf90b9bc5a2497a0597802') + +build() { + cd ${srcdir}/${pkgname}-${pkgver} + + sed -i -e "s|#![ ]*/usr/bin/env python$|#!/usr/bin/env python2|" \ + $(find . -name '*.py') + + ./configure.py --taglib-lib-dir=/usr/lib/ \ + --taglib-inc-dir=/usr/include/taglib/ \ + --boost-inc-dir=/usr/include/boost/ \ + --boost-lib-dir=/usr/lib/ \ + --boost-python-libname=boost_python + python2 setup.py build +} + +package(){ + cd ${srcdir}/${pkgname}-${pkgver} + python2 setup.py install --root="${pkgdir}" --optimize=1 + install -Dm644 LICENSE "${pkgdir}/usr/share/licenses/$pkgname/LICENSE" +} diff --git a/community-testing/qmmp/PKGBUILD b/community-testing/qmmp/PKGBUILD index 7f806fd67..ab07566af 100644 --- a/community-testing/qmmp/PKGBUILD +++ b/community-testing/qmmp/PKGBUILD @@ -1,8 +1,8 @@ -#$Id: PKGBUILD 73339 2012-07-06 15:23:46Z ibiru $ +#$Id: PKGBUILD 73424 2012-07-07 13:49:25Z jlichtblau $ # Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org> pkgname=qmmp -pkgver=0.5.5 +pkgver=0.6.0 pkgrel=2 pkgdesc="Qt4 based audio-player" arch=('i686' 'x86_64') @@ -21,16 +21,12 @@ optdepends=('flac: native FLAC support' 'libsndfile: sampled sound support' 'ffmpeg' 'libsamplerate' 'wavpack') install=$pkgname.install -source=("http://qmmp.ylsoftware.com/files/$pkgname-$pkgver.tar.bz2" - 'ffmpeg-0.11.diff') -sha256sums=('525d7528c58c885e45149f698125dfff6bedca0e9af979b2490e3f0b902943a6' - 'f110e59b345fcf143e45642b1cb3e89ead6c85a927a49974620e285cb116b666') +source=(http://qmmp.ylsoftware.com/files/$pkgname-$pkgver.tar.bz2) +sha256sums=('4e2c9cdfd630bb90b2c92cb3e2f95ac4239c7cf8f91c47ca4a5038dd519755fe') build() { cd ${srcdir}/$pkgname-$pkgver - patch -Np0 -i ${srcdir}/ffmpeg-0.11.diff - cmake . -DCMAKE_INSTALL_PREFIX=/usr make } diff --git a/community-testing/qmmp/qmmp.changelog b/community-testing/qmmp/qmmp.changelog index 04be7b9e8..bfd002e57 100644 --- a/community-testing/qmmp/qmmp.changelog +++ b/community-testing/qmmp/qmmp.changelog @@ -1,3 +1,18 @@ +2012-07-07 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> + * qmmp 0.6.0-2 ffmpeg 0.11 rebuild + +2012-07-07 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> + * qmmp 0.6.0-1 + +2012-07-07 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> + * qmmp 0.5.6-2 ffmpeg 0.11 rebuild + +2012-07-07 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> + * qmmp 0.5.6-1 + +2012-06-03 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> + * qmmp 0.5.5-2 ffmpeg 0.11 rebuild + 2012-05-26 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> * qmmp 0.5.5-1 diff --git a/community/collectd/PKGBUILD b/community/collectd/PKGBUILD index 363fcd830..d8379a3e2 100644 --- a/community/collectd/PKGBUILD +++ b/community/collectd/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 72138 2012-06-09 00:34:11Z dreisner $ +# $Id: PKGBUILD 73395 2012-07-07 05:48:11Z foutrelis $ # Maintainer: Gaetan Bisson <bisson@archlinux.org> # Contributor: Gerhard Brauer <gerhard.brauer@web.de> pkgname=collectd pkgver=5.1.0 -pkgrel=4 +pkgrel=5 pkgdesc='Daemon which collects system performance statistics periodically' url='http://collectd.org/' arch=('i686' 'x86_64') @@ -76,10 +76,8 @@ package() { make DESTDIR="${pkgdir}" install - install -Dm755 "$srcdir"/rc.d "${pkgdir}/etc/rc.d/${pkgname}" - install -Dm644 "$srcdir"/service "${pkgdir}"/usr/lib/systemd/system/collectd.service + rmdir "${pkgdir}/var/run" # FS#30201 + install -Dm755 ../rc.d "${pkgdir}/etc/rc.d/${pkgname}" + install -Dm644 ../service "${pkgdir}"/usr/lib/systemd/system/collectd.service install -Dm644 contrib/collectd2html.pl "${pkgdir}"/usr/share/collectd/collectd2html.pl - - # avoid conflict with filesystem>=2012.06 - rmdir "$pkgdir/var/run" } diff --git a/community/imdbpy/PKGBUILD b/community/imdbpy/PKGBUILD index accdb0c19..77f70bf1e 100644 --- a/community/imdbpy/PKGBUILD +++ b/community/imdbpy/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 67897 2012-03-15 23:14:25Z ebelanger $ +# $Id: PKGBUILD 73447 2012-07-07 19:43:08Z schiv $ # Maintainer: Ray Rashif <schiv@archlinux.org> # Contributor: Andrea Scarpino <andrea@archlinux.org> # Contributor: Geoffroy Carrier <geoffroy.carrier@koon.fr> @@ -6,8 +6,8 @@ pkgname=imdbpy _realname=IMDbPY -pkgver=4.8.2 -pkgrel=2 +pkgver=4.9 +pkgrel=1 pkgdesc="Python bindings for the Internet Movie Database (IMDb)" url="http://imdbpy.sourceforge.net/" arch=('i686' 'x86_64') @@ -16,7 +16,7 @@ depends=('python2') makedepends=('python2-distribute') optdepends=('python2-lxml' 'python2-sqlalchemy' 'python2-sqlobject') source=(http://downloads.sourceforge.net/$pkgname/$_realname-$pkgver.tar.gz) -md5sums=('6644540206c5023cb332637089d5342d') +md5sums=('5b071cd63d1804ed568741d2db8d12b5') build(){ cd "$srcdir/$_realname-$pkgver" diff --git a/community/ipset/PKGBUILD b/community/ipset/PKGBUILD index 9a7ebc1e5..47ad769be 100644 --- a/community/ipset/PKGBUILD +++ b/community/ipset/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 71313 2012-05-26 14:56:36Z seblu $ +# $Id: PKGBUILD 73450 2012-07-07 23:42:48Z seblu $ # Maintainer: Sébastien Luttringer <seblu@aur.archlinux.org> pkgname=ipset -pkgver=6.12.1 -pkgrel=2 +pkgver=6.13 +pkgrel=1 pkgdesc='Administration tool for IP sets' arch=('i686' 'x86_64') url='http://ipset.netfilter.org' @@ -16,7 +16,7 @@ source=("http://ipset.netfilter.org/$pkgname-$pkgver.tar.bz2" "$pkgname.rc" "$pkgname.systemd" "$pkgname.service") -md5sums=('80df500a4d93cb14e1373ae290716cda' +md5sums=('0b7f5db12a1852d9c31b1ec13d31ade1' '3e606a2823a700b4e9c5f17511a6f6a5' 'de89b054d967036e08b13bc6a7235286' 'dfc3105b89ed41fc4a1feb4f4f13f2a3' diff --git a/community/libmemcached/PKGBUILD b/community/libmemcached/PKGBUILD index 4f8085581..c60b2157a 100644 --- a/community/libmemcached/PKGBUILD +++ b/community/libmemcached/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 71092 2012-05-23 19:58:18Z foutrelis $ +# $Id: PKGBUILD 73390 2012-07-07 05:46:41Z foutrelis $ # Maintainer: Evangelos Foutras <evangelos@foutrelis.com> pkgname=libmemcached -pkgver=1.0.8 +pkgver=1.0.9 pkgrel=1 pkgdesc="C and C++ client library to the memcached server" arch=('i686' 'x86_64') @@ -12,7 +12,7 @@ depends=('glibc' 'libsasl' 'libevent') makedepends=('perl') options=('!libtool') source=(http://launchpad.net/$pkgname/1.0/$pkgver/+download/$pkgname-$pkgver.tar.gz) -sha256sums=('03f4eb91634f1434a93d4709eccd0c4cce3eb296b54f2b1998ca4a9ce1661ca5') +sha256sums=('795c51ef53ffc7d877f79c549db1f46ba71d190c7f03a3c2f00455bb948bda34') build() { cd "$srcdir/$pkgname-$pkgver" diff --git a/community/luaposix/PKGBUILD b/community/luaposix/PKGBUILD index 41933f17a..872138c99 100644 --- a/community/luaposix/PKGBUILD +++ b/community/luaposix/PKGBUILD @@ -1,12 +1,12 @@ -# $Id: PKGBUILD 70187 2012-05-01 12:58:45Z seblu $ +# $Id: PKGBUILD 73453 2012-07-07 23:53:09Z seblu $ # Maintainer: Sébastien Luttringer <seblu@aur.archlinux.org> # Contributor: SpepS <dreamspepser at yahoo dot it> # Contributor: Laszlo Papp <djszapi at archlinux us> # Contributor: Donald Ephraim Curtis <dcurtis@gmail.com> pkgname=luaposix -pkgver=5.1.19 -pkgrel=2 +pkgver=5.1.20 +pkgrel=1 pkgdesc='A POSIX library for Lua programming language' arch=('i686' 'x86_64') url='http://luaforge.net/projects/luaposix/' @@ -15,13 +15,13 @@ depends=('lua') #checkdepends=('lunit') options=('!libtool') source=("https://github.com/downloads/rrthomas/$pkgname/$pkgname-$pkgver.tar.gz") -md5sums=('3d74beb1b1d887adb689e6e9316abb42') +md5sums=('594d67678f829875e33c86b281441843') build() { cd $pkgname-$pkgver ./configure --prefix=/usr \ --libdir=/usr/lib/lua/5.1 \ - --datadir=/usr/share/lua/5.1 + --datadir=/usr/share/lua/5.1 make } diff --git a/community/luminancehdr/PKGBUILD b/community/luminancehdr/PKGBUILD index 9e531e8d2..c7897812e 100644 --- a/community/luminancehdr/PKGBUILD +++ b/community/luminancehdr/PKGBUILD @@ -1,33 +1,33 @@ -# $Id: PKGBUILD 68166 2012-03-18 20:30:56Z jlichtblau $ +# $Id: PKGBUILD 73397 2012-07-07 06:32:43Z jlichtblau $ # Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org> # Contributor: Lukas Jirkovsky <l.jirkovsky@gmail.com> # Contributor: Dmitry N. Shilov <stormblast@land.ru> pkgname=luminancehdr -pkgver=2.2.1 +pkgver=2.3.0 pkgrel=1 pkgdesc='Open source graphical user interface application that aims to provide a workflow for HDR imaging' arch=('i686' 'x86_64') url='http://qtpfsgui.sourceforge.net/' license=('GPL') -depends=('exiv2' 'fftw' 'gsl' 'libraw' 'openexr' 'qt' 'qtwebkit') +depends=('exiv2' 'fftw' 'gsl' 'lcms2' 'libraw' 'openexr' 'qt' 'qtwebkit') makedepends=('cmake') optdepends=('hugin: align image stack functionality') install=$pkgname.install changelog=$pkgname.changelog options=('!emptydirs') -source=(http://downloads.sourceforge.net/qtpfsgui/luminance-hdr-v${pkgver}.tar.gz) -sha256sums=('a8d781ca7a07737dfb1fe00702f948ecd044be6b8405a23d9e18fe46b27036f1') +source=(http://sourceforge.net/projects/qtpfsgui/files/luminance/${pkgver}/luminance-hdr-${pkgver}.tar.bz2) +sha256sums=('dada0795b58843912bcb57ce61dcd615bcb9f9437b610a37ff813ad2c899c676') build() { - cd "${srcdir}/luminance-hdr-v${pkgver}" + cd ${srcdir}/luminance-hdr-${pkgver} cmake -DCMAKE_INSTALL_PREFIX=/usr make } package() { - cd "${srcdir}/luminance-hdr-v${pkgver}" + cd ${srcdir}/luminance-hdr-${pkgver} - make DESTDIR="${pkgdir}" install + make DESTDIR=${pkgdir} install } diff --git a/community/luminancehdr/luminancehdr.changelog b/community/luminancehdr/luminancehdr.changelog index b649ab768..d0236e879 100644 --- a/community/luminancehdr/luminancehdr.changelog +++ b/community/luminancehdr/luminancehdr.changelog @@ -1,3 +1,6 @@ +2012-07-07 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> + * luminancehdr 2.3.0-1 + 2012-03-18 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> * luminancehdr 2.2.1-1 diff --git a/community/php-memcached/PKGBUILD b/community/php-memcached/PKGBUILD index b1cfddffb..b50ef485b 100644 --- a/community/php-memcached/PKGBUILD +++ b/community/php-memcached/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 70505 2012-05-09 18:48:15Z pschmitz $ +# $Id: PKGBUILD 73393 2012-07-07 05:47:10Z foutrelis $ # Maintainer: Evangelos Foutras <evangelos@foutrelis.com> pkgname=php-memcached pkgver=2.0.1 -pkgrel=4 +pkgrel=5 pkgdesc="PHP extension for interfacing with memcached via libmemcached library" arch=('i686' 'x86_64') url="http://pecl.php.net/package/memcached" diff --git a/community/python-psutil/PKGBUILD b/community/python-psutil/PKGBUILD index 0d96246c0..de8409cf7 100644 --- a/community/python-psutil/PKGBUILD +++ b/community/python-psutil/PKGBUILD @@ -1,16 +1,16 @@ -# $Id: PKGBUILD 68068 2012-03-17 16:12:56Z seblu $ +# $Id: PKGBUILD 73458 2012-07-08 00:12:47Z seblu $ # Maintainer: Sébastien Luttringer <seblu@aur.archlinux.org> pkgbase=python-psutil pkgname=('python-psutil' 'python2-psutil') -pkgver=0.4.1 -pkgrel=3 +pkgver=0.5.1 +pkgrel=1 arch=('i686' 'x86_64') url='http://code.google.com/p/psutil/' license=('custom: BSD') makedepends=('python' 'python-distribute' 'python2' 'python2-distribute') source=("https://psutil.googlecode.com/files/psutil-$pkgver.tar.gz") -sha1sums=('2705862e00280a7fa76cfb687dbd61623d5e236e') +sha1sums=('e4276dd11b5f03c4397490736f6c6445a7e64798') build() { cd psutil-$pkgver diff --git a/community/qlandkartegt/PKGBUILD b/community/qlandkartegt/PKGBUILD index 44356ee39..49fbff6b5 100644 --- a/community/qlandkartegt/PKGBUILD +++ b/community/qlandkartegt/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 71192 2012-05-24 17:21:45Z jlichtblau $ +# $Id: PKGBUILD 73400 2012-07-07 07:56:30Z jlichtblau $ # Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org> # Contributor: Matthias Maennich <arch@maennich.net> # Contributor: <boenki@gmx.de> pkgname=qlandkartegt -pkgver=1.4.2 +pkgver=1.5.0 pkgrel=1 pkgdesc="Use your GPS with Linux" arch=('i686' 'x86_64') @@ -18,7 +18,7 @@ install=$pkgname.install changelog=$pkgname.changelog source=(http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz $pkgname-mimetypes.xml) -sha256sums=('89f1021bda2bba054cb6d4363bb04fd5002fc34ccd01c73aa2513e99cfd65535' +sha256sums=('439137d4864217c350678d8357c07a0f80455f2cff35a736dd6b58a2d3d683b4' 'e8d33948831f8a66edd752c71c653085d6c4d9f1969e70dd8c40b9c7ca37fba0') build() { diff --git a/community/qlandkartegt/qlandkartegt.changelog b/community/qlandkartegt/qlandkartegt.changelog index f9934e824..abf10ce78 100644 --- a/community/qlandkartegt/qlandkartegt.changelog +++ b/community/qlandkartegt/qlandkartegt.changelog @@ -1,3 +1,6 @@ +2012-07-07 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> + * qlandkartegt 1.5.0-1 + 2012-05-24 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> * qlandkartegt 1.4.2-1 diff --git a/community/qmmp/PKGBUILD b/community/qmmp/PKGBUILD index 021ad1b5b..adbc1062b 100644 --- a/community/qmmp/PKGBUILD +++ b/community/qmmp/PKGBUILD @@ -1,8 +1,8 @@ -#$Id: PKGBUILD 71311 2012-05-26 14:22:36Z jlichtblau $ +#$Id: PKGBUILD 73421 2012-07-07 13:08:40Z jlichtblau $ # Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org> pkgname=qmmp -pkgver=0.5.5 +pkgver=0.6.0 pkgrel=1 pkgdesc="Qt4 based audio-player" arch=('i686' 'x86_64') @@ -22,7 +22,7 @@ optdepends=('flac: native FLAC support' 'ffmpeg' 'libsamplerate' 'wavpack') install=$pkgname.install source=(http://qmmp.ylsoftware.com/files/$pkgname-$pkgver.tar.bz2) -sha256sums=('525d7528c58c885e45149f698125dfff6bedca0e9af979b2490e3f0b902943a6') +sha256sums=('4e2c9cdfd630bb90b2c92cb3e2f95ac4239c7cf8f91c47ca4a5038dd519755fe') build() { cd ${srcdir}/$pkgname-$pkgver diff --git a/community/qmmp/qmmp.changelog b/community/qmmp/qmmp.changelog index 04be7b9e8..8012cc12c 100644 --- a/community/qmmp/qmmp.changelog +++ b/community/qmmp/qmmp.changelog @@ -1,3 +1,15 @@ +2012-07-07 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> + * qmmp 0.6.0-1 + +2012-07-07 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> + * qmmp 0.5.6-2 ffmpeg 0.11 rebuild + +2012-07-07 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> + * qmmp 0.5.6-1 + +2012-06-03 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> + * qmmp 0.5.5-2 ffmpeg 0.11 rebuild + 2012-05-26 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> * qmmp 0.5.5-1 diff --git a/community/radvd/PKGBUILD b/community/radvd/PKGBUILD index af5a4f8c2..e55ac3d49 100644 --- a/community/radvd/PKGBUILD +++ b/community/radvd/PKGBUILD @@ -1,22 +1,22 @@ -# $Id: PKGBUILD 69704 2012-04-22 21:26:38Z seblu $ +# $Id: PKGBUILD 73459 2012-07-08 00:19:18Z seblu $ # Maintainer: Sébastien Luttringer <seblu@aur.archlinux.org> # Contributor: Kaiting Chen <kaitocracy@gmail.com> # Contributor: Mark Smith <markzzzsmith@yahoo.com.au> pkgname=radvd -pkgver=1.8.5 -pkgrel=4 +pkgver=1.9.1 +pkgrel=1 pkgdesc='IPv6 Router Advertisement Daemon' url='http://www.litech.org/radvd/' license=('custom') -depends=('glibc') +depends=('glibc' 'libdaemon') arch=('i686' 'x86_64') backup=('etc/radvd.conf' 'etc/conf.d/radvd') source=("http://www.litech.org/radvd/dist/$pkgname-$pkgver.tar.gz" "$pkgname.rc" "$pkgname.conf" "$pkgname.service") -sha1sums=('344c145bd29938b7eefb0210cf92bf18df3e191d' +sha1sums=('8db7d69f5ca4ce3643f06866b4dbf634490f479a' '08dd01319682f4ef2e847d11aa375e0239c08c7a' '63ce41d790a0472e6b3b15928f6a71d1dbb7700d' '9cb6b2eaaf445fe8d17dfc50fde15709d4de7d1d') diff --git a/community/vifm/PKGBUILD b/community/vifm/PKGBUILD index e68a20c03..3e9199cdf 100644 --- a/community/vifm/PKGBUILD +++ b/community/vifm/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 71984 2012-06-04 19:39:36Z jlichtblau $ +# $Id: PKGBUILD 73402 2012-07-07 08:01:19Z jlichtblau $ # Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org> pkgname=vifm -pkgver=0.7.3 +pkgver=0.7.3a pkgrel=1 pkgdesc="Ncurses based file manager with vi like keybindings" arch=('i686' 'x86_64') @@ -11,7 +11,7 @@ license=('GPL') depends=('ncurses' 'gtk2') changelog=$pkgname.changelog source=(http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.bz2) -sha256sums=('c2cdb40ca03ea3e0464c2f0f68d27013fd447c0b67b0a5f87521f95c855e7658') +sha256sums=('77dbf8bb8caaf1b8e805c98dc6c3345d08a855fe1c09e93e6eb5a1b2cf0fd383') build() { cd ${srcdir}/$pkgname-$pkgver diff --git a/community/vifm/vifm.changelog b/community/vifm/vifm.changelog index 953f35aaa..767b7b70a 100644 --- a/community/vifm/vifm.changelog +++ b/community/vifm/vifm.changelog @@ -1,3 +1,6 @@ +2012-07-07 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> + * vifm 0.7.3a-1 + 2012-06-04 Jaroslav Lichtblau <dragonlord@aur.archlinux.org> * vifm 0.7.3-1 diff --git a/community/webfs/PKGBUILD b/community/webfs/PKGBUILD index d57e06f83..3e7da95bb 100644 --- a/community/webfs/PKGBUILD +++ b/community/webfs/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 66065 2012-02-22 17:25:28Z cbrannon $ +# $Id: PKGBUILD 73433 2012-07-07 15:26:00Z cbrannon $ # Contributor: Roman Kyrylych <Roman.Kyrylych@gmail.com> # Contributor: Mark Rosenstand <mark@archlinux.org> # Contributor: Daniel J Griffiths <ghost1227@archlinux.us> @@ -6,12 +6,12 @@ pkgname=webfs pkgver=1.21 -pkgrel=6 +pkgrel=7 pkgdesc="Simple http server for mostly static content." arch=(i686 x86_64) url="http://linux.bytesex.org/misc/webfs.html" license=("GPL") -depends=('openssl') +depends=('mime-types' 'openssl') backup=(etc/conf.d/webfsd) source=(http://dl.bytesex.org/releases/webfs/webfs-${pkgver}.tar.gz webfsd.rc webfsd.conf webfs.patch) diff --git a/extra/cppunit/PKGBUILD b/extra/cppunit/PKGBUILD index a5e98d62f..988124454 100644 --- a/extra/cppunit/PKGBUILD +++ b/extra/cppunit/PKGBUILD @@ -1,26 +1,31 @@ -# $Id: PKGBUILD 146794 2012-01-18 13:02:35Z stephane $ +# $Id: PKGBUILD 163110 2012-07-07 09:30:05Z andyrtr $ # Maintainer: Stéphane Gaudreault <stephane@archlinux.org> # Contributor: Jeff 'codemac' Mickey <jeff@archlinux.org> pkgname=cppunit -pkgver=1.12.1 -pkgrel=4 +pkgver=1.13.0 +pkgrel=1 +_hash=0c65c839854edd43d9294d1431a2b292 pkgdesc="A C++ unit testing framework" arch=('i686' 'x86_64') -url="http://cppunit.sourceforge.net" +url="http://www.freedesktop.org/wiki/Software/cppunit" license=('LGPL') depends=('sh' 'gcc-libs') options=('!libtool' '!emptydirs') -source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.gz) -sha1sums=('f1ab8986af7a1ffa6760f4bacf5622924639bf4a') +source=(http://dev-www.libreoffice.org/src/${_hash}-${pkgname}-${pkgver}.tar.gz) +md5sums=(${_hash}) build() { cd "${srcdir}/${pkgname}-${pkgver}" - export LDFLAGS+=" -ldl" - ./configure --prefix=/usr + ./configure --prefix=/usr --disable-static make } +check() { + cd "$srcdir/$pkgname-$pkgver" + make -k check +} + package() { cd "${srcdir}/${pkgname}-${pkgver}" make DESTDIR="${pkgdir}" install diff --git a/extra/opencv/PKGBUILD b/extra/opencv/PKGBUILD index cebb90f9e..368d58db9 100644 --- a/extra/opencv/PKGBUILD +++ b/extra/opencv/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 163098 2012-07-07 03:02:52Z schiv $ +# $Id: PKGBUILD 163131 2012-07-07 19:15:48Z schiv $ # Maintainer: Ray Rashif <schiv@archlinux.org> # Contributor: Tobias Powalowski <tpowa@archlinux.org> @@ -96,7 +96,7 @@ package_opencv-docs() { # install license file install -Dm644 "$srcdir/$_realname-$pkgver/doc/license.txt" \ - "$pkgdir/usr/share/licenses/$_realname/LICENSE" + "$pkgdir/usr/share/licenses/$pkgname/LICENSE" } package_opencv-samples() { @@ -112,7 +112,7 @@ package_opencv-samples() { # install license file install -Dm644 "$srcdir/$_realname-$pkgver/doc/license.txt" \ - "$pkgdir/usr/share/licenses/$_realname/LICENSE" + "$pkgdir/usr/share/licenses/$pkgname/LICENSE" } # vim:set ts=2 sw=2 et: diff --git a/extra/pidgin/PKGBUILD b/extra/pidgin/PKGBUILD index 6d90f8126..180419bd0 100644 --- a/extra/pidgin/PKGBUILD +++ b/extra/pidgin/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 163015 2012-07-05 15:59:41Z foutrelis $ +# $Id: PKGBUILD 163104 2012-07-07 05:24:14Z foutrelis $ # Maintainer: Evangelos Foutras <evangelos@foutrelis.com> # Contributor: Ionut Biru <ibiru@archlinux.org> # Contributor: Andrea Scarpino <andrea@archlinux.org> @@ -6,7 +6,7 @@ # Contributor: Lucien Immink <l.immink@student.fnt.hvu.nl> pkgname=('pidgin' 'libpurple' 'finch') -pkgver=2.10.5 +pkgver=2.10.6 pkgrel=1 arch=('i686' 'x86_64') url="http://pidgin.im/" @@ -17,7 +17,7 @@ makedepends=('startup-notification' 'gtkspell' 'libxss' 'nss' 'libsasl' 'libsm' 'networkmanager') options=('!libtool') source=(http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.bz2) -sha256sums=('6943d95a84d881adec9982685a8b41b68b1114335ae2ae4e18d22658f5c9e7aa') +sha256sums=('3e25a633b97cbfa8326999a30282e7a662a9b9bbf2853be84af0b8fb60392c96') build() { cd "$srcdir/$pkgname-$pkgver" diff --git a/extra/postfix/PKGBUILD b/extra/postfix/PKGBUILD index 6d9dc3245..9232270ae 100644 --- a/extra/postfix/PKGBUILD +++ b/extra/postfix/PKGBUILD @@ -1,16 +1,17 @@ -# $Id: PKGBUILD 159315 2012-05-21 13:58:46Z bisson $ +# $Id: PKGBUILD 163134 2012-07-08 02:03:27Z bisson $ # Contributor: Jeff Brodnax <tullyarcher@bellsouth.net> # Contributor: Paul Mattal <paul@archlinux.org> # Maintainer: Gaetan Bisson <bisson@archlinux.org> pkgname=postfix pkgver=2.9.3 -pkgrel=1 +pkgrel=2 pkgdesc='Fast, easy to administer, secure mail server' url='http://www.postfix.org/' license=('custom') arch=('i686' 'x86_64') -depends=('pcre' 'libsasl' 'libmysqlclient' 'postgresql-libs' 'sqlite' 'libldap' 'db') +depends=('pcre' 'libsasl' 'libldap' 'db' + 'libmysqlclient' 'postgresql-libs' 'sqlite' 'tinycdb') backup=('etc/postfix/'{access,aliases,canonical,generic,header_checks,main.cf,master.cf,relocated,transport,virtual}) source=("ftp://ftp.porcupine.org/mirrors/postfix-release/official/${pkgname}-${pkgver}.tar.gz" \ 'aliases.patch' \ @@ -20,8 +21,7 @@ sha1sums=('fd6c1ba3bbceb1a29b95655a742a2c547e11ca1d' '40c6be2eb55e6437a402f43775cdb3d22ea87a66') provides=('smtp-server' 'smtp-forwarder') -replaces=('postfix-mysql' 'postfix-pgsql') -conflicts=('postfix-mysql' 'postfix-pgsql' 'smtp-server' 'smtp-forwarder') +conflicts=('smtp-server' 'smtp-forwarder') install=install @@ -35,6 +35,7 @@ build() { -DHAS_MYSQL -I/usr/include/mysql \ -DHAS_PGSQL -I/usr/include/postgresql \ -DHAS_SQLITE \ + -DHAS_CDB \ ' AUXLIBS=' \ -lsasl2 \ -lldap -llber \ @@ -42,6 +43,7 @@ build() { -lmysqlclient -lz -lm \ -lpq \ -lsqlite3 -lpthread \ + -lcdb \ ' OPT="${CFLAGS} ${LDFLAGS}" make @@ -54,10 +56,11 @@ package() { install_root="${pkgdir}" \ daemon_directory="/usr/lib/${pkgname}" \ sample_directory="/etc/${pkgname}/sample" \ - manpage_directory="/usr/share/man" + manpage_directory="/usr/share/man" \ + readme_directory="/usr/share/doc/${pkgname}" \ install -D -m755 ../rc.d "${pkgdir}/etc/rc.d/${pkgname}" install -D -m644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" - sed 's/\(^\$manpage[^:]*\):/\1.gz:/' -i "${pkgdir}/usr/lib/${pkgname}/postfix-files" + sed 's/^\(\$manpage[^:]*\):/\1.gz:/' -i "${pkgdir}/usr/lib/${pkgname}/postfix-files" cd "${pkgdir}"; patch -p0 -i "${srcdir}"/aliases.patch } diff --git a/extra/timidity++/PKGBUILD b/extra/timidity++/PKGBUILD index bbfec5b5a..253bd1146 100644 --- a/extra/timidity++/PKGBUILD +++ b/extra/timidity++/PKGBUILD @@ -1,10 +1,9 @@ -# $Id: PKGBUILD 148660 2012-02-05 11:45:59Z ibiru $ -# Maintainer: Eric Belanger <eric@archlinux.org> -# Contributor: Tom Newsom <Jeepster@gmx.co.uk> +# $Id: PKGBUILD 163107 2012-07-07 06:45:30Z eric $ +# Maintainer: Eric Bélanger <eric@archlinux.org> pkgname=timidity++ -pkgver=2.13.2 -pkgrel=11 +pkgver=2.14.0 +pkgrel=1 pkgdesc="A MIDI to WAVE converter and player" arch=('i686' 'x86_64') url="http://timidity.sourceforge.net" @@ -14,42 +13,18 @@ makedepends=('xaw3d>=1.6' 'gtk2' 'tk' 'libxaw') optdepends=('gtk2: for using the GTK+ interface' 'tk: for using the Tk interface' \ 'xaw3d: for using the Xaw interface') backup=('etc/timidity++/timidity.cfg') -source=(http://downloads.sourceforge.net/timidity/TiMidity++-${pkgver}.tar.bz2 \ - timidity.cfg timidity++.sh 2.13.2-gcc4.patch TiMidity++-2.13.2+flac-1.1.3.patch \ - timidity++-2.13.2-exiterror.patch timidity++-2.13.2-gtk26.patch \ - timidity++-2.13.2-polling.patch) -md5sums=('a82ceeb2245e22f4de2b41da21eaee32' - '3fcc8f065c959205113fa7e9ab2be3c6' - '35606c12af9c6be9361d64fc536f046f' - '0868926c5290817cacb9a1849bc043c2' - 'fcbd27ff83066f69a3f8bd2442a3b3e2' - '31bdaea612f18e2c3d45a8a73ab44c81' - '16a4adec164836d4390dc6b0f9a69ce9' - '3f0034ead451cdd1078868e9e9b0494c') -sha1sums=('8e603146e1164335303a5ac5dff291f369241b4e' +source=(http://downloads.sourceforge.net/timidity/TiMidity++-${pkgver}.tar.xz \ + timidity.cfg timidity++.sh) +sha1sums=('15ec27f1ea3e718a8d61603521fc16df5c0dd24b' '660b3afbb720d26e8f008034cee66dd8da082d6e' - '9f3e732a7ca1e97119a76df62ecf154df04d4f77' - '8d50618a2379c078b07e8d0fc59457855c16106c' - '59b0dbe3cde8f7b41d83676d8c37809255d3fb36' - '7cd697b4f7cb1ce45cec46c2e0f6e5e8bf1d9d60' - 'ce115e84d99708f0bdb5b57bd98b0c3514fa2bf4' - '6abaedaecdecabf9dc76c062f7157571aed53984') + '9f3e732a7ca1e97119a76df62ecf154df04d4f77') build() { cd "${srcdir}/TiMidity++-${pkgver}" - patch -p1 < ../2.13.2-gcc4.patch - patch -p1 < ../TiMidity++-2.13.2+flac-1.1.3.patch - patch -p1 < ../timidity++-2.13.2-exiterror.patch - patch -p0 < ../timidity++-2.13.2-gtk26.patch - patch -p0 < ../timidity++-2.13.2-polling.patch - sed -i 's/tcl8.4/tcl8.5/' configure - sed -i 's/tk8.4/tk8.5/' configure - ./configure --prefix=/usr --mandir=/usr/share/man --with-default-path=/etc/timidity++/ \ - --enable-server --enable-alsaseq --enable-spectrogram \ - --enable-audio=alsa,oss,ao,vorbis,flac,jack \ - --enable-dynamic=ncurses,tcltk,vt100,xaw,gtk \ - --disable-gtktest + --enable-server --enable-alsaseq --enable-spectrogram --enable-network --enable-xft \ + --enable-audio=alsa,oss,ao,vorbis,flac,jack \ + --enable-dynamic=ncurses,tcltk,vt100,xaw,gtk make } diff --git a/extra/tinycdb/PKGBUILD b/extra/tinycdb/PKGBUILD index 406690e22..2e803febd 100644 --- a/extra/tinycdb/PKGBUILD +++ b/extra/tinycdb/PKGBUILD @@ -1,28 +1,26 @@ -# $Id: PKGBUILD 163096 2012-07-07 02:43:05Z bisson $ -# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> +# $Id: PKGBUILD 163135 2012-07-08 02:03:57Z bisson $ # Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com> +# Maintainer: Gaetan Bisson <bisson@archlinux.org> pkgname=tinycdb -pkgver=0.77 -pkgrel=4 -pkgdesc="very fast and simple package for creating and reading constant data bases" -arch=(i686 x86_64) -url="http://www.corpit.ru/mjt/tinycdb.html" -license=("GPL") -depends=(glibc) -source=(http://www.corpit.ru/mjt/tinycdb/${pkgname}_$pkgver.tar.gz) -md5sums=('c00e5fb96c30356ac3b67b2ab5d5641b') +pkgver=0.78 +pkgrel=1 +pkgdesc='Very fast and simple package for creating and reading constant data bases' +url='http://www.corpit.ru/mjt/tinycdb.html' +license=('custom') +arch=('i686' 'x86_64') +source=("http://www.corpit.ru/mjt/tinycdb/${pkgname}-${pkgver}.tar.gz") +sha1sums=('ade42ee1e7c56f66a63cb933206c089b9983adba') build() { - cd $srcdir/$pkgname-$pkgver - make sharedlib staticlib cdb + cd "${srcdir}/${pkgname}-${pkgver}" + sed -e 's/all: static/all: shared/' -e '/libcdb.a/d' -i Makefile + make CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" +} - install -D -m 0644 cdb.h $pkgdir/usr/include/cdb.h - install -D -m 0644 cdb.3 $pkgdir/usr/share/man/man3/cdb.3 - install -D -m 0644 cdb.1 $pkgdir/usr/share/man/man1/cdb.1 - install -D -m 0644 cdb.5 $pkgdir/usr/share/man/man5/cdb.5 - install -D -m 0755 cdb $pkgdir/usr/bin/cdb - install -D -m 0644 libcdb.a $pkgdir/usr/lib/libcdb.a - install -D -m 0644 libcdb.so $pkgdir/usr/lib/libcdb.so - install -D -m 0644 libcdb.so.1 $pkgdir/usr/lib/libcdb.so.1 +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + make DESTDIR="${pkgdir}" prefix=/usr mandir=/usr/share/man \ + INSTALLPROG=cdb-shared install-{all,sharedlib} + install -Dm644 debian/copyright "${pkgdir}"/usr/share/licenses/tinycdb/copyright } diff --git a/extra/upower/PKGBUILD b/extra/upower/PKGBUILD index 1d8c537f8..724c41920 100644 --- a/extra/upower/PKGBUILD +++ b/extra/upower/PKGBUILD @@ -1,18 +1,17 @@ -# $Id: PKGBUILD 158002 2012-04-30 22:34:00Z ibiru $ +# $Id: PKGBUILD 163113 2012-07-07 10:34:53Z tomegun $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=upower -pkgver=0.9.16 +pkgver=0.9.17 pkgrel=1 pkgdesc="Abstraction for enumerating power devices, listening to device events and querying history and statistics" arch=('i686' 'x86_64') url="http://upower.freedesktop.org" license=('GPL') -depends=('udev' 'libusb' 'polkit' 'pm-utils' 'dbus-glib' 'libimobiledevice') +depends=('systemd-tools' 'libusb' 'polkit' 'pm-utils' 'dbus-glib' 'libimobiledevice') makedepends=('intltool' 'docbook-xsl' 'gobject-introspection') options=('!libtool') source=($url/releases/$pkgname-$pkgver.tar.xz) -sha256sums=('eb9a3d39a8cb62970fd612e333bc7a43437ab0e7890303578b0a7e3c67c8c212') build() { cd "$pkgname-$pkgver" @@ -32,3 +31,4 @@ package() { cd "$pkgname-$pkgver" make DESTDIR="$pkgdir" install } +md5sums=('9ef7fc8ec438542f014f3a34552822aa') diff --git a/kernels/linux-libre-lts-rt/PKGBUILD b/kernels/linux-libre-lts-rt/PKGBUILD index b59e396cc..aee3a19ed 100644 --- a/kernels/linux-libre-lts-rt/PKGBUILD +++ b/kernels/linux-libre-lts-rt/PKGBUILD @@ -41,7 +41,7 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-gn md5sums=('5f64180fe7df4e574dac5911b78f5067' '150413437fe54d4822e9e43189e37319' '52679525b6b1049f5d54f270fad43423' - '5157a8a68134152e101a13d33441d5ed' + '37c2f6a089bc5d7632bcea4510c73e59' 'ffbd1f905ffb0bc0eccbbd729de7d116' '85f04a9555bdc295f7c387a6564f0c81' '2967cecc3af9f954ccc822fd63dca6ff' diff --git a/kernels/linux-libre-lts-rt/config.i686 b/kernels/linux-libre-lts-rt/config.i686 index ad52de79c..a7a870b8a 100644 --- a/kernels/linux-libre-lts-rt/config.i686 +++ b/kernels/linux-libre-lts-rt/config.i686 @@ -1,6 +1,6 @@ # # Automatically generated make config: don't edit -# Linux/i386 3.0.29-1 Kernel Configuration +# Linux/i386 3.0.36-1 Kernel Configuration # # CONFIG_64BIT is not set CONFIG_X86_32=y @@ -90,7 +90,6 @@ CONFIG_AUDIT=y CONFIG_AUDITSYSCALL=y CONFIG_AUDIT_WATCH=y CONFIG_AUDIT_TREE=y -CONFIG_UTRACE=y CONFIG_HAVE_GENERIC_HARDIRQS=y # @@ -418,9 +417,6 @@ CONFIG_DEFAULT_MMAP_MIN_ADDR=4096 CONFIG_ARCH_SUPPORTS_MEMORY_FAILURE=y CONFIG_MEMORY_FAILURE=y CONFIG_HWPOISON_INJECT=m -CONFIG_TRANSPARENT_HUGEPAGE=y -# CONFIG_TRANSPARENT_HUGEPAGE_ALWAYS is not set -CONFIG_TRANSPARENT_HUGEPAGE_MADVISE=y CONFIG_CLEANCACHE=y # CONFIG_HIGHPTE is not set CONFIG_X86_CHECK_BIOS_CORRUPTION=y @@ -996,7 +992,9 @@ CONFIG_IP_DCCP_TFRC_LIB=y # DCCP Kernel Hacking # # CONFIG_IP_DCCP_DEBUG is not set +# CONFIG_NET_DCCPPROBE is not set CONFIG_IP_SCTP=m +# CONFIG_NET_SCTPPROBE is not set # CONFIG_SCTP_DBG_MSG is not set # CONFIG_SCTP_DBG_OBJCNT is not set # CONFIG_SCTP_HMAC_NONE is not set @@ -1108,6 +1106,7 @@ CONFIG_XPS=y # Network testing # CONFIG_NET_PKTGEN=m +# CONFIG_NET_TCPPROBE is not set CONFIG_NET_DROP_MONITOR=y CONFIG_HAMRADIO=y @@ -1486,6 +1485,7 @@ CONFIG_MISC_DEVICES=y CONFIG_AD525X_DPOT=m CONFIG_AD525X_DPOT_I2C=m # CONFIG_IBM_ASM is not set +CONFIG_HWLAT_DETECTOR=m CONFIG_PHANTOM=m CONFIG_INTEL_MID_PTI=m CONFIG_SGI_IOC4=m @@ -2408,11 +2408,8 @@ CONFIG_SLHC=m # CONFIG_SLIP_SMART is not set # CONFIG_SLIP_MODE_SLIP6 is not set # CONFIG_NET_FC is not set -CONFIG_NETCONSOLE=m -CONFIG_NETCONSOLE_DYNAMIC=y -CONFIG_NETPOLL=y -# CONFIG_NETPOLL_TRAP is not set -CONFIG_NET_POLL_CONTROLLER=y +# CONFIG_NETPOLL is not set +# CONFIG_NET_POLL_CONTROLLER is not set CONFIG_VIRTIO_NET=m CONFIG_VMXNET3=m CONFIG_ISDN=y @@ -5290,13 +5287,13 @@ CONFIG_ENABLE_WARN_DEPRECATED=y # CONFIG_ENABLE_MUST_CHECK is not set CONFIG_FRAME_WARN=1024 CONFIG_MAGIC_SYSRQ=y +# CONFIG_MAGIC_SYSRQ_FORCE_PRINTK is not set CONFIG_STRIP_ASM_SYMS=y CONFIG_UNUSED_SYMBOLS=y CONFIG_DEBUG_FS=y # CONFIG_HEADERS_CHECK is not set # CONFIG_DEBUG_SECTION_MISMATCH is not set CONFIG_DEBUG_KERNEL=y -# CONFIG_DEBUG_SHIRQ is not set CONFIG_LOCKUP_DETECTOR=y CONFIG_HARDLOCKUP_DETECTOR=y # CONFIG_BOOTPARAM_HARDLOCKUP_PANIC is not set @@ -5311,8 +5308,7 @@ CONFIG_SCHED_DEBUG=y CONFIG_SCHEDSTATS=y CONFIG_TIMER_STATS=y # CONFIG_DEBUG_OBJECTS is not set -# CONFIG_SLUB_DEBUG_ON is not set -# CONFIG_SLUB_STATS is not set +# CONFIG_DEBUG_SLAB is not set # CONFIG_DEBUG_KMEMLEAK is not set # CONFIG_DEBUG_PREEMPT is not set # CONFIG_DEBUG_RT_MUTEXES is not set @@ -5346,6 +5342,7 @@ CONFIG_FRAME_POINTER=y # CONFIG_RCU_TORTURE_TEST is not set CONFIG_RCU_CPU_STALL_TIMEOUT=60 # CONFIG_RCU_CPU_STALL_VERBOSE is not set +# CONFIG_KPROBES_SANITY_TEST is not set # CONFIG_BACKTRACE_SELF_TEST is not set # CONFIG_DEBUG_BLOCK_EXT_DEVT is not set # CONFIG_DEBUG_FORCE_WEAK_PER_CPU is not set @@ -5373,7 +5370,6 @@ CONFIG_FTRACE_NMI_ENTER=y CONFIG_EVENT_TRACING=y CONFIG_EVENT_POWER_TRACING_DEPRECATED=y CONFIG_CONTEXT_SWITCH_TRACER=y -CONFIG_RING_BUFFER_ALLOW_SWAP=y CONFIG_TRACING=y CONFIG_GENERIC_TRACER=y CONFIG_TRACING_SUPPORT=y @@ -5383,12 +5379,15 @@ CONFIG_FUNCTION_GRAPH_TRACER=y # CONFIG_IRQSOFF_TRACER is not set # CONFIG_PREEMPT_TRACER is not set CONFIG_SCHED_TRACER=y +# CONFIG_WAKEUP_LATENCY_HIST is not set +# CONFIG_MISSED_TIMER_OFFSETS_HIST is not set CONFIG_FTRACE_SYSCALLS=y CONFIG_BRANCH_PROFILE_NONE=y # CONFIG_PROFILE_ANNOTATED_BRANCHES is not set # CONFIG_PROFILE_ALL_BRANCHES is not set CONFIG_STACK_TRACER=y CONFIG_BLK_DEV_IO_TRACE=y +CONFIG_KPROBE_EVENT=y CONFIG_DYNAMIC_FTRACE=y CONFIG_FUNCTION_PROFILER=y CONFIG_FTRACE_MCOUNT_RECORD=y @@ -5420,6 +5419,7 @@ CONFIG_DEBUG_RODATA=y CONFIG_DOUBLEFAULT=y # CONFIG_IOMMU_STRESS is not set CONFIG_HAVE_MMIOTRACE_SUPPORT=y +# CONFIG_X86_DECODER_SELFTEST is not set CONFIG_IO_DELAY_TYPE_0X80=0 CONFIG_IO_DELAY_TYPE_0XED=1 CONFIG_IO_DELAY_TYPE_UDELAY=2 diff --git a/libre/blender-libre/PKGBUILD b/libre/blender-libre/PKGBUILD index 6fc5679e7..05b54f402 100644 --- a/libre/blender-libre/PKGBUILD +++ b/libre/blender-libre/PKGBUILD @@ -2,7 +2,7 @@ # Contributor: John Sowiak <john@archlinux.org> # Contributor: tobias <tobias@archlinux.org> # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com> -# Maintainer (Parabola): Márcio Silva <coadde@adinet.com.uy> +# Maintainer (Parabola): Márcio Silva <coadde@lavabit.com> # Apparently, the blender guys refuse to release source tarballs for # intermediate releases that deal mainly with binaries but incorporate tiny @@ -14,9 +14,9 @@ _svn=true _pkgname=blender pkgname=blender-libre true && pkgver=2.63a # Hack for svn -true && pkgrel=2 +true && pkgrel=2.1 epoch=4 -pkgdesc="A fully integrated 3D graphics creation suite without cuda-toolkit recommendation" +pkgdesc="A fully integrated 3D graphics creation suite (without nonfree cuda-toolkit support)" arch=('i686' 'x86_64' 'mips64el') license=('GPL') url="http://www.blender.org" diff --git a/libre/libquicktime-libre/PKGBUILD b/libre/libquicktime-libre/PKGBUILD index 2b3c84263..b800c1444 100644 --- a/libre/libquicktime-libre/PKGBUILD +++ b/libre/libquicktime-libre/PKGBUILD @@ -1,11 +1,11 @@ # $Id$ # Maintainer: Mateusz Herych <heniekk@gmail.com> -# Contributor (Parabola): Jorge Lopez <jorginho@adinet.com.uy> +# Contributor (Parabola): Jorge Lopez <jorginho@lavabit.com> pkgname=libquicktime-libre _pkgname=libquicktime pkgver=1.2.4 -pkgrel=1 +pkgrel=2 pkgdesc="A library for reading and writing quicktime files (no unfree faac support)." arch=('i686' 'x86_64') license=('GPL') diff --git a/multilib-testing/lib32-glibc/PKGBUILD b/multilib-testing/lib32-glibc/PKGBUILD index 5fd14ee1d..69c1a2c63 100644 --- a/multilib-testing/lib32-glibc/PKGBUILD +++ b/multilib-testing/lib32-glibc/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 73234 2012-07-04 01:11:56Z heftig $ +# $Id: PKGBUILD 73419 2012-07-07 13:03:07Z allan $ # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> # Contributor: Jan de Groot <jgc@archlinux.org> # Contributor: Allan McRae <allan@archlinux.org> @@ -9,12 +9,11 @@ _pkgbasename=glibc pkgname=lib32-$_pkgbasename pkgver=2.16.0 -pkgrel=1 +pkgrel=2 pkgdesc="GNU C Library for multilib" arch=('x86_64') url="http://www.gnu.org/software/libc" license=('GPL' 'LGPL') -depends=("glibc>=$pkgver") makedepends=('gcc-multilib>=4.7') options=('!strip' '!emptydirs') source=(http://ftp.gnu.org/gnu/libc/${_pkgbasename}-${pkgver}.tar.xz{,.sig} @@ -48,6 +47,7 @@ build() { export CFLAGS="${CFLAGS} -mno-tls-direct-seg-refs" export CC="gcc -m32" + export CXX="g++ -m32" echo "slibdir=/usr/lib32" >> configparms # remove hardening options from CFLAGS for building libraries @@ -111,8 +111,8 @@ package() { usr/lib32/{pt_chown,{audit,gconv}/*.so} # Dynamic linker - mkdir ${pkgdir}/lib - ln -s ../usr/lib32/ld-linux.so.2 ${pkgdir}/lib/ + mkdir ${pkgdir}/usr/lib + ln -s ../lib32/ld-linux.so.2 ${pkgdir}/usr/lib/ # Add lib32 paths to the default library search path install -Dm644 "$srcdir/lib32-glibc.conf" "$pkgdir/etc/ld.so.conf.d/lib32-glibc.conf" diff --git a/multilib/gcc-multilib/PKGBUILD b/multilib/gcc-multilib/PKGBUILD index ee8e8f639..c942833fc 100644 --- a/multilib/gcc-multilib/PKGBUILD +++ b/multilib/gcc-multilib/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 73282 2012-07-05 13:48:44Z allan $ +# $Id: PKGBUILD 73410 2012-07-07 10:16:30Z heftig $ # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> # Contributor: Allan McRae <allan@archlinux.org> @@ -8,7 +8,7 @@ pkgbase='gcc-multilib' pkgname=('gcc-multilib' 'gcc-libs-multilib' 'lib32-gcc-libs' 'gcc-fortran-multilib' 'gcc-objc-multilib' 'gcc-ada-multilib' 'gcc-go-multilib') pkgver=4.7.1 -pkgrel=4 +pkgrel=4.1 #_snapshot=4.7-20120505 _libstdcppmanver=20120605 # Note: check source directory name when updating this pkgdesc="The GNU Compiler Collection for multilib" @@ -82,7 +82,7 @@ build() { --with-linker-hash-style=gnu \ --enable-multilib --disable-libssp \ --disable-build-with-cxx --disable-build-poststage1-with-cxx \ - --enable-checking=release --with-fpmath=sse + --enable-checking=release make } diff --git a/staging/akonadi/PKGBUILD b/staging/akonadi/PKGBUILD new file mode 100644 index 000000000..26571d1a8 --- /dev/null +++ b/staging/akonadi/PKGBUILD @@ -0,0 +1,32 @@ +# $Id: PKGBUILD 163118 2012-07-07 15:44:55Z andrea $ +# Maintainer: Andrea Scarpino <andrea@archlinux.org> +# Contributor: Pierre Schmitz <pierre@archlinux.de> + +pkgname=akonadi +pkgver=1.7.2 +pkgrel=2 +pkgdesc="PIM layer, which provides an asynchronous API to access all kind of PIM data" +arch=('i686' 'x86_64') +url='http://pim.kde.org/akonadi' +license=('LGPL') +depends=('shared-mime-info' 'boost-libs' 'mysql' 'soprano') +makedepends=('pkgconfig' 'cmake' 'automoc4' 'boost') +install="${pkgname}.install" +source=("http://download.kde.org/stable/${pkgname}/src/${pkgname}-${pkgver}.tar.bz2") +md5sums=('c73bb835057a3ee07d37a4f7daaf7ecf') + +build() { + cd "${srcdir}" + mkdir build + cd build + cmake ../${pkgname}-${pkgver} \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DINSTALL_QSQLITE_IN_QT_PREFIX=TRUE + make +} + +package() { + cd "${srcdir}/build" + make DESTDIR="${pkgdir}" install +} diff --git a/staging/akonadi/akonadi.install b/staging/akonadi/akonadi.install new file mode 100644 index 000000000..7c8a8bd2b --- /dev/null +++ b/staging/akonadi/akonadi.install @@ -0,0 +1,11 @@ +post_install() { + update-mime-database usr/share/mime &> /dev/null +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} diff --git a/staging/avogadro/PKGBUILD b/staging/avogadro/PKGBUILD new file mode 100644 index 000000000..cf03f9277 --- /dev/null +++ b/staging/avogadro/PKGBUILD @@ -0,0 +1,45 @@ +# $Id: PKGBUILD 163125 2012-07-07 16:07:39Z andrea $ +# Maintainer: +# Contributor: Andrea Scarpino <andrea@archlinux.org> +# Contributor: Nick B <Shirakawasuna at gmail _dot_com> + +pkgname=avogadro +pkgver=1.0.3 +pkgrel=6 +pkgdesc="An advanced molecular editor based on Qt" +arch=('i686' 'x86_64') +url="http://avogadro.openmolecules.net/wiki/Main_Page" +license=('GPL2') +depends=('eigen2' 'openbabel' 'python2-pyqt' 'boost-libs' 'glew' 'python2-numpy') +makedepends=('cmake' 'boost') +install=avogadro.install +source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.bz2" + 'replace-qt4_automoc-with-qt4_wrap_cpp.patch' + 'fix-boost.patch' + 'fix-opengl-headers.patch') +md5sums=('92c2702c1980f70fb6d87a1a58147911' + 'aec516daab066c15326a9681f8f15abc' + '46282e4709429447e44a0a54d51ad2ec' + 'f420bfd22e3d5d8fcddc625cf5e711f6') + +build() { + cd "${srcdir}"/${pkgname}-${pkgver} + patch -p1 -i "${srcdir}"/replace-qt4_automoc-with-qt4_wrap_cpp.patch + patch -p1 -i "${srcdir}"/fix-boost.patch + patch -p1 -i "${srcdir}"/fix-opengl-headers.patch + + cd "${srcdir}" + mkdir build + cd build + cmake ../${pkgname}-${pkgver} \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DPYTHON_EXECUTABLE=/usr/bin/python2 \ + -DQT_MKSPECS_RELATIVE=share/qt/mkspecs + make +} + +package() { + cd "${srcdir}/build" + make DESTDIR="${pkgdir}" install +} diff --git a/staging/avogadro/avogadro.install b/staging/avogadro/avogadro.install new file mode 100644 index 000000000..2eaa60550 --- /dev/null +++ b/staging/avogadro/avogadro.install @@ -0,0 +1,11 @@ +post_install() { + update-desktop-database -q +} + +post_upgrade() { + post_install $1 +} + +post_remove() { + post_install $1 +} diff --git a/staging/avogadro/fix-boost.patch b/staging/avogadro/fix-boost.patch new file mode 100644 index 000000000..8fb53ef12 --- /dev/null +++ b/staging/avogadro/fix-boost.patch @@ -0,0 +1,33 @@ +--- 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) diff --git a/staging/avogadro/fix-opengl-headers.patch b/staging/avogadro/fix-opengl-headers.patch new file mode 100644 index 000000000..e6e8bc3b5 --- /dev/null +++ b/staging/avogadro/fix-opengl-headers.patch @@ -0,0 +1,53 @@ +--- avogadro-1.0.3/libavogadro/src/camera.cpp~ 2012-02-27 18:35:52.109999585 +0000 ++++ avogadro-1.0.3/libavogadro/src/camera.cpp 2012-02-27 18:36:27.103053453 +0000 +@@ -25,6 +25,8 @@ + #include "camera.h" + #include "glwidget.h" + #include <avogadro/molecule.h> ++#include <Eigen/LU> ++#include <GL/glu.h> + + using namespace Eigen; + +--- avogadro-1.0.3/libavogadro/src/glpainter_p.cpp~ 2012-02-27 18:37:28.535894209 +0000 ++++ avogadro-1.0.3/libavogadro/src/glpainter_p.cpp 2012-02-27 18:37:46.912413557 +0000 +@@ -42,6 +42,7 @@ + #include <QColor> + #include <QVarLengthArray> + #include <Eigen/Geometry> ++#include <GL/glu.h> + + namespace Avogadro + { +--- avogadro-1.0.3/libavogadro/src/glwidget.cpp~ 2012-02-27 18:37:55.099014598 +0000 ++++ avogadro-1.0.3/libavogadro/src/glwidget.cpp 2012-02-27 18:38:30.805395066 +0000 +@@ -70,6 +70,8 @@ + + #include <openbabel/mol.h> + ++#include <GL/glu.h> ++ + using namespace OpenBabel; + using namespace Eigen; + +--- avogadro-1.0.3/libavogadro/src/extensions/povpainter.cpp~ 2012-02-27 18:36:53.646173944 +0000 ++++ avogadro-1.0.3/libavogadro/src/extensions/povpainter.cpp 2012-02-27 18:37:10.739370227 +0000 +@@ -36,6 +36,7 @@ + #include <QFile> + #include <QDebug> + #include <Eigen/Geometry> ++#include <GL/glu.h> + + namespace Avogadro + { +--- avogadro-1.0.3/libavogadro/src/tools/selectrotatetool.cpp~ 2012-02-27 18:38:47.491928000 +0000 ++++ avogadro-1.0.3/libavogadro/src/tools/selectrotatetool.cpp 2012-02-27 18:39:05.735115136 +0000 +@@ -44,6 +44,8 @@ + #include <QComboBox> + #include <QDebug> + ++#include <GL/glu.h> ++ + using namespace std; + using namespace OpenBabel; + using namespace Eigen; diff --git a/staging/avogadro/replace-qt4_automoc-with-qt4_wrap_cpp.patch b/staging/avogadro/replace-qt4_automoc-with-qt4_wrap_cpp.patch new file mode 100644 index 000000000..11f58a505 --- /dev/null +++ b/staging/avogadro/replace-qt4_automoc-with-qt4_wrap_cpp.patch @@ -0,0 +1,778 @@ +diff -U 3 -H -d -r -N -- avogadro-1.0.3/libavogadro/src/CMakeLists.txt avogadro-1.0.3-edit/libavogadro/src/CMakeLists.txt +--- avogadro-1.0.3/libavogadro/src/CMakeLists.txt 2011-04-25 07:22:18.000000000 +0200 ++++ avogadro-1.0.3-edit/libavogadro/src/CMakeLists.txt 2011-11-29 18:49:58.520790652 +0100 +@@ -75,6 +75,42 @@ + zmatrix.h + ) + ++SET(libavogadro_MOC_HDRS ++ animation.h ++ atom.h ++ bond.h ++ color.h ++ colorbutton.h ++ colors/elementcolor.h ++ cube.h ++ elementdetail_p.h ++ elementtranslator.h ++ engine.h ++ engines/bsdyengine.h ++ extension.h ++ fragment.h ++ glwidget.h ++ mesh.h ++ molecule.h ++ moleculefile.h ++ moleculefile_p.h ++ periodictablescene_p.h ++ periodictableview.h ++ plotwidget.h ++ plugin.h ++ pluginmanager.h ++ primitive.h ++ protein.h ++ pythonengine_p.h ++ pythonerror.h ++ pythonextension_p.h ++ pythontool_p.h ++ residue.h ++ tool.h ++ toolgroup.h ++ zmatrix.h ++) ++ + set(libavogadro_SRCS ${libavogadro_SRCS} ${libavogadro_UIS}) + # Also add in the qtiocompressor class + #set(libavogadro_SRCS ${libavogadro_SRCS} ../qtiocompressor/qtiocompressor.cpp) +@@ -113,7 +148,7 @@ + endforeach(P_ITEM ${PYTHON_SRCS}) + endif(NOT ENABLE_PYTHON OR NOT ALL_PYTHON_FOUND) + +-qt4_automoc(${libavogadro_SRCS}) ++QT4_WRAP_CPP(libavogadro_MOC_SRCS ${libavogadro_MOC_HDRS}) + + # you have to add link_directories before you add the target + if(ENABLE_PYTHON AND ALL_PYTHON_FOUND) +@@ -149,7 +184,7 @@ + COMMAND ${CMAKE_COMMAND} -E ${header_cmd} "${from}" "${to}") + endforeach(headerFile ${libavogadro_HDRS}) + +-add_library(avogadro SHARED ${libavogadro_SRCS} ${libavogadro_QM} ${pythontool_RC_SRCS}) ++add_library(avogadro SHARED ${libavogadro_SRCS} ${libavogadro_MOC_SRCS} ${libavogadro_QM} ${pythontool_RC_SRCS}) + set_target_properties(avogadro + PROPERTIES VERSION ${Avogadro_VERSION_FULL} SOVERSION 1 ) + target_link_libraries(avogadro ${AVO_LINK_LIBRARIES}) +diff -U 3 -H -d -r -N -- avogadro-1.0.3/libavogadro/src/animation.cpp avogadro-1.0.3-edit/libavogadro/src/animation.cpp +--- avogadro-1.0.3/libavogadro/src/animation.cpp 2011-04-25 07:22:18.000000000 +0200 ++++ avogadro-1.0.3-edit/libavogadro/src/animation.cpp 2011-11-29 18:48:47.967839537 +0100 +@@ -224,5 +224,3 @@ + } + + } // end namespace Avogadro +- +-#include "animation.moc" +diff -U 3 -H -d -r -N -- avogadro-1.0.3/libavogadro/src/atom.cpp avogadro-1.0.3-edit/libavogadro/src/atom.cpp +--- avogadro-1.0.3/libavogadro/src/atom.cpp 2011-04-25 07:22:18.000000000 +0200 ++++ avogadro-1.0.3-edit/libavogadro/src/atom.cpp 2011-11-29 18:48:39.561218412 +0100 +@@ -293,5 +293,3 @@ + } + + } // End namespace Avogadro +- +-#include "atom.moc" +diff -U 3 -H -d -r -N -- avogadro-1.0.3/libavogadro/src/bond.cpp avogadro-1.0.3-edit/libavogadro/src/bond.cpp +--- avogadro-1.0.3/libavogadro/src/bond.cpp 2011-04-25 07:22:18.000000000 +0200 ++++ avogadro-1.0.3-edit/libavogadro/src/bond.cpp 2011-11-29 18:49:00.067773985 +0100 +@@ -166,5 +166,3 @@ + } + + } // End namespace Avogadro +- +-#include "bond.moc" +diff -U 3 -H -d -r -N -- avogadro-1.0.3/libavogadro/src/color.cpp avogadro-1.0.3-edit/libavogadro/src/color.cpp +--- avogadro-1.0.3/libavogadro/src/color.cpp 2011-04-25 07:22:18.000000000 +0200 ++++ avogadro-1.0.3-edit/libavogadro/src/color.cpp 2011-11-29 18:49:05.207746140 +0100 +@@ -152,5 +152,3 @@ + return "Generic Color"; + } + } +- +-#include "color.moc" +diff -U 3 -H -d -r -N -- avogadro-1.0.3/libavogadro/src/colorbutton.cpp avogadro-1.0.3-edit/libavogadro/src/colorbutton.cpp +--- avogadro-1.0.3/libavogadro/src/colorbutton.cpp 2011-04-25 07:22:18.000000000 +0200 ++++ avogadro-1.0.3-edit/libavogadro/src/colorbutton.cpp 2011-11-29 18:49:11.987709410 +0100 +@@ -94,5 +94,3 @@ + } + + } // end namespace +- +-#include "colorbutton.moc" +diff -U 3 -H -d -r -N -- avogadro-1.0.3/libavogadro/src/colors/elementcolor.cpp avogadro-1.0.3-edit/libavogadro/src/colors/elementcolor.cpp +--- avogadro-1.0.3/libavogadro/src/colors/elementcolor.cpp 2011-04-25 07:22:18.000000000 +0200 ++++ avogadro-1.0.3-edit/libavogadro/src/colors/elementcolor.cpp 2011-11-29 18:50:11.077389292 +0100 +@@ -63,7 +63,5 @@ + + } + +-#include "elementcolor.moc" + //this is a static color plugin... + //Q_EXPORT_PLUGIN2(elementcolor, Avogadro::ElementColorFactory) +- +diff -U 3 -H -d -r -N -- avogadro-1.0.3/libavogadro/src/cube.cpp avogadro-1.0.3-edit/libavogadro/src/cube.cpp +--- avogadro-1.0.3/libavogadro/src/cube.cpp 2011-04-25 07:22:18.000000000 +0200 ++++ avogadro-1.0.3-edit/libavogadro/src/cube.cpp 2011-11-29 18:50:26.357306516 +0100 +@@ -322,5 +322,3 @@ + } + + } // End namespace Avogadro +- +-#include "cube.moc" +diff -U 3 -H -d -r -N -- avogadro-1.0.3/libavogadro/src/elementdetail_p.cpp avogadro-1.0.3-edit/libavogadro/src/elementdetail_p.cpp +--- avogadro-1.0.3/libavogadro/src/elementdetail_p.cpp 2011-04-25 07:22:18.000000000 +0200 ++++ avogadro-1.0.3-edit/libavogadro/src/elementdetail_p.cpp 2011-11-29 18:50:37.680578505 +0100 +@@ -132,5 +132,3 @@ + } + + } // End namespace Avogadro +- +-#include "elementdetail_p.moc" +diff -U 3 -H -d -r -N -- avogadro-1.0.3/libavogadro/src/elementtranslator.cpp avogadro-1.0.3-edit/libavogadro/src/elementtranslator.cpp +--- avogadro-1.0.3/libavogadro/src/elementtranslator.cpp 2011-04-25 07:22:18.000000000 +0200 ++++ avogadro-1.0.3-edit/libavogadro/src/elementtranslator.cpp 2011-11-29 18:50:48.160521729 +0100 +@@ -401,5 +401,3 @@ + } + + } // End namespace Avogadro +- +-#include "elementtranslator.moc" +diff -U 3 -H -d -r -N -- avogadro-1.0.3/libavogadro/src/engine.cpp avogadro-1.0.3-edit/libavogadro/src/engine.cpp +--- avogadro-1.0.3/libavogadro/src/engine.cpp 2011-04-25 07:22:18.000000000 +0200 ++++ avogadro-1.0.3-edit/libavogadro/src/engine.cpp 2011-11-29 18:50:54.397154610 +0100 +@@ -377,5 +377,3 @@ + return m_molecule->bonds(); + } + } +- +-#include "engine.moc" +diff -U 3 -H -d -r -N -- avogadro-1.0.3/libavogadro/src/engines/bsdyengine.cpp avogadro-1.0.3-edit/libavogadro/src/engines/bsdyengine.cpp +--- avogadro-1.0.3/libavogadro/src/engines/bsdyengine.cpp 2011-04-25 07:22:18.000000000 +0200 ++++ avogadro-1.0.3-edit/libavogadro/src/engines/bsdyengine.cpp 2011-11-29 18:51:18.733689435 +0100 +@@ -442,7 +442,5 @@ + } + + } +- +-#include "bsdyengine.moc" + // This is a static engine... + // Q_EXPORT_PLUGIN2( bsdyengine, Avogadro::BSDYEngineFactory ) +diff -U 3 -H -d -r -N -- avogadro-1.0.3/libavogadro/src/extension.cpp avogadro-1.0.3-edit/libavogadro/src/extension.cpp +--- avogadro-1.0.3/libavogadro/src/extension.cpp 2011-04-25 07:22:18.000000000 +0200 ++++ avogadro-1.0.3-edit/libavogadro/src/extension.cpp 2011-11-29 18:51:56.360152261 +0100 +@@ -80,5 +80,3 @@ + } + + } +- +-#include "extension.moc" +diff -U 3 -H -d -r -N -- avogadro-1.0.3/libavogadro/src/fragment.cpp avogadro-1.0.3-edit/libavogadro/src/fragment.cpp +--- avogadro-1.0.3/libavogadro/src/fragment.cpp 2011-04-25 07:22:18.000000000 +0200 ++++ avogadro-1.0.3-edit/libavogadro/src/fragment.cpp 2011-11-29 18:52:01.906788880 +0100 +@@ -82,5 +82,3 @@ + } + + } // End namespace Avogadro +- +-#include "fragment.moc" +diff -U 3 -H -d -r -N -- avogadro-1.0.3/libavogadro/src/glwidget.cpp avogadro-1.0.3-edit/libavogadro/src/glwidget.cpp +--- avogadro-1.0.3/libavogadro/src/glwidget.cpp 2011-04-25 07:22:18.000000000 +0200 ++++ avogadro-1.0.3-edit/libavogadro/src/glwidget.cpp 2011-11-29 18:52:14.346721486 +0100 +@@ -1966,5 +1966,3 @@ + d->updateCache = true; + } + } +- +-#include "glwidget.moc" +diff -U 3 -H -d -r -N -- avogadro-1.0.3/libavogadro/src/mesh.cpp avogadro-1.0.3-edit/libavogadro/src/mesh.cpp +--- avogadro-1.0.3/libavogadro/src/mesh.cpp 2011-04-25 07:22:18.000000000 +0200 ++++ avogadro-1.0.3-edit/libavogadro/src/mesh.cpp 2011-11-29 18:52:23.033341093 +0100 +@@ -231,5 +231,3 @@ + } + + } // End namespace Avogadro +- +-#include "mesh.moc" +diff -U 3 -H -d -r -N -- avogadro-1.0.3/libavogadro/src/molecule.cpp avogadro-1.0.3-edit/libavogadro/src/molecule.cpp +--- avogadro-1.0.3/libavogadro/src/molecule.cpp 2011-04-25 07:22:18.000000000 +0200 ++++ avogadro-1.0.3-edit/libavogadro/src/molecule.cpp 2011-11-29 18:52:33.573283993 +0100 +@@ -1575,5 +1575,3 @@ + } + + } // End namespace Avogadro +- +-#include "molecule.moc" +diff -U 3 -H -d -r -N -- avogadro-1.0.3/libavogadro/src/moleculefile.cpp avogadro-1.0.3-edit/libavogadro/src/moleculefile.cpp +--- avogadro-1.0.3/libavogadro/src/moleculefile.cpp 2011-04-25 07:22:18.000000000 +0200 ++++ avogadro-1.0.3-edit/libavogadro/src/moleculefile.cpp 2011-11-29 18:56:26.728687548 +0100 +@@ -22,23 +22,14 @@ + 02110-1301, USA. + **********************************************************************/ + +-#include "moleculefile.h" ++#include "moleculefile_p.h" + + #include <avogadro/molecule.h> + +-#include <QFile> + #include <QFileInfo> +-#include <QStringList> +-#include <QThread> + #include <QDebug> + #include <QPointer> + +-#include <openbabel/mol.h> +-#include <openbabel/obconversion.h> +- +-// Included in obconversion.h +-//#include <iostream> +- + namespace Avogadro { + + using OpenBabel::OBConversion; +@@ -578,164 +569,6 @@ + return false; + } + +- class ReadFileThread : public QThread +- { +- // Q_OBJECT +- +- public: +- ReadFileThread(MoleculeFile *moleculeFile) : m_moleculeFile(moleculeFile) +- { +- } +- +- void addConformer(const OpenBabel::OBMol &conformer) +- { +- unsigned int numAtoms = conformer.NumAtoms(); +- std::vector<Eigen::Vector3d> *coords = new std::vector<Eigen::Vector3d>(numAtoms); +- for (unsigned int i = 0; i < numAtoms; ++i) +- coords->push_back(Eigen::Vector3d(conformer.GetAtom(i+1)->GetVector().AsArray())); +- m_moleculeFile->m_conformers.push_back(coords); +- } +- +- void detectConformers(unsigned int c, const OpenBabel::OBMol &first, const OpenBabel::OBMol ¤t) +- { +- if (!c) { +- // this is the first molecule read +- m_moleculeFile->setConformerFile(true); +- addConformer(current); +- return; +- } +- +- if (!m_moleculeFile->isConformerFile()) +- return; +- +- // as long as we are not sure if this really is a +- // conformer/trajectory file, add the conformers +- addConformer(current); +- +- // performance: check only certain molecule 1-10,20,50 +- switch (c) { +- case 1: +- case 2: +- case 3: +- case 4: +- case 5: +- case 6: +- case 7: +- case 8: +- case 9: +- case 10: +- case 20: +- case 50: +- break; +- default: +- return; +- } +- +- if (first.NumAtoms() != current.NumAtoms()) { +- m_moleculeFile->setConformerFile(false); +- m_moleculeFile->m_conformers.clear(); +- return; +- } +- +- for (unsigned int i = 0; i < first.NumAtoms(); ++i) { +- OpenBabel::OBAtom *firstAtom = first.GetAtom(i+1); +- OpenBabel::OBAtom *currentAtom = current.GetAtom(i+1); +- if (firstAtom->GetAtomicNum() != currentAtom->GetAtomicNum()) { +- m_moleculeFile->setConformerFile(false); +- m_moleculeFile->m_conformers.clear(); +- return; +- } +- } +- } +- +- void run() +- { +- // Check that the file can be read from disk +- if (!MoleculeFile::canOpen(m_moleculeFile->m_fileName, QFile::ReadOnly | QFile::Text)) { +- // Cannot read the file +- m_moleculeFile->m_error.append(QObject::tr("File %1 cannot be opened for reading.") +- .arg(m_moleculeFile->m_fileName)); +- return; +- } +- +- // Construct the OpenBabel objects, set the file type +- OpenBabel::OBConversion conv; +- OpenBabel::OBFormat *inFormat; +- if (!m_moleculeFile->m_fileType.isEmpty() && !conv.SetInFormat(m_moleculeFile->m_fileType.toAscii().data())) { +- // Input format not supported +- m_moleculeFile->m_error.append( +- QObject::tr("File type '%1' is not supported for reading.").arg(m_moleculeFile->m_fileType)); +- return; +- } else { +- inFormat = conv.FormatFromExt(m_moleculeFile->m_fileName.toAscii().data()); +- if (!inFormat || !conv.SetInFormat(inFormat)) { +- // Input format not supported +- m_moleculeFile->m_error.append(QObject::tr("File type for file '%1' is not supported for reading.") +- .arg(m_moleculeFile->m_fileName)); +- return; +- } +- } +- +- // set any options +- if (!m_moleculeFile->m_fileOptions.isEmpty()) { +- foreach(const QString &option, +- m_moleculeFile->m_fileOptions.split('\n', QString::SkipEmptyParts)) { +- conv.AddOption(option.toAscii().data(), OBConversion::INOPTIONS); +- } +- } +- +- // Now attempt to read the molecule in +- ifstream ifs; +- ifs.open(m_moleculeFile->m_fileName.toLocal8Bit()); // This handles utf8 file names etc +- if (!ifs) // Should not happen, already checked file could be opened +- return; +- +- // read all molecules +- OpenBabel::OBMol firstOBMol, currentOBMol; +- unsigned int c = 0; +- conv.SetInStream(&ifs); +- m_moleculeFile->streamposRef().push_back(ifs.tellg()); +- while (ifs.good() && conv.Read(¤tOBMol)) { +- if (!c) +- firstOBMol = currentOBMol; +- +- if (c > 20 && !m_moleculeFile->isConformerFile()) +- m_moleculeFile->setFirstReady(true); +- +- // detect conformer/trajectory files +- detectConformers(c, firstOBMol, currentOBMol); +- // store information about molecule +- m_moleculeFile->streamposRef().push_back(ifs.tellg()); +- m_moleculeFile->titlesRef().append(currentOBMol.GetTitle()); +- // increment count +- ++c; +- } +- m_moleculeFile->streamposRef().pop_back(); +- +- // signle molecule files are not conformer files +- if (c == 1) { +- m_moleculeFile->setConformerFile(false); +- m_moleculeFile->m_conformers.clear(); +- } +- +- // check for empty titles +- for (int i = 0; i < m_moleculeFile->titlesRef().size(); ++i) { +- if (!m_moleculeFile->titlesRef()[i].isEmpty()) +- continue; +- +- QString title; +- if (m_moleculeFile->isConformerFile()) +- title = tr("Conformer %1").arg(i+1); +- else +- title = tr("Molecule %1").arg(i+1); +- +- m_moleculeFile->titlesRef()[i] = title; +- } +- } +- +- MoleculeFile *m_moleculeFile; +- }; // end ReadFileThread class +- + MoleculeFile* MoleculeFile::readFile(const QString &fileName, + const QString &fileType, const QString &fileOptions, bool wait) + { +@@ -794,6 +627,3 @@ + } + + } // end namespace Avogadro +- +-#include "moleculefile.moc" +- +diff -U 3 -H -d -r -N -- avogadro-1.0.3/libavogadro/src/moleculefile_p.h avogadro-1.0.3-edit/libavogadro/src/moleculefile_p.h +--- avogadro-1.0.3/libavogadro/src/moleculefile_p.h 1970-01-01 01:00:00.000000000 +0100 ++++ avogadro-1.0.3-edit/libavogadro/src/moleculefile_p.h 2011-11-29 18:57:43.108273764 +0100 +@@ -0,0 +1,202 @@ ++/********************************************************************** ++ MoleculeFile - Class representing molecule file. ++ ++ Copyright (C) 2009 Marcus Hanwell, Tim Vandermeersch ++ ++ This file is part of the Avogadro molecular editor project. ++ For more information, see <http://avogadro.openmolecules.net/> ++ ++ Avogadro 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. ++ ++ Avogadro 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. See the ++ GNU General Public License for more details. ++ ++ You should have received a copy of the GNU General Public License ++ along with this program; if not, write to the Free Software ++ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA ++ 02110-1301, USA. ++ **********************************************************************/ ++ ++#ifndef MOLECULEFILE_P_H ++#define MOLECULEFILE_P_H ++ ++#include "moleculefile.h" ++ ++#include <openbabel/mol.h> ++#include <openbabel/obconversion.h> ++ ++#include <QFile> ++#include <QStringList> ++#include <QThread> ++ ++namespace Avogadro { ++ ++ using OpenBabel::OBConversion; ++ using std::ifstream; ++ ++class ReadFileThread : public QThread ++{ ++ Q_OBJECT ++ ++ public: ++ ReadFileThread(MoleculeFile *moleculeFile) : m_moleculeFile(moleculeFile) ++ { ++ } ++ ++ void addConformer(const OpenBabel::OBMol &conformer) ++ { ++ unsigned int numAtoms = conformer.NumAtoms(); ++ std::vector<Eigen::Vector3d> *coords = new std::vector<Eigen::Vector3d>(numAtoms); ++ for (unsigned int i = 0; i < numAtoms; ++i) ++ coords->push_back(Eigen::Vector3d(conformer.GetAtom(i+1)->GetVector().AsArray())); ++ m_moleculeFile->m_conformers.push_back(coords); ++ } ++ ++ void detectConformers(unsigned int c, const OpenBabel::OBMol &first, const OpenBabel::OBMol ¤t) ++ { ++ if (!c) { ++ // this is the first molecule read ++ m_moleculeFile->setConformerFile(true); ++ addConformer(current); ++ return; ++ } ++ ++ if (!m_moleculeFile->isConformerFile()) ++ return; ++ ++ // as long as we are not sure if this really is a ++ // conformer/trajectory file, add the conformers ++ addConformer(current); ++ ++ // performance: check only certain molecule 1-10,20,50 ++ switch (c) { ++ case 1: ++ case 2: ++ case 3: ++ case 4: ++ case 5: ++ case 6: ++ case 7: ++ case 8: ++ case 9: ++ case 10: ++ case 20: ++ case 50: ++ break; ++ default: ++ return; ++ } ++ ++ if (first.NumAtoms() != current.NumAtoms()) { ++ m_moleculeFile->setConformerFile(false); ++ m_moleculeFile->m_conformers.clear(); ++ return; ++ } ++ ++ for (unsigned int i = 0; i < first.NumAtoms(); ++i) { ++ OpenBabel::OBAtom *firstAtom = first.GetAtom(i+1); ++ OpenBabel::OBAtom *currentAtom = current.GetAtom(i+1); ++ if (firstAtom->GetAtomicNum() != currentAtom->GetAtomicNum()) { ++ m_moleculeFile->setConformerFile(false); ++ m_moleculeFile->m_conformers.clear(); ++ return; ++ } ++ } ++ } ++ ++ void run() ++ { ++ // Check that the file can be read from disk ++ if (!MoleculeFile::canOpen(m_moleculeFile->m_fileName, QFile::ReadOnly | QFile::Text)) { ++ // Cannot read the file ++ m_moleculeFile->m_error.append(QObject::tr("File %1 cannot be opened for reading.") ++ .arg(m_moleculeFile->m_fileName)); ++ return; ++ } ++ ++ // Construct the OpenBabel objects, set the file type ++ OpenBabel::OBConversion conv; ++ OpenBabel::OBFormat *inFormat; ++ if (!m_moleculeFile->m_fileType.isEmpty() && !conv.SetInFormat(m_moleculeFile->m_fileType.toAscii().data())) { ++ // Input format not supported ++ m_moleculeFile->m_error.append( ++ QObject::tr("File type '%1' is not supported for reading.").arg(m_moleculeFile->m_fileType)); ++ return; ++ } else { ++ inFormat = conv.FormatFromExt(m_moleculeFile->m_fileName.toAscii().data()); ++ if (!inFormat || !conv.SetInFormat(inFormat)) { ++ // Input format not supported ++ m_moleculeFile->m_error.append(QObject::tr("File type for file '%1' is not supported for reading.") ++ .arg(m_moleculeFile->m_fileName)); ++ return; ++ } ++ } ++ ++ // set any options ++ if (!m_moleculeFile->m_fileOptions.isEmpty()) { ++ foreach(const QString &option, ++ m_moleculeFile->m_fileOptions.split('\n', QString::SkipEmptyParts)) { ++ conv.AddOption(option.toAscii().data(), OBConversion::INOPTIONS); ++ } ++ } ++ ++ // Now attempt to read the molecule in ++ ifstream ifs; ++ ifs.open(m_moleculeFile->m_fileName.toLocal8Bit()); // This handles utf8 file names etc ++ if (!ifs) // Should not happen, already checked file could be opened ++ return; ++ ++ // read all molecules ++ OpenBabel::OBMol firstOBMol, currentOBMol; ++ unsigned int c = 0; ++ conv.SetInStream(&ifs); ++ m_moleculeFile->streamposRef().push_back(ifs.tellg()); ++ while (ifs.good() && conv.Read(¤tOBMol)) { ++ if (!c) ++ firstOBMol = currentOBMol; ++ ++ if (c > 20 && !m_moleculeFile->isConformerFile()) ++ m_moleculeFile->setFirstReady(true); ++ ++ // detect conformer/trajectory files ++ detectConformers(c, firstOBMol, currentOBMol); ++ // store information about molecule ++ m_moleculeFile->streamposRef().push_back(ifs.tellg()); ++ m_moleculeFile->titlesRef().append(currentOBMol.GetTitle()); ++ // increment count ++ ++c; ++ } ++ m_moleculeFile->streamposRef().pop_back(); ++ ++ // signle molecule files are not conformer files ++ if (c == 1) { ++ m_moleculeFile->setConformerFile(false); ++ m_moleculeFile->m_conformers.clear(); ++ } ++ ++ // check for empty titles ++ for (int i = 0; i < m_moleculeFile->titlesRef().size(); ++i) { ++ if (!m_moleculeFile->titlesRef()[i].isEmpty()) ++ continue; ++ ++ QString title; ++ if (m_moleculeFile->isConformerFile()) ++ title = tr("Conformer %1").arg(i+1); ++ else ++ title = tr("Molecule %1").arg(i+1); ++ ++ m_moleculeFile->titlesRef()[i] = title; ++ } ++ } ++ ++ MoleculeFile *m_moleculeFile; ++}; ++ ++} // end namespace Avogadro ++ ++#endif // MOLECULEFILE_P_H +diff -U 3 -H -d -r -N -- avogadro-1.0.3/libavogadro/src/periodictablescene_p.cpp avogadro-1.0.3-edit/libavogadro/src/periodictablescene_p.cpp +--- avogadro-1.0.3/libavogadro/src/periodictablescene_p.cpp 2011-04-25 07:22:18.000000000 +0200 ++++ avogadro-1.0.3-edit/libavogadro/src/periodictablescene_p.cpp 2011-11-29 18:52:50.259860261 +0100 +@@ -213,5 +213,3 @@ + } + + } // End namespace Avogadro +- +-#include "periodictablescene_p.moc" +diff -U 3 -H -d -r -N -- avogadro-1.0.3/libavogadro/src/periodictableview.cpp avogadro-1.0.3-edit/libavogadro/src/periodictableview.cpp +--- avogadro-1.0.3/libavogadro/src/periodictableview.cpp 2011-11-29 19:30:25.130970122 +0000 ++++ avogadro-1.0.3-edit/libavogadro/src/periodictableview.cpp 2011-11-29 18:52:50.259860261 +0100 +@@ -69,4 +69,3 @@ + + } // End namespace Avogadro + +-#include "periodictableview.moc" +diff -U 3 -H -d -r -N -- avogadro-1.0.3/libavogadro/src/plotwidget.cpp avogadro-1.0.3-edit/libavogadro/src/plotwidget.cpp +--- avogadro-1.0.3/libavogadro/src/plotwidget.cpp 2011-04-25 07:22:18.000000000 +0200 ++++ avogadro-1.0.3-edit/libavogadro/src/plotwidget.cpp 2011-11-29 18:53:09.389756626 +0100 +@@ -27,7 +27,6 @@ + **********************************************************************/ + + #include "plotwidget.h" +-#include "plotwidget.moc" + + #include <math.h> + #include <QDebug> +diff -U 3 -H -d -r -N -- avogadro-1.0.3/libavogadro/src/plugin.cpp avogadro-1.0.3-edit/libavogadro/src/plugin.cpp +--- avogadro-1.0.3/libavogadro/src/plugin.cpp 2011-04-25 07:22:18.000000000 +0200 ++++ avogadro-1.0.3-edit/libavogadro/src/plugin.cpp 2011-11-29 18:53:16.016387394 +0100 +@@ -65,5 +65,3 @@ + } + + } // end namespace Avogadro +- +-#include "plugin.moc" +diff -U 3 -H -d -r -N -- avogadro-1.0.3/libavogadro/src/pluginmanager.cpp avogadro-1.0.3-edit/libavogadro/src/pluginmanager.cpp +--- avogadro-1.0.3/libavogadro/src/pluginmanager.cpp 2011-04-25 07:22:18.000000000 +0200 ++++ avogadro-1.0.3-edit/libavogadro/src/pluginmanager.cpp 2011-11-29 18:53:23.569679807 +0100 +@@ -784,5 +784,3 @@ + } + + } +- +-#include "pluginmanager.moc" +diff -U 3 -H -d -r -N -- avogadro-1.0.3/libavogadro/src/primitive.cpp avogadro-1.0.3-edit/libavogadro/src/primitive.cpp +--- avogadro-1.0.3/libavogadro/src/primitive.cpp 2011-04-25 07:22:18.000000000 +0200 ++++ avogadro-1.0.3-edit/libavogadro/src/primitive.cpp 2011-11-29 18:53:29.139649631 +0100 +@@ -77,5 +77,3 @@ + } + + } +- +-#include "primitive.moc" +diff -U 3 -H -d -r -N -- avogadro-1.0.3/libavogadro/src/protein.cpp avogadro-1.0.3-edit/libavogadro/src/protein.cpp +--- avogadro-1.0.3/libavogadro/src/protein.cpp 2011-04-25 07:22:18.000000000 +0200 ++++ avogadro-1.0.3-edit/libavogadro/src/protein.cpp 2011-11-29 18:53:37.952935219 +0100 +@@ -978,5 +978,3 @@ + } + + } // End namespace Avogadro +- +-#include "protein.moc" +diff -U 3 -H -d -r -N -- avogadro-1.0.3/libavogadro/src/python/CMakeLists.txt avogadro-1.0.3-edit/libavogadro/src/python/CMakeLists.txt +--- avogadro-1.0.3/libavogadro/src/python/CMakeLists.txt 2011-04-25 07:22:18.000000000 +0200 ++++ avogadro-1.0.3-edit/libavogadro/src/python/CMakeLists.txt 2011-11-29 18:58:02.354836165 +0100 +@@ -11,9 +11,9 @@ + # use all cpp files in this directory + FILE(GLOB wrapper_SRCS "*.cpp") + +-qt4_automoc(moleculelist.cpp) ++QT4_WRAP_CPP(MOC_SRCS moleculelist.h) + +-ADD_LIBRARY(python-module MODULE ${wrapper_SRCS}) ++ADD_LIBRARY(python-module MODULE ${wrapper_SRCS} ${MOC_SRCS}) + SET_TARGET_PROPERTIES(python-module PROPERTIES OUTPUT_NAME Avogadro) + SET_TARGET_PROPERTIES(python-module PROPERTIES PREFIX "") + if (WIN32) +diff -U 3 -H -d -r -N -- avogadro-1.0.3/libavogadro/src/python/moleculelist.cpp avogadro-1.0.3-edit/libavogadro/src/python/moleculelist.cpp +--- avogadro-1.0.3/libavogadro/src/python/moleculelist.cpp 2011-11-29 19:26:07.562214311 +0100 ++++ avogadro-1.0.3-edit/libavogadro/src/python/moleculelist.cpp 2011-11-29 19:26:14.538843182 +0100 +@@ -70,4 +70,3 @@ + + } + +-#include "moleculelist.moc" +diff -U 3 -H -d -r -N -- avogadro-1.0.3/libavogadro/src/pythonengine_p.cpp avogadro-1.0.3-edit/libavogadro/src/pythonengine_p.cpp +--- avogadro-1.0.3/libavogadro/src/pythonengine_p.cpp 2011-04-25 07:22:18.000000000 +0200 ++++ avogadro-1.0.3-edit/libavogadro/src/pythonengine_p.cpp 2011-11-29 18:53:45.492894371 +0100 +@@ -289,5 +289,3 @@ + + + } +- +-#include "pythonengine_p.moc" +diff -U 3 -H -d -r -N -- avogadro-1.0.3/libavogadro/src/pythonerror.cpp avogadro-1.0.3-edit/libavogadro/src/pythonerror.cpp +--- avogadro-1.0.3/libavogadro/src/pythonerror.cpp 2011-11-29 19:24:26.949426045 +0100 ++++ avogadro-1.0.3-edit/libavogadro/src/pythonerror.cpp 2011-11-29 19:24:41.176015640 +0100 +@@ -112,4 +112,3 @@ + + } // namespace + +-#include "pythonerror.moc" + +diff -U 3 -H -d -r -N -- avogadro-1.0.3/libavogadro/src/pythonextension_p.cpp avogadro-1.0.3-edit/libavogadro/src/pythonextension_p.cpp +--- avogadro-1.0.3/libavogadro/src/pythonextension_p.cpp 2011-04-25 07:22:18.000000000 +0200 ++++ avogadro-1.0.3-edit/libavogadro/src/pythonextension_p.cpp 2011-11-29 18:53:54.082847836 +0100 +@@ -340,5 +340,3 @@ + } + + } +- +-#include "pythonextension_p.moc" +diff -U 3 -H -d -r -N -- avogadro-1.0.3/libavogadro/src/pythontool_p.cpp avogadro-1.0.3-edit/libavogadro/src/pythontool_p.cpp +--- avogadro-1.0.3/libavogadro/src/pythontool_p.cpp 2011-04-25 07:22:18.000000000 +0200 ++++ avogadro-1.0.3-edit/libavogadro/src/pythontool_p.cpp 2011-11-29 18:54:02.269470152 +0100 +@@ -344,5 +344,3 @@ + } + + } +- +-#include "pythontool_p.moc" +diff -U 3 -H -d -r -N -- avogadro-1.0.3/libavogadro/src/residue.cpp avogadro-1.0.3-edit/libavogadro/src/residue.cpp +--- avogadro-1.0.3/libavogadro/src/residue.cpp 2011-04-25 07:22:18.000000000 +0200 ++++ avogadro-1.0.3-edit/libavogadro/src/residue.cpp 2011-11-29 18:54:14.316071557 +0100 +@@ -160,6 +160,3 @@ + } + + } // End namespace Avogadro +- +- #include "residue.moc" +- +diff -U 3 -H -d -r -N -- avogadro-1.0.3/libavogadro/src/tool.cpp avogadro-1.0.3-edit/libavogadro/src/tool.cpp +--- avogadro-1.0.3/libavogadro/src/tool.cpp 2011-04-25 07:22:18.000000000 +0200 ++++ avogadro-1.0.3-edit/libavogadro/src/tool.cpp 2011-11-29 18:55:05.515794184 +0100 +@@ -117,5 +117,3 @@ + } + + } // end namespace Avogadro +- +-#include "tool.moc" +diff -U 3 -H -d -r -N -- avogadro-1.0.3/libavogadro/src/toolgroup.cpp avogadro-1.0.3-edit/libavogadro/src/toolgroup.cpp +--- avogadro-1.0.3/libavogadro/src/toolgroup.cpp 2011-04-25 07:22:18.000000000 +0200 ++++ avogadro-1.0.3-edit/libavogadro/src/toolgroup.cpp 2011-11-29 18:55:11.699094018 +0100 +@@ -206,5 +206,3 @@ + } + + } // end namespace Avogadro +- +-#include "toolgroup.moc" +diff -U 3 -H -d -r -N -- avogadro-1.0.3/libavogadro/src/zmatrix.cpp avogadro-1.0.3-edit/libavogadro/src/zmatrix.cpp +--- avogadro-1.0.3/libavogadro/src/zmatrix.cpp 2011-04-25 07:22:18.000000000 +0200 ++++ avogadro-1.0.3-edit/libavogadro/src/zmatrix.cpp 2011-11-29 18:55:17.209064168 +0100 +@@ -149,5 +149,3 @@ + + + } // End namespace Avogadro +- +-#include "zmatrix.moc" diff --git a/staging/ekiga/PKGBUILD b/staging/ekiga/PKGBUILD index d337f8f49..9ec154322 100644 --- a/staging/ekiga/PKGBUILD +++ b/staging/ekiga/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 161384 2012-06-10 16:19:42Z jgc $ +# $Id: PKGBUILD 163123 2012-07-07 16:03:55Z ibiru $ # Maintainer: Jan de Groot <jgc@archlinux.org> # Contributor: Tom K <tomk@runbox.com> pkgname=ekiga pkgver=3.3.2 -pkgrel=5 +pkgrel=6 pkgdesc="VOIP/Videoconferencing app with full SIP and H.323 support (GnomeMeeting expanded and renamed)" url="http://www.ekiga.org" license=(GPL) diff --git a/staging/kdeedu-kig/PKGBUILD b/staging/kdeedu-kig/PKGBUILD index 8f5e97622..25cb8dbe1 100644 --- a/staging/kdeedu-kig/PKGBUILD +++ b/staging/kdeedu-kig/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 161020 2012-06-07 20:44:47Z andrea $ +# $Id: PKGBUILD 163120 2012-07-07 15:50:46Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdeedu-kig pkgver=4.8.4 -pkgrel=1 +pkgrel=2 pkgdesc="Interactive Geometry" url="http://kde.org/applications/education/kig/" arch=('i686' 'x86_64') diff --git a/staging/kdeedu-rocs/PKGBUILD b/staging/kdeedu-rocs/PKGBUILD index 05380515e..2d3dd044a 100644 --- a/staging/kdeedu-rocs/PKGBUILD +++ b/staging/kdeedu-rocs/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 161029 2012-06-07 20:49:35Z andrea $ +# $Id: PKGBUILD 163122 2012-07-07 16:00:36Z andrea $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> pkgname=kdeedu-rocs pkgver=4.8.4 -pkgrel=1 +pkgrel=2 pkgdesc="Rocs Graph Theory" url="http://kde.org/applications/education/rocs/" arch=('i686' 'x86_64') diff --git a/testing/glibc/PKGBUILD b/testing/glibc/PKGBUILD index a8f025ac5..b00f3039a 100644 --- a/testing/glibc/PKGBUILD +++ b/testing/glibc/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 162943 2012-07-04 01:13:22Z allan $ +# $Id: PKGBUILD 163115 2012-07-07 11:31:50Z allan $ # Maintainer: Allan McRae <allan@archlinux.org> # toolchain build order: linux-api-headers->glibc->binutils->gcc->binutils->glibc @@ -6,7 +6,7 @@ pkgname=glibc pkgver=2.16.0 -pkgrel=1 +pkgrel=2 pkgdesc="GNU C Library" arch=('i686' 'x86_64') url="http://www.gnu.org/software/libc" @@ -96,6 +96,8 @@ check() { package() { cd ${srcdir}/glibc-build + ln -s usr/lib ${pkgdir}/lib + install -dm755 ${pkgdir}/etc touch ${pkgdir}/etc/ld.so.conf @@ -123,7 +125,7 @@ package() { if [[ ${CARCH} = "x86_64" ]]; then # fix paths and compliance with binary blobs... sed -i '/RTLDLIST/s%lib64%lib%' ${pkgdir}/usr/bin/ldd - ln -s /lib ${pkgdir}/lib64 + ln -s usr/lib ${pkgdir}/lib64 fi # Do not strip the following files for improved debugging support @@ -143,9 +145,9 @@ package() { strip $STRIP_STATIC usr/lib/*.a - strip $STRIP_SHARED lib/{libanl,libBrokenLocale,libcidn,libcrypt}-*.so \ - lib/libnss_{compat,db,dns,files,hesiod,nis,nisplus}-*.so \ - lib/{libdl,libm,libnsl,libresolv,librt,libutil}-*.so \ - lib/{libmemusage,libpcprofile,libSegFault}.so \ + strip $STRIP_SHARED usr/lib/{libanl,libBrokenLocale,libcidn,libcrypt}-*.so \ + usr/lib/libnss_{compat,db,dns,files,hesiod,nis,nisplus}-*.so \ + usr/lib/{libdl,libm,libnsl,libresolv,librt,libutil}-*.so \ + usr/lib/{libmemusage,libpcprofile,libSegFault}.so \ usr/lib/{pt_chown,{audit,gconv}/*.so} } diff --git a/testing/opencv/PKGBUILD b/testing/opencv/PKGBUILD new file mode 100644 index 000000000..308df61c3 --- /dev/null +++ b/testing/opencv/PKGBUILD @@ -0,0 +1,118 @@ +# $Id: PKGBUILD 163133 2012-07-07 20:34:06Z schiv $ +# Maintainer: Ray Rashif <schiv@archlinux.org> +# Contributor: Tobias Powalowski <tpowa@archlinux.org> + +pkgbase=opencv +pkgname=('opencv' 'opencv-docs' 'opencv-samples') +_realname=OpenCV +pkgver=2.4.2 +pkgrel=2 +pkgdesc="Open Source Computer Vision Library" +arch=('i686' 'x86_64') +license=('BSD') +url="http://opencv.org/" +depends=('jasper' 'gstreamer0.10-base' 'openexr' + 'gtk2' 'xine-lib' 'libdc1394' 'v4l-utils') +makedepends=('pkg-config' 'cmake' 'python2-numpy' 'eigen2') +optdepends=('opencv-docs' + 'opencv-samples' + 'eigen2' + 'python2-numpy: Python 2.x interface') +options=('!libtool') +source=("http://downloads.sourceforge.net/opencvlibrary/$_realname-${pkgver}.tar.bz2") +md5sums=('059ef86fc1724d69b75832a0d2929ff5') + +_cmakeopts=('-D CMAKE_BUILD_TYPE=Release' + '-D CMAKE_INSTALL_PREFIX=/usr' + '-D CMAKE_SKIP_RPATH=ON' + '-D BUILD_TESTS=OFF' + '-D ENABLE_SSE=ON' + '-D ENABLE_SSE2=ON' + '-D ENABLE_SSE3=OFF' + '-D ENABLE_SSSE3=OFF' + '-D ENABLE_SSE41=OFF' + '-D ENABLE_SSE42=OFF' + '-D BUILD_EXAMPLES=ON' + '-D INSTALL_C_EXAMPLES=ON' + '-D INSTALL_PYTHON_EXAMPLES=ON' + '-D WITH_XINE=ON' + '-D WITH_QT=OFF' + '-D WITH_QT_OPENGL=OFF' + '-D WITH_UNICAP=OFF' + '-D WITH_PVAPI=OFF' + '-D WITH_OPENNI=OFF' + '-D WITH_TBB=OFF' + '-D WITH_IPP=OFF' + '-D WITH_CUDA=OFF' + '-D USE_FAST_MATH=ON') + +build() { + cd "$srcdir/$_realname-$pkgver" + + # x64, i.e "Athlon64" and upwards, can use SSE3 + [ $CARCH = x86_64 ] && \ + _cmakeopts=${_cmakeopts[@]/ENABLE_SSE3=OFF/ENABLE_SSE3=ON} + + cmake ${_cmakeopts[@]} . + + make +} + +package_opencv() { + cd "$srcdir/$_realname-$pkgver" + + make DESTDIR="$pkgdir" install + + # install license file + install -Dm644 "$srcdir/$_realname-$pkgver/doc/license.txt" \ + "$pkgdir/usr/share/licenses/$pkgname/LICENSE" + + cd "$pkgdir/usr/share" + + # prepare FSH-friendly dirs + #if [ -d OpenCV ]; then + # mv opencv/samples OpenCV/ + # rm -r opencv + # mv OpenCV opencv + #fi + + # separate docs package; also be -R friendly + [ -d $_realname/doc ] && mv $_realname/doc "$srcdir/opencv-doc" + + # separate samples package + [ -d $_realname/samples ] && mv $_realname/samples "$srcdir/opencv-samples" +} + +package_opencv-docs() { + pkgdesc+=" (documentation)" + unset depends + unset optdepends + options=('docs') + + cd "$srcdir" + + mkdir -p "$pkgdir/usr/share/doc" + cp -r opencv-doc "$pkgdir/usr/share/doc/$_realname" + + # install license file + install -Dm644 "$srcdir/$_realname-$pkgver/doc/license.txt" \ + "$pkgdir/usr/share/licenses/$pkgname/LICENSE" +} + +package_opencv-samples() { + pkgdesc+=" (samples)" + depends=('bash') + unset optdepends + unset options + + cd "$srcdir" + + mkdir -p "$pkgdir/usr/share/$_realname" + cp -r opencv-samples "$pkgdir/usr/share/$_realname/samples" + + # install license file + install -Dm644 "$srcdir/$_realname-$pkgver/doc/license.txt" \ + "$pkgdir/usr/share/licenses/$pkgname/LICENSE" +} + +# vim:set ts=2 sw=2 et: |