[arch-commits] Commit in transcode/repos (extra-i686 extra-i686/PKGBUILD)

[Jan de Groot]

    Date: Sunday, May 31, 2009 @ 08:44:44
  Author: jgc
Revision: 40790

Merged revisions 40789 via svnmerge from 
svn+ssh://svn.archlinux.org/srv/svn-packages/transcode/trunk

........
  r40789 | jgc | 2009-05-31 12:44:23 +0000 (Sun, 31 May 2009) | 2 lines
  
  Fix build with new glibc
........

Modified:
  transcode/repos/extra-i686/	(properties)
  transcode/repos/extra-i686/PKGBUILD

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


Property changes on: transcode/repos/extra-i686
___________________________________________________________________
Modified: svnmerge-integrated
   - /transcode/trunk:1-39823
   + /transcode/trunk:1-40789

Modified: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD	2009-05-31 12:44:23 UTC (rev 40789)
+++ extra-i686/PKGBUILD	2009-05-31 12:44:44 UTC (rev 40790)
@@ -49,13 +49,14 @@
   make DESTDIR="${pkgdir}" install || return 1
  ##############################################################################
  # this imports the latest subtitleripper sources and replaces the internal
-###  rm -rf $startdir/src/$pkgname-$pkgver/contrib/subrip
   mkdir contrib
   mv ${srcdir}/subtitleripper contrib/subrip
  # removes dependency on libppm, make it dependend on netpbm just failed, argh...
-  sed -i 's|^\(.*lppm.*\)$|#\1|' contrib/subrip/Makefile || return 1
-  sed -i 's|^\(.*D_HAVE_LIB_PPM.*\)$|#\1|' contrib/subrip/Makefile || return 1
   cd contrib/subrip || return 1
+  sed -e 's|^\(.*lppm.*\)$|#\1|' \
+      -e 's|^\(.*D_HAVE_LIB_PPM.*\)$|#\1|' \
+      -e 's/DEFINES :=/DEFINES = -DHAVE_GETLINE/' \
+      -i Makefile || return 1
   make || return 1
   install -m 755 pgm2txt ${pkgdir}/usr/bin/ || return 1
   install -m 755 srttool ${pkgdir}/usr/bin/ || return 1