Tue Jun 17 03:23:47 UTC 2014

author: Nicolás Reynolds <fauno@endefensadelsl.org> 2014-06-17 03:27:11 +0000
committer: Nicolás Reynolds <fauno@endefensadelsl.org> 2014-06-17 03:27:11 +0000
commit: 6459b84bf754eda5323f40eb7af76dde65b63251 (patch)
tree: 81947a270848520d4cf2f9d1c5ce91ced54fcdff /extra
parent: 942111e62628e9a5c4729563215b1cfb8911735e (diff)
72 files changed, 2291 insertions, 1597 deletions
diff --git a/extra/aspell-pt/PKGBUILD b/extra/aspell-pt/PKGBUILD
index abcadda52..87479bf4c 100644
--- a/extra/aspell-pt/PKGBUILD
+++ b/extra/aspell-pt/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 211658 2014-04-22 15:35:58Z fyan $
+# $Id: PKGBUILD 215101 2014-06-14 04:25:55Z fyan $
 # Maintainer:
 
 pkgname=aspell-pt
-_pkgverPT=20140412
+_pkgverPT=20140513
 _pkgverBR=20090702
 pkgver=$_pkgverPT
 pkgrel=1
@@ -17,8 +17,8 @@ source=(ftp://ftp.gnu.org/gnu/aspell/dict/pt_BR/aspell6-pt_BR-$_pkgverBR-0.tar.b
         http://natura.di.uminho.pt/download/sources/Dictionaries/aspell6/aspell6.pt-$_pkgverPT.tar.bz2
         http://natura.di.uminho.pt/download/sources/Dictionaries/aspell6/aspell6.pt-preao-$_pkgverPT.tar.bz2)
 sha1sums=('add1db9a6a908dccaad13a7fd85c3b202299ff26'
-          '26d991841bb13d3dfa6fe2bb9a29edd6982d6657'
-          '492ace13679f5fa3824bb528e9017fbab4ef0d4c')
+          '9b74f0bbdd9afa00cf6b6e86f8be065bc062dfca'
+          '341fe147c4454062249736da360012b4247b4fee')
 
 build() {
   cd aspell6-pt_BR-$_pkgverBR-0
diff --git a/extra/calligra/0001-switch-to-librevenge-based-import-libs.patch b/extra/calligra/0001-switch-to-librevenge-based-import-libs.patch
new file mode 100644
index 000000000..ced0ff074
--- /dev/null
+++ b/extra/calligra/0001-switch-to-librevenge-based-import-libs.patch
@@ -0,0 +1,882 @@
+From 8e8f99cc314435f100d367f41c110becd19d3885 Mon Sep 17 00:00:00 2001
+From: David Tardon <dtardon@redhat.com>
+Date: Tue, 27 May 2014 16:15:52 +0200
+Subject: [PATCH] switch to librevenge-based import libs
+
+---
+ CMakeLists.txt                                  | 10 ++++++
+ cmake/modules/FindLibEtonyek.cmake              |  6 ++--
+ cmake/modules/FindLibOdfGen.cmake               |  6 ++--
+ cmake/modules/FindLibRevenge.cmake              | 37 +++++++++++++++++++++
+ cmake/modules/FindLibVisio.cmake                |  6 ++--
+ cmake/modules/FindLibWpd.cmake                  | 22 +++----------
+ cmake/modules/FindLibWpg.cmake                  |  6 ++--
+ cmake/modules/FindLibWps.cmake                  |  6 ++--
+ filters/flow/visio/import/CMakeLists.txt        |  3 +-
+ filters/flow/visio/import/VSDXImport.cpp        |  9 ++---
+ filters/flow/wpg/import/CMakeLists.txt          |  3 +-
+ filters/flow/wpg/import/WPGImport.cpp           |  9 ++---
+ filters/karbon/wpg/CMakeLists.txt               |  4 +--
+ filters/karbon/wpg/WPGImport.cpp                | 39 ++++++++--------------
+ filters/libodfhandler/DiskDocumentHandler.cxx   | 13 ++++----
+ filters/libodfhandler/DiskDocumentHandler.hxx   |  8 ++---
+ filters/libodfhandler/OutputFileHelper.cxx      |  6 ++--
+ filters/libodfhandler/OutputFileHelper.hxx      |  9 ++---
+ filters/libodfhandler/StdOutHandler.cxx         | 13 ++++----
+ filters/libodfhandler/StdOutHandler.hxx         |  8 ++---
+ filters/stage/keynote/import/CMakeLists.txt     |  5 +--
+ filters/stage/keynote/import/KeyImport.cpp      | 15 +++++----
+ filters/words/wordperfect/import/CMakeLists.txt |  3 +-
+ filters/words/wordperfect/import/WPDImport.cpp  | 44 ++++++++++++++-----------
+ filters/words/works/import/CMakeLists.txt       |  3 +-
+ filters/words/works/import/WPSImport.cpp        | 18 +++++-----
+ 26 files changed, 177 insertions(+), 134 deletions(-)
+ create mode 100644 cmake/modules/FindLibRevenge.cmake
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 5b6b764..c337864 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -697,6 +697,16 @@ macro_optional_find_package(Okular)
+ macro_log_feature(OKULAR_FOUND "Okular" "Okular ODP Plugin" "http://okular.kde.org/" FALSE "" "Required to build the Okular OpenDocument Presenter plugin")
+ 
+ ##
++## Test for librevenge
++##
++macro_optional_find_package(LibRevenge)
++macro_log_feature(LIBREVENGE_FOUND "LibRevenge"
++                  "A base library for writing document import filters"
++                  "http://sf.net/p/libwpd/librevenge/" FALSE ""
++                  "Required by various import filters"
++)
++
++##
+ ## Test for libodfgen
+ ##
+ macro_optional_find_package(LibOdfGen)
+diff --git a/cmake/modules/FindLibEtonyek.cmake b/cmake/modules/FindLibEtonyek.cmake
+index 5b78964..ad10d79 100644
+--- a/cmake/modules/FindLibEtonyek.cmake
++++ b/cmake/modules/FindLibEtonyek.cmake
+@@ -10,16 +10,16 @@
+ 
+ include(LibFindMacros)
+ libfind_package(LIBETONYEK LibWpd)
+-libfind_pkg_check_modules(LIBETONYEK_PKGCONF libetonyek-0.0)
++libfind_pkg_check_modules(LIBETONYEK_PKGCONF libetonyek-0.1)
+ 
+ find_path(LIBETONYEK_INCLUDE_DIR
+     NAMES libetonyek/libetonyek.h
+     HINTS ${LIBETONYEK_PKGCONF_INCLUDE_DIRS} ${LIBETONYEK_PKGCONF_INCLUDEDIR}
+-    PATH_SUFFIXES libetonyek-0.0
++    PATH_SUFFIXES libetonyek-0.1
+ )
+ 
+ find_library(LIBETONYEK_LIBRARY
+-    NAMES etonyek etonyek-0.0
++    NAMES etonyek etonyek-0.1
+     HINTS ${LIBETONYEK_PKGCONF_LIBRARY_DIRS} ${LIBETONYEK_PKGCONF_LIBDIR}
+ )
+ 
+diff --git a/cmake/modules/FindLibOdfGen.cmake b/cmake/modules/FindLibOdfGen.cmake
+index 9ab80d1..355c345 100644
+--- a/cmake/modules/FindLibOdfGen.cmake
++++ b/cmake/modules/FindLibOdfGen.cmake
+@@ -9,16 +9,16 @@
+ # Redistribution and use is allowed according to the terms of the BSD license.
+ 
+ include(LibFindMacros)
+-libfind_pkg_check_modules(LIBODFGEN_PKGCONF libodfgen-0.0)
++libfind_pkg_check_modules(LIBODFGEN_PKGCONF libodfgen-0.1)
+ 
+ find_path(LIBODFGEN_INCLUDE_DIR
+     NAMES libodfgen/libodfgen.hxx
+     HINTS ${LIBODFGEN_PKGCONF_INCLUDE_DIRS} ${LIBODFGEN_PKGCONF_INCLUDEDIR}
+-    PATH_SUFFIXES libodfgen-0.0
++    PATH_SUFFIXES libodfgen-0.1
+ )
+ 
+ find_library(LIBODFGEN_LIBRARY
+-    NAMES odfgen-0.0
++    NAMES odfgen-0.1
+     HINTS ${LIBODFGEN_PKGCONF_LIBRARY_DIRS} ${LIBODFGEN_PKGCONF_LIBDIR}
+ )
+ 
+diff --git a/cmake/modules/FindLibRevenge.cmake b/cmake/modules/FindLibRevenge.cmake
+new file mode 100644
+index 0000000..8ed18b1
+--- /dev/null
++++ b/cmake/modules/FindLibRevenge.cmake
+@@ -0,0 +1,37 @@
++# - Try to find the librevenge
++# Once done this will define
++#
++#  LIBREVENGE_FOUND - system has LIBREVENGE
++#  LIBREVENGE_INCLUDE_DIRS - the LIBREVENGE include directory
++#  LIBREVENGE_LIBRARIES - Link these to use LIBREVENGE
++#  LIBREVENGE_DEFINITIONS - Compiler switches required for using LIBREVENGE
++#
++
++include(LibFindMacros)
++libfind_pkg_check_modules(REVENGE_PKGCONF librevenge-0.0)
++
++find_path(REVENGE_INCLUDE_DIR
++    NAMES librevenge/librevenge.h
++    HINTS ${REVENGE_PKGCONF_INCLUDE_DIRS} ${REVENGE_PKGCONF_INCLUDEDIR}
++    PATH_SUFFIXES librevenge-0.0
++)
++
++find_path(REVENGE_STREAM_INCLUDE_DIR
++    NAMES librevenge-stream/librevenge-stream.h
++    HINTS ${REVENGE_STREAM_PKGCONF_INCLUDE_DIRS} ${REVENGE_STREAM_PKGCONF_INCLUDEDIR}
++    PATH_SUFFIXES librevenge-0.0
++)
++
++find_library(REVENGE_LIBRARY
++    NAMES revenge librevenge revenge-0.0 librevenge-0.0
++    HINTS ${REVENGE_STREAM_PKGCONF_LIBRARY_DIRS} ${REVENGE_STREAM_PKGCONF_LIBDIR}
++)
++
++find_library(REVENGE_STREAM_LIBRARY
++    NAMES revenge-stream librevenge-stream revenge-stream-0.0 librevenge-stream-0.0
++    HINTS ${REVENGE_PKGCONF_LIBRARY_DIRS} ${REVENGE_PKGCONF_LIBDIR}
++)
++
++set(LIBREVENGE_PROCESS_LIBS REVENGE_LIBRARY REVENGE_STREAM_LIBRARY)
++set(LIBREVENGE_PROCESS_INCLUDES REVENGE_INCLUDE_DIR REVENGE_STREAM_INCLUDE_DIR)
++libfind_process(LIBREVENGE)
+diff --git a/cmake/modules/FindLibVisio.cmake b/cmake/modules/FindLibVisio.cmake
+index a8533ee..49871b3 100644
+--- a/cmake/modules/FindLibVisio.cmake
++++ b/cmake/modules/FindLibVisio.cmake
+@@ -12,16 +12,16 @@
+ include(LibFindMacros)
+ libfind_package(LIBWPD LibWpd)
+ libfind_package(LIBWPG LibWpg)
+-libfind_pkg_check_modules(LIBVISIO_PKGCONF libvisio-0.0)
++libfind_pkg_check_modules(LIBVISIO_PKGCONF libvisio-0.1)
+ 
+ find_path(LIBVISIO_INCLUDE_DIR
+     NAMES libvisio/libvisio.h
+     HINTS ${LIBVISIO_PKGCONF_INCLUDE_DIRS} ${LIBVISIO_PKGCONF_INCLUDEDIR}
+-    PATH_SUFFIXES libvisio-0.0
++    PATH_SUFFIXES libvisio-0.1
+ )
+ 
+ find_library(LIBVISIO_LIBRARY
+-    NAMES visio visio-0.0
++    NAMES visio visio-0.1
+     HINTS ${LIBVISIO_PKGCONF_LIBRARY_DIRS} ${LIBVISIO_PKGCONF_LIBDIR}
+ )
+ 
+diff --git a/cmake/modules/FindLibWpd.cmake b/cmake/modules/FindLibWpd.cmake
+index 2a324cc..ed9bc26 100644
+--- a/cmake/modules/FindLibWpd.cmake
++++ b/cmake/modules/FindLibWpd.cmake
+@@ -8,31 +8,19 @@
+ #
+ 
+ include(LibFindMacros)
+-libfind_pkg_check_modules(WPD_PKGCONF libwpd-0.9)
+-libfind_pkg_check_modules(WPD_STREAM_PKGCONF libwpd-stream-0.9)
++libfind_pkg_check_modules(WPD_PKGCONF libwpd-0.10)
+ 
+ find_path(WPD_INCLUDE_DIR
+     NAMES libwpd/libwpd.h
+     HINTS ${WPD_PKGCONF_INCLUDE_DIRS} ${WPD_PKGCONF_INCLUDEDIR}
+-    PATH_SUFFIXES libwpd-0.9
+-)
+-
+-find_path(WPD_STREAM_INCLUDE_DIR
+-    NAMES libwpd-stream/libwpd-stream.h
+-    HINTS ${WPD_STREAM_PKGCONF_INCLUDE_DIRS} ${WPD_STREAM_PKGCONF_INCLUDEDIR}
+-    PATH_SUFFIXES libwpd-0.9
++    PATH_SUFFIXES libwpd-0.10
+ )
+ 
+ find_library(WPD_LIBRARY
+-    NAMES wpd libwpd wpd-0.9 libwpd-0.9
++    NAMES wpd libwpd wpd-0.10 libwpd-0.10
+     HINTS ${WPD_PKGCONF_LIBRARY_DIRS} ${WPD_PKGCONF_LIBDIR}
+ )
+ 
+-find_library(WPD_STREAM_LIBRARY
+-    NAMES wpd-stream libwpd-stream wpd-stream-0.9 libwpd-stream-0.9
+-    HINTS ${WPD_STREAM_PKGCONF_LIBRARY_DIRS} ${WPD_STREAM_PKGCONF_LIBDIR}
+-)
+-
+-set(LIBWPD_PROCESS_LIBS WPD_LIBRARY WPD_STREAM_LIBRARY)
+-set(LIBWPD_PROCESS_INCLUDES WPD_INCLUDE_DIR WPD_STREAM_INCLUDE_DIR)
++set(LIBWPD_PROCESS_LIBS WPD_LIBRARY)
++set(LIBWPD_PROCESS_INCLUDES WPD_INCLUDE_DIR)
+ libfind_process(LIBWPD)
+diff --git a/cmake/modules/FindLibWpg.cmake b/cmake/modules/FindLibWpg.cmake
+index 56d9302..16c2a1c 100644
+--- a/cmake/modules/FindLibWpg.cmake
++++ b/cmake/modules/FindLibWpg.cmake
+@@ -11,16 +11,16 @@
+ 
+ include(LibFindMacros)
+ libfind_package(LIBWPG LibWpd)
+-libfind_pkg_check_modules(LIBWPG_PKGCONF libwpg-0.2)
++libfind_pkg_check_modules(LIBWPG_PKGCONF libwpg-0.3)
+ 
+ find_path(LIBWPG_INCLUDE_DIR
+     NAMES libwpg/libwpg.h
+     HINTS ${LIBWPG_PKGCONF_INCLUDE_DIRS} ${LIBWPG_PKGCONF_INCLUDEDIR}
+-    PATH_SUFFIXES libwpg-0.2
++    PATH_SUFFIXES libwpg-0.3
+ )
+ 
+ find_library(LIBWPG_LIBRARY
+-    NAMES wpg wpg-0.2
++    NAMES wpg wpg-0.3
+     HINTS ${LIBWPG_PKGCONF_LIBRARY_DIRS} ${LIBWPG_PKGCONF_LIBDIR}
+ )
+ 
+diff --git a/cmake/modules/FindLibWps.cmake b/cmake/modules/FindLibWps.cmake
+index 149f34c..f8c8225 100644
+--- a/cmake/modules/FindLibWps.cmake
++++ b/cmake/modules/FindLibWps.cmake
+@@ -10,16 +10,16 @@
+ 
+ include(LibFindMacros)
+ libfind_package(LIBWPS LibWpd)
+-libfind_pkg_check_modules(LIBWPS_PKGCONF libwps-0.2)
++libfind_pkg_check_modules(LIBWPS_PKGCONF libwps-0.3)
+ 
+ find_path(LIBWPS_INCLUDE_DIR
+     NAMES libwps/libwps.h
+     HINTS ${LIBWPS_PKGCONF_INCLUDE_DIRS} ${LIBWPS_PKGCONF_INCLUDEDIR}
+-    PATH_SUFFIXES libwps-0.2
++    PATH_SUFFIXES libwps-0.3
+ )
+ 
+ find_library(LIBWPS_LIBRARY
+-    NAMES wps wps-0.2
++    NAMES wps wps-0.3
+     HINTS ${LIBWPS_PKGCONF_LIBRARY_DIRS} ${LIBWPS_PKGCONF_LIBDIR}
+ )
+ 
+diff --git a/filters/flow/visio/import/CMakeLists.txt b/filters/flow/visio/import/CMakeLists.txt
+index 1de4385..4c2a391 100644
+--- a/filters/flow/visio/import/CMakeLists.txt
++++ b/filters/flow/visio/import/CMakeLists.txt
+@@ -1,6 +1,7 @@
+ include_directories(
+     ../../../libodfhandler/
+     ${LIBODFGEN_INCLUDE_DIRS}
++    ${LIBREVENGE_INCLUDE_DIRS}
+     ${LIBVISIO_INCLUDE_DIRS}
+     ${KOMAIN_INCLUDES}
+ )
+@@ -15,7 +16,7 @@ set(vsdx2odg_PART_SRCS
+ 
+ kde4_add_plugin(calligra_filter_vsdx2odg ${vsdx2odg_PART_SRCS})
+ 
+-target_link_libraries(calligra_filter_vsdx2odg komain ${LIBODFGEN_LIBRARIES} ${LIBVISIO_LIBRARIES})
++target_link_libraries(calligra_filter_vsdx2odg komain ${LIBODFGEN_LIBRARIES} ${LIBREVENGE_LIBRARIES} ${LIBVISIO_LIBRARIES})
+ 
+ install(TARGETS calligra_filter_vsdx2odg DESTINATION ${PLUGIN_INSTALL_DIR})
+ install(FILES calligra_filter_vsdx2odg.desktop DESTINATION ${SERVICES_INSTALL_DIR})
+diff --git a/filters/flow/visio/import/VSDXImport.cpp b/filters/flow/visio/import/VSDXImport.cpp
+index 70a54d9..eb3a208 100644
+--- a/filters/flow/visio/import/VSDXImport.cpp
++++ b/filters/flow/visio/import/VSDXImport.cpp
+@@ -17,7 +17,7 @@
+ #include "VSDXImport.h"
+ 
+ #include <libvisio/libvisio.h>
+-#include <libodfgen/OdgGenerator.hxx>
++#include <libodfgen/libodfgen.hxx>
+ 
+ #include "OutputFileHelper.hxx"
+ #include <KoFilterChain.h>
+@@ -39,7 +39,7 @@ public:
+     ~OdgOutputFileHelper() {}
+ 
+ private:
+-    bool _isSupportedFormat(WPXInputStream *input, const char * /* password */)
++    bool _isSupportedFormat(librevenge::RVNGInputStream *input, const char * /* password */)
+     {
+         if (!libvisio::VisioDocument::isSupported(input))
+         {
+@@ -49,9 +49,10 @@ private:
+         return true;
+     }
+ 
+-    bool _convertDocument(WPXInputStream *input, const char * /* password */, OdfDocumentHandler *handler, OdfStreamType streamType)
++    bool _convertDocument(librevenge::RVNGInputStream *input, const char * /* password */, OdfDocumentHandler *handler, OdfStreamType streamType)
+     {
+-        OdgGenerator exporter(handler, streamType);
++        OdgGenerator exporter;
++        exporter.addDocumentHandler(handler, streamType);
+         return libvisio::VisioDocument::parse(input, &exporter);
+     }
+ };
+diff --git a/filters/flow/wpg/import/CMakeLists.txt b/filters/flow/wpg/import/CMakeLists.txt
+index 524d1b1..e2ee2a5 100644
+--- a/filters/flow/wpg/import/CMakeLists.txt
++++ b/filters/flow/wpg/import/CMakeLists.txt
+@@ -1,6 +1,7 @@
+ include_directories(
+     ../../../libodfhandler/
+     ${LIBODFGEN_INCLUDE_DIRS}
++    ${LIBREVENGE_INCLUDE_DIRS}
+     ${LIBVISIO_INCLUDE_DIRS}
+     ${KOMAIN_INCLUDES}
+ )
+@@ -15,7 +16,7 @@ set(wpg2odg_PART_SRCS
+ 
+ kde4_add_plugin(calligra_filter_wpg2odg ${wpg2odg_PART_SRCS})
+ 
+-target_link_libraries(calligra_filter_wpg2odg komain ${LIBODFGEN_LIBRARIES} ${LIBWPG_LIBRARIES})
++target_link_libraries(calligra_filter_wpg2odg komain ${LIBODFGEN_LIBRARIES} ${LIBREVENGE_LIBRARIES} ${LIBWPG_LIBRARIES})
+ 
+ install(TARGETS calligra_filter_wpg2odg DESTINATION ${PLUGIN_INSTALL_DIR})
+ install(FILES calligra_filter_wpg2odg.desktop DESTINATION ${SERVICES_INSTALL_DIR})
+diff --git a/filters/flow/wpg/import/WPGImport.cpp b/filters/flow/wpg/import/WPGImport.cpp
+index b4e0fa7..563ae6e 100644
+--- a/filters/flow/wpg/import/WPGImport.cpp
++++ b/filters/flow/wpg/import/WPGImport.cpp
+@@ -17,7 +17,7 @@
+ #include "WPGImport.h"
+ 
+ #include <libwpg/libwpg.h>
+-#include <libodfgen/OdgGenerator.hxx>
++#include <libodfgen/libodfgen.hxx>
+ 
+ #include "OutputFileHelper.hxx"
+ #include <KoFilterChain.h>
+@@ -39,7 +39,7 @@ public:
+     ~OdgOutputFileHelper() {}
+ 
+ private:
+-    bool _isSupportedFormat(WPXInputStream *input, const char * /* password */)
++    bool _isSupportedFormat(librevenge::RVNGInputStream *input, const char * /* password */)
+     {
+         if (!libwpg::WPGraphics::isSupported(input))
+         {
+@@ -49,9 +49,10 @@ private:
+         return true;
+     }
+ 
+-    bool _convertDocument(WPXInputStream *input, const char * /* password */, OdfDocumentHandler *handler, OdfStreamType streamType)
++    bool _convertDocument(librevenge::RVNGInputStream *input, const char * /* password */, OdfDocumentHandler *handler, OdfStreamType streamType)
+     {
+-        OdgGenerator exporter(handler, streamType);
++        OdgGenerator exporter;
++        exporter.addDocumentHandler(handler, streamType);
+         return libwpg::WPGraphics::parse(input, &exporter);
+     }
+ };
+diff --git a/filters/karbon/wpg/CMakeLists.txt b/filters/karbon/wpg/CMakeLists.txt
+index 5f578e9..ffa7742 100644
+--- a/filters/karbon/wpg/CMakeLists.txt
++++ b/filters/karbon/wpg/CMakeLists.txt
+@@ -1,11 +1,11 @@
+ 
+-include_directories(${CMAKE_BINARY_DIR}/filters/ ${LIBWPD_INCLUDE_DIRS} ${LIBWPG_INCLUDE_DIR}/)
++include_directories(${CMAKE_BINARY_DIR}/filters/ ${LIBREVENGE_INCLUDE_DIRS} ${LIBWPG_INCLUDE_DIR}/)
+ 
+ set(wpg2svg_PART_SRCS WPGImport.cpp)
+ 
+ kde4_add_plugin(calligra_filter_wpg2svg ${wpg2svg_PART_SRCS})
+ 
+-target_link_libraries(calligra_filter_wpg2svg komain ${LIBWPG_LIBRARIES} ${LIBWPG_STREAM_LIBRARIES} ${LIBWPD_LIBRARIES})
++target_link_libraries(calligra_filter_wpg2svg komain ${LIBWPG_LIBRARIES} ${LIBREVENGE_LIBRARIES})
+ 
+ install(TARGETS calligra_filter_wpg2svg DESTINATION ${PLUGIN_INSTALL_DIR})
+ install(FILES calligra_filter_wpg2svg.desktop DESTINATION ${SERVICES_INSTALL_DIR})
+diff --git a/filters/karbon/wpg/WPGImport.cpp b/filters/karbon/wpg/WPGImport.cpp
+index f1852ee..4457bec 100644
+--- a/filters/karbon/wpg/WPGImport.cpp
++++ b/filters/karbon/wpg/WPGImport.cpp
+@@ -32,14 +32,12 @@
+ #include <QString>
+ #include <QFile>
+ 
++#include <librevenge/librevenge.h>
++#include <librevenge-stream/librevenge-stream.h>
++
+ #include <libwpg/libwpg.h>
+-#if LIBWPG_VERSION_MINOR<2
+-#include <libwpg/WPGStreamImplementation.h>
+-#else
+-#include <libwpd-stream/libwpd-stream.h>
+-#include <libwpd/libwpd.h>
+-#endif
+ 
++#include <cassert>
+ #include <iostream>
+ 
+ K_PLUGIN_FACTORY(WPGImportFactory, registerPlugin<WPGImport>();)
+@@ -63,39 +61,29 @@ KoFilter::ConversionStatus WPGImport::convert(const QByteArray& from, const QByt
+     if (to != "image/svg+xml")
+         return KoFilter::NotImplemented;
+ 
+-#if LIBWPG_VERSION_MINOR<2
+-    WPXInputStream* input = new libwpg::WPGFileStream(m_chain->inputFile().toLocal8Bit());
+-    if (input->isOLEStream()) {
+-        WPXInputStream* olestream = input->getDocumentOLEStream();
+-        if (olestream) {
+-            delete input;
+-            input = olestream;
+-        }
+-    }
+-    libwpg::WPGString output;
+-#else
+-    WPXInputStream* input = new WPXFileStream(m_chain->inputFile().toLocal8Bit());
+-    if (input->isOLEStream()) {
+-        WPXInputStream* olestream = input->getDocumentOLEStream("Anything");
++    librevenge::RVNGInputStream* input = new librevenge::RVNGFileStream(m_chain->inputFile().toLocal8Bit());
++    if (input->isStructured()) {
++        librevenge::RVNGInputStream* olestream = input->getSubStreamByName("Anything");
+         if (olestream) {
+             delete input;
+             input = olestream;
+         }
+      }
+-     ::WPXString output;
+-#endif
+-
+     if (!libwpg::WPGraphics::isSupported(input)) {
+         kWarning() << "ERROR: Unsupported file format (unsupported version) or file is encrypted!";
+         delete input;
+         return KoFilter::NotImplemented;
+     }
+ 
+-    if (!libwpg::WPGraphics::generateSVG(input, output)) {
++     ::librevenge::RVNGStringVector output;
++     librevenge::RVNGSVGDrawingGenerator generator(output, "");
++
++    if (!libwpg::WPGraphics::parse(input, &generator)) {
+         kWarning() << "ERROR: SVG Generation failed!";
+         delete input;
+         return KoFilter::ParsingError;
+     }
++    assert(1 == output.size());
+ 
+     delete input;
+ 
+@@ -104,7 +92,8 @@ KoFilter::ConversionStatus WPGImport::convert(const QByteArray& from, const QByt
+         kWarning() << "ERROR: Could not open output file" << m_chain->outputFile();
+         return KoFilter::InternalError;
+     }
+-    outputFile.write(output.cstr());
++    outputFile.write("<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"no\"?>\n<!DOCTYPE svg PUBLIC \"-//W3C//DTD SVG 1.1//EN\" \"http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd\">\n");
++    outputFile.write(output[0].cstr());
+     outputFile.close();
+ 
+     return KoFilter::OK;
+diff --git a/filters/libodfhandler/DiskDocumentHandler.cxx b/filters/libodfhandler/DiskDocumentHandler.cxx
+index e035fdc..f8ca273 100644
+--- a/filters/libodfhandler/DiskDocumentHandler.cxx
++++ b/filters/libodfhandler/DiskDocumentHandler.cxx
+@@ -37,7 +37,7 @@ DiskOdfDocumentHandler::DiskOdfDocumentHandler(FemtoZip *pOutput) :
+ {
+ }
+ 
+-void DiskOdfDocumentHandler::startElement(const char *psName, const WPXPropertyList &xPropList)
++void DiskOdfDocumentHandler::startElement(const char *psName, const librevenge::RVNGPropertyList &xPropList)
+ {
+ 	if (mbIsTagOpened)
+ 	{
+@@ -46,11 +46,11 @@ void DiskOdfDocumentHandler::startElement(const char *psName, const WPXPropertyL
+ 	}
+ 	PUTSTRING("<");
+ 	PUTSTRING(psName);
+-	WPXPropertyList::Iter i(xPropList);
++	librevenge::RVNGPropertyList::Iter i(xPropList);
+ 	for (i.rewind(); i.next(); )
+ 	{
+-		// filter out libwpd elements
+-		if (strncmp(i.key(), "libwpd", 6) != 0)
++		// filter out librevenge properties
++		if (strncmp(i.key(), "librevenge", 10) != 0)
+ 		{
+ 			PUTSTRING(" ");
+ 			PUTSTRING(i.key());
+@@ -91,14 +91,15 @@ void DiskOdfDocumentHandler::endElement(const char *psName)
+ 	}
+ }
+ 
+-void DiskOdfDocumentHandler::characters(const WPXString &sCharacters)
++void DiskOdfDocumentHandler::characters(const librevenge::RVNGString &sCharacters)
+ {
+ 	if (mbIsTagOpened)
+ 	{
+ 		PUTSTRING(">");
+ 		mbIsTagOpened = false;
+ 	}
+-	WPXString sEscapedCharacters(sCharacters, true);
++	librevenge::RVNGString sEscapedCharacters;
++	sEscapedCharacters.appendEscapedXML(sCharacters);
+ 	if (sEscapedCharacters.len() > 0)
+ 		PUTSTRING(sEscapedCharacters.cstr());
+ }
+diff --git a/filters/libodfhandler/DiskDocumentHandler.hxx b/filters/libodfhandler/DiskDocumentHandler.hxx
+index 17f7eb7..d52a256 100644
+--- a/filters/libodfhandler/DiskDocumentHandler.hxx
++++ b/filters/libodfhandler/DiskDocumentHandler.hxx
+@@ -23,7 +23,7 @@
+ #ifndef _DISKDOCUMENTHANDLER_H
+ #define _DISKDOCUMENTHANDLER_H
+ 
+-#include <libodfgen/OdfDocumentHandler.hxx>
++#include <libodfgen/libodfgen.hxx>
+ 
+ #ifdef HAVE_CONFIG_H
+ #include "config.h"
+@@ -45,9 +45,9 @@ public:
+ #endif
+ 	virtual void startDocument() {}
+ 	virtual void endDocument();
+-	virtual void startElement(const char *psName, const WPXPropertyList &xPropList);
++	virtual void startElement(const char *psName, const librevenge::RVNGPropertyList &xPropList);
+ 	virtual void endElement(const char *psName);
+-	virtual void characters(const WPXString &sCharacters);
++	virtual void characters(const librevenge::RVNGString &sCharacters);
+ 
+ private:
+ 	DiskOdfDocumentHandler(DiskOdfDocumentHandler const &);
+@@ -58,7 +58,7 @@ private:
+ 	FemtoZip *mpOutput;
+ #endif
+ 	bool mbIsTagOpened;
+-	WPXString msOpenedTagName;
++	librevenge::RVNGString msOpenedTagName;
+ };
+ #endif
+ 
+diff --git a/filters/libodfhandler/OutputFileHelper.cxx b/filters/libodfhandler/OutputFileHelper.cxx
+index 8786d4c..61e48e9 100644
+--- a/filters/libodfhandler/OutputFileHelper.cxx
++++ b/filters/libodfhandler/OutputFileHelper.cxx
+@@ -37,7 +37,7 @@
+ 
+ #include "DiskDocumentHandler.hxx"
+ #include "StdOutHandler.hxx"
+-#include <libwpd-stream/WPXStreamImplementation.h>
++#include <librevenge-stream/librevenge-stream.h>
+ 
+ struct OutputFileHelperImpl
+ {
+@@ -197,12 +197,12 @@ bool OutputFileHelper::writeChildFile(const char *childFileName, const char *str
+ 
+ bool OutputFileHelper::writeConvertedContent(const char *childFileName, const char *inFileName, const OdfStreamType streamType)
+ {
+-	WPXFileStream input(inFileName);
++	librevenge::RVNGFileStream input(inFileName);
+ 
+ 	if (!_isSupportedFormat(&input, m_impl->mpPassword))
+ 		return false;
+ 
+-	input.seek(0, WPX_SEEK_SET);
++	input.seek(0, librevenge::RVNG_SEEK_SET);
+ 
+ 	OdfDocumentHandler *pHandler;
+ #ifdef USE_GSF_OUTPUT
+diff --git a/filters/libodfhandler/OutputFileHelper.hxx b/filters/libodfhandler/OutputFileHelper.hxx
+index a61b9a0..d2632a9 100644
+--- a/filters/libodfhandler/OutputFileHelper.hxx
++++ b/filters/libodfhandler/OutputFileHelper.hxx
+@@ -22,9 +22,10 @@
+ #ifndef _OUTPUTFILEHELPER_HXX
+ #define _OUTPUTFILEHELPER_HXX
+ 
+-#include <libodfgen/OdfDocumentHandler.hxx>
++#include <libodfgen/libodfgen.hxx>
++
++#include <librevenge-stream/librevenge-stream.h>
+ 
+-class WPXInputStream;
+ struct OutputFileHelperImpl;
+ 
+ class OutputFileHelper
+@@ -38,8 +39,8 @@ public:
+ 	bool writeConvertedContent(const char *childFileName, const char *inFileName, const OdfStreamType streamType);
+ 
+ private:
+-	virtual bool _isSupportedFormat(WPXInputStream *input, const char *password) = 0;
+-	virtual bool _convertDocument(WPXInputStream *input, const char *password, OdfDocumentHandler *handler, const OdfStreamType streamType) = 0;
++	virtual bool _isSupportedFormat(librevenge::RVNGInputStream *input, const char *password) = 0;
++	virtual bool _convertDocument(librevenge::RVNGInputStream *input, const char *password, OdfDocumentHandler *handler, const OdfStreamType streamType) = 0;
+ 	OutputFileHelperImpl *m_impl;
+ 
+ private:
+diff --git a/filters/libodfhandler/StdOutHandler.cxx b/filters/libodfhandler/StdOutHandler.cxx
+index 6864266..16e19f0 100644
+--- a/filters/libodfhandler/StdOutHandler.cxx
++++ b/filters/libodfhandler/StdOutHandler.cxx
+@@ -31,7 +31,7 @@ StdOutHandler::StdOutHandler() :
+ 	printf("<?xml version=\"1.0\"?>\n");
+ }
+ 
+-void StdOutHandler::startElement(const char *psName, const WPXPropertyList &xPropList)
++void StdOutHandler::startElement(const char *psName, const librevenge::RVNGPropertyList &xPropList)
+ {
+ 	if (mbIsTagOpened)
+ 	{
+@@ -39,11 +39,11 @@ void StdOutHandler::startElement(const char *psName, const WPXPropertyList &xPro
+ 		mbIsTagOpened = false;
+ 	}
+ 	printf("<%s", psName);
+-	WPXPropertyList::Iter i(xPropList);
++	librevenge::RVNGPropertyList::Iter i(xPropList);
+ 	for (i.rewind(); i.next(); )
+ 	{
+-		// filter out libwpd elements
+-		if (strncmp(i.key(), "libwpd", 6) != 0)
++		// filter out librevenge properties
++		if (strncmp(i.key(), "librevenge", 10) != 0)
+ 			printf(" %s=\"%s\"", i.key(), i()->getStr().cstr());
+ 	}
+ 	mbIsTagOpened = true;
+@@ -73,15 +73,14 @@ void StdOutHandler::endElement(const char *psName)
+ 	}
+ }
+ 
+-void StdOutHandler::characters(const WPXString &sCharacters)
++void StdOutHandler::characters(const librevenge::RVNGString &sCharacters)
+ {
+ 	if (mbIsTagOpened)
+ 	{
+ 		printf(">");
+ 		mbIsTagOpened = false;
+ 	}
+-	WPXString sEscapedCharacters(sCharacters, true);
+-	printf("%s", sEscapedCharacters.cstr());
++	printf("%s", librevenge::RVNGString::escapeXML(sCharacters).cstr());
+ }
+ 
+ void StdOutHandler::endDocument()
+diff --git a/filters/libodfhandler/StdOutHandler.hxx b/filters/libodfhandler/StdOutHandler.hxx
+index a18189a..44fa1e7 100644
+--- a/filters/libodfhandler/StdOutHandler.hxx
++++ b/filters/libodfhandler/StdOutHandler.hxx
+@@ -23,7 +23,7 @@
+ #ifndef _STDOUTHANDLER_H
+ #define _STDOUTHANDLER_H
+ 
+-#include <libodfgen/OdfDocumentHandler.hxx>
++#include <libodfgen/libodfgen.hxx>
+ 
+ class StdOutHandler : public OdfDocumentHandler
+ {
+@@ -31,12 +31,12 @@ public:
+ 	StdOutHandler();
+ 	virtual void startDocument() {}
+ 	virtual void endDocument();
+-	virtual void startElement(const char *psName, const WPXPropertyList &xPropList);
++	virtual void startElement(const char *psName, const librevenge::RVNGPropertyList &xPropList);
+ 	virtual void endElement(const char *psName);
+-	virtual void characters(const WPXString &sCharacters);
++	virtual void characters(const librevenge::RVNGString &sCharacters);
+ private:
+ 	bool mbIsTagOpened;
+-	WPXString msOpenedTagName;
++	librevenge::RVNGString msOpenedTagName;
+ };
+ #endif
+ 
+diff --git a/filters/words/wordperfect/import/CMakeLists.txt b/filters/words/wordperfect/import/CMakeLists.txt
+index 6a0e2d7..ffb3c70 100644
+--- a/filters/words/wordperfect/import/CMakeLists.txt
++++ b/filters/words/wordperfect/import/CMakeLists.txt
+@@ -1,6 +1,7 @@
+ include_directories(
+     ../../../libodfhandler/
+     ${LIBODFGEN_INCLUDE_DIRS}
++    ${LIBREVENGE_INCLUDE_DIRS}
+     ${LIBWPD_INCLUDE_DIRS}
+     ${LIBWPG_INCLUDE_DIRS}
+     ${KOMAIN_INCLUDES}
+@@ -17,7 +18,7 @@ set(wpd2odt_PART_SRCS
+ kde4_add_plugin(calligra_filter_wpd2odt ${wpd2odt_PART_SRCS})
+ 
+ target_link_libraries(calligra_filter_wpd2odt
+-    komain ${LIBODFGEN_LIBRARIES} ${LIBWPD_LIBRARIES} ${LIBWPG_LIBRARIES})
++    komain ${LIBODFGEN_LIBRARIES} ${LIBREVENGE_LIBRARIES} ${LIBWPD_LIBRARIES} ${LIBWPG_LIBRARIES})
+ 
+ install(TARGETS calligra_filter_wpd2odt DESTINATION ${PLUGIN_INSTALL_DIR})
+ 
+diff --git a/filters/words/wordperfect/import/WPDImport.cpp b/filters/words/wordperfect/import/WPDImport.cpp
+index af9d9b6..edf1c91 100644
+--- a/filters/words/wordperfect/import/WPDImport.cpp
++++ b/filters/words/wordperfect/import/WPDImport.cpp
+@@ -18,8 +18,7 @@
+ 
+ #include <libwpd/libwpd.h>
+ #include <libwpg/libwpg.h>
+-#include <libodfgen/OdtGenerator.hxx>
+-#include <libodfgen/OdgGenerator.hxx>
++#include <libodfgen/libodfgen.hxx>
+ 
+ #include <OutputFileHelper.hxx>
+ #include <KoFilterChain.h>
+@@ -31,6 +30,7 @@
+ #include <QString>
+ #include <QByteArray>
+ 
++#include <cassert>
+ #include <stdio.h>
+ 
+ class OdtOutputFileHelper : public OutputFileHelper
+@@ -41,20 +41,20 @@ public:
+     ~OdtOutputFileHelper() {};
+ 
+ private:
+-    bool _isSupportedFormat(WPXInputStream *input, const char *password)
++    bool _isSupportedFormat(librevenge::RVNGInputStream *input, const char *password)
+     {
+-        WPDConfidence confidence = WPDocument::isFileFormatSupported(input);
+-        if (WPD_CONFIDENCE_EXCELLENT != confidence && WPD_CONFIDENCE_SUPPORTED_ENCRYPTION != confidence)
++        libwpd::WPDConfidence confidence = libwpd::WPDocument::isFileFormatSupported(input);
++        if (libwpd::WPD_CONFIDENCE_EXCELLENT != confidence && libwpd::WPD_CONFIDENCE_SUPPORTED_ENCRYPTION != confidence)
+         {
+             fprintf(stderr, "ERROR: We have no confidence that you are giving us a valid WordPerfect document.\n");
+             return false;
+         }
+-        if (WPD_CONFIDENCE_SUPPORTED_ENCRYPTION == confidence && !password)
++        if (libwpd::WPD_CONFIDENCE_SUPPORTED_ENCRYPTION == confidence && !password)
+         {
+             fprintf(stderr, "ERROR: The WordPerfect document is encrypted and you did not give us a password.\n");
+             return false;
+         }
+-        if (confidence == WPD_CONFIDENCE_SUPPORTED_ENCRYPTION && password && (WPD_PASSWORD_MATCH_OK != WPDocument::verifyPassword(input, password)))
++        if (confidence == libwpd::WPD_CONFIDENCE_SUPPORTED_ENCRYPTION && password && (libwpd::WPD_PASSWORD_MATCH_OK != libwpd::WPDocument::verifyPassword(input, password)))
+         {
+             fprintf(stderr, "ERROR: The WordPerfect document is encrypted and we either\n");
+             fprintf(stderr, "ERROR: don't know how to decrypt it or the given password is wrong.\n");
+@@ -64,41 +64,47 @@ private:
+         return true;
+     }
+ 
+-    static bool handleEmbeddedWPGObject(const WPXBinaryData &data, OdfDocumentHandler *pHandler,  const OdfStreamType streamType)
++    static bool handleEmbeddedWPGObject(const librevenge::RVNGBinaryData &data, OdfDocumentHandler *pHandler,  const OdfStreamType streamType)
+     {
+-        OdgGenerator exporter(pHandler, streamType);
++        OdgGenerator exporter;
++        exporter.addDocumentHandler(pHandler, streamType);
+ 
+         libwpg::WPGFileFormat fileFormat = libwpg::WPG_AUTODETECT;
+ 
+-        if (!libwpg::WPGraphics::isSupported(const_cast<WPXInputStream *>(data.getDataStream())))
++        if (!libwpg::WPGraphics::isSupported(const_cast<librevenge::RVNGInputStream *>(data.getDataStream())))
+             fileFormat = libwpg::WPG_WPG1;
+ 
+-        return libwpg::WPGraphics::parse(const_cast<WPXInputStream *>(data.getDataStream()), &exporter, fileFormat);
++        return libwpg::WPGraphics::parse(const_cast<librevenge::RVNGInputStream *>(data.getDataStream()), &exporter, fileFormat);
+     }
+ 
+-    static bool handleEmbeddedWPGImage(const WPXBinaryData &input, WPXBinaryData &output)
++    static bool handleEmbeddedWPGImage(const librevenge::RVNGBinaryData &input, librevenge::RVNGBinaryData &output)
+     {
+-        WPXString svgOutput;
+         libwpg::WPGFileFormat fileFormat = libwpg::WPG_AUTODETECT;
+ 
+-        if (!libwpg::WPGraphics::isSupported(const_cast<WPXInputStream *>(input.getDataStream())))
++        if (!libwpg::WPGraphics::isSupported(const_cast<librevenge::RVNGInputStream *>(input.getDataStream())))
+             fileFormat = libwpg::WPG_WPG1;
+ 
+-        if (!libwpg::WPGraphics::generateSVG(const_cast<WPXInputStream *>(input.getDataStream()), svgOutput, fileFormat))
++        librevenge::RVNGStringVector svgOutput;
++        librevenge::RVNGSVGDrawingGenerator generator(svgOutput, "");
++        if (!libwpg::WPGraphics::parse(const_cast<librevenge::RVNGInputStream *>(input.getDataStream()), &generator, fileFormat))
+             return false;
++        assert(1 == svgOutput.size());
+ 
+         output.clear();
+-        output.append((unsigned char *)svgOutput.cstr(), strlen(svgOutput.cstr()));
++        const librevenge::RVNGString svgPrefix("<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"no\"?>\n<!DOCTYPE svg PUBLIC \"-//W3C//DTD SVG 1.1//EN\" \"http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd\">\n");
++        output.append((unsigned char *)svgPrefix.cstr(), svgPrefix.size());
++        output.append((unsigned char *)svgOutput[0].cstr(), svgOutput[0].size());
+ 
+         return true;
+     }
+ 
+-    bool _convertDocument(WPXInputStream *input, const char *password, OdfDocumentHandler *handler, const OdfStreamType streamType)
++    bool _convertDocument(librevenge::RVNGInputStream *input, const char *password, OdfDocumentHandler *handler, const OdfStreamType streamType)
+     {
+-        OdtGenerator collector(handler, streamType);
++        OdtGenerator collector;
++        collector.addDocumentHandler(handler, streamType);
+         collector.registerEmbeddedObjectHandler("image/x-wpg", &handleEmbeddedWPGObject);
+         collector.registerEmbeddedImageHandler("image/x-wpg", &handleEmbeddedWPGImage);
+-        if (WPD_OK == WPDocument::parse(input, &collector, password))
++        if (libwpd::WPD_OK == libwpd::WPDocument::parse(input, &collector, password))
+             return true;
+         return false;
+     }
+diff --git a/filters/words/works/import/CMakeLists.txt b/filters/words/works/import/CMakeLists.txt
+index 76317ae..2c51937 100644
+--- a/filters/words/works/import/CMakeLists.txt
++++ b/filters/words/works/import/CMakeLists.txt
+@@ -1,6 +1,7 @@
+ include_directories(
+     ../../../libodfhandler/
+     ${LIBODFGEN_INCLUDE_DIRS}
++    ${LIBREVENGE_INCLUDE_DIRS}
+     ${LIBWPS_INCLUDE_DIRS}
+     ${KOMAIN_INCLUDES}
+ )
+@@ -15,7 +16,7 @@ set(wps2odt_PART_SRCS
+ 
+ kde4_add_plugin(calligra_filter_wps2odt ${wps2odt_PART_SRCS})
+ 
+-target_link_libraries(calligra_filter_wps2odt komain ${LIBODFGEN_LIBRARIES} ${LIBWPS_LIBRARIES})
++target_link_libraries(calligra_filter_wps2odt komain ${LIBODFGEN_LIBRARIES} ${LIBREVENGE_LIBRARIES} ${LIBWPS_LIBRARIES})
+ 
+ install(TARGETS calligra_filter_wps2odt DESTINATION ${PLUGIN_INSTALL_DIR})
+ install(FILES calligra_filter_wps2odt.desktop DESTINATION ${SERVICES_INSTALL_DIR})
+diff --git a/filters/words/works/import/WPSImport.cpp b/filters/words/works/import/WPSImport.cpp
+index c2058e5..545daf3 100644
+--- a/filters/words/works/import/WPSImport.cpp
++++ b/filters/words/works/import/WPSImport.cpp
+@@ -16,9 +16,9 @@
+ 
+ #include "WPSImport.h"
+ 
+-#include <libwpd/libwpd.h>
++#include <librevenge/librevenge.h>
+ #include <libwps/libwps.h>
+-#include <libodfgen/OdtGenerator.hxx>
++#include <libodfgen/libodfgen.hxx>
+ 
+ #include "OutputFileHelper.hxx"
+ #include <KoFilterChain.h>
+@@ -40,10 +40,11 @@ public:
+     ~OdtOutputFileHelper() {};
+ 
+ private:
+-    bool _isSupportedFormat(WPXInputStream *input, const char * /* password */)
++    bool _isSupportedFormat(librevenge::RVNGInputStream *input, const char * /* password */)
+     {
+-        WPSConfidence confidence = WPSDocument::isFileFormatSupported(input);
+-        if (confidence == WPS_CONFIDENCE_NONE || confidence == WPS_CONFIDENCE_POOR)
++        libwps::WPSKind kind = libwps::WPS_TEXT;
++        libwps::WPSConfidence confidence = libwps::WPSDocument::isFileFormatSupported(input, kind);
++        if ((libwps::WPS_TEXT != kind) || (confidence != libwps::WPS_CONFIDENCE_EXCELLENT))
+         {
+             fprintf(stderr, "ERROR: We have no confidence that you are giving us a valid Microsoft Works document.\n");
+             return false;
+@@ -52,10 +53,11 @@ private:
+         return true;
+     }
+ 
+-    bool _convertDocument(WPXInputStream *input, const char * /* password */, OdfDocumentHandler *handler, const OdfStreamType streamType)
++    bool _convertDocument(librevenge::RVNGInputStream *input, const char * /* password */, OdfDocumentHandler *handler, const OdfStreamType streamType)
+     {
+-        OdtGenerator collector(handler, streamType);
+-        if (WPS_OK == WPSDocument::parse(input, &collector))
++        OdtGenerator collector;
++        collector.addDocumentHandler(handler, streamType);
++        if (libwps::WPS_OK == libwps::WPSDocument::parse(input, &collector))
+             return true;
+         return false;
+     }
+-- 
+1.9.3
+
+
diff --git a/extra/calligra/PKGBUILD b/extra/calligra/PKGBUILD
index be59f30c8..c00d3193b 100644
--- a/extra/calligra/PKGBUILD
+++ b/extra/calligra/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 213126 2014-05-19 14:15:56Z svenstaro $
+# $Id: PKGBUILD 215145 2014-06-14 19:16:51Z andyrtr $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Ronald van Haren <ronald.archlinux.org>
 
@@ -19,7 +19,7 @@ pkgname=('calligra-braindump'
          'calligra-stage'
          'calligra-words')
 pkgver=2.8.3
-pkgrel=1
+pkgrel=3
 arch=('i686' 'x86_64')
 url='http://www.calligra-suite.org/'
 license=('FDL1.2' 'GPL2' 'LGPL')
@@ -29,11 +29,17 @@ makedepends=('cmake' 'automoc4' 'boost' 'kdepimlibs' 'eigen2' 'kdeedu-marble'
              'openjpeg' 'kdegraphics-okular' 'pstoedit' 'vc' 'libvisio'
              'libetonyek' 'libpqxx' 'libspnav')
 groups=('calligra')
-source=("http://download.kde.org/stable/${pkgbase}-${pkgver}/${pkgbase}-${pkgver}.tar.xz")
-md5sums=('78ad97127a3cc6d2c5c79ac6ae56f130')
+source=("http://download.kde.org/stable/${pkgbase}-${pkgver}/${pkgbase}-${pkgver}.tar.xz"
+        0001-switch-to-librevenge-based-import-libs.patch)
+md5sums=('78ad97127a3cc6d2c5c79ac6ae56f130'
+         '2589200d3f2199a8bff5755ff3245e33')
 
 prepare() {
   mkdir build
+  # use librevenge based import filter libraries - patch taken from Fedora
+  pushd $pkgbase-$pkgver
+  patch -Np1 -i $srcdir/0001-switch-to-librevenge-based-import-libs.patch
+  popd
 }
 
 build() {
@@ -64,7 +70,7 @@ package_calligra-filters() {
 
 package_calligra-libs() {
   pkgdesc="Libraries for the Calligra office suite"
-  depends=('kdepimlibs' 'kactivities')
+  depends=('kdepimlibs' 'kactivities' 'libkactivities4')
   conflicts=('koffice-interfaces' 'koffice-libs' 'koffice-pics'
              'koffice-servicetypes' 'calligra-interfaces'
              'calligra-pics' 'calligra-servicetypes')
diff --git a/extra/cifs-utils/0003-cifskey-better-use-snprintf.patch b/extra/cifs-utils/0003-cifskey-better-use-snprintf.patch
new file mode 100644
index 000000000..bea3603e5
--- /dev/null
+++ b/extra/cifs-utils/0003-cifskey-better-use-snprintf.patch
@@ -0,0 +1,49 @@
+From 0c521d5060035da655107001374e08873ac5dde8 Mon Sep 17 00:00:00 2001
+From: Sebastian Krahmer <krahmer@suse.de>
+Date: Mon, 14 Apr 2014 11:39:41 +0200
+Subject: [PATCH] cifskey: better use snprintf()
+
+Prefer snprintf() over sprintf() in cifskey.c
+Projects that fork the code (pam_cifscreds) can't rely on
+the max-size parameters.
+
+[jlayton: removed unneeded initialization of "len" in key_add]
+
+Signed-off-by: Sebastian Krahmer <krahmer@suse.de>
+---
+ cifskey.c | 10 +++++++---
+ 1 file changed, 7 insertions(+), 3 deletions(-)
+
+diff --git a/cifskey.c b/cifskey.c
+index 7716c42..e89cacf 100644
+--- a/cifskey.c
++++ b/cifskey.c
+@@ -29,7 +29,8 @@ key_search(const char *addr, char keytype)
+ {
+ 	char desc[INET6_ADDRSTRLEN + sizeof(KEY_PREFIX) + 4];
+ 
+-	sprintf(desc, "%s:%c:%s", KEY_PREFIX, keytype, addr);
++	if (snprintf(desc, sizeof(desc), "%s:%c:%s", KEY_PREFIX, keytype, addr) >= (int)sizeof(desc))
++		return -1;
+ 
+ 	return keyctl_search(DEST_KEYRING, CIFS_KEY_TYPE, desc, 0);
+ }
+@@ -43,10 +44,13 @@ key_add(const char *addr, const char *user, const char *pass, char keytype)
+ 	char val[MOUNT_PASSWD_SIZE +  MAX_USERNAME_SIZE + 2];
+ 
+ 	/* set key description */
+-	sprintf(desc, "%s:%c:%s", KEY_PREFIX, keytype, addr);
++	if (snprintf(desc, sizeof(desc), "%s:%c:%s", KEY_PREFIX, keytype, addr) >= (int)sizeof(desc))
++		return -1;
+ 
+ 	/* set payload contents */
+-	len = sprintf(val, "%s:%s", user, pass);
++	len = snprintf(val, sizeof(val), "%s:%s", user, pass);
++	if (len >= (int)sizeof(val))
++		return -1;
+ 
+ 	return add_key(CIFS_KEY_TYPE, desc, val, len + 1, DEST_KEYRING);
+ }
+-- 
+1.8.4.2
+
diff --git a/extra/cifs-utils/0004-cifscreds-better-error-handling-when-key_search-fail.patch b/extra/cifs-utils/0004-cifscreds-better-error-handling-when-key_search-fail.patch
new file mode 100644
index 000000000..cf57eea7b
--- /dev/null
+++ b/extra/cifs-utils/0004-cifscreds-better-error-handling-when-key_search-fail.patch
@@ -0,0 +1,85 @@
+From 3da4c43b575498be86c87a2ac3f3142e3cab1c59 Mon Sep 17 00:00:00 2001
+From: Jeff Layton <jlayton@samba.org>
+Date: Sun, 20 Apr 2014 20:41:05 -0400
+Subject: [PATCH] cifscreds: better error handling when key_search fails
+
+If we ended up getting a bogus string that would have overflowed, then
+make key_search set errno to EINVAL before returning. The callers can
+then test to see if the returned error is what was expected or something
+else and handle it appropriately.
+
+Cc: Sebastian Krahmer <krahmer@suse.de>
+Signed-off-by: Jeff Layton <jlayton@samba.org>
+---
+ cifscreds.c     | 9 +++++++++
+ cifskey.c       | 5 ++++-
+ pam_cifscreds.c | 9 +++++++++
+ 3 files changed, 22 insertions(+), 1 deletion(-)
+
+diff --git a/cifscreds.c b/cifscreds.c
+index fa05dc8..64d55b0 100644
+--- a/cifscreds.c
++++ b/cifscreds.c
+@@ -188,6 +188,15 @@ static int cifscreds_add(struct cmdarg *arg)
+ 			return EXIT_FAILURE;
+ 		}
+ 
++		switch(errno) {
++		case ENOKEY:
++			/* success */
++			break;
++		default:
++			printf("Key search failed: %s\n", strerror(errno));
++			return EXIT_FAILURE;
++		}
++
+ 		currentaddress = nextaddress;
+ 		if (currentaddress) {
+ 			*(currentaddress - 1) = ',';
+diff --git a/cifskey.c b/cifskey.c
+index e89cacf..4f01ed0 100644
+--- a/cifskey.c
++++ b/cifskey.c
+@@ -20,6 +20,7 @@
+ #include <sys/types.h>
+ #include <keyutils.h>
+ #include <stdio.h>
++#include <errno.h>
+ #include "cifskey.h"
+ #include "resolve_host.h"
+ 
+@@ -29,8 +30,10 @@ key_search(const char *addr, char keytype)
+ {
+ 	char desc[INET6_ADDRSTRLEN + sizeof(KEY_PREFIX) + 4];
+ 
+-	if (snprintf(desc, sizeof(desc), "%s:%c:%s", KEY_PREFIX, keytype, addr) >= (int)sizeof(desc))
++	if (snprintf(desc, sizeof(desc), "%s:%c:%s", KEY_PREFIX, keytype, addr) >= (int)sizeof(desc)) {
++		errno = EINVAL;
+ 		return -1;
++	}
+ 
+ 	return keyctl_search(DEST_KEYRING, CIFS_KEY_TYPE, desc, 0);
+ }
+diff --git a/pam_cifscreds.c b/pam_cifscreds.c
+index e0d8a55..fb23117 100644
+--- a/pam_cifscreds.c
++++ b/pam_cifscreds.c
+@@ -206,6 +206,15 @@ static int cifscreds_pam_add(pam_handle_t *ph, const char *user, const char *pas
+ 			return PAM_SERVICE_ERR;
+ 		}
+ 
++		switch(errno) {
++		case ENOKEY:
++			break;
++		default:
++			pam_syslog(ph, LOG_ERR, "Unable to search keyring for %s (%s)",
++					currentaddress, strerror(errno));
++			return PAM_SERVICE_ERR;
++		}
++
+ 		currentaddress = nextaddress;
+ 		if (currentaddress) {
+ 			*(currentaddress - 1) = ',';
+-- 
+1.8.4.2
+
diff --git a/extra/cifs-utils/0005-cifscreds-better-error-handling-for-key_add.patch b/extra/cifs-utils/0005-cifscreds-better-error-handling-for-key_add.patch
new file mode 100644
index 000000000..3baedd639
--- /dev/null
+++ b/extra/cifs-utils/0005-cifscreds-better-error-handling-for-key_add.patch
@@ -0,0 +1,102 @@
+From 382ec63757c1d8d4d399d17ccc927c4897d4cfc9 Mon Sep 17 00:00:00 2001
+From: Jeff Layton <jlayton@samba.org>
+Date: Sun, 20 Apr 2014 20:41:05 -0400
+Subject: [PATCH] cifscreds: better error handling for key_add
+
+If the string buffers would have been overrun, set errno to EINVAL
+before returning. Then, have the callers report the errors to
+stderr or syslog as appropriate.
+
+Cc: Sebastian Krahmer <krahmer@suse.de>
+Signed-off-by: Jeff Layton <jlayton@samba.org>
+---
+ cifscreds.c     | 6 +++---
+ cifskey.c       | 8 ++++++--
+ pam_cifscreds.c | 9 +++++----
+ 3 files changed, 14 insertions(+), 9 deletions(-)
+
+diff --git a/cifscreds.c b/cifscreds.c
+index 64d55b0..5d84c3c 100644
+--- a/cifscreds.c
++++ b/cifscreds.c
+@@ -220,8 +220,8 @@ static int cifscreds_add(struct cmdarg *arg)
+ 	while (currentaddress) {
+ 		key_serial_t key = key_add(currentaddress, arg->user, pass, arg->keytype);
+ 		if (key <= 0) {
+-			fprintf(stderr, "error: Add credential key for %s\n",
+-				currentaddress);
++			fprintf(stderr, "error: Add credential key for %s: %s\n",
++				currentaddress, strerror(errno));
+ 		} else {
+ 			if (keyctl(KEYCTL_SETPERM, key, CIFS_KEY_PERMS) < 0) {
+ 				fprintf(stderr, "error: Setting permissons "
+@@ -422,7 +422,7 @@ static int cifscreds_update(struct cmdarg *arg)
+ 		key_serial_t key = key_add(addrs[id], arg->user, pass, arg->keytype);
+ 		if (key <= 0)
+ 			fprintf(stderr, "error: Update credential key "
+-				"for %s\n", addrs[id]);
++				"for %s: %s\n", addrs[id], strerror(errno));
+ 	}
+ 
+ 	return EXIT_SUCCESS;
+diff --git a/cifskey.c b/cifskey.c
+index 4f01ed0..919540f 100644
+--- a/cifskey.c
++++ b/cifskey.c
+@@ -47,13 +47,17 @@ key_add(const char *addr, const char *user, const char *pass, char keytype)
+ 	char val[MOUNT_PASSWD_SIZE +  MAX_USERNAME_SIZE + 2];
+ 
+ 	/* set key description */
+-	if (snprintf(desc, sizeof(desc), "%s:%c:%s", KEY_PREFIX, keytype, addr) >= (int)sizeof(desc))
++	if (snprintf(desc, sizeof(desc), "%s:%c:%s", KEY_PREFIX, keytype, addr) >= (int)sizeof(desc)) {
++		errno = EINVAL;
+ 		return -1;
++	}
+ 
+ 	/* set payload contents */
+ 	len = snprintf(val, sizeof(val), "%s:%s", user, pass);
+-	if (len >= (int)sizeof(val))
++	if (len >= (int)sizeof(val)) {
++		errno = EINVAL;
+ 		return -1;
++	}
+ 
+ 	return add_key(CIFS_KEY_TYPE, desc, val, len + 1, DEST_KEYRING);
+ }
+diff --git a/pam_cifscreds.c b/pam_cifscreds.c
+index fb23117..5d99c2d 100644
+--- a/pam_cifscreds.c
++++ b/pam_cifscreds.c
+@@ -208,6 +208,7 @@ static int cifscreds_pam_add(pam_handle_t *ph, const char *user, const char *pas
+ 
+ 		switch(errno) {
+ 		case ENOKEY:
++			/* success */
+ 			break;
+ 		default:
+ 			pam_syslog(ph, LOG_ERR, "Unable to search keyring for %s (%s)",
+@@ -233,8 +234,8 @@ static int cifscreds_pam_add(pam_handle_t *ph, const char *user, const char *pas
+ 	while (currentaddress) {
+ 		key_serial_t key = key_add(currentaddress, user, password, keytype);
+ 		if (key <= 0) {
+-			pam_syslog(ph, LOG_ERR, "error: Add credential key for %s",
+-				currentaddress);
++			pam_syslog(ph, LOG_ERR, "error: Add credential key for %s: %s",
++				currentaddress, strerror(errno));
+ 		} else {
+ 			if ((args & ARG_DEBUG) == ARG_DEBUG) {
+ 				pam_syslog(ph, LOG_DEBUG, "credential key for \\\\%s\\%s added",
+@@ -336,8 +337,8 @@ static int cifscreds_pam_update(pam_handle_t *ph, const char *user, const char *
+ 	for (id = 0; id < count; id++) {
+ 		key_serial_t key = key_add(currentaddress, user, password, keytype);
+ 		if (key <= 0) {
+-			pam_syslog(ph, LOG_ERR, "error: Update credential key for %s",
+-				currentaddress);
++			pam_syslog(ph, LOG_ERR, "error: Update credential key for %s: %s",
++				currentaddress, strerror(errno));
+ 		}
+ 	}
+ 
+-- 
+1.8.4.2
+
diff --git a/extra/cifs-utils/PKGBUILD b/extra/cifs-utils/PKGBUILD
index 951a2cf95..6ef93d3a2 100644
--- a/extra/cifs-utils/PKGBUILD
+++ b/extra/cifs-utils/PKGBUILD
@@ -1,14 +1,26 @@
-# $Id: PKGBUILD 214184 2014-06-04 12:03:07Z tpowa $
+# $Id: PKGBUILD 215193 2014-06-16 10:42:57Z tpowa $
 # Maintainer: Tobias Powalowski <tpowa@archlinux.org>
 pkgname=cifs-utils
 pkgver=6.3
-pkgrel=1
+pkgrel=2
 pkgdesc="CIFS filesystem user-space tools"
 arch=(i686 x86_64)
 url="http://wiki.samba.org/index.php/LinuxCIFS_utils"
 license=('GPL')
 depends=('libcap-ng' 'keyutils' 'krb5' 'talloc' 'libwbclient' 'pam')
-source=(ftp://ftp.samba.org/pub/linux-cifs/cifs-utils/$pkgname-$pkgver.tar.bz2)
+source=(ftp://ftp.samba.org/pub/linux-cifs/cifs-utils/$pkgname-$pkgver.tar.bz2
+        '0003-cifskey-better-use-snprintf.patch'
+        '0004-cifscreds-better-error-handling-when-key_search-fail.patch'
+        '0005-cifscreds-better-error-handling-for-key_add.patch')
+
+prepare() {
+  cd "$srcdir/$pkgname-$pkgver"
+  # add fedora patches
+  # 40789 CVE-2014-2830
+  patch -Np1 -i "$srcdir/0003-cifskey-better-use-snprintf.patch"
+  patch -Np1 -i "$srcdir/0004-cifscreds-better-error-handling-when-key_search-fail.patch"
+  patch -Np1 -i "$srcdir/0005-cifscreds-better-error-handling-for-key_add.patch"
+}
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
@@ -27,4 +39,7 @@ package() {
   # set mount.cifs uid, to enable none root mounting form fstab
   chmod +s $pkgdir/usr/bin/mount.cifs
 }
-md5sums=('93697dbc043cb4d5c66e15e281f872e5')
+md5sums=('93697dbc043cb4d5c66e15e281f872e5'
+         'cc13c6d1b734a446d0f4384e0ce32748'
+         '350491f336dc931f9b192228909e5924'
+         'ac2b3367363fbc79f8f7fdfcae008a8c')
diff --git a/extra/cmake/FindPython-Interp-Libs-Search-for-Python-3.4.patch b/extra/cmake/FindPython-Interp-Libs-Search-for-Python-3.4.patch
deleted file mode 100644
index fee6b39bf..000000000
--- a/extra/cmake/FindPython-Interp-Libs-Search-for-Python-3.4.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From ab6201ab647c13fee44c44822b8502e9848faaaf Mon Sep 17 00:00:00 2001
-From: Matt McCormick <matt.mccormick@kitware.com>
-Date: Wed, 5 Mar 2014 17:41:47 -0500
-Subject: [PATCH] FindPython{Interp,Libs}: Search for Python 3.4.
-
-Python 3.4.0rnc1 was released on 2014-02-20.
----
- Modules/FindPythonInterp.cmake | 2 +-
- Modules/FindPythonLibs.cmake   | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/Modules/FindPythonInterp.cmake b/Modules/FindPythonInterp.cmake
-index 8da848c..e23a58b 100644
---- a/Modules/FindPythonInterp.cmake
-+++ b/Modules/FindPythonInterp.cmake
-@@ -47,7 +47,7 @@ unset(_Python_NAMES)
- 
- set(_PYTHON1_VERSIONS 1.6 1.5)
- set(_PYTHON2_VERSIONS 2.7 2.6 2.5 2.4 2.3 2.2 2.1 2.0)
--set(_PYTHON3_VERSIONS 3.3 3.2 3.1 3.0)
-+set(_PYTHON3_VERSIONS 3.4 3.3 3.2 3.1 3.0)
- 
- if(PythonInterp_FIND_VERSION)
-     if(PythonInterp_FIND_VERSION_COUNT GREATER 1)
-diff --git a/Modules/FindPythonLibs.cmake b/Modules/FindPythonLibs.cmake
-index 0749efc..1dbc967 100644
---- a/Modules/FindPythonLibs.cmake
-+++ b/Modules/FindPythonLibs.cmake
-@@ -51,7 +51,7 @@ CMAKE_FIND_FRAMEWORKS(Python)
- 
- set(_PYTHON1_VERSIONS 1.6 1.5)
- set(_PYTHON2_VERSIONS 2.7 2.6 2.5 2.4 2.3 2.2 2.1 2.0)
--set(_PYTHON3_VERSIONS 3.3 3.2 3.1 3.0)
-+set(_PYTHON3_VERSIONS 3.4 3.3 3.2 3.1 3.0)
- 
- if(PythonLibs_FIND_VERSION)
-     if(PythonLibs_FIND_VERSION_COUNT GREATER 1)
--- 
-1.9.0
-
diff --git a/extra/cmake/PKGBUILD b/extra/cmake/PKGBUILD
index 3e1e54f5b..01a0f37c5 100644
--- a/extra/cmake/PKGBUILD
+++ b/extra/cmake/PKGBUILD
@@ -1,34 +1,29 @@
-# $Id: PKGBUILD 208238 2014-03-20 07:54:59Z bpiotrowski $
+# $Id: PKGBUILD 215225 2014-06-16 21:39:19Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Pierre Schmitz <pierre@archlinux.de>
 
 pkgname=cmake
-pkgver=2.8.12.2
-pkgrel=2
-pkgdesc="A cross-platform open-source make system"
+pkgver=3.0.0
+pkgrel=3
+pkgdesc='A cross-platform open-source make system'
 arch=('i686' 'x86_64')
 url="http://www.cmake.org/"
 license=('custom')
 depends=('curl' 'libarchive' 'shared-mime-info')
-makedepends=('qt4' 'emacs')
-optdepends=('qt4: cmake-gui')
+makedepends=('qt5-base' 'python-sphinx' 'emacs')
+optdepends=('qt5-base: cmake-gui'
+            'libxkbcommon-x11: cmake-gui')
 install="${pkgname}.install"
-source=("http://www.cmake.org/files/v2.8/${pkgname}-${pkgver}.tar.gz"
-        "findfreetype.patch"
-        "FindPython-Interp-Libs-Search-for-Python-3.4.patch")
-md5sums=('17c6513483d23590cbce6957ec6d1e66'
-         '90321de1d9d46cd8d6609d0509dbd7b0'
-         '5e036a37f9b0b3368b8cfcc5784d1514')
+source=("http://www.cmake.org/files/v3.0/${pkgname}-${pkgver}.tar.gz")
+md5sums=('21a1c85e1a3b803c4b48e7ff915a863e')
 
 build() {
   cd ${pkgname}-${pkgver}
 
-  patch -Np1 < ${srcdir}/findfreetype.patch
-  patch -Np1 < ${srcdir}/FindPython-Interp-Libs-Search-for-Python-3.4.patch
-
   ./bootstrap --prefix=/usr \
     --mandir=/share/man \
     --docdir=/share/doc/cmake \
+    --sphinx-man \
     --system-libs \
     --qt-gui \
     --parallel=$(/usr/bin/getconf _NPROCESSORS_ONLN)
@@ -40,12 +35,14 @@ package() {
   make DESTDIR="${pkgdir}" install
 
   vimpath="${pkgdir}/usr/share/vim/vimfiles"
-  install -Dm644 Docs/cmake-indent.vim "${vimpath}"/indent/cmake-indent.vim
-  install -Dm644 Docs/cmake-syntax.vim "${vimpath}"/syntax/cmake-syntax.vim
-
-  install -Dm644 Docs/cmake-mode.el \
-    "${pkgdir}"/usr/share/emacs/site-lisp/cmake-mode.el
-  emacs -batch -f batch-byte-compile "${pkgdir}"/usr/share/emacs/site-lisp/cmake-mode.el
+  install -d "${vimpath}"/{help,indent,syntax}
+  ln -s /usr/share/cmake-3.0/editors/vim/cmake-help.vim "${vimpath}"/help/
+  ln -s /usr/share/cmake-3.0/editors/vim/cmake-indent.vim "${vimpath}"/indent/
+  ln -s /usr/share/cmake-3.0/editors/vim/cmake-syntax.vim "${vimpath}"/syntax/
+
+  install -d "${pkgdir}"/usr/share/emacs/site-lisp/
+  emacs -batch -f batch-byte-compile "${pkgdir}"/usr/share/cmake-3.0/editors/emacs/cmake-mode.el
+  ln -s /usr/share/cmake-3.0/editors/emacs/cmake-mode.el "${pkgdir}"/usr/share/emacs/site-lisp/
 
   install -Dm644 Copyright.txt \
     "${pkgdir}"/usr/share/licenses/${pkgname}/LICENSE
diff --git a/extra/cmake/findfreetype.patch b/extra/cmake/findfreetype.patch
deleted file mode 100644
index 454b591dd..000000000
--- a/extra/cmake/findfreetype.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-diff --git a/Modules/FindFreetype.cmake b/Modules/FindFreetype.cmake
-index 179dc00..0f5a2b4 100644
---- a/Modules/FindFreetype.cmake
-+++ b/Modules/FindFreetype.cmake
-@@ -62,10 +62,10 @@ find_path(FREETYPE_INCLUDE_DIR_ft2build ft2build.h
-     ENV GTKMM_BASEPATH
-     [HKEY_CURRENT_USER\\SOFTWARE\\gtkmm\\2.4;Path]
-     [HKEY_LOCAL_MACHINE\\SOFTWARE\\gtkmm\\2.4;Path]
--  PATH_SUFFIXES include/freetype2 include
-+  PATH_SUFFIXES include/freetype2 include/freetype include
- )
- 
--find_path(FREETYPE_INCLUDE_DIR_freetype2 freetype/config/ftheader.h
-+find_path(FREETYPE_INCLUDE_DIR_freetype2 config/ftheader.h
-   HINTS
-     ENV FREETYPE_DIR
-   PATHS
-@@ -76,7 +76,7 @@ find_path(FREETYPE_INCLUDE_DIR_freetype2 freetype/config/ftheader.h
-     ENV GTKMM_BASEPATH
-     [HKEY_CURRENT_USER\\SOFTWARE\\gtkmm\\2.4;Path]
-     [HKEY_LOCAL_MACHINE\\SOFTWARE\\gtkmm\\2.4;Path]
--  PATH_SUFFIXES include/freetype2 include
-+  PATH_SUFFIXES include/freetype2 include/freetype include include/freetype2/freetype
- )
- 
- find_library(FREETYPE_LIBRARY
diff --git a/extra/efl/PKGBUILD b/extra/efl/PKGBUILD
index 40e57269b..2a094f136 100644
--- a/extra/efl/PKGBUILD
+++ b/extra/efl/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 213609 2014-05-26 19:22:35Z ronald $
+# $Id: PKGBUILD 215156 2014-06-14 19:17:03Z andyrtr $
 # Maintainer: Ronald van Haren <ronald@archlinux.org>
 # Contributor: Enlightenment Developers <enlightenment-devel@enlightenment.org>
 
 pkgbase=efl
 pkgname=('efl' 'efl-docs')
 pkgver=1.10.0
-pkgrel=1
+pkgrel=2
 pkgdesc="Enlightenment Foundation Libraries"
 arch=('i686' 'x86_64')
 url="http://www.enlightenment.org"
@@ -14,18 +14,22 @@ depends=('bullet' 'libjpeg-turbo' 'gst-plugins-base'
          'luajit' 'curl' 'fribidi' 'libpulse' 'libxcomposite'
          'libxinerama' 'libxrandr' 'libxss' 'python2'
          'libxcursor' 'libxp' 'libwebp' 'shared-mime-info'
-	 'libxkbcommon' 'wayland')
+         'libxkbcommon' 'wayland')
 makedepends=('doxygen')
-replaces=('ecore' 'edje' 'eet' 'eeze' 'efreet' 'eina' 'eio' 'embryo' 
-	'emotion' 'ethumb' 'evas')
+replaces=('ecore' 'edje' 'eet' 'eeze' 'efreet' 'eina' 'eio' 'embryo'
+          'emotion' 'ethumb' 'evas')
 options=('!emptydirs')
-source=(http://download.enlightenment.org/rel/libs/${pkgname}/$pkgname-$pkgver.tar.gz)
+source=(http://download.enlightenment.org/rel/libs/${pkgname}/$pkgname-$pkgver.tar.gz
+        efl-1.10.0-giflib-5.1.0.patch)
 install=efl.install
-sha1sums=('c9e57f55f050e2a7e97e870857170163a550beaa')
+sha1sums=('c9e57f55f050e2a7e97e870857170163a550beaa'
+          '269bc6104859291107aa0c9eac2d9d3026df5b12')
 
 
 prepare() {
-  sed -i 's/env python$/&2/' "${srcdir}/${pkgname}-${pkgver}/src/scripts/eina/eina-bench-cmp"
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  sed -i 's/env python$/&2/' src/scripts/eina/eina-bench-cmp
+  patch -p1 -i "${srcdir}/efl-1.10.0-giflib-5.1.0.patch"
 }
 
 build() {
@@ -48,9 +52,9 @@ package_efl(){
 
   # install non-standard license files
   install -Dm644 "${srcdir}/${pkgname}-${pkgver}/licenses/COPYING.BSD" \
-	"${pkgdir}/usr/share/licenses/${pkgname}/COPYING.BSD"
+    "${pkgdir}/usr/share/licenses/${pkgname}/COPYING.BSD"
   install -Dm644 "${srcdir}/${pkgname}-${pkgver}/licenses/COPYING.SMALL" \
-	"${pkgdir}/usr/share/licenses/${pkgname}/COPYING.SMALL"
+    "${pkgdir}/usr/share/licenses/${pkgname}/COPYING.SMALL"
 }
 
 package_efl-docs() {
diff --git a/extra/efl/efl-1.10.0-giflib-5.1.0.patch b/extra/efl/efl-1.10.0-giflib-5.1.0.patch
new file mode 100644
index 000000000..429b91ea8
--- /dev/null
+++ b/extra/efl/efl-1.10.0-giflib-5.1.0.patch
@@ -0,0 +1,39 @@
+diff -rupN a/src/modules/evas/loaders/gif/evas_image_load_gif.c b/src/modules/evas/loaders/gif/evas_image_load_gif.c
+--- a/src/modules/evas/loaders/gif/evas_image_load_gif.c	2014-05-19 16:10:12.000000000 +0000
++++ b/src/modules/evas/loaders/gif/evas_image_load_gif.c	2014-06-01 11:05:50.963850389 +0000
+@@ -528,7 +528,7 @@ evas_image_load_file_head_gif2(void *loa
+    ret = EINA_TRUE;
+ 
+ on_error: // jump here on any errors to clean up
+-   if (gif) DGifCloseFile(gif);
++   if (gif) DGifCloseFile(gif, NULL);
+    if (fi.map) eina_file_map_free(f, fi.map);
+    return ret;
+ }
+@@ -606,7 +606,7 @@ open_file:
+    // start as we have nothnig to build on
+    if ((index > 0) && (index < loader->imgnum) && (animated->animated))
+      {
+-        if (loader->gif) DGifCloseFile(loader->gif);
++        if (loader->gif) DGifCloseFile(loader->gif, NULL);
+         if ((loader->fi.map) && (loader->f))
+           eina_file_map_free(loader->f, loader->fi.map);
+         loader->gif = NULL;
+@@ -764,7 +764,7 @@ open_file:
+    loader->imgnum = imgnum;
+    if ((animated->frame_count <= 1) || (rec == TERMINATE_RECORD_TYPE))
+      {
+-        if (loader->gif) DGifCloseFile(loader->gif);
++        if (loader->gif) DGifCloseFile(loader->gif, NULL);
+         if ((loader->fi.map) && (loader->f))
+           eina_file_map_free(loader->f, loader->fi.map);
+         loader->gif = NULL;
+@@ -848,7 +848,7 @@ static void
+ evas_image_load_file_close_gif2(void *loader_data)
+ {
+    Loader_Info *loader = loader_data;
+-   if (loader->gif) DGifCloseFile(loader->gif);
++   if (loader->gif) DGifCloseFile(loader->gif, NULL);
+    if ((loader->fi.map) && (loader->f))
+      eina_file_map_free(loader->f, loader->fi.map);
+    free(loader);
diff --git a/extra/emacs/PKGBUILD b/extra/emacs/PKGBUILD
index b2149a2f1..be31a3ec9 100644
--- a/extra/emacs/PKGBUILD
+++ b/extra/emacs/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 204839 2014-01-28 14:14:20Z juergen $
+# $Id: PKGBUILD 215157 2014-06-14 19:17:04Z andyrtr $
 # Maintainer: Juergen Hoetzel <juergen@archlinux.org>
 # Contributor: Renchi Raju <renchi@green.tam.uiuc.edu>
 
 pkgname=emacs
 pkgver=24.3
-pkgrel=6
+pkgrel=7
 pkgdesc="The extensible, customizable, self-documenting real-time display editor"
 arch=('i686' 'x86_64')
 url="http://www.gnu.org/software/emacs/emacs.html"
@@ -15,7 +15,7 @@ source=(ftp://ftp.gnu.org/gnu/emacs/$pkgname-$pkgver.tar.xz{,.sig}
         emacs-24.3-giflib5.patch)
 md5sums=('ea9ed000ca165280265aabb55b9afbd7'
          'SKIP'
-         '560cdf463299e059c5fadf474bcba218')
+         'ccbe4e77440ff6ea56c8532ebc960446')
 
 prepare() {
   cd $pkgname-$pkgver
diff --git a/extra/emacs/emacs-24.3-giflib5.patch b/extra/emacs/emacs-24.3-giflib5.patch
index b8571abb2..f58c31907 100644
--- a/extra/emacs/emacs-24.3-giflib5.patch
+++ b/extra/emacs/emacs-24.3-giflib5.patch
@@ -24,3 +24,74 @@
        if (!gif)
  	{
  	  image_error ("Cannot open memory source `%s'", img->spec, Qnil);
+@@ -7225,7 +7225,11 @@
+   if (!check_image_size (f, gif->SWidth, gif->SHeight))
+     {
+       image_error ("Invalid image size (see `max-image-size')", Qnil, Qnil);
++#if GIFLIB_MAJOR >= 5 && GIFLIB_MINOR >= 1
++      fn_DGifCloseFile (gif, NULL);
++#else
+       fn_DGifCloseFile (gif);
++#endif
+       return 0;
+     }
+ 
+@@ -7234,7 +7238,11 @@
+   if (rc == GIF_ERROR || gif->ImageCount <= 0)
+     {
+       image_error ("Error reading `%s'", img->spec, Qnil);
++#if GIFLIB_MAJOR >= 5 && GIFLIB_MINOR >= 1
++      fn_DGifCloseFile (gif, NULL);
++#else
+       fn_DGifCloseFile (gif);
++#endif
+       return 0;
+     }
+ 
+@@ -7246,7 +7254,11 @@
+       {
+ 	image_error ("Invalid image number `%s' in image `%s'",
+ 		     image_number, img->spec);
++#if GIFLIB_MAJOR >= 5 && GIFLIB_MINOR >= 1
++	fn_DGifCloseFile (gif, NULL);
++#else
+ 	fn_DGifCloseFile (gif);
++#endif
+ 	return 0;
+       }
+   }
+@@ -7264,14 +7276,22 @@
+   if (!check_image_size (f, width, height))
+     {
+       image_error ("Invalid image size (see `max-image-size')", Qnil, Qnil);
++#if GIFLIB_MAJOR >= 5 && GIFLIB_MINOR >= 1
++      fn_DGifCloseFile (gif, NULL);
++#else
+       fn_DGifCloseFile (gif);
++#endif
+       return 0;
+     }
+ 
+   /* Create the X image and pixmap.  */
+   if (!x_create_x_image_and_pixmap (f, width, height, 0, &ximg, &img->pixmap))
+     {
++#if GIFLIB_MAJOR >= 5 && GIFLIB_MINOR >= 1
++      fn_DGifCloseFile (gif, NULL);
++#else
+       fn_DGifCloseFile (gif);
++#endif
+       return 0;
+     }
+ 
+@@ -7447,7 +7467,11 @@
+ 			    Fcons (make_number (gif->ImageCount),
+ 				   img->lisp_data));
+ 
++#if GIFLIB_MAJOR >= 5 && GIFLIB_MINOR >= 1
++  fn_DGifCloseFile (gif, NULL);
++#else
+   fn_DGifCloseFile (gif);
++#endif
+ 
+   /* Maybe fill in the background field while we have ximg handy. */
+   if (NILP (image_spec_value (img->spec, QCbackground, NULL)))
diff --git a/extra/fbida/PKGBUILD b/extra/fbida/PKGBUILD
index 560de96b1..082f742a1 100644
--- a/extra/fbida/PKGBUILD
+++ b/extra/fbida/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 191916 2013-08-01 06:59:45Z bpiotrowski $
+# $Id: PKGBUILD 215158 2014-06-14 19:17:06Z andyrtr $
 # Maintainer: Eric Bélanger <eric@archlinux.org>
 
 pkgname=fbida
 pkgver=2.09
-pkgrel=3
+pkgrel=4
 pkgdesc="Few applications to display and elementary edit images: fbi, fbgs, ida, exiftran"
 arch=('i686' 'x86_64')
 url="http://www.kraxel.org/blog/linux/fbida/"
@@ -17,7 +17,7 @@ source=(http://www.kraxel.org/releases/${pkgname}/${pkgname}-${pkgver}.tar.gz{,.
 sha1sums=('5838b2cb7188481fece6159fccb3b121acd906e7'
           'SKIP'
           'd06b70f2d581a1a3e9e0909b5af7f3f71ed54717'
-          '4e7ed05fbfba46296aae11a9768680109bee8ac5')
+          'a5644d75e868bfc23bc462c3b4bc84c1a168146c')
 
 prepare() {
   cd ${pkgname}-${pkgver}
diff --git a/extra/fbida/ida-PrintGifError.patch b/extra/fbida/ida-PrintGifError.patch
index 60a45ea7d..e023218dd 100644
--- a/extra/fbida/ida-PrintGifError.patch
+++ b/extra/fbida/ida-PrintGifError.patch
@@ -59,3 +59,25 @@ diff -Naur fbida-2.09-orig/rd/read-gif.c fbida-2.09/rd/read-gif.c
  	    }
  	    if (NULL == h->gif->SColorMap &&
  		NULL == h->gif->Image.ColorMap) {
+@@ -165,7 +165,7 @@
+  oops:
+     if (debug)
+ 	fprintf(stderr,"gif: fatal error, aborting\n");
+-    DGifCloseFile(h->gif);
++    DGifCloseFile(h->gif, &Error);
+     fclose(h->infile);
+     free(h->row);
+     free(h);
+@@ -202,10 +202,11 @@
+ gif_done(void *data)
+ {
+     struct gif_state *h = data;
++    int Error;
+ 
+     if (debug)
+ 	fprintf(stderr,"gif: done, cleaning up\n");
+-    DGifCloseFile(h->gif);
++    DGifCloseFile(h->gif, &Error);
+     fclose(h->infile);
+     if (h->il)
+ 	free(h->il);
diff --git a/extra/fontforge/PKGBUILD b/extra/fontforge/PKGBUILD
index e06f51c1d..e5532bc08 100644
--- a/extra/fontforge/PKGBUILD
+++ b/extra/fontforge/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 209262 2014-03-31 07:34:34Z bisson $
+# $Id: PKGBUILD 215159 2014-06-14 19:17:07Z andyrtr $
 # Maintainer: Gaetan Bisson <bisson@archlinux.org>
 # Contributor: Eric Belanger <eric@archlinux.org>
 # Contributor: William Rea <sillywilly@gmail.com>
@@ -6,18 +6,20 @@
 pkgname=fontforge
 _pkgver=2.0.20140101
 pkgver=${_pkgver##*.}
-pkgrel=2
+pkgrel=3
 pkgdesc='Outline and bitmap font editor'
-url='http://fontforge.sourceforge.net/'
+url='http://www.fontforge.org/'
 arch=('i686' 'x86_64')
 license=('BSD')
 depends=('libltdl' 'libxkbui' 'libxi'
          'pango' 'giflib' 'libtiff' 'libspiro' 'libxml2' 'libspiro' 'libunicodenames' 'zeromq'
          'python2' 'desktop-file-utils' 'gtk-update-icon-cache' 'hicolor-icon-theme')
 source=("https://github.com/fontforge/fontforge/archive/${_pkgver}.tar.gz"
-        'http://fontforge.org/cidmaps.tgz')
+        'http://fontforge.org/cidmaps.tgz'
+        'giflib.patch')
 sha1sums=('abce297e53e8b6ff6f08871e53d1eb0be5ab82e7'
-          'efbc7c9d3e95159f5600dc71f9cccb370e46bb94')
+          'efbc7c9d3e95159f5600dc71f9cccb370e46bb94'
+          '420dd1dd75d72719f3203d832bfa8c1c7e7eef86')
 
 options=('!makeflags')
 install=install
@@ -25,6 +27,7 @@ install=install
 prepare() {
 	cd "${srcdir}/${pkgname}-${_pkgver}"
 	sed '/fontforge_package_name/s/^#//' -i configure.ac
+	patch -p1 -i ../giflib.patch
 	./autogen.sh
 }
 
diff --git a/extra/fontforge/giflib.patch b/extra/fontforge/giflib.patch
new file mode 100644
index 000000000..6234484a6
--- /dev/null
+++ b/extra/fontforge/giflib.patch
@@ -0,0 +1,37 @@
+diff -Naur old/gutils/gimagereadgif.c new/gutils/gimagereadgif.c
+--- old/gutils/gimagereadgif.c	2014-01-01 05:56:11.000000000 -1000
++++ new/gutils/gimagereadgif.c	2014-05-27 07:04:34.930338020 -1000
+@@ -170,13 +170,13 @@
+ 
+     if ( DGifSlurp(gif)!=GIF_OK ) {
+ 	fprintf(stderr,"Bad input file \"%s\"\n",filename );
+-	DGifCloseFile(gif);
++	DGifCloseFile(gif, NULL);
+ 	return( NULL );
+     }
+ 
+     /* Process each image so that it/they can be imported into FF. */
+     if ( (images=(GImage **) malloc(gif->ImageCount*sizeof(GImage *)))==NULL ) {
+-	DGifCloseFile(gif);
++	DGifCloseFile(gif, NULL);
+ 	NoMoreMemMessage();
+ 	return( NULL );
+     }
+@@ -185,7 +185,7 @@
+ 	if ( (images[i]=ProcessSavedImage(gif,&gif->SavedImages[i],il))==NULL ) {
+ 	    while ( --i>=0 ) free(images[i]);
+ 	    free(images);
+-	    DGifCloseFile(gif);
++	    DGifCloseFile(gif, NULL);
+ 	    return( NULL );
+ 	}
+     }
+@@ -195,7 +195,7 @@
+ 	ret = images[0];
+     else
+ 	ret = GImageCreateAnimation(images,gif->ImageCount);
+-    DGifCloseFile(gif);
++    DGifCloseFile(gif, NULL);
+     free(images);
+     return( ret );
+ }
diff --git a/extra/gc/PKGBUILD b/extra/gc/PKGBUILD
index fe519ebe1..0a68d21be 100644
--- a/extra/gc/PKGBUILD
+++ b/extra/gc/PKGBUILD
@@ -1,17 +1,17 @@
-# $Id: PKGBUILD 213308 2014-05-19 16:09:54Z anatolik $
+# $Id: PKGBUILD 215177 2014-06-15 15:40:57Z heftig $
 # Maintainer: Daniel Isenmann <daniel [at] archlinux.org>
 # Contributor: dorphell <dorphell@gmx.net>
 
 pkgname=gc
-pkgver=7.4.0
-pkgrel=3
+pkgver=7.4.2
+pkgrel=1
 pkgdesc="A garbage collector for C and C++"
 arch=('i686' 'x86_64')
 url="http://www.hboehm.info/gc/"
 license=('GPL')
 source=("http://www.hboehm.info/gc/gc_source/${pkgname}-${pkgver}.tar.gz")
 depends=('gcc-libs' 'libatomic_ops')
-md5sums=('f40d9a47c90d60791eeecb484f8df5ee')
+md5sums=('12c05fd2811d989341d8c6d81f66af87')
 
 prepare() {
   cd ${pkgname}-${pkgver}
diff --git a/extra/giflib/PKGBUILD b/extra/giflib/PKGBUILD
index 863a67c16..aa929cae8 100644
--- a/extra/giflib/PKGBUILD
+++ b/extra/giflib/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 211326 2014-04-18 17:38:48Z bpiotrowski $
+# $Id: PKGBUILD 215160 2014-06-14 19:17:08Z andyrtr $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 # Contributor: Baptiste Daroussin <baptiste.daroussin@gmail.com>
 # Contributor: Grigorios Bouzakis <grbzks[at]gmail[dot]com>
 # Contributor: mightyjaym <jm.ambrosino@free.fr>
 
 pkgname=giflib
-pkgver=5.0.6
+pkgver=5.1.0
 pkgrel=1
 pkgdesc="A library for reading and writing gif images"
 url="http://sourceforge.net/projects/giflib/"
@@ -28,3 +28,4 @@ package() {
 
   install -Dm644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/COPYING"
 }
+md5sums=('c7e9f1c10b755ab955156d4c1ac7fc5d')
diff --git a/extra/gparted/PKGBUILD b/extra/gparted/PKGBUILD
index ad95742d3..31472cb67 100644
--- a/extra/gparted/PKGBUILD
+++ b/extra/gparted/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 206153 2014-02-20 11:30:56Z giovanni $
+# $Id: PKGBUILD 215088 2014-06-13 13:44:39Z giovanni $
 # Maintainer: Giovanni Scafora <giovanni@archlinux.org>
 # Contributor: Andrew Simmons <andrew.simmons@gmail.com>
 # Contributor: György Balló <ballogy@freestart.hu>
 
 pkgname=gparted
-pkgver=0.18.0
+pkgver=0.19.0
 pkgrel=1
 pkgdesc="A Partition Magic clone, frontend to GNU Parted"
 arch=('i686' 'x86_64')
@@ -28,7 +28,7 @@ install=gparted.install
 source=("http://downloads.sourceforge.net/project/${pkgname}/${pkgname}/${pkgname}-${pkgver}/${pkgname}-${pkgver}.tar.bz2"
         'org.archlinux.pkexec.gparted.policy'
         'gparted_polkit')
-md5sums=('c4c928de08519c923abaa5a099881241'
+md5sums=('9cf1d1d1596ce2f7191969e081008af2'
          '122ed3120c846376bead22b25f6a3b19'
          '0b68a4e2bc6bc15440730ebe2d7bf9f6')
 
diff --git a/extra/imlib/PKGBUILD b/extra/imlib/PKGBUILD
index feb2a6e91..76be50533 100644
--- a/extra/imlib/PKGBUILD
+++ b/extra/imlib/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 213047 2014-05-17 19:10:09Z eric $
+# $Id: PKGBUILD 215161 2014-06-14 19:17:10Z andyrtr $
 # Maintainer: Eric Bélanger <eric@archlinux.org>
 
 pkgname=imlib
 pkgver=1.9.15
-pkgrel=14
+pkgrel=15
 pkgdesc="General image handling library for X11 and Gtk"
 arch=('i686' 'x86_64')
 url="http://freshmeat.net/projects/imlib/"
@@ -12,13 +12,13 @@ depends=('giflib' 'libpng' 'libtiff' 'libxext')
 makedepends=('libxt')
 source=(http://ftp.gnome.org/pub/GNOME/sources/imlib/1.9/${pkgname}-${pkgver}.tar.bz2
         debian-bug448360.patch CAN-2004-1026.patch aclocal-fixes.patch 
-        imlib-1.9.15-libpng15.patch imlib-giflib5.patch imlib-gtk.patch)
+        imlib-1.9.15-libpng15.patch imlib-giflib51.patch imlib-gtk.patch)
 sha1sums=('c9a732a354fbb3c7e1a426e5d19fc92d73f8f720'
           'fe2fd9ce4d7bc62271e724153de39012de8ec5ee'
           'ec1b47281c1a7fb21abe841f948ecc56ed13f310'
           'af54cb1ee0c8c6122b277284ebdd1022e31df3b5'
           '33c3aaa43eb624f2a6ab0406285a8515903333e3'
-          '56e9d65e05a347452fd608d2dfc8538f7ce09893'
+          '3c33b3d7f7125a6fbfcf48ca585739b71b1d8ebf'
           '7cf962f8d7488200910ba4bdee00473f035b054a')
 
 prepare() {
@@ -27,9 +27,10 @@ prepare() {
   patch -p1 -i "${srcdir}/CAN-2004-1026.patch"
   patch -p0 -i "${srcdir}/aclocal-fixes.patch"
   patch -p0 -i "${srcdir}/imlib-1.9.15-libpng15.patch"
-  patch -p1 -i "${srcdir}/imlib-giflib5.patch"
+  patch -p1 -i "${srcdir}/imlib-giflib51.patch"
   patch -p1 -i "${srcdir}/imlib-gtk.patch"
   sed '/AC_PATH_XTRA/d' -i configure.in
+  mv configure.in configure.ac
   libtoolize --force
   cp /usr/bin/libtool .
 }
diff --git a/extra/imlib/imlib-giflib5.patch b/extra/imlib/imlib-giflib5.patch
deleted file mode 100644
index affd206fc..000000000
--- a/extra/imlib/imlib-giflib5.patch
+++ /dev/null
@@ -1,110 +0,0 @@
-diff -Naur imlib-1.9.15-orig/Imlib/load.c imlib-1.9.15/Imlib/load.c
---- imlib-1.9.15-orig/Imlib/load.c	2013-07-29 17:33:54.656601713 -0400
-+++ imlib-1.9.15/Imlib/load.c	2013-07-29 17:39:39.063991823 -0400
-@@ -444,6 +444,7 @@
-   int                 intjump[] = {8, 8, 4, 2};
-   int                 istransp, transp;
-   int                 fd;
-+  int                 Error;
- 
-   done = 0;
-   istransp = 0;
-@@ -454,7 +455,7 @@
-   fd = fileno(f);
-   /* Apparently rewind(f) isn't sufficient */
-   lseek(fd, (long) 0, 0);
--  gif = DGifOpenFileHandle(fd);
-+  gif = DGifOpenFileHandle(fd, &Error);
- 
-   if (!gif)
-     return NULL;
-diff -Naur imlib-1.9.15-orig/gdk_imlib/io-gif.c imlib-1.9.15/gdk_imlib/io-gif.c
---- imlib-1.9.15-orig/gdk_imlib/io-gif.c	2013-07-29 17:33:54.656601713 -0400
-+++ imlib-1.9.15/gdk_imlib/io-gif.c	2013-07-29 17:37:11.941783903 -0400
-@@ -23,6 +23,7 @@
-   int                 intjump[] = {8, 8, 4, 2};
-   int                 istransp, transp;
-   int                 fd;
-+  int                 Error;
- 
-   done = 0;
-   istransp = 0;
-@@ -30,7 +31,7 @@
-   fd = fileno(f);
-   /* Apparently rewind(f) isn't sufficient */
-   lseek(fd, (long) 0, 0);
--  gif = DGifOpenFileHandle(fd);
-+  gif = DGifOpenFileHandle(fd, &Error);
- 
-   transp = -1;
-   data = NULL;
-diff -Naur imlib-1.9.15-orig/Imlib/load.c imlib-1.9.15/Imlib/load.c
---- imlib-1.9.15-orig/Imlib/load.c	2013-07-29 22:06:15.111285191 -0400
-+++ imlib-1.9.15/Imlib/load.c	2013-07-29 22:07:36.926673905 -0400
-@@ -6,6 +6,14 @@
- 
- #define G_MAXINT ((int) 0x7fffffff)
- 
-+static void
-+localPrintGifError(void)
-+{
-+    int ErrorCode=0;
-+    GifErrorString(ErrorCode);
-+    fprintf(stderr, "\nGIF-LIB error: %i.\n", ErrorCode);
-+}
-+
- /*      Split the ID - damages input    */
- 
- static char        *
-@@ -462,14 +470,14 @@
-     {
-       if (DGifGetRecordType(gif, &rec) == GIF_ERROR)
- 	{
--	  PrintGifError();
-+	  localPrintGifError();
- 	  rec = TERMINATE_RECORD_TYPE;
- 	}
-       if ((rec == IMAGE_DESC_RECORD_TYPE) && (!done))
- 	{
- 	  if (DGifGetImageDesc(gif) == GIF_ERROR)
- 	    {
--	      PrintGifError();
-+	      localPrintGifError();
- 	      rec = TERMINATE_RECORD_TYPE;
- 	    }
- 	  *w = gif->Image.Width;
-diff -Naur imlib-1.9.15-orig/gdk_imlib/io-gif.c imlib-1.9.15/gdk_imlib/io-gif.c
---- imlib-1.9.15-orig/gdk_imlib/io-gif.c	2013-07-29 22:06:15.111285191 -0400
-+++ imlib-1.9.15/gdk_imlib/io-gif.c	2013-07-29 22:08:46.182265058 -0400
-@@ -10,6 +10,14 @@
- #else
- #include <gif_lib.h>
- 
-+static void
-+localPrintGifError(void)
-+{
-+    int ErrorCode=0;
-+    GifErrorString(ErrorCode);
-+    fprintf(stderr, "\nGIF-LIB error: %i.\n", ErrorCode);
-+}
-+
- unsigned char      *
- loader_gif(FILE *f, int *w, int *h, int *t)
- {
-@@ -43,14 +51,14 @@
-     {
-       if (DGifGetRecordType(gif, &rec) == GIF_ERROR)
- 	{
--	  PrintGifError();
-+	  localPrintGifError();
- 	  rec = TERMINATE_RECORD_TYPE;
- 	}
-       if ((rec == IMAGE_DESC_RECORD_TYPE) && (!done))
- 	{
- 	  if (DGifGetImageDesc(gif) == GIF_ERROR)
- 	    {
--	      PrintGifError();
-+	      localPrintGifError();
- 	      rec = TERMINATE_RECORD_TYPE;
- 	    }
- 	  *w = gif->Image.Width;
diff --git a/extra/imlib/imlib-giflib51.patch b/extra/imlib/imlib-giflib51.patch
new file mode 100644
index 000000000..ae0cf7043
--- /dev/null
+++ b/extra/imlib/imlib-giflib51.patch
@@ -0,0 +1,126 @@
+diff -ruN imlib-1.9.15.orig/gdk_imlib/io-gif.c imlib-1.9.15/gdk_imlib/io-gif.c
+--- imlib-1.9.15.orig/gdk_imlib/io-gif.c	2014-05-27 09:38:13.210527763 +0000
++++ imlib-1.9.15/gdk_imlib/io-gif.c	2014-05-27 09:43:55.435910398 +0000
+@@ -30,7 +30,7 @@
+   fd = fileno(f);
+   /* Apparently rewind(f) isn't sufficient */
+   lseek(fd, (long) 0, 0);
+-  gif = DGifOpenFileHandle(fd);
++  gif = DGifOpenFileHandle(fd, NULL);
+ 
+   transp = -1;
+   data = NULL;
+@@ -43,14 +43,14 @@
+     {
+       if (DGifGetRecordType(gif, &rec) == GIF_ERROR)
+ 	{
+-	  PrintGifError();
++	  fprintf(stderr, "giflib error: %s\n", GifErrorString(gif->Error));
+ 	  rec = TERMINATE_RECORD_TYPE;
+ 	}
+       if ((rec == IMAGE_DESC_RECORD_TYPE) && (!done))
+ 	{
+ 	  if (DGifGetImageDesc(gif) == GIF_ERROR)
+ 	    {
+-	      PrintGifError();
++	      fprintf(stderr, "giflib error: %s\n", GifErrorString(gif->Error));
+ 	      rec = TERMINATE_RECORD_TYPE;
+ 	    }
+ 	  *w = gif->Image.Width;
+@@ -62,13 +62,13 @@
+ 	  rows = malloc(*h * sizeof(GifRowType *));
+ 	  if (!rows)
+ 	    {
+-	      DGifCloseFile(gif);
++	      DGifCloseFile(gif, NULL);
+ 	      return NULL;
+ 	    }
+ 	  data = _gdk_malloc_image(*w, *h);
+ 	  if (!data)
+ 	    {
+-	      DGifCloseFile(gif);
++	      DGifCloseFile(gif, NULL);
+ 	      free(rows);
+ 	      return NULL;
+ 	    }
+@@ -79,7 +79,7 @@
+ 	      rows[i] = malloc(*w * sizeof(GifPixelType));
+ 	      if (!rows[i])
+ 		{
+-		  DGifCloseFile(gif);
++		  DGifCloseFile(gif, NULL);
+ 		  for (i = 0; i < *h; i++)
+ 		    if (rows[i])
+ 		      free(rows[i]);
+@@ -168,7 +168,7 @@
+ 	    }
+ 	}
+     }
+-  DGifCloseFile(gif);
++  DGifCloseFile(gif, NULL);
+   for (i = 0; i < *h; i++)
+     free(rows[i]);
+   free(rows);
+diff -ruN imlib-1.9.15.orig/Imlib/load.c imlib-1.9.15/Imlib/load.c
+--- imlib-1.9.15.orig/Imlib/load.c	2014-05-27 09:38:13.220527723 +0000
++++ imlib-1.9.15/Imlib/load.c	2014-05-27 09:45:25.775576104 +0000
+@@ -454,7 +454,7 @@
+   fd = fileno(f);
+   /* Apparently rewind(f) isn't sufficient */
+   lseek(fd, (long) 0, 0);
+-  gif = DGifOpenFileHandle(fd);
++  gif = DGifOpenFileHandle(fd, NULL);
+ 
+   if (!gif)
+     return NULL;
+@@ -462,14 +462,14 @@
+     {
+       if (DGifGetRecordType(gif, &rec) == GIF_ERROR)
+ 	{
+-	  PrintGifError();
++          fprintf(stderr, "Imlib ERROR: JPEG uses line buffers > 16. Cannot load.\n");
+ 	  rec = TERMINATE_RECORD_TYPE;
+ 	}
+       if ((rec == IMAGE_DESC_RECORD_TYPE) && (!done))
+ 	{
+ 	  if (DGifGetImageDesc(gif) == GIF_ERROR)
+ 	    {
+-	      PrintGifError();
++              fprintf(stderr, "Imlib ERROR: JPEG uses line buffers > 16. Cannot load.\n");
+ 	      rec = TERMINATE_RECORD_TYPE;
+ 	    }
+ 	  *w = gif->Image.Width;
+@@ -481,13 +481,13 @@
+ 	  rows = malloc(*h * sizeof(GifRowType *));
+ 	  if (!rows)
+ 	    {
+-	      DGifCloseFile(gif);
++	      DGifCloseFile(gif, NULL);
+ 	      return NULL;
+ 	    }
+ 	  data = _imlib_malloc_image(*w, *h);
+ 	  if (!data)
+ 	    {
+-	      DGifCloseFile(gif);
++	      DGifCloseFile(gif, NULL);
+ 	      free(rows);
+ 	      return NULL;
+ 	    }
+@@ -498,7 +498,7 @@
+ 	      rows[i] = malloc(*w * sizeof(GifPixelType));
+ 	      if (!rows[i])
+ 		{
+-		  DGifCloseFile(gif);
++		  DGifCloseFile(gif, NULL);
+ 		  for (i = 0; i < *h; i++)
+ 		    if (rows[i])
+ 		      free(rows[i]);
+@@ -587,7 +587,7 @@
+ 	    }
+ 	}
+     }
+-  DGifCloseFile(gif);
++  DGifCloseFile(gif, NULL);
+   for (i = 0; i < *h; i++)
+     free(rows[i]);
+   free(rows);
diff --git a/extra/imlib2/PKGBUILD b/extra/imlib2/PKGBUILD
index 635ace90e..3c7d08d5f 100644
--- a/extra/imlib2/PKGBUILD
+++ b/extra/imlib2/PKGBUILD
@@ -1,24 +1,24 @@
-# $Id: PKGBUILD 204813 2014-01-27 19:49:53Z ronald $
+# $Id: PKGBUILD 215162 2014-06-14 19:17:11Z andyrtr $
 # Maintainer: Ronald van Haren <ronald.archlinux.org>
 # Contributor: Arjan Timmerman <arjan.archlinux.org>
 # Contributor: Tom Newsom <Jeepster.gmx.co.uk>
 
 pkgname=imlib2
 pkgver=1.4.6
-pkgrel=1
+pkgrel=2
 pkgdesc="Library that does image file loading and saving as well as rendering, manipulation, arbitrary polygon support"
 url="http://sourceforge.net/projects/enlightenment/"
 arch=('i686' 'x86_64')
 license=('BSD')
 depends=('libtiff' 'giflib' 'bzip2' 'freetype2' 'libxext' 'libpng' 'libid3tag' 'libjpeg-turbo')
 source=(http://downloads.sourceforge.net/enlightenment/$pkgname-$pkgver.tar.bz2
-        imlib2-giflib5.patch)
+        imlib2-giflib51.patch)
 sha1sums=('20e111d822074593e8d657ecf8aafe504e9e2967'
-          '29d0778ffbe6e57f08048918a79eb1ad6af87bce')
+          '3ee249142b4caecc4a38ac29a999708447f250c1')
 
 prepare() {
   cd $pkgname-$pkgver
-  patch -Np0 -i ../imlib2-giflib5.patch
+  patch -Np1 -i ../imlib2-giflib51.patch
 }
 
 build() {
diff --git a/extra/imlib2/imlib2-giflib5.patch b/extra/imlib2/imlib2-giflib5.patch
deleted file mode 100644
index 966c6e4a7..000000000
--- a/extra/imlib2/imlib2-giflib5.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- src/modules/loaders/loader_gif.c.orig
-+++ src/modules/loaders/loader_gif.c
-@@ -40,7 +40,11 @@ load(ImlibImage * im, ImlibProgressFunct
- #endif
-    if (fd < 0)
-       return 0;
-+#if defined(GIFLIB_MAJOR) && (GIFLIB_MAJOR >= 5)
-+   gif = DGifOpenFileHandle(fd, NULL);
-+#else
-    gif = DGifOpenFileHandle(fd);
-+#endif
-    if (!gif)
-      {
-         close(fd);
diff --git a/extra/imlib2/imlib2-giflib51.patch b/extra/imlib2/imlib2-giflib51.patch
new file mode 100644
index 000000000..1bd8627d3
--- /dev/null
+++ b/extra/imlib2/imlib2-giflib51.patch
@@ -0,0 +1,64 @@
+diff -ruN imlib2-1.4.6.orig/src/modules/loaders/loader_gif.c imlib2-1.4.6/src/modules/loaders/loader_gif.c
+--- imlib2-1.4.6.orig/src/modules/loaders/loader_gif.c	2013-12-21 10:16:10.000000000 +0000
++++ imlib2-1.4.6/src/modules/loaders/loader_gif.c	2014-05-27 09:52:35.857291512 +0000
+@@ -36,7 +36,7 @@
+ #endif
+    if (fd < 0)
+       return 0;
+-   gif = DGifOpenFileHandle(fd);
++   gif = DGifOpenFileHandle(fd, NULL);
+    if (!gif)
+      {
+         close(fd);
+@@ -60,13 +60,13 @@
+              h = gif->Image.Height;
+              if (!IMAGE_DIMENSIONS_OK(w, h))
+                {
+-                  DGifCloseFile(gif);
++                  DGifCloseFile(gif, NULL);
+                   return 0;
+                }
+              rows = malloc(h * sizeof(GifRowType *));
+              if (!rows)
+                {
+-                  DGifCloseFile(gif);
++                  DGifCloseFile(gif, NULL);
+                   return 0;
+                }
+              for (i = 0; i < h; i++)
+@@ -78,7 +78,7 @@
+                   rows[i] = malloc(w * sizeof(GifPixelType));
+                   if (!rows[i])
+                     {
+-                       DGifCloseFile(gif);
++                       DGifCloseFile(gif, NULL);
+                        for (i = 0; i < h; i++)
+                          {
+                             if (rows[i])
+@@ -150,7 +150,7 @@
+         im->data = (DATA32 *) malloc(sizeof(DATA32) * w * h);
+         if (!im->data)
+           {
+-             DGifCloseFile(gif);
++             DGifCloseFile(gif, NULL);
+              free(rows);
+              return 0;
+           }
+@@ -181,7 +181,7 @@
+                        last_per = (int)per;
+                        if (!(progress(im, (int)per, 0, last_y, w, i)))
+                          {
+-                            DGifCloseFile(gif);
++                            DGifCloseFile(gif, NULL);
+                             for (i = 0; i < h; i++)
+                               {
+                                  free(rows[i]);
+@@ -198,7 +198,7 @@
+      {
+         progress(im, 100, 0, last_y, w, h);
+      }
+-   DGifCloseFile(gif);
++   DGifCloseFile(gif, NULL);
+    for (i = 0; i < h; i++)
+      {
+         free(rows[i]);
diff --git a/extra/java7-openjdk/PKGBUILD b/extra/java7-openjdk/PKGBUILD
index 22bac7a2c..bb983cef3 100644
--- a/extra/java7-openjdk/PKGBUILD
+++ b/extra/java7-openjdk/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 210627 2014-04-16 12:11:05Z guillaume $
+# $Id: PKGBUILD 215163 2014-06-14 19:17:13Z andyrtr $
 # Maintainer: Andreas Radke <andyrtr@archlinux.org>
 # Maintainer: Guillaume ALAUX <guillaume@archlinux.org>
 # Contributor: Jan de Groot <jgc@archlinux.org>
@@ -6,24 +6,15 @@
 pkgname=('jre7-openjdk-headless' 'jre7-openjdk' 'jdk7-openjdk' 'openjdk7-src' 'openjdk7-doc')
 pkgbase=java7-openjdk
 _java_ver=7
-_icedtea_ver=2.4.7
+_icedtea_ver=2.5.0
 
 # check "${srcdir}/icedtea-${_icedtea_ver}"/Makefile.am
-_JDK_UPDATE_VERSION=55
-
-_CORBA_CHANGESET=e6ad5b912691
-_JAXP_CHANGESET=94b7e8e0d96f
-_JAXWS_CHANGESET=bd9a50a78d04
-_JDK_CHANGESET=9448fff93286
-_LANGTOOLS_CHANGESET=8c26a3c39128
-_OPENJDK_CHANGESET=13970e76b784
-
-_HOTSPOT_CHANGESET=69b542696e5b  # see "${srcdir}/icedtea-${_icedtea_ver}"/hotspot.map
+_JDK_UPDATE_VERSION=60
 
 _bootstrap=0 # 0/1 for quick build or full bootstrap
 
 pkgver=${_java_ver}.u${_JDK_UPDATE_VERSION}_${_icedtea_ver}
-pkgrel=1
+pkgrel=2
 arch=('i686' 'x86_64')
 url="http://icedtea.classpath.org"
 license=('custom')
@@ -33,83 +24,91 @@ makedepends=('jdk7-openjdk' 'libxp' 'libxslt'
              'java-rhino' 'libpulse>=0.9.11' 'zip' 'unzip' 'cpio' 'fastjar' 'wget'
              'eclipse-ecj')
 
-_url=http://icedtea.classpath.org/hg/release/icedtea7-forest-${_icedtea_ver:0:3}
-source=(http://icedtea.classpath.org/download/source/icedtea-${_icedtea_ver}.tar.gz
-        openjdk-${_OPENJDK_CHANGESET}.tar.gz::${_url}/archive/${_OPENJDK_CHANGESET}.tar.gz
-        corba-${_CORBA_CHANGESET}.tar.gz::${_url}/corba/archive/${_CORBA_CHANGESET}.tar.gz
-        jaxp-${_JAXP_CHANGESET}.tar.gz::${_url}/jaxp/archive/${_JAXP_CHANGESET}.tar.gz
-        jaxws-${_JAXWS_CHANGESET}.tar.gz::${_url}/jaxws/archive/${_JAXWS_CHANGESET}.tar.gz
-        jdk-${_JDK_CHANGESET}.tar.gz::${_url}/jdk/archive/${_JDK_CHANGESET}.tar.gz
-        langtools-${_LANGTOOLS_CHANGESET}.tar.gz::${_url}/langtools/archive/${_LANGTOOLS_CHANGESET}.tar.gz
-        hotspot-${_HOTSPOT_CHANGESET}.tar.gz::${_url}/hotspot/archive/${_HOTSPOT_CHANGESET}.tar.gz
+_icedtea_url=http://icedtea.classpath.org/download
+_drops_url=${_icedtea_url}/drops/icedtea7/${_icedtea_ver:0:3}
+source=(${_icedtea_url}/source/icedtea-${_icedtea_ver}.tar.gz
+        ${_drops_url}/openjdk.tar.bz2
+        ${_drops_url}/corba.tar.bz2
+        ${_drops_url}/jaxp.tar.bz2
+        ${_drops_url}/jaxws.tar.bz2
+        ${_drops_url}/jdk.tar.bz2
+        ${_drops_url}/langtools.tar.bz2
+        ${_drops_url}/hotspot.tar.bz2
         fontconfig-paths.diff
         openjdk7_nonreparenting-wm.diff
+        giflib_5.1.diff
         jdk7-openjdk.profile
         jdk7-openjdk.profile.csh
         jre7-openjdk.profile
         jre7-openjdk.profile.csh)
 
-sha256sums=('754350cbd704b22b7ba3d14c8283eb2d896d137824f95a9e6a2b34678658ade1'
-            'bcd45546509defc439f42f230c0ca64e8aa6ec00542c3634aab3a4c10be3fe6b'
-            'cc37272df260d08207c84763d4c39d7807728ba2d5908276b9bc63e925e70674'
-            '3515cd105c29563bf78432576e658005386f45d7c3b2b7eac7af86cf196aaaea'
-            '3e107628080d84a80a78ef0ef9dc3664989291dd17c8bacf031d59fba7bd7f4d'
-            '9222e5317264f20d4a0b8170b4c4d02459cda98333c18e3a75064e7856ff58be'
-            '5af29e32344e2f2fc0beb31f91b8312f2a0d6d02c53b4cb700ee2e27bcf1043b'
-            'e3bbed298ed7c77169fdfddc47cdb85c62ef2e5e7ea04ca28aa8779861efca65'
+sha256sums=('4e369e35dbf37a5fcc1a837861a74609bf907d3d0b9be7ac98d4f9c99dba7100'
+            '9a2f9486a48d51f84bdf9b9a52dc34fe90b886aa60ff5447b7f2502479065859'
+            '1f9f07f31ce8588cd3cd12465f94e142c852c380059a3dab9831d86d3f264253'
+            '59edb741e1b00243c040b399986960fad9e42f7e5dbe0a1e34798752b080c488'
+            'ed3803635ed25f58cd86ad8ca27585f77cc50385da0342112980cc6ba8ff6028'
+            '508b4e26704749172022c95f44c5aa9feb391e82b54a545fdb79f3a51c269f83'
+            '0eb9c19cfbecfbc6ef1e37f475d73f16469b9e1d969f69b1af4b10cbc2415659'
+            '645a43adaec3be3d3297479d134c02e444af9f0be33d35942f0ca863592fea26'
             '9ad943ceb3dbcdf45d72974fc3667886a7ed65c69ab9abc17be5412827551a7f'
             '56b919ababb13bd6afdcdaceb112b529b6e82539255f2dae9a7e5eb91645164b'
+            '77fba3032edf6cce549cd4e174d9296684b20f4589dc59179fcc8cba7426a4e9'
             'bd55299e08e6f8e61ba5baad0990170891801a29a1e8137e502b5e8a10fc37ea'
             '3f28f8bfc6dd105a07f747d7135c77a77de433e2b8647dd7520a900135203fbd'
             'b7c045b08ad55a9f79390c104fa846d0e7dbb49fccffb2fab2a3824b6b19c9c8'
             '89d99d8ac269ca66e2e279aff652d5aac938a35faec93cd8cff8f048052bd3ce')
 
-noextract=("openjdk-${_OPENJDK_CHANGESET}.tar.gz"
-           "corba-${_CORBA_CHANGESET}.tar.gz"
-           "jaxp-${_JAXP_CHANGESET}.tar.gz"
-           "jaxws-${_JAXWS_CHANGESET}.tar.gz"
-           "jdk-${_JDK_CHANGESET}.tar.gz"
-           "langtools-${_LANGTOOLS_CHANGESET}.tar.gz"
-           "hotspot-${_HOTSPOT_CHANGESET}.tar.gz")
+noextract=(openjdk.tar.gz
+           corba.tar.gz
+           jaxp.tar.gz
+           jaxws.tar.gz
+           jdk.tar.gz
+           langtools.tar.gz
+           hotspot.tar.gz)
 
-  _jvmdir=/usr/lib/jvm/java-7-openjdk
+[ "$CARCH" = "x86_64" ] && _JARCH=amd64
+[ "$CARCH" = "i686" ]   && _JARCH=i386
+
+_jvmdir=/usr/lib/jvm/java-7-openjdk
+_imgdir="icedtea-${_icedtea_ver}/openjdk.build/j2sdk-image"
+_nonheadless=(bin/policytool
+              lib/${_JARCH}/libjsoundalsa.so
+              lib/${_JARCH}/libsplashscreen.so
+              lib/${_JARCH}/xawt/libmawt.so)
 
-  [ "$CARCH" = "x86_64" ] && _JARCH=amd64
-  [ "$CARCH" = "i686" ] && _JARCH=i386
-  
 build() {
   cd "${srcdir}/icedtea-${_icedtea_ver}"
-  
+
   export ALT_PARALLEL_COMPILE_JOBS="${MAKEFLAGS/-j}"
   export HOTSPOT_BUILD_JOBS="${ALT_PARALLEL_COMPILE_JOBS}"
 
   . /etc/profile.d/apache-ant.sh
 
-  cp ${srcdir}/*.diff ${srcdir}/icedtea-${_icedtea_ver}/patches
+  cp "${srcdir}"/*.diff "${srcdir}"/icedtea-${_icedtea_ver}/patches
   export DISTRIBUTION_PATCHES="patches/fontconfig-paths.diff \
-                               patches/openjdk7_nonreparenting-wm.diff"
+                               patches/openjdk7_nonreparenting-wm.diff \
+                               patches/giflib_5.1.diff"
 
   if [ "$_bootstrap" = "1" ]; then
      BOOTSTRAPOPT="--enable-bootstrap --with-ecj-jar=/usr/share/java/ecj.jar"
-   else 
+   else
      BOOTSTRAPOPT="--disable-bootstrap"
   fi
 
   ./configure \
-	$BOOTSTRAPOPT \
+        ${BOOTSTRAPOPT} \
         --with-parallel-jobs="${MAKEFLAGS/-j}" \
         --disable-tests \
         --disable-downloading --disable-Werror \
-        --with-pkgversion="ArchLinux build ${pkgver}-${pkgrel}-${CARCH}" \
+        --with-pkgversion="Arch Linux build ${pkgver}-${pkgrel}-${CARCH}" \
         --with-jdk-home=${JAVA_HOME} \
-        --with-openjdk-src-zip=${srcdir}/openjdk-${_OPENJDK_CHANGESET}.tar.gz \
-        --with-hotspot-src-zip=${srcdir}/hotspot-${_HOTSPOT_CHANGESET}.tar.gz \
-        --with-corba-src-zip=${srcdir}/corba-${_CORBA_CHANGESET}.tar.gz \
-        --with-jaxp-src-zip=${srcdir}/jaxp-${_JAXP_CHANGESET}.tar.gz \
-        --with-jaxws-src-zip=${srcdir}/jaxws-${_JAXWS_CHANGESET}.tar.gz \
-        --with-jdk-src-zip=${srcdir}/jdk-${_JDK_CHANGESET}.tar.gz \
-        --with-langtools-src-zip=${srcdir}/langtools-${_LANGTOOLS_CHANGESET}.tar.gz \
-        --enable-pulse-java \
+        --with-openjdk-src-zip="${srcdir}/openjdk.tar.bz2" \
+        --with-hotspot-src-zip="${srcdir}/hotspot.tar.bz2" \
+        --with-corba-src-zip="${srcdir}/corba.tar.bz2" \
+        --with-jaxp-src-zip="${srcdir}/jaxp.tar.bz2" \
+        --with-jaxws-src-zip="${srcdir}/jaxws.tar.bz2" \
+        --with-jdk-src-zip="${srcdir}/jdk.tar.bz2" \
+        --with-langtools-src-zip="${srcdir}/langtools.tar.bz2" \
         --enable-nss \
         --with-rhino \
         --with-abs-install-dir=${_jvmdir}
@@ -122,135 +121,102 @@ check() {
 }
 
 package_jre7-openjdk-headless() {
-  pkgdesc="Free Java environment based on OpenJDK 7.0 with IcedTea7 replacing binary plugs - Minimal Java runtime - needed for executing non GUI Java programs"
+  pkgdesc='OpenJDK Java 7 headless runtime environment'
   depends=('libjpeg-turbo' 'lcms2' 'nss' 'ca-certificates-java')
   optdepends=('libcups: needed for Java Mauve support - libmawt.so'
               'fontconfig: needed for Java Mauve support - libmawt.so'
               'java-rhino: for some JavaScript support')
   provides=('java-runtime-headless=7')
   conflicts=('openjdk6')
-  backup=(etc/profile.d/jre.sh
-          etc/profile.d/jre.csh
-          etc/java-7-openjdk/calendars.properties
-          etc/java-7-openjdk/content-types.properties
-          etc/java-7-openjdk/cursors/cursors.properties
-          etc/java-7-openjdk/flavormap.properties
-          etc/java-7-openjdk/fontconfig.bfc
-          etc/java-7-openjdk/fontconfig.properties
-          etc/java-7-openjdk/jvm.cfg
-          etc/java-7-openjdk/logging.properties
-          etc/java-7-openjdk/management/jmxremote.access
-          etc/java-7-openjdk/management/jmxremote.password
-          etc/java-7-openjdk/management/management.properties
-          etc/java-7-openjdk/management/snmp.acl
-          etc/java-7-openjdk/net.properties
-          etc/java-7-openjdk/psfont.properties.ja
-          etc/java-7-openjdk/psfontj2d.properties
-          etc/java-7-openjdk/security/java.policy
-          etc/java-7-openjdk/security/java.security
-          etc/java-7-openjdk/security/nss.cfg
-          etc/java-7-openjdk/sound.properties
-          etc/java-7-openjdk/tz.properties)
+  # Upstream config files that should go to etc and get backup
+  _backup_etc=(etc/java-7-openjdk/${_JARCH}/jvm.cfg
+               etc/java-7-openjdk/calendars.properties
+               etc/java-7-openjdk/content-types.properties
+               etc/java-7-openjdk/flavormap.properties
+               etc/java-7-openjdk/fontconfig.bfc
+               etc/java-7-openjdk/fontconfig.properties
+               etc/java-7-openjdk/images/cursors/cursors.properties
+               etc/java-7-openjdk/logging.properties
+               etc/java-7-openjdk/management/jmxremote.access
+               etc/java-7-openjdk/management/jmxremote.password
+               etc/java-7-openjdk/management/management.properties
+               etc/java-7-openjdk/management/snmp.acl
+               etc/java-7-openjdk/net.properties
+               etc/java-7-openjdk/psfont.properties.ja
+               etc/java-7-openjdk/psfontj2d.properties
+               etc/java-7-openjdk/security/java.policy
+               etc/java-7-openjdk/security/java.security
+               etc/java-7-openjdk/security/nss.cfg
+               etc/java-7-openjdk/sound.properties
+               etc/java-7-openjdk/tz.properties)
+  backup=(${_backup_etc[@]}
+          etc/profile.d/jre.sh
+          etc/profile.d/jre.csh)
   install=jre7-openjdk-headless.install
 
-  cd "${srcdir}/icedtea-${_icedtea_ver}/openjdk.build/j2sdk-image/jre"
+  cd "${srcdir}/${_imgdir}/jre"
 
-  mv lib/fontconfig.Ubuntu.properties.src lib/fontconfig.properties
-  mv lib/fontconfig.Ubuntu.bfc lib/fontconfig.bfc
-  rm -f lib/fontconfig.*.bfc
-  rm -f lib/fontconfig.*.properties.src 
-  rm -f lib/fontconfig.properties.src
+  install -d -m755 "${pkgdir}${_jvmdir}/jre"
+  cp -a bin lib "${pkgdir}${_jvmdir}/jre"
 
-  install -d -m755 ${pkgdir}${_jvmdir}/jre
-  cp -a bin lib ${pkgdir}${_jvmdir}/jre
+  # Set config files
+  mv "${pkgdir}${_jvmdir}"/jre/lib/fontconfig.{Ubuntu.properties.src,properties}
+  mv "${pkgdir}${_jvmdir}"/jre/lib/fontconfig.{Ubuntu.bfc,bfc}
+  mv "${pkgdir}${_jvmdir}"/jre/lib/management/jmxremote.password{.template,}
+  mv "${pkgdir}${_jvmdir}"/jre/lib/management/snmp.acl{.template,}
+  rm -f "${pkgdir}${_jvmdir}"/jre/lib/fontconfig.*.bfc
+  rm -f "${pkgdir}${_jvmdir}"/jre/lib/fontconfig.*.properties.src
+  rm -f "${pkgdir}${_jvmdir}"/jre/lib/fontconfig.properties.src
 
-  # Install man pages
-  pushd ../../j2re-image/man
-  install -m755 -d ${pkgdir}/usr/share/man/{,ja/}man1/
-  install -m644 man1/*.1 ${pkgdir}/usr/share/man/man1
-  install -m644 ja_JP.UTF-8/man1/*.1 ${pkgdir}/usr/share/man/ja/man1
-  popd
+  # Remove 'non-headless' files
+  for f in ${_nonheadless[@]}; do
+    rm "${pkgdir}${_jvmdir}/jre/${f}"
+  done
 
-  # more files that belong to the desktop package
-  mkdir ${srcdir}/tmp-desktop-jre
-  for file in \
-      "${_jvmdir}/jre/bin/policytool" \
-      "${_jvmdir}/jre/lib/${_JARCH}/libjsoundalsa.so" \
-      "${_jvmdir}/jre/lib/${_JARCH}/libpulse-java.so" \
-      "${_jvmdir}/jre/lib/${_JARCH}/libsplashscreen.so" \
-      "${_jvmdir}/jre/lib/${_JARCH}/xawt/libmawt.so" \
-      "/usr/share/man/ja/man1/policytool.1" \
-      "/usr/share/man/man1/policytool.1"; do
-     dirname=`dirname $file`
-     install -dm755 ${srcdir}/tmp-desktop-jre/$dirname || /bin/true
-     # mv file from fakeinstall to pkgdir
-     mv ${pkgdir}/$file ${srcdir}/tmp-desktop-jre$file
+  # Man pages
+  pushd "${pkgdir}${_jvmdir}/jre/bin"
+  install -d -m 755 "${pkgdir}"/usr/share/man/{,ja/}man1/
+  for file in *; do
+    install -m 644 "${srcdir}/${_imgdir}/man/man1/${file}.1" \
+      "${pkgdir}/usr/share/man/man1/${file}.1"
+    install -m 644 "${srcdir}/${_imgdir}/man/ja/man1/${file}.1" \
+      "${pkgdir}/usr/share/man/ja/man1/${file}.1"
   done
-  rmdir ${pkgdir}${_jvmdir}/jre/lib/${_JARCH}/xawt
+  popd
 
   # Link binaries into /usr/bin
-  pushd ${pkgdir}${_jvmdir}/jre/bin
-  install -m755 -d ${pkgdir}/usr/bin/
+  pushd "${pkgdir}${_jvmdir}/jre/bin"
+  install -d -m755 "${pkgdir}/usr/bin/"
   for file in *; do
-    ln -sf ${_jvmdir}/jre/bin/${file} ${pkgdir}/usr/bin
+    ln -sf ${_jvmdir}/jre/bin/${file} "${pkgdir}/usr/bin"
   done
   popd
 
   # Link JKS keystore from ca-certificates-java
-  rm -f ${pkgdir}${_jvmdir}/jre/lib/security/cacerts
+  rm -f "${pkgdir}${_jvmdir}/jre/lib/security/cacerts"
   ln -sf /etc/ssl/certs/java/cacerts "${pkgdir}${_jvmdir}/jre/lib/security/cacerts"
 
   # Set some variables
-  install -m755 -d ${pkgdir}/etc/profile.d/
-  install -m755 ${srcdir}/jre7-openjdk.profile ${pkgdir}/etc/profile.d/jre.sh
-  install -m755 ${srcdir}/jre7-openjdk.profile.csh ${pkgdir}/etc/profile.d/jre.csh
+  install -d -m755 "${pkgdir}/etc/profile.d/"
+  install -m755 "${srcdir}/jre7-openjdk.profile" "${pkgdir}/etc/profile.d/jre.sh"
+  install -m755 "${srcdir}/jre7-openjdk.profile.csh" "${pkgdir}/etc/profile.d/jre.csh"
 
   # Install license
-  install -m755 -d ${pkgdir}/usr/share/licenses/${pkgbase}/
+  install -d -m755 "${pkgdir}/usr/share/licenses/${pkgbase}/"
   install -m644 ASSEMBLY_EXCEPTION LICENSE THIRD_PARTY_README \
-                 ${pkgdir}/usr/share/licenses/${pkgbase}
-
-  # link license
+                 "${pkgdir}/usr/share/licenses/${pkgbase}"
   ln -sf /usr/share/licenses/${pkgbase} "${pkgdir}/usr/share/licenses/${pkgname}"
-		 
-  # Put some more files under backup control
-  install -m755 -d ${pkgdir}/etc/java-7-openjdk/
-  install -m644 ${pkgdir}${_jvmdir}/jre/lib/*.properties* ${pkgdir}/etc/java-7-openjdk/
-  # install dummy links to make them found by JAVA
-  cd ${pkgdir}${_jvmdir}/jre/lib/
-  for file in `ls ${pkgdir}/etc/java-7-openjdk/*.properties*`; do
-    ln -vsf /etc/java-7-openjdk/`basename $file` .
+
+  # Move config files that were set in _backup_etc from ./lib to /etc
+  for file in ${_backup_etc[@]}; do
+    _filepkgpath=${_jvmdir}/jre/lib/${file#etc/java-7-openjdk/}
+    install -D -m 644 "${pkgdir}${_filepkgpath}" "${pkgdir}/${file}"
+    ln -sf /${file} "${pkgdir}${_filepkgpath}"
   done
-  # some more
-  install -m755 -d ${pkgdir}/etc/java-7-openjdk/{cursors,management,security}
-  install -m644 ${pkgdir}${_jvmdir}/jre/lib/images/cursors/cursors.properties \
-                ${pkgdir}/etc/java-7-openjdk/cursors/
-  pushd ${pkgdir}${_jvmdir}/jre/lib/images/cursors/
-    ln -vsf /etc/java-7-openjdk/cursors/cursors.properties .
-  popd
-  mv ${pkgdir}${_jvmdir}/jre/lib/management/jmxremote.password.template \
-     ${pkgdir}${_jvmdir}/jre/lib/management/jmxremote.password
-  mv ${pkgdir}${_jvmdir}/jre/lib/management/snmp.acl.template \
-     ${pkgdir}${_jvmdir}/jre/lib/management/snmp.acl
-  install -m644 ${pkgdir}${_jvmdir}/jre/lib/management/{management.properties,jmxremote.access,jmxremote.password,snmp.acl} \
-                ${pkgdir}/etc/java-7-openjdk/management/
-  pushd ${pkgdir}${_jvmdir}/jre/lib/management
-    ln -vsf /etc/java-7-openjdk/management/{management.properties,jmxremote.access,jmxremote.password,snmp.acl} .
-  popd
-  install -m644 ${pkgdir}${_jvmdir}/jre/lib/security/{java.policy,java.security,nss.cfg} \
-                ${pkgdir}/etc/java-7-openjdk/security/
-  pushd ${pkgdir}${_jvmdir}/jre/lib/security
-    ln -vsf /etc/java-7-openjdk/security/{java.policy,java.security,nss.cfg} .
-  popd
-  install -m644 ${pkgdir}${_jvmdir}/jre/lib/fontconfig.bfc ${pkgdir}/etc/java-7-openjdk/
-  install -m644 ${pkgdir}${_jvmdir}/jre/lib/${_JARCH}/jvm.cfg ${pkgdir}/etc/java-7-openjdk/
-  pushd ${pkgdir}${_jvmdir}/jre/lib/${_JARCH}/
-     ln -vsf /etc/java-7-openjdk/jvm.cfg .
-  popd
 }
-	 
+
 package_jre7-openjdk() {
-  pkgdesc="Free Java environment based on OpenJDK 7.0 with IcedTea7 replacing binary plugs - Full Java runtime environment - needed for executing Java GUI and Webstart programs"
+  pkgdesc='OpenJDK Java 7 full runtime environment'
   depends=('jre7-openjdk-headless' 'xdg-utils' 'hicolor-icon-theme')
   optdepends=('icedtea-web-java7: web browser plugin + Java Web Start'
              'alsa-lib: for basic sound support'
@@ -258,108 +224,121 @@ package_jre7-openjdk() {
              'libpulse: for advanced sound support'
              'gtk2: for the Gtk+ look and feel - desktop usage'
              'libxtst: linked in xawt/libmawt.so - desktop usage')
-  install=jre7-openjdk.install
   provides=('java-runtime=7')
   conflicts=('openjdk6')
-  
-  mv ${srcdir}/tmp-desktop-jre/* ${pkgdir}
+  install=jre7-openjdk.install
+
+  cd "${srcdir}/${_imgdir}/jre"
+
+  for f in ${_nonheadless[@]}; do
+    install -D ${f} "${pkgdir}${_jvmdir}/jre/${f}"
+  done
+
   # Link binaries into /usr/bin
-  pushd ${pkgdir}${_jvmdir}/jre/bin
-  install -m755 -d ${pkgdir}/usr/bin/
+  pushd "${pkgdir}${_jvmdir}/jre/bin"
+  install -d -m755 "${pkgdir}/usr/bin/"
+  for file in *; do
+    ln -sf ${_jvmdir}/jre/bin/${file} "${pkgdir}/usr/bin"
+  done
+  popd
+
+  # Man pages
+  pushd "${pkgdir}${_jvmdir}/jre/bin"
+  install -d -m 755 "${pkgdir}"/usr/share/man/{,ja/}man1/
   for file in *; do
-    ln -sf ${_jvmdir}/jre/bin/${file} ${pkgdir}/usr/bin
+    install -m 644 "${srcdir}/${_imgdir}/man/man1/${file}.1" \
+      "${pkgdir}/usr/share/man/man1/${file}.1"
+    install -m 644 "${srcdir}/${_imgdir}/man/ja/man1/${file}.1" \
+      "${pkgdir}/usr/share/man/ja/man1/${file}.1"
   done
   popd
-  
-  cd "${srcdir}/icedtea-${_icedtea_ver}/openjdk.build/j2sdk-image/jre"
 
   # Install icons and menu entries
   for s in 16 24 32 48 ; do
-    install -m755 -d ${pkgdir}/usr/share/icons/hicolor/${s}x${s}/apps/
+    install -d -m755 "${pkgdir}/usr/share/icons/hicolor/${s}x${s}/apps/"
     install -m644 ../../../openjdk/jdk/src/solaris/classes/sun/awt/X11/java-icon${s}.png \
-                  ${pkgdir}/usr/share/icons/hicolor/${s}x${s}/apps/java.png
+                  "${pkgdir}/usr/share/icons/hicolor/${s}x${s}/apps/java.png"
   done
-  
+
   # Install desktop files.
-  install -m755 -d ${pkgdir}/usr/share/applications
-  install -m644 ${srcdir}/icedtea-${_icedtea_ver}/policytool.desktop ${pkgdir}/usr/share/applications
+  install -d -m755 "${pkgdir}/usr/share/applications"
+  install -m644 "${srcdir}/icedtea-${_icedtea_ver}/policytool.desktop" "${pkgdir}/usr/share/applications"
 
   # link license
-  install -m755 -d ${pkgdir}/usr/share/licenses
+  install -d -m755 "${pkgdir}/usr/share/licenses"
   ln -sf /usr/share/licenses/${pkgbase} "${pkgdir}/usr/share/licenses/${pkgname}"
 }
 
 package_jdk7-openjdk() {
-  pkgdesc="Free Java environment based on OpenJDK 7.0 with IcedTea7 replacing binary plugs - SDK"
+  pkgdesc='OpenJDK Java 7 development kit'
   depends=('jre7-openjdk')
   provides=('java-environment=7')
   conflicts=('java-environment')
   replaces=('openjdk6')
   backup=(etc/profile.d/jdk.sh etc/profile.d/jdk.csh)
 
-  cd "${srcdir}/icedtea-${_icedtea_ver}/openjdk.build/j2sdk-image"
+  cd "${srcdir}/${_imgdir}"
 
   # Main files
-  install -m755 -d ${pkgdir}${_jvmdir}
+  install -d -m755 "${pkgdir}${_jvmdir}"
 
-  cp -a include lib ${pkgdir}${_jvmdir}
+  cp -a include lib "${pkgdir}${_jvmdir}"
 
   # 'bin' files
   pushd bin
-  install -m755 -d ${pkgdir}${_jvmdir}/bin/ \
-                   ${pkgdir}/usr/bin/ \
-                   ${pkgdir}/usr/share/man/{,ja/}man1/
+  install -d -m755 "${pkgdir}${_jvmdir}/bin/" \
+                   "${pkgdir}"/usr/bin/ \
+                   "${pkgdir}"/usr/share/man/{,ja/}man1/
 
   # 'java-rmi.cgi' will be handled separately as it should not be in the PATH and has no man page
   for b in $(ls | grep -v java-rmi.cgi); do
     if [ -e ../jre/bin/${b} ]; then
       # Provide a link of the jre binary in the jdk/bin/ directory
-      ln -s ../jre/bin/${b} ${pkgdir}${_jvmdir}/bin/${b}
+      ln -s ../jre/bin/${b} "${pkgdir}${_jvmdir}/bin/${b}"
     else
       # Copy binary to jdk/bin/
-      install -m755 ${b} ${pkgdir}${_jvmdir}/bin/${b}
+      install -m755 ${b} "${pkgdir}${_jvmdir}/bin/${b}"
       # Copy man page
-      install -m644 ../man/man1/${b}.1 ${pkgdir}/usr/share/man/man1/${b}.1
-      install -m644 ../man/ja/man1/${b}.1 ${pkgdir}/usr/share/man/ja/man1/${b}.1
+      install -m644 ../man/man1/${b}.1 "${pkgdir}/usr/share/man/man1/${b}.1"
+      install -m644 ../man/ja/man1/${b}.1 "${pkgdir}/usr/share/man/ja/man1/${b}.1"
       # Link from /bin/
-      ln -s ${_jvmdir}/bin/${b} ${pkgdir}/usr/bin/${b}
+      ln -s ${_jvmdir}/bin/${b} "${pkgdir}/usr/bin/${b}"
     fi
   done
   popd
 
-  # Install desktop files.
-  install -m755 -d ${pkgdir}/usr/share/applications
-  install -m644 ${srcdir}/icedtea-${_icedtea_ver}/jconsole.desktop ${pkgdir}/usr/share/applications
-
   # Handling 'java-rmi.cgi' separately
-  install -m755 -D bin/java-rmi.cgi ${pkgdir}${_jvmdir}/bin/java-rmi.cgi
+  install -D -m755 bin/java-rmi.cgi "${pkgdir}${_jvmdir}/bin/java-rmi.cgi"
+
+  # Install desktop files.
+  install -d -m755 "${pkgdir}/usr/share/applications"
+  install -m644 "${srcdir}/icedtea-${_icedtea_ver}/jconsole.desktop" "${pkgdir}/usr/share/applications"
 
   # Set some variables
-  install -m755 -d ${pkgdir}/etc/profile.d/
-  install -m755 ${srcdir}/${pkgname}.profile ${pkgdir}/etc/profile.d/jdk.sh
-  install -m755 ${srcdir}/${pkgname}.profile.csh ${pkgdir}/etc/profile.d/jdk.csh
+  install -d -m755 "${pkgdir}/etc/profile.d/"
+  install -m755 "${srcdir}/${pkgname}.profile" "${pkgdir}/etc/profile.d/jdk.sh"
+  install -m755 "${srcdir}/${pkgname}.profile.csh" "${pkgdir}/etc/profile.d/jdk.csh"
 
   # Temporarily fixing FS#35141
-  chmod go+r ${pkgdir}${_jvmdir}/lib/sa-jdi.jar
+  chmod go+r "${pkgdir}${_jvmdir}/lib/sa-jdi.jar"
 
   # link license
-  install -m755 -d ${pkgdir}/usr/share/licenses
+  install -d -m755 "${pkgdir}/usr/share/licenses"
   ln -sf /usr/share/licenses/${pkgbase} "${pkgdir}/usr/share/licenses/${pkgname}"
 }
 
 package_openjdk7-src() {
-  pkgdesc="Free Java environment based on OpenJDK 7.0 with IcedTea7 replacing binary plugs - sources"
+  pkgdesc='OpenJDK Java 7 sources'
   replaces=('openjdk6-src')
-  
-  install -D ${srcdir}/icedtea-${_icedtea_ver}/openjdk.build/j2sdk-image/src.zip \
-             ${pkgdir}${_jvmdir}/src.zip
+
+  install -D "${srcdir}/${_imgdir}/src.zip" "${pkgdir}${_jvmdir}/src.zip"
 }
 
 package_openjdk7-doc() {
-  pkgdesc="Free Java environment based on OpenJDK 7.0 with IcedTea7 replacing binary plugs - documentation"
+  pkgdesc='OpenJDK Java 7 documentation'
 
-  install -m755 -d ${pkgdir}/usr/share/doc/openjdk7-doc
-  for i in ${srcdir}/icedtea-${_icedtea_ver}/openjdk.build/docs/*; do
-    cp -a $i ${pkgdir}/usr/share/doc/openjdk7-doc/
+  install -d -m755 "${pkgdir}/usr/share/doc/openjdk7-doc"
+  for i in "${srcdir}"/icedtea-${_icedtea_ver}/openjdk.build/docs/*; do
+    cp -a $i "${pkgdir}/usr/share/doc/openjdk7-doc/"
   done
 }
diff --git a/extra/java7-openjdk/giflib_5.1.diff b/extra/java7-openjdk/giflib_5.1.diff
new file mode 100644
index 000000000..a9361573c
--- /dev/null
+++ b/extra/java7-openjdk/giflib_5.1.diff
@@ -0,0 +1,14 @@
+--- openjdk/jdk/src/share/native/sun/awt/splashscreen/splashscreen_gif.c.orig	2014-05-27 22:17:19.766866065 +0200
++++ openjdk/jdk/src/share/native/sun/awt/splashscreen/splashscreen_gif.c	2014-05-27 22:16:35.452894426 +0200
+@@ -310,7 +310,11 @@
+     free(pBitmapBits);
+     free(pOldBitmapBits);
+ 
++#if GIFLIB_MAJOR >= 5
++    DGifCloseFile(gif, NULL);
++#else
+     DGifCloseFile(gif);
++#endif
+ 
+     return 1;
+ }
diff --git a/extra/kdemultimedia-kmix/PKGBUILD b/extra/kdemultimedia-kmix/PKGBUILD
index 9d20fbd9a..c415bbcf1 100644
--- a/extra/kdemultimedia-kmix/PKGBUILD
+++ b/extra/kdemultimedia-kmix/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 214912 2014-06-10 17:55:11Z svenstaro $
+# $Id: PKGBUILD 215125 2014-06-14 15:26:06Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdemultimedia-kmix
 pkgver=4.13.2
-pkgrel=1
+pkgrel=2
 pkgdesc="KDE volume control program"
 url='http://kde.org/applications/multimedia/kmix/'
 arch=('i686' 'x86_64')
@@ -12,12 +12,20 @@ groups=('kde' 'kdemultimedia')
 depends=('kdebase-runtime')
 makedepends=('cmake' 'automoc4')
 install="${pkgname}.install"
-source=("http://download.kde.org/stable/${pkgver}/src/kmix-${pkgver}.tar.xz")
-sha1sums=('03f676426a9afbc9b0395239d8950319e786a019')
+source=("http://download.kde.org/stable/${pkgver}/src/kmix-${pkgver}.tar.xz"
+        'use-qdbus-qt4.patch')
+sha1sums=('03f676426a9afbc9b0395239d8950319e786a019'
+          'f89a076c5a29c51d213864e27d07baf5400ece03')
 
-build() {
-  cd "${srcdir}"
+prepare() {
   mkdir build
+
+  cd kmix-${pkgver}
+  # FS#40786
+  patch -p1 -i "${srcdir}"/use-qdbus-qt4.patch
+}
+
+build() {
   cd build
   cmake ../kmix-${pkgver} \
     -DCMAKE_BUILD_TYPE=Release \
@@ -27,6 +35,6 @@ build() {
 }
 
 package() {
-  cd "${srcdir}"/build
+  cd build
   make DESTDIR="${pkgdir}" install
 }
diff --git a/extra/kdemultimedia-kmix/use-qdbus-qt4.patch b/extra/kdemultimedia-kmix/use-qdbus-qt4.patch
new file mode 100644
index 000000000..462a25cf6
--- /dev/null
+++ b/extra/kdemultimedia-kmix/use-qdbus-qt4.patch
@@ -0,0 +1,59 @@
+--- kmix-4.13.2/apps/kmixremote~	2014-06-14 15:17:06.856474667 +0000
++++ kmix-4.13.2/apps/kmixremote	2014-06-14 15:17:44.759594763 +0000
+@@ -28,7 +28,7 @@
+ # Prints the mixer DBUS ID's on the console. leaving out the "/Mixers/" prefix
+ function listMixers
+ {
+-  qdbus org.kde.kmix /Mixers org.freedesktop.DBus.Properties.Get org.kde.KMix.MixSet mixers | cut -f3 -d/
++  qdbus-qt4 org.kde.kmix /Mixers org.freedesktop.DBus.Properties.Get org.kde.KMix.MixSet mixers | cut -f3 -d/
+   errorCode=$?
+   if test $errorCode != 0; then
+     echo "Error $errorCode listing mixers. KMix is not running."
+@@ -38,7 +38,7 @@
+ # Prints the mixer control DBUS ID's of the given mixer on the console. leaving out the "/Mixers/" prefix
+ function listControls
+ {
+-  qdbus org.kde.kmix $1 org.freedesktop.DBus.Properties.Get org.kde.KMix.Mixer controls  | cut -f4 -d/
++  qdbus-qt4 org.kde.kmix $1 org.freedesktop.DBus.Properties.Get org.kde.KMix.Mixer controls  | cut -f4 -d/
+   errorCode=$?
+   if test $errorCode != 0; then
+     echo "Error $errorCode listing controls. KMix is not running."
+@@ -47,8 +47,8 @@
+ 
+ command=""
+ 
+-if ! type qdbus >/dev/null  2>&1 ; then
+-  exit_with_error "$0 requires qdbus, but it cannot be found. Please install or check \$PATH"
++if ! type qdbus-qt4 >/dev/null  2>&1 ; then
++  exit_with_error "$0 requires qdbus-qt4, but it cannot be found. Please install or check \$PATH"
+ fi
+ 
+ # Read args
+@@ -58,8 +58,8 @@
+   if test -z "$arg"; then
+     break
+   elif test "x--master" = "x$arg"; then
+-    mixer=`qdbus org.kde.kmix /Mixers org.kde.KMix.MixSet.currentMasterMixer`
+-    control=`qdbus org.kde.kmix /Mixers org.kde.KMix.MixSet.currentMasterControl`
++    mixer=`qdbus-qt4 org.kde.kmix /Mixers org.kde.KMix.MixSet.currentMasterMixer`
++    control=`qdbus-qt4 org.kde.kmix /Mixers org.kde.KMix.MixSet.currentMasterControl`
+   elif test "x--help" = "x$arg" -o "x-h" = "x$arg"; then
+     usage
+     exit 0
+@@ -113,13 +113,13 @@
+ # --- EXECUTE PHASE --------------------------------------------------------------------------------------------------
+ if test "xget" = "x$command"; then
+   # GET
+-  qdbus org.kde.kmix $targetControl org.freedesktop.DBus.Properties.Get org.kde.KMix.Control volume
++  qdbus-qt4 org.kde.kmix $targetControl org.freedesktop.DBus.Properties.Get org.kde.KMix.Control volume
+ elif test "xset" = "x$command"; then
+   # SET
+-  qdbus org.kde.kmix $targetControl org.freedesktop.DBus.Properties.Set org.kde.KMix.Control volume $genericArg
++  qdbus-qt4 org.kde.kmix $targetControl org.freedesktop.DBus.Properties.Set org.kde.KMix.Control volume $genericArg
+ elif test "xmute" = "x$command"; then
+   # MUTE
+-  qdbus org.kde.kmix $targetControl org.freedesktop.DBus.Properties.Set org.kde.KMix.Control mute $genericArg
++  qdbus-qt4 org.kde.kmix $targetControl org.freedesktop.DBus.Properties.Set org.kde.KMix.Control mute $genericArg
+ else
+   exit_with_error "No such command '$command'"
+ fi
diff --git a/extra/khtml/PKGBUILD b/extra/khtml/PKGBUILD
index 1e05987e5..ae352247e 100644
--- a/extra/khtml/PKGBUILD
+++ b/extra/khtml/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 214178 2014-06-04 09:11:37Z andrea $
+# $Id: PKGBUILD 215165 2014-06-14 19:17:17Z andyrtr $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=khtml
 pkgver=4.100.0
-pkgrel=1
+pkgrel=2
 pkgdesc='KHtml'
 arch=('i686' 'x86_64')
 url='https://projects.kde.org/projects/frameworks/khtml'
@@ -16,6 +16,8 @@ md5sums=('c9b04036e1b1b3ac9f253962386c6b0e')
 
 prepare() {
   mkdir -p build
+  #fix build with giflib 5.1.0 - taken from BLFS
+  sed -i "/DGifCloseFile/s:file:&, NULL:g" khtml-$pkgver/src/imload/decoders/gifloader.cpp
 }
 
 build() {
diff --git a/extra/libcdr/PKGBUILD b/extra/libcdr/PKGBUILD
index d5f74de72..6f4234bdf 100644
--- a/extra/libcdr/PKGBUILD
+++ b/extra/libcdr/PKGBUILD
@@ -1,19 +1,19 @@
-# $Id: PKGBUILD 211320 2014-04-18 17:28:23Z andyrtr $
+# $Id: PKGBUILD 215146 2014-06-14 19:16:52Z andyrtr $
 # Maintainer: AndyRTR <andyrtr@archlinux.org>
 # Contributor: megadriver <megadriver at gmx dot com>
 # Contributor: Luca Bennati <lucak3 AT gmail DOT com>
 
 pkgname=libcdr
-pkgver=0.0.16
-pkgrel=2
+pkgver=0.1.0
+pkgrel=1
 pkgdesc="CorelDraw file format importer library for LibreOffice"
 arch=('i686' 'x86_64')
 url="http://www.freedesktop.org/wiki/Software/libcdr/"
 license=('GPL2' 'LGPL2.1' 'MPL')
-depends=('libwpd' 'lcms2' 'icu')
-makedepends=('libwpg' 'boost')
+depends=('libwpd' 'lcms2' 'icu' 'librevenge')
+makedepends=('libwpg' 'boost' 'doxygen')
 source=(http://dev-www.libreoffice.org/src/$pkgname-$pkgver.tar.xz)
-md5sums=('b494bbaf48a0d5f90a525e6ea37bc096')
+md5sums=('71f1f54a418694b6e46c3e9633899c12')
 
 build() {
   cd $pkgname-$pkgver
diff --git a/extra/libetonyek/PKGBUILD b/extra/libetonyek/PKGBUILD
index e56dc4a5b..a5d3dd44c 100644
--- a/extra/libetonyek/PKGBUILD
+++ b/extra/libetonyek/PKGBUILD
@@ -1,19 +1,19 @@
-# $Id: PKGBUILD 211265 2014-04-18 12:27:05Z andyrtr $
+# $Id: PKGBUILD 215147 2014-06-14 19:16:53Z andyrtr $
 # Maintainer: AndyRTR <andyrtr@archlinux.org>
 # Maintainer:  Bartłomiej Piotrowski <bpiotrowski@archlinux.org>
 # Contributor: Yue
 
 pkgname=libetonyek
-pkgver=0.0.4
+pkgver=0.1.1
 pkgrel=1
 pkgdesc='Library and a set of tools for reading and converting Apple Keynote presentations'
 arch=('i686' 'x86_64')
 url='http://www.freedesktop.org/wiki/Software/libetonyek/'
 license=('MPL')
-depends=('libxml2' 'gperf' 'zlib' 'libwpd' 'boost-libs')
-makedepends=('boost' 'cppunit')
+depends=('libxml2' 'zlib' 'libwpd' 'boost-libs' 'librevenge')
+makedepends=('boost' 'cppunit' 'gperf' 'doxygen')
 source=(http://dev-www.libreoffice.org/src/$pkgname-$pkgver.tar.xz)
-md5sums=('9d7c8e52e2d20e1fa270c75fd78f3417')
+md5sums=('7adbc34bb4a33e26688c862e154a0d29')
 
 build() {
   cd $pkgname-$pkgver
diff --git a/extra/libgadu/PKGBUILD b/extra/libgadu/PKGBUILD
index cc426a5c0..ca9696c5f 100644
--- a/extra/libgadu/PKGBUILD
+++ b/extra/libgadu/PKGBUILD
@@ -1,33 +1,27 @@
-# $Id: PKGBUILD 213856 2014-05-30 15:47:45Z andrea $
+# $Id: PKGBUILD 215223 2014-06-16 21:36:27Z andrea $
 # Maintainer:
 # Contributor: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Mateusz Herych <heniekk@gmail.com>
 
 pkgname=libgadu
-pkgver=1.11.4
+pkgver=1.12.0
 pkgrel=1
 pkgdesc="This library implements the client side of the Gadu-Gadu protocol"
 arch=('i686' 'x86_64')
 url="http://libgadu.net/"
 license=('LGPL2.1')
-depends=('openssl' 'zlib')
+depends=('gnutls' 'protobuf-c')
 source=("http://github.com/wojtekka/libgadu/releases/download/${pkgver}/${pkgname}-${pkgver}.tar.gz")
-md5sums=('feef622126e21601798c7e4497890ca3')
+md5sums=('e4569a0ed26136c4634fa8c4013910e3')
 
 build() {
   cd ${pkgname}-${pkgver}
   ./configure --prefix=/usr \
-    --disable-static \
-    --enable-shared \
-    --with-pthread
+    --disable-tests \
+    --disable-static
   make
 }
 
-check() {
-  cd ${pkgname}-${pkgver}
-  make check
-}
-
 package() {
   cd ${pkgname}-${pkgver}
   make DESTDIR="${pkgdir}" install
diff --git a/extra/libgdiplus/PKGBUILD b/extra/libgdiplus/PKGBUILD
index 4ff97ce93..c97d63999 100644
--- a/extra/libgdiplus/PKGBUILD
+++ b/extra/libgdiplus/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 211855 2014-04-28 10:32:20Z jgc $
+# $Id: PKGBUILD 215166 2014-06-14 19:17:18Z andyrtr $
 # Maintainer: Daniel Isenmann <daniel@archlinux.org>
 
 pkgname=libgdiplus
 pkgver=2.10.9
-pkgrel=4
+pkgrel=5
 pkgdesc="An Open Source Implementation of the GDI+ API"
 arch=(i686 x86_64)
 license=('MPL' 'LGPL')
@@ -13,12 +13,14 @@ source=(http://download.mono-project.com/sources/${pkgname}/${pkgname}-${pkgver}
         libpng15.patch
         libgdiplus0-giflib5.patch
         libgdiplus-2.10.9-gold.patch
-        libgdiplus-2.10.9-freetype25.patch)
+        libgdiplus-2.10.9-freetype25.patch
+        libgdiplus-2.10.9-giflib-5.1.0.patch)
 md5sums=('b4615c14584b5d73cbb9757c28887654'
          'a2d143676bbaceeb88b4c34069e93986'
          'ad97558c721106eea03c7808b501814b'
          '95fb92750c131ce9287419c3ac5fcb76'
-         '6ee484dde02ea89aded1287c0a8d4bad')
+         '6ee484dde02ea89aded1287c0a8d4bad'
+         '8c0a975b12a011b21e4216c44be1416e')
 
 prepare() {
   cd ${pkgname}-${pkgver}
@@ -26,6 +28,7 @@ prepare() {
   patch -Np1 -i ../libgdiplus0-giflib5.patch
   patch -Np1 -i ../libgdiplus-2.10.9-gold.patch
   patch -Np1 -i ../libgdiplus-2.10.9-freetype25.patch
+  patch -Np1 -i ../libgdiplus-2.10.9-giflib-5.1.0.patch
 
   sed -i -e 's/-L\${libjpeg_prefix}\/lib -ljpeg/-ljpeg/' configure
 }
diff --git a/extra/libgdiplus/libgdiplus-2.10.9-giflib-5.1.0.patch b/extra/libgdiplus/libgdiplus-2.10.9-giflib-5.1.0.patch
new file mode 100644
index 000000000..39d3c7a06
--- /dev/null
+++ b/extra/libgdiplus/libgdiplus-2.10.9-giflib-5.1.0.patch
@@ -0,0 +1,30 @@
+diff -rupN a/src/gifcodec.c b/src/gifcodec.c
+--- a/src/gifcodec.c	2011-12-02 18:23:12.000000000 +0100
++++ b/src/gifcodec.c	2014-06-01 13:20:17.027203704 +0200
+@@ -581,7 +581,7 @@ gdip_load_gif_image (void *stream, GpIma
+ 	}
+ 
+ 	FreeExtensionMono(&global_extensions);
+-	DGifCloseFile (gif);
++	DGifCloseFile (gif, NULL);
+ 
+ 	*image = result;
+ 	return Ok;
+@@ -597,7 +597,7 @@ error:
+ 
+ 	if (gif != NULL) {
+ 		FreeExtensionMono (&global_extensions);
+-		DGifCloseFile (gif);
++		DGifCloseFile (gif, NULL);
+ 	}
+ 
+ 	*image = NULL;
+@@ -923,7 +923,7 @@ gdip_save_gif_image (void *stream, GpIma
+ 		}
+ 	}
+ 
+-	EGifCloseFile (fp);	
++	EGifCloseFile (fp, NULL);	
+ 	
+ 	return Ok;
+ 
diff --git a/extra/libmspub/PKGBUILD b/extra/libmspub/PKGBUILD
index caf12ac46..e9fbf2fd9 100644
--- a/extra/libmspub/PKGBUILD
+++ b/extra/libmspub/PKGBUILD
@@ -1,18 +1,18 @@
-# $Id: PKGBUILD 211321 2014-04-18 17:28:24Z andyrtr $
+# $Id: PKGBUILD 215148 2014-06-14 19:16:54Z andyrtr $
 # Maintainer: AndyRTR <andyrtr@archlinux.org>
 # Contributor: Simone Sclavi 'Ito' <darkhado@gmail.com>
 
 pkgname=libmspub
-pkgver=0.0.6
-pkgrel=2
+pkgver=0.1.0
+pkgrel=1
 pkgdesc="Microsoft Publisher file format parser library (latest snapshost)"
 arch=('i686' 'x86_64')
 url="http://www.freedesktop.org/wiki/Software/libmspub/"
 license=('GPL2' 'LGPL2.1' 'MPL')
-depends=('libwpd' 'icu')
+depends=('libwpd' 'icu' 'librevenge')
 makedepends=('libwpg' 'boost' 'doxygen')
 source=(http://dev-www.libreoffice.org/src/${pkgname}-${pkgver}.tar.xz)
-md5sums=('96a1f176abd683c6b1b02a08847c0616')
+md5sums=('d6d9239a7bb95df55300334afd99ceed')
 
 build() {
     cd ${pkgname}-${pkgver}
diff --git a/extra/libodfgen/PKGBUILD b/extra/libodfgen/PKGBUILD
index f826f4be8..86bccacff 100644
--- a/extra/libodfgen/PKGBUILD
+++ b/extra/libodfgen/PKGBUILD
@@ -1,18 +1,19 @@
-# $Id$
+# $Id: PKGBUILD 215149 2014-06-14 19:16:55Z andyrtr $
+# Maintainer: AndyRTR <andyrtr@archlinux.org>
 # Maintainer:  Bartłomiej Piotrowski <bpiotrowski@archlinux.org>
 # Contributor: Yue
 
 pkgname=libodfgen
-pkgver=0.0.4
+pkgver=0.1.1
 pkgrel=1
 pkgdesc='Library for generating documents in Open Document Format'
 arch=('i686' 'x86_64')
 url='http://sf.net/p/libwpd/libodfgen/'
 license=('MPL')
-depends=('libwpd' 'zlib')
-makedepends=('boost' 'libwpg' 'libetonyek')
+depends=('libwpd' 'zlib' 'librevenge')
+makedepends=('boost' 'libwpg' 'libetonyek' 'doxygen')
 source=(http://dev-www.libreoffice.org/src/$pkgname-$pkgver.tar.bz2)
-md5sums=('e5483d1f0b71e64c367c1194b54b0f53')
+md5sums=('c22c83c17cda0754382ada4e116594b7')
 
 build() {
   cd $pkgname-$pkgver
diff --git a/extra/libreoffice-fresh/PKGBUILD b/extra/libreoffice-fresh/PKGBUILD
index 7319ff8bf..bf25df390 100644
--- a/extra/libreoffice-fresh/PKGBUILD
+++ b/extra/libreoffice-fresh/PKGBUILD
@@ -1,12 +1,12 @@
-# $Id: PKGBUILD 213923 2014-05-31 15:05:40Z bpiotrowski $
+# $Id: PKGBUILD 215151 2014-06-14 19:16:58Z andyrtr $
 # Maintainer: AndyRTR <andyrtr@archlinux.org>
 # Maintainer: Bartłomiej Piotrowski <bpiotrowski@archlinux.org>
 
 pkgbase=libreoffice-fresh
 pkgname=('libreoffice-fresh-sdk' 'libreoffice-fresh')
-_LOver=4.3.0.0.beta1
+_LOver=4.3.0.0.beta2-buildfix1
 pkgver=4.3.0
-pkgrel=0.7
+pkgrel=0.8
 arch=('i686' 'x86_64')
 license=('LGPL3')
 url="http://www.libreoffice.org/"
@@ -20,7 +20,8 @@ makedepends=('curl>=7.20.0' 'hunspell>=1.2.8' 'python>=3.4' 'libwpd>=0.9.2' 'lib
 	'gperf' 'kdelibs' 'gconf' 'gtk3' 'cppunit' 'beanshell2' 'vigra' 'clucene'
 	'junit' 'libmythes' 'libwpg'  'mesa' 'java-environment' 'postgresql-libs'
 	'bluez-libs' 'harfbuzz-icu' 'gdb' 'doxygen'  'libatomic_ops' 'mdds' 'glew'
-	'apr' 'serf' 'chrpath' 'ttf-liberation')
+	'apr' 'serf' 'chrpath' 'ttf-liberation'
+	'valgrind')
 
 #_mirror="http://download.documentfoundation.org/libreoffice/src/${pkgver}"
 _mirror="http://dev-builds.libreoffice.org/pre-releases/src"
@@ -54,15 +55,15 @@ source=(${_mirror}/libreoffice{,-help,-translations}-${_LOver}.tar.xz{,.asc}
 	${_additional_source_url}/0168229624cfac409e766913506961a8-ucpp-1.3.2.tar.gz
 	${_additional_source_url}/17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip
 	${_additional_source_url2}/185d60944ea767075d27247c3162b3bc-unowinreg.dll
-	${_additional_source_url}/libmwaw-0.2.0.tar.bz2
-	${_additional_source_url}/libfreehand-0.0.0.tar.bz2
+	${_additional_source_url}/libmwaw-0.3.1.tar.bz2
+	${_additional_source_url}/libfreehand-0.1.0.tar.bz2
 	${_additional_source_url}/Firebird-2.5.2.26540-0.tar.bz2
-	${_additional_source_url}/libe-book-0.0.3.tar.bz2
-	${_additional_source_url}/libabw-0.0.2.tar.bz2
-	${_additional_source_url}/language-subtag-registry-2014-03-27.tar.bz2
+	${_additional_source_url}/libe-book-0.1.1.tar.bz2
+	${_additional_source_url}/libabw-0.1.0.tar.bz2
+	${_additional_source_url}/language-subtag-registry-2014-04-10.tar.bz2
 	${_additional_source_url}/8ac8ae9829c4fefd1ae9f715f95d4e0b-libgltf.tar.gz
 	${_additional_source_url}/CoinMP-1.7.6.tgz
-	# do not use system glm, LibO patxhes it!
+	# do not use system glm, LibO patches it!
 	${_additional_source_url}/bae83fa5dc7f081768daace6e199adc3-glm-0.9.4.6-libreoffice.zip
 	${_additional_source_url}/collada2gltf-master-6258611a6a.tar.bz2
 	${_additional_source_url}/OpenCOLLADA-master-6509aa13af.tar.bz2
@@ -97,18 +98,66 @@ noextract=(d6eef4b4cacb2183f2bf265a5a03a354-boost_1_55_0.tar.bz2
 	36271d3fa0d9dec1632029b6d7aac925-liblangtag-0.5.1.tar.bz2
 	0168229624cfac409e766913506961a8-ucpp-1.3.2.tar.gz
 	17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip
-	libmwaw-0.2.0.tar.bz2
-	libfreehand-0.0.0.tar.bz2
+	libmwaw-0.3.1.tar.bz2
+	libfreehand-0.1.0.tar.bz2
 	Firebird-2.5.2.26540-0.tar.bz2
-	libe-book-0.0.3.tar.bz2
-	libabw-0.0.2.tar.bz2
-	language-subtag-registry-2014-03-27.tar.bz2
+	libe-book-0.1.1.tar.bz2
+	libabw-0.1.0.tar.bz2
+	language-subtag-registry-2014-04-10.tar.bz2
 	8ac8ae9829c4fefd1ae9f715f95d4e0b-libgltf.tar.gz
 	CoinMP-1.7.6.tgz
 	bae83fa5dc7f081768daace6e199adc3-glm-0.9.4.6-libreoffice.zip
 	collada2gltf-master-6258611a6a.tar.bz2
 	OpenCOLLADA-master-6509aa13af.tar.bz2
 	510c3f8504bfb8cc8c8fc5d0fac74055-libgltf.tar.bz2)
+md5sums=('d4dc0ed333569336519dfbddcbb1b329'
+         'SKIP'
+         'b009798fa57feea21924cdc6a4a6212a'
+         'SKIP'
+         '4c502724049b9dd50eaee81ec7b1896b'
+         'SKIP'
+         'd6eef4b4cacb2183f2bf265a5a03a354'
+         '1f24ab1d39f4a51faf22244c94a6203f'
+         '35c94d2df8893241173de1d16b6034c0'
+         '798b2ffdc8bcfe7bca2cf92b62caf685'
+         'a7983f859eafb2677d7ff386a023bc40'
+         'e8e197d628436490886d17cffa108fe3'
+         '8ab049135b2d15313da5d9f0656894a1'
+         '2c9b0f83ed5890af02c0df1c1776f39b'
+         '048751f3271906db5126ab76870444c4'
+         'eeb2c7ddf0d302fba4bfc6e97eac9624'
+         '39bb3fcea1514f1369fcfc87542390fd'
+         '3404ab6b1792ae5f16bbd603bd1e1d03'
+         '97b2d4dba862397f446b217e2b623e71'
+         'f94d9870737518e3b597f9265f4e9803'
+         '8ce2fcd72becf06c41f7201d15373ed9'
+         'd8bd5eed178db6e2b18eeed243f85aa8'
+         '3bdf40c0d199af31923e900d082ca2dd'
+         'ace6ab49184e329db254e454a010f56d'
+         'db60e4fde8dd6d6807523deb71ee34dc'
+         'ba2930200c9f019c2d93a8c88c651a0f'
+         'ae330b9493bd4503ac390106ff6060d7'
+         '22f8a85daf4a012180322e1f52a7563b'
+         '7681383be6ce489d84c1c74f4e7f9643'
+         '36271d3fa0d9dec1632029b6d7aac925'
+         '0168229624cfac409e766913506961a8'
+         '17410483b5b5f267aa18b7e00b65e6e0'
+         '185d60944ea767075d27247c3162b3bc'
+         '6f1ac4a0e24131c422e1e91f07718fb6'
+         '5f029fef73e42a2c2ae4524a7513f97d'
+         '21154d2004e025c8a3666625b0357bb5'
+         'c25a881d21abc5b4da19205db513cc22'
+         '9317e967c8fa8ff50e049744c4b33c87'
+         '49c94710f7858b1969d74ff72e6aac84'
+         '8ac8ae9829c4fefd1ae9f715f95d4e0b'
+         '1cce53bf4b40ae29790d2c5c9f8b1129'
+         'bae83fa5dc7f081768daace6e199adc3'
+         'c8a8be5829ceffacfe1d68d078f5c442'
+         '4ca8a6ef0afeefc864e9ef21b9f14bd6'
+         '510c3f8504bfb8cc8c8fc5d0fac74055'
+         '07d2bf5ad839a394cca008b3ec6e7bb1'
+         '4195735a80876ae812fca5736b50192a'
+         'e7e4b3e70e99e5cba8f8dfcacf3b0d87')
 
 prepare() {
 	cd libreoffice-$_LOver
@@ -232,6 +281,8 @@ build() {
 
 	touch src.downloaded
 	make
+	# use this if i686 fails
+	#make || make CppunitTest_sw_ooxmlsdrexport VALGRIND=memcheck
 
 	mkdir ${srcdir}/fakeinstall
 	make DESTDIR=${srcdir}/fakeinstall distro-pack-install
@@ -353,52 +404,3 @@ package_libreoffice-fresh() {
 	chrpath -d ${pkgdir}/usr/lib/libreoffice/program/libCgl.so.1
 	chrpath -d ${pkgdir}/usr/lib/libreoffice/program/libClp.so.1
 }
-
-md5sums=('c98ff0989252558dc21b71ec5e32049f'
-         'SKIP'
-         '5b3b55d75a9659dace93900c3e88d6a9'
-         'SKIP'
-         '507657907ee417631287c79deb44cfc8'
-         'SKIP'
-         'd6eef4b4cacb2183f2bf265a5a03a354'
-         '1f24ab1d39f4a51faf22244c94a6203f'
-         '35c94d2df8893241173de1d16b6034c0'
-         '798b2ffdc8bcfe7bca2cf92b62caf685'
-         'a7983f859eafb2677d7ff386a023bc40'
-         'e8e197d628436490886d17cffa108fe3'
-         '8ab049135b2d15313da5d9f0656894a1'
-         '2c9b0f83ed5890af02c0df1c1776f39b'
-         '048751f3271906db5126ab76870444c4'
-         'eeb2c7ddf0d302fba4bfc6e97eac9624'
-         '39bb3fcea1514f1369fcfc87542390fd'
-         '3404ab6b1792ae5f16bbd603bd1e1d03'
-         '97b2d4dba862397f446b217e2b623e71'
-         'f94d9870737518e3b597f9265f4e9803'
-         '8ce2fcd72becf06c41f7201d15373ed9'
-         'd8bd5eed178db6e2b18eeed243f85aa8'
-         '3bdf40c0d199af31923e900d082ca2dd'
-         'ace6ab49184e329db254e454a010f56d'
-         'db60e4fde8dd6d6807523deb71ee34dc'
-         'ba2930200c9f019c2d93a8c88c651a0f'
-         'ae330b9493bd4503ac390106ff6060d7'
-         '22f8a85daf4a012180322e1f52a7563b'
-         '7681383be6ce489d84c1c74f4e7f9643'
-         '36271d3fa0d9dec1632029b6d7aac925'
-         '0168229624cfac409e766913506961a8'
-         '17410483b5b5f267aa18b7e00b65e6e0'
-         '185d60944ea767075d27247c3162b3bc'
-         'd794625f156a9fb1c53b3f8a8aa13b5e'
-         '496dd00028afcc19f896b01394769043'
-         '21154d2004e025c8a3666625b0357bb5'
-         '2f1ceaf2ac8752ed278e175447d9b978'
-         '40fa48e03b1e28ae0325cc34b35bc46d'
-         '504af523f5d1a5590bbeb6a4b55e8a97'
-         '8ac8ae9829c4fefd1ae9f715f95d4e0b'
-         '1cce53bf4b40ae29790d2c5c9f8b1129'
-         'bae83fa5dc7f081768daace6e199adc3'
-         'c8a8be5829ceffacfe1d68d078f5c442'
-         '4ca8a6ef0afeefc864e9ef21b9f14bd6'
-         '510c3f8504bfb8cc8c8fc5d0fac74055'
-         '07d2bf5ad839a394cca008b3ec6e7bb1'
-         '4195735a80876ae812fca5736b50192a'
-         'e7e4b3e70e99e5cba8f8dfcacf3b0d87')
diff --git a/extra/libreoffice/PKGBUILD b/extra/libreoffice/PKGBUILD
index 46901fd8a..c17ab4573 100644
--- a/extra/libreoffice/PKGBUILD
+++ b/extra/libreoffice/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 212157 2014-05-09 14:51:00Z andyrtr $
+# $Id: PKGBUILD 215150 2014-06-14 19:16:57Z andyrtr $
 # Maintainer: AndyRTR <andyrtr@archlinux.org>
 # Maintainer: Bartłomiej Piotrowski <nospam@bpiotrowski.pl>
 
@@ -20,23 +20,22 @@ pkgname=('libreoffice-common'
 	'libreoffice-extension-nlpsolver') # svn up -r 142692 (last one with all extensions built)
 _LOver=4.2.4.2
 pkgver=4.2.4
-pkgrel=1
+pkgrel=2
 arch=('i686' 'x86_64')
 license=('LGPL3')
 url="http://www.libreoffice.org/"
 makedepends=( # makedepends
              'sane' 'perl-archive-zip' 'zip' 'unzip' 'unixodbc' 'apache-ant'
 			 'gperf' 'kdelibs' 'gconf' 'gtk3' 'cppunit' 'beanshell2' 'vigra'
-			 'clucene' 'junit' 'libmythes' 'libwpg'  'mesa' 'clucene'
+			 'clucene' 'junit' 'libmythes' 'mesa' 'clucene'
 			 'java-environment' 'postgresql-libs' 'bluez-libs' 'harfbuzz-icu'
 			 'gdb' 'doxygen'  'libatomic_ops' 'mdds'
              # the runtime dependencies
-             "curl>=7.20.0" "hunspell>=1.2.8" "python>=3.4" 'libwpd>=0.9.2'
-			 'libwps' 'libxaw' "neon>=0.28.6" 'pango' 'nspr' 'libjpeg' 'libxrandr'
+             "curl>=7.20.0" "hunspell>=1.2.8" "python>=3.4"
+			 'libxaw' "neon>=0.28.6" 'pango' 'nspr' 'libjpeg' 'libxrandr'
 			 'libgl' 'dbus-glib' 'libxslt' 'librsvg' 'redland' 'icu'
 			 'hyphen' 'lpsolve' 'gcc-libs' 'sh'  'libtextcat' 'graphite'
-			 'lcms2' 'poppler>=0.24.0' 'libvisio' 'libetonyek' 'libodfgen'
-			 'libcdr' 'libmspub'
+			 'lcms2' 'poppler>=0.24.0'
 			 'hicolor-icon-theme' 'desktop-file-utils' 'shared-mime-info'
 			 'gtk2' 'orbit2' 'translate-toolkit' 'xdg-utils' #'telepathy-glib'
 			 'gst-plugins-base-libs' 'glu' 'ttf-liberation' # to satisfy regression tests
@@ -82,6 +81,14 @@ source=(${_mirror}/${pkgbase}{,-help,-translations}-${_LOver}.tar.xz{,.asc}
 	${_additional_source_url}/17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip
 	${_additional_source_url2}/185d60944ea767075d27247c3162b3bc-unowinreg.dll
 	${_additional_source_url}/libmwaw-0.2.0.tar.bz2
+	${_additional_source_url}/libcdr-0.0.15.tar.bz2
+	${_additional_source_url}/libetonyek-0.0.4.tar.bz2
+	${_additional_source_url}/libmspub-0.0.6.tar.bz2
+	${_additional_source_url}/libodfgen-0.0.4.tar.bz2
+	${_additional_source_url}/libvisio-0.0.31.tar.bz2
+	${_additional_source_url}/a3dcac551fae5ebbec16e844810828c4-libwpd-0.9.9.tar.bz2
+	${_additional_source_url}/b85436266b2ac91d351ab5684b181151-libwpg-0.2.2.tar.bz2
+	${_additional_source_url}/46eb0e7f213ad61bd5dee0c494132cb0-libwps-0.2.9.tar.bz2
 	${_additional_source_url}/libfreehand-0.0.0.tar.bz2
 	${_additional_source_url}/Firebird-2.5.2.26540-0.tar.bz2
 	${_additional_source_url}/libe-book-0.0.3.tar.bz2
@@ -120,6 +127,14 @@ noextract=(15cb8c0803064faef0c4ddf5bc5ca279-boost_1_54_0.tar.bz2
 	0168229624cfac409e766913506961a8-ucpp-1.3.2.tar.gz
 	17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip
 	libmwaw-0.2.0.tar.bz2
+	libcdr-0.0.15.tar.bz2
+	libetonyek-0.0.4.tar.bz2
+	libmspub-0.0.6.tar.bz2
+	libodfgen-0.0.4.tar.bz2
+	libvisio-0.0.31.tar.bz2
+	a3dcac551fae5ebbec16e844810828c4-libwpd-0.9.9.tar.bz2
+	b85436266b2ac91d351ab5684b181151-libwpg-0.2.2.tar.bz2
+	46eb0e7f213ad61bd5dee0c494132cb0-libwps-0.2.9.tar.bz2
 	libfreehand-0.0.0.tar.bz2
 	Firebird-2.5.2.26540-0.tar.bz2
 	libe-book-0.0.3.tar.bz2
@@ -159,6 +174,14 @@ md5sums=('698a482f0cacd8b5eba9865fdd8a5403'
          '17410483b5b5f267aa18b7e00b65e6e0'
          '185d60944ea767075d27247c3162b3bc'
          'd794625f156a9fb1c53b3f8a8aa13b5e'
+         'fbcd8619fc6646f41d527c1329102998'
+         '3c50bc60394d1f2675fbf9bd22581363'
+         '1120705cd0f0d9bd5506360bf57b6c2e'
+         'e5483d1f0b71e64c367c1194b54b0f53'
+         '82628333418f101a20cd21f980cf9f40'
+         'a3dcac551fae5ebbec16e844810828c4'
+         'b85436266b2ac91d351ab5684b181151'
+         '46eb0e7f213ad61bd5dee0c494132cb0'
          '496dd00028afcc19f896b01394769043'
          '21154d2004e025c8a3666625b0357bb5'
          '2f1ceaf2ac8752ed278e175447d9b978'
@@ -256,20 +279,20 @@ build() {
 		--enable-ext-nlpsolver \
 		--without-fonts\
 		--without-afms\
-		--with-system-libcdr \
+		--without-system-libcdr \
 		--with-system-mdds\
 		--without-myspell-dicts \
-		--with-system-libvisio \
+		--without-system-libvisio \
 		--without-system-libcmis \
-		--with-system-libmspub \
+		--without-system-libmspub \
 		--without-system-libexttextcat \
 		--without-system-orcus \
 		--without-system-liblangtag \
 		--without-system-jfreereport \
 		--without-system-apache-commons \
-		--with-system-libodfgen \
+		--without-system-libodfgen \
 		--without-system-libmwaw \
-		--with-system-libetonyek \
+		--without-system-libetonyek \
 		--without-system-libfreehand \
 		--without-system-firebird \
 		--with-system-libatomic-ops \
@@ -282,8 +305,9 @@ build() {
 		--with-system-beanshell \
 		--with-system-cppunit\
 		--with-system-graphite\
-		--with-system-libwpg \
-		--with-system-libwps \
+		--without-system-libwpd \
+		--without-system-libwpg \
+		--without-system-libwps \
 		--with-system-redland\
 		--without-system-npapi-headers \
 		--with-ant-home="/usr/share/apache-ant"\
@@ -306,7 +330,7 @@ build() {
 
 	touch src.downloaded
 	#./download
-	make
+	make build
 	# fake installation to create split file lists
 	mkdir $srcdir/fakeinstall
 	make DESTDIR=${srcdir}/fakeinstall distro-pack-install # -o build -o check
@@ -323,9 +347,7 @@ package_libreoffice-common() {
  depends=('libreoffice-langpack' "hunspell>=1.2.8" "python>=3.3" "neon>=0.28.6"
 		  'dbus-glib' 'librsvg' 'libcups' 'nss' 'libsm' 'redland' 'hyphen'
 		  'graphite' 'clucene' 'lcms2' "poppler>=0.24.0" 'icu'
-		  #'telepathy-glib' # (calc telepathy-glib libtubeslo.so)
-          'libodfgen'  'libvisio' 'harfbuzz-icu' 'hicolor-icon-theme' 'glu'
-          'libmspub' 'libcdr'
+          'harfbuzz-icu' 'hicolor-icon-theme' 'glu'
 		  'desktop-file-utils' 'shared-mime-info' 'xdg-utils')
  optdepends=('libreoffice-langpack: additional language support'
              'java-runtime:     adds java support'
@@ -334,7 +356,6 @@ package_libreoffice-common() {
              'beanshell2:       interactive java -- good for prototyping/macros'
              'vigra:            C++ computer vision library, usable in Basebmp'
              'libmspack:        library for Microsoft compression formats for use in FontOOo'
-             'libwpg:           library for importing and converting Corel WordPerfect(tm) Graphics images and for MS visual import'
              'sane:             for scanner access'
              'unixodbc:         adds ODBC database support'
              'gst-plugins-base-libs:        + some gstr-plugins to support multimedia content, e.g. in impress'
@@ -528,7 +549,7 @@ package_libreoffice-gnome() {
 package_libreoffice-impress() {
  pkgdesc="Presentation Application for LibreOffice."
  install=libreoffice-impress.install
- depends=('libreoffice-common' 'libetonyek')
+ depends=('libreoffice-common')
  groups=('libreoffice')
  replaces=('libreoffice')
 
@@ -649,8 +670,7 @@ package_libreoffice-sdk-doc() {
 package_libreoffice-writer() {
  pkgdesc="Word Processor Application for LibreOffice."
  install=libreoffice-writer.install
- depends=('libreoffice-common' 'libwpd>=0.9.2' 'libwps' 'libxml2')
- optdepends=('libwpg:           library for importing and converting Corel WordPerfect(tm) Graphics images')
+ depends=('libreoffice-common' 'libxml2')
  groups=('libreoffice')
  replaces=('libreoffice')
 
diff --git a/extra/libreoffice/PKGBUILD.43 b/extra/libreoffice/PKGBUILD.43
deleted file mode 100644
index 0ab501c1a..000000000
--- a/extra/libreoffice/PKGBUILD.43
+++ /dev/null
@@ -1,725 +0,0 @@
-# $Id: PKGBUILD 211574 2014-04-20 12:55:34Z andyrtr $
-# Maintainer: AndyRTR <andyrtr@archlinux.org>
-# Maintainer: Bartłomiej Piotrowski <nospam@bpiotrowski.pl>
-
-pkgbase="libreoffice"
-pkgname=('libreoffice-common'
-	'libreoffice-base'
-	'libreoffice-calc'
-	'libreoffice-draw'
-	'libreoffice-gnome'
-	'libreoffice-impress'
-	'libreoffice-kde4'
-	'libreoffice-math'
-	'libreoffice-sdk'
-	'libreoffice-sdk-doc'
-	'libreoffice-writer'
-	'libreoffice-en-US'
-	'libreoffice-postgresql-connector'
-	'libreoffice-extension-wiki-publisher'
-	'libreoffice-extension-nlpsolver') # svn up -r 142692 (last one with all extensions built)
-_LOver=4.3.0.0.alpha1
-pkgver=4.3.0
-pkgrel=0.1
-arch=('i686' 'x86_64')
-license=('LGPL3')
-url="http://www.libreoffice.org/"
-makedepends=( # makedepends
-             'sane' 'perl-archive-zip' 'zip' 'unzip' 'unixodbc' 'apache-ant'
-			 'gperf' 'kdelibs' 'gconf' 'gtk3' 'cppunit' 'beanshell2' 'vigra'
-			 'clucene' 'junit' 'libmythes' 'libwpg'  'mesa' 'clucene'
-			 'java-environment' 'postgresql-libs' 'bluez-libs' 'harfbuzz-icu'
-			 'gdb' 'doxygen'  'libatomic_ops' 'glew' 'apr' 'serf'
-             # the runtime dependencies
-             "curl>=7.20.0" "hunspell>=1.2.8" "python>=3.4" 'libwpd>=0.9.2'
-			 'libwps' 'libxaw' "neon>=0.28.6" 'pango' 'nspr' 'libjpeg' 'libxrandr'
-			 'libgl' 'dbus-glib' 'libxslt' 'librsvg' 'redland' #"icu>=52.1" 
-			 'hyphen' 'lpsolve' 'gcc-libs' 'sh'  'libtextcat' 'graphite'
-			 'lcms2' 'poppler>=0.24.0' 'libvisio' 'libetonyek' 'libodfgen'
-			 'libcdr' 'libmspub'
-			 'hicolor-icon-theme' 'desktop-file-utils' 'shared-mime-info'
-			 'gtk2' 'orbit2' 'translate-toolkit' 'xdg-utils' #'telepathy-glib'
-			 'gst-plugins-base-libs' 'glu' 'ttf-liberation' # to satisfy regression tests
-	         'git')
-# there's only one single static library in libreoffice-sdk,
-# the next build that removes it may lead to trouble if people may use it
-# -rw-r--r-- 1 root root 5,1K 12. Okt 23:34 /usr/lib/libreoffice/sdk/lib/libsalcpprt.a
-# options=('staticlibs')
-
-# http://download.documentfoundation.org/mirrors/all.html
-# http://wiki.documentfoundation.org/Mirrors
-
-#_mirror="http://download.documentfoundation.org/libreoffice/src/${pkgver}"
-_mirror="http://dev-builds.libreoffice.org/pre-releases/src"
-_additional_source_url="http://dev-www.libreoffice.org/src"
-_additional_source_url2="http://dev-www.libreoffice.org/extern"
-source=(${_mirror}/${pkgbase}{,-help,-translations}-${_LOver}.tar.xz{,.asc}
-	${_additional_source_url}/d6eef4b4cacb2183f2bf265a5a03a354-boost_1_55_0.tar.bz2
-	${_additional_source_url}/9e96ed4c1d99c0d14ac03c140f9f346c-icu4c-52_1-src.tgz
-	${_additional_source_url}/1f24ab1d39f4a51faf22244c94a6203f-xmlsec1-1.2.14.tar.gz
-	${_additional_source_url}/35c94d2df8893241173de1d16b6034c0-swingExSrc.zip
-	${_additional_source_url}/798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip
-	${_additional_source_url}/a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip
-	${_additional_source_url}/e8e197d628436490886d17cffa108fe3-commons-logging-1.1.3-src.tar.gz
-	${_additional_source_url}/8ab049135b2d15313da5d9f0656894a1-commons-lang3-3.3.1-src.tar.gz
-	${_additional_source_url}/2c9b0f83ed5890af02c0df1c1776f39b-commons-httpclient-3.1-src.tar.gz
-	${_additional_source_url}/048751f3271906db5126ab76870444c4-commons-codec-1.9-src.zip
-	${_additional_source_url}/eeb2c7ddf0d302fba4bfc6e97eac9624-libbase-1.1.6.zip
-	${_additional_source_url}/39bb3fcea1514f1369fcfc87542390fd-sacjava-1.3.zip
-	${_additional_source_url}/3404ab6b1792ae5f16bbd603bd1e1d03-libformula-1.1.7.zip
-	${_additional_source_url}/97b2d4dba862397f446b217e2b623e71-libloader-1.1.6.zip
-	${_additional_source_url}/f94d9870737518e3b597f9265f4e9803-libserializer-1.1.6.zip
-	${_additional_source_url}/8ce2fcd72becf06c41f7201d15373ed9-librepository-1.1.6.zip
-	${_additional_source_url}/d8bd5eed178db6e2b18eeed243f85aa8-flute-1.1.6.zip
-	${_additional_source_url}/3bdf40c0d199af31923e900d082ca2dd-libfonts-1.1.6.zip
-	${_additional_source_url}/ace6ab49184e329db254e454a010f56d-libxml-1.1.7.zip
-	${_additional_source_url}/db60e4fde8dd6d6807523deb71ee34dc-liblayout-0.2.10.zip
-	${_additional_source_url}/ba2930200c9f019c2d93a8c88c651a0f-flow-engine-0.9.4.zip
-	${_additional_source_url}/47203e7cade74e5c385aa812f21e7932-mdds_0.10.2.tar.bz2
-	${_additional_source_url}/ae330b9493bd4503ac390106ff6060d7-libexttextcat-3.4.3.tar.bz2
-	${_additional_source_url}/22f8a85daf4a012180322e1f52a7563b-libcmis-0.4.1.tar.gz
-	${_additional_source_url}/7681383be6ce489d84c1c74f4e7f9643-liborcus-0.7.0.tar.bz2
-	${_additional_source_url}/36271d3fa0d9dec1632029b6d7aac925-liblangtag-0.5.1.tar.bz2
-	${_additional_source_url}/0168229624cfac409e766913506961a8-ucpp-1.3.2.tar.gz
-	${_additional_source_url}/17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip
-	${_additional_source_url2}/185d60944ea767075d27247c3162b3bc-unowinreg.dll
-	${_additional_source_url}/libmwaw-0.2.0.tar.bz2
-	${_additional_source_url}/libfreehand-0.0.0.tar.bz2
-	${_additional_source_url}/Firebird-2.5.2.26540-0.tar.bz2
-	${_additional_source_url}/libe-book-0.0.3.tar.bz2
-	${_additional_source_url}/libabw-0.0.2.tar.bz2
-	${_additional_source_url}/language-subtag-registry-2014-03-27.tar.bz2 
-	${_additional_source_url}/8ac8ae9829c4fefd1ae9f715f95d4e0b-libgltf.tar.gz
-	${_additional_source_url}/CoinMP-1.7.6.tgz
-	${_additional_source_url}/bae83fa5dc7f081768daace6e199adc3-glm-0.9.4.6-libreoffice.zip # don't use system glm! LibO patches it!
-	make-pyuno-work-with-system-wide-module-install.diff
-	libreoffice-common.sh libreoffice-common.csh
-	prevent_KDE_Qt_from_interfering_with_the_session_manager.diff)
-noextract=(d6eef4b4cacb2183f2bf265a5a03a354-boost_1_55_0.tar.bz2
-	9e96ed4c1d99c0d14ac03c140f9f346c-icu4c-52_1-src.tgz
-	185d60944ea767075d27247c3162b3bc-unowinreg.dll
-	47203e7cade74e5c385aa812f21e7932-mdds_0.10.2.tar.bz2
-	798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip
-	1f24ab1d39f4a51faf22244c94a6203f-xmlsec1-1.2.14.tar.gz
-	ae330b9493bd4503ac390106ff6060d7-libexttextcat-3.4.3.tar.bz2
-	22f8a85daf4a012180322e1f52a7563b-libcmis-0.4.1.tar.gz
-	35c94d2df8893241173de1d16b6034c0-swingExSrc.zip
-	a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip
-	e8e197d628436490886d17cffa108fe3-commons-logging-1.1.3-src.tar.gz
-	8ab049135b2d15313da5d9f0656894a1-commons-lang3-3.3.1-src.tar.gz
-	2c9b0f83ed5890af02c0df1c1776f39b-commons-httpclient-3.1-src.tar.gz
-	048751f3271906db5126ab76870444c4-commons-codec-1.9-src.zip
-	eeb2c7ddf0d302fba4bfc6e97eac9624-libbase-1.1.6.zip
-	39bb3fcea1514f1369fcfc87542390fd-sacjava-1.3.zip
-	3404ab6b1792ae5f16bbd603bd1e1d03-libformula-1.1.7.zip
-	97b2d4dba862397f446b217e2b623e71-libloader-1.1.6.zip
-	f94d9870737518e3b597f9265f4e9803-libserializer-1.1.6.zip
-	8ce2fcd72becf06c41f7201d15373ed9-librepository-1.1.6.zip
-	d8bd5eed178db6e2b18eeed243f85aa8-flute-1.1.6.zip
-	3bdf40c0d199af31923e900d082ca2dd-libfonts-1.1.6.zip
-	ace6ab49184e329db254e454a010f56d-libxml-1.1.7.zip
-	db60e4fde8dd6d6807523deb71ee34dc-liblayout-0.2.10.zip
-	ba2930200c9f019c2d93a8c88c651a0f-flow-engine-0.9.4.zip
-	7681383be6ce489d84c1c74f4e7f9643-liborcus-0.7.0.tar.bz2
-	36271d3fa0d9dec1632029b6d7aac925-liblangtag-0.5.1.tar.bz2
-	0168229624cfac409e766913506961a8-ucpp-1.3.2.tar.gz
-	17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip
-	libmwaw-0.2.0.tar.bz2
-	libfreehand-0.0.0.tar.bz2
-	Firebird-2.5.2.26540-0.tar.bz2
-	libe-book-0.0.3.tar.bz2
-	libabw-0.0.2.tar.bz2
-	language-subtag-registry-2014-03-27.tar.bz2
-	8ac8ae9829c4fefd1ae9f715f95d4e0b-libgltf.tar.gz
-	CoinMP-1.7.6.tgz
-	bae83fa5dc7f081768daace6e199adc3-glm-0.9.4.6-libreoffice.zip)
-md5sums=('6eab0996f37263f687bfcf511d14d747'
-         'SKIP'
-         '848577e3ccdd4c1083824a9b56db8151'
-         'SKIP'
-         '7ba0e71d7ed2900caa44c462efc53c49'
-         'SKIP'
-         'd6eef4b4cacb2183f2bf265a5a03a354'
-         '9e96ed4c1d99c0d14ac03c140f9f346c'
-         '1f24ab1d39f4a51faf22244c94a6203f'
-         '35c94d2df8893241173de1d16b6034c0'
-         '798b2ffdc8bcfe7bca2cf92b62caf685'
-         'a7983f859eafb2677d7ff386a023bc40'
-         'e8e197d628436490886d17cffa108fe3'
-         '8ab049135b2d15313da5d9f0656894a1'
-         '2c9b0f83ed5890af02c0df1c1776f39b'
-         '048751f3271906db5126ab76870444c4'
-         'eeb2c7ddf0d302fba4bfc6e97eac9624'
-         '39bb3fcea1514f1369fcfc87542390fd'
-         '3404ab6b1792ae5f16bbd603bd1e1d03'
-         '97b2d4dba862397f446b217e2b623e71'
-         'f94d9870737518e3b597f9265f4e9803'
-         '8ce2fcd72becf06c41f7201d15373ed9'
-         'd8bd5eed178db6e2b18eeed243f85aa8'
-         '3bdf40c0d199af31923e900d082ca2dd'
-         'ace6ab49184e329db254e454a010f56d'
-         'db60e4fde8dd6d6807523deb71ee34dc'
-         'ba2930200c9f019c2d93a8c88c651a0f'
-         '47203e7cade74e5c385aa812f21e7932'
-         'ae330b9493bd4503ac390106ff6060d7'
-         '22f8a85daf4a012180322e1f52a7563b'
-         '7681383be6ce489d84c1c74f4e7f9643'
-         '36271d3fa0d9dec1632029b6d7aac925'
-         '0168229624cfac409e766913506961a8'
-         '17410483b5b5f267aa18b7e00b65e6e0'
-         '185d60944ea767075d27247c3162b3bc'
-         'd794625f156a9fb1c53b3f8a8aa13b5e'
-         '496dd00028afcc19f896b01394769043'
-         '21154d2004e025c8a3666625b0357bb5'
-         '2f1ceaf2ac8752ed278e175447d9b978'
-         '40fa48e03b1e28ae0325cc34b35bc46d'
-         '504af523f5d1a5590bbeb6a4b55e8a97'
-         '8ac8ae9829c4fefd1ae9f715f95d4e0b'
-         '1cce53bf4b40ae29790d2c5c9f8b1129'
-         'bae83fa5dc7f081768daace6e199adc3'
-         '07d2bf5ad839a394cca008b3ec6e7bb1'
-         '4195735a80876ae812fca5736b50192a'
-         'e7e4b3e70e99e5cba8f8dfcacf3b0d87'
-         'fa2109339289663cb8ea7cf27cc22f4e')
-
-prepare() {
-
-    cd libreoffice-$_LOver
-#return 1
-
-	# move external sources into place
-	mkdir ${srcdir}/ext_sources &&	pushd ${srcdir}/ext_sources
-	for source in "${noextract[@]}"; do
-	  ln -s ${srcdir}/$source .
-	done
-	popd
-
-    # unowinreg.dll must be a file not a symlink or the result will become a broken symlink
-    # /usr/share/libreoffice/sdk/classes/win/unowinreg.dll -> /build/libreoffice/src/185d60944ea767075d27247c3162b3bc-unowinreg.dll
-    rm ${srcdir}/ext_sources/185d60944ea767075d27247c3162b3bc-unowinreg.dll
-    cp -f ${srcdir}/185d60944ea767075d27247c3162b3bc-unowinreg.dll ${srcdir}/ext_sources
-
-    # fix not upstreamable pyuno paths - patch taken from Debian
-    patch -Np1 -i ${srcdir}/make-pyuno-work-with-system-wide-module-install.diff
-    
-    # fix some startup issues with kde4 integration
-    # https://bugs.archlinux.org/task/39819 - https://bugs.freedesktop.org/show_bug.cgi?id=77128
-#    patch -Np1 -i ${srcdir}/prevent_KDE_Qt_from_interfering_with_the_session_manager.diff
-
-	#use the CFLAGS but remove the LibO overridden ones
-	for i in $CFLAGS; do
-		case "$i" in
-			-O?|-pipe|-Wall|-g|-fexceptions) continue;;
-		esac
-        ARCH_FLAGS="$ARCH_FLAGS $i"
-	done
-
-
-    # qt4 fix
-    sed -i "s:qmake:qmake-qt4:g" configure.ac
-}
-
-build() {
-    cd libreoffice-$_LOver
-
-	#autoconf -f
-
-	# non-SMP test build
-	#export MAKEFLAGS="-j1"
-	#./configure --with-build-version="${_LOver} Arch Linux build-${pkgrel}" --with-vendor="Arch Linux" \
-
-	./autogen.sh --with-build-version="${_LOver} Arch Linux build-${pkgrel}" --with-vendor="Arch Linux" \
-		--enable-split-app-modules \
-		--with-parallelism=${MAKEFLAGS/-j/} \
-		--with-external-tar="${srcdir}/ext_sources" \
-		--disable-fetch-external \
-		--disable-verbose \
-		--enable-release-build \
-		--prefix=/usr --exec-prefix=/usr --sysconfdir=/etc \
-		--libdir=/usr/lib --mandir=/usr/share/man \
-		--with-lang="" \
-		--enable-crashdump \
-		--enable-avahi \
-		--enable-dbus \
-		--enable-evolution2\
-		--enable-gio\
-		--disable-gnome-vfs\
-		--disable-kde\
-		--enable-kde4\
-		--enable-gtk3 \
-		--enable-gstreamer \
-		--disable-gstreamer-0-10 \
-		--enable-lockdown\
-		--enable-opencl \
-		--enable-opengl \
-		--enable-openssl \
-		--enable-odk\
-		--enable-orcus \
-		--enable-python=system \
-		--enable-scripting-beanshell \
-		--enable-scripting-javascript \
-		--disable-telepathy \
-		--enable-ext-wiki-publisher \
-		--enable-ext-nlpsolver \
-		--without-fonts\
-		--with-system-apr \
-		--with-system-libcdr \
-		--without-system-mdds\
-		--without-myspell-dicts \
-		--with-system-libvisio \
-		--without-system-libcmis \
-		--with-system-libmspub \
-		--without-system-libexttextcat \
-		--without-system-orcus \
-		--without-system-liblangtag \
-		--without-system-jfreereport \
-		--without-system-apache-commons \
-		--with-system-libodfgen \
-		--without-system-libmwaw \
-		--with-system-libetonyek \
-		--without-system-libfreehand \
-		--without-system-firebird \
-		--with-system-libatomic-ops \
-		--without-system-libebook \
-		--without-system-libabw \
-		--with-system-dicts \
-		--with-external-dict-dir=/usr/share/hunspell \
-		--with-external-hyph-dir=/usr/share/hyphen \
-		--with-external-thes-dir=/usr/share/mythes \
-		--with-system-beanshell \
-		--with-system-cppunit\
-		--with-system-graphite\
-		--with-system-glew \
-		--without-system-glm \
-		--with-system-libwpg \
-		--with-system-libwps \
-		--with-system-redland\
-		--with-system-serf \
-		--without-system-npapi-headers \
-		--with-ant-home="/usr/share/apache-ant"\
-		--without-system-boost\
-		--without-system-icu \
-		--with-system-cairo\
-		--with-system-libs\
-		--with-system-mythes\
-		--with-system-headers\
-		--without-system-hsqldb \
-		--with-alloc=system\
-		--with-system-clucene \
-		--disable-dependency-tracking \
-		--enable-hardlink-deliver #--help
-
-#		--enable-mergelibs=<all/yes> \ # https://bugs.archlinux.org/task/34414
-#		--without-ppds\ # breaks spadmin permission
-
-#--enable-split-opt-features Split file lists for some optional features, .e.g. pyuno, testtool
-
-	touch src.downloaded
-	#./download
-	make
-	# fake installation to create split file lists
-	mkdir $srcdir/fakeinstall
-	make DESTDIR=${srcdir}/fakeinstall distro-pack-install # -o build -o check
-}
-
-#check() {
-#	cd ${srcdir}/build
-#	make check
-#}
-
-package_libreoffice-common() {
- pkgdesc="Common files for LibreOffice - a productivity suite that is compatible with other major office suites"
- install=libreoffice-common.install
- depends=('libreoffice-langpack' "hunspell>=1.2.8" "python>=3.3" "neon>=0.28.6"
-		  'dbus-glib' 'librsvg' 'libcups' 'nss' 'libsm' 'redland' 'hyphen'
-		  'graphite' 'clucene' 'lcms2' "poppler>=0.24.0" #"icu>=52.1"
-		  #'telepathy-glib' # (calc telepathy-glib libtubeslo.so)
-          'libodfgen'  'libvisio' 'harfbuzz-icu' 'hicolor-icon-theme' 'glu'
-          'libmspub' 'libcdr' 'glew' # 'apr' 'serf' ?
-		  'desktop-file-utils' 'shared-mime-info' 'xdg-utils')
- optdepends=('libreoffice-langpack: additional language support'
-             'java-runtime:     adds java support'
-             'pstoedit:         translates PostScript and PDF graphics into other vector formats'
-             'libmythes:        for use in thesaurus'
-             'beanshell2:       interactive java -- good for prototyping/macros'
-             'vigra:            C++ computer vision library, usable in Basebmp'
-             'libmspack:        library for Microsoft compression formats for use in FontOOo'
-             'libwpg:           library for importing and converting Corel WordPerfect(tm) Graphics images and for MS visual import'
-             'sane:             for scanner access'
-             'unixodbc:         adds ODBC database support'
-             'gst-plugins-base-libs:        + some gstr-plugins to support multimedia content, e.g. in impress'
-             'gtk2:             for browser plugin'
-             'libpaper:         takes care of papersize')
- backup=(etc/libreoffice/sofficerc
-         etc/libreoffice/bootstraprc
-         etc/libreoffice/psprint.conf
-         etc/profile.d/libreoffice-common.sh
-         etc/profile.d/libreoffice-common.csh)
- groups=('libreoffice')
- provides=('go-openoffice' 'libreoffice-extension-pdfimport' 'libreoffice-extension-presenter-screen'
-           'libreoffice-scripting-beanshell' 'libreoffice-scripting-javascript'	'libreoffice-extension-scripting-python'
-           'libreoffice-extension-report-builder')
- conflicts=('go-openoffice')
- replaces=('go-openoffice' 'openoffice-base' 'libreoffice' 'libreoffice-extension-pdfimport' 'libreoffice-extension-presenter-screen'
-           'libreoffice-scripting-beanshell' 'libreoffice-scripting-javascript' 'libreoffice-extension-scripting-python'
-           'libreoffice-extension-report-builder' 'libreoffice-extension-presentation-minimizer' 'libreoffice-extension-presentation-minimizer')
-
- # create directories from *list.txt file
- for directory in `grep ^%dir ${srcdir}/libreoffice-$_LOver/file-lists/common_list.txt`; do
-   install -dm755 ${pkgdir}/${directory/\%dir/}
- done
- # install files into the pkg from fakeinstall dir
- for file in `grep -v ^%dir $srcdir/libreoffice-$_LOver/file-lists/common_list.txt`; do
-   dirname=`dirname $file`
-   # check if directory has been already been created - some are missing like manpages
-   [ -d ${pkgdir}/$dirname ] || install -dm755 ${pkgdir}/$dirname
-   # mv file from fakeinstall to pkgdir
-   mv ${srcdir}/fakeinstall${file} ${pkgdir}$file
- done
-
- # put configuration files into place
- install -dm755 ${pkgdir}/etc/libreoffice
- install -m644 ${pkgdir}/usr/lib/libreoffice/program/{bootstraprc,sofficerc} ${pkgdir}/etc/libreoffice/
- install -m644 ${pkgdir}/usr/lib/libreoffice/share/psprint/psprint.conf ${pkgdir}/etc/libreoffice/
- # install dummy links to make them found by LibO
- cd ${pkgdir}/usr/lib/libreoffice/program/
- ln -vsf /etc/libreoffice/{bootstraprc,sofficerc} .
- cd ${pkgdir}/usr/lib/libreoffice/share/psprint/
- ln -vsf /etc/libreoffice/psprint.conf .
-
- # allow to preset desired VLC
- install -dm755 ${pkgdir}/etc/profile.d
- install -m755 ${srcdir}/libreoffice-common.{sh,csh} ${pkgdir}/etc/profile.d/
-
- # move bash-completion files to its new place
- install -dm755 ${pkgdir}/usr/share/bash-completion/completions
- mv ${pkgdir}/etc/bash_completion.d/libreoffice.sh ${pkgdir}/usr/share/bash-completion/completions/libreoffice.sh
- rm -rf ${pkgdir}/etc/bash_completion.d
-
- # make pyuno find its modules
- install -dm755 ${pkgdir}/usr/lib/python3.4/site-packages
- ln -svf /usr/lib/libreoffice/program/uno.py ${pkgdir}/usr/lib/python3.4/site-packages/uno.py
- ln -svf /usr/lib/libreoffice/program/unohelper.py ${pkgdir}/usr/lib/python3.4/site-packages/unohelper.py
-
- # workaround all packages now depend on that file
- cp ${srcdir}/fakeinstall/usr/lib/libreoffice/share/registry/writer.xcd ${pkgdir}/usr/lib/libreoffice/share/registry/writer.xcd
- # workaround lowriter depending on a lib that's part of calc
- # https://bugs.archlinux.org/task/39038 - https://bugs.freedesktop.org/show_bug.cgi?id=75506
-# cp ${srcdir}/fakeinstall/usr/lib/libreoffice/program/libtubeslo.so ${pkgdir}/usr/lib/libreoffice/program/libtubeslo.so
-
- # add missing files from Beanshell provider
- # create directories from *list.txt file
- for directory in `grep ^%dir ${srcdir}/libreoffice-$_LOver/file-lists/orig/gid_Module_Optional_Extensions_Script_Provider_For_BS`; do
-   install -dm755 ${pkgdir}/${directory/\%dir/}
- done
- # install files into the pkg from fakeinstall dir
- for file in `grep -v ^%dir $srcdir/libreoffice-$_LOver/file-lists/orig/gid_Module_Optional_Extensions_Script_Provider_For_BS`; do
-   dirname=`dirname $file`
-   # check if directory has been already been created - some are missing like manpages
-   [ -d ${pkgdir}/$dirname ] || install -dm755 ${pkgdir}/$dirname
-   # mv file from fakeinstall to pkgdir
-   mv ${srcdir}/fakeinstall${file} ${pkgdir}$file || /bin/true # some double file entries make it fail
- done
-}
-
-package_libreoffice-base() {
- pkgdesc="GUI database front-end for LibreOffice. Allows creation and management of databases through a GUI."
- install=libreoffice-base.install
- depends=('libreoffice-common')
- optdepends=('libreoffice-postgresql-connector')
- groups=('libreoffice')
- replaces=('libreoffice')
-
- # create directories from *list.txt file
- for directory in `grep ^%dir ${srcdir}/libreoffice-$_LOver/file-lists/base_list.txt`; do
-   install -dm755 ${pkgdir}/${directory/\%dir/}
- done
- # install files into the pkg from fakeinstall dir
- for file in `grep -v ^%dir $srcdir/libreoffice-$_LOver/file-lists/base_list.txt`; do
-   dirname=`dirname $file`
-   # check if directory has been already been created - some are missing like manpages
-   [ -d ${pkgdir}/$dirname ] || install -dm755 ${pkgdir}/$dirname
-   # mv file from fakeinstall to pkgdir
-   mv ${srcdir}/fakeinstall${file} ${pkgdir}$file
- done
-}
-
-package_libreoffice-postgresql-connector() {
- pkgdesc="A PostgreSQL connector for the database front-end for LibreOffice"
- depends=('libreoffice-base' 'postgresql-libs')
- groups=('libreoffice')
- replaces=('libreoffice')
-
- # workaround double entries in the file list
- mv ${srcdir}/libreoffice-$_LOver/file-lists/postgresql_list.txt ${srcdir}/libreoffice-$_LOver/file-lists/postgresql_list.txt.orig
- sort ${srcdir}/libreoffice-$_LOver/file-lists/postgresql_list.txt.orig | uniq 1>& ${srcdir}/libreoffice-$_LOver/file-lists/postgresql_list.txt
-
- # create directories from *list.txt file
- for directory in `grep ^%dir ${srcdir}/libreoffice-$_LOver/file-lists/postgresql_list.txt`; do
-   install -dm755 ${pkgdir}/${directory/\%dir/}
- done
- # install files into the pkg from fakeinstall dir
- for file in `grep -v ^%dir $srcdir/libreoffice-$_LOver/file-lists/postgresql_list.txt`; do
-   dirname=`dirname $file`
-   # check if directory has been already been created - some are missing like manpages
-   [ -d ${pkgdir}/$dirname ] || install -dm755 ${pkgdir}/$dirname
-   # mv file from fakeinstall to pkgdir
-   mv ${srcdir}/fakeinstall${file} ${pkgdir}$file
- done
-}
-
-package_libreoffice-calc() {
- pkgdesc="Spreadsheet application for LibreOffice."
- install=libreoffice-calc.install
- depends=('libreoffice-common' 'lpsolve')
- #depends=('libreoffice-writer' 'lpsolve' ) # some hidden uno linking to parts of the writer pkg - https://bugs.archlinux.org/task/34332
- groups=('libreoffice')
- replaces=('libreoffice')
-
- # create directories from *list.txt file
- for directory in `grep ^%dir ${srcdir}/libreoffice-$_LOver/file-lists/calc_list.txt`; do
-   install -dm755 ${pkgdir}/${directory/\%dir/}
- done
- # install files into the pkg from fakeinstall dir
- for file in `grep -v ^%dir $srcdir/libreoffice-$_LOver/file-lists/calc_list.txt`; do
-   dirname=`dirname $file`
-   # check if directory has been already been created - some are missing like manpages
-   [ -d ${pkgdir}/$dirname ] || install -dm755 ${pkgdir}/$dirname
-   # mv file from fakeinstall to pkgdir
-   mv ${srcdir}/fakeinstall${file} ${pkgdir}$file
- done
- # workaround lowriter depending on a lib that's part of calc
- # https://bugs.archlinux.org/task/39038 - https://bugs.freedesktop.org/show_bug.cgi?id=75506
-# rm -vf ${pkgdir}/usr/lib/libreoffice/program/libtubeslo.so
-}
-
-package_libreoffice-draw() {
- pkgdesc="Drawing Application for LibreOffice."
- install=libreoffice-draw.install
- depends=('libreoffice-common')
- groups=('libreoffice')
- replaces=('libreoffice')
-
- # create directories from *list.txt file
- for directory in `grep ^%dir ${srcdir}/libreoffice-$_LOver/file-lists/draw_list.txt`; do
-   install -dm755 ${pkgdir}/${directory/\%dir/}
- done
- # install files into the pkg from fakeinstall dir
- for file in `grep -v ^%dir $srcdir/libreoffice-$_LOver/file-lists/draw_list.txt`; do
-   dirname=`dirname $file`
-   # check if directory has been already been created - some are missing like manpages
-   [ -d ${pkgdir}/$dirname ] || install -dm755 ${pkgdir}/$dirname
-   # mv file from fakeinstall to pkgdir
-   mv ${srcdir}/fakeinstall${file} ${pkgdir}$file
- done
-}
-
-package_libreoffice-gnome() {
- pkgdesc="Plug-in for LibreOffice that enables integration into the Gnome and other gtk desktop environment."
- depends=('libreoffice-common' 'gconf')
- optdepends=('gtk3: for gtk3 Gnome integration'
-             'gtk2: for older gtk2 desktop integration')
- groups=('libreoffice')
-
- # create directories from *list.txt file
- for directory in `grep ^%dir ${srcdir}/libreoffice-$_LOver/file-lists/gnome_list.txt`; do
-   install -dm755 ${pkgdir}/${directory/\%dir/}
- done
- # install files into the pkg from fakeinstall dir
- for file in `grep -v ^%dir $srcdir/libreoffice-$_LOver/file-lists/gnome_list.txt`; do
-   dirname=`dirname $file`
-   # check if directory has been already been created - some are missing like manpages
-   [ -d ${pkgdir}/$dirname ] || install -dm755 ${pkgdir}/$dirname
-   # mv file from fakeinstall to pkgdir
-   mv ${srcdir}/fakeinstall${file} ${pkgdir}$file
- done
-}
-
-package_libreoffice-impress() {
- pkgdesc="Presentation Application for LibreOffice."
- install=libreoffice-impress.install
- depends=('libreoffice-common' 'libetonyek')
- groups=('libreoffice')
- replaces=('libreoffice')
-
- # create directories from *list.txt file
- for directory in `grep ^%dir ${srcdir}/libreoffice-$_LOver/file-lists/impress_list.txt`; do
-   install -dm755 ${pkgdir}/${directory/\%dir/}
- done
- # install files into the pkg from fakeinstall dir
- for file in `grep -v ^%dir $srcdir/libreoffice-$_LOver/file-lists/impress_list.txt`; do
-   dirname=`dirname $file`
-   # check if directory has been already been created - some are missing like manpages
-   [ -d ${pkgdir}/$dirname ] || install -dm755 ${pkgdir}/$dirname
-   # mv file from fakeinstall to pkgdir
-   mv ${srcdir}/fakeinstall${file} ${pkgdir}$file
- done
-}
-
-package_libreoffice-kde4() {
- pkgdesc="Plug-in for LibreOffice that enables integration into the KDE4 desktop environment."
- depends=('libreoffice-common' 'kdelibs')
- optdepends=()
- backup=()
- groups=('libreoffice')
-
- # create directories from *list.txt file
- for directory in `grep ^%dir ${srcdir}/libreoffice-$_LOver/file-lists/kde4_list.txt`; do
-   install -dm755 ${pkgdir}/${directory/\%dir/}
- done
- # install files into the pkg from fakeinstall dir
- for file in `grep -v ^%dir $srcdir/libreoffice-$_LOver/file-lists/kde4_list.txt`; do
-   dirname=`dirname $file`
-   # check if directory has been already been created - some are missing like manpages
-   [ -d ${pkgdir}/$dirname ] || install -dm755 ${pkgdir}/$dirname
-   # mv file from fakeinstall to pkgdir
-   mv ${srcdir}/fakeinstall${file} ${pkgdir}$file
- done
-
- # one file (libkde4be1lo.so) is part of kde_list.txt
- # create directories from *list.txt file
- for directory in `grep ^%dir ${srcdir}/libreoffice-$_LOver/file-lists/kde_list.txt`; do
-   install -dm755 ${pkgdir}/${directory/\%dir/}
- done
- # install files into the pkg from fakeinstall dir
- for file in `grep -v ^%dir $srcdir/libreoffice-$_LOver/file-lists/kde_list.txt`; do
-   dirname=`dirname $file`
-   # check if directory has been already been created - some are missing like manpages
-   [ -d ${pkgdir}/$dirname ] || install -dm755 ${pkgdir}/$dirname
-   # mv file from fakeinstall to pkgdir
-   mv ${srcdir}/fakeinstall${file} ${pkgdir}$file
- done
-}
-
-package_libreoffice-math() {
- pkgdesc="Equation Editor Application for LibreOffice."
- depends=('libreoffice-common')
- groups=('libreoffice')
- replaces=('libreoffice')
-
- # create directories from *list.txt file
- for directory in `grep ^%dir ${srcdir}/libreoffice-$_LOver/file-lists/math_list.txt`; do
-   install -dm755 ${pkgdir}/${directory/\%dir/}
- done
- # install files into the pkg from fakeinstall dir
- for file in `grep -v ^%dir $srcdir/libreoffice-$_LOver/file-lists/math_list.txt`; do
-   dirname=`dirname $file`
-   # check if directory has been already been created - some are missing like manpages
-   [ -d ${pkgdir}/$dirname ] || install -dm755 ${pkgdir}/$dirname
-   # mv file from fakeinstall to pkgdir
-   mv ${srcdir}/fakeinstall${file} ${pkgdir}$file
- done
-}
-
-package_libreoffice-sdk() {
- pkgdesc="Software Development Kit for LibreOffice."
- depends=('libreoffice-common' 'gcc-libs' 'sh' 'make' 'zip' 'gcc' 'java-environment')
- groups=('libreoffice')
-
- # create directories from *list.txt file
- for directory in `grep ^%dir ${srcdir}/libreoffice-$_LOver/file-lists/sdk_list.txt`; do
-   install -dm755 ${pkgdir}/${directory/\%dir/}
- done
- # install files into the pkg from fakeinstall dir
- for file in `grep -v ^%dir $srcdir/libreoffice-$_LOver/file-lists/sdk_list.txt`; do
-   dirname=`dirname $file`
-   # check if directory has been already been created - some are missing like manpages
-   [ -d ${pkgdir}/$dirname ] || install -dm755 ${pkgdir}/$dirname
-   # mv file from fakeinstall to pkgdir
-   mv ${srcdir}/fakeinstall${file} ${pkgdir}$file
- done
-
-  # fix environment path to keep compatibility with other java-environments
-#  sed -i -e "s:\/usr\/lib\/jvm\/java-7-openjdk:\$J2SDKDIR:" ${pkgdir}/usr/lib/libreoffice/sdk/setsdkenv_unix.{sh,csh}
-  sed -i -e "s:\/usr\/lib\/jvm\/java-7-openjdk:\$J2SDKDIR:" ${pkgdir}/usr/lib/libreoffice/sdk/setsdkenv_unix.sh
-}
-
-package_libreoffice-sdk-doc() {
- pkgdesc="Software Development Kit documentation for LibreOffice"
- depends=('libreoffice-common' 'libreoffice-sdk')
- groups=('libreoffice')
-
- # create directories from *list.txt file
- for directory in `grep ^%dir ${srcdir}/libreoffice-$_LOver/file-lists/sdk_doc_list.txt`; do
-   install -dm755 ${pkgdir}/${directory/\%dir/}
- done
- # install files into the pkg from fakeinstall dir
- for file in `grep -v ^%dir $srcdir/libreoffice-$_LOver/file-lists/sdk_doc_list.txt`; do
-   dirname=`dirname $file`
-   # check if directory has been already been created - some are missing like manpages
-   [ -d ${pkgdir}/$dirname ] || install -dm755 ${pkgdir}/$dirname
-   # mv file from fakeinstall to pkgdir
-   mv ${srcdir}/fakeinstall${file} ${pkgdir}$file
- done
-
- #fix permissions
- find ${pkgdir}/usr/lib/libreoffice/sdk/examples -type f -exec chmod -x {} \;
-}
-
-package_libreoffice-writer() {
- pkgdesc="Word Processor Application for LibreOffice."
- install=libreoffice-writer.install
- depends=('libreoffice-common' 'libwpd>=0.9.2' 'libwps' 'libxml2')
- optdepends=('libwpg:           library for importing and converting Corel WordPerfect(tm) Graphics images')
- groups=('libreoffice')
- replaces=('libreoffice')
-
- # create directories from *list.txt file
- for directory in `grep ^%dir ${srcdir}/libreoffice-$_LOver/file-lists/writer_list.txt`; do
-   install -dm755 ${pkgdir}/${directory/\%dir/}
- done
- # install files into the pkg from fakeinstall dir
- for file in `grep -v ^%dir $srcdir/libreoffice-$_LOver/file-lists/writer_list.txt`; do
-   dirname=`dirname $file`
-   # check if directory has been already been created - some are missing like manpages
-   [ -d ${pkgdir}/$dirname ] || install -dm755 ${pkgdir}/$dirname
-   # mv file from fakeinstall to pkgdir
-   mv ${srcdir}/fakeinstall${file} ${pkgdir}$file
- done
-
- # for workaround this file belongs now to common
- rm -vf ${pkgdir}/usr/lib/libreoffice/share/registry/writer.xcd
-}
-
-package_libreoffice-en-US() {
-  pkgdesc="English (US) language pack for LibreOffice"
-  #arch=('any')
-  provides=('openoffice-en-US' 'libreoffice-langpack')
-  replaces=(openoffice-en-US)
-  conflicts=(openoffice-en-US)
-
- # create directories from *list.txt file
- for directory in `grep ^%dir ${srcdir}/libreoffice-$_LOver/file-lists/lang_en_US_list.txt`; do
-   install -dm755 ${pkgdir}/${directory/\%dir/}
- done
- # install files into the pkg from fakeinstall dir
- for file in `grep -v ^%dir $srcdir/libreoffice-$_LOver/file-lists/lang_en_US_list.txt`; do
-   dirname=`dirname $file`
-   # check if directory has been already been created - some are missing like manpages
-   [ -d ${pkgdir}/$dirname ] || install -dm755 ${pkgdir}/$dirname
-   # mv file from fakeinstall to pkgdir
-   mv ${srcdir}/fakeinstall${file} ${pkgdir}$file
- done
-}
-
-package_libreoffice-extension-wiki-publisher() {
-
- pkgdesc="This extension enables you to create Wiki articles on MediaWiki servers without having to know the syntax of the MediaWiki markup language"
- #arch=('any')
- depends=('libreoffice-common' 'java-environment')
- groups=('libreoffice-extensions')
-
-	install -dm755 ${pkgdir}/usr/lib/libreoffice/share/extensions
-	unzip -q ${srcdir}/libreoffice-$_LOver/workdir/Extension/wiki-publisher.oxt -d ${pkgdir}/usr/lib/libreoffice/share/extensions/wiki-publisher
-}
-
-package_libreoffice-extension-nlpsolver() {
-
- pkgdesc="This extension integrates into Calc and offers new Solver engines to use for optimizing nonlinear programming models"
- #arch=('any')
- depends=('libreoffice-common' 'java-environment')
- groups=('libreoffice-extensions')
-
-	install -dm755 ${pkgdir}/usr/lib/libreoffice/share/extensions
-	unzip -q ${srcdir}/libreoffice-$_LOver/workdir/Extension/nlpsolver.oxt -d ${pkgdir}/usr/lib/libreoffice/share/extensions/nlpsolver
-}
diff --git a/extra/libvisio/PKGBUILD b/extra/libvisio/PKGBUILD
index f130c0c2a..a0a0fd634 100644
--- a/extra/libvisio/PKGBUILD
+++ b/extra/libvisio/PKGBUILD
@@ -1,20 +1,20 @@
-# $Id: PKGBUILD 211312 2014-04-18 17:28:15Z andyrtr $
+# $Id: PKGBUILD 215152 2014-06-14 19:16:59Z andyrtr $
 # Maintainer: AndyRTR <andyrtr@archlinux.org>
 # Maintainer:  Bartłomiej Piotrowski <bpiotrowski@archlinux.org>
 # Contributor: ponsfoot <cabezon dot hashimoto at gmail dot com>
 # Contributor: philacs
 
 pkgname=libvisio
-pkgver=0.0.31
-pkgrel=3
+pkgver=0.1.0
+pkgrel=1
 pkgdesc='Library providing ability to interpret and import visio diagrams'
 arch=('i686' 'x86_64')
 url='http://www.freedesktop.org/wiki/Software/libvisio'
 license=('LGPL')
-depends=('libwpd' 'libwpg' 'libxml2' 'gperf' 'icu')
-makedepends=('boost')
+depends=('libwpd' 'libwpg' 'libxml2' 'icu' 'librevenge')
+makedepends=('boost' 'gperf' 'doxygen')
 source=(http://dev-www.libreoffice.org/src/$pkgname-$pkgver.tar.xz)
-md5sums=('12ceec054cdec55b4dc9fc931507d1cd')
+md5sums=('41e156acfd269dcaf99b37a1d979b746')
 
 build() {
   cd $pkgname-$pkgver
diff --git a/extra/libwebp/PKGBUILD b/extra/libwebp/PKGBUILD
index 64efd9b1d..0a17f3716 100644
--- a/extra/libwebp/PKGBUILD
+++ b/extra/libwebp/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 205027 2014-02-03 10:02:57Z heftig $
+# $Id: PKGBUILD 215167 2014-06-14 19:17:19Z andyrtr $
 # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
 # Contributor: Alexander Rødseth <rodseth@gmail.com>
 # Contributor: Jon Nordby <jononor@gmail.com>
 
 pkgname=libwebp
 pkgver=0.4.0
-pkgrel=1
+pkgrel=2
 pkgdesc="WebP library and conversion tools"
 arch=(x86_64 i686)
 url="https://developers.google.com/speed/webp/"
@@ -13,8 +13,15 @@ license=(BSD)
 depends=(libpng libjpeg libtiff giflib)
 makedepends=(freeglut mesa glu)
 optdepends=('freeglut: vwebp viewer')
-source=("http://webp.googlecode.com/files/$pkgname-$pkgver.tar.gz")
-sha256sums=('31913577e96386556855b41d210736449445fe96cfbe9289014e9b8afa944d69')
+source=("http://webp.googlecode.com/files/$pkgname-$pkgver.tar.gz"
+        "libwebp-0.4.0-giflib-5.1.0.patch")
+sha256sums=('31913577e96386556855b41d210736449445fe96cfbe9289014e9b8afa944d69'
+            '466fb04887b7fba1be95bb409bd01c23c2855dc2b9471cf5cd6de1822e55ed86')
+
+prepare() {
+  cd "$srcdir/$pkgname-$pkgver"
+  patch -p1 -i "$srcdir"/libwebp-0.4.0-giflib-5.1.0.patch 
+}
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
diff --git a/extra/libwebp/libwebp-0.4.0-giflib-5.1.0.patch b/extra/libwebp/libwebp-0.4.0-giflib-5.1.0.patch
new file mode 100644
index 000000000..efb06370a
--- /dev/null
+++ b/extra/libwebp/libwebp-0.4.0-giflib-5.1.0.patch
@@ -0,0 +1,12 @@
+diff -rupN a/examples/gif2webp.c b/examples/gif2webp.c
+--- a/examples/gif2webp.c	2013-12-20 09:48:07.000000000 +0100
++++ b/examples/gif2webp.c	2014-06-01 13:28:31.790564455 +0200
+@@ -644,7 +644,7 @@ int main(int argc, const char *argv[]) {
+     DisplayGifError(gif, gif_error);
+   }
+   if (gif != NULL) {
+-    DGifCloseFile(gif);
++    DGifCloseFile(gif, NULL);
+   }
+ 
+   return !ok;
diff --git a/extra/libwpd/PKGBUILD b/extra/libwpd/PKGBUILD
index f9ea447f6..5d1810f35 100644
--- a/extra/libwpd/PKGBUILD
+++ b/extra/libwpd/PKGBUILD
@@ -1,18 +1,18 @@
-# $Id: PKGBUILD 198267 2013-10-30 13:49:48Z allan $
+# $Id: PKGBUILD 215153 2014-06-14 19:17:00Z andyrtr $
 # Maintainer: AndyRTR <andyrtr@archlinux.org>
 
 pkgname=libwpd
-pkgver=0.9.9
+pkgver=0.10.0
 pkgrel=1
 pkgdesc="Library for importing WordPerfect (tm) documents"
 arch=('i686' 'x86_64')
 url="http://libwpd.sourceforge.net/"
 license=('LGPL')
-depends=('gcc-libs' 'zlib')
-makedepends=('libgsf>=1.14.26')
+depends=('gcc-libs' 'zlib' 'librevenge')
+makedepends=('libgsf>=1.14.26' 'doxygen')
 options=('!emptydirs')
 source=(http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.xz)
-md5sums=('6b74a863c957563924546e16cc833591')
+md5sums=('f7abb9b3ea96faf02ae019af68b1f07c')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/extra/libwpg/PKGBUILD b/extra/libwpg/PKGBUILD
index 5916e389b..12cac2fda 100644
--- a/extra/libwpg/PKGBUILD
+++ b/extra/libwpg/PKGBUILD
@@ -1,16 +1,17 @@
-# $Id: PKGBUILD 197095 2013-10-21 18:43:22Z andyrtr $
+# $Id: PKGBUILD 215154 2014-06-14 19:17:01Z andyrtr $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=libwpg
-pkgver=0.2.2
-pkgrel=2
+pkgver=0.3.0
+pkgrel=1
 pkgdesc="Library for importing and converting Corel WordPerfect(tm) Graphics images."
 arch=('i686' 'x86_64')
 url="http://libwpg.sourceforge.net/"
 license=('LGPL')
-depends=('libwpd' 'perl')
+depends=('libwpd' 'perl' 'librevenge')
+makedepends=('doxygen')
 source=("http://downloads.sourceforge.net/libwpg/${pkgname}-${pkgver}.tar.bz2")
-md5sums=('b85436266b2ac91d351ab5684b181151')
+md5sums=('17da9770cb8b317b7633f9807b32b71a')
 
 build() {
   cd ${pkgname}-${pkgver}
diff --git a/extra/libwps/PKGBUILD b/extra/libwps/PKGBUILD
index 0d814405b..f9f545220 100644
--- a/extra/libwps/PKGBUILD
+++ b/extra/libwps/PKGBUILD
@@ -1,18 +1,18 @@
-# $Id: PKGBUILD 198268 2013-10-30 13:50:09Z allan $
+# $Id: PKGBUILD 215155 2014-06-14 19:17:02Z andyrtr $
 # Maintainer: AndyRTR <andyrtr@archlinux.org>
 # Contributor: Robert McCathie <archaur at rmcc dot com dot au>
 
 pkgname=libwps
-pkgver=0.2.9
+pkgver=0.3.0
 pkgrel=1
 pkgdesc="a Microsoft Works file word processor format import filter library"
 arch=('i686' 'x86_64')
 url="http://libwps.sourceforge.net/"
 license=('LGPL')
-depends=('libwpd>=0.9.6')
-makedepends=('boost')
+depends=('libwpd' 'librevenge')
+makedepends=('boost' 'doxygen')
 source=("http://downloads.sourceforge.net/project/libwps/$pkgname/$pkgname-$pkgver/$pkgname-$pkgver.tar.bz2")
-md5sums=('46eb0e7f213ad61bd5dee0c494132cb0')
+md5sums=('d4d77d08b9048bae3b8ec8df11f80efd')
 
 build() {
 	cd "$srcdir/$pkgname-$pkgver"
@@ -26,4 +26,3 @@ package() {
 	cd "$srcdir/$pkgname-$pkgver"
 	make DESTDIR="$pkgdir" install
 }
-
diff --git a/extra/live-media/PKGBUILD b/extra/live-media/PKGBUILD
index 8d4deedb1..d0f39ed27 100644
--- a/extra/live-media/PKGBUILD
+++ b/extra/live-media/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 212078 2014-05-06 14:16:45Z giovanni $
+# $Id: PKGBUILD 215086 2014-06-13 13:39:00Z giovanni $
 # Maintainer: Giovanni Scafora <giovanni@archlinux.org>
 # Contributor: Gilles CHAUVIN <gcnweb@gmail.com>
 
 pkgname=live-media
-pkgver=2014.04.23
+pkgver=2014.05.27
 pkgrel=1
 pkgdesc="A set of C++ libraries for multimedia streaming"
 arch=('i686' 'x86_64')
@@ -12,7 +12,7 @@ url="http://live555.com/liveMedia"
 depends=('gcc-libs')
 options=('staticlibs')
 source=("http://live555.com/liveMedia/public/live.${pkgver}.tar.gz")
-md5sums=('f549f364374e2eec1000bc0ce31d6e74')
+md5sums=('69f877ac5464b6488f7af425d59f84d4')
 
 build() {
   cd ${srcdir}/live
diff --git a/extra/llvm/PKGBUILD b/extra/llvm/PKGBUILD
index bd2649240..4c3cfbcff 100644
--- a/extra/llvm/PKGBUILD
+++ b/extra/llvm/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 212366 2014-05-14 06:58:53Z foutrelis $
+# $Id: PKGBUILD 215216 2014-06-16 18:49:57Z foutrelis $
 # Maintainer: Evangelos Foutras <evangelos@foutrelis.com>
 # Contributor: Jan "heftig" Steffens <jan.steffens@gmail.com>
 # Contributor: Sebastian Nowicki <sebnow@gmail.com>
@@ -11,9 +11,9 @@
 
 pkgname=('llvm' 'llvm-libs' 'llvm-ocaml' 'clang' 'clang-analyzer'
          'clang-tools-extra')
-pkgver=3.4.1
+pkgver=3.4.2
 _base_ver=3.4
-pkgrel=2
+pkgrel=1
 arch=('i686' 'x86_64')
 url="http://llvm.org/"
 license=('custom:University of Illinois/NCSA Open Source License')
@@ -24,21 +24,19 @@ source=(http://llvm.org/releases/$pkgver/llvm-$pkgver.src.tar.gz{,.sig}
         http://llvm.org/releases/$_base_ver/clang-tools-extra-$_base_ver.src.tar.gz{,.sig}
         http://llvm.org/releases/$_base_ver/compiler-rt-$_base_ver.src.tar.gz{,.sig}
         clang-3.3-use-gold-linker.patch
-        clang-3.4-max_align_t.patch
         clang-3.4-fstack-protector-strong.patch
         llvm-3.4-provide-cmake-modules.patch
         llvm-Config-config.h
         llvm-Config-llvm-config.h)
-sha256sums=('7d28bb6eca243a2bb6d65a05743ab915b57958a7770277364e93534b63eef93a'
+sha256sums=('17038d47069ad0700c063caed76f0c7259628b0e79651ce2b540d506f2f1efd7'
             'SKIP'
-            'ab83f30951b34d75729026e0e73c180a728a140f2a02cbb8915805051a9d6bb7'
+            '5ba6f5772f8d00f445209356a7daf83c5bca2da5acd10de517ad2359ae95bc10'
             'SKIP'
             'ba85187551ae97fe1c8ab569903beae5ff0900e21233e5eb5389f6ceab1028b4'
             'SKIP'
             'f37c89b1383ce462d47537a0245ac798600887a9be9f63073e16b79ed536ab5c'
             'SKIP'
             '8240adda155d7961eeb5d07ed50ead10cb7125f70283dff7f1c9fee9df3cea09'
-            '0f0cbff69af54e83383385abbdeb1fee23e6e69427f8530060c492c0b07c2bbe'
             '7a2a1ddc94f67e643c1ab74601ec07deb6d5d344d4b19ed17c900afb2f6f2863'
             'b6bb154d5ec998328e818bb09acfc6229e41367ba45cea7cc5b2dd2a7c835cf5'
             '312574e655f9a87784ca416949c505c452b819fad3061f2cde8aced6540a19a3'
@@ -67,10 +65,6 @@ prepare() {
   # Make -flto work; use ld.gold instead of the default linker
   patch -d tools/clang -Np1 -i "$srcdir/clang-3.3-use-gold-linker.patch"
 
-  # Teach Clang to provide ::max_align_t in C11 and C++11 modes (FS#40229)
-  # http://reviews.llvm.org/rL201729
-  patch -d tools/clang -Np0 -i "$srcdir/clang-3.4-max_align_t.patch"
-
   # Add command line option -fstack-protector-strong
   # http://reviews.llvm.org/rL201120
   patch -d tools/clang -Np0 -i "$srcdir/clang-3.4-fstack-protector-strong.patch"
@@ -128,8 +122,8 @@ package_llvm() {
   mv "$srcdir/clang" tools
 
   # The runtime library goes into llvm-libs
-  mv "$pkgdir/usr/lib/libLLVM-$pkgver.so" "$srcdir"
-  rm "$pkgdir/usr/lib/libLLVM-$_base_ver.so"
+  mv "$pkgdir/usr/lib/libLLVM-$pkgver.so" "$srcdir/"
+  mv "$pkgdir/usr/lib/libLLVM-$_base_ver.so" "$srcdir/"
 
   # OCaml bindings go to a separate package
   rm -rf "$srcdir"/{ocaml,ocamldoc}
@@ -174,8 +168,11 @@ package_llvm-libs() {
   pkgdesc="Low Level Virtual Machine (runtime library)"
   depends=('gcc-libs' 'zlib' 'libffi' 'ncurses')
 
-  install -D "$srcdir/libLLVM-$pkgver.so" "$pkgdir/usr/lib/libLLVM-$pkgver.so"
-  ln -s libLLVM-$pkgver.so "$pkgdir/usr/lib/libLLVM-$_base_ver.so"
+  install -d "$pkgdir/usr/lib"
+  cp -P \
+    "$srcdir/libLLVM-$pkgver.so" \
+    "$srcdir/libLLVM-$_base_ver.so" \
+    "$pkgdir/usr/lib/"
 
   install -Dm644 "$srcdir/llvm-$pkgver/LICENSE.TXT" \
     "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
diff --git a/extra/llvm/clang-3.4-max_align_t.patch b/extra/llvm/clang-3.4-max_align_t.patch
deleted file mode 100644
index a41f37e93..000000000
--- a/extra/llvm/clang-3.4-max_align_t.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-Index: lib/Headers/stddef.h
-===================================================================
---- lib/Headers/stddef.h	(revision 201728)
-+++ lib/Headers/stddef.h	(revision 201729)
-@@ -84,6 +84,16 @@
- #endif
- #endif
- 
-+#if __STDC_VERSION__ >= 201112L || __cplusplus >= 201103L
-+typedef struct {
-+  long long __clang_max_align_nonce1
-+      __attribute__((__aligned__(__alignof__(long long))));
-+  long double __clang_max_align_nonce2
-+      __attribute__((__aligned__(__alignof__(long double))));
-+} max_align_t;
-+#define __CLANG_MAX_ALIGN_T_DEFINED
-+#endif
-+
- #define offsetof(t, d) __builtin_offsetof(t, d)
- 
- #endif /* __STDDEF_H */
-Index: test/Headers/c11.c
-===================================================================
---- test/Headers/c11.c	(revision 201728)
-+++ test/Headers/c11.c	(revision 201729)
-@@ -22,6 +22,10 @@
- #define __STDC_WANT_LIB_EXT1__ 1
- #include <stddef.h>
- rsize_t x = 0;
-+_Static_assert(sizeof(max_align_t) >= sizeof(long long), "");
-+_Static_assert(alignof(max_align_t) >= alignof(long long), "");
-+_Static_assert(sizeof(max_align_t) >= sizeof(long double), "");
-+_Static_assert(alignof(max_align_t) >= alignof(long double), "");
- 
- // If we are freestanding, then also check RSIZE_MAX (in a hosted implementation
- // we will use the host stdint.h, which may not yet have C11 support).
diff --git a/extra/maxima/PKGBUILD b/extra/maxima/PKGBUILD
index dc75187ec..ffd775d2b 100644
--- a/extra/maxima/PKGBUILD
+++ b/extra/maxima/PKGBUILD
@@ -1,15 +1,15 @@
-# $Id: PKGBUILD 213411 2014-05-23 10:44:10Z juergen $
+# $Id: PKGBUILD 215196 2014-06-16 11:02:24Z juergen $
 # Maintainer: Ronald van Haren <ronald.archlinux.org>
 # Contributor: Damir Perisa <damir@archlinux.org>
 
 pkgname=maxima
 pkgver=5.33.0
-pkgrel=3
+pkgrel=4
 pkgdesc="A sophisticated computer algebra system"
 arch=('i686' 'x86_64')
 license=('GPL')
 url="http://maxima.sourceforge.net"
-depends=('sbcl=1.1.18' 'texinfo' 'sh')
+depends=('sbcl=1.2.0' 'texinfo' 'sh')
 makedepends=('python2')
 optdepends=('gnuplot: plotting capabilities' 'rlwrap: readline support via /usr/bin/rmaxima' 'tk: graphical xmaxima interface')
 # needs rebuild when bash changes version
diff --git a/extra/mesa/PKGBUILD b/extra/mesa/PKGBUILD
index e6fbefd30..08ce53503 100644
--- a/extra/mesa/PKGBUILD
+++ b/extra/mesa/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 214387 2014-06-08 19:01:03Z lcarlier $
+# $Id: PKGBUILD 215218 2014-06-16 18:52:23Z foutrelis $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 # Maintainer: Andreas Radke <andyrtr@archlinux.org>
 
 pkgbase=mesa
 pkgname=('opencl-mesa' 'ati-dri' 'intel-dri' 'nouveau-dri' 'svga-dri' 'mesa' 'mesa-libgl')
 pkgver=10.2.1
-pkgrel=1
+pkgrel=2
 arch=('i686' 'x86_64')
 makedepends=('python2' 'libxml2' 'libx11' 'glproto' 'libdrm' 'dri2proto' 'dri3proto' 'presentproto' 
              'libxshmfence' 'libxxf86vm'  'libxdamage' 'libvdpau' 'wayland' 'elfutils' 'llvm' 'systemd'
diff --git a/extra/mkvtoolnix/PKGBUILD b/extra/mkvtoolnix/PKGBUILD
index 0dc6f95cb..39c13e6c2 100644
--- a/extra/mkvtoolnix/PKGBUILD
+++ b/extra/mkvtoolnix/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 211782 2014-04-26 08:25:50Z giovanni $
+# $Id: PKGBUILD 215084 2014-06-13 13:21:08Z giovanni $
 # Maintainer: Giovanni Scafora <giovanni@archlinux.org>
 # Contributor: xduugu <xduugu@gmx.com>
 
 pkgbase=mkvtoolnix
 pkgname=('mkvtoolnix-cli' 'mkvtoolnix-gtk')
-pkgver=6.9.1
+pkgver=7.0.0
 pkgrel=1
 arch=('i686' 'x86_64')
 license=('GPL')
@@ -12,7 +12,7 @@ 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.xz")
-md5sums=('428e4609aabfe2f967e8ae4d7be55e15')
+md5sums=('ddd5ce6288d2fdaa6b79cb6d7bfffb04')
 
 prepare() {
   cd "${srcdir}/${pkgbase}-${pkgver}"
diff --git a/extra/perl-net-dns/PKGBUILD b/extra/perl-net-dns/PKGBUILD
index 64f3ae18b..2c8d0960f 100644
--- a/extra/perl-net-dns/PKGBUILD
+++ b/extra/perl-net-dns/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 215054 2014-06-12 03:05:13Z fyan $
+# $Id: PKGBUILD 215099 2014-06-14 03:49:47Z fyan $
 # Maintainer: Felix Yan <felixonmars@gmail.com>
 
 pkgname=perl-net-dns
-pkgver=0.76_2
+pkgver=0.77
 pkgrel=1
 pkgdesc="Perl Module: Interface to the DNS resolver"
 arch=('i686' 'x86_64')
@@ -14,7 +14,7 @@ optdepends=('perl-io-socket-inet6: IPv6 support'
             'perl-socket6: IPv6 support')
 options=('!emptydirs')
 source=(http://www.cpan.org/authors/id/N/NL/NLNETLABS/Net-DNS-$pkgver.tar.gz)
-sha1sums=('93a79f281c2a731020959cc28630fa20128b18d0')
+sha1sums=('e2264580ba9fa1d13104d41239c317570de9807e')
 
 build() {
   cd Net-DNS-${pkgver}
diff --git a/extra/php-apcu/PKGBUILD b/extra/php-apcu/PKGBUILD
index aeb0286ba..0d6a166df 100644
--- a/extra/php-apcu/PKGBUILD
+++ b/extra/php-apcu/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 207394 2014-03-08 15:50:15Z pierre $
+# $Id: PKGBUILD 215109 2014-06-14 10:57:01Z pierre $
 # Maintainer: Pierre Schmitz <pierre@archlinux.de>
 
 pkgname=php-apcu
-pkgver=4.0.4
-pkgrel=1
+pkgver=4.0.6
+pkgrel=2
 arch=('i686' 'x86_64')
 pkgdesc='A userland caching module for PHP'
 url='http://pecl.php.net/package/APCu'
@@ -14,7 +14,7 @@ provides=("php-apc=${pkgver}")
 license=('PHP')
 source=("http://pecl.php.net/get/apcu-$pkgver.tgz")
 backup=('etc/php/conf.d/apcu.ini')
-md5sums=('a7696b1c351d9bd1592b7840701f5bf7')
+md5sums=('cf7f1a751c4f3ecd1bb8f985be4de09b')
 
 build() {
 	cd $srcdir/apcu-$pkgver
@@ -23,17 +23,18 @@ build() {
 	make
 }
 
-# check() {
-# 	cd $srcdir/apcu-$pkgver
-# 	printf "n\n" | make test
-# 	echo
-# }
+check() {
+	cd $srcdir/apcu-$pkgver
+	export NO_INTERACTION=1
+	make test
+	echo
+}
 
 package() {
 	cd $srcdir/apcu-$pkgver
 	make INSTALL_ROOT=$pkgdir install
 	echo ';extension=apcu.so' > apcu.ini
 	install -D -m644 apcu.ini $pkgdir/etc/php/conf.d/apcu.ini
-	install -D -m644 apc.php $pkgdir/usr/share/php-apcu/apc.php
+	install -D -m644 apc.php $pkgdir/usr/share/webapps/php-apcu/apc.php
 	install -D -m644 INSTALL $pkgdir/usr/share/doc/php-apcu/install.txt
 }
diff --git a/extra/php-xcache/PKGBUILD b/extra/php-xcache/PKGBUILD
index 22393296e..cb0bccb8f 100644
--- a/extra/php-xcache/PKGBUILD
+++ b/extra/php-xcache/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 196293 2013-10-11 06:26:09Z pierre $
+# $Id: PKGBUILD 215107 2014-06-14 10:56:09Z pierre $
 # Maintainer: Pierre Schmitz <pierre@archlinux.de>
 
 pkgname=php-xcache
 pkgver=3.1.0
-pkgrel=1
+pkgrel=2
 arch=('i686' 'x86_64')
 pkgdesc='A PHP opcode cacher'
 url='http://xcache.lighttpd.net/'
@@ -22,11 +22,12 @@ build() {
 	make
 }
 
-# check() {
-# 	cd $srcdir/xcache-$pkgver
-# 	printf "n\n" | make test
-# 	echo
-# }
+check() {
+	cd $srcdir/xcache-$pkgver
+	export NO_INTERACTION=1
+	make test
+	echo
+}
 
 package() {
 	cd $srcdir/xcache-$pkgver
@@ -34,8 +35,8 @@ package() {
 
 	install -Dm644 $srcdir/xcache.ini $pkgdir/etc/php/conf.d/xcache.ini
 
-	install -dm755 $pkgdir/usr/share/php-xcache/admin
-	cp -r htdocs/* $pkgdir/usr/share/php-xcache/admin/
+	install -dm755 $pkgdir/usr/share/webapps/php-xcache
+	cp -r htdocs/* $pkgdir/usr/share/webapps/php-xcache/
 
 	install -Dm644 COPYING $pkgdir/usr/share/licenses/php-xcache/COPYING
 }
diff --git a/extra/pyqt4/PKGBUILD b/extra/pyqt4/PKGBUILD
index a859d46b4..2a6635557 100644
--- a/extra/pyqt4/PKGBUILD
+++ b/extra/pyqt4/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 208888 2014-03-28 06:10:07Z fyan $
+# $Id: PKGBUILD 215219 2014-06-16 21:35:22Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Douglas Soares de Andrade <douglas@archlinux.org>
 # Contributor: riai <riai@bigfoot.com> Ben <ben@benmazer.net>
 
 pkgbase=pyqt4
 pkgname=('pyqt4-common' 'python-pyqt4' 'python2-pyqt4')
-pkgver=4.10.4
+pkgver=4.11
 pkgrel=2
 arch=('i686' 'x86_64')
 url='http://www.riverbankcomputing.com/software/pyqt/intro'
@@ -13,13 +13,13 @@ license=('GPL')
 makedepends=('python-sip' 'python-dbus' 'python2-sip' 'phonon' 'mesa'
              'python2-opengl' 'qt-assistant-compat' 'qtwebkit' 'python2-dbus')
 source=("http://downloads.sourceforge.net/pyqt/PyQt-x11-gpl-${pkgver}.tar.gz")
-md5sums=('20940f6b2c957269cdd02d0efe537515')
+md5sums=('8b991f95fec9582cdcc1bf1f4ac02406')
 
 build() {
   cp -r PyQt-x11-gpl-${pkgver} Py2Qt-x11-gpl-${pkgver}
 
   cd PyQt-x11-gpl-${pkgver}
-  python configure.py \
+  python configure-ng.py \
     --confirm-license \
     --qsci-api \
     -q /usr/bin/qmake-qt4
@@ -31,7 +31,7 @@ build() {
 
   ### Python2 version ###
   cd ../Py2Qt-x11-gpl-${pkgver}
-  python2 configure.py \
+  python2 configure-ng.py \
     --confirm-license \
     -v /usr/share/sip \
     --qsci-api \
@@ -51,8 +51,8 @@ package_pyqt4-common(){
   provides=("pyqt-common=${pkgver}")
 
   cd PyQt-x11-gpl-${pkgver}
-  make -C pyrcc DESTDIR="${pkgdir}" install
-  make -C pylupdate DESTDIR="${pkgdir}" install
+  make -C pyrcc INSTALL_ROOT="${pkgdir}" install
+  make -C pylupdate INSTALL_ROOT="${pkgdir}" install
 
   install -Dm644 PyQt4.api "${pkgdir}"/usr/share/qt4/qsci/api/python/PyQt4.api
 }
diff --git a/extra/pyqt5/PKGBUILD b/extra/pyqt5/PKGBUILD
index dbfe4e387..45bb2a420 100644
--- a/extra/pyqt5/PKGBUILD
+++ b/extra/pyqt5/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 208890 2014-03-28 06:38:37Z fyan $
+# $Id: PKGBUILD 215132 2014-06-14 15:46:49Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Yichao Yu <yyc1992@gmail.com>
 # Contributor: Douglas Soares de Andrade <douglas@archlinux.org>
@@ -7,8 +7,8 @@
 pkgbase=pyqt5
 pkgname=pyqt5
 pkgname=('pyqt5-common' 'python-pyqt5' 'python2-pyqt5')
-pkgver=5.2.1
-pkgrel=2
+pkgver=5.3
+pkgrel=1
 arch=('i686' 'x86_64')
 url="http://riverbankcomputing.co.uk/software/pyqt/intro"
 license=('GPL')
@@ -16,7 +16,7 @@ makedepends=('python-sip' 'python2-sip' 'python-opengl' 'python2-opengl'
              'python2-dbus' 'python-dbus' 'qt5-multimedia' 'qt5-tools'
              'qt5-svg' 'qt5-serialport')
 source=("http://downloads.sourceforge.net/project/pyqt/PyQt5/PyQt-${pkgver}/PyQt-gpl-${pkgver}.tar.gz")
-md5sums=('8ab34b17b7d76ad613ff3af3c59e0c20')
+md5sums=('1e00c13e3627a3568d7f7dbc608c6525')
 
 build() {
   cp -r PyQt-gpl-${pkgver} Py2Qt-gpl-${pkgver}
diff --git a/extra/refind-efi/PKGBUILD b/extra/refind-efi/PKGBUILD
index 7bbaa00d2..25f94332c 100644
--- a/extra/refind-efi/PKGBUILD
+++ b/extra/refind-efi/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 213910 2014-05-31 11:41:33Z tpowa $
+# $Id: PKGBUILD 215215 2014-06-16 18:49:42Z tpowa $
 # Maintainer: Tobias Powalowski <tpowa@archlinux.org>
 # Contributor: Keshav Amburay <(the ddoott ridikulus ddoott rat) (aatt) (gemmaeiil) (ddoott) (ccoomm)>
 
@@ -13,7 +13,7 @@ _USE_GNU_EFI="1"
 #######
 
 pkgname="refind-efi"
-pkgver="0.8.1"
+pkgver="0.8.2"
 pkgrel="1"
 pkgdesc="Rod Smith's fork of rEFIt UEFI Boot Manager"
 url="http://www.rodsbooks.com/refind/index.html"
@@ -31,6 +31,9 @@ install="${pkgname}.install"
 source=("http://downloads.sourceforge.net/refind/refind-src-${pkgver}.zip"
         'refind_linux.conf')
 
+md5sums=('3752afeca886c9c9d9176490a35cd1f5'
+         '12ce3e22a216e7b25c253478a34713b4')
+
 if [[ "${_USE_GNU_EFI}" == "1" ]]; then
 	
 	pkgdesc="${pkgdesc} - Built with GNU-EFI libs"
@@ -57,8 +60,6 @@ else
 	
 fi
 
-md5sums=('9bb5181bab8700a32a6ab835a131e5c5'
-         '12ce3e22a216e7b25c253478a34713b4')
 
 _setup_tianocore_env_vars() {
 	
diff --git a/extra/sbcl/PKGBUILD b/extra/sbcl/PKGBUILD
index 84d742016..1bdc20c58 100644
--- a/extra/sbcl/PKGBUILD
+++ b/extra/sbcl/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 213412 2014-05-23 10:44:45Z juergen $
+# $Id: PKGBUILD 215191 2014-06-16 09:52:50Z juergen $
 # Contributor: John Proctor <jproctor@prium.net>
 # Contributor: Daniel White <daniel@whitehouse.id.au>
 # Maintainer: Juergen Hoetzel <juergen@archlinux.org>
 # Contributor: Leslie Polzer (skypher)
 
 pkgname=sbcl
-pkgver=1.1.18
+pkgver=1.2.0
 pkgrel=1
 pkgdesc="Steel Bank Common Lisp"
 url="http://www.sbcl.org/"
@@ -17,7 +17,7 @@ makedepends=('sbcl')
 install=sbcl.install
 source=("http://downloads.sourceforge.net/project/sbcl/sbcl/$pkgver/$pkgname-$pkgver-source.tar.bz2"
   "arch-fixes.lisp")
-md5sums=('4dc4e8d8a5111ee4a689ab1a5db65f7d'
+md5sums=('9d370876cd190f952fbfd421784f8003'
          '7ac0c1936547f4278198b8bf7725204d')
 
 
diff --git a/extra/sip/PKGBUILD b/extra/sip/PKGBUILD
index 366383dd3..6b0fbcaca 100644
--- a/extra/sip/PKGBUILD
+++ b/extra/sip/PKGBUILD
@@ -1,18 +1,18 @@
-# $Id: PKGBUILD 208863 2014-03-27 14:43:43Z fyan $
+# $Id: PKGBUILD 215130 2014-06-14 15:40:02Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Douglas Soares de Andrade <douglas@archlinux.org>
 # Contributor: riai <riai@bigfoot.com>, Ben <ben@benmazer.net>
 
 pkgbase=sip
 pkgname=('sip' 'python-sip' 'python2-sip')
-pkgver=4.15.5
-pkgrel=2
+pkgver=4.16.1
+pkgrel=1
 arch=('i686' 'x86_64')
 url='http://www.riverbankcomputing.com/software/sip/intro'
 license=('custom:"sip"')
 makedepends=('python' 'python2')
 source=("http://downloads.sourceforge.net/pyqt/${pkgbase}-${pkgver}.tar.gz")
-md5sums=('4c95447c7b0391b7f183cf9f92ae9bc6')
+md5sums=('e41fecec1b35b7b9d158aed464786813')
 
 build() {
   cp -r ${pkgbase}-${pkgver} python2-${pkgbase}-${pkgver}
diff --git a/extra/tracker/PKGBUILD b/extra/tracker/PKGBUILD
index f645a6718..7584569ac 100644
--- a/extra/tracker/PKGBUILD
+++ b/extra/tracker/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 212168 2014-05-09 17:03:34Z jgc $
+# $Id: PKGBUILD 215169 2014-06-14 19:17:22Z andyrtr $
 # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
 # Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Alexander Fehr <pizzapunk gmail com>
@@ -6,7 +6,7 @@
 pkgbase=tracker
 pkgname=(tracker libtracker-sparql)
 pkgver=1.0.1
-pkgrel=1
+pkgrel=2
 pkgdesc="All-in-one indexer, search tool and metadata database"
 arch=(i686 x86_64)
 license=(GPL)
@@ -17,8 +17,15 @@ makedepends=(libgee libsecret upower libexif exempi
              taglib libvorbis flac vala libgxps libnautilus-extension libmediaart)
 url="http://www.gnome.org"
 options=('!emptydirs')
-source=(http://ftp.gnome.org/pub/gnome/sources/$pkgbase/${pkgver:0:3}/$pkgbase-$pkgver.tar.xz)
-sha256sums=('76e7918e62526a8209f9c9226f82abe592a6332826ac7c12e6e405063181e889')
+source=(http://ftp.gnome.org/pub/gnome/sources/$pkgbase/${pkgver:0:3}/$pkgbase-$pkgver.tar.xz
+        tracker-1.0.1-giflib-5.1.0.patch)
+sha256sums=('76e7918e62526a8209f9c9226f82abe592a6332826ac7c12e6e405063181e889'
+            'b5440e8129256a315f932229e9a25a3586b9dfdc3505bd2c018351573345b0bc')
+
+prepare() {
+  cd $pkgbase-$pkgver
+  patch -p1 -i ../tracker-1.0.1-giflib-5.1.0.patch
+}
 
 build() {
   cd $pkgbase-$pkgver
diff --git a/extra/tracker/tracker-1.0.1-giflib-5.1.0.patch b/extra/tracker/tracker-1.0.1-giflib-5.1.0.patch
new file mode 100644
index 000000000..d6fa2d64a
--- /dev/null
+++ b/extra/tracker/tracker-1.0.1-giflib-5.1.0.patch
@@ -0,0 +1,12 @@
+diff -rupN a/src/tracker-extract/tracker-extract-gif.c b/src/tracker-extract/tracker-extract-gif.c
+--- a/src/tracker-extract/tracker-extract-gif.c	2014-05-08 15:48:22.000000000 +0200
++++ b/src/tracker-extract/tracker-extract-gif.c	2014-06-01 13:35:37.407254708 +0200
+@@ -684,7 +684,7 @@ tracker_extract_get_metadata (TrackerExt
+ 
+ 	g_free (uri);
+ 
+-	if (DGifCloseFile (gifFile) != GIF_OK) {
++	if (DGifCloseFile (gifFile, NULL) != GIF_OK) {
+ #if GIFLIB_MAJOR < 5
+ 		print_gif_error ();
+ #else  /* GIFLIB_MAJOR < 5 */
diff --git a/extra/vc/PKGBUILD b/extra/vc/PKGBUILD
index 5ac53741f..683abbadd 100644
--- a/extra/vc/PKGBUILD
+++ b/extra/vc/PKGBUILD
@@ -1,18 +1,18 @@
-# $Id: PKGBUILD 197134 2013-10-22 12:37:05Z andrea $
+# $Id: PKGBUILD 215221 2014-06-16 21:35:56Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: PedsXing <pedsxing at gmx dot net>
 
 pkgname=vc
-pkgver=0.7.3
-pkgrel=3
+pkgver=0.7.4
+pkgrel=1
 pkgdesc="A library to ease explicit vectorization of C++ code"
 url='http://code.compeng.uni-frankfurt.de/projects/vc/'
 arch=('x86_64' 'i686')
 license=('LGPL3')
 makedepends=('cmake')
-options=('staticlibs')
-source=("http://code.compeng.uni-frankfurt.de/attachments/download/174/Vc-${pkgver}.tar.gz")
-md5sums=('a55e2871a33dbcbbe444c22ccef47dbd')
+options=('staticlibs') # only builds a static library
+source=("http://code.compeng.uni-frankfurt.de/attachments/download/183/Vc-${pkgver}.tar.gz")
+md5sums=('b11f0c6925f64a4ce178d3b8f0c282f8')
 
 prepare() {
   mkdir build
@@ -26,10 +26,10 @@ build() {
   make
 }
 
-check() {
-  cd build
-  make test
-}
+#check() {
+#  cd build
+#  make test
+#}
 
 package() {
   cd build
diff --git a/extra/vice/PKGBUILD b/extra/vice/PKGBUILD
index 7068e569c..376ecb759 100644
--- a/extra/vice/PKGBUILD
+++ b/extra/vice/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 205562 2014-02-07 16:53:54Z giovanni $
+# $Id: PKGBUILD 215170 2014-06-14 19:17:24Z andyrtr $
 # Maintainer: Giovanni Scafora <giovanni@archlinux.org>
 # Contributor: Tom Newsom <Jeepster@gmx.co.uk>
 
 pkgname=vice
 pkgver=2.4
-pkgrel=5
+pkgrel=6
 pkgdesc="The Versatile Commodore 8-bit Emulator"
 arch=('i686' 'x86_64')
 license=('GPL')
@@ -17,12 +17,14 @@ source=("http://downloads.sourceforge.net/project/vice-emu/releases/${pkgname}-$
         'vice-2.4-x11video.patch'
         'vice-2.4-no-fc-cache-no-lib64.patch'
         'vice-2.4-notexi-notxt.patch'
-        'vice-2.4-zlib-1.2.7.patch')
+        'vice-2.4-zlib-1.2.7.patch'
+        'vice-2.4-giflib-5.1.0.patch')
 md5sums=('b017647a0c159bbe43cdb81762d1c577'
          '99931efcb779734c9df069e94f0b38a5'
          'b0d1392664decd3169740baf90661710'
          '877f93db1550ea81386aae7c3b578442'
-         '9d9f62f05a967a5926df496e86404148')
+         '9d9f62f05a967a5926df496e86404148'
+         '94563e3023d804341f1d252c0e6d1384')
 
 prepare() {
   cd ${pkgname}-${pkgver}
@@ -31,6 +33,7 @@ prepare() {
   patch -Np1 -i "${srcdir}/vice-2.4-no-fc-cache-no-lib64.patch"
   patch -Np1 -i "${srcdir}/vice-2.4-notexi-notxt.patch"
   patch -Np1 -i "${srcdir}/vice-2.4-zlib-1.2.7.patch"
+  patch -Np1 -i "${srcdir}/vice-2.4-giflib-5.1.0.patch"
 
   sed -i 's/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/' configure.in
 
diff --git a/extra/vice/vice-2.4-giflib-5.1.0.patch b/extra/vice/vice-2.4-giflib-5.1.0.patch
new file mode 100644
index 000000000..be1caa898
--- /dev/null
+++ b/extra/vice/vice-2.4-giflib-5.1.0.patch
@@ -0,0 +1,39 @@
+diff -rupN a/src/gfxoutputdrv/gifdrv.c b/src/gfxoutputdrv/gifdrv.c
+--- a/src/gfxoutputdrv/gifdrv.c	2012-07-25 23:46:05.000000000 +0000
++++ b/src/gfxoutputdrv/gifdrv.c	2014-06-01 11:48:40.493722851 +0000
+@@ -114,7 +114,7 @@ static int gifdrv_open(screenshot_t *scr
+   if (EGifPutScreenDesc(sdata->fd, screenshot->width, screenshot->height, 8, 0, gif_colors) == GIF_ERROR ||
+       EGifPutImageDesc(sdata->fd, 0, 0, screenshot->width, screenshot->height, 0, NULL) == GIF_ERROR)
+   {
+-    EGifCloseFile(sdata->fd);
++    EGifCloseFile(sdata->fd, NULL);
+     VICE_FreeMapObject(gif_colors);
+     lib_free(sdata->data);
+     lib_free(sdata->ext_filename);
+@@ -145,7 +145,7 @@ static int gifdrv_close(screenshot_t *sc
+ 
+     sdata = screenshot->gfxoutputdrv_data;
+ 
+-    EGifCloseFile(sdata->fd);
++    EGifCloseFile(sdata->fd, NULL);
+     VICE_FreeMapObject(gif_colors);
+ 
+     /* for some reason giflib will create a file with unexpected
+@@ -184,7 +184,7 @@ static char *gifdrv_memmap_ext_filename;
+ 
+ static int gifdrv_close_memmap(void)
+ {
+-  EGifCloseFile(gifdrv_memmap_fd);
++  EGifCloseFile(gifdrv_memmap_fd, NULL);
+   VICE_FreeMapObject(gif_colors);
+   lib_free(gifdrv_memmap_ext_filename);
+ 
+@@ -231,7 +231,7 @@ static int gifdrv_open_memmap(const char
+   if (EGifPutScreenDesc(gifdrv_memmap_fd, x_size, y_size, 8, 0, gif_colors) == GIF_ERROR ||
+       EGifPutImageDesc(gifdrv_memmap_fd, 0, 0, x_size, y_size, 0, NULL) == GIF_ERROR)
+   {
+-    EGifCloseFile(gifdrv_memmap_fd);
++    EGifCloseFile(gifdrv_memmap_fd, NULL);
+     VICE_FreeMapObject(gif_colors);
+     lib_free(gifdrv_memmap_ext_filename);
+     return -1;
diff --git a/extra/windowmaker/PKGBUILD b/extra/windowmaker/PKGBUILD
index 08a557b18..4fa5e3a6a 100644
--- a/extra/windowmaker/PKGBUILD
+++ b/extra/windowmaker/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 204765 2014-01-26 14:35:19Z andyrtr $
+# $Id: PKGBUILD 215171 2014-06-14 19:17:25Z andyrtr $
 # Maintainer: Daniel Isenmann <daniel@archlinux.org>
 # Contributor: Judd Vinet <jvinet@zeroflux.org>
 
 pkgname=windowmaker
 pkgver=0.95.5
-pkgrel=3
+pkgrel=4
 pkgdesc="An X11 window manager with a NEXTSTEP look and feel"
 arch=('i686' 'x86_64')
 url="http://www.windowmaker.org/"
@@ -12,14 +12,20 @@ license=('GPL' 'custom')
 depends=('libxinerama' 'libxrandr' 'libxmu' 'libpng' 'libxpm' 'libxft' 'libtiff' 'giflib')
 source=(http://windowmaker.org/pub/source/release/WindowMaker-$pkgver.tar.gz
         wmaker.desktop
-        wm-giflib.patch)
+        wm-giflib.patch
+        giflib_510.diff)
 md5sums=('19e9cc256ccb7075ff82f4b809df3a0a'
          '2fba97bebfd691836b92b8f0db79ff13'
-         '05d8e98fb579f2fa5a097b629374e6b8')
+         '05d8e98fb579f2fa5a097b629374e6b8'
+         '9eee694ecec55a5185e421bac9170344')
 
 prepare() {
   cd WindowMaker-$pkgver
-  patch -Np0 -i ../wm-giflib.patch
+  #patch -Np0 -i ../wm-giflib.patch
+  
+  # patch taken from NetBSD
+  patch -Np0 -i ../giflib_510.diff
+  
   autoreconf -fi
   
   # fix some paths FS#3080 - ckeck also Gentoo ebuild
diff --git a/extra/windowmaker/giflib_510.diff b/extra/windowmaker/giflib_510.diff
new file mode 100644
index 000000000..ffc6ec779
--- /dev/null
+++ b/extra/windowmaker/giflib_510.diff
@@ -0,0 +1,54 @@
+$NetBSD: patch-wrlib_gif.c,v 1.2 2014/05/16 09:29:39 tron Exp $
+
+Fix build with giflib 5.1 and newer.
+
+--- wrlib/gif.c.orig	2013-09-12 22:43:54.000000000 +0100
++++ wrlib/gif.c	2014-05-16 10:10:04.000000000 +0100
+@@ -52,6 +52,7 @@
+ 	unsigned char rmap[256];
+ 	unsigned char gmap[256];
+ 	unsigned char bmap[256];
++	int gif_error;
+ 
+ 	if (index < 0)
+ 		index = 0;
+@@ -59,10 +60,10 @@
+ 	/* default error message */
+ 	RErrorCode = RERR_BADINDEX;
+ 
+-	gif = DGifOpenFileName(file);
++	gif = DGifOpenFileName(file, &gif_error);
+ 
+ 	if (!gif) {
+-		switch (GifLastError()) {
++		switch (gif_error) {
+ 		case D_GIF_ERR_OPEN_FAILED:
+ 			RErrorCode = RERR_OPEN;
+ 			break;
+@@ -77,7 +78,7 @@
+ 	}
+ 
+ 	if (gif->SWidth < 1 || gif->SHeight < 1) {
+-		DGifCloseFile(gif);
++		DGifCloseFile(gif, NULL);
+ 		RErrorCode = RERR_BADIMAGEFILE;
+ 		return NULL;
+ 	}
+@@ -199,7 +200,7 @@
+ 	/* yuck! */
+ 	goto did_not_get_any_errors;
+  giferr:
+-	switch (GifLastError()) {
++	switch (gif->Error) {
+ 	case D_GIF_ERR_OPEN_FAILED:
+ 		RErrorCode = RERR_OPEN;
+ 		break;
+@@ -220,7 +221,7 @@
+ 		free(buffer);
+ 
+ 	if (gif)
+-		DGifCloseFile(gif);
++		DGifCloseFile(gif, NULL);
+ 
+ 	return image;
+ }
diff --git a/extra/xcb-util-renderutil/PKGBUILD b/extra/xcb-util-renderutil/PKGBUILD
index b6efdc470..a73f9ff35 100644
--- a/extra/xcb-util-renderutil/PKGBUILD
+++ b/extra/xcb-util-renderutil/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 198494 2013-10-30 15:12:17Z allan $
+# $Id: PKGBUILD 215097 2014-06-13 17:16:50Z andyrtr $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 # Maintainer: Andreas Radke <andyrtr@archlinux.org>
 
 pkgname=xcb-util-renderutil
-pkgver=0.3.8
+pkgver=0.3.9
 pkgrel=1
 pkgdesc="Utility libraries for XC Binding - Convenience functions for the Render extension"
 arch=('i686' 'x86_64')
@@ -13,22 +13,22 @@ depends=('libxcb>=1.7')
 makedepends=('xorg-util-macros')
 source=("http://xcb.freedesktop.org/dist/${pkgname}-${pkgver}.tar.bz2"
         'LICENSE')
-md5sums=('b346ff598ee093c141f836fbc0f8f721'
-         '2672c2e72dedb40f773e989dd622f298')
+sha256sums=('c6e97e48fb1286d6394dddb1c1732f00227c70bd1bedb7d1acabefdd340bea5b'
+            'ded299aa179dcf0d885bf89274a4db77a530e03f9f5e7cf1c3c4ef1d60e914b9')
 
 build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
+  cd ${pkgname}-${pkgver}
   ./configure --prefix=/usr --disable-static
   make
 }
 
 check() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
+  cd ${pkgname}-${pkgver}
   make check
 }
 
 package() { 
-  cd "${srcdir}/${pkgname}-${pkgver}"
+  cd ${pkgname}-${pkgver}
   make DESTDIR="${pkgdir}" install
 
   install -D -m644 "${srcdir}/LICENSE" \
diff --git a/extra/xf86-video-intel/PKGBUILD b/extra/xf86-video-intel/PKGBUILD
index a72065549..7513ad375 100644
--- a/extra/xf86-video-intel/PKGBUILD
+++ b/extra/xf86-video-intel/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 209836 2014-04-05 17:16:44Z lcarlier $
+# $Id: PKGBUILD 215142 2014-06-14 17:44:53Z andyrtr $
 # Maintainer: AndyRTR <andyrtr@archlinux.org>
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=xf86-video-intel
-pkgver=2.99.911
-pkgrel=2
+pkgver=2.99.912
+pkgrel=1
 arch=(i686 x86_64)
 url="http://xorg.freedesktop.org/"
 license=('custom')
@@ -23,16 +23,8 @@ provides=('xf86-video-intel-uxa' 'xf86-video-intel-sna')
 conflicts=('xorg-server<1.15.0' 'X-ABI-VIDEODRV_VERSION<15' 'X-ABI-VIDEODRV_VERSION>=16'
            'xf86-video-intel-sna' 'xf86-video-intel-uxa' 'xf86-video-i810' 'xf86-video-intel-legacy')
 groups=('xorg-drivers' 'xorg')
-source=(${url}/archive/individual/driver/${pkgname}-${pkgver}.tar.bz2
-        sna-avoid-discarding-damage.patch)
-sha256sums=('4e7a68491bcc4d49912c5ec3ee688badce3f929ce1b7618ede9d8001827270d6'
-            '122637d66a70d40b098b0bb732000c8227ea1dd155af0c71f605f87934822dcb')
-
-prepare() {
-  cd ${pkgname}-${pkgver}
-  # Fix FS#39747 (merged upstream)
-  patch -Np1 -i ../sna-avoid-discarding-damage.patch
-}
+source=(${url}/archive/individual/driver/${pkgname}-${pkgver}.tar.bz2)
+sha256sums=('7c8ffc492d59f34cac64093deb70717b4d9223cf416ecc6fa016ab2e8bde9501')
 
 build() {
   cd ${pkgname}-${pkgver}
diff --git a/extra/xf86-video-intel/sna-avoid-discarding-damage.patch b/extra/xf86-video-intel/sna-avoid-discarding-damage.patch
deleted file mode 100644
index 8e97ee591..000000000
--- a/extra/xf86-video-intel/sna-avoid-discarding-damage.patch
+++ /dev/null
@@ -1,103 +0,0 @@
-From 3310ee89c1f1a663de5f5b12b8125809a213996f Mon Sep 17 00:00:00 2001
-From: Chris Wilson <chris@chris-wilson.co.uk>
-Date: Sat, 05 Apr 2014 11:18:31 +0000
-Subject: sna: Avoid discarding damage when applying WHOLE hint to pixmap migration
-
-Once again, we must be careful when promoting from a region to whole
-pixmap migration that we do not discard required damage.
-
-Fixes regression from
-commit 27ac9f574f65cbd535751c925e9b2e2d7c8a6b3a [2.99.911]
-Author: Chris Wilson <chris@chris-wilson.co.uk>
-Date:   Thu Feb 27 08:33:52 2014 +0000
-
-    sna: Avoid promoting region-to-whole migration and discarding damage
-
-Reported-by: gedgon@gmail.com
-Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=77063
-Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
----
-diff --git a/src/sna/sna_accel.c b/src/sna/sna_accel.c
-index 0116d54..71ba34d 100644
---- a/src/sna/sna_accel.c
-+++ b/src/sna/sna_accel.c
-@@ -2500,7 +2500,10 @@ sna_drawable_move_region_to_cpu(DrawablePtr drawable,
- 		flags |= MOVE_INPLACE_HINT;
- 	}
- 
--	if (flags & MOVE_WHOLE_HINT && priv->gpu_damage == NULL)
-+	if ((flags & (MOVE_WHOLE_HINT | MOVE_READ)) == (MOVE_WHOLE_HINT | MOVE_READ))
-+		return _sna_pixmap_move_to_cpu(pixmap, flags);
-+
-+	if (flags & MOVE_WHOLE_HINT && priv->gpu_damage == NULL && priv->cpu_damage == NULL)
- 		return _sna_pixmap_move_to_cpu(pixmap, flags);
- 
- 	if (priv->gpu_damage == NULL &&
-@@ -2527,22 +2530,18 @@ sna_drawable_move_region_to_cpu(DrawablePtr drawable,
- 		return _sna_pixmap_move_to_cpu(pixmap, flags);
- 	}
- 
--	if ((flags & MOVE_READ) == 0 &&
--	    priv->gpu_damage &&
--	    region_subsumes_damage(region, priv->gpu_damage)) {
--		DBG(("%s: region [(%d, %d), (%d, %d)] subsumes damage [(%d,%d), (%d, %d)]\n",
-+	if (flags & MOVE_WHOLE_HINT) {
-+		DBG(("%s: region (%d, %d), (%d, %d) marked with WHOLE hint, pixmap %dx%d\n",
- 		       __FUNCTION__,
- 		       region->extents.x1,
- 		       region->extents.y1,
- 		       region->extents.x2,
- 		       region->extents.y2,
--		       priv->gpu_damage->extents.x1,
--		       priv->gpu_damage->extents.y1,
--		       priv->gpu_damage->extents.x2,
--		       priv->gpu_damage->extents.y2));
-+		       pixmap->drawable.width,
-+		       pixmap->drawable.height));
- 		if (dx | dy)
- 			RegionTranslate(region, -dx, -dy);
--		return _sna_pixmap_move_to_cpu(pixmap, flags);
-+		return _sna_pixmap_move_to_cpu(pixmap, flags | MOVE_READ);
- 	}
- 
- 	if (priv->move_to_gpu && !priv->move_to_gpu(sna, priv, MOVE_READ)) {
-@@ -4471,17 +4470,19 @@ try_upload_tiled_x(PixmapPtr pixmap, RegionRec *region,
- 	if (wedged(sna))
- 		return false;
- 
--	DBG(("%s: bo? %d, can map? %d\n", __FUNCTION__,
--	     priv->gpu_bo != NULL,
--	     priv->gpu_bo ? kgem_bo_can_map__cpu(&sna->kgem, priv->gpu_bo, true) : 0));
--
- 	replaces = region->data == NULL &&
- 		w >= pixmap->drawable.width &&
- 		h >= pixmap->drawable.height;
- 
-+	DBG(("%s: bo? %d, can map? %d, replaces? %d\n", __FUNCTION__,
-+	     priv->gpu_bo != NULL,
-+	     priv->gpu_bo ? kgem_bo_can_map__cpu(&sna->kgem, priv->gpu_bo, true) : 0,
-+	     replaces));
-+
- 	if (priv->gpu_bo && (replaces || priv->gpu_bo->proxy)) {
- 		DBG(("%s: discarding cached upload proxy\n", __FUNCTION__));
- 		sna_pixmap_free_gpu(sna, priv);
-+		replaces = true; /* Mark it all GPU damaged afterwards */
- 	}
- 	assert(priv->gpu_bo == NULL || priv->gpu_bo->proxy == NULL);
- 
-@@ -4616,8 +4617,11 @@ sna_put_zpixmap_blt(DrawablePtr drawable, GCPtr gc, RegionPtr region,
- 		return true;
- 
- 	hint = MOVE_WRITE;
--	if (w == pixmap->drawable.width && h*stride > 4096)
-+	if (w == pixmap->drawable.width && (h+1)*stride > 65536) {
-+		DBG(("%s: large upload (%d bytes), marking WHOLE_HINT\n",
-+		     __FUNCTION__, h*stride));
- 		hint |= MOVE_WHOLE_HINT;
-+	}
- 
- 	if (!sna_drawable_move_region_to_cpu(&pixmap->drawable, region, hint))
- 		return false;
---
-cgit v0.9.0.2-2-gbebe
-
author	Nicolás Reynolds <fauno@endefensadelsl.org>	2014-06-17 03:27:11 +0000
committer	Nicolás Reynolds <fauno@endefensadelsl.org>	2014-06-17 03:27:11 +0000
commit	6459b84bf754eda5323f40eb7af76dde65b63251 (patch)
tree	81947a270848520d4cf2f9d1c5ce91ced54fcdff /extra
parent	942111e62628e9a5c4729563215b1cfb8911735e (diff)