Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status
summaryrefslogtreecommitdiff
path: root/media-gfx/xfig
diff options
context:
space:
mode:
Diffstat (limited to 'media-gfx/xfig')
-rw-r--r--media-gfx/xfig/Manifest3
-rw-r--r--media-gfx/xfig/files/xfig-3.2.6a-app-defaults.patch14
-rw-r--r--media-gfx/xfig/files/xfig-3.2.6a-urwfonts.patch79
-rw-r--r--media-gfx/xfig/files/xfig-3.2.7b-ghostscript.patch13
-rw-r--r--media-gfx/xfig/files/xfig-3.2.8b-Fix-build-with-flto.patch62
-rw-r--r--media-gfx/xfig/files/xfig-3.2.9-app-defaults.patch (renamed from media-gfx/xfig/files/xfig-3.2.8b-app-defaults.patch)8
-rw-r--r--media-gfx/xfig/metadata.xml9
-rw-r--r--media-gfx/xfig/xfig-3.2.7b-r1.ebuild50
-rw-r--r--media-gfx/xfig/xfig-3.2.9.ebuild (renamed from media-gfx/xfig/xfig-3.2.8b.ebuild)20
9 files changed, 21 insertions, 237 deletions
diff --git a/media-gfx/xfig/Manifest b/media-gfx/xfig/Manifest
index 80f26b1cdbf9..67b7ac2e8503 100644
--- a/media-gfx/xfig/Manifest
+++ b/media-gfx/xfig/Manifest
@@ -1,2 +1 @@
-DIST xfig-3.2.7b.tar.xz 5059984 BLAKE2B a22465e16019e9887e302ea308e250ad5d7ba0c49aec8f554a73d3b4489d803a05041cb7d267c543a7c0d3b78eac25077c628283f82767932afcc9d9750ce883 SHA512 f3396ebf8a5961909e58b05b60117fd7bbc8c24fabbd47f108eaea9586f4180af572faffe077b1a5dcbf669ebd69b1c2791f302c126dea62a44aa1592de66f73
-DIST xfig-3.2.8b.tar.xz 5382524 BLAKE2B 94963d165664c6451776fcbc3e332a7933c00d4b43e3d4196f15883a9873171f7a0791e6fa41cbb6e8d07958f9ddcceb9578a62a9893cf2f436c07dcbe3e7f37 SHA512 5cc5e61977f97956baca77bf4bce09d0f47ea6fafb10055d0523f7cccd72d7af80e706daa62ae16df3fc54338b4f6cd4a6b71dc460311e65be749ec84fa662b3
+DIST xfig-3.2.9.tar.xz 5368544 BLAKE2B 6fd04d7238453d304a5e9624524f1e3674fe21ea3485d0925fa430a6312b61019a54397301cd7773565035cd3aee7fa130ed2459187241a778c0d44759c57d45 SHA512 c5e797b394740761a24e6e5e83d025dd78a11ad7d12662728c708218d7131d9077d9ed0c09023134ed9d709c58f52f5c9182e5b50e540b1876be4c359d79a60e
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
deleted file mode 100644
index 7d11b571df39..000000000000
--- a/media-gfx/xfig/files/xfig-3.2.6a-app-defaults.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-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-urwfonts.patch b/media-gfx/xfig/files/xfig-3.2.6a-urwfonts.patch
deleted file mode 100644
index 89957590af6d..000000000000
--- a/media-gfx/xfig/files/xfig-3.2.6a-urwfonts.patch
+++ /dev/null
@@ -1,79 +0,0 @@
---- 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/files/xfig-3.2.7b-ghostscript.patch b/media-gfx/xfig/files/xfig-3.2.7b-ghostscript.patch
deleted file mode 100644
index 07a7de141ec0..000000000000
--- a/media-gfx/xfig/files/xfig-3.2.7b-ghostscript.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-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/files/xfig-3.2.8b-Fix-build-with-flto.patch b/media-gfx/xfig/files/xfig-3.2.8b-Fix-build-with-flto.patch
deleted file mode 100644
index 344d4df06e69..000000000000
--- a/media-gfx/xfig/files/xfig-3.2.8b-Fix-build-with-flto.patch
+++ /dev/null
@@ -1,62 +0,0 @@
-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.9-app-defaults.patch
index 3ca0f99963ac..09c61453f679 100644
--- a/media-gfx/xfig/files/xfig-3.2.8b-app-defaults.patch
+++ b/media-gfx/xfig/files/xfig-3.2.9-app-defaults.patch
@@ -1,9 +1,7 @@
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
+--- xfig-3.2.8b.orig/app-defaults/Fig 2017-01-10 00:27:39.000000000 +0100
++++ xfig-3.2.8b/app-defaults/Fig 2017-03-24 16:22:14.702253419 +0100
+@@ -10,4 +10,8 @@
+! If the following resource is set to false, xfig will use metric units
+! by default.
diff --git a/media-gfx/xfig/metadata.xml b/media-gfx/xfig/metadata.xml
index 9206b593ffbc..78af0f20536c 100644
--- a/media-gfx/xfig/metadata.xml
+++ b/media-gfx/xfig/metadata.xml
@@ -1,7 +1,14 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <!--maintainer-needed-->
+ <maintainer type="person" proxied="yes">
+ <email>mario.haustein@hrz.tu-chemnitz.de</email>
+ <name>Mario Haustein</name>
+ </maintainer>
+ <maintainer type="project" proxied="proxy">
+ <email>proxy-maint@gentoo.org</email>
+ <name>Proxy Maintainers</name>
+ </maintainer>
<upstream>
<remote-id type="sourceforge">mcj</remote-id>
</upstream>
diff --git a/media-gfx/xfig/xfig-3.2.7b-r1.ebuild b/media-gfx/xfig/xfig-3.2.7b-r1.ebuild
deleted file mode 100644
index 4f24ee215a3e..000000000000
--- a/media-gfx/xfig/xfig-3.2.7b-r1.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit 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"
-IUSE="jpeg nls postscript"
-
-RDEPEND="
- x11-libs/libXaw
- 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? ( media-libs/libjpeg-turbo:= )
- nls? ( x11-libs/libXaw3d[unicode(+)] )
- postscript? ( app-text/ghostscript-gpl )
-"
-DEPEND="${RDEPEND}
- x11-base/xorg-proto
-"
-
-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() {
- local myeconfargs=(
- $(use_enable nls i18n)
- $(use_enable jpeg)
- $(use_with postscript gs)
- --htmldir="${EPREFIX}/usr/share/doc/${PF}" # it expects docdir...
- )
- econf "${myeconfargs[@]}"
-}
diff --git a/media-gfx/xfig/xfig-3.2.8b.ebuild b/media-gfx/xfig/xfig-3.2.9.ebuild
index 41d99bb28a6a..bb7c1053b687 100644
--- a/media-gfx/xfig/xfig-3.2.8b.ebuild
+++ b/media-gfx/xfig/xfig-3.2.9.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -6,21 +6,22 @@ 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/"
+HOMEPAGE="https://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"
+KEYWORDS="~alpha amd64 arm ~hppa ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-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
+ >=media-gfx/fig2dev-${PV}
+ media-libs/libjpeg-turbo:=
+ media-libs/libpng:=
+ media-libs/tiff:=
x11-libs/libX11
x11-libs/libXaw3d[unicode(+)]
+ x11-libs/libXft
x11-libs/libXpm
x11-libs/libXt
"
@@ -33,15 +34,12 @@ RDEPEND="${COMMON_DEPEND}
"
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"
+ "${FILESDIR}/${PN}-3.2.9-app-defaults.patch"
)
src_configure() {
local myeconfargs=(
- --enable-i18n
--htmldir="${EPREFIX}/usr/share/doc/${PF}" # it expects docdir...
)
econf "${myeconfargs[@]}"