[arch-commits] Commit in xfig/repos (15 files)
Eric Bélanger
eric at archlinux.org
Fri Aug 14 04:13:37 UTC 2009
Date: Friday, August 14, 2009 @ 00:13:37
Author: eric
Revision: 49623
Merged revisions 49592 via svnmerge from
svn+ssh://svn.archlinux.org/srv/svn-packages/xfig/trunk
........
r49592 | eric | 2009-08-13 22:58:44 -0400 (Thu, 13 Aug 2009) | 2 lines
upgpkg: xfig 3.2.5b-1
Upstream update, Improved description, Updated and cleaned up patches, Fixed files and directory permissions, Added force option
........
Modified:
xfig/repos/extra-i686/ (properties)
xfig/repos/extra-i686/ChangeLog
xfig/repos/extra-i686/PKGBUILD
xfig/repos/extra-i686/xfig-3.2.4-redhat.patch
xfig/repos/extra-i686/xfig-3.2.5-color-resources.patch
xfig/repos/extra-i686/xfig-3.2.5-enable-Xaw3d.patch
xfig/repos/extra-i686/xfig-3.2.5-fhs.patch
xfig/repos/extra-i686/xfig-3.2.5-missing-protos.patch
xfig/repos/extra-i686/xfig.3.2.5-modularX.patch
Deleted:
xfig/repos/extra-i686/xfig-3.2.5-mkstemp.diff
xfig/repos/extra-i686/xfig-3.2.5-modepanel.patch
xfig/repos/extra-i686/xfig-3.2.5-quiet.patch
xfig/repos/extra-i686/xfig-3.2.5-zoom-crash.patch
xfig/repos/extra-i686/xfig.3.2.5-Xaw3d.patch
xfig/repos/extra-i686/xfig.png
----------------------------------+
ChangeLog | 9 +
PKGBUILD | 64 ++-----
xfig-3.2.4-redhat.patch | 4
xfig-3.2.5-color-resources.patch | 44 ++---
xfig-3.2.5-enable-Xaw3d.patch | 22 --
xfig-3.2.5-fhs.patch | 8
xfig-3.2.5-missing-protos.patch | 116 -------------
xfig-3.2.5-mkstemp.diff | 311 -------------------------------------
xfig-3.2.5-modepanel.patch | 24 --
xfig-3.2.5-quiet.patch | 12 -
xfig-3.2.5-zoom-crash.patch | 60 -------
xfig.3.2.5-Xaw3d.patch | 11 -
xfig.3.2.5-modularX.patch | 6
13 files changed, 63 insertions(+), 628 deletions(-)
Property changes on: xfig/repos/extra-i686
___________________________________________________________________
Modified: svnmerge-integrated
- /xfig/trunk:1-44416
+ /xfig/trunk:1-49622
Modified: extra-i686/ChangeLog
===================================================================
--- extra-i686/ChangeLog 2009-08-14 04:05:21 UTC (rev 49622)
+++ extra-i686/ChangeLog 2009-08-14 04:13:37 UTC (rev 49623)
@@ -1,3 +1,12 @@
+2009-08-13 Eric Belanger <eric at archlinux.org>
+
+ * xfig 3.2.5b-1
+ * Upstream update
+ * Improved description
+ * Updated and cleaned up patches
+ * Fixed files and directory permissions
+ * Added force option
+
2009-07-01 Eric Belanger <eric at archlinux.org>
* xfig 3.2.5-3
Modified: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD 2009-08-14 04:05:21 UTC (rev 49622)
+++ extra-i686/PKGBUILD 2009-08-14 04:13:37 UTC (rev 49623)
@@ -3,73 +3,55 @@
# Contributor: Ben <ben at benmazer.net>
pkgname=xfig
-pkgver=3.2.5
-pkgrel=3
-pkgdesc="Xfig drawing tool"
+pkgver=3.2.5b
+pkgrel=1
+pkgdesc="An interactive drawing tool"
arch=('i686' 'x86_64')
url="http://www.xfig.org"
license=('custom')
depends=('libpng' 'libjpeg>=7' 'xaw3d>=1.5E' 'libxi' 'desktop-file-utils')
makedepends=('imake')
optdepends=('transfig: to use the frontend to convert fig files')
-options=('!makeflags' '!emptydirs')
+options=('!makeflags' '!emptydirs' 'force')
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-enable-Xaw3d.patch xfig-3.2.5-urwfonts.patch \
xfig-3.2.5-fhs.patch xfig-3.2.5-missing-protos.patch \
- xfig-3.2.5-mkstemp.diff xfig-3.2.5-modepanel.patch \
- xfig-3.2.5-quiet.patch xfig-3.2.5-urwfonts.patch \
- xfig-3.2.5-zoom-crash.patch xfig.3.2.5-Xaw3d.patch \
- xfig.3.2.5-modularX.patch LICENSE xfig.desktop xfig.png)
-md5sums=('fae0c67a3951bd41c057deb63b6aa47a' 'eddf54ba411da92c2b58aef8169ffddd'\
- 'af171656320c7d30d381c5ceb799b0f6' '00985b3ef840171a1910a48ed1acf7e2'\
- 'b17069a48c157b6afbd74cfae21e7f73' '29fe2a11f3520e8c5c3330c87eb52e74'\
- 'e8ed46711a875701037c2c83d56efb6e' 'ed8ff51f215d99046d5c1e83505fbf24'\
- 'a77e18752385fb9e637c1d18bf6c33bc' 'c5b7dc054063f02c6bfcd132dae82b6f'\
- '21afcf387f76f756abbb11e6544a2d2f' '8689364e6b18c7f6b1afcb3afb7b3d30'\
- 'a9e001daf43022e9453504933ad28d49' 'f405b7a96f3401c12153fe6170a7d8f1'\
- '8ac2de637c9148aa4a32978910822230' '8c99ca12404ed300c77106458c7340c0')
-sha1sums=('ce09d1a74dbddf0bc6b20fe9c558db584fbfed17'
- 'cfe1c3c7864045966792d81fbcb03dd6dfc62ccb'
- 'bb33f4ded24ab6167fc253bc1add9d8cd2da43bb'
- '7555cda41f7b14958be6fa6402c48b0489271864'
- '95413aa929341349786561aa91f57b15d06c4257'
- '1fb2efd7cb3a00e57c6b9614ac77dc8d04f50ab2'
- '7af8464d143e35f9fac7254fe6a18717d6cfd24a'
- 'fd18fad3d8768a6d9736a9fac88de4abaaa5b79d'
- 'a9a8e5fe88d8235e66adfc6e27a6e1d72f40d6f3'
- 'e595ccdbe293ea0fdecbf59a2192ae57ced2c8eb'
- 'a5ad69bb7b03f023ef502bdad18971b565a55ddd'
- 'c82e6acab6af3d68d8421657aec889acb733e68e'
- '41640f6fe0ef90bf5ec417e84f3a041e3b51cffb'
- '31edf4cfab708820ea3f114d095dfef5aa88e5aa'
- '9011b8fa6143e37525b28cc9800a3bf2d6b008d2'
- '8b7554cfac560186e4cc6318e078c988bf228ab1')
+ xfig.3.2.5-modularX.patch LICENSE xfig.desktop)
+md5sums=('499b0ce103a6b353453bf7e327f9a3b9' '5c2bc208c8ee852bc9ffa00dcbfd8241'\
+ 'a4b91e4aaf48ed07f4a579a1f692ef82' '46c6fb15d26c9fe03e558bdacc0b0a53'\
+ 'c5b7dc054063f02c6bfcd132dae82b6f' 'b532871c792716465e3b05967bcfba10'\
+ 'de059a6b8ce287942c7da35d19ee46f3' '7347389f7fdecd582579845df0c0b664'\
+ 'f405b7a96f3401c12153fe6170a7d8f1' '8ac2de637c9148aa4a32978910822230')
+sha1sums=('0730d7e6bc217c0de02682efb0078821512bb542' '926ad99c7221baa4aa9e9737722958860b2700fc'\
+ 'b7c03fb70066ff476a4039a8c0f8930c15edef68' '33bff26b42ce164e79de11808b5b34b363f0d59f'\
+ 'e595ccdbe293ea0fdecbf59a2192ae57ced2c8eb' '39bec6bac9746b643b05fd1286826113ede07ff6'\
+ 'bd76cd50be6a5789cfd6f182309cfd7056be04f3' 'a1285f4e61ad2eec040460ab03e8022098e7f78e'\
+ '31edf4cfab708820ea3f114d095dfef5aa88e5aa' '9011b8fa6143e37525b28cc9800a3bf2d6b008d2')
build() {
cd "${srcdir}/${pkgname}.${pkgver}"
patch -p1 < ../xfig-3.2.4-redhat.patch || return 1
patch -p1 < ../xfig-3.2.5-fhs.patch || return 1
- patch -p1 < ../xfig-3.2.5-mkstemp.diff || return 1
patch -p1 < ../xfig.3.2.5-modularX.patch || return 1
- patch -p1 < ../xfig.3.2.5-Xaw3d.patch || return 1
patch -p1 < ../xfig-3.2.5-enable-Xaw3d.patch || return 1
patch -p1 < ../xfig-3.2.5-color-resources.patch || return 1
- patch -p1 < ../xfig-3.2.5-quiet.patch || return 1
patch -p1 < ../xfig-3.2.5-urwfonts.patch || return 1
- patch -p1 < ../xfig-3.2.5-zoom-crash.patch || return 1
patch -p1 < ../xfig-3.2.5-missing-protos.patch || return 1
- patch -p1 < ../xfig-3.2.5-modepanel.patch || return 1
+ chmod 755 Libraries
xmkmf || return 1
make DOCDIR=/usr/share/doc || return 1
make DESTDIR="${pkgdir}" DOCDIR=/usr/share/doc install.all || return 1
-
rm "${pkgdir}/usr/lib/X11/app-defaults"
- chmod 755 "${pkgdir}"/usr/share/xfig/Libraries/Fasteners/{,Bolts,Machinescrews,Springs,Woodscrews} || return 1
+ find "${pkgdir}/usr/share/xfig/Libraries" -type f -exec chmod 0644 {} \;
+ find "${pkgdir}/usr/share/xfig/Libraries" -type d -exec chmod 0755 {} \;
+ find "${pkgdir}/usr/share/doc/xfig" -type f -exec chmod 0644 {} \;
+ find "${pkgdir}/usr/share/doc/xfig" -type d -exec chmod 0755 {} \;
+
install -D -m644 ../xfig.desktop "${pkgdir}/usr/share/applications/xfig.desktop" || return 1
- install -D -m644 ../xfig.png "${pkgdir}/usr/share/pixmaps/xfig.png" || return 1
+ install -D -m644 xfig.png "${pkgdir}/usr/share/pixmaps/xfig.png" || return 1
install -D -m644 ../LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" || return 1
}
Modified: extra-i686/xfig-3.2.4-redhat.patch
===================================================================
--- extra-i686/xfig-3.2.4-redhat.patch 2009-08-14 04:05:21 UTC (rev 49622)
+++ extra-i686/xfig-3.2.4-redhat.patch 2009-08-14 04:13:37 UTC (rev 49623)
@@ -13,12 +13,12 @@
! This is for viewing the xfig html reference.
! For netscape, this command will open the help pages in a running netscape,
! or start a new netscape if one isn't already running
--Fig.browser: netscape -remote 'openFile(%f)' || netscape %f
+-Fig.browser: firefox -remote 'openFile(%f)' || firefox %f
+Fig.browser: xdg-open %f
! pdfviewer - put your favorite pdf viewer here.
! This is for viewing the xfig how-to guide and man pages
--Fig.pdfviewer: acroread %f
+-Fig.pdfviewer: xpdf %f
+Fig.pdfviewer: xdg-open %f
! Spell check program - put your favorite spelling check program here.
Modified: extra-i686/xfig-3.2.5-color-resources.patch
===================================================================
--- extra-i686/xfig-3.2.5-color-resources.patch 2009-08-14 04:05:21 UTC (rev 49622)
+++ extra-i686/xfig-3.2.5-color-resources.patch 2009-08-14 04:13:37 UTC (rev 49623)
@@ -1,30 +1,30 @@
-diff -up xfig.3.2.5/Fig-color.ad~ xfig.3.2.5/Fig-color.ad
---- xfig.3.2.5/Fig-color.ad~ 2007-11-16 13:47:45.000000000 +0100
-+++ xfig.3.2.5/Fig-color.ad 2007-11-16 13:47:52.000000000 +0100
+diff -up xfig.3.2.5/Fig-color.bisque.ad~ xfig.3.2.5/Fig-color.bisque.ad
+--- xfig.3.2.5/Fig-color.bisque.ad~ 2007-11-16 13:47:45.000000000 +0100
++++ xfig.3.2.5/Fig-color.bisque.ad 2007-11-16 13:47:52.000000000 +0100
@@ -93,7 +93,7 @@ Fig*sideruler.background: gray95
-
- Fig*FigList*background: gray95
- Fig*List*background: gray95
--Fig*Scrollbar.background: gray95
-+! Fig*Scrollbar.background: gray95
-
- Fig*Label.background: gray80
- Fig*ind_box.background: gray80
-@@ -104,8 +104,8 @@ Fig*button_form.update*foreground: red
- Fig*upd_ctrl_form.upd_ctrl_btns*shadowWidth: 2
-
+ Fig*topruler.background: gray95
+ Fig*sideruler.background: gray95
+ Fig*List*background: gray95
+-Fig*Scrollbar.background: gray95
++! Fig*Scrollbar.background: gray95
+
+ Fig*cancel.background: navajowhite1
+ Fig*dismiss.background: navajowhite1
+@@ -104,8 +104,8 @@ Fig*menu_divider.foreground: red
+ Fig*menu_divider.foreground: red
+
!##### Shadows
--Fig*shadowWidth: 1
--Fig*Label.shadowWidth: 1
-+!Fig*shadowWidth: 1
-+!Fig*Label.shadowWidth: 1
- Fig*horizontal.shadowWidth: 2
- Fig*Scrollbar.shadowWidth: 2
+-Fig*shadowWidth: 2
+-Fig*Label.shadowWidth: 1
++! Fig*shadowWidth: 2
++! Fig*Label.shadowWidth: 1
+ Fig*horizontal.shadowWidth: 2
+ Fig*Scrollbar.shadowWidth: 2
! no shadows for update indicators
@@ -136,3 +136,15 @@ Fig*color_box*topShadowPixel: gray80
- Fig*toggle*bottomShadowPixel: gray80
- Fig*toggle*topShadowPixel: gray50
+ Fig*toggle*bottomShadowPixel: gray80
+ Fig*toggle*topShadowPixel: gray50
+
+! repare damage done to scrollbar shadows non color resources file
+
Modified: extra-i686/xfig-3.2.5-enable-Xaw3d.patch
===================================================================
--- extra-i686/xfig-3.2.5-enable-Xaw3d.patch 2009-08-14 04:05:21 UTC (rev 49622)
+++ extra-i686/xfig-3.2.5-enable-Xaw3d.patch 2009-08-14 04:13:37 UTC (rev 49623)
@@ -1,16 +1,11 @@
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,16 +50,16 @@ XAPPLOADDIR = /usr/share/X11/app-default
- XCOMM Uncomment the following definition for XAW3D if you want to use
- XCOMM the 3d Athena Widget Set (highly recommended!)
-
--XCOMM #define XAW3D
-+#define XAW3D
-
+@@ -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
@@ -21,14 +16,3 @@
#else
XAW_SRC = w_menuentry.c SmeCascade.c SmeBSB.c SimpleMenu.c
XAW_OBJ = w_menuentry.o SmeCascade.o SmeBSB.o SimpleMenu.o
-diff -up xfig.3.2.5/w_library.c.no-Xaw3d xfig.3.2.5/w_library.c
---- xfig.3.2.5/w_library.c.no-Xaw3d 2006-04-03 18:27:30.000000000 +0200
-+++ xfig.3.2.5/w_library.c 2007-11-16 10:38:18.000000000 +0100
-@@ -1029,6 +1029,7 @@ make_library_menu(Widget parent, char *n
- Widget menu, entry;
- #ifndef XAW3D1_5E
- Widget submenu;
-+#else
- char submenu_name[200];
- #endif /* XAW3D1_5E */
- char menu_name[200];
Modified: extra-i686/xfig-3.2.5-fhs.patch
===================================================================
--- extra-i686/xfig-3.2.5-fhs.patch 2009-08-14 04:05:21 UTC (rev 49622)
+++ extra-i686/xfig-3.2.5-fhs.patch 2009-08-14 04:13:37 UTC (rev 49623)
@@ -1,6 +1,6 @@
--- xfig.3.2.5/Imakefile.fhs 2006-10-11 01:19:22.000000000 +0200
+++ xfig.3.2.5/Imakefile 2007-04-16 14:04:45.000000000 +0200
-@@ -169,13 +169,11 @@
+@@ -169,8 +169,7 @@
XFIGLIBDIR = $(LIBDIR)/xfig
XCOMM XFIGDOCDIR tells where the html and pdf documentation should go
@@ -10,9 +10,3 @@
XCOMM MANDIR tells where the standard man pages should go (no need to change it
XCOMM if you want the man pages installed in the standard place on your system
--XCOMM MANDIR = $(MANSOURCEPATH)$(MANSUFFIX)
--MANDIR = /usr/local/xfig/man
-+MANDIR = $(MANSOURCEPATH)$(MANSUFFIX)
-
- XCOMM If your system doesn't have strstr undefine the following definition
- XCOMM HAVE_NO_NOSTRSTR = -DNOSTRSTR
Modified: extra-i686/xfig-3.2.5-missing-protos.patch
===================================================================
--- extra-i686/xfig-3.2.5-missing-protos.patch 2009-08-14 04:05:21 UTC (rev 49622)
+++ extra-i686/xfig-3.2.5-missing-protos.patch 2009-08-14 04:13:37 UTC (rev 49623)
@@ -1,119 +1,3 @@
-diff -ur xfig.3.2.5/e_chop.c xfig.3.2.5.new/e_chop.c
---- xfig.3.2.5/e_chop.c 2005-07-26 18:56:28.000000000 +0200
-+++ xfig.3.2.5.new/e_chop.c 2008-04-03 18:58:07.000000000 +0200
-@@ -20,6 +20,7 @@
-
- #include <stdlib.h>
- #include <alloca.h>
-+#include <math.h>
- #include "fig.h"
- #include "resources.h"
- #include "mode.h"
-@@ -29,6 +30,9 @@
- #include "u_list.h"
- #include "u_search.h"
- #include "u_undo.h"
-+#include "u_markers.h"
-+#include "u_geom.h"
-+#include "u_redraw.h"
- #include "w_canvas.h"
- #include "w_drawprim.h"
- #include "w_mousefun.h"
-@@ -37,6 +41,8 @@
- #include "w_zoom.h"
- #include "w_snap.h"
- #include "w_intersect.h"
-+#include "w_cursor.h"
-+#include "f_util.h"
-
- static void select_axe_object();
- static void select_log_object();
-diff -ur xfig.3.2.5/main.c xfig.3.2.5.new/main.c
---- xfig.3.2.5/main.c 2008-04-03 19:28:25.000000000 +0200
-+++ xfig.3.2.5.new/main.c 2008-04-03 19:26:36.000000000 +0200
-@@ -68,6 +68,8 @@
- #include <X11/keysym.h>
- #endif /* I18N */
-
-+#include <X11/IntrinsicP.h>
-+
- /* EXPORTS */
-
- Boolean geomspec;
-diff -ur xfig.3.2.5/w_intersect.c xfig.3.2.5.new/w_intersect.c
---- xfig.3.2.5/w_intersect.c 2004-09-29 23:46:00.000000000 +0200
-+++ xfig.3.2.5.new/w_intersect.c 2008-04-03 19:25:08.000000000 +0200
-@@ -23,6 +23,8 @@
- #include "mode.h"
- #include "w_snap.h"
- #include "w_intersect.h"
-+#include "w_msgpanel.h"
-+#include "f_util.h"
- #include "u_quartic.h"
- #include <math.h>
- #include <complex.h>
-diff -ur xfig.3.2.5/w_intersect.h xfig.3.2.5.new/w_intersect.h
---- xfig.3.2.5/w_intersect.h 2004-09-28 05:05:03.000000000 +0200
-+++ xfig.3.2.5.new/w_intersect.h 2008-04-03 19:15:44.000000000 +0200
-@@ -59,4 +59,6 @@
-
- extern F_line * build_text_bounding_box(F_text * t);
-
-+extern void delete_text_bounding_box(F_line * l);
-+
- #endif
-diff -ur xfig.3.2.5/w_keyboard.c xfig.3.2.5.new/w_keyboard.c
---- xfig.3.2.5/w_keyboard.c 2004-11-09 22:10:22.000000000 +0100
-+++ xfig.3.2.5.new/w_keyboard.c 2008-04-03 19:24:23.000000000 +0200
-@@ -31,7 +31,9 @@
- #include "w_setup.h"
- #include "w_indpanel.h"
- #include "w_util.h"
-+#include "w_msgpanel.h"
- #include "w_keyboard.h"
-+#include "f_util.h"
-
- #if defined(__CYGWIN__)
- #define REG_NOERROR REG_OKAY
-diff -ur xfig.3.2.5/w_snap.c xfig.3.2.5.new/w_snap.c
---- xfig.3.2.5/w_snap.c 2004-09-29 23:52:16.000000000 +0200
-+++ xfig.3.2.5.new/w_snap.c 2008-04-03 19:16:37.000000000 +0200
-@@ -27,7 +27,10 @@
- #include "w_setup.h"
- #include "w_indpanel.h"
- #include "w_util.h"
-+#include "w_msgpanel.h"
- #include "u_quartic.h"
-+#include "u_search.h"
-+#include "f_util.h"
- #include <math.h>
- #include <alloca.h>
-
-@@ -850,6 +853,12 @@
- }
-
-
-+#ifdef signbit
-+#undef signbit
-+#endif
-+#define signbit(x) \
-+ ((0.0 > (x)) ? 1 : 0)
-+
- Boolean
- is_point_on_arc(a, x, y)
- F_arc * a;
-diff -ur xfig.3.2.5/w_snap.h xfig.3.2.5.new/w_snap.h
---- xfig.3.2.5/w_snap.h 2004-11-09 22:14:42.000000000 +0100
-+++ xfig.3.2.5.new/w_snap.h 2008-04-03 19:15:49.000000000 +0200
-@@ -63,8 +63,4 @@
- extern Widget snap_indicator_panel;
- extern Widget snap_indicator_label;
-
--# define signbit(x) \
-- ((0.0 > (x)) ? 1 : 0)
--
--
- #endif
diff -up xfig.3.2.5/u_draw.c~ xfig.3.2.5/u_draw.c
--- xfig.3.2.5/u_draw.c~ 2008-04-03 15:58:23.000000000 +0200
+++ xfig.3.2.5/u_draw.c 2008-04-03 15:58:23.000000000 +0200
Deleted: extra-i686/xfig-3.2.5-mkstemp.diff
===================================================================
--- extra-i686/xfig-3.2.5-mkstemp.diff 2009-08-14 04:05:21 UTC (rev 49622)
+++ extra-i686/xfig-3.2.5-mkstemp.diff 2009-08-14 04:13:37 UTC (rev 49623)
@@ -1,311 +0,0 @@
---- xfig.3.2.5/f_readtif.c.mkstemp 2005-07-26 18:39:59.000000000 +0200
-+++ xfig.3.2.5/f_readtif.c 2007-04-16 14:05:22.000000000 +0200
-@@ -33,11 +33,16 @@
- {
- char buf[2*PATH_MAX+40],pcxname[PATH_MAX];
- FILE *tiftopcx;
-- int stat;
-+ int stat, fd;
-
- /* make name for temp output file */
-- sprintf(pcxname, "%s/%s%06d.pix", TMPDIR, "xfig-pcx", getpid());
--
-+ snprintf(pcxname, sizeof(pcxname), "%s/xfig-pcx.XXXXXX", TMPDIR);
-+ if ((fd = mkstemp(pcxname)) == -1) {
-+ file_msg("Cannot open temp file %s: %s\n", pcxname, strerror(errno));
-+ return FileInvalid;
-+ }
-+ close(fd);
-+
- /* make command to convert tif to pnm then to pcx into temp file */
- /* for some reason, tifftopnm requires a file and can't work in a pipe */
- sprintf(buf, "tifftopnm %s 2> /dev/null | ppmtopcx > %s 2> /dev/null",
---- xfig.3.2.5/u_print.c.mkstemp 2006-02-24 21:18:11.000000000 +0100
-+++ xfig.3.2.5/u_print.c 2007-04-16 14:05:22.000000000 +0200
-@@ -92,9 +92,16 @@
- char syspr[2*PATH_MAX+200];
- char tmpfile[PATH_MAX];
- char *name;
-+ int fd;
-
-- sprintf(tmpfile, "%s/%s%06d", TMPDIR, "xfig-print", getpid());
-+ snprintf(tmpfile, sizeof(tmpfile), "%s/xfig-print.XXXXXX", TMPDIR);
- warnexist = False;
-+ if ((fd = mkstemp(tmpfile)) == -1) {
-+ file_msg("Can't open temp file %s: %s\n", tmpfile, strerror(errno));
-+ return;
-+ }
-+ close(fd);
-+
- init_write_tmpfile();
- if (write_file(tmpfile, False)) {
- end_write_tmpfile();
-@@ -648,10 +655,16 @@
- char errfname[PATH_MAX];
- FILE *errfile;
- char str[400];
-- int status;
-+ int status, fd;
-
- /* make temp filename for any errors */
-- sprintf(errfname, "%s/xfig-export%06d.err", TMPDIR, getpid());
-+ snprintf(errfname, sizeof(errfname), "%s/xfig-export.XXXXXX", TMPDIR);
-+ if ((fd = mkstemp(errfname)) == -1) {
-+ file_msg("Can't open temp file %s: %s\n", errfname, strerror(errno));
-+ return 1;
-+ }
-+ close(fd);
-+
- /* direct any output from fig2dev to this file */
- strcat(command, " 2> ");
- strcat(command, errfname);
---- xfig.3.2.5/f_util.c.mkstemp 2007-01-16 18:58:18.000000000 +0100
-+++ xfig.3.2.5/f_util.c 2007-04-16 14:05:22.000000000 +0200
-@@ -906,14 +906,20 @@
- int strain_out(char *name)
- {
- char line[RC_BUFSIZ+1], *tok;
-+ int fd;
-
- /* make a temp filename in the user's home directory so we
- can just rename it to .xfigrc after creating it */
-- sprintf(tmpname, "%s/%s%06d", userhome, "xfig-xfigrc", getpid());
-- tmpf = fopen(tmpname,"wb");
-- if (tmpf == 0) {
-- file_msg("Can't make temporary file for .xfigrc - error: %s",strerror(errno));
-- return -1;
-+ snprintf(tmpname, sizeof(tmpname), "%s/xfig-xfigrc.XXXXXX", userhome);
-+
-+ if ((fd = mkstemp(tmpname)) == -1 || (tmpf = fdopen(fd, "wb")) == NULL) {
-+ file_msg("Can't make temporary file for .xfigrc - error: %s",
-+ strerror(errno));
-+ if (fd != -1) {
-+ unlink(tmpname);
-+ close(fd);
-+ }
-+ return -1;
- }
- /* read the .xfigrc file and write all to temp file except file names */
- xfigrc = fopen(xfigrc_name,"r");
---- xfig.3.2.5/main.c.mkstemp 2007-01-15 01:24:26.000000000 +0100
-+++ xfig.3.2.5/main.c 2007-04-16 14:05:22.000000000 +0200
-@@ -653,8 +653,10 @@
- update_figs = False;
-
- /* get the TMPDIR environment variable for temporary files */
-- if ((TMPDIR = getenv("XFIGTMPDIR"))==NULL)
-- TMPDIR = "/tmp";
-+ if ((TMPDIR = getenv("XFIGTMPDIR"))==NULL) {
-+ if ((TMPDIR = getenv("TMPDIR")) == NULL)
-+ TMPDIR = "/tmp";
-+ }
-
- /* first check args to see if user wants to scale the figure as it is
- read in and make sure it is a resonable (positive) number */
-@@ -1669,7 +1671,14 @@
- if (userhome != NULL && *strcpy(cut_buf_name, userhome) != '\0') {
- strcat(cut_buf_name, "/.xfig");
- } else {
-- sprintf(cut_buf_name, "%s/xfig%06d", TMPDIR, getpid());
-+ int fd;
-+ sprintf(cut_buf_name, "%s/xfig.XXXXXX", TMPDIR);
-+ if ((fd = mkstemp(cut_buf_name)) == -1) {
-+ fprintf(stderr, "Can't create temporary file for cut_buff: %s\n",
-+ strerror(errno));
-+ exit(0);
-+ }
-+ close(fd);
- }
- }
-
---- xfig.3.2.5/w_print.c.mkstemp 2005-07-26 18:40:01.000000000 +0200
-+++ xfig.3.2.5/w_print.c 2007-04-16 14:05:22.000000000 +0200
-@@ -294,9 +294,10 @@
- do_print_batch(Widget w)
- {
- FILE *infp,*outfp;
-- char tmp_exp_file[32];
-+ char tmp_exp_file[PATH_MAX];
- char str[255];
- char backgrnd[10], grid[80];
-+ int fd;
-
- if (writing_batch || emptyfigure_msg(print_msg))
- return;
-@@ -305,11 +306,20 @@
- /* this could happen if the user presses the button too fast */
- writing_batch = True;
-
-- /* make a temporary name to write the batch stuff to */
-- sprintf(batch_file, "%s/%s%06d", TMPDIR, "xfig-batch", getpid());
- /* make a temporary name to write this figure to */
-- sprintf(tmp_exp_file, "%s/%s%06d", TMPDIR, "xfig-exp", getpid());
-- batch_exists = True;
-+ snprintf(tmp_exp_file, sizeof(tmp_exp_file), "%s/xfig-exp.XXXXXX",
-+ TMPDIR);
-+
-+ if (batch_exists != True) {
-+ /* make a temporary name to write the batch stuff to */
-+ sprintf(batch_file, "%s/xfig-batch.XXXXXX", TMPDIR);
-+ if ((fd = mkstemp(batch_file)) == -1) {
-+ file_msg("Error creating temporary file");
-+ return;
-+ }
-+ close(fd);
-+ batch_exists = True;
-+ }
- if (!print_popup)
- create_print_panel(w);
-
-@@ -322,6 +332,12 @@
- /* make a #rrggbb string from the background color */
- make_rgb_string(export_background_color, backgrnd);
-
-+ if ((fd = mkstemp(tmp_exp_file)) == -1) {
-+ file_msg("Error creating temporary file");
-+ return;
-+ }
-+ close(fd);
-+
- /* get grid params and assemble into fig2dev parm */
- get_grid_spec(grid, print_grid_minor_text, print_grid_major_text);
-
---- xfig.3.2.5/f_readppm.c.mkstemp 2005-07-26 18:39:59.000000000 +0200
-+++ xfig.3.2.5/f_readppm.c 2007-04-16 14:05:22.000000000 +0200
-@@ -34,10 +34,16 @@
- {
- char buf[BUFLEN],pcxname[PATH_MAX];
- FILE *giftopcx;
-- int stat, size;
-+ int stat, size, fd;
-
- /* make name for temp output file */
-- sprintf(pcxname, "%s/%s%06d.pix", TMPDIR, "xfig-pcx", getpid());
-+ snprintf(pcxname, sizeof(pcxname), "%s/xfig-pcx.XXXXXX", TMPDIR);
-+ if ((fd = mkstemp(pcxname)) == -1) {
-+ file_msg("Cannot open temp file %s: %s\n", pcxname, strerror(errno));
-+ return FileInvalid;
-+ }
-+ close(fd);
-+
- /* make command to convert gif to pcx into temp file */
- sprintf(buf, "ppmtopcx > %s 2> /dev/null", pcxname);
- if ((giftopcx = popen(buf,"w" )) == 0) {
---- xfig.3.2.5/f_readgif.c.mkstemp 2005-07-26 18:39:59.000000000 +0200
-+++ xfig.3.2.5/f_readgif.c 2007-04-16 14:05:22.000000000 +0200
-@@ -76,7 +76,7 @@
- char buf[BUFLEN],pcxname[PATH_MAX];
- FILE *giftopcx;
- struct Cmap localColorMap[MAX_COLORMAP_SIZE];
-- int i, stat, size;
-+ int i, stat, size, fd;
- int useGlobalColormap;
- unsigned int bitPixel, red, green, blue;
- unsigned char c;
-@@ -173,7 +173,13 @@
- /* now call giftopnm and ppmtopcx */
-
- /* make name for temp output file */
-- sprintf(pcxname, "%s/%s%06d.pix", TMPDIR, "xfig-pcx", getpid());
-+ snprintf(pcxname, sizeof(pcxname), "%s/xfig-pcx.XXXXXX", TMPDIR);
-+ if ((fd = mkstemp(pcxname)) == -1) {
-+ file_msg("Cannot create temporary file\n");
-+ return FileInvalid;
-+ }
-+ close(fd);
-+
- /* make command to convert gif to pcx into temp file */
- sprintf(buf, "giftopnm | ppmtopcx > %s 2> /dev/null", pcxname);
- if ((giftopcx = popen(buf,"w" )) == 0) {
---- xfig.3.2.5/w_srchrepl.c.mkstemp 2005-07-26 18:40:02.000000000 +0200
-+++ xfig.3.2.5/w_srchrepl.c 2007-04-16 14:05:22.000000000 +0200
-@@ -788,7 +788,7 @@
- char *cmd;
- char str[300];
- FILE *fp;
-- int len, i;
-+ int len, i, fd;
- Boolean done = FALSE;
- static int lines = 0;
-
-@@ -804,9 +804,12 @@
- }
- lines = 0;
-
-- sprintf(filename, "%s/xfig-spell.%d", TMPDIR, (int)getpid());
-- fp = fopen(filename, "w");
-- if (fp == NULL) {
-+ snprintf(filename, sizeof(filename), "%s/xfig-spell.XXXXXX", TMPDIR);
-+ if ((fd = mkstemp(filename)) == -1 || (fp = fdopen(fd, "w")) == NULL) {
-+ if (fd != -1) {
-+ unlink(filename);
-+ close(fd);
-+ }
- file_msg("Can't open temporary file: %s: %s\n", filename, strerror(errno));
- } else {
- /* locate all text objects and write them to file fp */
---- xfig.3.2.5/f_readeps.c.mkstemp 2005-10-31 18:40:38.000000000 +0100
-+++ xfig.3.2.5/f_readeps.c 2007-04-16 14:19:32.000000000 +0200
-@@ -250,11 +250,10 @@
- int urx, llx, ury, lly;
- int pdf_flag;
- {
-- static tempseq = 0;
- char buf[300];
- FILE *tmpfp, *pixfile, *gsfile;
- char *psnam, *driver;
-- int status, wid, ht, nbitmap;
-+ int status, wid, ht, nbitmap, fd;
- char tmpfile[PATH_MAX],
- pixnam[PATH_MAX],
- errnam[PATH_MAX],
-@@ -270,8 +269,12 @@
- /* re-open the pipe */
- close_picfile(file, filetype);
- file = open_picfile(tmpfile, &filetype, PIPEOK, pixnam);
-- sprintf(tmpfile, "%s/%s%06d", TMPDIR, "xfig-eps", getpid());
-- if ((tmpfp = fopen(tmpfile, "wb")) == NULL) {
-+ snprintf(tmpfile, sizeof(tmpfile), "%s/xfig-eps.XXXXXX", TMPDIR);
-+ if ((fd = mkstemp(tmpfile)) == -1 || (tmpfp = fdopen(fd, "wb")) == NULL) {
-+ if (fd != -1) {
-+ unlink(tmpfile);
-+ close(fd);
-+ }
- file_msg("Couldn't open tmp file %s, %s", tmpfile, strerror(errno));
- return False;
- }
-@@ -280,10 +283,20 @@
- fclose(tmpfp);
- }
- /* make name /TMPDIR/xfig-pic######.pix */
-- sprintf(pixnam, "%s/%s%06d.pix", TMPDIR, "xfig-pic", tempseq);
-+ snprintf(pixnam, sizeof(pixnam), "%s/xfig-pic.XXXXXX", TMPDIR);
-+ if ((fd = mkstemp(pixnam)) == -1) {
-+ file_msg("Couldn't open tmp file %s, %s", pixnam, strerror(errno));
-+ return False;
-+ }
-+ close(fd);
-+
- /* and file name for any error messages from gs */
-- sprintf(errnam, "%s/%s%06d.err", TMPDIR, "xfig-pic", tempseq);
-- tempseq++;
-+ snprintf(errnam, sizeof(errnam), "%s/xfig-picerr.XXXXXX", TMPDIR);
-+ if ((fd = mkstemp(errnam)) == -1) {
-+ file_msg("Couldn't open tmp file %s, %s", errnam, strerror(errno));
-+ return False;
-+ }
-+ close(fd);
-
- /* generate gs command line */
- /* for monochrome, use pbm */
---- xfig.3.2.5/mode.c.mkstemp 2005-07-26 18:40:00.000000000 +0200
-+++ xfig.3.2.5/mode.c 2007-04-16 14:05:22.000000000 +0200
-@@ -86,7 +86,7 @@
-
- int cur_exp_lang; /* gets initialized in main.c */
- Boolean batch_exists = False;
--char batch_file[32];
-+char batch_file[PATH_MAX];
-
- /*******************************************************************/
- /* If you change the order of the lang_items[] you must change the */
Deleted: extra-i686/xfig-3.2.5-modepanel.patch
===================================================================
--- extra-i686/xfig-3.2.5-modepanel.patch 2009-08-14 04:05:21 UTC (rev 49622)
+++ extra-i686/xfig-3.2.5-modepanel.patch 2009-08-14 04:13:37 UTC (rev 49623)
@@ -1,24 +0,0 @@
---- xfig.3.2.5/w_setup.c.dist 2008-12-08 01:35:22.000000000 -0500
-+++ xfig.3.2.5/w_setup.c 2008-12-08 01:36:31.000000000 -0500
-@@ -23,7 +23,7 @@
- #include "w_setup.h"
- #include "w_util.h"
-
--#define NUM_DRAW_SW 17 /* kludge - shouldn't have to edit this by hand */
-+#define NUM_DRAW_SW 15 /* kludge - number of switches above draw line*/
-
- int TOOL_WD, TOOL_HT;
- int CMDFORM_WD, CMDFORM_HT = CMD_BUT_HT;
-@@ -94,8 +94,10 @@
-
- /* space for both modepanel titles (Drawing modes and Editing modes) */
- MODEPANEL_SPACE = 1 + CANVAS_HT + RULER_WD -
-- (MODE_SW_HT + INTERNAL_BW) * (ceil((double)NUM_DRAW_SW/SW_PER_ROW) +
-- ceil((double)(NUM_MODE_SW-NUM_DRAW_SW)/SW_PER_ROW));
-+ (MODE_SW_HT + INTERNAL_BW) *
-+ (ceil(((double)NUM_DRAW_SW+1)/SW_PER_ROW) +
-+ ceil(((double)NUM_MODE_SW-NUM_DRAW_SW)/SW_PER_ROW));
-+
- if (MODEPANEL_SPACE < 2)
- MODEPANEL_SPACE = 2;
- }
Deleted: extra-i686/xfig-3.2.5-quiet.patch
===================================================================
--- extra-i686/xfig-3.2.5-quiet.patch 2009-08-14 04:05:21 UTC (rev 49622)
+++ extra-i686/xfig-3.2.5-quiet.patch 2009-08-14 04:13:37 UTC (rev 49623)
@@ -1,12 +0,0 @@
-diff -up xfig.3.2.5/w_drawprim.c~ xfig.3.2.5/w_drawprim.c
---- xfig.3.2.5/w_drawprim.c~ 2007-11-16 13:21:55.000000000 +0100
-+++ xfig.3.2.5/w_drawprim.c 2007-11-16 13:21:55.000000000 +0100
-@@ -512,7 +512,7 @@ void init_gc(void)
- gccache[ERASE] = makegc(ERASE, x_fg_color.pixel, x_bg_color.pixel);
- gccache[INV_PAINT] = makegc(INV_PAINT, x_fg_color.pixel, x_bg_color.pixel);
- /* parse any grid color spec */
--fprintf(stderr,"color = '%s'\n",appres.grid_color);
-+/* fprintf(stderr,"color = '%s'\n",appres.grid_color); */
- XParseColor(tool_d, tool_cm, appres.grid_color, &tmp_color);
- if (XAllocColor(tool_d, tool_cm, &tmp_color)==0) {
- fprintf(stderr,"Can't allocate color for grid \n");
Deleted: extra-i686/xfig-3.2.5-zoom-crash.patch
===================================================================
--- extra-i686/xfig-3.2.5-zoom-crash.patch 2009-08-14 04:05:21 UTC (rev 49622)
+++ extra-i686/xfig-3.2.5-zoom-crash.patch 2009-08-14 04:13:37 UTC (rev 49623)
@@ -1,60 +0,0 @@
-diff -up xfig.3.2.5/w_rulers.c~ xfig.3.2.5/w_rulers.c
---- xfig.3.2.5/w_rulers.c~ 2007-12-12 20:28:30.000000000 +0100
-+++ xfig.3.2.5/w_rulers.c 2007-12-12 20:28:30.000000000 +0100
-@@ -1166,7 +1166,7 @@ void reset_topruler(void)
- register int i,k;
- register tick_info* tk;
- register Pixmap p = topruler_pm;
-- char number[6];
-+ char number[16];
- int X0,len;
- int tickmod, tickskip;
-
-@@ -1183,7 +1183,7 @@ void reset_topruler(void)
- tickmod = 1;
-
- /* see how big a label is to adjust spacing, if necessary */
-- sprintf(number, "%d%s", (X0+(int)((TOPRULER_WD/zoomscale)))/tickmod, cur_fig_units);
-+ snprintf(number, sizeof(number), "%d%s", (X0+(int)((TOPRULER_WD/zoomscale)))/tickmod, cur_fig_units);
- len = XTextWidth(roman_font, number, strlen(number));
- while (skipx < (len + 5)/zoomscale) {
- skip *= 2;
-@@ -1197,11 +1197,11 @@ void reset_topruler(void)
- /* string */
- if (i % skipx == 0) {
- if ((i/10) % tickmod == 0)
-- sprintf(number, "%d%s", i/tickmod, cur_fig_units);
-+ snprintf(number, sizeof(number), "%d%s", i/tickmod, cur_fig_units);
- else if (i % tickmod == 0)
-- sprintf(number, "%d", i/tickmod);
-+ snprintf(number, sizeof(number), "%d", i/tickmod);
- else
-- sprintf(number, precstr, (float)(1.0 * i / tickmod));
-+ snprintf(number, sizeof(number), precstr, (float)(1.0 * i / tickmod));
- /* get length of string to position it */
- len = XTextWidth(roman_font, number, strlen(number));
- /* we center on the number only, letting the minus sign hang out */
-@@ -1425,7 +1425,7 @@ void reset_sideruler(void)
- register int i,k;
- register tick_info* tk;
- register Pixmap p = sideruler_pm;
-- char number[6],len;
-+ char number[16],len;
- int Y0;
- int tickmod, tickskip;
-
-@@ -1456,11 +1456,11 @@ void reset_sideruler(void)
- /* string */
- if (i % skipx == 0) {
- if ((i/10) % tickmod == 0)
-- sprintf(number, "%d%s", i/tickmod, cur_fig_units);
-+ snprintf(number, sizeof(number), "%d%s", i/tickmod, cur_fig_units);
- else if (i % tickmod == 0)
-- sprintf(number, "%d", i/tickmod);
-+ snprintf(number, sizeof(number), "%d", i/tickmod);
- else
-- sprintf(number, precstr, (float)(1.0 * i / tickmod));
-+ snprintf(number, sizeof(number), precstr, (float)(1.0 * i / tickmod));
- /* get length of string to position it */
- len = XTextWidth(roman_font, number, strlen(number));
- /* vertically centered on inch/cm mark */
Deleted: extra-i686/xfig.3.2.5-Xaw3d.patch
===================================================================
--- extra-i686/xfig.3.2.5-Xaw3d.patch 2009-08-14 04:05:21 UTC (rev 49622)
+++ extra-i686/xfig.3.2.5-Xaw3d.patch 2009-08-14 04:13:37 UTC (rev 49623)
@@ -1,11 +0,0 @@
---- xfig.3.2.5/Imakefile.Xaw3d 2007-04-16 14:56:58.000000000 +0200
-+++ xfig.3.2.5/Imakefile 2007-04-16 14:57:26.000000000 +0200
-@@ -50,7 +50,7 @@
- XCOMM Uncomment the following definition for XAW3D if you want to use
- XCOMM the 3d Athena Widget Set (highly recommended!)
-
--#define XAW3D
-+XCOMM #define XAW3D
-
- 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"
Modified: extra-i686/xfig.3.2.5-modularX.patch
===================================================================
--- extra-i686/xfig.3.2.5-modularX.patch 2009-08-14 04:05:21 UTC (rev 49622)
+++ extra-i686/xfig.3.2.5-modularX.patch 2009-08-14 04:13:37 UTC (rev 49623)
@@ -9,7 +9,7 @@
XCOMM Uncomment the following definition for XAW3D if you want to use
XCOMM the 3d Athena Widget Set (highly recommended!)
-@@ -166,14 +166,14 @@
+@@ -166,12 +166,12 @@
XCOMM XFIGLIBDIR = $(LIBDIR)
XCOMM use this if you want the multi-key data base file in the standard X11 tree
@@ -23,6 +23,6 @@
XCOMM if you want the man pages installed in the standard place on your system
-MANDIR = $(MANSOURCEPATH)$(MANSUFFIX)
+MANDIR = /usr/share/man/man1
-
+ XCOMM MANDIR = /usr/local/xfig/man
+
XCOMM If your system doesn't have strstr undefine the following definition
- XCOMM HAVE_NO_NOSTRSTR = -DNOSTRSTR
Deleted: extra-i686/xfig.png
===================================================================
(Binary files differ)
More information about the arch-commits
mailing list