diff options
author | Mike Frysinger <vapier@gentoo.org> | 2015-03-27 20:39:57 +0000 |
---|---|---|
committer | Mike Frysinger <vapier@gentoo.org> | 2015-03-27 20:39:57 +0000 |
commit | 6f6b7d49a5301a17912e9165e1833bbc2a16a561 (patch) | |
tree | 3a519db9284edf2778081868d41116dc3057f368 /app-editors | |
parent | Version bump. (diff) | |
download | historical-6f6b7d49a5301a17912e9165e1833bbc2a16a561.tar.gz historical-6f6b7d49a5301a17912e9165e1833bbc2a16a561.tar.bz2 historical-6f6b7d49a5301a17912e9165e1833bbc2a16a561.zip |
Add upstream fix for building with USE=-spell #544296 by Karl Lindén.
Package-Manager: portage-2.2.18/cvs/Linux x86_64
Manifest-Sign-Key: 0xD2E96200
Diffstat (limited to 'app-editors')
-rw-r--r-- | app-editors/nano/ChangeLog | 6 | ||||
-rw-r--r-- | app-editors/nano/Manifest | 31 | ||||
-rw-r--r-- | app-editors/nano/files/nano-2.4.0-no-speller.patch | 88 | ||||
-rw-r--r-- | app-editors/nano/nano-2.4.0.ebuild | 3 |
4 files changed, 111 insertions, 17 deletions
diff --git a/app-editors/nano/ChangeLog b/app-editors/nano/ChangeLog index f53fb8e97f05..6623642618ac 100644 --- a/app-editors/nano/ChangeLog +++ b/app-editors/nano/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for app-editors/nano # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-editors/nano/ChangeLog,v 1.317 2015/03/23 07:14:32 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-editors/nano/ChangeLog,v 1.318 2015/03/27 20:39:55 vapier Exp $ + + 27 Mar 2015; Mike Frysinger <vapier@gentoo.org> + +files/nano-2.4.0-no-speller.patch, nano-2.4.0.ebuild: + Add upstream fix for building with USE=-spell #544296 by Karl Lindén. *nano-2.4.0 (23 Mar 2015) diff --git a/app-editors/nano/Manifest b/app-editors/nano/Manifest index e5c128a5b933..9100206707ba 100644 --- a/app-editors/nano/Manifest +++ b/app-editors/nano/Manifest @@ -13,6 +13,7 @@ AUX nano-2.3.1-gentoo-nanorc.patch 5909 SHA256 a61d9c606da8c6a843cb4801babffc4d1 AUX nano-2.3.1-ncurses-pkg-config.patch 1401 SHA256 dbb472978eb92d4a5518710daaa5861f20e2d2d29c9e683b5f1d125e303018c2 SHA512 83920c1b0a934cf025abffb8ce786373313233e2383ee8de683bb27fca47186958c7c0ebb8b117ae7eed31e1e158fc6339765fe988a60c17f6964cc802496e04 WHIRLPOOL 8c6eb4b7a134bb0d8a710e9499136673a628e761793caccd71edca73e047d3c99c6dfa797f19f585e13dd0addccb085e778b39510985af53d307e645c2884e7b AUX nano-2.3.1-shell-nanorc.patch 2089 SHA256 ca46218301c47fc2e0088cc109adc47d45dcd57425f98e7900d7e4a5ac3c0152 SHA512 e94a8345cd934f49833b2d415e7c72c266eeb04755ab6b986b42b86d3863235bc8f879429ba9e3336ec91d383dbd07eb95dcceaaae468ea6436c2c66dc1710e1 WHIRLPOOL 3dfa102243a615043e483005eb2fe48f87ba5e0b54bcdc8356e24601a99960ab27bcd8fe991def2f0de312be3c7bdc580e54d7cbc55f603e0c1b64f8b52c09b4 AUX nano-2.3.2-bind-unbind-docs.patch 4732 SHA256 881060d028dc24ef55d80fff790971b5da633d92f0bce754fa88feb0df11537c SHA512 92badd7e08b326621a3dbba488b23988185d56e56e60054dc537926612e4e4c97755d73d902e171b3160039a488a9ba33dce8d6db56294b3b88cc7749588a9eb WHIRLPOOL 83e08cec1793132597aadffa8c994514e3a9ad5db93d5874dcf187ecd0c9729855cf1c63aa282179256154d6b2cb681c377e5a18e3d479ea6e56a4de3692f08f +AUX nano-2.4.0-no-speller.patch 2789 SHA256 6715d20aef335a42b8dfdf5cde7a12d9a41633f43b6c74f78c980accda58b4ba SHA512 2e39ed29a4c83dbd0da416f838b8e12ac5b6086299151a5b28625cfef2258b5740fb347742e2b1a90c92c15b50e9992c7d19167e582210645f6961fd599ea069 WHIRLPOOL 930f549b3e92fddf930dfa65e8eebca03b8cf4fb628bc6a5c5995f5ed5da4c6781d1114c6ef5cb59055860a5870538fde4a81eaebcb237f0d2ba7ffb61626028 AUX xml.nanorc 260 SHA256 d8de59f2993d921801e38127043a05b07277373b32714e7489d0947b3415a406 SHA512 7a0fbd00c3db7a3c662ae7835ce6bb252d0c64c2cb78d8ab6a33381dd635a25f052e0975d79030d7426ca66c0efb3a7de667ca8ae2258d373a80a025eccc3c5f WHIRLPOOL e415068d82aab4a36ca89a9a1889269b6aadf4f8cf495f1e0c2d7a0bb94b8812e969801e6b9125b362ee92c7d87745aa593c6028d4c4d0e5af4892b7acde90d0 DIST nano-1.3.12.tar.gz 1250777 SHA256 f5537b8a988618fa8524b6a4b0a6950184d37db983b4521ad843b98845da571c SHA512 30d95122486e13159c4e36d4408ab977351d0d46bb28e21b0e867ab6246a3a5a51d987fcca956d66d629753698188bffec34f076a1cf505cbadd6bec4cd54afb WHIRLPOOL a2ef9482ade321ffc231e5bc0429a363389049ab4fbb82f74719003ca3446681805fbcf8c78dd6fad62c0363030e9804f649b297a7c6840fff83148cb031c7d1 DIST nano-2.0.9.tar.gz 1403773 SHA256 6d212385680d29dcda35dda7801da19c80182a8bc6bc6d5cf7533034c853d37f SHA512 9090dc005670998db2d10657e8c37751051a71ea4a6ba514d1c8e36d5d5030c778ede5d2c3734106a92e100e3755add828f3094b3b5c2b41def8e15e674e4907 WHIRLPOOL 4d16cb2c684bf34f441096311778b9249243cc84351af7586ff1bbbbbd7c0fb251548a1fc987cb91a08633b49fb0841e97d3ca79e8392b8f0ff2e12560b2b098 @@ -36,23 +37,23 @@ EBUILD nano-2.3.2.ebuild 2354 SHA256 31b38065f30abec98afea932a8996d54efe2d0eb730 EBUILD nano-2.3.3.ebuild 2249 SHA256 c5ad0efc252f3474314ae382bd5695b49a6269c66001e9eb22449753c6909233 SHA512 fb694bb88320ba5bc86dad423380ec8fbc7ab4c444e6c9f08bd0b8b7ce53f2fdbd64a35d98d3800e66de4f8a958f17af2580e59858a19660e5ca3abe312e2218 WHIRLPOOL b46c3c80d440fd70194469bb3a5971fc18eeeebdfdc6a78d196da6333c42f407a1a35194d0d02160a668fd30a62b6fe31759ecf036895bdeadff56d160b56a6a EBUILD nano-2.3.4.ebuild 2249 SHA256 ab6517545d09a8e2f5dec0bbf3d7abcaff3e3dc28801c8a8f69ef0adc7822746 SHA512 d567a1706fd819ef6cf30d6fb98c20beaa228c09bcb6daa9d131f0f1be85f5a284dd8f257f916d3366e6680c4790b9e464408015bbbf6e31bd1d56ddef9d0653 WHIRLPOOL 4e9993c72636c29e3bd59ed59450c4db9a02dddd6a544f930d0fa4fc8cb565af5dcf7a7a6219364cedcf7820bf57ce2b2f93618ffee2e3031ed184fe9c37f875 EBUILD nano-2.3.6.ebuild 2239 SHA256 fd897081f8d71fc8cd3b2c1242cb1631c08e6d8f9f7fc12583a051ee1442dc54 SHA512 df31b0095f338eb8b42345a5744cf107568ea800a24a47b40bd0e1ebf5eeb93dfea6d761c29de2d74f1d852b854926ab7fb29ed285072fce978c61204559602d WHIRLPOOL 36df7b4f0f2f50f745075e97a3b810e95127166f284cb7a93944f89d3d8caf1441a1b673eb0ed2bbbff9aa1274f943a8a96618adf268c4574cbcb9dcec3b0316 -EBUILD nano-2.4.0.ebuild 2249 SHA256 2813f5d1146ddc59b03c0857e859acd70ba31ea53fa8f6c08a10fc97e71d45c8 SHA512 ec8efa64f4e44792063a2d32cd4569ef9f1331eeabc292a3fe02ba7d3ae76c528774545f39f7ea3758c5492a395486ac3b49896a5abcc369200fc46c2dbbb083 WHIRLPOOL f697c6e2446d7275c54ae91f0e81ec8ada933b42818add6deffd2571c3df38037f1057fe857ba43c488de44c24e98a014ed9ef1cf201ef647f06307d0fb021cc -MISC ChangeLog 37171 SHA256 26ee0f43eb2e1375cbe76eda84e4c572d6beeda741d52f015fd0ce4921eaba93 SHA512 b20fbc0f684ce54e20a63ce3dde157c310e68b97cacb06b96061ce92ce265551e51e9ab00cf3854ec02f0bd27171e57106d8474ed96b449909a77f8307f3b81a WHIRLPOOL 32471354ba45cb6938683a3490eb0804104677486efd9f4715550ae3694a2ee737e24b21bced4af538ea371eee921500c8a4fdafa462de665b7a3fbee70fd3e3 +EBUILD nano-2.4.0.ebuild 2301 SHA256 5d4fc525c5a8844fc2594f60196e85984c515f36cc7ffaa43d5a4c1a4354e420 SHA512 60f272fdcf0d71ab74ceb6911fd56813335629696aab60c575bc23929ca19ad44c59c476f04558bc3932ca52191ef211b08d0ef8fda943f613ebee67dcc437e2 WHIRLPOOL 1b6e5f7786e1be829cd9cdf0a0458b4d3bd86700b7731c720d9cb362610d0ecf0d93cc7d9bb8abc1c7ca85f413132b4379b041af5d3235d4d24e714d6fb10e79 +MISC ChangeLog 37352 SHA256 22d8b8232801b18e8dc32b74192bff49972f19508cf49fd65d4d5186e96a3c3c SHA512 82b54d20f6383c040a347f1b4cf2eb598be4fbfdbdc8cf6354efcbdae3119ade1be82a17d9c6ed54fa0349bf0b5aecbe0c4eec15f049943bb5117f7558a49c3f WHIRLPOOL cfdd72c46592acad1f7bfa6f88bf14883ef10ad1a7aae31b60370bab6806011d5819db9d9ba8e55de62e70f29fae584a5ce9b6c71d9c39030bdf71869d429ad4 MISC metadata.xml 1495 SHA256 b6af8e3dc22f6d9ea0acd4b446469298e8bff0ca8834aa56fe0a6baa129399c9 SHA512 b2e0ec89520c02263d660a5a3d570e426999967af183344b066b2dd293fc958018f7c360a1df02ae5207b24f32914bc800311ea985043c60459a83abdf237da9 WHIRLPOOL 138f93840416fd75eefccaa6cf48d4f5fd908987b505ba4621157e85ca997dc1f6cc6bbf21059d8b0dec3f358605547a364a5b4982b8f43b52fe6d1be130da81 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 -iQIcBAEBCAAGBQJVD71jAAoJEPGu1DbS6WIACm4P/iKGZDPmRsKXvOKuSnoZUJvw -lgb0HVsQz7WcFihlvgXXDCpkZTeFshsIfEfGlESLk7Apys26OVUYARnB9eir5cSf -NGX98RscoV3hhpuzSEdiCVwEuaZHy4ZH5nuBmMuBBv+gc60TvNyWByRt1qeOYq0z -4DIBsO+con68EJB5CY3U5y699iCZo1grhef6NJPYSWje/x+owVKyjAvgQqm1nwsH -GUz0KT3m7JliaXXnjwPOT/Mbg+6fClWsvTKEd9mFnL2i71CM0zR036FLKK+7GTIA -nlflwapUO+3xap6s8ET1LUsuw0A2ZACZCQLiOUlgxB2u2idFa2reYxIs2Mn5IrV2 -Itd/q7sq4VzNdmje/zsiXIOZ6iuDPEnkf4PPPhVDreOOBEmz5lznhQ2FyEtKSTvz -cpHl8teD0nKxKQ7+ORsy/buoJWvGx85e76xIVQ4AA6SC8VtaTBDp2sWQ7zb2dwsL -qERqfTpNLLrnxY0X4DcHtGFzfZzzkjMWjJkrqauS+nNoI+3ErFQIQFCB3pEK27pK -w7Yt/7jps/sI5xOeYJVrEAT7xQ+idGkRAhAgCoXLFqWig0PL0tPJgwByhMWqo9eh -PBW3KoJwGHtjPGzLAlplSKP+3Lj2JLPYUd4BQ1r9Ph1R4/+uKZoqxEeqLgRkBGTE -uS6HMF7lMR/c1NTuqWQT -=96mv +iQIcBAEBCAAGBQJVFcAdAAoJEPGu1DbS6WIAaIMP/00FDQLf+TtgIzSifurHEuCi +qZhO2JZrqFfvSgejNnq6dU6pBiUeejutvOTSq4qXRgMGH1NpbBEufPqyz9C4o3jz +NgcSEeFLExsTl7qkCUxZjtrbFatT5og+NkR0FBZSj+E4WuYZhEtuCcVGJswRJ46A +AGQhlsDQk8vfBkhM9+CjXCTffaagVqT2wTJTQe9U3DKC/RZiURyxGmSERTtu85RA +GjQWm+D8sbzbij226htTeDDcfXcQQ+8wCQpQ9nvl4UCMCfqqmWU4IyDNTfg3LX5d +YtDRr5wMlMyrg/pO0uKotdxQvJc+DUwnQy84taUyiSJ5CI2p6ggwvvA5XcUmTZVx +Ez+UohGZMzJD1K27gn8/4xX/9fRcWeyJn7UAkyQt1fNdCCMbLyRU/e/aA1KANPpO +QX5i3TC8izGcEPtMhOvRFYF4oOOq5PJoZum53q7G7JlFiZhTvGD8EDQFxkjv6fhu +smyCJs+FFpq0Av+2cvAoWHhz5715mwbUBpawUCZYdLEmvw6qGnCtvg0FlUHJ9SbV +ZPQ4nx3/bqKptowqndY6iFw8b4JvyPJ7qrmG9XERFGN1TyOE6NEiVkf0SX35Xtem +rJ0VGVt45pPcHvGNmZgIa/zXBwNa0TFyDkFpTxX3tFmd+gMu7B2m9+LOvwFiudLs +28VjA/SLj5cvRB+7j35T +=2jty -----END PGP SIGNATURE----- diff --git a/app-editors/nano/files/nano-2.4.0-no-speller.patch b/app-editors/nano/files/nano-2.4.0-no-speller.patch new file mode 100644 index 000000000000..4405266bb0af --- /dev/null +++ b/app-editors/nano/files/nano-2.4.0-no-speller.patch @@ -0,0 +1,88 @@ +https://bugs.gentoo.org/show_bug.cgi?id=544296 +https://savannah.gnu.org/bugs/?44607 + +From 14a9c8aa0b124dc580c4805e848e6ff0880b43bd Mon Sep 17 00:00:00 2001 +From: Benno Schulenberg <bensberg@justemail.net> +Date: Fri, 27 Mar 2015 16:55:49 +0000 +Subject: [PATCH] Treating the formatter like a speller, to fix compilation + with --disable-speller. This fixes Savannah bug #44607. + +git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@5168 35c25a1d-7b9e-4130-9fde-d3aeb78583b8 +--- + ChangeLog | 2 ++ + src/global.c | 10 ++++++++-- + src/text.c | 3 ++- + 3 files changed, 12 insertions(+), 3 deletions(-) + +ChangeLog + * src/global.c, src/text.c: Treat the formatter like a speller, to fix + compilation with --disable-speller. Fixes Savannah bug #44607. + +diff --git a/src/global.c b/src/global.c +index 4643af2..27ff938 100644 +--- a/src/global.c ++++ b/src/global.c +@@ -639,8 +639,10 @@ void shortcut_init(void) + const char *nano_lint_msg = N_("Invoke the linter, if available"); + const char *nano_prevlint_msg = N_("Go to previous linter msg"); + const char *nano_nextlint_msg = N_("Go to next linter msg"); ++#ifndef DISABLE_SPELLER + const char *nano_formatter_msg = N_("Invoke formatter, if available"); + #endif ++#endif + #endif /* !DISABLE_HELP */ + + #ifndef DISABLE_HELP +@@ -736,9 +738,11 @@ void shortcut_init(void) + #ifndef DISABLE_COLOR + add_to_funcs(do_linter, MMAIN, + N_("To Linter"), IFSCHELP(nano_lint_msg), TOGETHER, NOVIEW); ++#ifndef DISABLE_SPELLER + add_to_funcs(do_formatter, MMAIN, + N_("Formatter"), IFSCHELP(nano_formatter_msg), BLANKAFTER, NOVIEW); + #endif ++#endif + + #ifndef NANO_TINY + add_to_funcs(case_sens_void, MWHEREIS|MREPLACE, +@@ -1006,12 +1010,14 @@ void shortcut_init(void) + #ifndef DISABLE_SPELLER + add_to_sclist(MMAIN, "^T", do_spell, 0); + add_to_sclist(MMAIN, "F12", do_spell, 0); ++#ifndef DISABLE_COLOR ++ add_to_sclist(MMAIN, "^T", do_formatter, 0); ++ add_to_sclist(MMAIN, "F12", do_formatter, 0); ++#endif + #else + #ifndef DISABLE_COLOR + add_to_sclist(MMAIN, "^T", do_linter, 0); + add_to_sclist(MMAIN, "F12", do_linter, 0); +- add_to_sclist(MMAIN, "^T", do_formatter, 0); +- add_to_sclist(MMAIN, "F12", do_formatter, 0); + #endif + #endif + add_to_sclist(MMAIN, "^C", do_cursorpos_void, 0); +diff --git a/src/text.c b/src/text.c +index 8814b49..98b2f80 100644 +--- a/src/text.c ++++ b/src/text.c +@@ -3223,6 +3223,7 @@ free_lints_and_return: + lint_cleanup(); + } + ++#ifndef DISABLE_SPELLER + /* Run a formatter for the given syntax. + * Expects the formatter to be non-interactive and + * operate on a file in-place, which we'll pass it +@@ -3370,7 +3371,7 @@ void do_formatter(void) + + statusbar(finalstatus); + } +- ++#endif /* !DISABLE_SPELLER */ + #endif /* !DISABLE_COLOR */ + + #ifndef NANO_TINY +-- +2.3.3 + diff --git a/app-editors/nano/nano-2.4.0.ebuild b/app-editors/nano/nano-2.4.0.ebuild index 97f166586410..7553247be58d 100644 --- a/app-editors/nano/nano-2.4.0.ebuild +++ b/app-editors/nano/nano-2.4.0.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-editors/nano/nano-2.4.0.ebuild,v 1.1 2015/03/23 07:14:32 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-editors/nano/nano-2.4.0.ebuild,v 1.2 2015/03/27 20:39:55 vapier Exp $ EAPI="4" @@ -30,6 +30,7 @@ DEPEND="${RDEPEND} virtual/pkgconfig" src_prepare() { + epatch "${FILESDIR}"/${P}-no-speller.patch #544296 epatch_user } |