1 |
commit: ec0821df5afa90353b3de868fe4ff86d2845e59e |
2 |
Author: Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at> |
3 |
AuthorDate: Wed Aug 25 14:39:23 2021 +0000 |
4 |
Commit: Sam James <sam <AT> gentoo <DOT> org> |
5 |
CommitDate: Thu Aug 26 22:32:35 2021 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ec0821df |
7 |
|
8 |
dev-perl/Tk: remove unused patch |
9 |
|
10 |
Package-Manager: Portage-3.0.22, Repoman-3.0.3 |
11 |
Signed-off-by: Michael Mair-Keimberger <mmk <AT> levelnine.at> |
12 |
Closes: https://github.com/gentoo/gentoo/pull/22099 |
13 |
Signed-off-by: Sam James <sam <AT> gentoo.org> |
14 |
|
15 |
dev-perl/Tk/files/Tk-804.33.0-xorg.patch | 41 -------------------------------- |
16 |
1 file changed, 41 deletions(-) |
17 |
|
18 |
diff --git a/dev-perl/Tk/files/Tk-804.33.0-xorg.patch b/dev-perl/Tk/files/Tk-804.33.0-xorg.patch |
19 |
deleted file mode 100644 |
20 |
index d4284a39493..00000000000 |
21 |
--- a/dev-perl/Tk/files/Tk-804.33.0-xorg.patch |
22 |
+++ /dev/null |
23 |
@@ -1,41 +0,0 @@ |
24 |
-diff --git a/myConfig b/myConfig |
25 |
-index fcf1933..14033cb 100755 |
26 |
---- a/myConfig |
27 |
-+++ b/myConfig |
28 |
-@@ -316,7 +316,7 @@ if ($win_arch eq 'x') { |
29 |
- } |
30 |
- close(XMKMF); |
31 |
- while (defined $uidir) { |
32 |
-- last unless ($uidir =~ s!^.*-I(\S+)/lib/X11/config!!o); |
33 |
-+ last unless ($uidir =~ s!^.*-I(\S+)/lib(64)/X11/config!!o); |
34 |
- $try = $1; |
35 |
- $try =~ s/'x11root'/$ENV{X11ROOT}/; |
36 |
- push(@xdirs,$try); |
37 |
-@@ -365,8 +365,7 @@ if ($win_arch eq 'x') { |
38 |
- # |
39 |
- unless (defined $xlib) |
40 |
- { |
41 |
-- $xlib = &lX11(0,chooseX11(</usr/X11*/lib>),chooseX11(</usr/lib/X11*>),</usr/Xfree*/lib>,'/usr/X386/lib', |
42 |
-- '/opt/X11/lib') |
43 |
-+ $xlib = &lX11(0,chooseX11(</usr/X11*/lib>),chooseX11(</usr/lib/X11*>),</usr/Xfree*/lib>,'/usr/X386/lib','/opt/X11/lib','/usr/lib64') |
44 |
- } |
45 |
- |
46 |
- # |
47 |
-@@ -385,7 +384,7 @@ if ($win_arch eq 'x') { |
48 |
- exit 0; |
49 |
- } |
50 |
- |
51 |
-- ($base) = $xlib =~ m#-L(.*)(?:/lib)$#x; |
52 |
-+ ($base) = $xlib =~ m#-L(.*)(?:/lib(64))$#x; |
53 |
- if (defined $X11INC) |
54 |
- { |
55 |
- $xinc = &IX11("$X11INC"); |
56 |
-@@ -397,6 +396,8 @@ if ($win_arch eq 'x') { |
57 |
- { |
58 |
- warn "Cannot find X include files via $base/include\n"; |
59 |
- $xinc = &IX11(map("$_/include",@xdirs), |
60 |
-+ chooseX11(</usr/include/X11*>), |
61 |
-+ '/usr/include', |
62 |
- '/usr/openwin/include', |
63 |
- chooseX11(</usr/X11*/include>), |
64 |
- chooseX11(</usr/include/X11*>), |