summaryrefslogtreecommitdiff
path: root/app-editors
diff options
context:
space:
mode:
Diffstat (limited to 'app-editors')
-rw-r--r--app-editors/Manifest.gzbin14123 -> 14118 bytes
-rw-r--r--app-editors/xemacs/Manifest8
-rw-r--r--app-editors/xemacs/files/xemacs-21.5.35-misalignment.patch67
-rw-r--r--app-editors/xemacs/files/xemacs-21.5.35-va_args.patch179
-rw-r--r--app-editors/xemacs/files/xemacs-21.5.35-which.patch17
-rw-r--r--app-editors/xemacs/xemacs-21.5.35-r4.ebuild (renamed from app-editors/xemacs/xemacs-21.5.35-r3.ebuild)4
-rw-r--r--app-editors/xemacs/xemacs-21.5.9999.ebuild2
7 files changed, 271 insertions, 6 deletions
diff --git a/app-editors/Manifest.gz b/app-editors/Manifest.gz
index d5a0b07c210a..950de2e89787 100644
--- a/app-editors/Manifest.gz
+++ b/app-editors/Manifest.gz
Binary files differ
diff --git a/app-editors/xemacs/Manifest b/app-editors/xemacs/Manifest
index 26fbcf7820e5..211e6c300971 100644
--- a/app-editors/xemacs/Manifest
+++ b/app-editors/xemacs/Manifest
@@ -6,15 +6,17 @@ AUX xemacs-21.4.24-ncurses-tinfo.patch 538 BLAKE2B ef09bb366ebb79cd9bd3e089098ae
AUX xemacs-21.4.24-strsignal.patch 4452 BLAKE2B f5f8d35a15f6c1aa59d6d31a8c4ed46b057f6af01ed8bb42cada466c6b95ba9633dbe8f0af5aa7a4779cc2c98bab42c629f4f16eb38aa558913a630a961110c5 SHA512 2858c5937f0a9f80f72f7f78f38ebd6abe9d65b79d44a817579c6346a46f20c42756291f399d464b4cc994dfc3ec9e2e1a32613d915f92f3c79ebf0f90cd7c64
AUX xemacs-21.5.35-configure-libc-version.patch 2169 BLAKE2B c3c6e7717971217f5a141ea6904193761a943d0656158f863c054f09858518f96975782dcb67a3bf0f4ef2bc29cc0b656198a28623043a1cbeb78bea0c6d2c1c SHA512 b386a92a474012e5583bc4fff7a958e1ae81aee90fc4c095c49e637bf4e35e8dfb90ea2ab1cd91190739ac975f5994f4465db56b150d0017dedff3ab3dd84a66
AUX xemacs-21.5.35-configure.patch 1305 BLAKE2B 3625857381ed9113dcf92cfc89f70fb70d0a64267b7b2e006f3c3c495995ef1d5edd3c8ba63863b9ca678a83bebfe49febb0d6a67ad8e770bfa07feece0a598a SHA512 5556a8e8e9940177aa674e9d47f1bc00f8af90467c2d7bcdbd8820f0723de3b945eb9491961c041bbd7c66b39228e1996f3212931e8e2823c5f83e125ceb2fc9
+AUX xemacs-21.5.35-misalignment.patch 2383 BLAKE2B e3a1c462b9da8bcf22f8e776b38884c9f3a7e4ae2300a3971794bccd9614b32b345fee6f414eb2a8705c064a4ce2f6ce3ae4e8ca4190b835853e35c7cede31e0 SHA512 2b228668e9365e4a2f7d91e2376bb066271a1f0eb962118d84937a1db31c1f6d60853939e62f56906b1a9d2d3e8fea7dc937b8d695b7f9dea67310d1d39785a8
AUX xemacs-21.5.35-mule-tests.patch 6312 BLAKE2B 0caee1f8f037128c9b781d6885e8e8a18cdab4280d9f05f68e73ddad9e52e7606ea60fd4a9bdda8d7ab57608fe88163e2d195adf096c3fa25e156545fa67c12f SHA512 0e6db8ca4061ae2493ce99c745b50336b3f3d05cb76000f63eb829a1befba293dbe8e9d88466f5e6849d7584253cfd1ac9edf4be7bf18ace13a8db5a1efa5c6d
-AUX xemacs-21.5.35-which.patch 485 BLAKE2B 20c43dcfb05fb10d359758ef877c1084478516766e163cb6560d3eecad51cc127b523dddb0a2d391a1ddffee7818e3b9bcd6c606517ca7306a20e2515ce33548 SHA512 57257dd27e41ad31607b274aaaa9b094164441e254d2d5b6567e920995ee2c26290d445e9cc3c455b379eef87a0f8fb08b2131509af0c2e08fb6947e93e0db6e
+AUX xemacs-21.5.35-va_args.patch 6881 BLAKE2B b618059e55889aa06e0cb125aef0d95d1e4648b54099939473669bbfd5651b3b8774ec37d2598b1039550cdf8653cd55bb89c098a580e044867fa7aa5386f8fe SHA512 bdf5f6f44b4b523e60839cdaf2b726e99f64bb29664b2b7b0ffe1f315a38f901f693ff59ff208a57b52eb14886735cb9b967a20e33ef0e872a2b01256b058d4d
+AUX xemacs-21.5.35-which.patch 751 BLAKE2B 4235c084089e391c7b7a3447f0252f98686796065c04a5a993f898f6c97c95c2253a0f89e9c069e2c011e391fd8293277e05c2e7c3690e02d6c6277dcb0d6383 SHA512 210bfb3bc763f544b04d09f35b6735aefb8ebeb4ddadbdb75ad3fae0de4f8ae9fff0c0b99a1b3d57fc159db8898f6490585c8c8dfb651c70691a2ba811f32914
AUX xemacs.desktop 1061 BLAKE2B 47941fc8b380e08aad13e44fc1899ee73ef502dbbf5d8be4eaa23c301b5d25a8c334971a1d89f8cfa551dce909891edaac6a7df956c912396fc8cfb88a720a6b SHA512 6542fc7777af888ae711d386918e712e1d106635f70e65af77d1e809156baba9831fc4c8bd2cb7e7c6f9ab0ab18ddfb92709ac2909aa613471101454599bdb69
DIST NeXT_XEmacs.tar.gz 39571 BLAKE2B 7abf17627ec34e6b0d0edde444028c46dca6d703cfa208a8a1eaf30e2fc2543b953c9a9582c3d55bd5b37e746f45c03ebfc408a0d965606e45d5f4adb9148dea SHA512 611ddbbf5be3d2274e7f76be7f8200c6c7f3cba917efcc24e73685aa5f61c94237e6e48ce66f2d59ee4b74862e686f3ea7a29cf006717d5d0674db24d243d566
DIST xemacs-21.4.24.tar.gz 8543879 BLAKE2B d7e60e4e053a10bfc4591a5d691c849ef5e5436f6951c801f5a169592b160669d0f6b9dc8f10b6b79889a3210de977ed78a5cea826c02e425495364745ef9e10 SHA512 b7a88d5a4a9f74f74c2067ed60f7ea87ac8ccad5d9c2c1033ecf07f540250191f8fa5f9e6d23d9fedd0f2ab1eb5ea6c29a7665a310ec512d85e2e4f337447213
DIST xemacs-21.5.35.tar.gz 16403617 BLAKE2B efab8d3d984ec2223913b09ff1abc9f2df187fb5b8c2ccf99fcfc60c86369f4411cffd48b03532d53329bd5b3d3149271a445da4c0a3cd7bdc2834021b1297b3 SHA512 e592af6ffbb6f95299039de28f59ee770bf62f54a15b1358b9d1059ed25dcb410c01dcf6e88c1d2196d54f0c6902f309d709fe003accee82e516023fa4363019
EBUILD xemacs-21.4.24-r10.ebuild 6951 BLAKE2B e7d0bda0f6b5e6531dfc565488487af3e1ac32b248b59bf1b93583edaeaa0ec0d9b9ef98b731d7e94a117fb2ccd138d96f607864a6b4bcc396e26570162d43e7 SHA512 061948f75a2be2b72472956d5801974db916c78938ae3b13a9840368c886c3e433fe327cfae46dd3082cf7190c738a446697a7efedd8f31e9cd15a725fc2ffb2
EBUILD xemacs-21.4.24-r9.ebuild 6923 BLAKE2B bc99795d5ace91260f2d26e1e16b2aa16cf9f9f33996e9a9c0d49a172bec5c40816c09b7ebbc6cc013c4276d57bf8dc3c7c099097b3307f2731154cdb3f8c9e6 SHA512 ac3cbdc9087d4bdcfa0ecb591729ea0f5fa084f350d93a37f5283dba5ed56d77555e9bc706f3d43b2abc21e5020e4b8564657c92f36730c073e283ef1288ef5e
-EBUILD xemacs-21.5.35-r3.ebuild 7176 BLAKE2B 5ca4f6cd6bf9633a3d66b7594d69ede7d3aac00763ecf5518f6f39b3a27c1ff90110faf7338f1f7e97053d02c8ab0bd292ae9a2b5af6568deeb337306f8d9b86 SHA512 552870e5042de91fd14ef63de6cd767a01ce1b865d38b2dc71fd3b1e5f2141bf75eb4f007eee4d38c1dfa3796add53fbdae31d7b08a8c5c1acab5593262cdccb
+EBUILD xemacs-21.5.35-r4.ebuild 7291 BLAKE2B 781de89cf9e80f38d094136eec92829a76a5423fb716849e745ec0fd5da89ba4280bd9f5d77ac18f4fc6457f8f9c0498a84a1b40548e58bc2398c2e02a522db9 SHA512 0abb0b7515e9e6e23ab0b5427c4350c66d35645ad966258d06fb1402130a65626780c21bdd3d4e10b6d775d79f2556f8a9217323ed07c80fb8bccdd950558d6a
EBUILD xemacs-21.5.35.ebuild 7025 BLAKE2B 695f2221402c2461116746c81f07811929274b53892fe87f6200d2c93ba4f9209cbd77e702eb7ad922c8115a96ee8afffbd657d6698dc0b452aa854041a22bf6 SHA512 d4a51870a73d2c9dcbb73f69e3dcb982443442e0be66c0a35bd2c0730e8813b8ebd2dfcffdb68221d2f24d078f47d6fe7e593157a4b1cda32887f1c88259f206
-EBUILD xemacs-21.5.9999.ebuild 7090 BLAKE2B c2d613ddb7ec5801e1aea864b81ba0efb475d5ec310890b7ba2254ca307cb71024cfc038b736d215b38d63fe7012594771950991bd138c8f962eeefc90b12a86 SHA512 5d719acfee3b869e47df35ffebccb0c8d0fc760b5474ac9b533ac44709c0c6d02c05eb7af708befd1788dd9c7cbd807d9660911b9b30e0f16aead409714a168a
+EBUILD xemacs-21.5.9999.ebuild 7118 BLAKE2B f95ce674de0c7db7342615467dd3d6c48ae65c4fd17a8f9307678df413c561f7229e4250e6b4c44989bb52530f4410f7ccc1a34c237ed75b968caa9a9171947d SHA512 9c407c07bb357455a043dad3bf3f269720b33f4960f799a95f055b6adc20cf3c823f1b2c6c1fdc12af9f66d315481ca34603e5814c6138b228000d78e06db983
MISC metadata.xml 756 BLAKE2B 1237bb18a737c4473990bd73a4a1fdd5788c743867b1f7c6d963f6acd21a7133fbe5b1c0921556a5152ab7f3116e635a6c6087dad15b5d2430a2d742c63a1a05 SHA512 65c0a9a02a9d11bde55cae161344803177203f4868f508c970d87fc7ea7b4f552f63d2e70ad2b1829efb8ff2ca641e1717672976f681ec56ad51dec2eebc8464
diff --git a/app-editors/xemacs/files/xemacs-21.5.35-misalignment.patch b/app-editors/xemacs/files/xemacs-21.5.35-misalignment.patch
new file mode 100644
index 000000000000..deb3ef36664a
--- /dev/null
+++ b/app-editors/xemacs/files/xemacs-21.5.35-misalignment.patch
@@ -0,0 +1,67 @@
+# HG changeset patch
+# User Aidan Kehoe <kehoea@parhasard.net>
+# Date 1727073391 -3600
+# Mon Sep 23 07:36:31 2024 +0100
+# Node ID 00eb7276ebb1a22e20e6f6b9b5247b196b44f3f1
+# Parent d40990b854cf32198aea31eae0d60ce91ce0f4f7
+Avoid misaligned coding systems objects in the dump file,
+
+src/ChangeLog addition:
+
+2024-09-22 Aidan Kehoe <kehoea@parhasard.net>
+
+ * file-coding.c:
+ * file-coding.c (aligned_sizeof_coding_system): New.
+ * file-coding.c (allocate_coding_system): Use it.
+ Avoid misaligned coding systems objects in the dump file,
+ previously addressed for lstreams, specifiers, opaque data in
+ Martin Buchholz's change of 2001-01-24. Approach taken the same as
+ that for specifiers.
+ * file-coding.c (struct convert_eol_coding_system):
+ Remove a dummy integer no longer needed.
+
+[Changelog patch removed]
+
+diff -r d40990b854cf -r 00eb7276ebb1 src/file-coding.c
+--- a/src/file-coding.c Mon Sep 23 08:03:15 2024 +0100
++++ b/src/file-coding.c Mon Sep 23 07:36:31 2024 +0100
+@@ -312,11 +312,18 @@
+ MAYBE_XCODESYSMETH (obj, finalize, (obj));
+ }
+
++inline static Bytecount
++aligned_sizeof_coding_system (Bytecount type_specific_size)
++{
++ return MAX_ALIGN_SIZE (offsetof (Lisp_Coding_System, data)
++ + type_specific_size);
++}
++
+ static Bytecount
+ sizeof_coding_system (Lisp_Object obj)
+ {
+ const Lisp_Coding_System *p = XCODING_SYSTEM (obj);
+- return offsetof (Lisp_Coding_System, data) + p->methods->extra_data_size;
++ return aligned_sizeof_coding_system (p->methods->extra_data_size);
+ }
+
+ static const struct memory_description coding_system_methods_description_1[]
+@@ -835,7 +842,7 @@
+ Bytecount data_size,
+ Lisp_Object name)
+ {
+- Bytecount total_size = offsetof (Lisp_Coding_System, data) + data_size;
++ Bytecount total_size = aligned_sizeof_coding_system (data_size);
+ Lisp_Object obj = ALLOC_SIZED_LISP_OBJECT (total_size, coding_system);
+ Lisp_Coding_System *codesys = XCODING_SYSTEM (obj);
+
+@@ -3951,10 +3958,6 @@
+ struct convert_eol_coding_system
+ {
+ enum eol_type subtype;
+- int dummy; /* On some architectures (eg ia64) the portable dumper can
+- produce unaligned access errors without this field. Probably
+- because the combined structure of this structure and
+- Lisp_Coding_System is not properly aligned. */
+ };
+
+ #define CODING_SYSTEM_CONVERT_EOL_SUBTYPE(codesys) \
diff --git a/app-editors/xemacs/files/xemacs-21.5.35-va_args.patch b/app-editors/xemacs/files/xemacs-21.5.35-va_args.patch
new file mode 100644
index 000000000000..a3d5f14b728a
--- /dev/null
+++ b/app-editors/xemacs/files/xemacs-21.5.35-va_args.patch
@@ -0,0 +1,179 @@
+# HG changeset patch
+# User Aidan Kehoe <kehoea@parhasard.net>
+# Date 1727074995 -3600
+# Mon Sep 23 08:03:15 2024 +0100
+# Node ID d40990b854cf32198aea31eae0d60ce91ce0f4f7
+# Parent d3dfe7ea1c31cc619bf8416e04c5466927d9c6f5
+Avoid passing an int among Lisp_Object va_args, specifier instantiate methods.
+
+src/ChangeLog addition:
+
+2024-09-08 Aidan Kehoe <kehoea@parhasard.net>
+
+ * fontcolor.c (color_instantiate):
+ * fontcolor.c (font_instantiate):
+ * fontcolor.c (face_boolean_instantiate):
+ * fontcolor.c (face_background_placement_instantiate):
+ * glyphs.c (image_instantiate):
+ * specifier.c (specifier_instance_from_inst_list):
+ * specifier.h (struct specifier_methods):
+ Avoid passing an int among the Lisp_Object va_args of the
+ specifier instantiate methods, this is not portable behaviour,
+ thank you clang and -fsanitize=undefined.
+
+[Changelog patch removed]
+
+diff -r d3dfe7ea1c31 -r d40990b854cf src/fontcolor.c
+--- a/src/fontcolor.c Mon Sep 23 08:01:37 2024 +0100
++++ b/src/fontcolor.c Mon Sep 23 08:03:15 2024 +0100
+@@ -1380,7 +1380,7 @@
+ static Lisp_Object
+ color_instantiate (Lisp_Object specifier, Lisp_Object UNUSED (matchspec),
+ Lisp_Object domain, Lisp_Object instantiator,
+- Lisp_Object depth, int no_fallback)
++ Lisp_Object depth, Lisp_Object no_fallback)
+ {
+ /* When called, we're inside of call_with_suspended_errors(),
+ so we can freely error. */
+@@ -1436,7 +1436,7 @@
+ (Fget_face (XVECTOR_DATA (instantiator)[0]),
+ COLOR_SPECIFIER_FACE_PROPERTY
+ (XCOLOR_SPECIFIER (specifier)),
+- domain, ERROR_ME, no_fallback, depth));
++ domain, ERROR_ME, !NILP (no_fallback), depth));
+
+ case 2:
+ return (FACE_PROPERTY_INSTANCE_1
+@@ -1653,7 +1653,7 @@
+ font_instantiate (Lisp_Object UNUSED (specifier),
+ Lisp_Object USED_IF_MULE (matchspec),
+ Lisp_Object domain, Lisp_Object instantiator,
+- Lisp_Object depth, int no_fallback)
++ Lisp_Object depth, Lisp_Object no_fallback)
+ {
+ /* When called, we're inside of call_with_suspended_errors(),
+ so we can freely error. */
+@@ -1766,13 +1766,15 @@
+
+ match_inst = face_property_matching_instance
+ (Fget_face (XVECTOR_DATA (instantiator)[0]), Qfont,
+- charset, domain, ERROR_ME, no_fallback, depth, STAGE_INITIAL);
++ charset, domain, ERROR_ME, !NILP (no_fallback),
++ depth, STAGE_INITIAL);
+
+ if (UNBOUNDP(match_inst))
+ {
+ match_inst = face_property_matching_instance
+ (Fget_face (XVECTOR_DATA (instantiator)[0]), Qfont,
+- charset, domain, ERROR_ME, no_fallback, depth, STAGE_FINAL);
++ charset, domain, ERROR_ME, !NILP (no_fallback), depth,
++ STAGE_FINAL);
+ }
+
+ return match_inst;
+@@ -1868,7 +1870,7 @@
+ face_boolean_instantiate (Lisp_Object specifier,
+ Lisp_Object UNUSED (matchspec),
+ Lisp_Object domain, Lisp_Object instantiator,
+- Lisp_Object depth, int no_fallback)
++ Lisp_Object depth, Lisp_Object no_fallback)
+ {
+ /* When called, we're inside of call_with_suspended_errors(),
+ so we can freely error. */
+@@ -1895,7 +1897,7 @@
+
+ retval = (FACE_PROPERTY_INSTANCE_1
+ (Fget_face (XVECTOR_DATA (instantiator)[0]),
+- prop, domain, ERROR_ME, no_fallback, depth));
++ prop, domain, ERROR_ME, !NILP (no_fallback), depth));
+
+ if (instantiator_len == 3 && !NILP (XVECTOR_DATA (instantiator)[2]))
+ retval = NILP (retval) ? Qt : Qnil;
+@@ -2015,7 +2017,7 @@
+ Lisp_Object domain,
+ Lisp_Object instantiator,
+ Lisp_Object depth,
+- int no_fallback)
++ Lisp_Object no_fallback)
+ {
+ /* When called, we're inside of call_with_suspended_errors(),
+ so we can freely error. */
+@@ -2027,7 +2029,7 @@
+
+ return FACE_PROPERTY_INSTANCE_1
+ (Fget_face (XVECTOR_DATA (instantiator)[0]),
+- Qbackground_placement, domain, ERROR_ME, no_fallback, depth);
++ Qbackground_placement, domain, ERROR_ME, !NILP (no_fallback), depth);
+ }
+ else
+ ABORT (); /* Eh? */
+diff -r d3dfe7ea1c31 -r d40990b854cf src/glyphs.c
+--- a/src/glyphs.c Mon Sep 23 08:01:37 2024 +0100
++++ b/src/glyphs.c Mon Sep 23 08:03:15 2024 +0100
+@@ -3179,7 +3179,7 @@
+ static Lisp_Object
+ image_instantiate (Lisp_Object specifier, Lisp_Object UNUSED (matchspec),
+ Lisp_Object domain, Lisp_Object instantiator,
+- Lisp_Object depth, int no_fallback)
++ Lisp_Object depth, Lisp_Object no_fallback)
+ {
+ Lisp_Object glyph = IMAGE_SPECIFIER_ATTACHEE (XIMAGE_SPECIFIER (specifier));
+ int dest_mask = XIMAGE_SPECIFIER_ALLOWED (specifier);
+@@ -3218,7 +3218,7 @@
+ assert (XVECTOR_LENGTH (instantiator) == 3);
+ return (FACE_PROPERTY_INSTANCE
+ (Fget_face (XVECTOR_DATA (instantiator)[2]),
+- Qbackground_pixmap, domain, no_fallback, depth));
++ Qbackground_pixmap, domain, !NILP (no_fallback), depth));
+ }
+ else
+ {
+diff -r d3dfe7ea1c31 -r d40990b854cf src/specifier.c
+--- a/src/specifier.c Mon Sep 23 08:01:37 2024 +0100
++++ b/src/specifier.c Mon Sep 23 08:03:15 2024 +0100
+@@ -2862,8 +2862,8 @@
+ if (HAS_SPECMETH_P (sp, instantiate))
+ val = call_with_suspended_errors
+ ((lisp_fn_t) RAW_SPECMETH (sp, instantiate),
+- Qunbound, Qspecifier, ERROR_ME_WARN, 5, specifier,
+- matchspec, domain, val, depth, no_fallback);
++ Qunbound, Qspecifier, ERROR_ME_WARN, 6, specifier,
++ matchspec, domain, val, depth, no_fallback ? Qt : Qnil);
+
+ if (!UNBOUNDP (val))
+ {
+@@ -2911,8 +2911,8 @@
+ if (HAS_SPECMETH_P (sp, instantiate))
+ val = call_with_suspended_errors
+ ((lisp_fn_t) RAW_SPECMETH (sp, instantiate),
+- Qunbound, Qspecifier, errb, 5, specifier,
+- matchspec, domain, val, depth, no_fallback);
++ Qunbound, Qspecifier, errb, 6, specifier,
++ matchspec, domain, val, depth, no_fallback ? Qt : Qnil);
+
+ if (!UNBOUNDP (val))
+ {
+diff -r d3dfe7ea1c31 -r d40990b854cf src/specifier.h
+--- a/src/specifier.h Mon Sep 23 08:01:37 2024 +0100
++++ b/src/specifier.h Mon Sep 23 08:03:15 2024 +0100
+@@ -147,8 +147,9 @@
+ name specifier_instance) to avoid creating "external"
+ specification loops.
+
+- NO_FALLBACK indicates that the method should not try the fallbacks
+- (and thus simply return Qunbound) in case of a failure to instantiate.
++ NO_FALLBACK non-nil indicates that the method should not try the
++ fallbacks (and thus simply return Qunbound) in case of a failure to
++ instantiate.
+
+ This method must presume that both INSTANTIATOR and MATCHSPEC are
+ already validated by the corresponding validate_* methods, and
+@@ -165,7 +166,7 @@
+ Lisp_Object domain,
+ Lisp_Object instantiator,
+ Lisp_Object depth,
+- int no_fallback);
++ Lisp_Object no_fallback);
+
+ /* Going-to-add method: Called when an instantiator is about
+ to be added to a specifier. This function can specify
diff --git a/app-editors/xemacs/files/xemacs-21.5.35-which.patch b/app-editors/xemacs/files/xemacs-21.5.35-which.patch
index cf8b554490fc..1c93aa0e19d7 100644
--- a/app-editors/xemacs/files/xemacs-21.5.35-which.patch
+++ b/app-editors/xemacs/files/xemacs-21.5.35-which.patch
@@ -1,12 +1,23 @@
diff -r 22f2684b1b82 configure.ac
--- a/configure.ac Mon Sep 23 16:24:03 2024 +0100
-+++ b/configure.ac Thu Sep 26 07:57:11 2024 +0200
-@@ -2518,7 +2518,7 @@
++++ b/configure.ac Sat Sep 28 14:09:56 2024 +0200
+@@ -2518,16 +2518,16 @@
dnl We need a recent version of makeinfo
AC_MSG_CHECKING([for makeinfo >= 4.12])
MAKEINFO=
-for prog in `which -a makeinfo`; do
-+for prog in `type -P makeinfo`; do
++if prog=`command -v makeinfo`
++then
mi_verstr=[`$prog --version | sed -n '1s/^.* \([0-9][0-9.]*\)$/\1/p'`]
mi_major=`echo $mi_verstr | cut -d. -f1`
mi_minor=`echo $mi_verstr | cut -d. -f2`
+ if test "$mi_major" -gt 4 || ( test "$mi_major" -eq 4 && test "$mi_minor" -gt 11 );
+ then
+ MAKEINFO=$prog
+- break
+ fi
+-done
++fi
+ if test -z $MAKEINFO; then
+ AC_MSG_RESULT([no])
+ AC_MSG_WARN([Found Makeinfo $mi_verstr. 4.12 or later required.])
diff --git a/app-editors/xemacs/xemacs-21.5.35-r3.ebuild b/app-editors/xemacs/xemacs-21.5.35-r4.ebuild
index c6d6120f7236..7e74432b1405 100644
--- a/app-editors/xemacs/xemacs-21.5.35-r3.ebuild
+++ b/app-editors/xemacs/xemacs-21.5.35-r4.ebuild
@@ -50,6 +50,8 @@ RDEPEND="
DEPEND="${RDEPEND}
virtual/pkgconfig"
+BDEPEND="sys-apps/texinfo"
+
PDEPEND="app-xemacs/xemacs-base
app-xemacs/mule-base"
@@ -64,6 +66,8 @@ src_prepare() {
eapply "${FILESDIR}/${P}-mule-tests.patch"
eapply "${FILESDIR}/${P}-configure-libc-version.patch"
eapply "${FILESDIR}/${P}-which.patch"
+ eapply "${FILESDIR}/${P}-misalignment.patch"
+ eapply "${FILESDIR}/${P}-va_args.patch"
eapply_user
diff --git a/app-editors/xemacs/xemacs-21.5.9999.ebuild b/app-editors/xemacs/xemacs-21.5.9999.ebuild
index 9f275d6c2c18..8ce245bf3a87 100644
--- a/app-editors/xemacs/xemacs-21.5.9999.ebuild
+++ b/app-editors/xemacs/xemacs-21.5.9999.ebuild
@@ -50,6 +50,8 @@ RDEPEND="
DEPEND="${RDEPEND}
virtual/pkgconfig"
+BDEPEND="sys-apps/texinfo"
+
PDEPEND="app-xemacs/xemacs-base
app-xemacs/mule-base"
generated by cgit v1.2.3 (git 2.25.1) at 2024-10-21 01:39:02 +0000