pva 14/06/09 14:12:16
Added: xfig-3.2.5c-crash-on-exit.patch
xfig-3.2.5c-darwin.patch xfig-3.2.5c-spelling.patch
xfig-3.2.5c-XAW3D1_5E_notlocal.patch
Log:
Version bump, bug 487712 wrt Martin Walch. Took back ebuild.
(Portage version: 2.2.8-r1/cvs/Linux x86_64, signed Manifest commit with key
F1989B07)
Revision Changes Path
1.1 media-gfx/xfig/files/xfig-3.2.5c-crash-on-exit.patch
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/xfig/files/xfig-3.2.5c-crash-on-exit.patch?rev=1.1&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/xfig/files/xfig-3.2.5c-crash-on-exit.patch?rev=1.1&content-type=text/plain
Index: xfig-3.2.5c-crash-on-exit.patch
===================================================================
commit 56f0caaae3cc3fdbf6eaa21fc419c951c53a156d
Author: Peter Volkov <peter.vol...@gmail.com>
Date: Mon Jun 9 12:36:12 2014 +0400
Fix crash on exit (regression of xfig.3.2.5c)
diff --git a/u_free.c b/u_free.c
index 18d517a..4a5080f 100755
--- a/u_free.c
+++ b/u_free.c
@@ -270,8 +270,6 @@ void free_Fonts(void)
XUnloadFont(tool_d, nf->fid);
if (nf->fstruct != NULL)
XFreeFont(tool_d, nf->fstruct);
- if (nf->fset != NULL)
- XFreeFontSet(tool_d, nf->fset);
nf = nf->next;
}
}
1.1 media-gfx/xfig/files/xfig-3.2.5c-darwin.patch
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/xfig/files/xfig-3.2.5c-darwin.patch?rev=1.1&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/xfig/files/xfig-3.2.5c-darwin.patch?rev=1.1&content-type=text/plain
Index: xfig-3.2.5c-darwin.patch
===================================================================
diff --git a/fig.h b/fig.h
index ca00aef..a3605b0 100644
--- a/fig.h
+++ b/fig.h
@@ -375,7 +375,7 @@ extern double drand48();
extern long random();
extern void srandom(unsigned int);
-#elif !defined(__osf__) && !defined(__CYGWIN__) && !defined(linux) &&
!defined(__FreeBSD__) && !defined(__GLIBC__)
+#elif !defined(__osf__) && !defined(__CYGWIN__) && !defined(linux) &&
!defined(__FreeBSD__) && !defined(__DARWIN__) && !defined(__GLIBC__)
extern void srandom(int);
#endif
diff --git a/w_keyboard.c b/w_keyboard.c
index 427d60c..03a3f76 100644
--- a/w_keyboard.c
+++ b/w_keyboard.c
@@ -41,7 +41,7 @@
#define REG_NOERROR 0
#endif
-#if defined(__FreeBSD__) && !defined(REG_NOERROR)
+#if (defined(__FreeBSD__) || defined(__DARWIN__)) && !defined(REG_NOERROR)
#define REG_NOERROR 0
#endif
1.1 media-gfx/xfig/files/xfig-3.2.5c-spelling.patch
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/xfig/files/xfig-3.2.5c-spelling.patch?rev=1.1&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/xfig/files/xfig-3.2.5c-spelling.patch?rev=1.1&content-type=text/plain
Index: xfig-3.2.5c-spelling.patch
===================================================================
#! /bin/sh /usr/share/dpatch/dpatch-run
## 31_spelling.dpatch by Roland Rosenfeld <rol...@debian.org>
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: Fix spelling errors in binary.
@DPATCH@
diff -urNad xfig~/f_load.c xfig/f_load.c
--- xfig~/f_load.c
+++ xfig/f_load.c
@@ -373,5 +373,5 @@
/* Format error; relevant error message is already delivered */
;
else
- file_msg("File \"%s\" is not accessable; %s.", file, strerror(err));
+ file_msg("File \"%s\" is not accessible; %s.", file, strerror(err));
}
1.1 media-gfx/xfig/files/xfig-3.2.5c-XAW3D1_5E_notlocal.patch
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/xfig/files/xfig-3.2.5c-XAW3D1_5E_notlocal.patch?rev=1.1&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/xfig/files/xfig-3.2.5c-XAW3D1_5E_notlocal.patch?rev=1.1&content-type=text/plain
Index: xfig-3.2.5c-XAW3D1_5E_notlocal.patch
===================================================================
>From be8cf541743060921f629d5bfe990d985ecf1813 Mon Sep 17 00:00:00 2001
From: Vladislav Zavjalov <sla...@altlinux.org>
Origin:
http://git.altlinux.org/people/slazav/packages/?p=xfig.git;a=patch;h=be8cf541743060921f629d5bfe990d985ecf1813
Date: Wed, 29 May 2013 02:18:13 +0400
Subject: [PATCH] Don't use local SimpleMenu.c with XAW3D1_5E
Bug-Debian: http://bugs.debian.org/296703
---
xfig/SmeCascade.h | 5 +++++
xfig/SmeCascadeP.h | 5 +++++
xfig/w_menuentry.h | 4 ++++
xfig/w_util.c | 2 ++
4 files changed, 16 insertions(+), 0 deletions(-)
--- a/SmeCascade.h
+++ b/SmeCascade.h
@@ -27,7 +27,12 @@
#else
#include <X11/Xaw/Sme.h>
#endif
+
+#ifdef XAW3D1_5E
+#include <X11/Xaw3d/SmeBSB.h>
+#else
#include "SmeBSB.h"
+#endif
/****************************************************************
*
--- a/SmeCascadeP.h
+++ b/SmeCascadeP.h
@@ -32,8 +32,12 @@
#include <X11/Xaw/SmeP.h>
#endif
+#ifdef XAW3D1_5E
+#include <X11/Xaw3d/SmeBSBP.h>
+#else
#include "SmeBSBP.h"
#include "SmeCascade.h"
+#endif
/************************************************************
*
--- a/w_menuentry.h
+++ b/w_menuentry.h
@@ -30,7 +30,11 @@
#include <X11/Xaw/Sme.h>
#endif
+#ifdef XAW3D1_5E
+#include <X11/Xaw3d/SmeBSB.h>
+#else
#include "SmeBSB.h"
+#endif
/****************************************************************
*
--- a/w_util.c
+++ b/w_util.c
@@ -351,7 +351,9 @@
* (use -1 if no line desired)
*/
+#ifndef XAW3D1_5E
#include "SmeCascade.h"
+#endif /* XAW3D1_5E */
#include "d_text.h"
#include "e_placelib.h"
