[arch-commits] CVS update of extra/multimedia/xfig (PKGBUILD xfig-gcc4.patch)

[Damir Perisa]

    Date: Tuesday, February 19, 2008 @ 17:18:13
  Author: damir
    Path: /home/cvs-extra/extra/multimedia/xfig

Modified: PKGBUILD (1.9 -> 1.10) xfig-gcc4.patch (1.2 -> 1.3)

upgpkg: xfig 3.2.4-10
    xfig downgrade - as decided in bug http://bugs.archlinux.org/task/8806


-----------------+
 PKGBUILD        |   34 ++++++++++++++++++++++------------
 xfig-gcc4.patch |   28 ++++++++++++++++++++++++++++
 2 files changed, 50 insertions(+), 12 deletions(-)


Index: extra/multimedia/xfig/PKGBUILD
diff -u extra/multimedia/xfig/PKGBUILD:1.9 extra/multimedia/xfig/PKGBUILD:1.10
--- extra/multimedia/xfig/PKGBUILD:1.9	Wed Oct 17 09:47:55 2007
+++ extra/multimedia/xfig/PKGBUILD	Tue Feb 19 17:18:12 2008
@@ -1,36 +1,49 @@
-# $Id: PKGBUILD,v 1.9 2007/10/17 13:47:55 damir Exp $
+# $Id: PKGBUILD,v 1.10 2008/02/19 22:18:12 damir Exp $
 # Maintainer: damir <damir at archlinux.org>
 # TU: Ben <ben at benmazer.net>
 # Contributor: ipqw
 
 pkgname=xfig
-pkgver=3.2.5
-pkgrel=1
+pkgver=3.2.4
+pkgrel=10
+# downgraded because of bug 8806 and some other issues that make the 3.2.5 quite unusable
 pkgdesc="Xfig drawing tool"
 arch=("i686" "x86_64")
 url="http://www.xfig.org"
 depends=('libpng' 'libjpeg' 'xaw3d' 'libxi' 'libxaw')
 makedepends=('imake')
+options=('force')
 license=('custom')
 source=("http://xfig.org/software/xfig/$pkgver/$pkgname.$pkgver.full.tar.gz" \
 	"LICENSE" \
 	"${pkgname}.desktop" \
 	"${pkgname}.png" \
-	"Imakefile.archlinux.patch")
+	"xfig-gcc4.patch")
+
 install=$pkgname.install
 
 build() {
         cd $startdir/src/$pkgname.$pkgver
 
+	# >=3.2.5 
 	# change paths to archlinux standards:
-	patch -Np0 -i $startdir/src/Imakefile.archlinux.patch || return 1
+	# patch -Np0 -i $startdir/src/Imakefile.archlinux.patch || return 1
+
+ 	# =3.2.4
+	patch -Np1 -i ../xfig-gcc4.patch
 
 	# make makefile with imake
         xmkmf || return 1
 
 	# build
-        make  || return 1
-        make DESTDIR=$startdir/pkg install.all || return 1
+	# >=3.2.5 
+        # make  || return 1
+        # make DESTDIR=$startdir/pkg install.all || return 1
+        # make DESTDIR=$startdir/pkg install.man || return 1
+ 	# =3.2.4
+        make XAPPLOADDIR=/usr/share/X11/app-defaults || return 1
+        make XAPPLOADDIR=/usr/share/X11/app-defaults \
+		DESTDIR=$startdir/pkg install.all || return 1
         make DESTDIR=$startdir/pkg install.man || return 1
 	rm -f ${startdir}/pkg/usr/lib/X11/app-defaults
 	rmdir ${startdir}/pkg/etc/X11/app-defaults
@@ -45,8 +58,5 @@
   	install -D -m644 ../LICENSE ${startdir}/pkg/usr/share/licenses/${pkgname}/LICENSE	
 }
 
-md5sums=('fae0c67a3951bd41c057deb63b6aa47a'
-         'f405b7a96f3401c12153fe6170a7d8f1'
-         '658942ce4062d2766c8b2395f5ed4319'
-         '8c99ca12404ed300c77106458c7340c0'
-         '199754e815475e89d133c7e657a6c228')
+
+
Index: extra/multimedia/xfig/xfig-gcc4.patch
diff -u /dev/null extra/multimedia/xfig/xfig-gcc4.patch:1.3
--- /dev/null	Tue Feb 19 17:18:13 2008
+++ extra/multimedia/xfig/xfig-gcc4.patch	Tue Feb 19 17:18:12 2008
@@ -0,0 +1,28 @@
+diff -ru xfig.3.2.4/u_fonts.h xfig.3.2.4.new/u_fonts.h
+--- xfig.3.2.4/u_fonts.h	2002-03-27 01:18:23.000000000 +0100
++++ xfig.3.2.4.new/u_fonts.h	2005-12-03 15:21:02.054250392 +0100
+@@ -30,12 +30,6 @@
+ /* font number for the "nil" font (when user wants tiny text) */
+ #define NILL_FONT NUM_FONTS
+ 
+-extern int		psfontnum();
+-extern int		latexfontnum();
+-extern struct _xfstruct	x_fontinfo[], x_backup_fontinfo[];
+-extern struct _fstruct	ps_fontinfo[];
+-extern struct _fstruct	latex_fontinfo[];
+-
+ /* element of linked list for each font
+    The head of list is for the different font NAMES,
+    and the elements of this list are for each different
+@@ -61,5 +55,11 @@
+ 				 * sizes */
+ };
+ 
++extern int		psfontnum();
++extern int		latexfontnum();
++extern struct _xfstruct	x_fontinfo[], x_backup_fontinfo[];
++extern struct _fstruct	ps_fontinfo[];
++extern struct _fstruct	latex_fontinfo[];
++
+ int		x_fontnum();
+ #endif /* U_FONTS_H */