1 |
commit: 7d473744a565102ce13bd5a341ad91f50779ef9a |
2 |
Author: Anthony G. Basile <blueness <AT> gentoo <DOT> org> |
3 |
AuthorDate: Thu Feb 28 10:48:05 2019 +0000 |
4 |
Commit: Anthony G. Basile <blueness <AT> gentoo <DOT> org> |
5 |
CommitDate: Thu Feb 28 10:48:05 2019 +0000 |
6 |
URL: https://gitweb.gentoo.org/proj/musl.git/commit/?id=7d473744 |
7 |
|
8 |
sys-apps/groff: remove unused patches |
9 |
|
10 |
Signed-off-by: Anthony G. Basile <blueness <AT> gentoo.org> |
11 |
Package-Manager: Portage-2.3.51, Repoman-2.3.11 |
12 |
|
13 |
.../groff/files/groff-1.22.2-parallel-mom.patch | 96 ---------------------- |
14 |
.../groff/files/groff-1.22.3-parallel-mom.patch | 11 --- |
15 |
2 files changed, 107 deletions(-) |
16 |
|
17 |
diff --git a/sys-apps/groff/files/groff-1.22.2-parallel-mom.patch b/sys-apps/groff/files/groff-1.22.2-parallel-mom.patch |
18 |
deleted file mode 100644 |
19 |
index 7cf3c22..0000000 |
20 |
--- a/sys-apps/groff/files/groff-1.22.2-parallel-mom.patch |
21 |
+++ /dev/null |
22 |
@@ -1,96 +0,0 @@ |
23 |
-From 9f3af719383ab525c86ee0f514e268ef8494330a Mon Sep 17 00:00:00 2001 |
24 |
-From: Mike Frysinger <vapier@g.o> |
25 |
-Date: Fri, 6 Dec 2013 20:40:10 -0500 |
26 |
-Subject: [PATCH] fix parallel build w/gropdf and mom examples |
27 |
- |
28 |
-The contrib/mom/examples/ directory uses the helper script from |
29 |
-src/devices/gropdf/. Currently though, parallel builds might fail |
30 |
-like so: |
31 |
- |
32 |
-... |
33 |
-make[2]: Entering directory `.../groff-1.22.2/contrib/mom' |
34 |
-GROFF_COMMAND_PREFIX= GROFF_BIN_PATH="`echo .../groff-1.22.2/src/roff/groff .../groff-1.22.2/src/roff/troff .../groff-1.22.2/src/devices/grops .../groff-1.22.2/src/devices/gropdf | sed -e 's| *|:|g'`" PDFMOM_BIN_PATH=".../groff-1.22.2/src/devices/gropdf" .../groff-1.22.2/src/devices/gropdf/pdfmom -F.../groff-1.22.2/font -F.../groff-1.22.2/font -M.../groff-1.22.2/tmac -M.../groff-1.22.2/tmac -M. examples/letter.mom >examples/letter.pdf |
35 |
-GROFF_COMMAND_PREFIX= GROFF_BIN_PATH="`echo .../groff-1.22.2/src/roff/groff .../groff-1.22.2/src/roff/troff .../groff-1.22.2/src/devices/grops .../groff-1.22.2/src/devices/gropdf | sed -e 's| *|:|g'`" PDFMOM_BIN_PATH=".../groff-1.22.2/src/devices/gropdf" .../groff-1.22.2/src/devices/gropdf/pdfmom -F.../groff-1.22.2/font -F.../groff-1.22.2/font -M.../groff-1.22.2/tmac -M.../groff-1.22.2/tmac -M. examples/mom-pdf.mom >examples/mom-pdf.pdf |
36 |
-/bin/sh: .../groff-1.22.2/src/devices/gropdf/pdfmom: No such file or directory |
37 |
-make[2]: *** [examples/letter.pdf] Error 127 |
38 |
-/bin/sh: .../groff-1.22.2/src/devices/gropdf/pdfmom: No such file or directory |
39 |
-make[2]: *** [examples/mom-pdf.pdf] Error 127 |
40 |
-make[2]: Leaving directory `.../groff-1.22.2/contrib/mom' |
41 |
-make[1]: *** [contrib/mom] Error 2 |
42 |
-... |
43 |
-make[2]: Entering directory `.../groff-1.22.2/src/devices/gropdf' |
44 |
-sed -f .../groff-1.22.2/arch/misc/shdeps.sed \ |
45 |
- -e "s|@VERSION@|1.22.2|" \ |
46 |
- -e "s|@PERLPATH@|/usr/bin/perl|" ./pdfmom.pl >pdfmom |
47 |
- |
48 |
-The top level makefile tries to account for this in general with OTHERDIRS, |
49 |
-but looks like src/devices/gropdf/ was added to this variable (which holds |
50 |
-contrib/mom/ too) because gropdf installs a shell script, and the other |
51 |
-prog vars require it to be a dir of things to compile. |
52 |
- |
53 |
-Declare a new prog var for holding shell scripts. |
54 |
- |
55 |
-URL: http://crbug.com/324116 |
56 |
-URL: https://bugs.gentoo.org/487276 |
57 |
-Signed-off-by: Mike Frysinger <vapier@g.o> |
58 |
- |
59 |
-2013-12-06 Mike Frysinger <vapier@g.o> |
60 |
- |
61 |
- * Makefile.in (SHPROGDIRS): Declare. |
62 |
- (PROGDIRS): Add $(SHPROGDIRS). |
63 |
- (OTHERDIRS): Delete src/devices/gropdf. |
64 |
- ($(SHPROGDIRS):): Add to existing rule. |
65 |
- ($(OTHERDIRS):): Depend on $(SHPROGDIRS). |
66 |
---- |
67 |
- Makefile.in | 8 +++++--- |
68 |
- 1 file changed, 5 insertions(+), 3 deletions(-) |
69 |
- |
70 |
-diff --git a/Makefile.in b/Makefile.in |
71 |
-index a794de7..8e478af 100644 |
72 |
---- a/Makefile.in |
73 |
-+++ b/Makefile.in |
74 |
-@@ -602,12 +602,15 @@ CCPROGDIRS=\ |
75 |
- src/utils/addftinfo |
76 |
- CPROGDIRS=\ |
77 |
- src/utils/pfbtops |
78 |
-+SHPROGDIRS=\ |
79 |
-+ src/devices/gropdf |
80 |
- PROGDEPDIRS=\ |
81 |
- arch/misc |
82 |
- PROGDIRS=\ |
83 |
- $(PROGDEPDIRS) \ |
84 |
- $(CCPROGDIRS) \ |
85 |
- $(CPROGDIRS) \ |
86 |
-+ $(SHPROGDIRS) \ |
87 |
- $(XPROGDIRS) |
88 |
- DEVDIRS=\ |
89 |
- font/devps \ |
90 |
-@@ -637,7 +640,6 @@ OTHERDIRS=\ |
91 |
- contrib/glilypond \ |
92 |
- contrib/hdtbl \ |
93 |
- contrib/pdfmark \ |
94 |
-- src/devices/gropdf \ |
95 |
- font/devpdf \ |
96 |
- contrib/mom \ |
97 |
- contrib/gdiffmk |
98 |
-@@ -778,7 +780,7 @@ $(CCPROGDIRS): FORCE $(LIBDIRS) |
99 |
- -f $(top_srcdir)/Makefile.ccpg \ |
100 |
- -f Makefile.dep $(do) |
101 |
- |
102 |
--$(DEVDIRS) $(XDEVDIRS) $(OTHERDEVDIRS) $(TTYDEVDIRS): FORCE $(PROGDEPDIRS) $(CCPROGDIRS) $(CPROGDIRS) |
103 |
-+$(DEVDIRS) $(XDEVDIRS) $(OTHERDEVDIRS) $(TTYDEVDIRS) $(SHPROGDIRS): FORCE $(PROGDEPDIRS) $(CCPROGDIRS) $(CPROGDIRS) |
104 |
- @$(ENVSETUP); \ |
105 |
- if test $(srcdir) = .; then \ |
106 |
- srcdir=.; \ |
107 |
-@@ -809,7 +811,7 @@ $(GNULIBDIRS): FORCE |
108 |
- $(MAKE) ACLOCAL=: AUTOCONF=: AUTOHEADER=: AUTOMAKE=: $(do) ;; \ |
109 |
- esac |
110 |
- |
111 |
--$(OTHERDIRS): $(PROGDEPDIRS) $(CCPROGDIRS) $(CPROGDIRS) |
112 |
-+$(OTHERDIRS): $(PROGDEPDIRS) $(CCPROGDIRS) $(CPROGDIRS) $(SHPROGDIRS) |
113 |
- |
114 |
- $(INCDIRS) $(PROGDEPDIRS) $(OTHERDIRS): FORCE |
115 |
- @$(ENVSETUP); \ |
116 |
--- |
117 |
-1.8.4.3 |
118 |
- |
119 |
|
120 |
diff --git a/sys-apps/groff/files/groff-1.22.3-parallel-mom.patch b/sys-apps/groff/files/groff-1.22.3-parallel-mom.patch |
121 |
deleted file mode 100644 |
122 |
index 10661ac..0000000 |
123 |
--- a/sys-apps/groff/files/groff-1.22.3-parallel-mom.patch |
124 |
+++ /dev/null |
125 |
@@ -1,11 +0,0 @@ |
126 |
---- groff-1.22.3/Makefile.in |
127 |
-+++ groff-1.22.3/Makefile.in |
128 |
-@@ -864,7 +864,7 @@ |
129 |
- -f $(top_srcdir)/Makefile.ccpg \ |
130 |
- -f Makefile.dep $(do) |
131 |
- |
132 |
--$(DEVDIRS) $(XDEVDIRS) $(OTHERDEVDIRS) $(TTYDEVDIRS): FORCE \ |
133 |
-+$(DEVDIRS) $(XDEVDIRS) $(OTHERDEVDIRS) $(TTYDEVDIRS) $(SHPROGDIRS): FORCE \ |
134 |
- $(PROGDEPDIRS) $(CCPROGDIRS) $(CPROGDIRS) |
135 |
- @$(ENVSETUP); \ |
136 |
- if test $(srcdir) = .; then \ |