[arch-commits] Commit in xorg-font-utils/repos (4 files)

[Jan de Groot]

    Date: Friday, December 5, 2008 @ 05:05:50
  Author: jgc
Revision: 20486

Merged revisions 20484 via svnmerge from 
svn+ssh://svn.archlinux.org/srv/svn-packages/xorg-font-utils/trunk

........
  r20484 | jgc | 2008-12-05 11:05:16 +0100 (Fri, 05 Dec 2008) | 2 lines
  
  Fix build with gcc 4.3 (FS#12186)
........

Added:
  xorg-font-utils/repos/extra-i686/gcc-4.3.patch
    (from rev 20484, xorg-font-utils/trunk/gcc-4.3.patch)
Modified:
  xorg-font-utils/repos/extra-i686/	(properties)
  xorg-font-utils/repos/extra-i686/PKGBUILD
  xorg-font-utils/repos/extra-i686/xorg-font-utils.install

-------------------------+
 PKGBUILD                |   31 +++++++++++++++++--------------
 gcc-4.3.patch           |    8 ++++++++
 xorg-font-utils.install |    5 -----
 3 files changed, 25 insertions(+), 19 deletions(-)


Property changes on: xorg-font-utils/repos/extra-i686
___________________________________________________________________
Modified: svnmerge-integrated
   - /xorg-font-utils/trunk:1-14300
   + /xorg-font-utils/trunk:1-20485

Modified: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD	2008-12-05 10:05:35 UTC (rev 20485)
+++ extra-i686/PKGBUILD	2008-12-05 10:05:50 UTC (rev 20486)
@@ -19,32 +19,35 @@
         ${url}/releases/individual/app/mkfontscale-1.0.3.tar.bz2
         ${url}/releases/individual/font/font-util-1.0.1.tar.bz2
 	http://people.redhat.com/yshao/ttmkfdir2.20021109.tar.bz2
-	ttmkfdir.patch)
+	ttmkfdir.patch
+	gcc-4.3.patch)
+md5sums=('9685fab33d39954ab8a0d22e0969d5a4'
+         'b0ebd86029571239b9d7b0c61191b591'
+         '4d0f89a23f77e22f1671a77bf0898955'
+         '1d608771aca9695b828cec1e34178fd1'
+         'b81535f78fe05732931f02841e5ca37b'
+         '79e0401393c9728865aa73bb2bd68dd4'
+         '099278628ad63631e872bc5590bade74'
+	 '92ef5f77a467cc188f8dec87b0fdb664')
 
 build() {
-  cd ${startdir}/src
+  cd "${srcdir}"
 
   for i in *; do
     if [ -d "${i}" ]; then
       pushd "${i}"
         if [ "${i}" = "ttmkfdir2" ]; then
-	  patch -Np0 -i ${startdir}/src/ttmkfdir.patch || return 1
+	  patch -Np0 -i "${srcdir}/ttmkfdir.patch" || return 1
+	  patch -Np1 -i "${srcdir}/gcc-4.3.patch" || return 1
 	  make || return 1
-	  mkdir -p ${startdir}/pkg/usr/bin
-	  install -m755 ttmkfdir ${startdir}/pkg/usr/bin/ || return 1
+	  install -m755 -d "${pkgdir}/usr/bin"
+	  install -m755 ttmkfdir "${pkgdir}/usr/bin/" || return 1
 	else
-	  ./configure --prefix=/usr --with-mapdir=/usr/share/fonts/util
+	  ./configure --prefix=/usr --with-mapdir=/usr/share/fonts/util || return 1
           make || return 1
-          make DESTDIR=${startdir}/pkg install || return 1
+          make DESTDIR="${pkgdir}" install || return 1
 	fi
       popd
     fi
   done
 }
-md5sums=('9685fab33d39954ab8a0d22e0969d5a4'
-         'b0ebd86029571239b9d7b0c61191b591'
-         '4d0f89a23f77e22f1671a77bf0898955'
-         '1d608771aca9695b828cec1e34178fd1'
-         'b81535f78fe05732931f02841e5ca37b'
-         '79e0401393c9728865aa73bb2bd68dd4'
-         '099278628ad63631e872bc5590bade74')

Copied: xorg-font-utils/repos/extra-i686/gcc-4.3.patch (from rev 20484, xorg-font-utils/trunk/gcc-4.3.patch)
===================================================================
--- extra-i686/gcc-4.3.patch	                        (rev 0)
+++ extra-i686/gcc-4.3.patch	2008-12-05 10:05:50 UTC (rev 20486)
@@ -0,0 +1,8 @@
+--- ttmkfdir2/directory.cpp.orig	2008-12-05 10:45:28.000000000 +0100
++++ ttmkfdir2/directory.cpp	2008-12-05 10:45:38.000000000 +0100
+@@ -1,4 +1,5 @@
+ #include <cctype>
++#include <cstring>
+ #include <dirent.h>
+ #include <sys/stat.h>
+ #include <unistd.h>

Modified: extra-i686/xorg-font-utils.install
===================================================================
--- extra-i686/xorg-font-utils.install	2008-12-05 10:05:35 UTC (rev 20485)
+++ extra-i686/xorg-font-utils.install	2008-12-05 10:05:50 UTC (rev 20486)
@@ -1,8 +1,3 @@
-# arg 1:  the new package version
 post_install() {
   ldconfig -r .
 }
-
-op=$1
-shift
-$op $*