[arch-commits] Commit in xfig/trunk (PKGBUILD xfig-3.2.5-enable-Xaw3d.patch)

[Eric Bélanger]

    Date: Sunday, April 1, 2012 @ 20:25:25
  Author: eric
Revision: 155347

upgpkg: xfig 3.2.5b-8

Replace xaw3d support by libxaw (close FS#28699)

Modified:
  xfig/trunk/PKGBUILD
Deleted:
  xfig/trunk/xfig-3.2.5-enable-Xaw3d.patch

-------------------------------+
 PKGBUILD                      |    9 ++++-----
 xfig-3.2.5-enable-Xaw3d.patch |   18 ------------------
 2 files changed, 4 insertions(+), 23 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2012-04-01 23:44:22 UTC (rev 155346)
+++ PKGBUILD	2012-04-02 00:25:25 UTC (rev 155347)
@@ -3,26 +3,25 @@
 
 pkgname=xfig
 pkgver=3.2.5b
-pkgrel=7
+pkgrel=8
 pkgdesc="An interactive drawing tool"
 arch=('i686' 'x86_64')
 url="http://www.xfig.org/userman/"
 license=('custom')
-depends=('libpng' 'libjpeg' 'xaw3d>=1.6' 'libxi' 'desktop-file-utils' 'gsfonts' 'libxpm')
+depends=('libpng' 'libjpeg' 'libxaw' 'libxi' 'desktop-file-utils' 'gsfonts')
 makedepends=('imake')
 optdepends=('transfig: to use the frontend to convert fig files')
 options=('!makeflags' '!emptydirs')
 install=xfig.install
 source=(http://downloads.sourceforge.net/mcj/${pkgname}.${pkgver}.full.tar.gz \
 	xfig-3.2.4-redhat.patch xfig-3.2.5-color-resources.patch \
-        xfig-3.2.5-enable-Xaw3d.patch xfig-3.2.5-urwfonts.patch \
+        xfig-3.2.5-urwfonts.patch \
         xfig-3.2.5-fhs.patch xfig-3.2.5-missing-protos.patch \
         xfig.3.2.5-modularX.patch xfig-3.2.5b-fix-eps-reading.patch \
         xfig-3.2.5b-libpng-1.5.patch LICENSE xfig.desktop)
 sha1sums=('0730d7e6bc217c0de02682efb0078821512bb542'
           '926ad99c7221baa4aa9e9737722958860b2700fc'
           'b7c03fb70066ff476a4039a8c0f8930c15edef68'
-          '33bff26b42ce164e79de11808b5b34b363f0d59f'
           'e595ccdbe293ea0fdecbf59a2192ae57ced2c8eb'
           '39bec6bac9746b643b05fd1286826113ede07ff6'
           'bd76cd50be6a5789cfd6f182309cfd7056be04f3'
@@ -37,12 +36,12 @@
   patch -p1 < ../xfig-3.2.4-redhat.patch
   patch -p1 < ../xfig-3.2.5-fhs.patch
   patch -p1 < ../xfig.3.2.5-modularX.patch
-  patch -p1 < ../xfig-3.2.5-enable-Xaw3d.patch
   patch -p1 < ../xfig-3.2.5-color-resources.patch
   patch -p1 < ../xfig-3.2.5-urwfonts.patch
   patch -p1 < ../xfig-3.2.5-missing-protos.patch
   patch -p1 < ../xfig-3.2.5b-fix-eps-reading.patch
   patch -p1 < ../xfig-3.2.5b-libpng-1.5.patch
+  sed -i 's/#define XAW3D/XCOMM #define XAW3D/' Imakefile
   chmod 755 Libraries
 
   xmkmf

Deleted: xfig-3.2.5-enable-Xaw3d.patch
===================================================================
--- xfig-3.2.5-enable-Xaw3d.patch	2012-04-01 23:44:22 UTC (rev 155346)
+++ xfig-3.2.5-enable-Xaw3d.patch	2012-04-02 00:25:25 UTC (rev 155347)
@@ -1,18 +0,0 @@
-diff -up xfig.3.2.5/Imakefile.no-Xaw3d xfig.3.2.5/Imakefile
---- xfig.3.2.5/Imakefile.no-Xaw3d	2007-11-16 10:38:18.000000000 +0100
-+++ xfig.3.2.5/Imakefile	2007-11-16 10:38:49.000000000 +0100
-@@ -50,8 +50,8 @@ XAPPLOADDIR = /usr/share/X11/app-default
- XCOMM Uncomment the following if you have David Hawkey's Xaw3D version 1.5E which has
- XCOMM some new features, including "Tips", which replace xfig's "help balloons"
- XCOMM NOTE: This is the default for many X systems now.
-
--XCOMM #define XAW3D1_5E
-+#define XAW3D1_5E
- 
- #ifdef XAW3D1_5E
-     DUSEXAW3D = -DXAW3D -DXAW3D1_5E
--    XAWLIB = -lXaw3d15e
-+    XAWLIB = -lXaw3d
- #else
-     XAW_SRC = w_menuentry.c SmeCascade.c SmeBSB.c SimpleMenu.c
-     XAW_OBJ = w_menuentry.o SmeCascade.o SmeBSB.o SimpleMenu.o