commit: 0462d9b7b48ccdc169d09602107494dd0aceca18
Author: Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at>
AuthorDate: Sat Feb 17 14:35:18 2024 +0000
Commit: David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Sat Feb 17 14:35:18 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0462d9b7
media-gfx/xfig: remove unused patches
Signed-off-by: Michael Mair-Keimberger <mmk <AT> levelnine.at>
Signed-off-by: David Seifert <soap <AT> gentoo.org>
media-gfx/xfig/files/xfig-3.2.6a-urwfonts.patch | 79 ----------------------
.../files/xfig-3.2.8b-Fix-build-with-flto.patch | 62 -----------------
.../xfig/files/xfig-3.2.8b-app-defaults.patch | 14 ----
3 files changed, 155 deletions(-)
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.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 <[email protected]>
-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
deleted file mode 100644
index 3ca0f99963ac..000000000000
--- a/media-gfx/xfig/files/xfig-3.2.8b-app-defaults.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-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
-
