diff options
Diffstat (limited to 'extra')
-rw-r--r-- | extra/amule/PKGBUILD | 6 | ||||
-rw-r--r-- | extra/calligra/PKGBUILD | 8 | ||||
-rw-r--r-- | extra/clamav/PKGBUILD | 36 | ||||
-rw-r--r-- | extra/clamav/clamd.conf | 6 | ||||
-rw-r--r-- | extra/clamav/clamd.service (renamed from extra/clamav/service) | 0 | ||||
-rw-r--r-- | extra/clamav/config.patch | 30 | ||||
-rw-r--r-- | extra/clamav/freshclam.conf | 3 | ||||
-rw-r--r-- | extra/clamav/freshclamd.service (renamed from extra/clamav/service.fresh) | 0 | ||||
-rw-r--r-- | extra/enlightenment16/PKGBUILD | 6 | ||||
-rw-r--r-- | extra/graphicsmagick/PKGBUILD | 7 | ||||
-rw-r--r-- | extra/libdrm/PKGBUILD | 6 | ||||
-rw-r--r-- | extra/librsvg/PKGBUILD | 8 | ||||
-rw-r--r-- | extra/nasm/PKGBUILD | 6 | ||||
-rw-r--r-- | extra/opengtl/PKGBUILD | 47 | ||||
-rw-r--r-- | extra/opengtl/opengtl-0.9.18-llvm-3.3.patch | 732 | ||||
-rw-r--r-- | extra/opengtl/opengtl-0.9.18-memcpy.patch | 11 | ||||
-rw-r--r-- | extra/seahorse/PKGBUILD | 6 |
17 files changed, 54 insertions, 864 deletions
diff --git a/extra/amule/PKGBUILD b/extra/amule/PKGBUILD index 3be84143d..947b841d3 100644 --- a/extra/amule/PKGBUILD +++ b/extra/amule/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 203013 2013-12-31 17:11:59Z giovanni $ +# $Id: PKGBUILD 203346 2014-01-08 13:17:00Z giovanni $ # Maintainer: Giovanni Scafora <giovanni@archlinux.org> # Contributor: Henrik Ronellenfitsch <searinox@web.de> # Contributor: Alessio Sergi <sergi.alessio {at} gmail.com> @@ -6,7 +6,7 @@ # Contributor: Anatol Pomozov <anatol.pomozov@gmail.com> pkgname=amule -pkgver=10829 +pkgver=10830 pkgrel=1 pkgdesc="An eMule-like client for ed2k p2p network" arch=('i686' 'x86_64') @@ -17,7 +17,7 @@ install=amule.install source=("http://amule.sourceforge.net/tarballs/aMule-SVN-r${pkgver}.tar.bz2" 'amuled.systemd' 'amuleweb.systemd') -md5sums=('843693d449b81899267d6756ce55a6e0' +md5sums=('8ba572ed1c87909ee24652d96f93dc40' '59772c41860e238f1c822feb8ca8d47f' '05975c5d94bfc41fddb894d98b1115d5') diff --git a/extra/calligra/PKGBUILD b/extra/calligra/PKGBUILD index 0045ad4b5..176d85456 100644 --- a/extra/calligra/PKGBUILD +++ b/extra/calligra/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 200653 2013-12-01 09:50:18Z andyrtr $ +# $Id: PKGBUILD 203352 2014-01-08 14:45:06Z lcarlier $ # Maintainer: Andrea Scarpino <andrea@archlinux.org> # Contributor: Ronald van Haren <ronald.archlinux.org> @@ -18,13 +18,13 @@ pkgname=('calligra-braindump' 'calligra-stage' 'calligra-words') pkgver=2.7.5 -pkgrel=2 +pkgrel=3 arch=('i686' 'x86_64') url='http://www.calligra-suite.org/' license=('FDL1.2' 'GPL2' 'LGPL') makedepends=('cmake' 'automoc4' 'boost' 'kdepimlibs' 'eigen2' 'kdeedu-marble' 'lcms2' 'libmariadbclient' 'freetds' 'xbase' 'libwpg' 'opencolorio' - 'libwps' 'gsl' 'glew' 'fftw' 'opengtl' 'poppler-qt' 'libkdcraw' + 'libwps' 'gsl' 'glew' 'fftw' 'poppler-qt' 'libkdcraw' 'openjpeg' 'kdegraphics-okular' 'pstoedit' 'vc') groups=('calligra') source=("http://download.kde.org/stable/${pkgbase}-${pkgver}/${pkgbase}-${pkgver}.tar.xz") @@ -148,7 +148,7 @@ package_calligra-stage() { package_calligra-krita() { pkgdesc="Edit and paint images" depends=('calligra-plugins' 'kdebase-runtime' 'eigen2' - 'opencolorio' 'libkdcraw' 'fftw' 'glew' 'opengtl') + 'opencolorio' 'libkdcraw' 'fftw' 'glew') conflicts=('koffice-krita' 'calligra-krita-doc') replaces=('koffice-krita' 'calligra-krita-doc') install=calligra-krita.install diff --git a/extra/clamav/PKGBUILD b/extra/clamav/PKGBUILD index 4b7a8e00a..affde1857 100644 --- a/extra/clamav/PKGBUILD +++ b/extra/clamav/PKGBUILD @@ -1,36 +1,36 @@ -# $Id: PKGBUILD 197893 2013-10-30 11:31:17Z allan $ +# $Id: PKGBUILD 203336 2014-01-08 07:29:58Z bisson $ # Contributor: Dale Blount <dale@archlinux.org> # Contributor: Gregor Ibic <gregor.ibic@intelicom.si> # Maintainer: Gaetan Bisson <bisson@archlinux.org> pkgname=clamav pkgver=0.98 -pkgrel=1 +pkgrel=2 pkgdesc='Anti-virus toolkit for Unix' url='http://www.clamav.net/' license=('GPL') arch=('i686' 'x86_64') -depends=('bzip2' 'libltdl') -backup=('etc/logrotate.d/clamav') +depends=('bzip2' 'libltdl' 'gcc-libs') source=("http://downloads.sourceforge.net/project/${pkgname}/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.gz" - 'service' - 'service.fresh' 'logrotate' 'tmpfiles.d' - 'config.patch') + 'clamd.conf' + 'freshclam.conf' + 'clamd.service' + 'freshclamd.service') sha1sums=('1e6a7284721387646c713a8d32fa8b5a897985db' - 'b6ac0c5de1e5b41232b10d4f84e86201c370eaeb' - 'cda9a087e5593992150cb456e34c5f6f589aca82' 'bb488a56b0f6a0760446cde89c1e3321e2717b78' 'a224ea9b4d0f4f196827347d54bed51e11c197ea' - '00dfadd93d11186793cb1161745f9dd7370beb99') + '887f624eb305f2446f55d8339e2972ad0cfe2b79' + 'b767837d0279ad30b92c314cb762b73e5ad0415e' + 'b6ac0c5de1e5b41232b10d4f84e86201c370eaeb' + 'cda9a087e5593992150cb456e34c5f6f589aca82') -install=install +backup=('etc/clamav/clamd.conf' + 'etc/clamav/freshclam.conf' + 'etc/logrotate.d/clamav') -prepare() { - cd "${srcdir}/${pkgname}-${pkgver}" - patch -p1 -i ../config.patch -} +install=install build() { cd "${srcdir}/${pkgname}-${pkgver}" @@ -48,8 +48,10 @@ package() { cd "${srcdir}/${pkgname}-${pkgver}" make DESTDIR="${pkgdir}" install - install -Dm644 ../service.fresh "${pkgdir}"/usr/lib/systemd/system/freshclamd.service - install -Dm644 ../service "${pkgdir}"/usr/lib/systemd/system/clamd.service + install -Dm644 ../clamd.conf "${pkgdir}"/etc/clamav/clamd.conf + install -Dm644 ../freshclam.conf "${pkgdir}"/etc/clamav/freshclam.conf + install -Dm644 ../freshclamd.service "${pkgdir}"/usr/lib/systemd/system/freshclamd.service + install -Dm644 ../clamd.service "${pkgdir}"/usr/lib/systemd/system/clamd.service install -Dm644 ../tmpfiles.d "${pkgdir}"/usr/lib/tmpfiles.d/clamav.conf install -Dm644 ../logrotate "${pkgdir}"/etc/logrotate.d/clamav diff --git a/extra/clamav/clamd.conf b/extra/clamav/clamd.conf new file mode 100644 index 000000000..d231ec9f0 --- /dev/null +++ b/extra/clamav/clamd.conf @@ -0,0 +1,6 @@ +LogFile /var/log/clamav/clamd.log +LogTime yes +PidFile /run/clamav/clamd.pid +TemporaryDirectory /tmp +LocalSocket /var/lib/clamav/clamd.sock +User clamav diff --git a/extra/clamav/service b/extra/clamav/clamd.service index 86608c40e..86608c40e 100644 --- a/extra/clamav/service +++ b/extra/clamav/clamd.service diff --git a/extra/clamav/config.patch b/extra/clamav/config.patch deleted file mode 100644 index 0b552b3f9..000000000 --- a/extra/clamav/config.patch +++ /dev/null @@ -1,30 +0,0 @@ -diff -arU 0 old/etc/clamd.conf.sample new/etc/clamd.conf.sample ---- old/etc/clamd.conf.sample 2010-12-02 19:31:21.773357389 +0100 -+++ new/etc/clamd.conf.sample 2010-12-02 19:31:45.873357389 +0100 -@@ -14 +14 @@ --#LogFile /tmp/clamd.log -+LogFile /var/log/clamav/clamd.log -@@ -34 +34 @@ --#LogTime yes -+LogTime yes -@@ -61 +61 @@ --#PidFile /var/run/clamd.pid -+PidFile /run/clamav/clamd.pid -@@ -65 +65 @@ --#TemporaryDirectory /var/tmp -+TemporaryDirectory /tmp -@@ -80 +80 @@ --#LocalSocket /tmp/clamd.socket -+LocalSocket /var/lib/clamav/clamd.sock -@@ -190 +190 @@ --#User clamav -+User clamav -diff -arU 0 old/etc/freshclam.conf.sample new/etc/freshclam.conf.sample ---- old/etc/freshclam.conf.sample 2010-12-02 19:31:21.773357389 +0100 -+++ new/etc/freshclam.conf.sample 2010-12-02 19:31:51.190024057 +0100 -@@ -17 +17 @@ --#UpdateLogFile /var/log/freshclam.log -+UpdateLogFile /var/log/clamav/freshclam.log -@@ -121 +121 @@ --#NotifyClamd /path/to/clamd.conf -+NotifyClamd /etc/clamav/clamd.conf diff --git a/extra/clamav/freshclam.conf b/extra/clamav/freshclam.conf new file mode 100644 index 000000000..db513fd3e --- /dev/null +++ b/extra/clamav/freshclam.conf @@ -0,0 +1,3 @@ +UpdateLogFile /var/log/clamav/freshclam.log +DatabaseMirror database.clamav.net +NotifyClamd /etc/clamav/clamd.conf diff --git a/extra/clamav/service.fresh b/extra/clamav/freshclamd.service index a0a72c2e6..a0a72c2e6 100644 --- a/extra/clamav/service.fresh +++ b/extra/clamav/freshclamd.service diff --git a/extra/enlightenment16/PKGBUILD b/extra/enlightenment16/PKGBUILD index 467f168f7..2e20fd922 100644 --- a/extra/enlightenment16/PKGBUILD +++ b/extra/enlightenment16/PKGBUILD @@ -1,18 +1,18 @@ -# $Id: PKGBUILD 201529 2013-12-13 21:18:56Z ronald $ +# $Id: PKGBUILD 203364 2014-01-08 20:08:26Z ronald $ # Maintainer: Eric Bélanger <eric@archlinux.org> pkgname=enlightenment16 _pkgname=enlightenment pkgver=1.0.13 _themever=1.0.1 -pkgrel=3 +pkgrel=4 pkgdesc="A fast, flexible, and very extensible Window Manager" arch=('i686' 'x86_64') url="http://www.enlightenment.org" license=('BSD' 'custom') depends=('libxinerama' 'imlib2' 'perl' 'pango' 'libxcomposite' \ 'libxrandr' 'libpulse') -replaces=('enlightenment<=1.0.13') +replaces=('enlightenment>=1.0.13') source=(http://downloads.sourceforge.net/sourceforge/${_pkgname}/e16-${pkgver}.tar.gz \ http://downloads.sourceforge.net/enlightenment/e16-themes-${_themever}.tar.gz) sha1sums=('bcb74385fb6d0732f735f27264ae02b539d136c9' diff --git a/extra/graphicsmagick/PKGBUILD b/extra/graphicsmagick/PKGBUILD index 09b123e8e..ab01cf9e2 100644 --- a/extra/graphicsmagick/PKGBUILD +++ b/extra/graphicsmagick/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 203038 2014-01-02 10:14:56Z bisson $ +# $Id: PKGBUILD 203337 2014-01-08 07:32:11Z bisson $ # Maintainer: Ronald van Haren <ronald.archlinux.org> # Maintainer: Gaetan Bisson <bisson@archlinux.org> # Contributor: Jaroslav Lichtblau <dragonlord@aur.archlinux.org> @@ -6,7 +6,7 @@ pkgname=graphicsmagick pkgver=1.3.19 -pkgrel=1 +pkgrel=2 pkgdesc='Image processing system' url='http://www.graphicsmagick.org/' arch=('i686' 'x86_64') @@ -32,8 +32,7 @@ build() { --with-modules \ --with-perl \ --with-gs-font-dir=/usr/share/fonts/Type1 \ - --with-quantum-depth=32 \ - --with-openmp \ + --with-quantum-depth=16 \ --with-threads make } diff --git a/extra/libdrm/PKGBUILD b/extra/libdrm/PKGBUILD index 917431975..e5c9232ed 100644 --- a/extra/libdrm/PKGBUILD +++ b/extra/libdrm/PKGBUILD @@ -1,8 +1,8 @@ -# $Id: PKGBUILD 200740 2013-12-03 19:25:26Z lcarlier $ +# $Id: PKGBUILD 203374 2014-01-08 20:56:58Z lcarlier $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=libdrm -pkgver=2.4.50 +pkgver=2.4.51 pkgrel=1 pkgdesc="Userspace interface to kernel DRM services" arch=(i686 x86_64) @@ -14,7 +14,7 @@ replaces=('libdrm-new' 'libdrm-nouveau') url="http://dri.freedesktop.org/" source=(http://dri.freedesktop.org/$pkgname/$pkgname-$pkgver.tar.bz2 COPYING) -sha256sums=('3823d24cda800c2cd36995e01830b890edb8fb1bebf97d5ea4318b8c3933b045' +sha256sums=('0bb75284ff56e1188cd2d0721f7cb8830aafcea5c6ca72dfd7b947ea652b951c' '9631d4f694952e3e6ae5a05534c2e93e994e47d3413677a3a00e45c8cef6db93') build() { diff --git a/extra/librsvg/PKGBUILD b/extra/librsvg/PKGBUILD index 59c078568..35829b988 100644 --- a/extra/librsvg/PKGBUILD +++ b/extra/librsvg/PKGBUILD @@ -1,15 +1,15 @@ -# $Id: PKGBUILD 199931 2013-11-19 18:03:47Z heftig $ +# $Id: PKGBUILD 203350 2014-01-08 14:05:06Z heftig $ # Maintainer: Jan de Groot <jgc@archlinux.org> pkgname=librsvg pkgver=2.40.1 -pkgrel=1 +pkgrel=3 epoch=1 pkgdesc="A SVG viewing library" arch=(i686 x86_64) license=('LGPL') depends=('gdk-pixbuf2' 'pango' 'libcroco') -makedepends=('intltool' 'gtk3' 'gobject-introspection') +makedepends=('intltool' 'gtk3' 'gobject-introspection' 'vala') optdepends=('gtk3: for rsvg-view-3') options=('!emptydirs') url="https://live.gnome.org/LibRsvg" @@ -19,7 +19,7 @@ sha256sums=('8813b4fe776d5e7acbce28bacbaed30ccb0cec3734eb3632c711a16ebe2961d7') build() { cd $pkgname-$pkgver - ./configure --prefix=/usr --disable-static + ./configure --prefix=/usr --disable-static --enable-vala make } diff --git a/extra/nasm/PKGBUILD b/extra/nasm/PKGBUILD index 8ef22a31f..9d653f380 100644 --- a/extra/nasm/PKGBUILD +++ b/extra/nasm/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 192097 2013-08-05 20:37:17Z eric $ +# $Id: PKGBUILD 203305 2014-01-07 23:23:24Z eric $ # Maintainer: Stéphane Gaudreault <stephane@archlinux.org> # Contributor: Aaron Griffin <aaron@archlinux.org> pkgname=nasm -pkgver=2.10.09 +pkgver=2.11 pkgrel=1 pkgdesc="An 80x86 assembler designed for portability and modularity" arch=('i686' 'x86_64') @@ -12,7 +12,7 @@ license=('BSD') depends=('glibc') install=nasm.install source=(http://www.nasm.us/pub/nasm/releasebuilds/${pkgver}/${pkgname}-${pkgver}.tar.xz) -sha1sums=('062dd7315b307870917e708a96b6862481cefc54') +sha1sums=('7cc2568ce804fa17d972d159f161adc3f6d25750') build() { cd ${pkgname}-${pkgver} diff --git a/extra/opengtl/PKGBUILD b/extra/opengtl/PKGBUILD deleted file mode 100644 index 8d4402ab9..000000000 --- a/extra/opengtl/PKGBUILD +++ /dev/null @@ -1,47 +0,0 @@ -# $Id: PKGBUILD 188593 2013-06-16 17:21:06Z foutrelis $ -# Maintainer: -# Contributor: Ronald van Haren <ronald.archlinux.org> -# Contributor: Andries Radu <admiral0@live.it> - -pkgname=opengtl -pkgver=0.9.18 -pkgrel=3 -pkgdesc="A set of libraries for using and integrating transformation algorithms (such as filter or color conversion) in graphics applications" -url="http://www.opengtl.org" -arch=('i686' 'x86_64') -license=('GPL') -depends=('gcc-libs' 'llvm-libs') -makedepends=('cmake' 'libpng' 'llvm') -optdepends=('libpng: for using the png extension') -source=(http://download.opengtl.org/OpenGTL-$pkgver.tar.bz2 - opengtl-0.9.18-llvm-3.3.patch - opengtl-0.9.18-memcpy.patch) -sha256sums=('f094b3d2a1a60519975bb3badc05e704f2b93c7a3d2cb753041f2ff27cfcd9f8' - 'c43418bc039660ae86cb86b8b8175342793cb1361c699faa9b6342bc896e3d6c' - '357cc2e538bbaaffe7d58956959d8a7fbae09741d4a87488a5a8c51ec645d23a') - -prepare() { - mkdir build - - # Fix build with LLVM 3.3 (patch from Fedora) - patch -d OpenGTL-$pkgver -Np1 -i "$srcdir/opengtl-0.9.18-llvm-3.3.patch" - - # Fix build with libpng 1.6 - patch -d OpenGTL-$pkgver -Np1 -i "$srcdir/opengtl-0.9.18-memcpy.patch" -} - -build() { - cd "$srcdir/build" - cmake ../OpenGTL-$pkgver \ - -DCMAKE_INSTALL_PREFIX=/usr \ - -DCMAKE_BUILD_TYPE=Release \ - -DCMAKE_SKIP_RPATH=ON - make -} - -package() { - cd "$srcdir/build" - make DESTDIR="$pkgdir" install -} - -# vim:set ts=2 sw=2 et: diff --git a/extra/opengtl/opengtl-0.9.18-llvm-3.3.patch b/extra/opengtl/opengtl-0.9.18-llvm-3.3.patch deleted file mode 100644 index 80280979f..000000000 --- a/extra/opengtl/opengtl-0.9.18-llvm-3.3.patch +++ /dev/null @@ -1,732 +0,0 @@ -diff -up OpenGTL-0.9.18/CMakeLists.txt.jx OpenGTL-0.9.18/CMakeLists.txt ---- OpenGTL-0.9.18/CMakeLists.txt.jx 2012-12-29 06:27:12.000000000 -0500 -+++ OpenGTL-0.9.18/CMakeLists.txt 2013-05-08 15:39:25.090057193 -0400 -@@ -78,8 +78,8 @@ else(MSVC) - FIND_LLVM_LIBS( ${LLVM_CONFIG_EXECUTABLE} "native bitwriter linker bitreader jit interpreter support ipo" LLVM_LIBS LLVM_NATIVE_OBJECTS ) - endif(MSVC) - --if( NOT MSVC AND NOT (LLVM_VERSION STREQUAL "3.1" OR LLVM_VERSION STREQUAL "3.0" OR LLVM_VERSION STREQUAL "3.2svn" OR LLVM_VERSION STREQUAL "3.2" ) ) # There is no way with MSVC to know the llvm version -- message(FATAL_ERROR "LLVM 3.0 or 3.1 or 3.2 is required.") -+if( NOT MSVC AND NOT (LLVM_VERSION STREQUAL "3.3svn" OR LLVM_VERSION STREQUAL "3.3" ) ) # There is no way with MSVC to know the llvm version -+ message(FATAL_ERROR "LLVM 3.3 is required.") - endif() - - if(MSVC) -diff -up OpenGTL-0.9.18/OpenCTL/OpenCTL/compiler/Compiler.cpp.jx OpenGTL-0.9.18/OpenCTL/OpenCTL/compiler/Compiler.cpp ---- OpenGTL-0.9.18/OpenCTL/OpenCTL/compiler/Compiler.cpp.jx 2012-12-29 06:27:12.000000000 -0500 -+++ OpenGTL-0.9.18/OpenCTL/OpenCTL/compiler/Compiler.cpp 2013-05-08 15:39:25.091057197 -0400 -@@ -27,10 +27,10 @@ - #include <climits> - - // LLVM --#include <llvm/InstrTypes.h> -+#include <llvm/IR/InstrTypes.h> - // #include <llvm/Linker.h> --#include <llvm/DerivedTypes.h> --#include <llvm/Module.h> -+#include <llvm/IR/DerivedTypes.h> -+#include <llvm/IR/Module.h> - // #include <llvm/Transforms/Utils/Cloning.h> - // Library Loader - #ifdef LLVM_27_OR_28 -@@ -214,7 +214,7 @@ bool Compiler::compile(bool _isStandardL - return success; - } - --#include <llvm/ValueSymbolTable.h> -+#include <llvm/IR/ValueSymbolTable.h> - - bool Compiler::importModule(const GTLCore::String& name) - { -diff -up OpenGTL-0.9.18/OpenCTL/OpenCTL/compiler/ParserNG.cpp.jx OpenGTL-0.9.18/OpenCTL/OpenCTL/compiler/ParserNG.cpp ---- OpenGTL-0.9.18/OpenCTL/OpenCTL/compiler/ParserNG.cpp.jx 2012-12-29 06:27:12.000000000 -0500 -+++ OpenGTL-0.9.18/OpenCTL/OpenCTL/compiler/ParserNG.cpp 2013-05-08 15:39:25.091057197 -0400 -@@ -19,9 +19,9 @@ - - #include "ParserNG.h" - --#include <llvm/Constants.h> --#include <llvm/DerivedTypes.h> --#include <llvm/Type.h> -+#include <llvm/IR/Constants.h> -+#include <llvm/IR/DerivedTypes.h> -+#include <llvm/IR/Type.h> - - #include <GTLCore/LLVMBackend/CodeGenerator_p.h> - #include <GTLCore/CompilationMessage.h> -diff -up OpenGTL-0.9.18/OpenCTL/OpenCTL/Module.cpp.jx OpenGTL-0.9.18/OpenCTL/OpenCTL/Module.cpp ---- OpenGTL-0.9.18/OpenCTL/OpenCTL/Module.cpp.jx 2012-12-29 06:27:12.000000000 -0500 -+++ OpenGTL-0.9.18/OpenCTL/OpenCTL/Module.cpp 2013-05-08 15:39:25.091057197 -0400 -@@ -38,7 +38,7 @@ - using namespace OpenCTL; - - // LLVM --#include <llvm/Module.h> -+#include <llvm/IR/Module.h> - #include <llvm/Bitcode/ReaderWriter.h> - #ifdef LLVM_27_OR_28 - #include <llvm/System/Path.h> -@@ -47,8 +47,7 @@ using namespace OpenCTL; - #include <llvm/Support/Path.h> - #include <llvm/Support/DynamicLibrary.h> - #endif --#include <llvm/Module.h> --#include <llvm/LLVMContext.h> -+#include <llvm/IR/LLVMContext.h> - - struct Module::Private { - Private() : moduleData(0), isStandardLibrary(false) {} -diff -up OpenGTL-0.9.18/OpenCTL/OpenCTL/Program.cpp.jx OpenGTL-0.9.18/OpenCTL/OpenCTL/Program.cpp ---- OpenGTL-0.9.18/OpenCTL/OpenCTL/Program.cpp.jx 2012-12-29 06:27:12.000000000 -0500 -+++ OpenGTL-0.9.18/OpenCTL/OpenCTL/Program.cpp 2013-05-08 15:39:25.091057197 -0400 -@@ -20,16 +20,16 @@ - #include "Program.h" - - // LLVM --#include <llvm/DerivedTypes.h> --#include <llvm/Instructions.h> --#include <llvm/Module.h> -+#include <llvm/IR/DerivedTypes.h> -+#include <llvm/IR/Instructions.h> -+#include <llvm/IR/Module.h> - #include <llvm/Transforms/Utils/Cloning.h> - - // Passes - #include <llvm/PassManager.h> - #include <llvm/Analysis/LoopPass.h> - #include <llvm/Analysis/Verifier.h> --#include <llvm/GlobalVariable.h> -+#include <llvm/IR/GlobalVariable.h> - - // GTLCore - #include "GTLCore/Buffer.h" -diff -up OpenGTL-0.9.18/OpenGTL/GTLCore/AST/AccessorExpression.cpp.jx OpenGTL-0.9.18/OpenGTL/GTLCore/AST/AccessorExpression.cpp ---- OpenGTL-0.9.18/OpenGTL/GTLCore/AST/AccessorExpression.cpp.jx 2012-12-29 06:27:12.000000000 -0500 -+++ OpenGTL-0.9.18/OpenGTL/GTLCore/AST/AccessorExpression.cpp 2013-05-08 15:39:25.092057201 -0400 -@@ -20,9 +20,9 @@ - #include "AccessorExpression.h" - - #include <llvm/ADT/ArrayRef.h> --#include <llvm/Constants.h> --#include <llvm/Function.h> --#include <llvm/Instructions.h> -+#include <llvm/IR/Constants.h> -+#include <llvm/IR/Function.h> -+#include <llvm/IR/Instructions.h> - - #include "../LLVMBackend/CodeGenerator_p.h" - #include "../LLVMBackend/ExpressionResult_p.h" -diff -up OpenGTL-0.9.18/OpenGTL/GTLCore/AST/BinaryExpression.cpp.jx OpenGTL-0.9.18/OpenGTL/GTLCore/AST/BinaryExpression.cpp ---- OpenGTL-0.9.18/OpenGTL/GTLCore/AST/BinaryExpression.cpp.jx 2012-12-29 06:27:12.000000000 -0500 -+++ OpenGTL-0.9.18/OpenGTL/GTLCore/AST/BinaryExpression.cpp 2013-05-08 15:39:25.092057201 -0400 -@@ -19,7 +19,7 @@ - - #include "BinaryExpression.h" - --#include <llvm/Instructions.h> -+#include <llvm/IR/Instructions.h> - - #include <GTLCore/Debug.h> - #include <GTLCore/LLVMBackend/CodeGenerator_p.h> -diff -up OpenGTL-0.9.18/OpenGTL/GTLCore/AST/CompoundExpression.cpp.jx OpenGTL-0.9.18/OpenGTL/GTLCore/AST/CompoundExpression.cpp ---- OpenGTL-0.9.18/OpenGTL/GTLCore/AST/CompoundExpression.cpp.jx 2012-12-29 06:27:12.000000000 -0500 -+++ OpenGTL-0.9.18/OpenGTL/GTLCore/AST/CompoundExpression.cpp 2013-05-08 15:39:25.092057201 -0400 -@@ -19,10 +19,10 @@ - - #include "CompoundExpression.h" - --#include <llvm/Constants.h> --#include <llvm/DerivedTypes.h> --#include <llvm/GlobalVariable.h> --#include <llvm/Instructions.h> -+#include <llvm/IR/Constants.h> -+#include <llvm/IR/DerivedTypes.h> -+#include <llvm/IR/GlobalVariable.h> -+#include <llvm/IR/Instructions.h> - - #include "../LLVMBackend/CodeGenerator_p.h" - #include "../Debug.h" -diff -up OpenGTL-0.9.18/OpenGTL/GTLCore/AST/ConstantCompoundExpression.cpp.jx OpenGTL-0.9.18/OpenGTL/GTLCore/AST/ConstantCompoundExpression.cpp ---- OpenGTL-0.9.18/OpenGTL/GTLCore/AST/ConstantCompoundExpression.cpp.jx 2012-12-29 06:27:12.000000000 -0500 -+++ OpenGTL-0.9.18/OpenGTL/GTLCore/AST/ConstantCompoundExpression.cpp 2013-05-08 15:39:25.092057201 -0400 -@@ -19,10 +19,10 @@ - - #include "ConstantCompoundExpression.h" - --#include <llvm/Constants.h> --#include <llvm/DerivedTypes.h> --#include <llvm/GlobalVariable.h> --#include <llvm/Instructions.h> -+#include <llvm/IR/Constants.h> -+#include <llvm/IR/DerivedTypes.h> -+#include <llvm/IR/GlobalVariable.h> -+#include <llvm/IR/Instructions.h> - - #include "../LLVMBackend/CodeGenerator_p.h" - #include "../Debug.h" -diff -up OpenGTL-0.9.18/OpenGTL/GTLCore/AST/Expression.cpp.jx OpenGTL-0.9.18/OpenGTL/GTLCore/AST/Expression.cpp ---- OpenGTL-0.9.18/OpenGTL/GTLCore/AST/Expression.cpp.jx 2012-12-29 06:27:12.000000000 -0500 -+++ OpenGTL-0.9.18/OpenGTL/GTLCore/AST/Expression.cpp 2013-05-08 15:39:25.093057205 -0400 -@@ -19,11 +19,11 @@ - - #include "Expression.h" - --#include <llvm/Constant.h> --#include <llvm/Constants.h> --#include <llvm/Function.h> --#include <llvm/GlobalVariable.h> --#include <llvm/Instructions.h> -+#include <llvm/IR/Constant.h> -+#include <llvm/IR/Constants.h> -+#include <llvm/IR/Function.h> -+#include <llvm/IR/GlobalVariable.h> -+#include <llvm/IR/Instructions.h> - - #include "GTLCore/LLVMBackend/CodeGenerator_p.h" - #include "GTLCore/LLVMBackend/ExpressionResult_p.h" -diff -up OpenGTL-0.9.18/OpenGTL/GTLCore/AST/FunctionDeclaration.cpp.jx OpenGTL-0.9.18/OpenGTL/GTLCore/AST/FunctionDeclaration.cpp ---- OpenGTL-0.9.18/OpenGTL/GTLCore/AST/FunctionDeclaration.cpp.jx 2012-12-29 06:27:12.000000000 -0500 -+++ OpenGTL-0.9.18/OpenGTL/GTLCore/AST/FunctionDeclaration.cpp 2013-05-08 15:39:25.093057205 -0400 -@@ -19,10 +19,10 @@ - - #include "FunctionDeclaration.h" - --#include <llvm/DerivedTypes.h> --#include <llvm/Function.h> --#include <llvm/Instructions.h> --#include <llvm/Type.h> -+#include <llvm/IR/DerivedTypes.h> -+#include <llvm/IR/Function.h> -+#include <llvm/IR/Instructions.h> -+#include <llvm/IR/Type.h> - - #include <GTLCore/LLVMBackend/CodeGenerator_p.h> - #include <GTLCore/LLVMBackend/ExpressionResult_p.h> -diff -up OpenGTL-0.9.18/OpenGTL/GTLCore/AST/GarbageCollectionStatement.cpp.jx OpenGTL-0.9.18/OpenGTL/GTLCore/AST/GarbageCollectionStatement.cpp ---- OpenGTL-0.9.18/OpenGTL/GTLCore/AST/GarbageCollectionStatement.cpp.jx 2012-12-29 06:27:12.000000000 -0500 -+++ OpenGTL-0.9.18/OpenGTL/GTLCore/AST/GarbageCollectionStatement.cpp 2013-05-08 15:39:25.093057205 -0400 -@@ -21,8 +21,8 @@ - - #include <stdlib.h> - --#include <llvm/Constant.h> --#include <llvm/Instructions.h> -+#include <llvm/IR/Constant.h> -+#include <llvm/IR/Instructions.h> - - #include "../Type.h" - #include "../LLVMBackend/CodeGenerator_p.h" -diff -up OpenGTL-0.9.18/OpenGTL/GTLCore/AST/Statement.cpp.jx OpenGTL-0.9.18/OpenGTL/GTLCore/AST/Statement.cpp ---- OpenGTL-0.9.18/OpenGTL/GTLCore/AST/Statement.cpp.jx 2012-12-29 06:27:12.000000000 -0500 -+++ OpenGTL-0.9.18/OpenGTL/GTLCore/AST/Statement.cpp 2013-05-08 15:39:25.093057205 -0400 -@@ -21,12 +21,12 @@ - - // LLVM - #include <llvm/ADT/ArrayRef.h> --#include <llvm/BasicBlock.h> --#include <llvm/Constants.h> --#include <llvm/Function.h> --#include <llvm/GlobalVariable.h> --#include <llvm/Instructions.h> --#include <llvm/Module.h> -+#include <llvm/IR/BasicBlock.h> -+#include <llvm/IR/Constants.h> -+#include <llvm/IR/Function.h> -+#include <llvm/IR/GlobalVariable.h> -+#include <llvm/IR/Instructions.h> -+#include <llvm/IR/Module.h> - - // GTLCore - #include <GTLCore/LLVMBackend/CodeGenerator_p.h> -diff -up OpenGTL-0.9.18/OpenGTL/GTLCore/AST/Tree.cpp.jx OpenGTL-0.9.18/OpenGTL/GTLCore/AST/Tree.cpp ---- OpenGTL-0.9.18/OpenGTL/GTLCore/AST/Tree.cpp.jx 2012-12-29 06:27:12.000000000 -0500 -+++ OpenGTL-0.9.18/OpenGTL/GTLCore/AST/Tree.cpp 2013-05-08 15:39:25.094057209 -0400 -@@ -19,9 +19,9 @@ - - #include "Tree.h" - --#include <llvm/Constant.h> --#include <llvm/GlobalVariable.h> --#include <llvm/Type.h> -+#include <llvm/IR/Constant.h> -+#include <llvm/IR/GlobalVariable.h> -+#include <llvm/IR/Type.h> - - #include "FunctionDeclaration.h" - -@@ -37,8 +37,8 @@ - #include "GTLCore/LLVMBackend/Visitor_p.h" - - #include "Expression.h" --#include <llvm/Module.h> --#include <llvm/DerivedTypes.h> -+#include <llvm/IR/Module.h> -+#include <llvm/IR/DerivedTypes.h> - - using namespace GTLCore::AST; - -diff -up OpenGTL-0.9.18/OpenGTL/GTLCore/Debug.cpp.jx OpenGTL-0.9.18/OpenGTL/GTLCore/Debug.cpp ---- OpenGTL-0.9.18/OpenGTL/GTLCore/Debug.cpp.jx 2012-12-29 06:27:12.000000000 -0500 -+++ OpenGTL-0.9.18/OpenGTL/GTLCore/Debug.cpp 2013-05-08 15:39:25.094057209 -0400 -@@ -22,9 +22,9 @@ - #include <map> - #include <fstream> - --#include <llvm/Module.h> --#include <llvm/Value.h> --#include <llvm/Type.h> -+#include <llvm/IR/Module.h> -+#include <llvm/IR/Value.h> -+#include <llvm/IR/Type.h> - #include <llvm/Support/Path.h> - #include <llvm/Support/raw_ostream.h> - -@@ -418,9 +418,9 @@ namespace GTLCore { - - #ifdef OPENGTL_ENABLE_DEBUG_OUTPUT - --#include <llvm/DerivedTypes.h> --#include <llvm/Function.h> --#include <llvm/Type.h> -+#include <llvm/IR/DerivedTypes.h> -+#include <llvm/IR/Function.h> -+#include <llvm/IR/Type.h> - - void compareFunctionParameters( llvm::Value* func, const std::vector<llvm::Value*>& params ) - { -diff -up OpenGTL-0.9.18/OpenGTL/GTLCore/FunctionCaller_p.cpp.jx OpenGTL-0.9.18/OpenGTL/GTLCore/FunctionCaller_p.cpp ---- OpenGTL-0.9.18/OpenGTL/GTLCore/FunctionCaller_p.cpp.jx 2012-12-29 06:27:12.000000000 -0500 -+++ OpenGTL-0.9.18/OpenGTL/GTLCore/FunctionCaller_p.cpp 2013-05-08 15:39:25.094057209 -0400 -@@ -21,9 +21,9 @@ - - #include <llvm/ExecutionEngine/GenericValue.h> - #include <llvm/ExecutionEngine/ExecutionEngine.h> --#include <llvm/Function.h> -- --#include <llvm/DerivedTypes.h> // <- I don't understand why I need to include that file to be able to display llvm::Type on the standard output -+#include <llvm/IR/Function.h> -+#include <llvm/IR/Instructions.h> -+#include <llvm/IR/DerivedTypes.h> // <- I don't understand why I need to include that file to be able to display llvm::Type on the standard output - - #include "VirtualMachine_p.h" - -@@ -35,7 +35,6 @@ - #include "LLVMBackend/GenerationContext_p.h" - #include "ModuleData_p.h" - #include "LLVMBackend/CodeGenerator_p.h" --#include <llvm/Instructions.h> - #include "Type_p.h" - #include <GTLCore/Parameter.h> - #include "PrimitiveTypesTraits_p.h" -diff -up OpenGTL-0.9.18/OpenGTL/GTLCore/Function_p.cpp.jx OpenGTL-0.9.18/OpenGTL/GTLCore/Function_p.cpp ---- OpenGTL-0.9.18/OpenGTL/GTLCore/Function_p.cpp.jx 2012-12-29 06:27:12.000000000 -0500 -+++ OpenGTL-0.9.18/OpenGTL/GTLCore/Function_p.cpp 2013-05-08 15:39:25.094057209 -0400 -@@ -21,9 +21,9 @@ - - #include <cstdarg> - --#include <llvm/DerivedTypes.h> --#include <llvm/Module.h> --#include <llvm/Type.h> -+#include <llvm/IR/DerivedTypes.h> -+#include <llvm/IR/Module.h> -+#include <llvm/IR/Type.h> - - #include "Parameter.h" - -diff -up OpenGTL-0.9.18/OpenGTL/GTLCore/LLVMBackend/CodeGenerator_p.cpp.jx OpenGTL-0.9.18/OpenGTL/GTLCore/LLVMBackend/CodeGenerator_p.cpp ---- OpenGTL-0.9.18/OpenGTL/GTLCore/LLVMBackend/CodeGenerator_p.cpp.jx 2012-12-29 06:27:12.000000000 -0500 -+++ OpenGTL-0.9.18/OpenGTL/GTLCore/LLVMBackend/CodeGenerator_p.cpp 2013-05-08 15:39:25.095057213 -0400 -@@ -19,12 +19,12 @@ - - #include "CodeGenerator_p.h" - --#include <llvm/CallingConv.h> --#include <llvm/Constants.h> --#include <llvm/Function.h> --#include <llvm/Instructions.h> --#include <llvm/Module.h> --#include <llvm/Value.h> -+#include <llvm/IR/CallingConv.h> -+#include <llvm/IR/Constants.h> -+#include <llvm/IR/Function.h> -+#include <llvm/IR/Instructions.h> -+#include <llvm/IR/Module.h> -+#include <llvm/IR/Value.h> - - #include "GTLCore/Debug.h" - #include "ExpressionResult_p.h" -diff -up OpenGTL-0.9.18/OpenGTL/GTLCore/LLVMBackend/ContextManager_p.cpp.jx OpenGTL-0.9.18/OpenGTL/GTLCore/LLVMBackend/ContextManager_p.cpp ---- OpenGTL-0.9.18/OpenGTL/GTLCore/LLVMBackend/ContextManager_p.cpp.jx 2012-12-29 06:27:12.000000000 -0500 -+++ OpenGTL-0.9.18/OpenGTL/GTLCore/LLVMBackend/ContextManager_p.cpp 2013-05-08 15:39:25.095057213 -0400 -@@ -20,7 +20,7 @@ - #include "ContextManager_p.h" - - #include <llvm/Support/ThreadLocal.h> --#include <llvm/LLVMContext.h> -+#include <llvm/IR/LLVMContext.h> - - using namespace LLVMBackend; - -diff -up OpenGTL-0.9.18/OpenGTL/GTLCore/LLVMBackend/ExpressionGenerationContext_p.cpp.jx OpenGTL-0.9.18/OpenGTL/GTLCore/LLVMBackend/ExpressionGenerationContext_p.cpp ---- OpenGTL-0.9.18/OpenGTL/GTLCore/LLVMBackend/ExpressionGenerationContext_p.cpp.jx 2012-12-29 06:27:12.000000000 -0500 -+++ OpenGTL-0.9.18/OpenGTL/GTLCore/LLVMBackend/ExpressionGenerationContext_p.cpp 2013-05-08 15:39:25.095057213 -0400 -@@ -20,7 +20,7 @@ - #include "ExpressionGenerationContext_p.h" - - #include "GTLCore/Debug.h" --#include <llvm/BasicBlock.h> -+#include <llvm/IR/BasicBlock.h> - - #include "GTLCore/Macros_p.h" - -diff -up OpenGTL-0.9.18/OpenGTL/GTLCore/LLVMBackend/ExpressionResult_p.cpp.jx OpenGTL-0.9.18/OpenGTL/GTLCore/LLVMBackend/ExpressionResult_p.cpp ---- OpenGTL-0.9.18/OpenGTL/GTLCore/LLVMBackend/ExpressionResult_p.cpp.jx 2012-12-29 06:27:12.000000000 -0500 -+++ OpenGTL-0.9.18/OpenGTL/GTLCore/LLVMBackend/ExpressionResult_p.cpp 2013-05-08 15:39:25.095057213 -0400 -@@ -19,8 +19,8 @@ - - #include "ExpressionResult_p.h" - --#include "llvm/Constant.h" --#include "llvm/DerivedTypes.h" -+#include "llvm/IR/Constant.h" -+#include "llvm/IR/DerivedTypes.h" - - #include "../Type.h" - #include "../Type_p.h" -diff -up OpenGTL-0.9.18/OpenGTL/GTLCore/LLVMBackend/GenerationContext_p.cpp.jx OpenGTL-0.9.18/OpenGTL/GTLCore/LLVMBackend/GenerationContext_p.cpp ---- OpenGTL-0.9.18/OpenGTL/GTLCore/LLVMBackend/GenerationContext_p.cpp.jx 2012-12-29 06:27:12.000000000 -0500 -+++ OpenGTL-0.9.18/OpenGTL/GTLCore/LLVMBackend/GenerationContext_p.cpp 2013-05-08 15:39:25.096057217 -0400 -@@ -22,8 +22,8 @@ - #include "GTLCore/ModuleData_p.h" - #include "GTLCore/Debug.h" - --#include "llvm/BasicBlock.h" --#include "llvm/Function.h" -+#include "llvm/IR/BasicBlock.h" -+#include "llvm/IR/Function.h" - - #include "GTLCore/AST/Statement.h" - -diff -up OpenGTL-0.9.18/OpenGTL/GTLCore/LLVMBackend/Visitor_p.cpp.jx OpenGTL-0.9.18/OpenGTL/GTLCore/LLVMBackend/Visitor_p.cpp ---- OpenGTL-0.9.18/OpenGTL/GTLCore/LLVMBackend/Visitor_p.cpp.jx 2012-12-29 06:27:12.000000000 -0500 -+++ OpenGTL-0.9.18/OpenGTL/GTLCore/LLVMBackend/Visitor_p.cpp 2013-05-08 15:39:25.096057217 -0400 -@@ -20,12 +20,12 @@ - #include "Visitor_p.h" - - // LLVM --#include <llvm/BasicBlock.h> --#include <llvm/Constants.h> --#include <llvm/Function.h> --#include <llvm/Instructions.h> --#include <llvm/Module.h> --#include <llvm/GlobalVariable.h> -+#include <llvm/IR/BasicBlock.h> -+#include <llvm/IR/Constants.h> -+#include <llvm/IR/Function.h> -+#include <llvm/IR/Instructions.h> -+#include <llvm/IR/Module.h> -+#include <llvm/IR/GlobalVariable.h> - - // GTLCore - #include "CodeGenerator_p.h" -diff -up OpenGTL-0.9.18/OpenGTL/GTLCore/ModuleData_p.cpp.jx OpenGTL-0.9.18/OpenGTL/GTLCore/ModuleData_p.cpp ---- OpenGTL-0.9.18/OpenGTL/GTLCore/ModuleData_p.cpp.jx 2012-12-29 06:27:12.000000000 -0500 -+++ OpenGTL-0.9.18/OpenGTL/GTLCore/ModuleData_p.cpp 2013-05-08 15:41:21.422512114 -0400 -@@ -21,7 +21,7 @@ - - #include <sstream> - --#include <llvm/Module.h> -+#include <llvm/IR/Module.h> - #include <llvm/PassManager.h> - #include <llvm/Target/TargetMachine.h> - #include <llvm/Analysis/Verifier.h> -@@ -242,7 +242,7 @@ void ModuleData::doLink() - GTL_ASSERT( not m_llvmLinkedModule ); - m_llvmLinkedModule = m_llvmModule; - m_llvmModule = llvm::CloneModule( m_llvmModule ); -- llvm::Linker linker("", m_llvmLinkedModule); -+ llvm::Linker linker(m_llvmLinkedModule); - std::string errorMessage; - foreach( const llvm::Module* mod, m_linkModuleWith ) - { -@@ -270,18 +270,11 @@ void ModuleData::doLink() - hide.push_back(name); - } - } -- linker.LinkInModule( clone, &errorMessage ); -+ linker.linkInModule( clone, &errorMessage ); - - GTL_DEBUG("Linking error: " << errorMessage ); - delete clone; - } -- foreach( const GTLCore::String& mod, m_linkModuleWithArchives ) -- { -- bool v = false; -- linker.LinkInArchive( llvm::sys::Path( (const std::string&) mod), v); -- } -- -- linker.releaseModule(); - - // Hide symbols - foreach(GTLCore::String name, hide) -diff -up OpenGTL-0.9.18/OpenGTL/GTLCore/Type.cpp.jx OpenGTL-0.9.18/OpenGTL/GTLCore/Type.cpp ---- OpenGTL-0.9.18/OpenGTL/GTLCore/Type.cpp.jx 2012-12-29 06:27:12.000000000 -0500 -+++ OpenGTL-0.9.18/OpenGTL/GTLCore/Type.cpp 2013-05-08 15:39:25.096057217 -0400 -@@ -25,7 +25,7 @@ - - #include <iostream> - --#include <llvm/DerivedTypes.h> -+#include <llvm/IR/DerivedTypes.h> - - #include "wrappers/StructWrap.h" - #include "SharedPointer.h" -diff -up OpenGTL-0.9.18/OpenGTL/GTLCore/Type_p.cpp.jx OpenGTL-0.9.18/OpenGTL/GTLCore/Type_p.cpp ---- OpenGTL-0.9.18/OpenGTL/GTLCore/Type_p.cpp.jx 2012-12-29 06:27:12.000000000 -0500 -+++ OpenGTL-0.9.18/OpenGTL/GTLCore/Type_p.cpp 2013-05-08 15:39:25.097057221 -0400 -@@ -30,8 +30,8 @@ - - using namespace GTLCore; - --#include <llvm/Type.h> --#include <llvm/DerivedTypes.h> -+#include <llvm/IR/Type.h> -+#include <llvm/IR/DerivedTypes.h> - - Type::StructDataMember::Information::~Information() - { -diff -up OpenGTL-0.9.18/OpenGTL/GTLCore/Value_p.cpp.jx OpenGTL-0.9.18/OpenGTL/GTLCore/Value_p.cpp ---- OpenGTL-0.9.18/OpenGTL/GTLCore/Value_p.cpp.jx 2012-12-29 06:27:12.000000000 -0500 -+++ OpenGTL-0.9.18/OpenGTL/GTLCore/Value_p.cpp 2013-05-08 15:39:25.097057221 -0400 -@@ -19,8 +19,8 @@ - - #include "Value_p.h" - --#include <llvm/DerivedTypes.h> --#include <llvm/Type.h> -+#include <llvm/IR/DerivedTypes.h> -+#include <llvm/IR/Type.h> - - #include "Debug.h" - #include "Value.h" -diff -up OpenGTL-0.9.18/OpenGTL/GTLCore/VariableNG_p.cpp.jx OpenGTL-0.9.18/OpenGTL/GTLCore/VariableNG_p.cpp ---- OpenGTL-0.9.18/OpenGTL/GTLCore/VariableNG_p.cpp.jx 2012-12-29 06:27:12.000000000 -0500 -+++ OpenGTL-0.9.18/OpenGTL/GTLCore/VariableNG_p.cpp 2013-05-08 15:39:25.097057221 -0400 -@@ -19,8 +19,8 @@ - - #include "VariableNG_p.h" - --#include <llvm/Constants.h> --#include <llvm/Instructions.h> -+#include <llvm/IR/Constants.h> -+#include <llvm/IR/Instructions.h> - - #include "LLVMBackend/CodeGenerator_p.h" - #include "Debug.h" -diff -up OpenGTL-0.9.18/OpenGTL/GTLCore/VirtualMachine_p.cpp.jx OpenGTL-0.9.18/OpenGTL/GTLCore/VirtualMachine_p.cpp ---- OpenGTL-0.9.18/OpenGTL/GTLCore/VirtualMachine_p.cpp.jx 2012-12-29 06:27:12.000000000 -0500 -+++ OpenGTL-0.9.18/OpenGTL/GTLCore/VirtualMachine_p.cpp 2013-05-08 15:39:25.097057221 -0400 -@@ -21,10 +21,10 @@ - - // JIT - #include <llvm/ExecutionEngine/ExecutionEngine.h> --#include <llvm/Module.h> --#include <llvm/DerivedTypes.h> -+#include <llvm/IR/Module.h> -+#include <llvm/IR/DerivedTypes.h> - #include <llvm/Target/TargetOptions.h> --#include <llvm/LLVMContext.h> -+#include <llvm/IR/LLVMContext.h> - #include <llvm/Support/CommandLine.h> - #include <llvm/Support/Threading.h> - #include <llvm/Support/ErrorHandling.h> -@@ -48,7 +48,8 @@ struct VirtualMachine::Private { - VirtualMachine* VirtualMachine::Private::virtualMachine = 0; - int VirtualMachine::Private::optimLevel = 2; - --void gtl_llvm_error_handler(void *user_data, const std::string& reason) -+void gtl_llvm_error_handler(void *user_data, const std::string& reason, -+ bool gen_crash_diag) - { - GTL_ABORT(reason); - } -@@ -58,11 +59,7 @@ VirtualMachine::VirtualMachine() : d(new - { - d->executionEngine = 0; - --#ifdef LLVM_27 -- llvm::llvm_install_error_handler(>l_llvm_error_handler); --#else -- llvm::install_fatal_error_handler(>l_llvm_error_handler); --#endif -+ llvm::install_fatal_error_handler(gtl_llvm_error_handler); - - llvm::llvm_start_multithreaded(); - -diff -up OpenGTL-0.9.18/OpenGTL/GTLFragment/Compiler_p.cpp.jx OpenGTL-0.9.18/OpenGTL/GTLFragment/Compiler_p.cpp ---- OpenGTL-0.9.18/OpenGTL/GTLFragment/Compiler_p.cpp.jx 2012-12-29 06:27:12.000000000 -0500 -+++ OpenGTL-0.9.18/OpenGTL/GTLFragment/Compiler_p.cpp 2013-05-08 15:39:25.097057221 -0400 -@@ -19,7 +19,7 @@ - - #include "Compiler_p.h" - --#include <llvm/Module.h> -+#include <llvm/IR/Module.h> - #include <llvm/PassManager.h> - - #include "GTLCore/AST/Expression.h" -diff -up OpenGTL-0.9.18/OpenGTL/GTLFragment/Library.cpp.jx OpenGTL-0.9.18/OpenGTL/GTLFragment/Library.cpp ---- OpenGTL-0.9.18/OpenGTL/GTLFragment/Library.cpp.jx 2012-12-29 06:27:12.000000000 -0500 -+++ OpenGTL-0.9.18/OpenGTL/GTLFragment/Library.cpp 2013-05-08 15:39:25.098057225 -0400 -@@ -22,9 +22,9 @@ - - #include <sstream> - --#include <llvm/Module.h> -+#include <llvm/IR/Module.h> - #include <llvm/Support/DynamicLibrary.h> --#include <llvm/LLVMContext.h> -+#include <llvm/IR/LLVMContext.h> - - #include "GTLCore/CompilationMessage.h" - #include "GTLCore/Function.h" -diff -up OpenGTL-0.9.18/OpenGTL/GTLFragment/Wrapper.cpp.jx OpenGTL-0.9.18/OpenGTL/GTLFragment/Wrapper.cpp ---- OpenGTL-0.9.18/OpenGTL/GTLFragment/Wrapper.cpp.jx 2012-12-29 06:27:12.000000000 -0500 -+++ OpenGTL-0.9.18/OpenGTL/GTLFragment/Wrapper.cpp 2013-05-08 15:39:25.098057225 -0400 -@@ -29,7 +29,7 @@ - - #include "Library.h" - #include <GTLCore/Function_p.h> --#include <llvm/Module.h> -+#include <llvm/IR/Module.h> - #include <GTLCore/Type_p.h> - - using namespace GTLFragment; -diff -up OpenGTL-0.9.18/OpenShiva/OpenShiva/CodeGenerator_p.cpp.jx OpenGTL-0.9.18/OpenShiva/OpenShiva/CodeGenerator_p.cpp ---- OpenGTL-0.9.18/OpenShiva/OpenShiva/CodeGenerator_p.cpp.jx 2012-12-29 06:27:12.000000000 -0500 -+++ OpenGTL-0.9.18/OpenShiva/OpenShiva/CodeGenerator_p.cpp 2013-05-08 15:39:25.098057225 -0400 -@@ -21,14 +21,14 @@ - - #include <vector> - --#include <llvm/CallingConv.h> --#include <llvm/Constants.h> --#include <llvm/Constant.h> --#include <llvm/DerivedTypes.h> --#include <llvm/Function.h> --#include <llvm/Instructions.h> --#include <llvm/Module.h> --#include <llvm/Value.h> -+#include <llvm/IR/CallingConv.h> -+#include <llvm/IR/Constants.h> -+#include <llvm/IR/Constant.h> -+#include <llvm/IR/DerivedTypes.h> -+#include <llvm/IR/Function.h> -+#include <llvm/IR/Instructions.h> -+#include <llvm/IR/Module.h> -+#include <llvm/IR/Value.h> - - #include "GTLCore/LLVMBackend/CodeGenerator_p.h" - #include "GTLCore/LLVMBackend/ExpressionResult_p.h" -diff -up OpenGTL-0.9.18/OpenShiva/OpenShiva/ColorToPixelOverloadOperatorFactory_p.cpp.jx OpenGTL-0.9.18/OpenShiva/OpenShiva/ColorToPixelOverloadOperatorFactory_p.cpp ---- OpenGTL-0.9.18/OpenShiva/OpenShiva/ColorToPixelOverloadOperatorFactory_p.cpp.jx 2012-12-29 06:27:12.000000000 -0500 -+++ OpenGTL-0.9.18/OpenShiva/OpenShiva/ColorToPixelOverloadOperatorFactory_p.cpp 2013-05-08 15:39:25.098057225 -0400 -@@ -28,13 +28,13 @@ - #include "CodeGenerator_p.h" - #include <GTLFragment/wrappers/ColorWrap_p.h> - #include <GTLCore/Type_p.h> --#include <llvm/Value.h> --#include <llvm/DerivedTypes.h> --#include <llvm/CallingConv.h> --#include <llvm/Module.h> -+#include <llvm/IR/Value.h> -+#include <llvm/IR/DerivedTypes.h> -+#include <llvm/IR/CallingConv.h> -+#include <llvm/IR/Module.h> - #include <GTLCore/LLVMBackend/ExpressionGenerationContext_p.h> - #include <GTLCore/LLVMBackend/CodeGenerator_p.h> --#include <llvm/Instructions.h> -+#include <llvm/IR/Instructions.h> - #include <GTLCore/TypesManager.h> - - using namespace OpenShiva; -diff -up OpenGTL-0.9.18/OpenShiva/OpenShiva/Kernel.cpp.jx OpenGTL-0.9.18/OpenShiva/OpenShiva/Kernel.cpp ---- OpenGTL-0.9.18/OpenShiva/OpenShiva/Kernel.cpp.jx 2012-12-29 06:27:12.000000000 -0500 -+++ OpenGTL-0.9.18/OpenShiva/OpenShiva/Kernel.cpp 2013-05-08 15:39:25.099057228 -0400 -@@ -22,7 +22,7 @@ - #include <sstream> - #include <fstream> - --#include <llvm/Module.h> -+#include <llvm/IR/Module.h> - - #include "GTLCore/CompilationMessage.h" - #include "GTLCore/Function.h" -@@ -48,7 +48,7 @@ - #include "wrappers/ImageWrap_p.h" - #include "wrappers/RegionWrap_p.h" - #include <GTLCore/AST/Tree.h> --#include <llvm/DerivedTypes.h> -+#include <llvm/IR/DerivedTypes.h> - - using namespace OpenShiva; - -diff -up OpenGTL-0.9.18/OpenShiva/OpenShiva/PixelConvertExpressionFactory_p.cpp.jx OpenGTL-0.9.18/OpenShiva/OpenShiva/PixelConvertExpressionFactory_p.cpp ---- OpenGTL-0.9.18/OpenShiva/OpenShiva/PixelConvertExpressionFactory_p.cpp.jx 2012-12-29 06:27:12.000000000 -0500 -+++ OpenGTL-0.9.18/OpenShiva/OpenShiva/PixelConvertExpressionFactory_p.cpp 2013-05-08 15:39:25.099057228 -0400 -@@ -19,7 +19,8 @@ - - #include "PixelConvertExpressionFactory_p.h" - --#include <llvm/Instructions.h> -+#include <llvm/IR/Instructions.h> -+#include <llvm/IR/Function.h> - - #include "GTLCore/Type.h" - #include "GTLCore/AST/ConvertExpression.h" -@@ -34,7 +35,6 @@ - #include <GTLCore/VariableNG_p.h> - #include <GTLCore/LLVMBackend/Visitor_p.h> - #include <GTLFragment/wrappers/ColorWrap_p.h> --#include <llvm/Function.h> - #include <GTLCore/Type_p.h> - - using namespace OpenShiva; -diff -up OpenGTL-0.9.18/OpenShiva/OpenShiva/PixelVisitor_p.cpp.jx OpenGTL-0.9.18/OpenShiva/OpenShiva/PixelVisitor_p.cpp ---- OpenGTL-0.9.18/OpenShiva/OpenShiva/PixelVisitor_p.cpp.jx 2012-12-29 06:27:12.000000000 -0500 -+++ OpenGTL-0.9.18/OpenShiva/OpenShiva/PixelVisitor_p.cpp 2013-05-08 15:39:25.099057228 -0400 -@@ -20,11 +20,11 @@ - #include "PixelVisitor_p.h" - - // LLVM --#include <llvm/Constant.h> --#include <llvm/Constants.h> --#include <llvm/BasicBlock.h> --#include <llvm/Instructions.h> --#include <llvm/Function.h> -+#include <llvm/IR/Constant.h> -+#include <llvm/IR/Constants.h> -+#include <llvm/IR/BasicBlock.h> -+#include <llvm/IR/Instructions.h> -+#include <llvm/IR/Function.h> - - #include "GTLCore/LLVMBackend/ExpressionResult_p.h" - #include "GTLCore/LLVMBackend/ExpressionGenerationContext_p.h" -diff -up OpenGTL-0.9.18/OpenShiva/OpenShiva/Wrapper_p.cpp.jx OpenGTL-0.9.18/OpenShiva/OpenShiva/Wrapper_p.cpp ---- OpenGTL-0.9.18/OpenShiva/OpenShiva/Wrapper_p.cpp.jx 2012-12-29 06:27:12.000000000 -0500 -+++ OpenGTL-0.9.18/OpenShiva/OpenShiva/Wrapper_p.cpp 2013-05-08 15:39:25.099057228 -0400 -@@ -22,9 +22,9 @@ - #include <map> - #include <vector> - --#include <llvm/DerivedTypes.h> --#include <llvm/Function.h> --#include <llvm/Module.h> -+#include <llvm/IR/DerivedTypes.h> -+#include <llvm/IR/Function.h> -+#include <llvm/IR/Module.h> - - #include "GTLCore/Function_p.h" - #include "GTLCore/Macros.h" diff --git a/extra/opengtl/opengtl-0.9.18-memcpy.patch b/extra/opengtl/opengtl-0.9.18-memcpy.patch deleted file mode 100644 index 3e6ecd557..000000000 --- a/extra/opengtl/opengtl-0.9.18-memcpy.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff -r 99a2017746c0 Extensions/PngDC/PngDC.cpp ---- a/Extensions/PngDC/PngDC.cpp Wed Jan 30 05:28:12 2013 +1100 -+++ b/Extensions/PngDC/PngDC.cpp Tue Apr 16 01:59:10 2013 +1000 -@@ -20,6 +20,7 @@ - #include "PngDC.h" - - #include <png.h> -+#include <string.h> - - #include <config-endian.h> - diff --git a/extra/seahorse/PKGBUILD b/extra/seahorse/PKGBUILD index 6a0f7a8f5..924f58be1 100644 --- a/extra/seahorse/PKGBUILD +++ b/extra/seahorse/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 198425 2013-10-30 14:47:52Z allan $ +# $Id: PKGBUILD 203359 2014-01-08 18:28:24Z heftig $ # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> # Contributor: Jan de Groot <jgc@archlinux.org> # Contributor: Michel Brabants <michel.linux@tiscali.be> pkgname=seahorse -pkgver=3.10.1 +pkgver=3.10.2 pkgrel=1 pkgdesc="GNOME application for managing PGP keys." arch=(i686 x86_64) @@ -19,7 +19,7 @@ groups=(gnome-extra) install=seahorse.install source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz seahorse-ssh-askpass.sh) -sha256sums=('1df307481988c272d5648a335b2e8bb545b568a00c3f2ca2f3aa732badb46985' +sha256sums=('89cabf19f77a55f220bc61a3b97e4db845a0980f0f1d9c66147cc9a4ced8cd16' '400ea9a6084acc93f1dbd4223b95622bbd48071b763063328efba00de378b68c') build() { |