1 |
commit: b7a6f1a26fae20fe511f05ac09702ed3c94da6fb |
2 |
Author: Sam James <sam <AT> gentoo <DOT> org> |
3 |
AuthorDate: Fri Sep 9 12:32:20 2022 +0000 |
4 |
Commit: Sam James <sam <AT> gentoo <DOT> org> |
5 |
CommitDate: Fri Sep 9 12:34:12 2022 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b7a6f1a2 |
7 |
|
8 |
sys-libs/ncurses: use hosted patchset for 6.3_p20220903 |
9 |
|
10 |
This is needed because we really want the full generated |
11 |
configure files in addition to the source (configure.in |
12 |
changes). |
13 |
|
14 |
It's far too hard to rebase and also ensure |
15 |
the patches are doing what they're supposed |
16 |
to if just relying on patches to a huge |
17 |
configure script. |
18 |
|
19 |
Rebase the whole lot, and then throw in |
20 |
the patch for bug 869128 from 345696eea0fbeb96946f1c1ae7293150c2c7e8ad. |
21 |
|
22 |
Closes: https://bugs.gentoo.org/869128 |
23 |
Signed-off-by: Sam James <sam <AT> gentoo.org> |
24 |
|
25 |
sys-libs/ncurses/Manifest | 2 +- |
26 |
sys-libs/ncurses/ncurses-6.3_p20220903-r1.ebuild | 44 ++++++++++++----------- |
27 |
sys-libs/ncurses/ncurses-6.3_p20220903.ebuild | 46 +++++++++++++----------- |
28 |
3 files changed, 50 insertions(+), 42 deletions(-) |
29 |
|
30 |
diff --git a/sys-libs/ncurses/Manifest b/sys-libs/ncurses/Manifest |
31 |
index 6f1cdb953a38..526a2fe5fe91 100644 |
32 |
--- a/sys-libs/ncurses/Manifest |
33 |
+++ b/sys-libs/ncurses/Manifest |
34 |
@@ -94,4 +94,4 @@ DIST ncurses-6.3-20220903.patch.gz 4814 BLAKE2B 668041aef48d9ce37474edc6d70e0725 |
35 |
DIST ncurses-6.3-20220903.patch.gz.asc 729 BLAKE2B 2f076ce9d390ee02edc0b58ecf3a6881897062e34a5f4c09b503c4b306ee70fb0f08e38518029eae4933508a48bda92716dd4b76159a0aa3d7bbd3835d2695ff SHA512 18cb1a77f67b6fddc9f83366487cb547fe1439e7edcd4fc27632702cd3ffc79622dd1421d32454489d08acec7403a04239b34794e81750b703385189a4534b04 |
36 |
DIST ncurses-6.3.tar.gz 3583550 BLAKE2B b2c174ac48d587b4d3aa054f04e4ec8bffd8a657a4aff5f090104965c741901e600712c8f8e5e98f3b8a26bc558996a1e14a746f113854832853b855e9d406c3 SHA512 5373f228cba6b7869210384a607a2d7faecfcbfef6dbfcd7c513f4e84fbd8bcad53ac7db2e7e84b95582248c1039dcfc7c4db205a618f7da22a166db482f0105 |
37 |
DIST ncurses-6.3.tar.gz.sig 438 BLAKE2B d7f9852292110fe7a048a9e38611ea06564b5142cb4cbeb8d99bba752d5df8eeffa3b57e5ca315c14024520bc008b30650e99669c995dca05a798399a0c85d39 SHA512 b9a2a25e0b1854c272bf89c610c81fc0ba061f0296eca5c0079a79cfe310e44eb16c46eb5a0dd018f1ca9114d569c9d5087a2b8e60b0344f1eb97f7c5addafc6 |
38 |
-DIST ncurses-6.3_p20220903-musl-xopen_source.patch.xz 43008 BLAKE2B 463645c62d2c72e8e1be14e510867d709ec6f78e3d7b78df317f5a8351264f19c04cb93cd3296a1df783db58d4ed5e5885f9b45a04dd0d549db9e41274d8448f SHA512 c2b0810fafca1cffb27095d207fe2d29daf5d1bbc79142a717ea79df8d3873b12664fbd8538e08c4576f9366acc7ac335b56df62310efc191cf20df52af2bf1c |
39 |
+DIST ncurses-6.3_p20220903-patches.tar.xz 76908 BLAKE2B a5afb3a5c016ad6b602e6af77cc4fc067692f1e1245cf006feb2b74e69be13b2ffb2b14c7b5de48780965d6b596621cc399c316657ae63afbe5ea9ff2d9715fa SHA512 11ae7458f925a68bf6d482f204e9e57ef23cf456ea9827c713787f635bd11621c3612651a90f3f3a3c7c2742f95fde4bc87d6500115ef74300b9a4d240ff74ad |
40 |
|
41 |
diff --git a/sys-libs/ncurses/ncurses-6.3_p20220903-r1.ebuild b/sys-libs/ncurses/ncurses-6.3_p20220903-r1.ebuild |
42 |
index d2f153326cad..c8f854c99411 100644 |
43 |
--- a/sys-libs/ncurses/ncurses-6.3_p20220903-r1.ebuild |
44 |
+++ b/sys-libs/ncurses/ncurses-6.3_p20220903-r1.ebuild |
45 |
@@ -103,7 +103,7 @@ if [[ ${PV} == *_p* ]] ; then |
46 |
unset my_patch_index |
47 |
fi |
48 |
|
49 |
- SRC_URI+=" https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${PN}-6.3_p20220903-musl-xopen_source.patch.xz" |
50 |
+ SRC_URI+=" https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${PN}-6.3_p20220903-patches.tar.xz" |
51 |
fi |
52 |
|
53 |
LICENSE="MIT" |
54 |
@@ -125,28 +125,32 @@ BDEPEND="verify-sig? ( sec-keys/openpgp-keys-thomasdickey )" |
55 |
S="${WORKDIR}/${MY_P}" |
56 |
|
57 |
PATCHES=( |
58 |
- ${UPSTREAM_PATCHES[@]} |
59 |
- |
60 |
- "${FILESDIR}/${PN}-5.7-nongnu.patch" |
61 |
- "${FILESDIR}/${PN}-6.0-rxvt-unicode-9.15.patch" # bug #192083, bug #383871 |
62 |
- "${FILESDIR}/${PN}-6.0-pkg-config.patch" |
63 |
- "${FILESDIR}/${PN}-6.0-ticlib.patch" # bug #557360 |
64 |
- "${FILESDIR}/${PN}-6.2_p20210123-cppflags-cross.patch" # bug #601426 |
65 |
- "${WORKDIR}/${PN}-6.3_p20220903-musl-xopen_source.patch" # bug #869128 |
66 |
+ "${UPSTREAM_PATCHES[@]}" |
67 |
+ |
68 |
+ # When rebasing Gentoo's patchset, please use git from a clean |
69 |
+ # src_unpack with upstream patches already applied. git am |
70 |
+ # the existing patchset and rebase as required. This makes it easier |
71 |
+ # to manage future rebasing & adding new patches. |
72 |
+ # |
73 |
+ # For the same reasons, please include the original configure.in changes, |
74 |
+ # NOT just the generated results! |
75 |
+ "${WORKDIR}"/${PN}-6.3_p20220903-patches |
76 |
) |
77 |
|
78 |
src_unpack() { |
79 |
- # Can drop this implementation once 6.3_p20220903-musl-xopen_source.patch is dropped |
80 |
- local file |
81 |
- for file in ${A} ; do |
82 |
- if [[ ${file} == ${MY_P}.tar.gz ]] ; then |
83 |
- verify-sig_verify_detached "${DISTDIR}"/${file} "${DISTDIR}"/${file}.sig |
84 |
- else |
85 |
- [[ ${file} == @(*musl-xopen_source.patch.xz|*.asc|*.sig) ]] && continue |
86 |
- |
87 |
- verify-sig_verify_detached "${DISTDIR}"/${file} "${DISTDIR}"/${file}.asc |
88 |
- fi |
89 |
- done |
90 |
+ # Avoid trying to verify our own patchset tarball, there's no point |
91 |
+ if use verify-sig ; then |
92 |
+ local file |
93 |
+ for file in ${A} ; do |
94 |
+ if [[ ${file} == ${MY_P}.tar.gz ]] ; then |
95 |
+ verify-sig_verify_detached "${DISTDIR}"/${file} "${DISTDIR}"/${file}.sig |
96 |
+ else |
97 |
+ [[ ${file} == @(patches.tar.xz|*.asc|*.sig) ]] && continue |
98 |
+ |
99 |
+ verify-sig_verify_detached "${DISTDIR}"/${file} "${DISTDIR}"/${file}.asc |
100 |
+ fi |
101 |
+ done |
102 |
+ fi |
103 |
|
104 |
default |
105 |
} |
106 |
|
107 |
diff --git a/sys-libs/ncurses/ncurses-6.3_p20220903.ebuild b/sys-libs/ncurses/ncurses-6.3_p20220903.ebuild |
108 |
index dc99aab55fc5..389f5c864ed5 100644 |
109 |
--- a/sys-libs/ncurses/ncurses-6.3_p20220903.ebuild |
110 |
+++ b/sys-libs/ncurses/ncurses-6.3_p20220903.ebuild |
111 |
@@ -103,13 +103,13 @@ if [[ ${PV} == *_p* ]] ; then |
112 |
unset my_patch_index |
113 |
fi |
114 |
|
115 |
- SRC_URI+=" https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${PN}-6.3_p20220903-musl-xopen_source.patch.xz" |
116 |
+ SRC_URI+=" https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${PN}-6.3_p20220903-patches.tar.xz" |
117 |
fi |
118 |
|
119 |
LICENSE="MIT" |
120 |
# The subslot reflects the SONAME. |
121 |
SLOT="0/6" |
122 |
-#KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" |
123 |
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" |
124 |
IUSE="ada +cxx debug doc gpm minimal profile +stack-realign static-libs test tinfo trace" |
125 |
RESTRICT="!test? ( test )" |
126 |
|
127 |
@@ -125,28 +125,32 @@ BDEPEND="verify-sig? ( sec-keys/openpgp-keys-thomasdickey )" |
128 |
S="${WORKDIR}/${MY_P}" |
129 |
|
130 |
PATCHES=( |
131 |
- ${UPSTREAM_PATCHES[@]} |
132 |
- |
133 |
- "${FILESDIR}/${PN}-5.7-nongnu.patch" |
134 |
- "${FILESDIR}/${PN}-6.0-rxvt-unicode-9.15.patch" # bug #192083, bug #383871 |
135 |
- "${FILESDIR}/${PN}-6.0-pkg-config.patch" |
136 |
- "${FILESDIR}/${PN}-6.0-ticlib.patch" # bug #557360 |
137 |
- "${FILESDIR}/${PN}-6.2_p20210123-cppflags-cross.patch" # bug #601426 |
138 |
- "${WORKDIR}/${PN}-6.3_p20220903-musl-xopen_source.patch" # bug #869128 |
139 |
+ "${UPSTREAM_PATCHES[@]}" |
140 |
+ |
141 |
+ # When rebasing Gentoo's patchset, please use git from a clean |
142 |
+ # src_unpack with upstream patches already applied. git am |
143 |
+ # the existing patchset and rebase as required. This makes it easier |
144 |
+ # to manage future rebasing & adding new patches. |
145 |
+ # |
146 |
+ # For the same reasons, please include the original configure.in changes, |
147 |
+ # NOT just the generated results! |
148 |
+ "${WORKDIR}"/${PN}-6.3_p20220903-patches |
149 |
) |
150 |
|
151 |
src_unpack() { |
152 |
- # Can drop this implementation once 6.3_p20220903-musl-xopen_source.patch is dropped |
153 |
- local file |
154 |
- for file in ${A} ; do |
155 |
- if [[ ${file} == ${MY_P}.tar.gz ]] ; then |
156 |
- verify-sig_verify_detached "${DISTDIR}"/${file} "${DISTDIR}"/${file}.sig |
157 |
- else |
158 |
- [[ ${file} == @(*musl-xopen_source.patch.xz|*.asc|*.sig) ]] && continue |
159 |
- |
160 |
- verify-sig_verify_detached "${DISTDIR}"/${file} "${DISTDIR}"/${file}.asc |
161 |
- fi |
162 |
- done |
163 |
+ # Avoid trying to verify our own patchset tarball, there's no point |
164 |
+ if use verify-sig ; then |
165 |
+ local file |
166 |
+ for file in ${A} ; do |
167 |
+ if [[ ${file} == ${MY_P}.tar.gz ]] ; then |
168 |
+ verify-sig_verify_detached "${DISTDIR}"/${file} "${DISTDIR}"/${file}.sig |
169 |
+ else |
170 |
+ [[ ${file} == @(patches.tar.xz|*.asc|*.sig) ]] && continue |
171 |
+ |
172 |
+ verify-sig_verify_detached "${DISTDIR}"/${file} "${DISTDIR}"/${file}.asc |
173 |
+ fi |
174 |
+ done |
175 |
+ fi |
176 |
|
177 |
default |
178 |
} |