* [gentoo-commits] repo/gentoo:master commit in: media-gfx/xfig/, media-gfx/xfig/files/
@ 2017-03-24 17:10 Andreas Hüttel
0 siblings, 0 replies; 4+ messages in thread
From: Andreas Hüttel @ 2017-03-24 17:10 UTC (permalink / raw
To: gentoo-commits
commit: afc2bca12fe01504943f1587cd30a34911e266b8
Author: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Fri Mar 24 17:09:42 2017 +0000
Commit: Andreas Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Fri Mar 24 17:10:15 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=afc2bca1
media-gfx/xfig: Version bump
Package-Manager: Portage-2.3.5, Repoman-2.3.2
media-gfx/xfig/Manifest | 1 +
.../xfig/files/xfig-3.2.6a-app-defaults.patch | 14 ++++
media-gfx/xfig/files/xfig-3.2.6a-solaris.patch | 26 +++++++
media-gfx/xfig/files/xfig-3.2.6a-urwfonts.patch | 79 ++++++++++++++++++++++
media-gfx/xfig/xfig-3.2.6a.ebuild | 50 ++++++++++++++
5 files changed, 170 insertions(+)
diff --git a/media-gfx/xfig/Manifest b/media-gfx/xfig/Manifest
index 8f63326ed0e..029b8c5612a 100644
--- a/media-gfx/xfig/Manifest
+++ b/media-gfx/xfig/Manifest
@@ -1 +1,2 @@
+DIST xfig-full-3.2.6a.tar.xz 5502944 SHA256 51fa4f5006ebea0657a3b92c62dfbc0116ca63f581370f102af5970de45abd67 SHA512 82e292e050213b6d22be5e174224308b446505e25208f29d4f4c5e760a87ff4104b9dcea0a332241c9bca358e1d44336bb38c316eb3f28130d7c8828c10a805f WHIRLPOOL 56d94e6b3bbd6b419f9c0d10ee548ec52fe79bb70e14bca8b88e047090d33e06b63deab9d0bd87b3280883c04c0af5043bc143f738af9765e6d133adf64a5ff5
DIST xfig.3.2.5c.full.tar.gz 6078933 SHA256 ea628f975b79ab175ab29220cc118274466497f6217f2989928317be2993a1f9 SHA512 763bd6fd43bff9b44f934dd6e16b0aa5142041f895e74564d28e7252e012f1c7728bbee40e3970357c7d3fd15aa109dbfcbc1d0a2203fa1a2ed770aabacd9525 WHIRLPOOL f2234fc9c1f011bdec301b447816f7bfd090bc2ca3471823afd0617ae15ceafb195dd81ddbb0b255f23e0256b35e12cdd30f44fb65d3fff23f444e4d26028726
diff --git a/media-gfx/xfig/files/xfig-3.2.6a-app-defaults.patch b/media-gfx/xfig/files/xfig-3.2.6a-app-defaults.patch
new file mode 100644
index 00000000000..7d11b571df3
--- /dev/null
+++ b/media-gfx/xfig/files/xfig-3.2.6a-app-defaults.patch
@@ -0,0 +1,14 @@
+diff -ruN xfig-3.2.6a.orig/app-defaults/Fig xfig-3.2.6a/app-defaults/Fig
+--- xfig-3.2.6a.orig/app-defaults/Fig 2017-01-10 00:27:39.000000000 +0100
++++ xfig-3.2.6a/app-defaults/Fig 2017-03-24 16:22:14.702253419 +0100
+@@ -10,6 +10,10 @@
+
+ ! some sample settings you may want to change
+
++! If the following resource is set to false, xfig will use metric units
++! by default.
++Fig.inches: false
++
+ ! The following fixes a problem that some window managers have
+ ! with xfig continually resizing itself
+
diff --git a/media-gfx/xfig/files/xfig-3.2.6a-solaris.patch b/media-gfx/xfig/files/xfig-3.2.6a-solaris.patch
new file mode 100644
index 00000000000..5c6cd023fe6
--- /dev/null
+++ b/media-gfx/xfig/files/xfig-3.2.6a-solaris.patch
@@ -0,0 +1,26 @@
+* workaround some missing things on Solaris
+
+--- a/src/u_quartic.c
++++ b/src/u_quartic.c
+@@ -21,4 +21,7 @@
+ #include <math.h>
+
++ #ifndef M_PI
++ # define M_PI 3.14159265358979323846
++ #endif
+
+ static int
+--- a/src/w_intersect.c
++++ b/src/w_intersect.c
+@@ -31,6 +31,11 @@
+ #define ISET_P1 (1 << 0)
+ #define ISET_P2 (1 << 1)
+
++#if defined (__SVR4) && defined (__sun)
++#undef _Complex_I
++#define _Complex_I (__extension__ 1.0fi)
++#endif
++
+ intersect_state_e intersect_state = INTERSECT_INITIAL;
+
+ static INLINE Boolean
diff --git a/media-gfx/xfig/files/xfig-3.2.6a-urwfonts.patch b/media-gfx/xfig/files/xfig-3.2.6a-urwfonts.patch
new file mode 100644
index 00000000000..89957590af6
--- /dev/null
+++ b/media-gfx/xfig/files/xfig-3.2.6a-urwfonts.patch
@@ -0,0 +1,79 @@
+--- a/src/u_fonts.c 2002-09-09 13:36:58.000000000 -0400
++++ b/src/u_fonts.c 2006-10-11 00:29:07.000000000 -0400
+@@ -22,41 +22,41 @@
+ /* X11 font names */
+
+ struct _xfstruct x_fontinfo[NUM_FONTS] = {
+- {"-*-times-medium-r-normal--", (struct xfont*) NULL},
+- {"-*-times-medium-i-normal--", (struct xfont*) NULL},
+- {"-*-times-bold-r-normal--", (struct xfont*) NULL},
+- {"-*-times-bold-i-normal--", (struct xfont*) NULL},
+- {"-*-avantgarde-book-r-normal--", (struct xfont*) NULL},
+- {"-*-avantgarde-book-o-normal--", (struct xfont*) NULL},
+- {"-*-avantgarde-demi-r-normal--", (struct xfont*) NULL},
+- {"-*-avantgarde-demi-o-normal--", (struct xfont*) NULL},
+- {"-*-bookman-light-r-normal--", (struct xfont*) NULL},
+- {"-*-bookman-light-i-normal--", (struct xfont*) NULL},
+- {"-*-bookman-demi-r-normal--", (struct xfont*) NULL},
+- {"-*-bookman-demi-i-normal--", (struct xfont*) NULL},
+- {"-*-courier-medium-r-normal--", (struct xfont*) NULL},
+- {"-*-courier-medium-o-normal--", (struct xfont*) NULL},
+- {"-*-courier-bold-r-normal--", (struct xfont*) NULL},
+- {"-*-courier-bold-o-normal--", (struct xfont*) NULL},
+- {"-*-helvetica-medium-r-normal--", (struct xfont*) NULL},
+- {"-*-helvetica-medium-o-normal--", (struct xfont*) NULL},
+- {"-*-helvetica-bold-r-normal--", (struct xfont*) NULL},
+- {"-*-helvetica-bold-o-normal--", (struct xfont*) NULL},
+- {"-*-helvetica-medium-r-narrow--", (struct xfont*) NULL},
+- {"-*-helvetica-medium-o-narrow--", (struct xfont*) NULL},
+- {"-*-helvetica-bold-r-narrow--", (struct xfont*) NULL},
+- {"-*-helvetica-bold-o-narrow--", (struct xfont*) NULL},
+- {"-*-new century schoolbook-medium-r-normal--", (struct xfont*) NULL},
+- {"-*-new century schoolbook-medium-i-normal--", (struct xfont*) NULL},
+- {"-*-new century schoolbook-bold-r-normal--", (struct xfont*) NULL},
+- {"-*-new century schoolbook-bold-i-normal--", (struct xfont*) NULL},
+- {"-*-palatino-medium-r-normal--", (struct xfont*) NULL},
+- {"-*-palatino-medium-i-normal--", (struct xfont*) NULL},
+- {"-*-palatino-bold-r-normal--", (struct xfont*) NULL},
+- {"-*-palatino-bold-i-normal--", (struct xfont*) NULL},
+- {"-*-symbol-medium-r-normal--", (struct xfont*) NULL},
+- {"-*-itc zapf chancery-medium-i-normal--", (struct xfont*) NULL},
+- {"-*-itc zapf dingbats-*-*-*--", (struct xfont*) NULL},
++ {"-urw-nimbus roman no9 l-medium-r-normal--", (struct xfont*) NULL},
++ {"-urw-nimbus roman no9 l-medium-i-normal--", (struct xfont*) NULL},
++ {"-urw-nimbus roman no9 l-bold-r-normal--", (struct xfont*) NULL},
++ {"-urw-nimbus roman no9 l-bold-i-normal--", (struct xfont*) NULL},
++ {"-urw-urw gothic l-medium-r-normal--", (struct xfont*) NULL},
++ {"-urw-urw gothic l-medium-o-normal--", (struct xfont*) NULL},
++ {"-urw-urw gothic l-semibold-r-normal--", (struct xfont*) NULL},
++ {"-urw-urw gothic l-semibold-o-normal--", (struct xfont*) NULL},
++ {"-urw-urw bookman l-medium-r-normal--", (struct xfont*) NULL},
++ {"-urw-urw bookman l-medium-i-normal--", (struct xfont*) NULL},
++ {"-urw-urw bookman l-bold-r-normal--", (struct xfont*) NULL},
++ {"-urw-urw bookman l-bold-i-normal--", (struct xfont*) NULL},
++ {"-urw-nimbus mono l-medium-r-normal--", (struct xfont*) NULL},
++ {"-urw-nimbus mono l-medium-o-normal--", (struct xfont*) NULL},
++ {"-urw-nimbus mono l-bold-r-normal--", (struct xfont*) NULL},
++ {"-urw-nimbus mono l-bold-o-normal--", (struct xfont*) NULL},
++ {"-urw-nimbus sans l-medium-r-normal--", (struct xfont*) NULL},
++ {"-urw-nimbus sans l-medium-i-normal--", (struct xfont*) NULL},
++ {"-urw-nimbus sans l-bold-r-normal--", (struct xfont*) NULL},
++ {"-urw-nimbus sans l-bold-i-normal--", (struct xfont*) NULL},
++ {"-urw-nimbus sans l-medium-r-condensed--", (struct xfont*) NULL},
++ {"-urw-nimbus sans l-medium-i-condensed--", (struct xfont*) NULL},
++ {"-urw-nimbus sans l-bold-r-condensed--", (struct xfont*) NULL},
++ {"-urw-nimbus sans l-bold-i-condensed--", (struct xfont*) NULL},
++ {"-urw-century schoolbook l-medium-r-normal--", (struct xfont*) NULL},
++ {"-urw-century schoolbook l-medium-i-normal--", (struct xfont*) NULL},
++ {"-urw-century schoolbook l-bold-r-normal--", (struct xfont*) NULL},
++ {"-urw-century schoolbook l-bold-i-normal--", (struct xfont*) NULL},
++ {"-urw-urw palladio l-medium-r-normal--", (struct xfont*) NULL},
++ {"-urw-urw palladio l-medium-i-normal--", (struct xfont*) NULL},
++ {"-urw-urw palladio l-bold-r-normal--", (struct xfont*) NULL},
++ {"-urw-urw palladio l-bold-i-normal--", (struct xfont*) NULL},
++ {"-urw-standard symbols l-medium-r-normal--", (struct xfont*) NULL},
++ {"-urw-urw chancery l-medium-i-normal--", (struct xfont*) NULL},
++ {"-urw-dingbats-medium-r-normal--", (struct xfont*) NULL},
+ };
+
+ /* Use the following font names for any font that doesn't exist in the table above.
diff --git a/media-gfx/xfig/xfig-3.2.6a.ebuild b/media-gfx/xfig/xfig-3.2.6a.ebuild
new file mode 100644
index 00000000000..7192bace12e
--- /dev/null
+++ b/media-gfx/xfig/xfig-3.2.6a.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit eutils multilib
+
+MY_P=${PN}.${PV}
+
+DESCRIPTION="A menu-driven tool to draw and manipulate objects interactively in an X window"
+HOMEPAGE="http://www.xfig.org"
+SRC_URI="mirror://sourceforge/mcj/${PN}-full-${PV}.tar.xz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+IUSE="jpeg nls postscript"
+
+RDEPEND="x11-libs/libXaw
+ x11-libs/libXp
+ x11-libs/libXaw3d
+ x11-libs/libXi
+ x11-libs/libXt
+ media-libs/libpng:0=
+ media-fonts/font-misc-misc
+ media-fonts/urw-fonts
+ >=media-gfx/transfig-3.2.5-r1
+ media-libs/netpbm
+ jpeg? ( virtual/jpeg:0= )
+ nls? ( x11-libs/libXaw3d[unicode] )
+ postscript? ( app-text/ghostscript-gpl )
+"
+DEPEND="${RDEPEND}
+ x11-misc/imake
+ x11-proto/xproto
+ x11-proto/inputproto"
+
+PATCHES=(
+ "${FILESDIR}/${PN}-3.2.6a-urwfonts.patch"
+ "${FILESDIR}/${PN}-3.2.6a-solaris.patch"
+ "${FILESDIR}/${PN}-3.2.6a-app-defaults.patch"
+)
+
+src_configure() {
+ econf \
+ $(use_enable nls i18n) \
+ $(use_enable jpeg) \
+ $(use_with postscript gs) \
+ --htmldir="${EPREFIX}/usr/share/doc/${PF}" # it expects docdir...
+}
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-gfx/xfig/, media-gfx/xfig/files/
@ 2018-04-02 0:51 Matt Turner
0 siblings, 0 replies; 4+ messages in thread
From: Matt Turner @ 2018-04-02 0:51 UTC (permalink / raw
To: gentoo-commits
commit: 4849911692da0dec7290d879150d0f25e34240bc
Author: Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Mon Apr 2 00:50:51 2018 +0000
Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Mon Apr 2 00:51:03 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=48499116
media-gfx/xfig: Drop old
Closes: https://bugs.gentoo.org/649134
Package-Manager: Portage-2.3.24, Repoman-2.3.6
media-gfx/xfig/Manifest | 1 -
.../xfig/files/xfig-3.2.5b-app-defaults.patch | 24 --
media-gfx/xfig/files/xfig-3.2.5b-mkstemp.patch | 32 --
.../xfig/files/xfig-3.2.5b-network_images.patch | 371 ---------------------
.../xfig/files/xfig-3.2.5b-papersize_b1.patch | 27 --
.../files/xfig-3.2.5b-pdfimport_mediabox.patch | 37 --
media-gfx/xfig/files/xfig-3.2.5b-solaris.patch | 26 --
media-gfx/xfig/files/xfig-3.2.5b-urwfonts.patch | 79 -----
.../files/xfig-3.2.5c-XAW3D1_5E_notlocal.patch | 70 ----
.../xfig/files/xfig-3.2.5c-crash-on-exit.patch | 19 --
media-gfx/xfig/files/xfig-3.2.5c-darwin.patch | 26 --
media-gfx/xfig/files/xfig-3.2.5c-spelling.patch | 17 -
media-gfx/xfig/xfig-3.2.5c.ebuild | 109 ------
media-gfx/xfig/xfig-3.2.6a.ebuild | 47 ---
14 files changed, 885 deletions(-)
diff --git a/media-gfx/xfig/Manifest b/media-gfx/xfig/Manifest
index c10093d94d1..106af3f0e1e 100644
--- a/media-gfx/xfig/Manifest
+++ b/media-gfx/xfig/Manifest
@@ -1,2 +1 @@
DIST xfig-full-3.2.6a.tar.xz 5502944 BLAKE2B 3a83feeb5647ffa9586b9ce40116e9854a423c0cc90265ad78b27c0c82a15bbda9d9734475aba13f442c259cd0489a667242f319ac758ddbfea1a5b268e12550 SHA512 82e292e050213b6d22be5e174224308b446505e25208f29d4f4c5e760a87ff4104b9dcea0a332241c9bca358e1d44336bb38c316eb3f28130d7c8828c10a805f
-DIST xfig.3.2.5c.full.tar.gz 6078933 BLAKE2B 44ccad26fa3d7a57b0e8798d6ebfe6682baf15046d9e360d7a7569cac54c403c0068671e27a5289dbb4f70dafd12c1653a61709749a8298874bc49528783973b SHA512 763bd6fd43bff9b44f934dd6e16b0aa5142041f895e74564d28e7252e012f1c7728bbee40e3970357c7d3fd15aa109dbfcbc1d0a2203fa1a2ed770aabacd9525
diff --git a/media-gfx/xfig/files/xfig-3.2.5b-app-defaults.patch b/media-gfx/xfig/files/xfig-3.2.5b-app-defaults.patch
deleted file mode 100644
index 560ddef94eb..00000000000
--- a/media-gfx/xfig/files/xfig-3.2.5b-app-defaults.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-Defaults for xfig. Idea from Roland Rosenfeld <roland@debian.org>
-
-diff -urNad xfig~/Fig.ad xfig/Fig.ad
---- a/Fig.ad
-+++ b/Fig.ad
-@@ -10,13 +10,17 @@
-
- ! some sample settings you may want to change
-
-+! If the following resource is set to false, xfig will use metric units
-+! by default.
-+Fig.inches: false
-+
- ! The following fixes a problem that some window managers have
- ! with xfig continually resizing itself
-
- Fig*AllowShellResize: false
-
- ! Image editor - can edit imported image
--Fig.image_editor: xv
-+Fig.image_editor: gimp
-
- ! name of ghostscript (not ghostview)
- Fig.ghostscript: gs
diff --git a/media-gfx/xfig/files/xfig-3.2.5b-mkstemp.patch b/media-gfx/xfig/files/xfig-3.2.5b-mkstemp.patch
deleted file mode 100644
index 931ac94e58a..00000000000
--- a/media-gfx/xfig/files/xfig-3.2.5b-mkstemp.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-Missed hunk noticed https://bugzilla.redhat.com/show_bug.cgi?id=505257#c1 is recreated.
-
-http://bugs.gentoo.org/show_bug.cgi?id=264575
-
-=== modified file 'u_print.c'
---- a/u_print.c 2010-01-14 19:50:08 +0000
-+++ b/u_print.c 2010-01-14 19:54:14 +0000
-@@ -202,14 +202,22 @@
- char tmp_fig_file[PATH_MAX];
- char *outfile, *name, *real_lang;
- char *suf;
-+ int fd;
-
- /* if file exists, ask if ok */
- if (!ok_to_write(file, "EXPORT"))
- return (1);
-
-- sprintf(tmp_fig_file, "%s/%s%06d", TMPDIR, "xfig-fig", getpid());
-+ snprintf(tmp_fig_file, sizeof(tmp_fig_file), "%s/xfig-fig.XXXXXX", TMPDIR);
- /* write the fig objects to a temporary file */
- warnexist = False;
-+
-+ if ((fd = mkstemp(tmp_fig_file)) == -1) {
-+ file_msg("Can't open temp file %s: %s\n", tmp_fig_file, strerror(errno));
-+ return;
-+ }
-+ close(fd);
-+
- init_write_tmpfile();
- if (write_file(tmp_fig_file, False)) {
- end_write_tmpfile();
-
diff --git a/media-gfx/xfig/files/xfig-3.2.5b-network_images.patch b/media-gfx/xfig/files/xfig-3.2.5b-network_images.patch
deleted file mode 100644
index 1f7be5ff99a..00000000000
--- a/media-gfx/xfig/files/xfig-3.2.5b-network_images.patch
+++ /dev/null
@@ -1,371 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 12_network_images.dpatch by Roland Rosenfeld <roland@debian.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Some network icons colored and/or combined by Roland Rosenfeld.
-
-@DPATCH@
-diff -urNad xfig~/Libraries/Networks/Devices/firewall-pair.fig xfig/Libraries/Networks/Devices/firewall-pair.fig
---- Libraries/Networks/Devices/firewall-pair.fig
-+++ Libraries/Networks/Devices/firewall-pair.fig
-@@ -0,0 +1,75 @@
-+#FIG 3.2 Produced by xfig version 3.2.5-alpha5
-+Portrait
-+Center
-+Inches
-+A4
-+100.00
-+Single
-+-2
-+# A pair of firewalls
-+# Combined by Roland Rosenfeld
-+1200 2
-+0 32 #aeaaae
-+# A pair of firewalls
-+6 3375 2175 4050 3075
-+6 3600 2250 4050 3075
-+# Firewall
-+# (from TomiOllila <Tomi.Ollila@tfi.net> )
-+6 3600 2250 4050 3075
-+2 1 0 1 0 7 0 0 -1 0.000 0 0 -1 0 0 2
-+ 3825 3075 3825 2475
-+2 1 0 1 0 20 2 0 20 0.000 0 0 -1 0 0 5
-+ 3675 2475 3675 3075 3825 3075 3975 2925 3975 2400
-+2 1 0 1 0 32 1 0 20 0.000 0 0 -1 0 0 7
-+ 3600 2400 3600 2475 3900 2475 4050 2325 4050 2250 3750 2250
-+ 3600 2400
-+2 1 0 1 0 7 0 0 -1 0.000 0 0 -1 0 0 3
-+ 3900 2475 3900 2400 3600 2400
-+2 1 0 1 0 7 0 0 -1 0.000 0 0 -1 0 0 2
-+ 3900 2400 4050 2250
-+2 1 0 1 0 7 0 0 -1 0.000 0 0 -1 0 0 3
-+ 3675 2625 3825 2625 3975 2475
-+2 1 0 1 0 7 0 0 -1 0.000 0 0 -1 0 0 3
-+ 3675 2775 3825 2775 3975 2625
-+2 1 0 1 0 7 0 0 -1 0.000 0 0 -1 0 0 3
-+ 3675 2925 3825 2925 3975 2775
-+2 1 0 1 0 7 0 0 -1 0.000 0 0 -1 0 0 2
-+ 3900 3000 3900 2850
-+2 1 0 1 0 7 0 0 -1 0.000 0 0 -1 0 0 2
-+ 3900 2700 3900 2550
-+2 1 0 1 0 7 0 0 -1 0.000 0 0 -1 0 0 2
-+ 3750 2475 3750 2625
-+2 1 0 1 0 7 0 0 -1 0.000 0 0 -1 0 0 2
-+ 3750 2775 3750 2925
-+-6
-+-6
-+6 3375 2175 3825 3000
-+6 3450 2175 3825 3000
-+2 1 0 1 0 7 20 0 -1 0.000 0 0 7 0 0 2
-+ 3600 3000 3600 2400
-+2 1 0 1 0 7 20 0 -1 0.000 0 0 7 0 0 2
-+ 3675 2325 3825 2175
-+2 1 0 1 0 7 20 0 -1 0.000 0 0 7 0 0 3
-+ 3450 2550 3600 2550 3750 2400
-+2 1 0 1 0 7 20 0 -1 0.000 0 0 7 0 0 3
-+ 3450 2700 3600 2700 3750 2550
-+2 1 0 1 0 7 20 0 -1 0.000 0 0 7 0 0 3
-+ 3450 2850 3600 2850 3750 2700
-+2 1 0 1 0 7 20 0 -1 0.000 0 0 7 0 0 2
-+ 3675 2925 3675 2775
-+2 1 0 1 0 7 20 0 -1 0.000 0 0 7 0 0 2
-+ 3675 2625 3675 2475
-+2 1 0 1 0 7 20 0 -1 0.000 0 0 7 0 0 2
-+ 3525 2400 3525 2550
-+2 1 0 1 0 7 20 0 -1 0.000 0 0 7 0 0 2
-+ 3525 2700 3525 2850
-+-6
-+2 1 0 1 0 20 22 0 20 0.000 0 0 -1 0 0 5
-+ 3450 2400 3450 3000 3600 3000 3750 2850 3750 2325
-+2 1 0 1 0 32 21 0 20 0.000 0 0 -1 0 0 7
-+ 3375 2325 3375 2400 3675 2400 3825 2250 3825 2175 3525 2175
-+ 3375 2325
-+2 1 0 1 0 7 20 0 -1 0.000 0 0 -1 0 0 3
-+ 3675 2400 3675 2325 3375 2325
-+-6
-+-6
-diff -urNad xfig~/Libraries/Networks/Devices/internet.fig xfig/Libraries/Networks/Devices/internet.fig
---- Libraries/Networks/Devices/internet.fig
-+++ Libraries/Networks/Devices/internet.fig
-@@ -0,0 +1,39 @@
-+#FIG 3.2 Produced by xfig version 3.2.5-alpha5
-+Portrait
-+Center
-+Inches
-+A4
-+100.00
-+Single
-+-2
-+# Internet cloud
-+# By Roland Rosenfeld
-+1200 2
-+# An Internet cloud
-+6 4275 5700 7200 7650
-+2 1 0 0 7 7 970 0 20 4.000 0 0 0 0 0 65
-+ 4719 7111 4633 7121 4548 7105 4469 7057 4394 6983 4346 6888
-+ 4309 6776 4298 6654 4309 6526 4346 6415 4394 6325 4469 6244
-+ 4548 6197 4633 6181 4719 6197 4798 6048 4893 5915 4994 5825
-+ 5122 5746 5244 5719 5377 5719 5505 5746 5627 5825 5733 5915
-+ 5850 5825 5961 5746 6094 5719 6222 5719 6355 5746 6472 5825
-+ 6583 5915 6668 6048 6748 6197 6833 6181 6918 6197 7003 6244
-+ 7072 6325 7130 6415 7157 6526 7168 6654 7157 6776 7130 6888
-+ 7072 6983 7003 7057 6918 7105 6833 7121 6748 7111 6668 7265
-+ 6583 7387 6472 7488 6355 7557 6222 7594 6094 7594 5961 7557
-+ 5850 7488 5733 7387 5627 7488 5505 7557 5377 7594 5244 7594
-+ 5122 7557 4994 7488 4893 7387 4798 7265 4719 7111
-+2 1 0 2 1 0 969 0 -1 0.000 0 0 0 0 0 65
-+ 4719 7111 4633 7121 4548 7105 4469 7057 4394 6983 4346 6888
-+ 4309 6776 4298 6654 4309 6526 4346 6415 4394 6325 4469 6244
-+ 4548 6197 4633 6181 4719 6197 4798 6048 4893 5915 4994 5825
-+ 5122 5746 5244 5719 5377 5719 5505 5746 5627 5825 5733 5915
-+ 5850 5825 5961 5746 6094 5719 6222 5719 6355 5746 6472 5825
-+ 6583 5915 6668 6048 6748 6197 6833 6181 6918 6197 7003 6244
-+ 7072 6325 7130 6415 7157 6526 7168 6654 7157 6776 7130 6888
-+ 7072 6983 7003 7057 6918 7105 6833 7121 6748 7111 6668 7265
-+ 6583 7387 6472 7488 6355 7557 6222 7594 6094 7594 5961 7557
-+ 5850 7488 5733 7387 5627 7488 5505 7557 5377 7594 5244 7594
-+ 5122 7557 4994 7488 4893 7387 4798 7265 4719 7111
-+4 0 0 100 0 18 33 0.0000 4 405 2040 4744 6853 Internet\001
-+-6
-diff -urNad xfig~/Libraries/Networks/Routers/router-pair.fig xfig/Libraries/Networks/Routers/router-pair.fig
---- Libraries/Networks/Routers/router-pair.fig
-+++ Libraries/Networks/Routers/router-pair.fig
-@@ -0,0 +1,78 @@
-+#FIG 3.2 Produced by xfig version 3.2.5-alpha5
-+Portrait
-+Center
-+Inches
-+A4
-+100.00
-+Single
-+-2
-+# A pair of routers
-+# Colored and combined by Roland Rosenfeld
-+1200 2
-+# A pair of routers
-+6 3150 3300 4275 3975
-+6 3346 3450 4269 3975
-+6 3844 3615 4173 3718
-+# polyline
-+2 1 0 1 0 7 50 0 20 0.000 0 0 0 0 0 8
-+ 3879 3701 3854 3647 3976 3624 3955 3642 4159 3676 4111 3713
-+ 3908 3676 3879 3701
-+-6
-+6 3617 3636 3803 3759
-+# polyline
-+2 1 0 1 0 7 50 0 20 0.000 0 0 0 0 0 8
-+ 3764 3731 3638 3754 3634 3694 3671 3703 3738 3646 3800 3657
-+ 3727 3719 3764 3731
-+-6
-+6 3803 3470 3988 3594
-+# polyline
-+2 1 0 1 0 7 50 0 20 0.000 0 0 7 0 0 8
-+ 3837 3518 3982 3481 3983 3541 3947 3535 3876 3591 3809 3581
-+ 3882 3526 3837 3518
-+-6
-+1 2 0 1 0 15 51 0 20 0.000 1 0.0000 3807 3619 457 169 3349 3619 4264 3619
-+1 2 0 1 0 15 53 0 20 0.000 1 0.0000 3803 3806 457 169 3346 3806 4261 3806
-+# polyline
-+2 1 0 1 0 7 50 0 20 0.000 0 0 0 0 0 8
-+ 3705 3557 3738 3608 3609 3637 3638 3615 3439 3581 3488 3545
-+ 3681 3576 3705 3557
-+2 1 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 2
-+ 3350 3613 3347 3812
-+2 1 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 2
-+ 4263 3626 4263 3815
-+2 2 0 0 0 15 52 -1 20 0.000 0 0 -1 0 0 5
-+ 3349 3626 4269 3626 4269 3800 3349 3800 3349 3626
-+-6
-+6 3150 3300 4125 3825
-+6 3600 3450 3975 3600
-+# polyline
-+2 1 0 1 0 7 60 0 20 0.000 0 0 0 0 0 8
-+ 3683 3551 3658 3497 3780 3474 3759 3492 3963 3526 3915 3563
-+ 3712 3526 3683 3551
-+-6
-+6 3600 3300 3825 3450
-+# polyline
-+2 1 0 1 0 7 60 0 20 0.000 0 0 7 0 0 8
-+ 3641 3368 3786 3331 3787 3391 3751 3385 3680 3441 3613 3431
-+ 3686 3376 3641 3368
-+-6
-+6 3375 3450 3675 3675
-+# polyline
-+2 1 0 1 0 7 60 0 20 0.000 0 0 0 0 0 8
-+ 3568 3581 3442 3604 3438 3544 3475 3553 3542 3496 3604 3507
-+ 3531 3569 3568 3581
-+-6
-+1 2 0 1 0 15 61 0 20 0.000 1 0.0000 3611 3469 457 169 3153 3469 4068 3469
-+1 2 0 1 0 15 63 0 20 0.000 1 0.0000 3607 3656 457 169 3150 3656 4065 3656
-+2 1 0 1 0 7 60 -1 -1 0.000 0 0 -1 0 0 2
-+ 4067 3476 4067 3665
-+# polyline
-+2 1 0 1 0 7 60 0 20 0.000 0 0 0 0 0 8
-+ 3509 3407 3542 3458 3413 3487 3442 3465 3243 3431 3292 3395
-+ 3485 3426 3509 3407
-+2 1 0 1 0 7 60 -1 -1 0.000 0 0 -1 0 0 2
-+ 3154 3463 3151 3662
-+2 2 0 0 0 15 62 -1 20 0.000 0 0 -1 0 0 5
-+ 3153 3476 4073 3476 4073 3650 3153 3650 3153 3476
-+-6
-+-6
-diff -urNad xfig~/Libraries/Networks/Routers/router4.fig xfig/Libraries/Networks/Routers/router4.fig
---- Libraries/Networks/Routers/router4.fig
-+++ Libraries/Networks/Routers/router4.fig
-@@ -0,0 +1,44 @@
-+#FIG 3.2 Produced by xfig version 3.2.5-alpha5
-+Portrait
-+Center
-+Metric
-+A4
-+100.00
-+Single
-+-2
-+# Router
-+# Colored by Roland Rosenfeld
-+1200 2
-+# Router
-+6 3870 4455 5940 5625
-+6 4995 4815 5715 5040
-+# polyline
-+2 1 0 1 0 7 50 0 20 0.000 0 0 0 0 0 8
-+ 5072 5002 5018 4886 5284 4834 5238 4873 5683 4948 5578 5030
-+ 5136 4948 5072 5002
-+-6
-+6 4500 4860 4905 5130
-+# polyline
-+2 1 0 1 0 7 50 0 20 0.000 0 0 0 0 0 8
-+ 4822 5067 4545 5117 4537 4989 4618 5007 4766 4883 4900 4905
-+ 4741 5041 4822 5067
-+-6
-+6 4905 4500 5310 4770
-+# polyline
-+2 1 0 1 0 7 50 0 20 0.000 0 0 7 0 0 8
-+ 4981 4603 5296 4523 5300 4653 5222 4640 5066 4762 4919 4741
-+ 5079 4622 4981 4603
-+-6
-+1 2 0 1 0 15 51 0 20 0.000 1 0.0000 4914 4824 999 369 3915 4824 5913 4824
-+1 2 0 1 0 15 53 0 20 0.000 1 0.0000 4908 5231 999 369 3909 5231 5907 5231
-+# polyline
-+2 1 0 1 0 7 50 0 20 0.000 0 0 0 0 0 8
-+ 4693 4690 4766 4800 4483 4863 4545 4814 4111 4740 4219 4661
-+ 4640 4731 4693 4690
-+2 1 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 2
-+ 3917 4811 3910 5244
-+2 1 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 2
-+ 5910 4838 5910 5251
-+2 2 0 0 0 15 52 -1 20 0.000 0 0 -1 0 0 5
-+ 3915 4838 5924 4838 5924 5218 3915 5218 3915 4838
-+-6
-diff -urNad xfig~/Libraries/Networks/Switches/switch-pair.fig xfig/Libraries/Networks/Switches/switch-pair.fig
---- Libraries/Networks/Switches/switch-pair.fig
-+++ Libraries/Networks/Switches/switch-pair.fig
-@@ -0,0 +1,66 @@
-+#FIG 3.2 Produced by xfig version 3.2.5-alpha5
-+Portrait
-+Center
-+Inches
-+A4
-+100.00
-+Single
-+-2
-+# A pair of switches
-+# Colored and combined by Roland Rosenfeld
-+1200 2
-+# A pair of switches
-+6 2550 2625 4725 3750
-+6 2625 2850 4725 3750
-+6 3000 2850 4425 3300
-+# polyline
-+2 1 0 1 0 7 50 0 20 0.000 0 0 0 0 0 8
-+ 3603 3180 3581 3210 3194 3210 3161 3240 3028 3195 3268 3126
-+ 3214 3184 3608 3184
-+# polyline
-+2 1 0 1 0 7 50 0 20 0.000 0 0 0 0 0 8
-+ 3651 3128 3673 3098 4060 3098 4093 3068 4226 3113 3986 3182
-+ 4040 3124 3646 3124
-+# polyline
-+2 1 0 1 0 7 50 0 20 0.000 0 0 0 0 0 8
-+ 3760 3008 3738 3038 3351 3038 3318 3068 3185 3023 3425 2954
-+ 3371 3012 3765 3012
-+# polyline
-+2 1 0 1 0 7 50 0 20 0.000 0 0 0 0 0 8
-+ 3827 2963 3849 2933 4236 2933 4269 2903 4402 2948 4162 3017
-+ 4216 2959 3822 2959
-+-6
-+2 1 0 1 0 15 51 0 20 0.000 0 0 -1 0 0 4
-+ 4125 3300 4725 2850 4725 3300 4125 3750
-+2 2 0 1 0 15 51 0 20 0.000 0 0 -1 0 0 5
-+ 2625 3300 4125 3300 4125 3750 2625 3750 2625 3300
-+2 3 0 1 0 15 51 -1 20 0.000 0 0 -1 0 0 5
-+ 2625 3300 3225 2850 4725 2850 4125 3300 2625 3300
-+-6
-+6 2550 2625 4650 3525
-+6 2925 2625 4350 3075
-+# polyline
-+2 1 0 1 0 7 61 0 20 0.000 0 0 0 0 0 8
-+ 3528 2955 3506 2985 3119 2985 3086 3015 2953 2970 3193 2901
-+ 3139 2959 3533 2959
-+# polyline
-+2 1 0 1 0 7 61 0 20 0.000 0 0 0 0 0 8
-+ 3576 2903 3598 2873 3985 2873 4018 2843 4151 2888 3911 2957
-+ 3965 2899 3571 2899
-+# polyline
-+2 1 0 1 0 7 61 0 20 0.000 0 0 0 0 0 8
-+ 3685 2783 3663 2813 3276 2813 3243 2843 3110 2798 3350 2729
-+ 3296 2787 3690 2787
-+# polyline
-+2 1 0 1 0 7 61 0 20 0.000 0 0 0 0 0 8
-+ 3752 2738 3774 2708 4161 2708 4194 2678 4327 2723 4087 2792
-+ 4141 2734 3747 2734
-+-6
-+2 1 0 1 0 15 62 0 20 0.000 0 0 -1 0 0 4
-+ 4050 3075 4650 2625 4650 3075 4050 3525
-+2 2 0 1 0 15 62 0 20 0.000 0 0 -1 0 0 5
-+ 2550 3075 4050 3075 4050 3525 2550 3525 2550 3075
-+2 3 0 1 0 15 62 -1 20 0.000 0 0 -1 0 0 5
-+ 2550 3075 3150 2625 4650 2625 4050 3075 2550 3075
-+-6
-+-6
-diff -urNad xfig~/Libraries/Networks/Switches/switch2.fig xfig/Libraries/Networks/Switches/switch2.fig
---- Libraries/Networks/Switches/switch2.fig
-+++ Libraries/Networks/Switches/switch2.fig
-@@ -0,0 +1,38 @@
-+#FIG 3.2 Produced by xfig version 3.2.5-alpha5
-+Portrait
-+Center
-+Inches
-+A4
-+100.00
-+Single
-+-2
-+# Switch
-+# colored by Roland Rosenfeld
-+1200 2
-+# Switch
-+6 2625 2850 4725 3750
-+6 3000 2850 4425 3300
-+# polyline
-+2 1 0 1 0 7 50 0 20 0.000 0 0 0 0 0 8
-+ 3603 3180 3581 3210 3194 3210 3161 3240 3028 3195 3268 3126
-+ 3214 3184 3608 3184
-+# polyline
-+2 1 0 1 0 7 50 0 20 0.000 0 0 0 0 0 8
-+ 3651 3128 3673 3098 4060 3098 4093 3068 4226 3113 3986 3182
-+ 4040 3124 3646 3124
-+# polyline
-+2 1 0 1 0 7 50 0 20 0.000 0 0 0 0 0 8
-+ 3760 3008 3738 3038 3351 3038 3318 3068 3185 3023 3425 2954
-+ 3371 3012 3765 3012
-+# polyline
-+2 1 0 1 0 7 50 0 20 0.000 0 0 0 0 0 8
-+ 3827 2963 3849 2933 4236 2933 4269 2903 4402 2948 4162 3017
-+ 4216 2959 3822 2959
-+-6
-+2 1 0 1 0 15 51 0 20 0.000 0 0 -1 0 0 4
-+ 4125 3300 4725 2850 4725 3300 4125 3750
-+2 2 0 1 0 15 51 0 20 0.000 0 0 -1 0 0 5
-+ 2625 3300 4125 3300 4125 3750 2625 3750 2625 3300
-+2 3 0 1 0 15 51 -1 20 0.000 0 0 -1 0 0 5
-+ 2625 3300 3225 2850 4725 2850 4125 3300 2625 3300
-+-6
diff --git a/media-gfx/xfig/files/xfig-3.2.5b-papersize_b1.patch b/media-gfx/xfig/files/xfig-3.2.5b-papersize_b1.patch
deleted file mode 100644
index fa0bdf0a3c0..00000000000
--- a/media-gfx/xfig/files/xfig-3.2.5b-papersize_b1.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 32_papersize_b1.dpatch by Roland Rosenfeld <roland@debian.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: xfig -papersize b1 now really uses B1 instead of B10
-## DP: Closes: #535181
-
-@DPATCH@
-diff -urNad xfig~/resources.c xfig/resources.c
---- xfig~/resources.c
-+++ xfig/resources.c
-@@ -228,7 +228,6 @@
- {"A2 ", "ISO A2 ( 420mm x 594mm)", 19843, 28063},
- {"A1 ", "ISO A1 ( 594mm x 841mm)", 28063, 39732},
- {"A0 ", "ISO A0 ( 841mm x 1189mm)", 39732, 56173},
-- {"B10 ", "JIS B10 ( 32mm x 45mm)", 1516, 2117},
- {"B9 ", "JIS B9 ( 45mm x 64mm)", 2117, 3017},
- {"B8 ", "JIS B8 ( 64mm x 91mm)", 3017, 4300},
- {"B7 ", "JIS B7 ( 91mm x 128mm)", 4300, 6050},
-@@ -239,6 +238,7 @@
- {"B2 ", "JIS B2 ( 515mm x 728mm)", 24333, 34400},
- {"B1 ", "JIS B1 ( 728mm x 1030mm)", 34400, 48666},
- {"B0 ", "JIS B0 (1030mm x 1456mm)", 48666, 68783},
-+ {"B10 ", "JIS B10 ( 32mm x 45mm)", 1516, 2117},
- };
-
- char *multiple_pages[] = {
diff --git a/media-gfx/xfig/files/xfig-3.2.5b-pdfimport_mediabox.patch b/media-gfx/xfig/files/xfig-3.2.5b-pdfimport_mediabox.patch
deleted file mode 100644
index 23de740f157..00000000000
--- a/media-gfx/xfig/files/xfig-3.2.5b-pdfimport_mediabox.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 33_pdfimport_mediabox.dpatch by jsoula@univ-lille2.fr
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Fix reading "/MediaBox" when importing PDF (Closes: #530898).
-
-@DPATCH@
-diff -urNad xfig~/f_readeps.c xfig/f_readeps.c
---- xfig~/f_readeps.c
-+++ xfig/f_readeps.c
-@@ -77,11 +77,13 @@
-
- /* look for /MediaBox for pdf file */
- if (pdf_flag) {
-- if (!strncmp(buf, "/MediaBox", 8)) { /* look for the MediaBox spec */
-+ char *s;
-+ for(s=buf; (s=strchr(s,'/')); s++) {
-+ if (!strncmp(s, "/MediaBox", 8)) { /* look for the MediaBox spec */
- char *c;
-
-- c = strchr(buf, '[') + 1;
-- if (c && sscanf(c, "%d %d %d %d", &llx, &lly, &urx, &ury) < 4) {
-+ c = strchr(s, '[');
-+ if (c && sscanf(c+1, "%d %d %d %d", &llx, &lly, &urx, &ury) < 4) {
- llx = lly = 0;
- urx = paper_sizes[0].width * 72 / PIX_PER_INCH;
- ury = paper_sizes[0].height * 72 / PIX_PER_INCH;
-@@ -89,7 +91,9 @@
- appres.INCHES ? "Letter" : "A4");
- app_flush();
- }
-+ break;
- }
-+ }
- /* look for bounding box */
- } else if (!nested && !strncmp(buf, "%%BoundingBox:", 14)) {
- if (!strstr(buf, "(atend)")) { /* make sure doesn't say (atend) */
diff --git a/media-gfx/xfig/files/xfig-3.2.5b-solaris.patch b/media-gfx/xfig/files/xfig-3.2.5b-solaris.patch
deleted file mode 100644
index 2e93a7faac2..00000000000
--- a/media-gfx/xfig/files/xfig-3.2.5b-solaris.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-* workaround some missing things on Solaris
-
---- a/u_quartic.c
-+++ b/u_quartic.c
-@@ -21,4 +21,7 @@
- #include <math.h>
-
-+ #ifndef M_PI
-+ # define M_PI 3.14159265358979323846
-+ #endif
-
- static int
---- a/w_intersect.c
-+++ b/w_intersect.c
-@@ -31,6 +31,11 @@
- #define ISET_P1 (1 << 0)
- #define ISET_P2 (1 << 1)
-
-+#if defined (__SVR4) && defined (__sun)
-+#undef _Complex_I
-+#define _Complex_I (__extension__ 1.0fi)
-+#endif
-+
- intersect_state_e intersect_state = INTERSECT_INITIAL;
-
- static INLINE Boolean
diff --git a/media-gfx/xfig/files/xfig-3.2.5b-urwfonts.patch b/media-gfx/xfig/files/xfig-3.2.5b-urwfonts.patch
deleted file mode 100644
index 87ac63f838f..00000000000
--- a/media-gfx/xfig/files/xfig-3.2.5b-urwfonts.patch
+++ /dev/null
@@ -1,79 +0,0 @@
---- a/u_fonts.c 2002-09-09 13:36:58.000000000 -0400
-+++ b/u_fonts.c 2006-10-11 00:29:07.000000000 -0400
-@@ -22,41 +22,41 @@
- /* X11 font names */
-
- struct _xfstruct x_fontinfo[NUM_FONTS] = {
-- {"-*-times-medium-r-normal--", (struct xfont*) NULL},
-- {"-*-times-medium-i-normal--", (struct xfont*) NULL},
-- {"-*-times-bold-r-normal--", (struct xfont*) NULL},
-- {"-*-times-bold-i-normal--", (struct xfont*) NULL},
-- {"-*-avantgarde-book-r-normal--", (struct xfont*) NULL},
-- {"-*-avantgarde-book-o-normal--", (struct xfont*) NULL},
-- {"-*-avantgarde-demi-r-normal--", (struct xfont*) NULL},
-- {"-*-avantgarde-demi-o-normal--", (struct xfont*) NULL},
-- {"-*-bookman-light-r-normal--", (struct xfont*) NULL},
-- {"-*-bookman-light-i-normal--", (struct xfont*) NULL},
-- {"-*-bookman-demi-r-normal--", (struct xfont*) NULL},
-- {"-*-bookman-demi-i-normal--", (struct xfont*) NULL},
-- {"-*-courier-medium-r-normal--", (struct xfont*) NULL},
-- {"-*-courier-medium-o-normal--", (struct xfont*) NULL},
-- {"-*-courier-bold-r-normal--", (struct xfont*) NULL},
-- {"-*-courier-bold-o-normal--", (struct xfont*) NULL},
-- {"-*-helvetica-medium-r-normal--", (struct xfont*) NULL},
-- {"-*-helvetica-medium-o-normal--", (struct xfont*) NULL},
-- {"-*-helvetica-bold-r-normal--", (struct xfont*) NULL},
-- {"-*-helvetica-bold-o-normal--", (struct xfont*) NULL},
-- {"-*-helvetica-medium-r-narrow--", (struct xfont*) NULL},
-- {"-*-helvetica-medium-o-narrow--", (struct xfont*) NULL},
-- {"-*-helvetica-bold-r-narrow--", (struct xfont*) NULL},
-- {"-*-helvetica-bold-o-narrow--", (struct xfont*) NULL},
-- {"-*-new century schoolbook-medium-r-normal--", (struct xfont*) NULL},
-- {"-*-new century schoolbook-medium-i-normal--", (struct xfont*) NULL},
-- {"-*-new century schoolbook-bold-r-normal--", (struct xfont*) NULL},
-- {"-*-new century schoolbook-bold-i-normal--", (struct xfont*) NULL},
-- {"-*-palatino-medium-r-normal--", (struct xfont*) NULL},
-- {"-*-palatino-medium-i-normal--", (struct xfont*) NULL},
-- {"-*-palatino-bold-r-normal--", (struct xfont*) NULL},
-- {"-*-palatino-bold-i-normal--", (struct xfont*) NULL},
-- {"-*-symbol-medium-r-normal--", (struct xfont*) NULL},
-- {"-*-itc zapf chancery-medium-i-normal--", (struct xfont*) NULL},
-- {"-*-itc zapf dingbats-*-*-*--", (struct xfont*) NULL},
-+ {"-urw-nimbus roman no9 l-medium-r-normal--", (struct xfont*) NULL},
-+ {"-urw-nimbus roman no9 l-medium-i-normal--", (struct xfont*) NULL},
-+ {"-urw-nimbus roman no9 l-bold-r-normal--", (struct xfont*) NULL},
-+ {"-urw-nimbus roman no9 l-bold-i-normal--", (struct xfont*) NULL},
-+ {"-urw-urw gothic l-medium-r-normal--", (struct xfont*) NULL},
-+ {"-urw-urw gothic l-medium-o-normal--", (struct xfont*) NULL},
-+ {"-urw-urw gothic l-semibold-r-normal--", (struct xfont*) NULL},
-+ {"-urw-urw gothic l-semibold-o-normal--", (struct xfont*) NULL},
-+ {"-urw-urw bookman l-medium-r-normal--", (struct xfont*) NULL},
-+ {"-urw-urw bookman l-medium-i-normal--", (struct xfont*) NULL},
-+ {"-urw-urw bookman l-bold-r-normal--", (struct xfont*) NULL},
-+ {"-urw-urw bookman l-bold-i-normal--", (struct xfont*) NULL},
-+ {"-urw-nimbus mono l-medium-r-normal--", (struct xfont*) NULL},
-+ {"-urw-nimbus mono l-medium-o-normal--", (struct xfont*) NULL},
-+ {"-urw-nimbus mono l-bold-r-normal--", (struct xfont*) NULL},
-+ {"-urw-nimbus mono l-bold-o-normal--", (struct xfont*) NULL},
-+ {"-urw-nimbus sans l-medium-r-normal--", (struct xfont*) NULL},
-+ {"-urw-nimbus sans l-medium-i-normal--", (struct xfont*) NULL},
-+ {"-urw-nimbus sans l-bold-r-normal--", (struct xfont*) NULL},
-+ {"-urw-nimbus sans l-bold-i-normal--", (struct xfont*) NULL},
-+ {"-urw-nimbus sans l-medium-r-condensed--", (struct xfont*) NULL},
-+ {"-urw-nimbus sans l-medium-i-condensed--", (struct xfont*) NULL},
-+ {"-urw-nimbus sans l-bold-r-condensed--", (struct xfont*) NULL},
-+ {"-urw-nimbus sans l-bold-i-condensed--", (struct xfont*) NULL},
-+ {"-urw-century schoolbook l-medium-r-normal--", (struct xfont*) NULL},
-+ {"-urw-century schoolbook l-medium-i-normal--", (struct xfont*) NULL},
-+ {"-urw-century schoolbook l-bold-r-normal--", (struct xfont*) NULL},
-+ {"-urw-century schoolbook l-bold-i-normal--", (struct xfont*) NULL},
-+ {"-urw-urw palladio l-medium-r-normal--", (struct xfont*) NULL},
-+ {"-urw-urw palladio l-medium-i-normal--", (struct xfont*) NULL},
-+ {"-urw-urw palladio l-bold-r-normal--", (struct xfont*) NULL},
-+ {"-urw-urw palladio l-bold-i-normal--", (struct xfont*) NULL},
-+ {"-urw-standard symbols l-medium-r-normal--", (struct xfont*) NULL},
-+ {"-urw-urw chancery l-medium-i-normal--", (struct xfont*) NULL},
-+ {"-urw-dingbats-medium-r-normal--", (struct xfont*) NULL},
- };
-
- /* Use the following font names for any font that doesn't exist in the table above.
diff --git a/media-gfx/xfig/files/xfig-3.2.5c-XAW3D1_5E_notlocal.patch b/media-gfx/xfig/files/xfig-3.2.5c-XAW3D1_5E_notlocal.patch
deleted file mode 100644
index 8998b406467..00000000000
--- a/media-gfx/xfig/files/xfig-3.2.5c-XAW3D1_5E_notlocal.patch
+++ /dev/null
@@ -1,70 +0,0 @@
-From be8cf541743060921f629d5bfe990d985ecf1813 Mon Sep 17 00:00:00 2001
-From: Vladislav Zavjalov <slazav@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"
diff --git a/media-gfx/xfig/files/xfig-3.2.5c-crash-on-exit.patch b/media-gfx/xfig/files/xfig-3.2.5c-crash-on-exit.patch
deleted file mode 100644
index 80d20281ae9..00000000000
--- a/media-gfx/xfig/files/xfig-3.2.5c-crash-on-exit.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-commit 56f0caaae3cc3fdbf6eaa21fc419c951c53a156d
-Author: Peter Volkov <peter.volkov@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;
- }
- }
diff --git a/media-gfx/xfig/files/xfig-3.2.5c-darwin.patch b/media-gfx/xfig/files/xfig-3.2.5c-darwin.patch
deleted file mode 100644
index 5d64c2a4deb..00000000000
--- a/media-gfx/xfig/files/xfig-3.2.5c-darwin.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-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
-
diff --git a/media-gfx/xfig/files/xfig-3.2.5c-spelling.patch b/media-gfx/xfig/files/xfig-3.2.5c-spelling.patch
deleted file mode 100644
index 4af77e0e9b0..00000000000
--- a/media-gfx/xfig/files/xfig-3.2.5c-spelling.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 31_spelling.dpatch by Roland Rosenfeld <roland@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));
- }
diff --git a/media-gfx/xfig/xfig-3.2.5c.ebuild b/media-gfx/xfig/xfig-3.2.5c.ebuild
deleted file mode 100644
index 98f535d1daf..00000000000
--- a/media-gfx/xfig/xfig-3.2.5c.ebuild
+++ /dev/null
@@ -1,109 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils multilib
-
-MY_P=${PN}.${PV}
-
-DESCRIPTION="A menu-driven tool to draw and manipulate objects interactively in an X window"
-HOMEPAGE="http://www.xfig.org"
-SRC_URI="mirror://sourceforge/mcj/${MY_P}.full.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="alpha amd64 ~arm hppa ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
-IUSE="nls"
-
-RDEPEND="x11-libs/libXaw
- x11-libs/libXp
- x11-libs/libXaw3d
- nls? ( x11-libs/libXaw3d[unicode] )
- x11-libs/libXi
- x11-libs/libXt
- virtual/jpeg
- media-libs/libpng
- media-fonts/font-misc-misc
- media-fonts/urw-fonts
- >=media-gfx/transfig-3.2.5-r1
- media-libs/netpbm"
-DEPEND="${RDEPEND}
- x11-misc/imake
- x11-proto/xproto
- x11-proto/inputproto"
-
-S=${WORKDIR}/${MY_P}
-
-sed_Imakefile() {
- # see Imakefile for details
- vars2subs=( BINDIR="${EPREFIX}"/usr/bin
- PNGINC=-I"${EPREFIX}"/usr/include
- JPEGLIBDIR="${EPREFIX}"/usr/$(get_libdir)
- JPEGINC=-I"${EPREFIX}"/usr/include
- XPMLIBDIR="${EPREFIX}"/usr/$(get_libdir)
- XPMINC=-I"${EPREFIX}"/usr/include/X11
- USEINLINE=-DUSE_INLINE
- XFIGLIBDIR="${EPREFIX}"/usr/share/xfig
- XFIGDOCDIR="${EPREFIX}/usr/share/doc/${PF}"
- MANDIR="${EPREFIX}/usr/share/man/man\$\(MANSUFFIX\)"
- "CC=$(tc-getCC)" )
-
- for variable in "${vars2subs[@]}" ; do
- varname=${variable%%=*}
- varval=${variable##*=}
- sed -i \
- -e "s:^\(XCOMM\)*[[:space:]]*${varname}[[:space:]]*=.*$:${varname} = ${varval}:" \
- "$@" || die
- done
- if use nls; then
- # XAW_INTERNATIONALIZATION fixes #405475 (comment 17) and #426780 by Markus Peloquin
- sed -i \
- -e "s:^\(XCOMM\)*[[:space:]]*\(#define I18N\).*$:\2:" \
- -e "s:^\(XCOMM\)*[[:space:]]*\(XAW_INTERN = -DXAW_INTERNATIONALIZATION\).*$:\2:" \
- "$@" || die
- fi
- sed -i -e "s:^\(XCOMM\)*[[:space:]]*\(#define XAW3D1_5E\).*$:\2:" "$@" || die
-}
-
-src_prepare() {
- # Permissions are really crazy here
- chmod -R go+rX . || die
- find . -type f -exec chmod a-x '{}' \; || die
- epatch "${FILESDIR}/${PN}-3.2.5c-spelling.patch"
- epatch "${FILESDIR}/${PN}-3.2.5b-papersize_b1.patch"
- epatch "${FILESDIR}/${PN}-3.2.5b-pdfimport_mediabox.patch"
- epatch "${FILESDIR}/${PN}-3.2.5b-network_images.patch"
- epatch "${FILESDIR}/${PN}-3.2.5b-app-defaults.patch"
- epatch "${FILESDIR}/${PN}-3.2.5b-urwfonts.patch"
- epatch "${FILESDIR}/${PN}-3.2.5b-mkstemp.patch" #264575
- epatch "${FILESDIR}/${PN}-3.2.5c-darwin.patch"
- epatch "${FILESDIR}/${PN}-3.2.5b-solaris.patch"
- epatch "${FILESDIR}/${PN}-3.2.5c-XAW3D1_5E_notlocal.patch"
- epatch "${FILESDIR}/${PN}-3.2.5c-crash-on-exit.patch"
-
- sed_Imakefile Imakefile
- sed -e "s:/usr/lib/X11/xfig:${EPREFIX}/usr/share/doc/${PF}:" \
- -i Doc/xfig.man || die
-}
-
-src_compile() {
- local EXTCFLAGS=${CFLAGS}
- xmkmf || die
- [[ ${CHOST} == *-solaris* ]] && EXTCFLAGS="${EXTCFLAGS} -D_POSIX_SOURCE"
- emake CC="$(tc-getCC)" LOCAL_LDFLAGS="${LDFLAGS}" CDEBUGFLAGS="${EXTCFLAGS}" \
- USRLIBDIR="${EPREFIX}"/usr/$(get_libdir)
-}
-
-src_install() {
- emake -j1 DESTDIR="${D}" install install.libs install.man
-
- dodoc README FIGAPPS CHANGES LATEX.AND.XFIG
-
- doicon xfig.png
- make_desktop_entry xfig Xfig xfig
-}
-
-pkg_postinst() {
- einfo "Don't forget to update xserver's font path for media-fonts/urw-fonts."
-}
diff --git a/media-gfx/xfig/xfig-3.2.6a.ebuild b/media-gfx/xfig/xfig-3.2.6a.ebuild
deleted file mode 100644
index cb1a5954893..00000000000
--- a/media-gfx/xfig/xfig-3.2.6a.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="A menu-driven tool to draw and manipulate objects interactively in an X window"
-HOMEPAGE="http://mcj.sourceforge.net/"
-SRC_URI="mirror://sourceforge/mcj/${PN}-full-${PV}.tar.xz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="alpha amd64 ~arm hppa ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
-IUSE="jpeg nls postscript"
-
-RDEPEND="
- x11-libs/libXaw
- x11-libs/libXp
- x11-libs/libXaw3d
- x11-libs/libXi
- x11-libs/libXt
- media-libs/libpng:0=
- media-fonts/font-misc-misc
- media-fonts/urw-fonts
- >=media-gfx/transfig-3.2.5-r1
- media-libs/netpbm
- jpeg? ( virtual/jpeg:0= )
- nls? ( x11-libs/libXaw3d[unicode] )
- postscript? ( app-text/ghostscript-gpl )
-"
-DEPEND="${RDEPEND}
- x11-proto/xproto
- x11-proto/inputproto
-"
-
-PATCHES=(
- "${FILESDIR}/${PN}-3.2.6a-urwfonts.patch"
- "${FILESDIR}/${PN}-3.2.6a-solaris.patch"
- "${FILESDIR}/${PN}-3.2.6a-app-defaults.patch"
-)
-
-src_configure() {
- econf \
- $(use_enable nls i18n) \
- $(use_enable jpeg) \
- $(use_with postscript gs) \
- --htmldir="${EPREFIX}/usr/share/doc/${PF}" # it expects docdir...
-}
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-gfx/xfig/, media-gfx/xfig/files/
@ 2020-10-12 18:26 Stephan Hartmann
0 siblings, 0 replies; 4+ messages in thread
From: Stephan Hartmann @ 2020-10-12 18:26 UTC (permalink / raw
To: gentoo-commits
commit: d760b499a6081410e6125dae00c236d5404a60a1
Author: Jakov Smolic <jakov.smolic <AT> sartura <DOT> hr>
AuthorDate: Mon Oct 12 06:04:17 2020 +0000
Commit: Stephan Hartmann <sultan <AT> gentoo <DOT> org>
CommitDate: Mon Oct 12 18:26:07 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d760b499
media-gfx/xfig: patch ghostscript issue
Closes: https://bugs.gentoo.org/747559
Package-Manager: Portage-3.0.4, Repoman-3.0.1
Signed-off-by: Jakov Smolic <jakov.smolic <AT> sartura.hr>
Closes: https://github.com/gentoo/gentoo/pull/17891
Signed-off-by: Stephan Hartmann <sultan <AT> gentoo.org>
media-gfx/xfig/files/xfig-3.2.7b-ghostscript.patch | 13 +++++++++++++
media-gfx/xfig/xfig-3.2.7b.ebuild | 1 +
2 files changed, 14 insertions(+)
diff --git a/media-gfx/xfig/files/xfig-3.2.7b-ghostscript.patch b/media-gfx/xfig/files/xfig-3.2.7b-ghostscript.patch
new file mode 100644
index 00000000000..07a7de141ec
--- /dev/null
+++ b/media-gfx/xfig/files/xfig-3.2.7b-ghostscript.patch
@@ -0,0 +1,13 @@
+diff --git a/src/Makefile.in b/src/Makefile.in
+index 7426253..ae5b045 100644
+--- a/src/Makefile.in
++++ b/src/Makefile.in
+@@ -1356,7 +1356,7 @@ splash.xpm: $(top_srcdir)/splash-image/spl_bckgnd.fig.in \
+ fig2dev -L xpm $(top_srcdir)/splash-image/spl_bckgnd.fig \
+ | sed '2 {s/static //; s/noname/spl_bckgnd_xpm/}' > $@
+
+-splash.xbm: $(top_srcdir)/splash-image/spl_bckgnd.fig $(top_srcdir)/version.m4
++splash.xbm: $(top_srcdir)/splash-image/spl_bckgnd.fig.in $(top_srcdir)/version.m4
+ fig2dev -L xbm -S 4 $(top_srcdir)/splash-image/spl_bckgnd.fig \
+ | sed '1,3 s/noname/spl_bckgnd/; 3 s/char/unsigned &/' > $@
+
diff --git a/media-gfx/xfig/xfig-3.2.7b.ebuild b/media-gfx/xfig/xfig-3.2.7b.ebuild
index 3232a773a65..c1e849310d7 100644
--- a/media-gfx/xfig/xfig-3.2.7b.ebuild
+++ b/media-gfx/xfig/xfig-3.2.7b.ebuild
@@ -36,6 +36,7 @@ PATCHES=(
"${FILESDIR}/${PN}-3.2.6a-urwfonts.patch"
"${FILESDIR}/${PN}-3.2.6a-solaris.patch"
"${FILESDIR}/${PN}-3.2.6a-app-defaults.patch"
+ "${FILESDIR}/${PN}-3.2.7b-ghostscript.patch"
)
src_configure() {
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-gfx/xfig/, media-gfx/xfig/files/
@ 2022-08-27 15:29 Matt Turner
0 siblings, 0 replies; 4+ messages in thread
From: Matt Turner @ 2022-08-27 15:29 UTC (permalink / raw
To: gentoo-commits
commit: 2a48d4e4bce4431bd68ead902a4042e9877c9ff6
Author: Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Sat Aug 27 12:54:45 2022 +0000
Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Sat Aug 27 15:29:37 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2a48d4e4
media-gfx/xfig: Version bump to 3.2.8b
* Bump to EAPI=8
* Move media-libs/netpbm from DEPEND/RDEPEND to optfeature
* Remove unneeded dependencies: x11-libs/libXaw, x11-libs/libXi
* Add needed dependencies: media-libs/tiff, x11-libs/libX11, x11-libs/libXpm
* Remove IUSE="jpeg" and IUSE="postscript", as they're always enabled
upstream now.
* Remove IUSE="nls" and add (+) to x11-libs/libXaw3d's unicode USE-dep
* Switch from virtual/jpeg to media-libs/libjpeg-turbo
* Add patch to build with -lflto
Bug: https://bugs.gentoo.org/807784
Closes: https://bugs.gentoo.org/761424
Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>
media-gfx/xfig/Manifest | 1 +
.../files/xfig-3.2.8b-Fix-build-with-flto.patch | 62 ++++++++++++++++++++++
.../xfig/files/xfig-3.2.8b-app-defaults.patch | 14 +++++
media-gfx/xfig/xfig-3.2.8b.ebuild | 52 ++++++++++++++++++
4 files changed, 129 insertions(+)
diff --git a/media-gfx/xfig/Manifest b/media-gfx/xfig/Manifest
index 46a43488a86d..80f26b1cdbf9 100644
--- a/media-gfx/xfig/Manifest
+++ b/media-gfx/xfig/Manifest
@@ -1 +1,2 @@
DIST xfig-3.2.7b.tar.xz 5059984 BLAKE2B a22465e16019e9887e302ea308e250ad5d7ba0c49aec8f554a73d3b4489d803a05041cb7d267c543a7c0d3b78eac25077c628283f82767932afcc9d9750ce883 SHA512 f3396ebf8a5961909e58b05b60117fd7bbc8c24fabbd47f108eaea9586f4180af572faffe077b1a5dcbf669ebd69b1c2791f302c126dea62a44aa1592de66f73
+DIST xfig-3.2.8b.tar.xz 5382524 BLAKE2B 94963d165664c6451776fcbc3e332a7933c00d4b43e3d4196f15883a9873171f7a0791e6fa41cbb6e8d07958f9ddcceb9578a62a9893cf2f436c07dcbe3e7f37 SHA512 5cc5e61977f97956baca77bf4bce09d0f47ea6fafb10055d0523f7cccd72d7af80e706daa62ae16df3fc54338b4f6cd4a6b71dc460311e65be749ec84fa662b3
diff --git a/media-gfx/xfig/files/xfig-3.2.8b-Fix-build-with-flto.patch b/media-gfx/xfig/files/xfig-3.2.8b-Fix-build-with-flto.patch
new file mode 100644
index 000000000000..344d4df06e69
--- /dev/null
+++ b/media-gfx/xfig/files/xfig-3.2.8b-Fix-build-with-flto.patch
@@ -0,0 +1,62 @@
+https://sourceforge.net/p/mcj/tickets/149/
+
+From 938c4089e6cc09e6e327f15d622c064865f837ae Mon Sep 17 00:00:00 2001
+From: Matt Turner <mattst88@gmail.com>
+Date: Sat, 27 Aug 2022 09:14:55 -0400
+Subject: [PATCH] Fix build with -flto
+
+With CFLAGS="-lflto" the tests fail to build because main() is
+redeclared with a different type:
+
+../src/main.c:651:1: error: type of ‘main’ does not match original declaration [-Werror=lto-type-mismatch]
+ 651 | main(int argc, char **argv)
+ | ^
+test1.c:47:1: note: type mismatch in parameter 1
+ 47 | main(void)
+ | ^
+test1.c:47:1: note: type ‘void’ should match type ‘int’
+test1.c:47:1: note: ‘main’ was previously declared here
+
+Simply change the definitions of main() in the tests to match
+the one in src/main.c.
+---
+ tests/test1.c | 4 +++-
+ tests/test2.c | 4 +++-
+ tests/test4.c | 4 +++-
+ 3 files changed, 9 insertions(+), 3 deletions(-)
+
+diff --git a/tests/test1.c b/tests/test1.c
+index 83cf930..da76dd7 100644
+--- a/tests/test1.c
++++ b/tests/test1.c
+@@ -44,8 +44,10 @@ round_coords(int *x, int *y)
+ }
+
+ int
+-main(void)
++main(int argc, char *argv[])
+ {
++ (void) argc;
++ (void) argv;
+ int errcode = 0;
+
+ cur_pointposn = 2; /* == P_GRID1, see mode.h */
+diff --git a/tests/test2.c b/tests/test2.c
+index ab3b434..02e919c 100644
+--- a/tests/test2.c
++++ b/tests/test2.c
+@@ -77,8 +77,10 @@ compare(int xc, int yc, int n, int pts[n][2])
+ }
+
+ int
+-main(void)
++main(int argc, char *argv[])
+ {
++ (void) argc;
++ (void) argv;
+ int x, y, yspacing, xc, yc, dist, xdist;
+ int error = 0;
+ int pts_square[2][2];
+--
+2.35.1
+
diff --git a/media-gfx/xfig/files/xfig-3.2.8b-app-defaults.patch b/media-gfx/xfig/files/xfig-3.2.8b-app-defaults.patch
new file mode 100644
index 000000000000..3ca0f99963ac
--- /dev/null
+++ b/media-gfx/xfig/files/xfig-3.2.8b-app-defaults.patch
@@ -0,0 +1,14 @@
+diff -ruN xfig-3.2.8b.orig/app-defaults/Fig xfig-3.2.6a/app-defaults/Fig
+--- xfig-3.2.8b.orig/app-defaults/Fig.in 2017-01-10 00:27:39.000000000 +0100
++++ xfig-3.2.8b/app-defaults/Fig.in 2017-03-24 16:22:14.702253419 +0100
+@@ -10,6 +10,10 @@
+
+ ! some sample settings you may want to change
+
++! If the following resource is set to false, xfig will use metric units
++! by default.
++Fig.inches: false
++
+ ! The following fixes a problem that some window managers have
+ ! with xfig continually resizing itself
+
diff --git a/media-gfx/xfig/xfig-3.2.8b.ebuild b/media-gfx/xfig/xfig-3.2.8b.ebuild
new file mode 100644
index 000000000000..e25f69b210d0
--- /dev/null
+++ b/media-gfx/xfig/xfig-3.2.8b.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit optfeature xdg
+
+DESCRIPTION="A menu-driven tool to draw and manipulate objects interactively in an X window"
+HOMEPAGE="http://mcj.sourceforge.net/"
+SRC_URI="https://downloads.sourceforge.net/project/mcj/${P}.tar.xz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris ~x86-solaris"
+
+COMMON_DEPEND="
+ app-text/ghostscript-gpl:=
+ >=media-gfx/transfig-3.2.5-r1
+ media-libs/libjpeg-turbo:0=
+ media-libs/libpng:0=
+ media-libs/tiff
+ x11-libs/libX11
+ x11-libs/libXaw3d[unicode(+)]
+ x11-libs/libXpm
+ x11-libs/libXt
+"
+DEPEND="${COMMON_DEPEND}
+ x11-base/xorg-proto
+"
+RDEPEND="${COMMON_DEPEND}
+ media-fonts/font-misc-misc
+ media-fonts/urw-fonts
+"
+
+PATCHES=(
+ "${FILESDIR}/${PN}-3.2.6a-urwfonts.patch"
+ "${FILESDIR}/${PN}-3.2.6a-solaris.patch"
+ "${FILESDIR}/${PN}-3.2.8b-app-defaults.patch"
+ "${FILESDIR}/${PN}-3.2.8b-Fix-build-with-flto.patch"
+)
+
+src_configure() {
+ local myeconfargs=(
+ --enable-i18n
+ --htmldir="${EPREFIX}/usr/share/doc/${PF}" # it expects docdir...
+ )
+ econf "${myeconfargs[@]}"
+}
+
+pkg_postinst() {
+ optfeature "GIF support" media-libs/netpbm virtual/imagemagick-tools
+}
^ permalink raw reply related [flat|nested] 4+ messages in thread
end of thread, other threads:[~2022-08-27 23:15 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2020-10-12 18:26 [gentoo-commits] repo/gentoo:master commit in: media-gfx/xfig/, media-gfx/xfig/files/ Stephan Hartmann
-- strict thread matches above, loose matches on Subject: below --
2022-08-27 15:29 Matt Turner
2018-04-02 0:51 Matt Turner
2017-03-24 17:10 Andreas Hüttel
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox