[arch-commits] Commit in graphite/trunk (PKGBUILD)

2020-04-02 Thread Andreas Radke via arch-commits
Date: Thursday, April 2, 2020 @ 06:57:13
  Author: andyrtr
Revision: 379123

upgpkg: graphite 1:1.3.14-1: upstream update 1.3.14

Modified:
  graphite/trunk/PKGBUILD

--+
 PKGBUILD |7 ---
 1 file changed, 4 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2020-04-02 06:55:41 UTC (rev 379122)
+++ PKGBUILD2020-04-02 06:57:13 UTC (rev 379123)
@@ -1,8 +1,8 @@
 # Maintainer: AndyRTR 
 
 pkgname=graphite
-pkgver=1.3.13
-pkgrel=2
+pkgver=1.3.14
+pkgrel=1
 epoch=1
 arch=('x86_64')
 url="https://github.com/silnrsi/graphite;
@@ -14,8 +14,9 @@
  'doxygen' 'dblatex' 'graphviz' 'asciidoc')
 checkdepends=('python-fonttools')
 options=('!emptydirs')
+# 
https://github.com/silnrsi/graphite/releases/download/1.3.14/graphite2-1.3.14.sha256sum
 
source=(https://github.com/silnrsi/graphite/releases/download/${pkgver}/graphite2-${pkgver}.tgz)
-sha1sums=('bd3494575a1ff1c5b4ea796444274dab1e5992c9')
+sha256sums=('f99d1c13aa5fa296898a181dff9b82fb25f6cc0933dbaa7a475d8109bd54209d')
 
 
 build() {


[arch-commits] Commit in graphite/trunk (PKGBUILD)

2019-08-29 Thread Andreas Radke via arch-commits
Date: Thursday, August 29, 2019 @ 12:39:51
  Author: andyrtr
Revision: 361364

upgpkg: graphite 1:1.3.13-2

rebuild using python v3 to avoid confusion - FS#63589

Modified:
  graphite/trunk/PKGBUILD

--+
 PKGBUILD |   11 +--
 1 file changed, 1 insertion(+), 10 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2019-08-29 10:50:29 UTC (rev 361363)
+++ PKGBUILD2019-08-29 12:39:51 UTC (rev 361364)
@@ -2,7 +2,7 @@
 
 pkgname=graphite
 pkgver=1.3.13
-pkgrel=1
+pkgrel=2
 epoch=1
 arch=('x86_64')
 url="https://github.com/silnrsi/graphite;
@@ -18,13 +18,6 @@
 sha1sums=('bd3494575a1ff1c5b4ea796444274dab1e5992c9')
 
 
-prepare() {
-  cd "${srcdir}"
-
-  # python2 fixes
-#sed -i "s:\/usr\/bin\/python:\/usr\/bin\/python2:" 
graphite2-${pkgver}/tests/{corrupt.py,defuzz,fnttxtrender,hbspeeds,jsoncmp}
-}
-
 build() {
   mkdir build
   cd build
@@ -43,8 +36,6 @@
 
 check() {
   cd "${srcdir}"/build
-  # python2 fixes
-#  sed -i "s:python:python2:g" tests/CTestTestfile.cmake
   ctest || true
 }
 


[arch-commits] Commit in graphite/trunk (PKGBUILD)

2019-04-01 Thread Jelle van der Waa via arch-commits
Date: Monday, April 1, 2019 @ 14:04:37
  Author: jelle
Revision: 349526

testsuite supports python3

Switch to python3 for testing, as python2 is deprecated

Modified:
  graphite/trunk/PKGBUILD

--+
 PKGBUILD |8 
 1 file changed, 4 insertions(+), 4 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2019-04-01 13:44:22 UTC (rev 349525)
+++ PKGBUILD2019-04-01 14:04:37 UTC (rev 349526)
@@ -9,10 +9,10 @@
 pkgdesc='reimplementation of the SIL Graphite text processing engine'
 license=('LGPL' 'GPL' 'custom')
 depends=('gcc-libs')
-makedepends=('cmake' 'freetype2' 'python2'
+makedepends=('cmake' 'freetype2' 'python'
  # for documentation
  'doxygen' 'dblatex' 'graphviz' 'asciidoc')
-checkdepends=('python2-fonttools')
+checkdepends=('python-fonttools')
 options=('!emptydirs')
 
source=(https://github.com/silnrsi/graphite/releases/download/${pkgver}/graphite2-${pkgver}.tgz)
 sha1sums=('bd3494575a1ff1c5b4ea796444274dab1e5992c9')
@@ -22,7 +22,7 @@
   cd "${srcdir}"
 
   # python2 fixes
-  sed -i "s:\/usr\/bin\/python:\/usr\/bin\/python2:" 
graphite2-${pkgver}/tests/{corrupt.py,defuzz,fnttxtrender,hbspeeds,jsoncmp}
+#sed -i "s:\/usr\/bin\/python:\/usr\/bin\/python2:" 
graphite2-${pkgver}/tests/{corrupt.py,defuzz,fnttxtrender,hbspeeds,jsoncmp}
 }
 
 build() {
@@ -44,7 +44,7 @@
 check() {
   cd "${srcdir}"/build
   # python2 fixes
-  sed -i "s:python:python2:g" tests/CTestTestfile.cmake
+#  sed -i "s:python:python2:g" tests/CTestTestfile.cmake
   ctest || true
 }
 


[arch-commits] Commit in graphite/trunk (PKGBUILD)

2018-12-21 Thread Andreas Radke via arch-commits
Date: Friday, December 21, 2018 @ 16:59:33
  Author: andyrtr
Revision: 342646

upgpkg: graphite 1:1.3.13-1

upstream update 1.3.13

Modified:
  graphite/trunk/PKGBUILD

--+
 PKGBUILD |6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2018-12-21 15:52:15 UTC (rev 342645)
+++ PKGBUILD2018-12-21 16:59:33 UTC (rev 342646)
@@ -1,7 +1,7 @@
 # Maintainer: AndyRTR 
 
 pkgname=graphite
-pkgver=1.3.12
+pkgver=1.3.13
 pkgrel=1
 epoch=1
 arch=('x86_64')
@@ -15,7 +15,7 @@
 checkdepends=('python2-fonttools')
 options=('!emptydirs')
 
source=(https://github.com/silnrsi/graphite/releases/download/${pkgver}/graphite2-${pkgver}.tgz)
-sha1sums=('9efb65423924f0c204f7b208af8567ce1284cd8d')
+sha1sums=('bd3494575a1ff1c5b4ea796444274dab1e5992c9')
 
 
 prepare() {
@@ -22,7 +22,7 @@
   cd "${srcdir}"
 
   # python2 fixes
-  sed -i "s:\/usr\/bin\/python:\/usr\/bin\/python2:" 
graphite2-${pkgver}/tests/{corrupt.py,defuzz,fnttxtrender,fuzzbidi,fuzztest,hbspeeds,jsoncmp}
+  sed -i "s:\/usr\/bin\/python:\/usr\/bin\/python2:" 
graphite2-${pkgver}/tests/{corrupt.py,defuzz,fnttxtrender,hbspeeds,jsoncmp}
 }
 
 build() {


[arch-commits] Commit in graphite/trunk (PKGBUILD)

2018-08-18 Thread Andreas Radke via arch-commits
Date: Saturday, August 18, 2018 @ 11:15:30
  Author: andyrtr
Revision: 332252

upgpkg: graphite 1:1.3.12-1

upstream update 1.3.12

Modified:
  graphite/trunk/PKGBUILD

--+
 PKGBUILD |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2018-08-18 11:10:11 UTC (rev 332251)
+++ PKGBUILD2018-08-18 11:15:30 UTC (rev 332252)
@@ -2,7 +2,7 @@
 # Maintainer: AndyRTR 
 
 pkgname=graphite
-pkgver=1.3.11
+pkgver=1.3.12
 pkgrel=1
 epoch=1
 arch=('x86_64')
@@ -16,7 +16,7 @@
 checkdepends=('python2-fonttools')
 options=('!emptydirs')
 
source=(https://github.com/silnrsi/graphite/releases/download/${pkgver}/graphite2-${pkgver}.tgz)
-sha1sums=('26b70897bac68868d964ef70002c384ec10b6572')
+sha1sums=('9efb65423924f0c204f7b208af8567ce1284cd8d')
 
 
 prepare() {


[arch-commits] Commit in graphite/trunk (PKGBUILD)

2018-03-10 Thread Andreas Radke via arch-commits
Date: Saturday, March 10, 2018 @ 17:37:51
  Author: andyrtr
Revision: 318506

upgpkg: graphite 1:1.3.11-1

upstream update 1.3.11

Modified:
  graphite/trunk/PKGBUILD

--+
 PKGBUILD |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2018-03-10 13:06:11 UTC (rev 318505)
+++ PKGBUILD2018-03-10 17:37:51 UTC (rev 318506)
@@ -2,7 +2,7 @@
 # Maintainer: AndyRTR 
 
 pkgname=graphite
-pkgver=1.3.10
+pkgver=1.3.11
 pkgrel=1
 epoch=1
 arch=('x86_64')
@@ -16,7 +16,7 @@
 checkdepends=('python2-fonttools')
 options=('!emptydirs')
 
source=(https://github.com/silnrsi/graphite/releases/download/${pkgver}/graphite2-${pkgver}.tgz)
-sha1sums=('668f3bce96fc02d90ea875b401ed36b2e8957d2f')
+sha1sums=('26b70897bac68868d964ef70002c384ec10b6572')
 
 
 prepare() {


[arch-commits] Commit in graphite/trunk (PKGBUILD)

2017-05-05 Thread Andreas Radke
Date: Friday, May 5, 2017 @ 18:47:47
  Author: andyrtr
Revision: 295336

upgpkg: graphite 1:1.3.10-1

upstream update 1.3.10

Modified:
  graphite/trunk/PKGBUILD

--+
 PKGBUILD |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2017-05-05 18:32:46 UTC (rev 295335)
+++ PKGBUILD2017-05-05 18:47:47 UTC (rev 295336)
@@ -2,7 +2,7 @@
 # Maintainer: AndyRTR 
 
 pkgname=graphite
-pkgver=1.3.9
+pkgver=1.3.10
 pkgrel=1
 epoch=1
 arch=('i686' 'x86_64')
@@ -16,7 +16,7 @@
 checkdepends=('python2-fonttools')
 options=('!emptydirs')
 
source=(https://github.com/silnrsi/graphite/releases/download/${pkgver}/graphite2-${pkgver}.tgz)
-sha1sums=('0693e9eef87edf1792db247dd38794211666a1b9')
+sha1sums=('668f3bce96fc02d90ea875b401ed36b2e8957d2f')
 
 
 prepare() {


[arch-commits] Commit in graphite/trunk (PKGBUILD)

2016-11-12 Thread Andreas Radke
Date: Saturday, November 12, 2016 @ 09:03:29
  Author: andyrtr
Revision: 280592

upgpkg: graphite 1:1.3.9-1

upstream update 1.3.9

Modified:
  graphite/trunk/PKGBUILD

--+
 PKGBUILD |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2016-11-12 08:09:45 UTC (rev 280591)
+++ PKGBUILD2016-11-12 09:03:29 UTC (rev 280592)
@@ -2,7 +2,7 @@
 # Maintainer: AndyRTR 
 
 pkgname=graphite
-pkgver=1.3.8
+pkgver=1.3.9
 pkgrel=1
 epoch=1
 arch=('i686' 'x86_64')
@@ -16,7 +16,7 @@
 checkdepends=('python2-fonttools')
 options=('!emptydirs')
 
source=(https://github.com/silnrsi/graphite/releases/download/${pkgver}/graphite2-${pkgver}.tgz)
-sha1sums=('0c802628dacf3bfa2c1654d7d72b76e20e1adc97')
+sha1sums=('0693e9eef87edf1792db247dd38794211666a1b9')
 
 
 prepare() {


[arch-commits] Commit in graphite/trunk (PKGBUILD)

2016-04-01 Thread Andreas Radke
Date: Friday, April 1, 2016 @ 16:54:43
  Author: andyrtr
Revision: 263723

upgpkg: graphite 1:1.3.8-1

upstream update 1.3.8

Modified:
  graphite/trunk/PKGBUILD

--+
 PKGBUILD |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2016-04-01 14:42:49 UTC (rev 263722)
+++ PKGBUILD2016-04-01 14:54:43 UTC (rev 263723)
@@ -2,7 +2,7 @@
 # Maintainer: AndyRTR 
 
 pkgname=graphite
-pkgver=1.3.7
+pkgver=1.3.8
 pkgrel=1
 epoch=1
 arch=('i686' 'x86_64')
@@ -16,7 +16,7 @@
 checkdepends=('python2-fonttools')
 options=('!emptydirs')
 
source=(https://github.com/silnrsi/graphite/releases/download/${pkgver}/graphite2-${pkgver}.tgz)
-sha1sums=('83fde60cca7ce82d3b90b335a6e6ea719d15ffec')
+sha1sums=('0c802628dacf3bfa2c1654d7d72b76e20e1adc97')
 
 
 prepare() {


[arch-commits] Commit in graphite/trunk (PKGBUILD)

2016-03-25 Thread Andreas Radke
Date: Friday, March 25, 2016 @ 13:22:29
  Author: andyrtr
Revision: 262530

upgpkg: graphite 1:1.3.7-1

upstream update 1.3.7

Modified:
  graphite/trunk/PKGBUILD

--+
 PKGBUILD |6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2016-03-25 10:50:37 UTC (rev 262529)
+++ PKGBUILD2016-03-25 12:22:29 UTC (rev 262530)
@@ -2,7 +2,7 @@
 # Maintainer: AndyRTR 
 
 pkgname=graphite
-pkgver=1.3.6
+pkgver=1.3.7
 pkgrel=1
 epoch=1
 arch=('i686' 'x86_64')
@@ -15,8 +15,8 @@
  'doxygen' 'dblatex' 'graphviz' 'asciidoc')
 checkdepends=('python2-fonttools')
 options=('!emptydirs')
-source=(https://github.com/silnrsi/graphite/releases/download/${pkgver}/graphite-${pkgver}.tgz)
-sha1sums=('052ed2e3653f7a026bf9ff63ca42683ce0bcefb4')
+source=(https://github.com/silnrsi/graphite/releases/download/${pkgver}/graphite2-${pkgver}.tgz)
+sha1sums=('83fde60cca7ce82d3b90b335a6e6ea719d15ffec')
 
 
 prepare() {


[arch-commits] Commit in graphite/trunk (PKGBUILD graphite2-1.2.0-cmakepath.patch)

2016-03-01 Thread Andreas Radke
Date: Tuesday, March 1, 2016 @ 17:59:34
  Author: andyrtr
Revision: 260487

upgpkg: graphite 1:1.3.6-1

upstream update 1.3.6

Modified:
  graphite/trunk/PKGBUILD
Deleted:
  graphite/trunk/graphite2-1.2.0-cmakepath.patch

-+
 PKGBUILD|6 +++---
 graphite2-1.2.0-cmakepath.patch |9 -
 2 files changed, 3 insertions(+), 12 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2016-03-01 16:25:10 UTC (rev 260486)
+++ PKGBUILD2016-03-01 16:59:34 UTC (rev 260487)
@@ -2,7 +2,7 @@
 # Maintainer: AndyRTR 
 
 pkgname=graphite
-pkgver=1.3.5
+pkgver=1.3.6
 pkgrel=1
 epoch=1
 arch=('i686' 'x86_64')
@@ -15,8 +15,8 @@
  'doxygen' 'dblatex' 'graphviz' 'asciidoc')
 checkdepends=('python2-fonttools')
 options=('!emptydirs')
-source=(https://github.com/silnrsi/graphite/releases/download/${pkgver}/graphite2-${pkgver}.tgz)
-md5sums=('5b8d22a8bbf031838e31432868c0109c')
+source=(https://github.com/silnrsi/graphite/releases/download/${pkgver}/graphite-${pkgver}.tgz)
+sha1sums=('052ed2e3653f7a026bf9ff63ca42683ce0bcefb4')
 
 
 prepare() {

Deleted: graphite2-1.2.0-cmakepath.patch
===
--- graphite2-1.2.0-cmakepath.patch 2016-03-01 16:25:10 UTC (rev 260486)
+++ graphite2-1.2.0-cmakepath.patch 2016-03-01 16:59:34 UTC (rev 260487)
@@ -1,9 +0,0 @@
-diff -urN graphite2-1.2.0.orig/src/CMakeLists.txt 
graphite2-1.2.0/src/CMakeLists.txt
 graphite2-1.2.0.orig/src/CMakeLists.txt2013-01-29 15:47:32.465841769 
+0530
-+++ graphite2-1.2.0/src/CMakeLists.txt 2013-01-29 15:48:24.056843352 +0530
-@@ -136,4 +136,4 @@
- 
- 
- install(TARGETS graphite2 EXPORT graphite2 LIBRARY DESTINATION 
lib${LIB_SUFFIX} ARCHIVE DESTINATION lib${LIB_SUFFIX} PUBLIC_HEADER DESTINATION 
include/graphite2 RUNTIME DESTINATION bin)
--install(EXPORT graphite2 DESTINATION share/graphite2 NAMESPACE gr2_)
-+install(EXPORT graphite2 DESTINATION lib${LIB_SUFFIX}/graphite2 NAMESPACE 
gr2_)


[arch-commits] Commit in graphite/trunk (PKGBUILD)

2016-01-22 Thread Andreas Radke
Date: Friday, January 22, 2016 @ 19:24:10
  Author: andyrtr
Revision: 258504

upgpkg: graphite 1:1.3.5-1

upstream update 1.3.5; fix build and install doc

Modified:
  graphite/trunk/PKGBUILD

--+
 PKGBUILD |   38 ++
 1 file changed, 18 insertions(+), 20 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2016-01-22 07:09:26 UTC (rev 258503)
+++ PKGBUILD2016-01-22 18:24:10 UTC (rev 258504)
@@ -2,33 +2,28 @@
 # Maintainer: AndyRTR 
 
 pkgname=graphite
-pkgver=1.3.3
-pkgrel=3
+pkgver=1.3.5
+pkgrel=1
 epoch=1
 arch=('i686' 'x86_64')
-url="http://projects.palaso.org/projects/graphitedev;
+url="https://github.com/silnrsi/graphite;
 pkgdesc='reimplementation of the SIL Graphite text processing engine'
 license=('LGPL' 'GPL' 'custom')
 depends=('gcc-libs')
-makedepends=('cmake' 'freetype2' 'python2')
- # - only for docs - target doesn't install properly
- #  'doxygen' 'texlive-latexextra' 'graphviz' 'asciidoc' 
'perl-module-build' 'icu') # builds doc properly? 'texlive-helvetic' seems to 
be missing
+makedepends=('cmake' 'freetype2' 'python2'
+ # for documentation
+ 'doxygen' 'dblatex' 'graphviz' 'asciidoc')
+checkdepends=('python2-fonttools')
 options=('!emptydirs')
-source=(http://downloads.sourceforge.net/project/silgraphite/graphite2/graphite2-${pkgver}.tgz
-graphite2-1.2.0-cmakepath.patch)
-sha1sums=('54b04c283bab4695de63ae2dd6cff392dd49d7f0'
-  '7283d73e21f28a0b4221af9ce7998d68fcced16a')
+source=(https://github.com/silnrsi/graphite/releases/download/${pkgver}/graphite2-${pkgver}.tgz)
+md5sums=('5b8d22a8bbf031838e31432868c0109c')
 
+
 prepare() {
   cd "${srcdir}"
 
   # python2 fixes
   sed -i "s:\/usr\/bin\/python:\/usr\/bin\/python2:" 
graphite2-${pkgver}/tests/{corrupt.py,defuzz,fnttxtrender,fuzzbidi,fuzztest,hbspeeds,jsoncmp}
-  
-  # fix install path - .cmake files contain architecture dependend content - 
patch taken from FC/Slackware
-  pushd graphite2-${pkgver}
-  patch -Np1 -i ${srcdir}/graphite2-1.2.0-cmakepath.patch
-  popd
 }
 
 build() {
@@ -39,25 +34,28 @@
-DCMAKE_INSTALL_PREFIX=/usr \
-DCMAKE_BUILD_TYPE:STRING=Release \
-DGRAPHITE2_COMPARE_RENDERER=OFF \
-   #-DCMAKE_VERBOSE_MAKEFILE:BOOL=ON # remove when docs install target 
will be fixed
 
   # fix unwanted -O3 cflag (taken form Debian)
   find . -type f ! -name "rules" ! -name "changelog" -exec sed -i -e 
's/\-O3//g' {} \;
 
   make 
-  #make docs
+  make -j1 docs
 }
 
 check() {
   cd "${srcdir}"/build
+  # python2 fixes
   sed -i "s:python:python2:g" tests/CTestTestfile.cmake
-  ctest || true # some new test fail
+  ctest || true
 }
 
 package() {
   cd "${srcdir}"/build
-  # FIXME: all target doesn't install the docs target files
-  make DESTDIR="$pkgdir/" install 
+  make DESTDIR="$pkgdir/" install
+  # install doc files
+  mkdir -p "${pkgdir}"/usr/share/doc/graphite2/api
+  cp -vrf doc/doxygen/{html,latex/refman.pdf} 
"${pkgdir}"/usr/share/doc/graphite2/api
+  cp -vrf doc/{GTF,manual}.html "${pkgdir}"/usr/share/doc/graphite2
 
   # licenses
   mkdir -p "${pkgdir}"/usr/share/licenses/${pkgname}


[arch-commits] Commit in graphite/trunk (PKGBUILD)

2015-12-06 Thread Evangelos Foutras
Date: Sunday, December 6, 2015 @ 12:29:35
  Author: foutrelis
Revision: 252739

C++11 ABI rebuild

Modified:
  graphite/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2015-12-06 11:29:04 UTC (rev 252738)
+++ PKGBUILD2015-12-06 11:29:35 UTC (rev 252739)
@@ -3,7 +3,7 @@
 
 pkgname=graphite
 pkgver=1.3.3
-pkgrel=2
+pkgrel=3
 epoch=1
 arch=('i686' 'x86_64')
 url="http://projects.palaso.org/projects/graphitedev;


[arch-commits] Commit in graphite/trunk (PKGBUILD)

2015-12-05 Thread Bartłomiej Piotrowski
Date: Sunday, December 6, 2015 @ 07:03:20
  Author: bpiotrowski
Revision: 252618

C++11 ABI rebuild

Modified:
  graphite/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2015-12-06 06:02:29 UTC (rev 252617)
+++ PKGBUILD2015-12-06 06:03:20 UTC (rev 252618)
@@ -3,7 +3,7 @@
 
 pkgname=graphite
 pkgver=1.3.3
-pkgrel=1
+pkgrel=2
 epoch=1
 arch=('i686' 'x86_64')
 url="http://projects.palaso.org/projects/graphitedev;


[arch-commits] Commit in graphite/trunk (PKGBUILD)

2015-09-29 Thread Andreas Radke
Date: Tuesday, September 29, 2015 @ 16:59:07
  Author: andyrtr
Revision: 247894

upgpkg: graphite 1:1.3.3-1

upstream update 1.3.3

Modified:
  graphite/trunk/PKGBUILD

--+
 PKGBUILD |6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2015-09-29 13:56:38 UTC (rev 247893)
+++ PKGBUILD2015-09-29 14:59:07 UTC (rev 247894)
@@ -2,7 +2,7 @@
 # Maintainer: AndyRTR 
 
 pkgname=graphite
-pkgver=1.3.2
+pkgver=1.3.3
 pkgrel=1
 epoch=1
 arch=('i686' 'x86_64')
@@ -16,7 +16,7 @@
 options=('!emptydirs')
 
source=(http://downloads.sourceforge.net/project/silgraphite/graphite2/graphite2-${pkgver}.tgz
 graphite2-1.2.0-cmakepath.patch)
-sha1sums=('cb9293aab77b4008f9c6c6d4fbed783b6aaad071'
+sha1sums=('54b04c283bab4695de63ae2dd6cff392dd49d7f0'
   '7283d73e21f28a0b4221af9ce7998d68fcced16a')
 
 prepare() {
@@ -23,7 +23,7 @@
   cd "${srcdir}"
 
   # python2 fixes
-  sed -i "s:\/usr\/bin\/python:\/usr\/bin\/python2:" 
graphite2-${pkgver}/tests/{biditest,corrupt.py,defuzz,fnttxtrender,fuzzbidi,fuzztest,hbspeeds,jsoncmp}
+  sed -i "s:\/usr\/bin\/python:\/usr\/bin\/python2:" 
graphite2-${pkgver}/tests/{corrupt.py,defuzz,fnttxtrender,fuzzbidi,fuzztest,hbspeeds,jsoncmp}
   
   # fix install path - .cmake files contain architecture dependend content - 
patch taken from FC/Slackware
   pushd graphite2-${pkgver}


[arch-commits] Commit in graphite/trunk (PKGBUILD)

2015-09-14 Thread Andreas Radke
Date: Monday, September 14, 2015 @ 20:13:51
  Author: andyrtr
Revision: 246044

upgpkg: graphite 1:1.3.2-1

upstream update 1.3.2

Modified:
  graphite/trunk/PKGBUILD

--+
 PKGBUILD |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2015-09-14 18:09:35 UTC (rev 246043)
+++ PKGBUILD2015-09-14 18:13:51 UTC (rev 246044)
@@ -2,7 +2,7 @@
 # Maintainer: AndyRTR 
 
 pkgname=graphite
-pkgver=1.3.1
+pkgver=1.3.2
 pkgrel=1
 epoch=1
 arch=('i686' 'x86_64')
@@ -16,7 +16,7 @@
 options=('!emptydirs')
 
source=(http://downloads.sourceforge.net/project/silgraphite/graphite2/graphite2-${pkgver}.tgz
 graphite2-1.2.0-cmakepath.patch)
-sha1sums=('e1d4b129b1fea1a44428da59f200c6a07dc5aad2'
+sha1sums=('cb9293aab77b4008f9c6c6d4fbed783b6aaad071'
   '7283d73e21f28a0b4221af9ce7998d68fcced16a')
 
 prepare() {


[arch-commits] Commit in graphite/trunk (PKGBUILD)

2015-09-04 Thread Andreas Radke
Date: Friday, September 4, 2015 @ 19:10:33
  Author: andyrtr
Revision: 245289

upgpkg: graphite 1:1.3.1-1

upstream update 1.3.1

Modified:
  graphite/trunk/PKGBUILD

--+
 PKGBUILD |   12 +++-
 1 file changed, 7 insertions(+), 5 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2015-09-04 17:03:04 UTC (rev 245288)
+++ PKGBUILD2015-09-04 17:10:33 UTC (rev 245289)
@@ -2,7 +2,7 @@
 # Maintainer: AndyRTR 
 
 pkgname=graphite
-pkgver=1.3.0
+pkgver=1.3.1
 pkgrel=1
 epoch=1
 arch=('i686' 'x86_64')
@@ -16,10 +16,10 @@
 options=('!emptydirs')
 
source=(http://downloads.sourceforge.net/project/silgraphite/graphite2/graphite2-${pkgver}.tgz
 graphite2-1.2.0-cmakepath.patch)
-md5sums=('ca6da3ba3ff914e4974c167a7a63a3ae'
- '00353b67941dbc30b76a43253760769e')
+sha1sums=('e1d4b129b1fea1a44428da59f200c6a07dc5aad2'
+  '7283d73e21f28a0b4221af9ce7998d68fcced16a')
 
-build() {
+prepare() {
   cd "${srcdir}"
 
   # python2 fixes
@@ -29,7 +29,9 @@
   pushd graphite2-${pkgver}
   patch -Np1 -i ${srcdir}/graphite2-1.2.0-cmakepath.patch
   popd
-  
+}
+
+build() {
   mkdir build
   cd build
   cmake -G "Unix Makefiles" ../graphite2-${pkgver} \


[arch-commits] Commit in graphite/trunk (PKGBUILD)

2015-08-06 Thread Andreas Radke
Date: Thursday, August 6, 2015 @ 22:30:50
  Author: andyrtr
Revision: 243100

upgpkg: graphite 1:1.3.0-1

upstream update 1.3.0

Modified:
  graphite/trunk/PKGBUILD

--+
 PKGBUILD |   10 +-
 1 file changed, 5 insertions(+), 5 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2015-08-06 19:08:11 UTC (rev 243099)
+++ PKGBUILD2015-08-06 20:30:50 UTC (rev 243100)
@@ -2,7 +2,7 @@
 # Maintainer: AndyRTR andy...@archlinux.org
 
 pkgname=graphite
-pkgver=1.2.4
+pkgver=1.3.0
 pkgrel=1
 epoch=1
 arch=('i686' 'x86_64')
@@ -16,14 +16,14 @@
 options=('!emptydirs')
 
source=(http://downloads.sourceforge.net/project/silgraphite/graphite2/graphite2-${pkgver}.tgz
 graphite2-1.2.0-cmakepath.patch)
-md5sums=('2ef839348fe28e3b923bf8cced440227'
+md5sums=('ca6da3ba3ff914e4974c167a7a63a3ae'
  '00353b67941dbc30b76a43253760769e')
 
 build() {
   cd ${srcdir}
-  
+
   # python2 fixes
-  sed -i s:\/usr\/bin\/python:\/usr\/bin\/python2: 
graphite2-${pkgver}/tests/{jsoncmp,fuzztest,defuzz,corrupt.py}
+  sed -i s:\/usr\/bin\/python:\/usr\/bin\/python2: 
graphite2-${pkgver}/tests/{biditest,corrupt.py,defuzz,fnttxtrender,fuzzbidi,fuzztest,hbspeeds,jsoncmp}
   
   # fix install path - .cmake files contain architecture dependend content - 
patch taken from FC/Slackware
   pushd graphite2-${pkgver}
@@ -49,7 +49,7 @@
 check() {
   cd ${srcdir}/build
   sed -i s:python:python2:g tests/CTestTestfile.cmake
-  ctest
+  ctest || true # some new test fail
 }
 
 package() {


[arch-commits] Commit in graphite/trunk (PKGBUILD)

2013-11-30 Thread Andreas Radke
Date: Saturday, November 30, 2013 @ 20:10:53
  Author: andyrtr
Revision: 200650

upgpkg: graphite 1:1.2.4-1

upstream update 1.2.4

Modified:
  graphite/trunk/PKGBUILD

--+
 PKGBUILD |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2013-11-30 18:00:09 UTC (rev 200649)
+++ PKGBUILD2013-11-30 19:10:53 UTC (rev 200650)
@@ -2,7 +2,7 @@
 # Maintainer: AndyRTR andy...@archlinux.org
 
 pkgname=graphite
-pkgver=1.2.3
+pkgver=1.2.4
 pkgrel=1
 epoch=1
 arch=('i686' 'x86_64')
@@ -16,7 +16,7 @@
 options=('!emptydirs')
 
source=(http://downloads.sourceforge.net/project/silgraphite/graphite2/graphite2-${pkgver}.tgz
 graphite2-1.2.0-cmakepath.patch)
-md5sums=('7042305e4208af4c2d5249d814ccce58'
+md5sums=('2ef839348fe28e3b923bf8cced440227'
  '00353b67941dbc30b76a43253760769e')
 
 build() {



[arch-commits] Commit in graphite/trunk (PKGBUILD graphite2-1.2.0-cmakepath.patch)

2013-06-15 Thread Andreas Radke
Date: Saturday, June 15, 2013 @ 09:02:08
  Author: andyrtr
Revision: 188518

upgpkg: graphite 1:1.2.3-1

upstream update 1.2.3; fix optimisation, move some arch dependend files to 
proper place

Added:
  graphite/trunk/graphite2-1.2.0-cmakepath.patch
Modified:
  graphite/trunk/PKGBUILD

-+
 PKGBUILD|   36 +++-
 graphite2-1.2.0-cmakepath.patch |9 +
 2 files changed, 36 insertions(+), 9 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2013-06-15 06:52:07 UTC (rev 188517)
+++ PKGBUILD2013-06-15 07:02:08 UTC (rev 188518)
@@ -2,7 +2,7 @@
 # Maintainer: AndyRTR andy...@archlinux.org
 
 pkgname=graphite
-pkgver=1.2.2
+pkgver=1.2.3
 pkgrel=1
 epoch=1
 arch=('i686' 'x86_64')
@@ -10,23 +10,40 @@
 pkgdesc='reimplementation of the SIL Graphite text processing engine'
 license=('LGPL' 'GPL' 'custom')
 depends=('gcc-libs')
-makedepends=('cmake' 'freetype2' 'python2') 
-# 'doxygen' 'texlive-latexextra' 'graphviz' 'asciidoc' 'perl-module-build' 
'icu') - only for docs - target doesn't install properly
+makedepends=('cmake' 'freetype2' 'python2')
+ # - only for docs - target doesn't install properly
+ #  'doxygen' 'texlive-latexextra' 'graphviz' 'asciidoc' 
'perl-module-build' 'icu') # builds doc properly? 'texlive-helvetic' seems to 
be missing
 options=('!libtool' '!emptydirs')
-source=(http://downloads.sourceforge.net/project/silgraphite/graphite2/graphite2-${pkgver}.tgz;)
-md5sums=('4bfd5db6c91a4097cd76a699beaca70e')
+source=(http://downloads.sourceforge.net/project/silgraphite/graphite2/graphite2-${pkgver}.tgz
+graphite2-1.2.0-cmakepath.patch)
+md5sums=('7042305e4208af4c2d5249d814ccce58'
+ '00353b67941dbc30b76a43253760769e')
 
 build() {
   cd ${srcdir}
+  
+  # python2 fixes
   sed -i s:\/usr\/bin\/python:\/usr\/bin\/python2: 
graphite2-${pkgver}/tests/{jsoncmp,fuzztest,defuzz,corrupt.py}
+  
+  # fix install path - .cmake files contain architecture dependend content - 
patch taken from FC/Slackware
+  pushd graphite2-${pkgver}
+  patch -Np1 -i ${srcdir}/graphite2-1.2.0-cmakepath.patch
+  popd
+  
   mkdir build
   cd build
   cmake -G Unix Makefiles ../graphite2-${pkgver} \
+   -DCMAKE_C_FLAGS:STRING=${CFLAGS} \
-DCMAKE_INSTALL_PREFIX=/usr \
-DCMAKE_BUILD_TYPE:STRING=Release \
-   -DGRAPHITE2_COMPARE_RENDERER=OFF
-  make
-#  make docs
+   -DGRAPHITE2_COMPARE_RENDERER=OFF \
+   #-DCMAKE_VERBOSE_MAKEFILE:BOOL=ON # remove when docs install target 
will be fixed
+
+  # fix unwanted -O3 cflag (taken form Debian)
+  find . -type f ! -name rules ! -name changelog -exec sed -i -e 
's/\-O3//g' {} \;
+
+  make 
+  #make docs
 }
 
 check() {
@@ -37,7 +54,8 @@
 
 package() {
   cd ${srcdir}/build
-  make DESTDIR=$pkgdir/ install
+  # FIXME: all target doesn't install the docs target files
+  make DESTDIR=$pkgdir/ install 
 
   # licenses
   mkdir -p ${pkgdir}/usr/share/licenses/${pkgname}

Added: graphite2-1.2.0-cmakepath.patch
===
--- graphite2-1.2.0-cmakepath.patch (rev 0)
+++ graphite2-1.2.0-cmakepath.patch 2013-06-15 07:02:08 UTC (rev 188518)
@@ -0,0 +1,9 @@
+diff -urN graphite2-1.2.0.orig/src/CMakeLists.txt 
graphite2-1.2.0/src/CMakeLists.txt
+--- graphite2-1.2.0.orig/src/CMakeLists.txt2013-01-29 15:47:32.465841769 
+0530
 graphite2-1.2.0/src/CMakeLists.txt 2013-01-29 15:48:24.056843352 +0530
+@@ -136,4 +136,4 @@
+ 
+ 
+ install(TARGETS graphite2 EXPORT graphite2 LIBRARY DESTINATION 
lib${LIB_SUFFIX} ARCHIVE DESTINATION lib${LIB_SUFFIX} PUBLIC_HEADER DESTINATION 
include/graphite2 RUNTIME DESTINATION bin)
+-install(EXPORT graphite2 DESTINATION share/graphite2 NAMESPACE gr2_)
++install(EXPORT graphite2 DESTINATION lib${LIB_SUFFIX}/graphite2 NAMESPACE 
gr2_)



[arch-commits] Commit in graphite/trunk (PKGBUILD)

2013-05-24 Thread Andreas Radke
Date: Friday, May 24, 2013 @ 22:18:30
  Author: andyrtr
Revision: 186327

upgpkg: graphite 1:1.2.2-1

upstream update 1.2.2

Modified:
  graphite/trunk/PKGBUILD

--+
 PKGBUILD |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2013-05-24 19:56:49 UTC (rev 186326)
+++ PKGBUILD2013-05-24 20:18:30 UTC (rev 186327)
@@ -2,7 +2,7 @@
 # Maintainer: AndyRTR andy...@archlinux.org
 
 pkgname=graphite
-pkgver=1.2.1
+pkgver=1.2.2
 pkgrel=1
 epoch=1
 arch=('i686' 'x86_64')
@@ -14,7 +14,7 @@
 # 'doxygen' 'texlive-latexextra' 'graphviz' 'asciidoc' 'perl-module-build' 
'icu') - only for docs - target doesn't install properly
 options=('!libtool' '!emptydirs')
 
source=(http://downloads.sourceforge.net/project/silgraphite/graphite2/graphite2-${pkgver}.tgz;)
-md5sums=('edf70ab2f7d789be219f47b1df00d67e')
+md5sums=('4bfd5db6c91a4097cd76a699beaca70e')
 
 build() {
   cd ${srcdir}



[arch-commits] Commit in graphite/trunk (PKGBUILD)

2013-03-02 Thread Andreas Radke
Date: Saturday, March 2, 2013 @ 12:28:06
  Author: andyrtr
Revision: 179055

upgpkg: graphite 1:1.2.1-1

upstream update 1.2.1

Modified:
  graphite/trunk/PKGBUILD

--+
 PKGBUILD |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2013-03-02 09:03:00 UTC (rev 179054)
+++ PKGBUILD2013-03-02 11:28:06 UTC (rev 179055)
@@ -2,7 +2,7 @@
 # Maintainer: AndyRTR andy...@archlinux.org
 
 pkgname=graphite
-pkgver=1.2.0
+pkgver=1.2.1
 pkgrel=1
 epoch=1
 arch=('i686' 'x86_64')
@@ -14,7 +14,7 @@
 # 'doxygen' 'texlive-latexextra' 'graphviz' 'asciidoc' 'perl-module-build' 
'icu') - only for docs - target doesn't install properly
 options=('!libtool' '!emptydirs')
 
source=(http://downloads.sourceforge.net/project/silgraphite/graphite2/graphite2-${pkgver}.tgz;)
-md5sums=('f5ef3f7f10fa8c3542c6a085a233080b')
+md5sums=('edf70ab2f7d789be219f47b1df00d67e')
 
 build() {
   cd ${srcdir}



[arch-commits] Commit in graphite/trunk (PKGBUILD pango-graphite.install)

2012-12-21 Thread andyrtr
Date: Friday, December 21, 2012 @ 14:49:15
  Author: andyrtr
Revision: 173710

upgpkg: graphite 1:1.2.0-1

upstream update 1.2.0

Modified:
  graphite/trunk/PKGBUILD
Deleted:
  graphite/trunk/pango-graphite.install

+
 PKGBUILD   |   18 --
 pango-graphite.install |   12 
 2 files changed, 12 insertions(+), 18 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2012-12-21 19:18:05 UTC (rev 173709)
+++ PKGBUILD2012-12-21 19:49:15 UTC (rev 173710)
@@ -2,30 +2,36 @@
 # Maintainer: AndyRTR andy...@archlinux.org
 
 pkgname=graphite
-pkgver=1.0.3
+pkgver=1.2.0
 pkgrel=1
 epoch=1
 arch=('i686' 'x86_64')
-url=http://graphite.sil.org/;
+url=http://projects.palaso.org/projects/graphitedev;
 pkgdesc='reimplementation of the SIL Graphite text processing engine'
-license=('custom_SIL Dual license')
+license=('LGPL' 'GPL' 'custom')
 depends=('gcc-libs')
-makedepends=('cmake' 'freetype2')
+makedepends=('cmake' 'freetype2' 'python2') 
+# 'doxygen' 'texlive-latexextra' 'graphviz' 'asciidoc' 'perl-module-build' 
'icu') - only for docs - target doesn't install properly
 options=('!libtool' '!emptydirs')
 
source=(http://downloads.sourceforge.net/project/silgraphite/graphite2/graphite2-${pkgver}.tgz;)
-md5sums=('3bf481ca95109b14435125c0dd1f2217')
+md5sums=('f5ef3f7f10fa8c3542c6a085a233080b')
 
 build() {
   cd ${srcdir}
+  sed -i s:\/usr\/bin\/python:\/usr\/bin\/python2: 
graphite2-${pkgver}/tests/{jsoncmp,fuzztest,defuzz,corrupt.py}
   mkdir build
   cd build
   cmake -G Unix Makefiles ../graphite2-${pkgver} \
-   -DCMAKE_INSTALL_PREFIX=/usr
+   -DCMAKE_INSTALL_PREFIX=/usr \
+   -DCMAKE_BUILD_TYPE:STRING=Release \
+   -DGRAPHITE2_COMPARE_RENDERER=OFF
   make
+  make docs
 }
 
 check() {
   cd ${srcdir}/build
+  sed -i s:python:python2:g tests/CTestTestfile.cmake
   ctest
 }
 

Deleted: pango-graphite.install
===
--- pango-graphite.install  2012-12-21 19:18:05 UTC (rev 173709)
+++ pango-graphite.install  2012-12-21 19:49:15 UTC (rev 173710)
@@ -1,12 +0,0 @@
-post_install() {
-   usr/bin/pango-querymodules etc/pango/pango.modules
-}
-
-post_upgrade() {
-   post_install $1
-}
-
-pre_remove() {
-post_install $1
-}
-



[arch-commits] Commit in graphite/trunk (PKGBUILD)

2012-12-21 Thread andyrtr
Date: Friday, December 21, 2012 @ 14:56:27
  Author: andyrtr
Revision: 173714

comment out docs

Modified:
  graphite/trunk/PKGBUILD

--+
 PKGBUILD |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: PKGBUILD
===
--- PKGBUILD2012-12-21 19:52:56 UTC (rev 173713)
+++ PKGBUILD2012-12-21 19:56:27 UTC (rev 173714)
@@ -26,7 +26,7 @@
-DCMAKE_BUILD_TYPE:STRING=Release \
-DGRAPHITE2_COMPARE_RENDERER=OFF
   make
-  make docs
+#  make docs
 }
 
 check() {



[arch-commits] Commit in graphite/trunk (PKGBUILD)

2011-10-27 Thread andyrtr
Date: Friday, October 28, 2011 @ 01:35:17
  Author: andyrtr
Revision: 141286

upgpkg: graphite 1:1.0.3-1

move to graphite2 branch

Modified:
  graphite/trunk/PKGBUILD

--+
 PKGBUILD |   47 ++-
 1 file changed, 22 insertions(+), 25 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2011-10-28 04:36:42 UTC (rev 141285)
+++ PKGBUILD2011-10-28 05:35:17 UTC (rev 141286)
@@ -1,42 +1,39 @@
 # $Id$
 # Maintainer: AndyRTR andy...@archlinux.org
 
-pkgbase=graphite
-pkgname=('libgraphite' 'pango-graphite')
-pkgver=2.3.1
-pkgrel=2
+pkgname=graphite
+pkgver=1.0.3
+pkgrel=1
+epoch=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')
 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}
-  ./configure --prefix=/usr --disable-static
+  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
+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}/
+  install -m644 ${srcdir}/graphite2-${pkgver}/COPYING 
${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
-}



[arch-commits] Commit in graphite/trunk (PKGBUILD)

2011-09-10 Thread Pierre Schmitz
Date: Saturday, September 10, 2011 @ 10:58:39
  Author: pierre
Revision: 137742

upgpkg: graphite 2.3.1-2

rebuild old package; cleanup

Modified:
  graphite/trunk/PKGBUILD

--+
 PKGBUILD |   35 +--
 1 file changed, 13 insertions(+), 22 deletions(-)

Modified: PKGBUILD
===
--- PKGBUILD2011-09-10 14:49:04 UTC (rev 137741)
+++ PKGBUILD2011-09-10 14:58:39 UTC (rev 137742)
@@ -1,39 +1,30 @@
 # $Id$
 # Maintainer: AndyRTR andy...@archlinux.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
-pkgrel=1
+pkgrel=2
 arch=('i686' 'x86_64')
 url=http://graphite.sil.org/;
 makedepends=('pango' 'gcc-libs')
 options=('!libtool' '!emptydirs')
-source=(http://downloads.sourceforge.net/project/silgraphite/silgraphite/${pkgver}/silgraphite-${pkgver}.tar.gz)
+source=(http://downloads.sourceforge.net/project/silgraphite/silgraphite/${pkgver}/silgraphite-${pkgver}.tar.gz;)
 md5sums=('d35724900f6a4105550293686688bbb3')
 
 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  
+  make
 }
 
 package_libgraphite() {
- pkgdesc=SILGraphite - a \smart font\ rendering engine - the libs and 
headers
- license=('custom_SIL Dual license')
- depends=('gcc-libs')
+  pkgdesc='SILGraphite - a smart font rendering engine - the libs and 
headers'
+  license=('custom_SIL Dual license')
+  depends=('gcc-libs')
 
   cd ${srcdir}/silgraphite-${pkgver}/engine
-  make DESTDIR=$pkgdir/ install || return 1
+  make DESTDIR=$pkgdir/ install
 
   # licenses
   mkdir -p ${pkgdir}/usr/share/licenses/${pkgname}
@@ -41,11 +32,11 @@
 }
 
 package_pango-graphite() {
- pkgdesc=SILGraphite support for pango
- license=('LGPL')
- depends=('pango' 'libgraphite')
- install=pango-graphite.install
+  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
-}
\ No newline at end of file
+  make DESTDIR=$pkgdir/ install
+}