rename libgraphite to graphite, switch to 2 branch, needed for latest libreoffice, prepared opengtl update, needs new llvm(calibre)

graphite/PKGBUILD

@@ -1,54 +1,41 @@
 #
 # Platform Packages for Chakra, part of chakra-project.org
 #
-# maintainer (i686): Phil Miller <philm[at]chakra-project[dog]org>
-# maintainer (x86_64): Manuel Tortosa <manutortosa[at]chakra-project[dot]org>
+# maintainer abveritas@chakra-project.org
 
-# build twice that pango-graphite can pickup the new libgraphite dependency - take care when .so names happen!
-
-pkgbase=graphite
-pkgname=('libgraphite' 'pango-graphite')
-pkgver=2.3.1
+pkgname=graphite
+pkgver=1.0.3
 pkgrel=1
 arch=('i686' 'x86_64')
 url="http://graphite.sil.org/"
-makedepends=('pango' 'gcc-libs')
+pkgdesc='reimplementation of the SIL Graphite text processing engine'
+license=('custom_SIL Dual license')
+depends=('gcc-libs')
+makedepends=('cmake' 'freetype2')
+replaces=('libgraphite' 'pango-graphite')
 options=('!libtool' '!emptydirs')
-source=(http://downloads.sourceforge.net/project/silgraphite/silgraphite/${pkgver}/silgraphite-${pkgver}.tar.gz)
-md5sums=('d35724900f6a4105550293686688bbb3')
+source=("http://downloads.sourceforge.net/project/silgraphite/graphite2/graphite2-${pkgver}.tgz")
+md5sums=('3bf481ca95109b14435125c0dd1f2217')
 
 build() {
-  cd "${srcdir}/silgraphite-${pkgver}"
-  pushd engine
-    ./configure --prefix=/usr --disable-static
-  make || return 1
-  popd
-  
-  pushd wrappers/pangographite
-  ./configure --prefix=/usr --disable-static
-  make || return 1
-  popd  
+  cd "${srcdir}"
+  mkdir build
+  cd build
+  cmake -G "Unix Makefiles" ../graphite2-${pkgver} \
+	-DCMAKE_INSTALL_PREFIX=/usr
+  make
 }
 
-package_libgraphite() {
- pkgdesc="SILGraphite - a \"smart font\" rendering engine - the libs and headers"
- license=('custom_SIL Dual license')
- depends=('gcc-libs')
+check() {
+  cd "${srcdir}"/build
+  ctest
+}
 
-  cd "${srcdir}/silgraphite-${pkgver}"/engine
-  make DESTDIR="$pkgdir/" install || return 1
+package() {
+  cd "${srcdir}"/build
+  make DESTDIR="$pkgdir/" install
 
   # licenses
   mkdir -p "${pkgdir}"/usr/share/licenses/${pkgname}
-  install -m644 license/*.txt "${pkgdir}"/usr/share/licenses/${pkgname}/
-}
-
-package_pango-graphite() {
- pkgdesc="SILGraphite support for pango"
- license=('LGPL')
- depends=('pango' 'libgraphite')
- install=pango-graphite.install
- 
-  cd "${srcdir}/silgraphite-${pkgver}"/wrappers/pangographite
-  make DESTDIR="$pkgdir/" install || return 1
+  install -m644 "${srcdir}"/graphite2-${pkgver}/COPYING "${pkgdir}"/usr/share/licenses/${pkgname}/
 }

opengtl/OpenGTL-0.9.14-fix-link.patch

@@ -1,11 +0,0 @@
---- OpenGTL/GTLCore/CMakeLists.txt.link	2010-05-18 03:04:12.000000000 +0200
-+++ OpenGTL/GTLCore/CMakeLists.txt	2010-05-18 03:04:17.000000000 +0200
-@@ -125,7 +125,7 @@
- # Create GTLCore library
- add_library(GTLCore SHARED ${GTLCore_SRCS} ${llvm_objects})
- 
--target_link_libraries(GTLCore ${LLVM_LDFLAGS} ${LLVM_LIBS} )
-+target_link_libraries(GTLCore ${LLVM_LDFLAGS} ${LLVM_LIBS} dl)
- 
- # Set the ABI version of the library
- set_target_properties(GTLCore PROPERTIES VERSION ${OPENGTL_LIB_VERSION} SOVERSION ${OPENGTL_LIB_SOVERSION} )

opengtl/PKGBUILD

@@ -1,22 +1,20 @@
 #
 # Chakra Packages for Chakra, part of chakra-project.org
 #
-# maintainer (i686): Phil Miller <philm[at]chakra-project[dog]org>
-# maintainer (x86_64): Manuel Tortosa <manutortosa[at]chakra-project[dot]org>
+# maintainer abveritas@chakra-project.org
 
 pkgname=opengtl
-pkgver=0.9.15.1
-pkgrel=2
+pkgver=0.9.16
+pkgrel=1
 pkgdesc="A set of library for using and integrating transformation algorithms (such as filter or color conversion) in graphics applications"
 url="http://www.opengtl.org"
 arch=('i686' 'x86_64')
 license=('GPL')
-depends=('gcc-libs')
-makedepends=('cmake' 'llvm' 'libpng')
+depends=('gcc-libs' 'llvm')
+makedepends=('cmake' 'libpng')
 optdepends=('libpng: for using the png extension')
 source=(http://download.opengtl.org/OpenGTL-${pkgver}.tar.bz2)
-md5sums=('052fc8504ced601e356e4d20621699f7')
-sha1sums=('ddd25b1f5eb11ae0b438c67d5a2a73481e919a0a')
+sha1sums=('3cfe4a08e5778c13f7e74dfc822adb68f97ad048')
 
 build() {
   cd "${srcdir}"