summaryrefslogtreecommitdiff
path: root/staging
diff options
context:
space:
mode:
Diffstat (limited to 'staging')
-rw-r--r--staging/akonadi/PKGBUILD32
-rw-r--r--staging/akonadi/akonadi.install11
-rw-r--r--staging/avogadro/PKGBUILD45
-rw-r--r--staging/avogadro/avogadro.install11
-rw-r--r--staging/avogadro/fix-boost.patch33
-rw-r--r--staging/avogadro/fix-opengl-headers.patch53
-rw-r--r--staging/avogadro/replace-qt4_automoc-with-qt4_wrap_cpp.patch778
-rw-r--r--staging/binutils/PKGBUILD95
-rw-r--r--staging/binutils/binutils.install17
-rw-r--r--staging/boost/PKGBUILD113
-rw-r--r--staging/gcc/PKGBUILD277
-rw-r--r--staging/gcc/gcc-4.7.0-cloog-0.17.patch24
-rw-r--r--staging/gcc/gcc-4.7.1-libada-pic.patch12
-rw-r--r--staging/gcc/gcc-4.7.1-libgo-mksysinfo.patch15
-rw-r--r--staging/gcc/gcc-4.7.1-libgo-write.patch13
-rw-r--r--staging/gcc/gcc-ada.install20
-rw-r--r--staging/gcc/gcc-fortran.install16
-rw-r--r--staging/gcc/gcc-go.install20
-rw-r--r--staging/gcc/gcc-libs.install16
-rw-r--r--staging/gcc/gcc.install20
-rw-r--r--staging/gcc/gcc_pure64.patch26
-rw-r--r--staging/hugin/PKGBUILD39
-rw-r--r--staging/hugin/gcc47.patch11
-rw-r--r--staging/hugin/hugin.install15
-rw-r--r--staging/libpst/PKGBUILD40
-rw-r--r--staging/libtorrent-rasterbar/PKGBUILD31
-rw-r--r--staging/licq/PKGBUILD40
-rw-r--r--staging/lyx/PKGBUILD50
-rw-r--r--staging/lyx/lyx.desktop14
-rw-r--r--staging/lyx/lyx.install14
-rw-r--r--staging/lyx/lyxrc.dist14
-rw-r--r--staging/mkvtoolnix/PKGBUILD84
-rw-r--r--staging/mkvtoolnix/mkvtoolnix.install14
-rw-r--r--staging/ppl/PKGBUILD33
-rw-r--r--staging/source-highlight/PKGBUILD32
-rw-r--r--staging/source-highlight/source-highlight.install18
36 files changed, 0 insertions, 2096 deletions
diff --git a/staging/akonadi/PKGBUILD b/staging/akonadi/PKGBUILD
deleted file mode 100644
index 26571d1a8..000000000
--- a/staging/akonadi/PKGBUILD
+++ /dev/null
@@ -1,32 +0,0 @@
-# $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
deleted file mode 100644
index 7c8a8bd2b..000000000
--- a/staging/akonadi/akonadi.install
+++ /dev/null
@@ -1,11 +0,0 @@
-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
deleted file mode 100644
index cf03f9277..000000000
--- a/staging/avogadro/PKGBUILD
+++ /dev/null
@@ -1,45 +0,0 @@
-# $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
deleted file mode 100644
index 2eaa60550..000000000
--- a/staging/avogadro/avogadro.install
+++ /dev/null
@@ -1,11 +0,0 @@
-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
deleted file mode 100644
index 8fb53ef12..000000000
--- a/staging/avogadro/fix-boost.patch
+++ /dev/null
@@ -1,33 +0,0 @@
---- 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
deleted file mode 100644
index e6e8bc3b5..000000000
--- a/staging/avogadro/fix-opengl-headers.patch
+++ /dev/null
@@ -1,53 +0,0 @@
---- 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
deleted file mode 100644
index 11f58a505..000000000
--- a/staging/avogadro/replace-qt4_automoc-with-qt4_wrap_cpp.patch
+++ /dev/null
@@ -1,778 +0,0 @@
-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 &current)
-- {
-- 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(&currentOBMol)) {
-- 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 &current)
-+ {
-+ 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(&currentOBMol)) {
-+ 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/binutils/PKGBUILD b/staging/binutils/PKGBUILD
deleted file mode 100644
index 067cf289f..000000000
--- a/staging/binutils/PKGBUILD
+++ /dev/null
@@ -1,95 +0,0 @@
-# $Id: PKGBUILD 162862 2012-07-02 13:30:53Z allan $
-# Maintainer: Allan McRae <allan@archlinux.org>
-
-# toolchain build order: linux-api-headers->glibc->binutils->gcc->binutils->glibc
-
-pkgname=binutils
-pkgver=2.22
-pkgrel=8
-_date=20120323
-pkgdesc="A set of programs to assemble and manipulate binary and object files"
-arch=('i686' 'x86_64')
-url="http://www.gnu.org/software/binutils/"
-license=('GPL')
-groups=('base-devel')
-depends=('glibc>=2.16' 'zlib')
-checkdepends=('dejagnu')
-options=('!libtool' '!distcc' '!ccache')
-install=binutils.install
-source=(ftp://ftp.archlinux.org/other/${pkgname}/${pkgname}-${pkgver}_${_date}.tar.bz2)
-md5sums=('de2ac4298732827f8af706fc24020330')
-
-mksource() {
- mkdir ${pkgname}-${_date}
- cd ${pkgname}-${_date}
- export _TAG=binutils-2_22-branch
- export 'CVSROOT=:pserver:anoncvs@sourceware.org:/cvs/src'
- cvs -z9 co -r $_TAG binutils || return 1
- mv src binutils
- tar -cvjf ../binutils-${pkgver}_${_date}.tar.bz2 binutils/*
-}
-
-build() {
- cd ${srcdir}
- mkdir binutils-build && cd binutils-build
-
- [[ $CARCH == "x86_64" ]] && CONFIGFLAG="--enable-64-bit-bfd --disable-multilib"
-
- ${srcdir}/binutils/configure --prefix=/usr \
- --enable-ld=default --enable-gold \
- --enable-plugins --enable-threads \
- --enable-shared $CONFIGFLAG
-
- # check the host environment and makes sure all the necessary tools are available
- make configure-host
-
- make tooldir=${pkgdir}/usr
-
- # Rebuild libiberty.a with -fPIC
- cp -a libiberty libiberty-pic
- make -C libiberty-pic clean
- make CFLAGS="$CFLAGS -fPIC" -C libiberty-pic
-
- # Rebuild libbfd.a with -fPIC
- # hidden visability prevent 3rd party shared libraries exporting bfd non-stable API
- cp -a bfd bfd-pic
- make -C bfd-pic clean
- make CFLAGS="$CFLAGS -fPIC -fvisibility=hidden" -C bfd-pic
-
- # Rebuild libopcodes.a with -fPIC
- cp -a opcodes opcodes-pic
- make -C opcodes-pic clean
- make CFLAGS="$CFLAGS -fPIC" -C opcodes-pic
-}
-
-check() {
- cd ${srcdir}/binutils-build
-
- # do not abort on errors - manually check log files
- # gold testsuite does not build with _FORTIFY_SOURCE (due to -O0 -Werror)
- make CFLAGS="${CFLAGS/-D_FORTIFY_SOURCE=2/}" \
- CXXFLAGS="${CXXFLAGS/-D_FORTIFY_SOURCE=2/}" -k check || true
-}
-
-package() {
- cd ${srcdir}/binutils-build
- make prefix=${pkgdir}/usr tooldir=${pkgdir}/usr install
-
- # Add some useful headers
- install -m644 ${srcdir}/binutils/include/libiberty.h ${pkgdir}/usr/include
- install -m644 ${srcdir}/binutils/include/demangle.h ${pkgdir}/usr/include
-
- # install libraries rebuilt with -fPIC
- install -m644 libiberty-pic/libiberty.a ${pkgdir}/usr/lib
- install -m644 bfd-pic/libbfd.a ${pkgdir}/usr/lib
- install -m644 opcodes/libopcodes.a ${pkgdir}/usr/lib
-
- # Remove Windows/Novell specific man pages
- rm -f ${pkgdir}/usr/share/man/man1/{dlltool,nlmconv,windres,windmc}*
-
- # Remove these symlinks, they are not ABI stable.
- # Programs should compile static to the .a file.
- rm -f ${pkgdir}/usr/lib/lib{bfd,opcodes}.so
- echo "INPUT ( /usr/lib/libbfd.a -liberty -lz )" >${pkgdir}/usr/lib/libbfd.so
- echo "INPUT ( /usr/lib/libopcodes.a -lbfd )" >${pkgdir}/usr/lib/libopcodes.so
-}
diff --git a/staging/binutils/binutils.install b/staging/binutils/binutils.install
deleted file mode 100644
index 8bf9f3a47..000000000
--- a/staging/binutils/binutils.install
+++ /dev/null
@@ -1,17 +0,0 @@
-infodir=usr/share/info
-filelist=(as.info bfd.info binutils.info configure.info gprof.info ld.info standards.info)
-
-post_upgrade() {
- [ -x usr/bin/install-info ] || return 0
- for file in ${filelist[@]}; do
- install-info $infodir/$file.gz $infodir/dir 2> /dev/null
- done
-}
-
-pre_remove() {
- [ -x usr/bin/install-info ] || return 0
- for file in ${filelist[@]}; do
- install-info --delete $infodir/$file.gz $infodir/dir 2> /dev/null
- done
-}
-
diff --git a/staging/boost/PKGBUILD b/staging/boost/PKGBUILD
deleted file mode 100644
index 0b6dc502c..000000000
--- a/staging/boost/PKGBUILD
+++ /dev/null
@@ -1,113 +0,0 @@
-# $Id: PKGBUILD 163072 2012-07-06 15:51:12Z ibiru $
-# Maintainer: kevin <kevin@archlinux.org>
-# Contributor: Giovanni Scafora <giovanni@archlinux.org>
-# Contributor: Kritoke <kritoke@gamebox.net>
-# Contributor: Luca Roccia <little_rock@users.sourceforge.net>
-
-pkgbase=boost
-pkgname=('boost-libs' 'boost')
-pkgver=1.50.0
-_boostver=${pkgver//./_}
-pkgrel=1
-arch=('i686' 'x86_64')
-url="http://www.boost.org/"
-makedepends=('icu' 'python' 'python2' 'bzip2' 'zlib' 'openmpi')
-source=(http://downloads.sourceforge.net/${pkgbase}/${pkgbase}_${_boostver}.tar.gz)
-license=('custom')
-md5sums=('dbc07ab0254df3dda6300fd737b3f264')
-
-_stagedir="${srcdir}/stagedir"
-
-build() {
- # set python path for bjam
- cd "${srcdir}/${pkgbase}_${_boostver}/tools"
- echo "using python : 2.7 : /usr/bin/python2 ;" >> build/v2/user-config.jam
- echo "using python : 3.2 : /usr/bin/python : /usr/include/python3.2mu : /usr/lib ;" >> build/v2/user-config.jam
- echo "using mpi ;" >> build/v2/user-config.jam
-
- cd "${srcdir}"/${pkgbase}_${_boostver}
-
- # build bjam
- cd "${srcdir}/${pkgbase}_${_boostver}/tools/build/v2/engine"
- ./build.sh cc
-
- _bindir="bin.linuxx86"
- [ "${CARCH}" = "x86_64" ] && _bindir="bin.linuxx86_64"
-
- install -d "${_stagedir}"/usr/bin
- install ${_bindir}/bjam "${_stagedir}"/usr/bin/bjam
-
- # build tools
- cd "${srcdir}/${pkgbase}_${_boostver}/tools/"
- "${_stagedir}"/usr/bin/bjam --toolset=gcc
-
- # copy the tools
- cd "${srcdir}/${pkgbase}_${_boostver}/dist/bin"
- for i in *;do
- install -m755 "${i}" "${_stagedir}/usr/bin/${i}"
- done
-
- #boostbook needed by quickbook
- cd "${srcdir}/${pkgbase}_${_boostver}/dist/"
- cp -r share "${_stagedir}"
-
- # build libs
- cd "${srcdir}/${pkgbase}_${_boostver}"
-
- # default "minimal" install: "release link=shared,static
- # runtime-link=shared threading=single,multi"
- # --layout=tagged will add the "-mt" suffix for multithreaded libraries
- # and installs includes in /usr/include/boost.
- # --layout=system no longer adds the -mt suffix for multi-threaded libs.
- # install to ${_stagedir} in preparation for split packaging
-
- "${_stagedir}"/usr/bin/bjam \
- release debug-symbols=off threading=multi \
- runtime-link=shared link=shared,static \
- cflags=-fno-strict-aliasing \
- toolset=gcc \
- --prefix="${_stagedir}" \
- -sTOOLS=gcc \
- --layout=system \
- ${MAKEFLAGS} \
- install
-}
-
-package_boost() {
- pkgdesc="Free peer-reviewed portable C++ source libraries - Development"
- depends=("boost-libs=${pkgver}")
- optdepends=('python: for python bindings'
- 'python2: for python2 bindings'
- 'boost-build: to use boost jam for building your project.')
-
- install -d "${pkgdir}"/usr/{include,lib,share}
- # headers/source files
- cp -r "${_stagedir}"/include/ "${pkgdir}"/usr/
-
- # static libs
- cp -r "${_stagedir}"/lib/*.a "${pkgdir}"/usr/lib/
-
- # utilities (bjam, bcp, pyste)
- cp -r "${_stagedir}"/usr/* "${pkgdir}"/usr/
-
- #boostbook
- cp -r "${_stagedir}"/share/* "${pkgdir}"/usr/share
-
- # license
- install -D -m644 "${srcdir}/${pkgbase}_${_boostver}/LICENSE_1_0.txt" \
- "${pkgdir}"/usr/share/licenses/boost/LICENSE_1_0.txt
-}
-
-package_boost-libs() {
- pkgdesc="Free peer-reviewed portable C++ source libraries - Runtime"
- depends=('gcc-libs' 'bzip2' 'zlib' 'icu')
- optdepends=('openmpi: for mpi support')
-
- install -d "${pkgdir}/usr/lib"
- #shared libs
- cp -r "${_stagedir}"/lib/*.so{,.*} "${pkgdir}/usr/lib/"
-
- # license
- install -D -m644 "${srcdir}/${pkgbase}_${_boostver}/LICENSE_1_0.txt" \
- "${pkgdir}"/usr/share/licenses/boost-libs/LICENSE_1_0.txt
-}
diff --git a/staging/gcc/PKGBUILD b/staging/gcc/PKGBUILD
deleted file mode 100644
index 4c3dfc6f4..000000000
--- a/staging/gcc/PKGBUILD
+++ /dev/null
@@ -1,277 +0,0 @@
-# $Id: PKGBUILD 162860 2012-07-02 13:12:42Z allan $
-# Maintainer: Allan McRae <allan@archlinux.org>
-
-# toolchain build order: linux-api-headers->glibc->binutils->gcc->binutils->glibc
-# NOTE: libtool requires rebuilt with each new gcc version
-
-pkgname=('gcc' 'gcc-libs' 'gcc-fortran' 'gcc-objc' 'gcc-ada' 'gcc-go')
-pkgver=4.7.1
-pkgrel=4
-#_snapshot=4.7-20120505
-_libstdcppmanver=20120605 # Note: check source directory name when updating this
-pkgdesc="The GNU Compiler Collection"
-arch=('i686' 'x86_64')
-license=('GPL' 'LGPL' 'FDL' 'custom')
-url="http://gcc.gnu.org"
-makedepends=('binutils>=2.22' 'libmpc' 'cloog' 'ppl' 'gcc-ada')
-checkdepends=('dejagnu')
-options=('!libtool' '!emptydirs')
-source=(ftp://gcc.gnu.org/pub/gcc/releases/gcc-${pkgver}/gcc-${pkgver}.tar.bz2
- #ftp://gcc.gnu.org/pub/gcc/snapshots/${_snapshot}/gcc-${_snapshot}.tar.bz2
- ftp://gcc.gnu.org/pub/gcc/libstdc++/doxygen/libstdc++-api.${_libstdcppmanver}.man.tar.bz2
- gcc_pure64.patch
- gcc-4.7.1-libada-pic.patch
- gcc-4.7.1-libgo-write.patch
- gcc-4.7.1-libgo-mksysinfo.patch)
-md5sums=('933e6f15f51c031060af64a9e14149ff'
- '767c62f9a047c4434f2345decf1d0819'
- 'ced48436c1b3c981d721a829f1094de1'
- '2acbc9d35cc9d72329dc71d6b1f162ef'
- 'df82dd175ac566c8a6d46b11ac21f14c'
- '8e847244dba042d0aa3297713edaf70c')
-
-
-if [ -n "${_snapshot}" ]; then
- _basedir="${srcdir}/gcc-${_snapshot}"
-else
- _basedir="${srcdir}/gcc-${pkgver}"
-fi
-
-build() {
- cd ${_basedir}
-
- # Do not install libiberty
- sed -i 's/install_to_$(INSTALL_DEST) //' libiberty/Makefile.in
-
- # Do not run fixincludes
- sed -i 's@\./fixinc\.sh@-c true@' gcc/Makefile.in
-
- if [ "${CARCH}" = "x86_64" ]; then
- patch -p1 -i ${srcdir}/gcc_pure64.patch
- fi
-
- # http://gcc.gnu.org/bugzilla/show_bug.cgi?id=53679
- patch -p1 -i ${srcdir}/gcc-4.7.1-libgo-write.patch
-
- # bug to file...
- patch -p1 -i ${srcdir}/gcc-4.7.1-libada-pic.patch
-
- # http://gcc.gnu.org/ml/gcc-patches/2012-06/msg01946.html
- patch -p0 -i ${srcdir}/gcc-4.7.1-libgo-mksysinfo.patch
-
- echo ${pkgver} > gcc/BASE-VER
-
- cd ${srcdir}
- mkdir gcc-build && cd gcc-build
-
- ${_basedir}/configure --prefix=/usr \
- --libdir=/usr/lib --libexecdir=/usr/lib \
- --mandir=/usr/share/man --infodir=/usr/share/info \
- --with-bugurl=https://bugs.archlinux.org/ \
- --enable-languages=c,c++,ada,fortran,go,lto,objc,obj-c++ \
- --enable-shared --enable-threads=posix \
- --with-system-zlib --enable-__cxa_atexit \
- --disable-libunwind-exceptions --enable-clocale=gnu \
- --disable-libstdcxx-pch --enable-libstdcxx-time \
- --enable-gnu-unique-object --enable-linker-build-id \
- --with-ppl --enable-cloog-backend=isl \
- --disable-ppl-version-check --disable-cloog-version-check \
- --enable-lto --enable-gold --enable-ld=default \
- --enable-plugin --with-plugin-ld=ld.gold \
- --with-linker-hash-style=gnu \
- --disable-multilib --disable-libssp \
- --disable-build-with-cxx --disable-build-poststage1-with-cxx \
- --enable-checking=release
- make
-}
-
-check() {
- cd gcc-build
-
- # increase stack size to prevent test failures
- # http://gcc.gnu.org/bugzilla/show_bug.cgi?id=31827
- ulimit -s 32768
-
- # do not abort on error as some are "expected"
- make -k check || true
- ${_basedir}/contrib/test_summary
-}
-
-package_gcc-libs()
-{
- pkgdesc="Runtime libraries shipped by GCC"
- groups=('base')
- depends=('glibc>=2.16')
- install=gcc-libs.install
-
- cd gcc-build
- make -j1 -C $CHOST/libgcc DESTDIR=${pkgdir} install-shared
- for lib in libmudflap libgomp libstdc++-v3/src libitm; do
- make -j1 -C $CHOST/$lib DESTDIR=${pkgdir} install-toolexeclibLTLIBRARIES
- done
- make -j1 -C $CHOST/libstdc++-v3/po DESTDIR=${pkgdir} install
- make -j1 -C $CHOST/libgomp DESTDIR=${pkgdir} install-info
- make -j1 -C $CHOST/libitm DESTDIR=${pkgdir} install-info
-
- make -j1 DESTDIR=${pkgdir} install-target-libquadmath
- make -j1 DESTDIR=${pkgdir} install-target-libgfortran
- make -j1 DESTDIR=${pkgdir} install-target-libobjc
-
- # remove unnecessary files installed by install-target-{libquadmath,libgfortran,libobjc}
- rm -r ${pkgdir}/usr/lib/{gcc/,libgfortran.spec}
-
- # remove static libraries
- find ${pkgdir} -name *.a -delete
-
- # Install Runtime Library Exception
- install -Dm644 ${_basedir}/COPYING.RUNTIME \
- ${pkgdir}/usr/share/licenses/gcc-libs/RUNTIME.LIBRARY.EXCEPTION
-}
-
-package_gcc()
-{
- pkgdesc="The GNU Compiler Collection - C and C++ frontends"
- depends=("gcc-libs=$pkgver-$pkgrel" 'binutils>=2.22' 'libmpc' 'cloog' 'ppl')
- groups=('base-devel')
- install=gcc.install
-
- cd gcc-build
-
- make -j1 DESTDIR=${pkgdir} install
-
- install -d $pkgdir/usr/share/gdb/auto-load/usr/lib
- mv $pkgdir{,/usr/share/gdb/auto-load}/usr/lib/libstdc++.so.6.0.17-gdb.py
-
- # unfortunately it is much, much easier to install the lot and clean-up the mess...
- rm $pkgdir/usr/bin/{{$CHOST-,}gfortran,{$CHOST-,}gccgo,gnat*}
- rm $pkgdir/usr/lib/*.so*
- rm $pkgdir/usr/lib/lib{ffi,gfortran,go{,begin},objc,quadmath}.a
- rm $pkgdir/usr/lib/libgfortran.spec
- rm -r $pkgdir/usr/lib/gcc/$CHOST/${pkgver}/{ada{include,lib},finclude,include/objc}
- rm $pkgdir/usr/lib/gcc/$CHOST/${pkgver}/include/{ffi{,target}.h,quadmath{,_weak}.h}
- rm $pkgdir/usr/lib/gcc/$CHOST/${pkgver}/{cc1obj{,plus},f951,gnat1,go1}
- rm $pkgdir/usr/lib/gcc/$CHOST/${pkgver}/{libcaf_single,libgfortranbegin}.a
- rm -r $pkgdir/usr/lib/go
- rm $pkgdir/usr/share/info/{gccgo,gfortran,gnat*,libgomp,libquadmath,libitm}.info
- rm $pkgdir/usr/share/locale/{de,fr}/LC_MESSAGES/libstdc++.mo
- rm $pkgdir/usr/share/man/man1/{gccgo,gfortran}.1
- rm $pkgdir/usr/share/man/man3/ffi*
-
- # many packages require these symlinks
- #install -dm755 ${pkgdir}/lib
- #ln -s /usr/bin/cpp ${pkgdir}/lib/cpp
- ln -s gcc ${pkgdir}/usr/bin/cc
-
- # POSIX conformance launcher scripts for c89 and c99
- cat > $pkgdir/usr/bin/c89 <<"EOF"
-#!/bin/sh
-fl="-std=c89"
-for opt; do
- case "$opt" in
- -ansi|-std=c89|-std=iso9899:1990) fl="";;
- -std=*) echo "`basename $0` called with non ANSI/ISO C option $opt" >&2
- exit 1;;
- esac
-done
-exec gcc $fl ${1+"$@"}
-EOF
-
- cat > $pkgdir/usr/bin/c99 <<"EOF"
-#!/bin/sh
-fl="-std=c99"
-for opt; do
- case "$opt" in
- -std=c99|-std=iso9899:1999) fl="";;
- -std=*) echo "`basename $0` called with non ISO C99 option $opt" >&2
- exit 1;;
- esac
-done
-exec gcc $fl ${1+"$@"}
-EOF
-
- chmod 755 $pkgdir/usr/bin/c{8,9}9
-
- # install the libstdc++ man pages
- install -dm755 ${pkgdir}/usr/share/man/man3
- install -m644 ${srcdir}/libstdc++-api.${_libstdcppmanver}.man/man3/* \
- ${pkgdir}/usr/share/man/man3/
-
- # Install Runtime Library Exception
- install -Dm644 ${_basedir}/COPYING.RUNTIME \
- ${pkgdir}/usr/share/licenses/gcc/RUNTIME.LIBRARY.EXCEPTION
-}
-
-package_gcc-fortran()
-{
- pkgdesc="Fortran front-end for GCC"
- depends=("gcc=$pkgver-$pkgrel")
- install=gcc-fortran.install
-
- cd gcc-build
- make -j1 DESTDIR=${pkgdir} install-target-libquadmath
- make -j1 DESTDIR=$pkgdir install-target-libgfortran
- make -j1 -C $CHOST/libgomp DESTDIR=$pkgdir install-nodist_fincludeHEADERS
- make -j1 -C gcc DESTDIR=$pkgdir fortran.install-{common,man,info}
- install -Dm755 gcc/f951 $pkgdir/usr/lib/gcc/$CHOST/$pkgver/f951
-
- # remove libraries included in gcc-libs
- rm ${pkgdir}/usr/lib/lib{gfortran,quadmath}.so*
- rm ${pkgdir}/usr/share/info/libquadmath.info
-
- ln -s gfortran ${pkgdir}/usr/bin/f95
-
- # Install Runtime Library Exception
- install -Dm644 ${_basedir}/COPYING.RUNTIME \
- ${pkgdir}/usr/share/licenses/gcc-fortran/RUNTIME.LIBRARY.EXCEPTION
-}
-
-package_gcc-objc()
-{
- pkgdesc="Objective-C front-end for GCC"
- depends=("gcc=$pkgver-$pkgrel")
-
- cd gcc-build
- make -j1 DESTDIR=$pkgdir install-target-libobjc
- install -dm755 $pkgdir/usr/lib/gcc/$CHOST/$pkgver/
- install -m755 gcc/cc1obj{,plus} $pkgdir/usr/lib/gcc/$CHOST/$pkgver/
-
- # remove libraries included in gcc-libs
- rm ${pkgdir}/usr/lib/libobjc.so*
-
- # Install Runtime Library Exception
- install -Dm644 ${_basedir}/COPYING.RUNTIME \
- ${pkgdir}/usr/share/licenses/gcc-objc/RUNTIME.LIBRARY.EXCEPTION
-}
-
-package_gcc-ada()
-{
- pkgdesc="Ada front-end for GCC (GNAT)"
- depends=("gcc=$pkgver-$pkgrel")
- install=gcc-ada.install
-
- cd gcc-build/gcc
- make -j1 DESTDIR=$pkgdir ada.install-{common,info}
- install -m755 gnat1 $pkgdir/usr/lib/gcc/$CHOST/$pkgver
-
- ln -s gcc ${pkgdir}/usr/bin/gnatgcc
-
- # Install Runtime Library Exception
- install -Dm644 ${_basedir}/COPYING.RUNTIME \
- ${pkgdir}/usr/share/licenses/gcc-ada/RUNTIME.LIBRARY.EXCEPTION
-}
-
-package_gcc-go()
-{
- pkgdesc="Go front-end for GCC"
- depends=("gcc=$pkgver-$pkgrel")
- install=gcc-go.install
-
- cd gcc-build
- make -j1 DESTDIR=$pkgdir install-target-libgo
- make -j1 -C gcc DESTDIR=$pkgdir go.install-{common,man,info}
- install -Dm755 gcc/go1 $pkgdir/usr/lib/gcc/$CHOST/$pkgver/go1
-
- # Install Runtime Library Exception
- install -Dm644 ${_basedir}/COPYING.RUNTIME \
- ${pkgdir}/usr/share/licenses/gcc-go/RUNTIME.LIBRARY.EXCEPTION
-}
diff --git a/staging/gcc/gcc-4.7.0-cloog-0.17.patch b/staging/gcc/gcc-4.7.0-cloog-0.17.patch
deleted file mode 100644
index c7146fa04..000000000
--- a/staging/gcc/gcc-4.7.0-cloog-0.17.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-diff -Naur gcc-4.6-20120120-orig/configure gcc-4.6-20120120/configure
---- gcc-4.6-20120120-orig/configure 2011-12-18 20:03:44.000000000 +1000
-+++ gcc-4.6-20120120/configure 2012-02-03 17:55:14.885990135 +1000
-@@ -6049,8 +6049,8 @@
- LDFLAGS="${_cloog_saved_LDFLAGS} ${clooglibs} ${ppllibs}"
-
- if test "${cloog_org}" = yes ; then
-- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for version 0.16.1 of CLooG" >&5
--$as_echo_n "checking for version 0.16.1 of CLooG... " >&6; }
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for version 0.17 of CLooG" >&5
-+$as_echo_n "checking for version 0.17 of CLooG... " >&6; }
- if test "${gcc_cv_cloog_ct_0_14_0+set}" = set; then :
- $as_echo_n "(cached) " >&6
- else
-@@ -6061,8 +6061,7 @@
- main ()
- {
- #if CLOOG_VERSION_MAJOR != 0 \
-- || CLOOG_VERSION_MINOR != 16 \
-- || CLOOG_VERSION_REVISION < 1
-+ || CLOOG_VERSION_MINOR != 17
- choke me
- #endif
- ;
diff --git a/staging/gcc/gcc-4.7.1-libada-pic.patch b/staging/gcc/gcc-4.7.1-libada-pic.patch
deleted file mode 100644
index 591da1e4a..000000000
--- a/staging/gcc/gcc-4.7.1-libada-pic.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Naur gcc-4.7.1-orig/libada/Makefile.in gcc-4.7.1/libada/Makefile.in
---- gcc-4.7.1-orig/libada/Makefile.in 2012-06-13 01:12:37.000000000 +1000
-+++ gcc-4.7.1/libada/Makefile.in 2012-06-16 15:04:32.179911023 +1000
-@@ -54,7 +54,7 @@
- PICFLAG = @PICFLAG@
- GNATLIBFLAGS= -W -Wall -gnatpg -nostdinc
- GNATLIBCFLAGS= -g -O2
--GNATLIBCFLAGS_FOR_C = -W -Wall $(GNATLIBCFLAGS) \
-+GNATLIBCFLAGS_FOR_C = -W -Wall $(GNATLIBCFLAGS) $(PICFLAG) \
- -fexceptions -DIN_RTS @have_getipinfo@
-
- host_subdir = @host_subdir@
diff --git a/staging/gcc/gcc-4.7.1-libgo-mksysinfo.patch b/staging/gcc/gcc-4.7.1-libgo-mksysinfo.patch
deleted file mode 100644
index 427efe8a6..000000000
--- a/staging/gcc/gcc-4.7.1-libgo-mksysinfo.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- libgo/mksysinfo.sh 2012-06-29 14:23:30.684708901 +0200
-+++ libgo/mksysinfo.sh 2012-06-29 14:23:20.782761973 +0200
-@@ -522,10 +522,10 @@ grep '^const _DT_' gen-sysinfo.go |
- # The rusage struct.
- rusage=`grep '^type _rusage struct' gen-sysinfo.go`
- if test "$rusage" != ""; then
-- rusage=`echo $rusage | sed -e 's/type _rusage struct //' -e 's/[{}]//g'`
-- rusage=`echo $rusage | sed -e 's/^ *//'`
- # Remove anonymous unions from GNU/Linux <bits/resource.h>.
- rusage=`echo $rusage | sed -e 's/Godump_[0-9]* struct {\([^}]*\)};/\1/g'`
-+ rusage=`echo $rusage | sed -e 's/type _rusage struct //' -e 's/[{}]//g'`
-+ rusage=`echo $rusage | sed -e 's/^ *//'`
- nrusage=
- while test -n "$rusage"; do
- field=`echo $rusage | sed -e 's/^\([^;]*\);.*$/\1/'`
diff --git a/staging/gcc/gcc-4.7.1-libgo-write.patch b/staging/gcc/gcc-4.7.1-libgo-write.patch
deleted file mode 100644
index a7be83fda..000000000
--- a/staging/gcc/gcc-4.7.1-libgo-write.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff -Naur gcc-4.7.1-orig/libgo/runtime/print.c gcc-4.7.1/libgo/runtime/print.c
---- gcc-4.7.1-orig/libgo/runtime/print.c 2012-05-26 04:22:14.000000000 +1000
-+++ gcc-4.7.1/libgo/runtime/print.c 2012-06-16 15:06:28.553138502 +1000
-@@ -17,7 +17,8 @@
- G* g = runtime_g();
-
- if(g == nil || g->writebuf == nil) {
-- runtime_write(2, v, n);
-+ ssize_t bytesWritten = runtime_write(2, v, n);
-+ (void)bytesWritten;
- return;
- }
-
diff --git a/staging/gcc/gcc-ada.install b/staging/gcc/gcc-ada.install
deleted file mode 100644
index df0553a4f..000000000
--- a/staging/gcc/gcc-ada.install
+++ /dev/null
@@ -1,20 +0,0 @@
-infodir=usr/share/info
-filelist=(gnat-style.info gnat_rm.info gnat_ugn.info)
-
-post_install() {
- [ -x usr/bin/install-info ] || return 0
- for file in ${filelist[@]}; do
- install-info $infodir/$file.gz $infodir/dir 2> /dev/null
- done
-}
-
-post_upgrade() {
- post_install $1
-}
-
-pre_remove() {
- [ -x usr/bin/install-info ] || return 0
- for file in ${filelist[@]}; do
- install-info --delete $infodir/$file.gz $infodir/dir 2> /dev/null
- done
-}
diff --git a/staging/gcc/gcc-fortran.install b/staging/gcc/gcc-fortran.install
deleted file mode 100644
index b15d89a97..000000000
--- a/staging/gcc/gcc-fortran.install
+++ /dev/null
@@ -1,16 +0,0 @@
-infodir=usr/share/info
-file="gfortran.info"
-
-post_install() {
- [ -x usr/bin/install-info ] || return 0
- install-info $infodir/$file.gz $infodir/dir 2> /dev/null
-}
-
-post_upgrade() {
- post_install $1
-}
-
-pre_remove() {
- [ -x usr/bin/install-info ] || return 0
- install-info --delete $infodir/$file.gz $infodir/dir 2> /dev/null
-}
diff --git a/staging/gcc/gcc-go.install b/staging/gcc/gcc-go.install
deleted file mode 100644
index 7dc50dee5..000000000
--- a/staging/gcc/gcc-go.install
+++ /dev/null
@@ -1,20 +0,0 @@
-infodir=usr/share/info
-filelist=(gccgo.info)
-
-post_install() {
- [ -x usr/bin/install-info ] || return 0
- for file in ${filelist[@]}; do
- install-info $infodir/$file.gz $infodir/dir 2> /dev/null
- done
-}
-
-post_upgrade() {
- post_install $1
-}
-
-pre_remove() {
- [ -x usr/bin/install-info ] || return 0
- for file in ${filelist[@]}; do
- install-info --delete $infodir/$file.gz $infodir/dir 2> /dev/null
- done
-}
diff --git a/staging/gcc/gcc-libs.install b/staging/gcc/gcc-libs.install
deleted file mode 100644
index 23553b8f0..000000000
--- a/staging/gcc/gcc-libs.install
+++ /dev/null
@@ -1,16 +0,0 @@
-infodir=usr/share/info
-filelist=(libgomp.info libquadmath.info)
-
-post_upgrade() {
- [ -x usr/bin/install-info ] || return 0
- for file in ${filelist[@]}; do
- install-info $infodir/$file.gz $infodir/dir 2> /dev/null
- done
-}
-
-pre_remove() {
- [ -x usr/bin/install-info ] || return 0
- for file in ${filelist[@]}; do
- install-info --delete $infodir/$file.gz $infodir/dir 2> /dev/null
- done
-}
diff --git a/staging/gcc/gcc.install b/staging/gcc/gcc.install
deleted file mode 100644
index 3407a5e1f..000000000
--- a/staging/gcc/gcc.install
+++ /dev/null
@@ -1,20 +0,0 @@
-infodir=usr/share/info
-filelist=(cpp.info cppinternals.info gcc.info gccinstall.info gccint.info)
-
-post_install() {
- [ -x usr/bin/install-info ] || return 0
- for file in ${filelist[@]}; do
- install-info $infodir/$file.gz $infodir/dir 2> /dev/null
- done
-}
-
-post_upgrade() {
- post_install $1
-}
-
-pre_remove() {
- [ -x usr/bin/install-info ] || return 0
- for file in ${filelist[@]}; do
- install-info --delete $infodir/$file.gz $infodir/dir 2> /dev/null
- done
-}
diff --git a/staging/gcc/gcc_pure64.patch b/staging/gcc/gcc_pure64.patch
deleted file mode 100644
index a9b09bbcf..000000000
--- a/staging/gcc/gcc_pure64.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-diff -Naur gcc-orig/gcc/config/i386/linux64.h gcc/gcc/config/i386/linux64.h
---- gcc-orig/gcc/config/i386/linux64.h 2011-07-08 01:38:34.000000000 +1000
-+++ gcc/gcc/config/i386/linux64.h 2011-07-24 19:48:05.000000000 +1000
-@@ -28,6 +28,6 @@
- #define GNU_USER_LINK_EMULATION64 "elf_x86_64"
- #define GNU_USER_LINK_EMULATIONX32 "elf32_x86_64"
-
--#define GLIBC_DYNAMIC_LINKER32 "/lib/ld-linux.so.2"
--#define GLIBC_DYNAMIC_LINKER64 "/lib64/ld-linux-x86-64.so.2"
-+#define GLIBC_DYNAMIC_LINKER32 "/lib32/ld-linux.so.2"
-+#define GLIBC_DYNAMIC_LINKER64 "/lib/ld-linux-x86-64.so.2"
- #define GLIBC_DYNAMIC_LINKERX32 "/libx32/ld-linux-x32.so.2"
-diff -Naur gcc-orig/gcc/config/i386/t-linux64 gcc/gcc/config/i386/t-linux64
---- gcc-orig/gcc/config/i386/t-linux64 2011-07-08 01:38:34.000000000 +1000
-+++ gcc/gcc/config/i386/t-linux64 2011-07-24 19:49:41.000000000 +1000
-@@ -34,8 +34,8 @@
- comma=,
- MULTILIB_OPTIONS = $(subst $(comma),/,$(TM_MULTILIB_CONFIG))
- MULTILIB_DIRNAMES = $(patsubst m%, %, $(subst /, ,$(MULTILIB_OPTIONS)))
--MULTILIB_OSDIRNAMES = m64=../lib64
--MULTILIB_OSDIRNAMES+= m32=$(if $(wildcard $(shell echo $(SYSTEM_HEADER_DIR))/../../usr/lib32),../lib32,../lib)
-+MULTILIB_OSDIRNAMES = m64=../lib
-+MULTILIB_OSDIRNAMES+= m32=../lib32
- MULTILIB_OSDIRNAMES+= mx32=../libx32
-
- LIBGCC = stmp-multilib
diff --git a/staging/hugin/PKGBUILD b/staging/hugin/PKGBUILD
deleted file mode 100644
index 79e557f6c..000000000
--- a/staging/hugin/PKGBUILD
+++ /dev/null
@@ -1,39 +0,0 @@
-# $Id: PKGBUILD 163191 2012-07-08 15:53:29Z ibiru $
-# Maintainer: Tobias Kieslich <tobias@archlinux.org>
-# Contributor: Giovanni Scafora <giovanni@archlinux.org>
-# Contributor: Dominik Ryba <domryba@post.pl>
-
-pkgname=hugin
-pkgver=2011.4.0
-pkgrel=3
-pkgdesc="A frontend to the panorama-tools"
-arch=('i686' 'x86_64')
-url="http://hugin.sourceforge.net/"
-license=('GPL')
-depends=('wxgtk' 'boost-libs' 'enblend-enfuse' 'exiv2' 'autopano-sift-c'
- 'lapack' 'desktop-file-utils' 'make' 'perl-image-exiftool')
-makedepends=('zip' 'cmake' 'boost' 'tclap')
-install=hugin.install
-source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.bz2"
- gcc47.patch)
-sha1sums=('21ec7331d5e196aca2a8771d3c9101dd181ad93b'
- 'aa0fc9425bd7a4b5e270412f4ca72258fac77298')
-
-build() {
- cd "${srcdir}"
- patch -Np0 -i gcc47.patch
- mkdir build
- cd build
- export CXXFLAGS+=" -fpermissive"
- cmake "${srcdir}/${pkgname}-${pkgver}" \
- -DCMAKE_BUILD_TYPE=Release \
- -DCMAKE_INSTALL_PREFIX=/usr \
- -DCMAKE_EXE_LINKER_FLAGS="-lpthread" \
- -DENABLE_LAPACK=yes
- make
-}
-
-package(){
- cd "${srcdir}/build"
- make DESTDIR="${pkgdir}" install
-}
diff --git a/staging/hugin/gcc47.patch b/staging/hugin/gcc47.patch
deleted file mode 100644
index 3814b871c..000000000
--- a/staging/hugin/gcc47.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -Nur hugin-2011.4.0.orig/src/celeste/Utilities.cpp hugin-2011.4.0/src/celeste/Utilities.cpp
---- hugin-2011.4.0.orig/src/celeste/Utilities.cpp 2012-07-08 15:18:16.864454043 +0000
-+++ hugin-2011.4.0/src/celeste/Utilities.cpp 2012-07-08 15:18:20.341089422 +0000
-@@ -27,6 +27,7 @@
-
- #include <math.h>
- #include <stdlib.h>
-+#include <unistd.h>
- #include "Utilities.h"
-
- using namespace std;
diff --git a/staging/hugin/hugin.install b/staging/hugin/hugin.install
deleted file mode 100644
index 362749233..000000000
--- a/staging/hugin/hugin.install
+++ /dev/null
@@ -1,15 +0,0 @@
-post_install() {
- gtk-update-icon-cache -q -t -f usr/share/icons/gnome
- update-desktop-database -q
- update-mime-database usr/share/mime > /dev/null
-}
-
-post_upgrade() {
- post_install $1
-}
-
-post_remove() {
- gtk-update-icon-cache -q -t -f usr/share/icons/gnome
- update-desktop-database -q
- update-mime-database usr/share/mime > /dev/null
-}
diff --git a/staging/libpst/PKGBUILD b/staging/libpst/PKGBUILD
deleted file mode 100644
index ee01ca472..000000000
--- a/staging/libpst/PKGBUILD
+++ /dev/null
@@ -1,40 +0,0 @@
-# $Id: PKGBUILD 163183 2012-07-08 14:59:15Z ibiru $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-
-pkgbase=libpst
-pkgname=('libpst' 'libpst-docs')
-pkgver=0.6.54
-pkgrel=2
-arch=('i686' 'x86_64')
-url="http://www.five-ten-sg.com/libpst/"
-license=('GPL')
-makedepends=('python2' 'boost')
-source=(http://www.five-ten-sg.com/libpst/packages/${pkgbase}-${pkgver}.tar.gz)
-sha1sums=('a4713b87e330556acb0786b4efa975a3c739cd84')
-
-build() {
- cd "${srcdir}/${pkgbase}-${pkgver}"
- ./configure --prefix=/usr --mandir=/usr/share/man \
- --disable-static --enable-libpst-shared --disable-dii PYTHON_VERSION=2
- make
-}
-
-package_libpst() {
- pkgdesc="Outlook .pst file converter"
- depends=('gcc-libs')
- optdepends=('boost-libs: for libpst python interface')
- options=('!libtool' '!docs')
-
- cd "${srcdir}/${pkgbase}-${pkgver}"
- make DESTDIR="${pkgdir}" install
-}
-
-package_libpst-docs() {
- pkgdesc="Documentation for Outlook .pst file converter"
- options=('!libtool')
-
- cd "${srcdir}/${pkgbase}-${pkgver}"
- make DESTDIR="${pkgdir}" install-htmlDATA
- cd "${srcdir}/${pkgbase}-${pkgver}/html"
- make DESTDIR="${pkgdir}" install-htmldevelDATA
-}
diff --git a/staging/libtorrent-rasterbar/PKGBUILD b/staging/libtorrent-rasterbar/PKGBUILD
deleted file mode 100644
index a416c7110..000000000
--- a/staging/libtorrent-rasterbar/PKGBUILD
+++ /dev/null
@@ -1,31 +0,0 @@
-# $Id: PKGBUILD 163074 2012-07-06 16:12:17Z ibiru $
-# Maintainer : Ionut Biru <ibiru@archlinux.org>
-# Contributor: Hugo Doria <hugo@archlinux.org>
-
-pkgname=libtorrent-rasterbar
-pkgver=0.16.1
-pkgrel=1
-epoch=1
-pkgdesc="A C++ library that aims to be a good alternative to all the other bittorrent implementations around"
-url="http://www.rasterbar.com/products/libtorrent/"
-arch=('i686' 'x86_64')
-license=('custom')
-depends=('boost-libs' 'geoip' 'python2')
-makedepends=('boost')
-options=('!libtool' '!emptydirs')
-source=(http://libtorrent.googlecode.com/files/$pkgname-$pkgver.tar.gz)
-sha1sums=('798944301ee6ef8e0d8de3d944c59d184ef1a4d3')
-
-build() {
- cd $pkgname-$pkgver
- PYTHON2=/usr/bin/python2 ./configure --prefix=/usr \
- --enable-python-binding \
- --with-libgeoip=system
- make
-}
-
-package() {
- cd $pkgname-$pkgver
- make DESTDIR="$pkgdir" install
- install -D COPYING "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
-}
diff --git a/staging/licq/PKGBUILD b/staging/licq/PKGBUILD
deleted file mode 100644
index f852cde06..000000000
--- a/staging/licq/PKGBUILD
+++ /dev/null
@@ -1,40 +0,0 @@
-# $Id: PKGBUILD 163193 2012-07-08 16:00:41Z ibiru $
-# Maintainer: Juergen Hoetzel <juergen@archlinux.org>
-
-pkgname=licq
-pkgver=1.6.0
-pkgrel=5
-pkgdesc="Advanced graphical ICQ clone and more for Unix"
-arch=('i686' 'x86_64')
-url="http://www.licq.org"
-license=('GPL')
-depends=('boost-libs' 'gpgme' 'libxss' 'qt')
-makedepends=('cmake' 'boost')
-options=('!libtool')
-source=(http://downloads.sourceforge.net/sourceforge/licq/licq-${pkgver}.tar.bz2)
-md5sums=('383153697e281a0b1b4ff008936731b8')
-
-build() {
- cd "${srcdir}/${pkgname}-${pkgver}"
-
- # licq
- mkdir build
- cd build
- cmake -DCMAKE_INSTALL_PREFIX=/usr ..
- make
-
- # qt4-gui
- cd ../plugins/qt4-gui
- mkdir build
- cd build
- cmake -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_MODULE_PATH="${srcdir}/${pkgname}-${pkgver}/cmake" ..
- make
-}
-
-package() {
- cd "${srcdir}/${pkgname}-${pkgver}/build"
- make DESTDIR="${pkgdir}" install
-
- cd ../plugins/qt4-gui/build
- make DESTDIR="${pkgdir}" install
-}
diff --git a/staging/lyx/PKGBUILD b/staging/lyx/PKGBUILD
deleted file mode 100644
index e6341f0a0..000000000
--- a/staging/lyx/PKGBUILD
+++ /dev/null
@@ -1,50 +0,0 @@
-# $Id: PKGBUILD 163195 2012-07-08 16:34:34Z ibiru $
-# Maintainer: Ronald van Haren <ronald.archlinux.org>
-# Contributor: Jason Chu <jason@archlinux.org>
-
-pkgname=lyx
-pkgver=2.0.3
-pkgrel=4
-pkgdesc="An advanced WYSIWYM document processor & LaTeX front-end"
-arch=('i686' 'x86_64')
-url="http://www.lyx.org"
-depends=('qt' 'texlive-core' 'python2' 'imagemagick' 'enchant' 'boost-libs' 'libmythes')
-makedepends=('boost')
-optdepends=('rcs: built-in version control system'
- 'texlive-latexextra: float wrap support')
-license=('GPL')
-source=(ftp://ftp.lip6.fr/pub/lyx/stable/2.0.x/$pkgname-$pkgver.tar.xz
- lyx.desktop lyxrc.dist)
-backup=('etc/lyx/lyxrc.dist')
-install=lyx.install
-options=('emptydirs')
-sha1sums=('109dae0ef22a7d8944964b32ee380ad170b0665f'
- 'e2b8f6d6cdeec41e1d5795167f5557e4a6ea28ad'
- '56416642cc3da2a13b87b84e6b87c1a239f3d09a')
-
-build() {
- cd "${srcdir}/${pkgname}-${pkgver}"
- find . -type f -exec sed -i 's|#!.*python|#!/usr/bin/env python2|' {} +
- sed -i 's|"python|"python2|' lib/configure.py src/support/os.cpp
- export CXXFLAGS="$CXXFLAGS -fpermissive"
- ./configure --prefix=/usr \
- --with-frontend=qt4 --without-included-boost \
- --without-included-mythes
- make
-}
-
-package() {
- cd "${srcdir}/${pkgname}-${pkgver}"
-
- make DESTDIR="${pkgdir}" install
-
- # install desktop entry
- install -Dm644 "${srcdir}/lyx.desktop" \
- "${pkgdir}/usr/share/applications/lyx.desktop"
- install -Dm644 "lib/images/lyx.png" \
- "${pkgdir}/usr/share/pixmaps/lyx.png"
-
- # install default config file
- install -Dm644 "${srcdir}/lyxrc.dist" "${pkgdir}/etc/lyx/lyxrc.dist"
- ln -sf /etc/lyx/lyxrc.dist "${pkgdir}/usr/share/lyx/lyxrc.dist"
-}
diff --git a/staging/lyx/lyx.desktop b/staging/lyx/lyx.desktop
deleted file mode 100644
index 649b30c98..000000000
--- a/staging/lyx/lyx.desktop
+++ /dev/null
@@ -1,14 +0,0 @@
-[Desktop Entry]
-Version=1.0
-Type=Application
-Name=LyX Document Processor
-GenericName=Document Processor
-Comment=High level LaTeX frontend
-Exec=lyx %F
-TryExec=lyx
-Icon=lyx
-StartupNotify=false
-StartupWMClass=Lyx
-Terminal=false
-Categories=Office;WordProcessor;Qt;
-MimeType=text/x-lyx;application/x-lyx;
diff --git a/staging/lyx/lyx.install b/staging/lyx/lyx.install
deleted file mode 100644
index c15c17b3a..000000000
--- a/staging/lyx/lyx.install
+++ /dev/null
@@ -1,14 +0,0 @@
-post_install() {
- update-desktop-database -q
-}
-
-post_upgrade() {
- post_install
-}
-
-post_remove () {
- post_install
-}
-
-
-
diff --git a/staging/lyx/lyxrc.dist b/staging/lyx/lyxrc.dist
deleted file mode 100644
index dd18694f9..000000000
--- a/staging/lyx/lyxrc.dist
+++ /dev/null
@@ -1,14 +0,0 @@
-### This file is part of
-### ========================================================
-### LyX, The Document Processor
-###
-### Copyright 1995 Matthias Ettrich
-### Copyright 1995-2011 The LyX Team.
-###
-### ========================================================
-
-# The file lyxrc.dist gives initial global options for all LyX users.
-# Almost all settings here can be overridden through the preferences in LyX.
-
-\thesaurusdir_path "/usr/share/mythes"
-\hunspelldir_path "/usr/share/myspell"
diff --git a/staging/mkvtoolnix/PKGBUILD b/staging/mkvtoolnix/PKGBUILD
deleted file mode 100644
index 48bd96863..000000000
--- a/staging/mkvtoolnix/PKGBUILD
+++ /dev/null
@@ -1,84 +0,0 @@
-# $Id: PKGBUILD 163225 2012-07-11 10:08:56Z giovanni $
-# Maintainer: Giovanni Scafora <giovanni@archlinux.org>
-# Contributor: xduugu <xduugu@gmx.com>
-
-pkgbase=mkvtoolnix
-pkgname=('mkvtoolnix-cli' 'mkvtoolnix-gtk')
-pkgver=5.7.0
-pkgrel=2
-arch=('i686' 'x86_64')
-license=('GPL')
-url="http://www.bunkus.org/videotools/mkvtoolnix/index.html"
-makedepends=('libmatroska' 'flac' 'libvorbis' 'file' 'wxgtk'
- 'boost-libs' 'lzo2' 'xdg-utils' 'boost' 'ruby')
-source=("http://www.bunkus.org/videotools/${pkgbase}/sources/${pkgbase}-${pkgver}.tar.bz2")
-md5sums=('99ea44be570412dadafe4ccaee0cfe6e')
-
-build() {
- cd "${srcdir}/${pkgbase}-${pkgver}"
-
- # Disable automagic curl dep used for online update checking
- sed -i -e '/curl/d' configure.in
- export CURL_CFLAGS="" CURL_LIBS=""
-
- export CFLAGS="${CFLAGS} -DBOOST_FILESYSTEM_VERSION=3"
- export CXXFLAGS="${CXXFLAGS} -DBOOST_FILESYSTEM_VERSION=3"
-
- autoreconf
-
- ./configure --prefix=/usr \
- --with-boost-libdir=/usr/lib \
- --disable-gui
- rake
-
- mv src/mkvinfo{,-cli}
-
- ./configure --prefix=/usr \
- --with-boost-libdir=/usr/lib
- rake
-}
-
-package_mkvtoolnix-cli() {
- pkgdesc="Set of tools to create, edit and inspect Matroska files - CLI version"
- depends=('libmatroska' 'expat' 'flac' 'libvorbis' 'file' 'boost-libs' 'lzo2')
- provides=('mkvtoolnix')
- conflicts=('mkvtoolnix')
- replaces=('mkvtoolnix')
-
- cd "${srcdir}/${pkgbase}-${pkgver}"
-
- rake DESTDIR="${pkgdir}" install
- rm -rf "${pkgdir}"/usr/bin/mkvinfo
- install -Dm755 src/mkvinfo-cli "${pkgdir}"/usr/bin/mkvinfo
-
- rm -rf "${pkgdir}"/usr/bin/mmg
- rm -rf "${pkgdir}"/usr/share/man/ja/man1/mmg.1
- rm -rf "${pkgdir}"/usr/share/man/man1/mmg.1
- rm -rf "${pkgdir}"/usr/share/man/nl/man1/mmg.1
- rm -rf "${pkgdir}"/usr/share/man/zh_CN/man1/mmg.1
- rm -rf "${pkgdir}"/usr/share/man/uk/man1/mmg.1
- rm -rf "${pkgdir}"/usr/share/applications
- rm -rf "${pkgdir}"/usr/share/icons
- rm -rf "${pkgdir}"/usr/share/mime
-}
-
-package_mkvtoolnix-gtk() {
- pkgdesc="Set of tools to create, edit and inspect Matroska files - wxGTK GUI"
- depends=("mkvtoolnix-cli=${pkgver}" 'wxgtk' 'xdg-utils')
- install=mkvtoolnix.install
-
- cd "${srcdir}/${pkgbase}-${pkgver}"
-
- rake DESTDIR="${pkgdir}" install
- rm -rf "${pkgdir}"/usr/bin/mkv*
- install -Dm755 src/mkvinfo "${pkgdir}"/usr/bin/mkvinfo-gtk
- sed -ri 's/^(Exec=mkvinfo)/\1-gtk/' "${pkgdir}"/usr/share/applications/mkvinfo.desktop
-
- rm -rf "${pkgdir}"/usr/share/doc
- rm -rf "${pkgdir}"/usr/share/locale
- rm -rf "${pkgdir}"/usr/share/man/ja/man1/mkv*
- rm -rf "${pkgdir}"/usr/share/man/man1/mkv*
- rm -rf "${pkgdir}"/usr/share/man/nl/man1/mkv*
- rm -rf "${pkgdir}"/usr/share/man/zh_CN/man1/mkv*
- rm -rf "${pkgdir}"/usr/share/man/uk/man1/mkv*
-}
diff --git a/staging/mkvtoolnix/mkvtoolnix.install b/staging/mkvtoolnix/mkvtoolnix.install
deleted file mode 100644
index 74d9eb2ef..000000000
--- a/staging/mkvtoolnix/mkvtoolnix.install
+++ /dev/null
@@ -1,14 +0,0 @@
-post_install() {
- xdg-icon-resource forceupdate --theme hicolor &> /dev/null
- if [ -f usr/bin/update-mime-database ]; then
- update-mime-database usr/share/mime &> /dev/null
- fi
-}
-
-post_upgrade() {
- post_install
-}
-
-pre_remove() {
- post_install
-}
diff --git a/staging/ppl/PKGBUILD b/staging/ppl/PKGBUILD
deleted file mode 100644
index 0e5798dcd..000000000
--- a/staging/ppl/PKGBUILD
+++ /dev/null
@@ -1,33 +0,0 @@
-# $Id: PKGBUILD 162774 2012-06-30 08:11:58Z allan $
-# Maintainer: Allan McRae <allan@archlinux.org>
-# Contributor: ezzetabi <ezzetabi at gawab dot com>
-
-pkgname=ppl
-pkgver=1.0
-pkgrel=1
-pkgdesc="A modern library for convex polyhedra and other numerical abstractions."
-arch=('i686' 'x86_64')
-url="http://bugseng.com/products/ppl"
-license=('GPL3')
-depends=('gmp>=5.0')
-options=('!docs' '!libtool')
-source=(http://bugseng.com/products/ppl/download/ftp/releases/$pkgver/ppl-$pkgver.tar.gz{,.sign})
-md5sums=('c4566928c6b7bb63e95f96d1a7b5cb4c'
- '5f490df826c76fed296060ca8fca4eb5')
-
-build() {
- cd $srcdir/ppl-$pkgver
- ./configure --prefix=/usr --enable-interfaces="c,cxx"
- make
-}
-
-check() {
- cd $srcdir/ppl-$pkgver
- make check
-}
-
-package() {
- cd $srcdir/ppl-$pkgver
- make DESTDIR=$pkgdir install
-}
-
diff --git a/staging/source-highlight/PKGBUILD b/staging/source-highlight/PKGBUILD
deleted file mode 100644
index e4c135217..000000000
--- a/staging/source-highlight/PKGBUILD
+++ /dev/null
@@ -1,32 +0,0 @@
-# $Id: PKGBUILD 163141 2012-07-08 09:27:47Z giovanni $
-# Maintainer: Giovanni Scafora <giovanni@archlinux.org>
-# Contributor: Douglas Soares de Andrade <douglas@archlinux.org>
-
-pkgname=source-highlight
-pkgver=3.1.7
-pkgrel=2
-pkgdesc="Convert source code to syntax highlighted document"
-arch=('i686' 'x86_64')
-url="http://www.gnu.org/software/src-highlite/"
-license=('GPL')
-depends=('bash' 'boost-libs')
-makedepends=('ctags' 'boost')
-options=('!libtool')
-install=$pkgname.install
-source=("ftp://ftp.gnu.org/gnu/src-highlite/${pkgname}-${pkgver}.tar.gz")
-md5sums=('0ff81588d3536b4c4e571122ba940595')
-
-build() {
- cd "${srcdir}/${pkgname}-${pkgver}"
-
- ./configure --prefix=/usr \
- --sysconfdir=/etc \
- --with-bash-completion=${pkgdir}/usr/share/bash-completion/completions
- make
-}
-
-package() {
- cd "${srcdir}/${pkgname}-${pkgver}"
-
- make prefix="${pkgdir}/usr" install
-}
diff --git a/staging/source-highlight/source-highlight.install b/staging/source-highlight/source-highlight.install
deleted file mode 100644
index 4fd1b3005..000000000
--- a/staging/source-highlight/source-highlight.install
+++ /dev/null
@@ -1,18 +0,0 @@
-info_dir=usr/share/info
-info_files=(source-highlight.info source-highlight-lib.info)
-
-post_install() {
- for f in ${info_files[@]}; do
- install-info ${info_dir}/$f.gz ${info_dir}/dir 2> /dev/null
- done
-}
-
-post_upgrade() {
- post_install
-}
-
-pre_remove() {
- for f in ${info_files[@]}; do
- install-info --delete ${info_dir}/$f.gz ${info_dir}/dir 2> /dev/null
- done
-}