From 81b8f20732954c4508baf2f77472b5435e3f851f Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Wed, 14 Sep 2022 11:10:11 +0100 Subject: gentoo auto-resync : 14:09:2022 - 11:10:10 --- dev-lang/erlang/Manifest | 2 - dev-lang/erlang/files/18.2.1-wx3.0.patch | 113 ----------------- .../files/erlang-23.3.4.14-emacs28-compat.patch | 137 --------------------- 3 files changed, 252 deletions(-) delete mode 100644 dev-lang/erlang/files/18.2.1-wx3.0.patch delete mode 100644 dev-lang/erlang/files/erlang-23.3.4.14-emacs28-compat.patch (limited to 'dev-lang/erlang') diff --git a/dev-lang/erlang/Manifest b/dev-lang/erlang/Manifest index 1e8689ff17ff..cfa71cb9217a 100644 --- a/dev-lang/erlang/Manifest +++ b/dev-lang/erlang/Manifest @@ -1,4 +1,3 @@ -AUX 18.2.1-wx3.0.patch 3849 BLAKE2B 02912cf61094d8217eab7181a4cc35aead224df7872c412db0b40b072778cfb900bf18219baf52e29f609b72305d3a11ea1079b2e873cf56a0a3bd42e3303d2f SHA512 33d8b67542266ae224ffb2bc86fbf36fff6737252810cfb445662ecc418fb30b0b00cbddd2f706ca836f1a8809c505e61edfe221d29dbe91c78c371bff6cec15 AUX 50erlang-gentoo.el 134 BLAKE2B df2da5c0c4be3e6855b51b820e3304f5c212a92d13ec48aa5d73ea3a0e801a8dddd371fd8894d49aa9d5573def56b3a864e463734d72fcf5356d39753dbda1ba SHA512 7a862e0ef1e96e88a484e80aeb92eb4465c7e8661efb0291c28abc13225eb3aa69442fe29417f5ad0d264e54399d645d9cd4713bc9869b48e87a91e50b9b2473 AUX epmd.confd-r2 60 BLAKE2B 6d4c0ecc74218941281dd7235b34ef2fcca32fc26f3f282551a6d551153b53f77f42b5139dfbee2b02a966cdea03fa350270e6897a57405ca2ac256d1b7eae50 SHA512 e594ccdfef8473f9fccbdee6fe084c43a4fadd5ac47ffb98aaa223902e74290e749f28b88952aa83eb207de1393d44184f81244c233b7d6afde04fc8615dfd91 AUX epmd.init 536 BLAKE2B fc4d5058088e08f3ed17f4cfcff2190ec8b7fb922ca8ac1353b82f14319a443d23563c7d436b85946573f0313debcf5af4669caf013ea87d54af4f2da0692ff6 SHA512 e351892fe920d4dab4cc0bb1b448204f8b1e16b8e0ed687b285c52a8d5e00d6a39fb27e83d5c0b973b5b595f4b4274c64fa938a25853dcbae674edf1cae42d3d @@ -6,7 +5,6 @@ AUX epmd.init-r2 390 BLAKE2B eae80a5a919fe2511463f99f225bfde4e31d603552eac40164f AUX epmd.service 138 BLAKE2B f56c907ec51bb85c437235334cf01c6a43ccf2316be3b226ab557e3f71cab48baf59b5a9533a4dccb2cb61a4434e3a51d44eae06010718dbf9a732d605c40f73 SHA512 405740f8f9cd55d4ecd7420748399ab3f374b7cb09e53605f44ba49d0af86b70e4a1baf1fde05a703fb90c8a83dbcdd5cfbbf09185e9d7b58ff9612aefc2dd28 AUX epmd.service-r1 159 BLAKE2B ec50e4bfd89dc2d35fc2e549c695f9aae163d3df4d3c7a0d3f85f0f747c13a8aed9c8e9e57f3898ab31aec6795d7cd0565a7c563dc77f3f6154e53be88ec326d SHA512 4b99b2092fe447fa01e3badfce261bca6400ebda70f890efbacc40570019adfe9fc349a6d024955e2f1909c9068f37415b64d0a104399f2696eff6ccf6ad06ab AUX erlang-22.0-dont-ignore-LDFLAGS.patch 1174 BLAKE2B 64900c6b934ecbd11238e604f907e6f8b1ec2730d2b98aad5405383742563e050bc6ffaae22d55a22998658460109fac9f6628458f5e976e9fbfe71cc26f1d64 SHA512 0fd7cbef64a9a54e0959d49b50096f9abc6fcede4360c153631c7f649f5c41b35ffb1f2d06f80964bf49421464bcc43c96147c227d60cf413c51b3e89ae9ad24 -AUX erlang-23.3.4.14-emacs28-compat.patch 6237 BLAKE2B b5b8f0c7bfd1f217805d7279d85b7d09189d069814afde10b32446031c221aaac58aa7adaf993da7261c1d8889b5bef6cabbfc73b4062a6eeadae5e0d923c39d SHA512 e47364afaf8d29b1e9e1f6548bfe5efa110e56777d9db87fefd24ee201d5689f46e3e4d34c32b3a95353411500ae10fc1064f9ed155d5d6d97f442d749e38f9b AUX erlang-24.0.2-serial-configure.patch 586 BLAKE2B 3ad4fcbf35310dc11e8aaddca95a467414c60390a7e170c83d0775230a5a815212c6ddce55e98721b02e03511f80e67cfbd60e4b06bc86c615bb3a51d5015ec5 SHA512 abc81ef2a0b23fbe82542efefb1cbb12b1143e9282f7114ea929c18a5c02f2053caabb05ef9838d40b40f3ca59b06955528b122092438ee3d4ef6a8b567fc335 DIST erlang-24.3.3.tar.gz 59296830 BLAKE2B 1792274c77001b6f49e84f1584620a247cf3acdf075a8d581403f31a2b4cfe32e7b8104d325f3c1a999595d94484cb74b7996a35599e9ef8935931a133a554f6 SHA512 5e8ce0ebd50c1c67ca29ce9405fc18f5461793b20a1732418bc8fac404078044deb72526682aab92ee3e737bc9dc9e94e6be162a088e2cb7cc68c14b1d76454e DIST erlang-24.3.4.2.tar.gz 59532491 BLAKE2B 28c48f1a3197a151010a775286cf0b775567301411b8480b32cfb39c68978de5586b63c245fe58bff8034ebc04fcc3b002dee7c953127ecf581ed6d716587ae4 SHA512 78bc2dc67fe60d3ea6049c361a017c054e12b0adeeae890b0a1ee5301744505593bd19f3731acebff8312b323a3bd21a1359507d122fc34f0eb85eefb3aac88c diff --git a/dev-lang/erlang/files/18.2.1-wx3.0.patch b/dev-lang/erlang/files/18.2.1-wx3.0.patch deleted file mode 100644 index aada0d9eaa1e..000000000000 --- a/dev-lang/erlang/files/18.2.1-wx3.0.patch +++ /dev/null @@ -1,113 +0,0 @@ -Description: Fix constants for wxwidgets3.0 - The values of wx constants can change between stable release series (and - some have between 2.8 and 3.0), but erlang seems to hardcode these values. -Author: Olly Betts -Bug-Debian: https://bugs.debian.org/766790 -Forwarded: no -Last-Update: 2014-11-25 - ---- a/lib/wx/include/wx.hrl -+++ b/lib/wx/include/wx.hrl -@@ -767,7 +767,7 @@ - % From "checkbox.h" - -define(wxCHK_ALLOW_3RD_STATE_FOR_USER, 8192). - -define(wxCHK_3STATE, 4096). ---define(wxCHK_2STATE, 0). -+-define(wxCHK_2STATE, 16384). - % From "checkbox.h": wxCheckBoxState - -define(wxCHK_UNCHECKED, 0). - -define(wxCHK_CHECKED, 1). -@@ -1014,10 +1014,10 @@ - -define(wxSIZE_AUTO_WIDTH, 1). - -define(wxSETUP, 131072). - -define(wxMORE, 65536). ---define(wxHELP, 32768). ---define(wxRESET, 16384). ---define(wxBACKWARD, 8192). ---define(wxFORWARD, 4096). -+-define(wxHELP, 4096). -+-define(wxRESET, 32768). -+-define(wxBACKWARD, 16384). -+-define(wxFORWARD, 8192). - -define(wxICON_MASK, (16#00000100 bor 16#00000200 bor 16#00000400 bor 16#00000800)). - -define(wxICON_ASTERISK, ?wxICON_INFORMATION). - -define(wxICON_STOP, ?wxICON_HAND). -@@ -1049,8 +1049,8 @@ - -define(wxTC_TOP, 0). - -define(wxTC_FIXEDWIDTH, 32). - -define(wxTC_RIGHTJUSTIFY, 16). ---define(wxSP_WRAP, 8192). ---define(wxSP_ARROW_KEYS, 4096). -+-define(wxSP_WRAP, 32768). -+-define(wxSP_ARROW_KEYS, 16384). - -define(wxSP_VERTICAL, ?wxVERTICAL). - -define(wxSP_HORIZONTAL, ?wxHORIZONTAL). - -define(wxSB_VERTICAL, ?wxVERTICAL). -@@ -1071,8 +1071,8 @@ - -define(wxCB_SIMPLE, 4). - -define(wxLB_INT_HEIGHT, 2048). - -define(wxLB_HSCROLL, ?wxHSCROLL). ---define(wxLB_ALWAYS_SB, 1024). ---define(wxLB_NEEDED_SB, 512). -+-define(wxLB_ALWAYS_SB, 512). -+-define(wxLB_NEEDED_SB, 0). - -define(wxLB_OWNERDRAW, 256). - -define(wxLB_EXTENDED, 128). - -define(wxLB_MULTIPLE, 64). -@@ -1548,7 +1548,7 @@ - -define(wxUPDATE_UI_FROMIDLE, 2). - % From "dialog.h" - -define(wxDEFAULT_DIALOG_STYLE, (?wxCAPTION bor ?wxSYSTEM_MENU bor ?wxCLOSE_BOX)). ---define(wxDIALOG_NO_PARENT, 1). -+-define(wxDIALOG_NO_PARENT, 32). - % From "dirctrlg.h" - -define(wxDIRCTRL_DIR_ONLY, 16). - -define(wxDIRCTRL_SELECT_FIRST, 32). -@@ -3728,7 +3728,7 @@ - -define(wxSTC_KEY_LEFT, 302). - -define(wxSTC_KEY_UP, 301). - -define(wxSTC_KEY_DOWN, 300). ---define(wxSTC_MODEVENTMASKALL, 8191). -+-define(wxSTC_MODEVENTMASKALL, 1048575). - -define(wxSTC_MULTILINEUNDOREDO, 4096). - -define(wxSTC_MOD_BEFOREDELETE, 2048). - -define(wxSTC_MOD_BEFOREINSERT, 1024). -@@ -3810,7 +3810,7 @@ - -define(wxSTC_INDIC_TT, 2). - -define(wxSTC_INDIC_SQUIGGLE, 1). - -define(wxSTC_INDIC_PLAIN, 0). ---define(wxSTC_INDIC_MAX, 7). -+-define(wxSTC_INDIC_MAX, 31). - -define(wxSTC_CASE_LOWER, 2). - -define(wxSTC_CASE_UPPER, 1). - -define(wxSTC_CASE_MIXED, 0). -@@ -3835,7 +3835,7 @@ - -define(wxSTC_CHARSET_BALTIC, 186). - -define(wxSTC_CHARSET_DEFAULT, 1). - -define(wxSTC_CHARSET_ANSI, 0). ---define(wxSTC_STYLE_MAX, 127). -+-define(wxSTC_STYLE_MAX, 255). - -define(wxSTC_STYLE_LASTPREDEFINED, 39). - -define(wxSTC_STYLE_CALLTIP, 38). - -define(wxSTC_STYLE_INDENTGUIDE, 37). -@@ -3934,9 +3934,9 @@ - -define(wxTE_PROCESS_TAB, 64). - -define(wxTE_MULTILINE, 32). - -define(wxTE_READONLY, 16). ---define(wxTE_AUTO_SCROLL, 8). -+-define(wxTE_AUTO_SCROLL, 0). - -define(wxTE_NO_VSCROLL, 2). ---define(wxHAS_TEXT_WINDOW_STREAM, 0). -+-define(wxHAS_TEXT_WINDOW_STREAM, 1). - % From "textctrl.h": wxTextAttrAlignment - -define(wxTEXT_ALIGNMENT_DEFAULT, 0). - -define(wxTEXT_ALIGNMENT_LEFT, 1). -@@ -3986,7 +3986,7 @@ - -define(wxDEFAULT_FRAME_STYLE, (?wxSYSTEM_MENU bor ?wxRESIZE_BORDER bor ?wxMINIMIZE_BOX bor ?wxMAXIMIZE_BOX bor ?wxCLOSE_BOX bor ?wxCAPTION bor ?wxCLIP_CHILDREN)). - -define(wxRESIZE_BORDER, 64). - -define(wxTINY_CAPTION_VERT, 128). ---define(wxTINY_CAPTION_HORIZ, 256). -+-define(wxTINY_CAPTION_HORIZ, 128). - -define(wxMAXIMIZE_BOX, 512). - -define(wxMINIMIZE_BOX, 1024). - -define(wxSYSTEM_MENU, 2048). diff --git a/dev-lang/erlang/files/erlang-23.3.4.14-emacs28-compat.patch b/dev-lang/erlang/files/erlang-23.3.4.14-emacs28-compat.patch deleted file mode 100644 index 32844d8dd1a8..000000000000 --- a/dev-lang/erlang/files/erlang-23.3.4.14-emacs28-compat.patch +++ /dev/null @@ -1,137 +0,0 @@ -From 22a7522ef3f0f3c13618214e61f60cb01d80eef4 Mon Sep 17 00:00:00 2001 -From: Justin Davis -Date: Tue, 26 Oct 2021 13:28:16 -0400 -Subject: [PATCH] Fix emacs erlang-mode: xref switched to CL-Lib - -Fix for GitHub issue #5314. - -Xref is a package which is also bundled with emacs: -http://elpa.gnu.org/packages/xref.html - -Xref switched its own internally defined classes from EIEIO to -CL-lib (emacs-mirror/emacs@86da812afb2572c7fead2bb07570b976bffd7c55). -erlang-mode subclasses xref-file-location in order to add a function -arity slot to xrefs. - -If xref-file-location is a class, use defclass to subclass it. Otherwise -use cl-defstruct. Avoids referencing make-instance, slot-value functions -from EIEIO. Only references constructor, accessor, and predicate -functions. Updates comments that make references to classes. - -Testing: -- cd into lib/tools/emacs. -- Run the tests included with erlang-mode from the shell: - emacs -Q -batch -L . -l erlang.el -l erlang-test.el \ - -f ert-run-tests-batch-and-exit -- Copy xref.el from the xref package (>=1.3.1) into the - lib/tools/emacs directory. -- Run the tests again. This will load xref.el automatically - and use the new interface. ---- - lib/tools/emacs/erlang.el | 48 +++++++++++++++++++++++++-------------- - 1 file changed, 31 insertions(+), 17 deletions(-) - -diff --git a/lib/tools/emacs/erlang.el b/lib/tools/emacs/erlang.el -index 69a5fdaeb55..40fe32689e7 100644 ---- a/lib/tools/emacs/erlang.el -+++ b/lib/tools/emacs/erlang.el -@@ -5120,8 +5120,8 @@ about Erlang modules." - ;; - ;; As mentioned this xref implementation is based on the etags xref - ;; implementation. But in the cases where arity is considered the --;; etags information structures (class xref-etags-location) will be --;; translated to our own structures which include arity (class -+;; etags information structures (struct xref-etags-location) will be -+;; translated to our own structures which include arity (struct - ;; erlang-xref-location). This translation is started in the function - ;; `erlang-refine-xrefs'. - -@@ -5129,6 +5129,11 @@ about Erlang modules." - ;; with xref items with xref-etags-location and some deal with xref - ;; items with erlang-xref-location. - -+;; NOTE: Around Sept 2021, the xrefs package changed all of its defined types -+;; (i.e. xref-location, xref-file-location) from EIEIO classes to CL-Lib -+;; structures. These are both supported. Older Emacsen with earlier versions of -+;; xref will continue to use defclass. Newer Emacsen will use cl-defstruct. -+ - (defun erlang-etags--xref-backend () 'erlang-etags) - - (defun erlang-soft-require (feature) -@@ -5137,6 +5142,7 @@ about Erlang modules." - - (when (and (erlang-soft-require 'xref) - (erlang-soft-require 'cl-generic) -+ (erlang-soft-require 'cl-lib) - (erlang-soft-require 'eieio) - (erlang-soft-require 'etags)) - ;; The purpose of using eval here is to avoid compilation -@@ -5165,10 +5171,20 @@ about Erlang modules." - (let ((erlang-replace-etags-tags-completion-table t)) - (tags-completion-table))) - -- (defclass erlang-xref-location (xref-file-location) -- ((arity :type fixnum :initarg :arity -- :reader erlang-xref-location-arity)) -- :documentation "An erlang location is a file location plus arity.") -+ ;; Xref 1.3.1 bundled with Emacs 28+ switched from using EIEIO classes to -+ ;; using CL-Lib structs. -+ (if (find-class 'xref-file-location) -+ (progn -+ (defclass erlang-xref-location (xref-file-location) -+ ((arity :type fixnum :initarg :arity -+ :reader erlang-xref-location-arity)) -+ :documentation "An erlang location is a file location plus arity.") -+ ;; Make a constructor with the same name that a CL structure would have. -+ (defalias 'make-erlang-xref-location 'erlang-xref-location)) -+ (cl-defstruct (erlang-xref-location -+ (:include xref-file-location)) -+ "An erlang location is a file location plus arity." -+ (arity 0 :type fixnum))) - - ;; This method definition only calls the superclass which is - ;; the default behaviour if it was not defined. It is only -@@ -5331,8 +5347,7 @@ is non-nil then TAG is a regexp." - xrefs - (when (and xrefs - (fboundp 'xref-item-location) -- (fboundp 'xref-location-group) -- (fboundp 'slot-value)) -+ (fboundp 'xref-location-group)) - (let (files) - (cl-loop for xref in xrefs - for loc = (xref-item-location xref) -@@ -5357,7 +5372,8 @@ is non-nil then TAG is a regexp." - t)))) - - (defun erlang-xrefs-in-file (file kind tag is-regexp) -- (when (fboundp 'make-instance) -+ (when (and (fboundp 'make-erlang-xref-location) -+ (fboundp 'xref-make)) - (with-current-buffer (find-file-noselect file) - (save-excursion - (goto-char (point-min)) -@@ -5369,17 +5385,15 @@ is non-nil then TAG is a regexp." - for name = (match-string-no-properties 1) - for arity = (save-excursion - (erlang-get-arity)) -- for loc = (make-instance 'erlang-xref-location -- :file file -- :line (line-number-at-pos) -- :column 0 -- :arity arity) -+ for loc = (make-erlang-xref-location -+ :file file -+ :line (line-number-at-pos) -+ :column 0 -+ :arity arity) - for sum = (erlang-xref-summary kind name arity) - when (and arity - (not (eq arity last-arity))) -- collect (make-instance 'xref-item -- :summary sum -- :location loc) -+ collect (xref-make sum loc) - do (setq last-arity arity))))))) - - (defun erlang-xref-summary (kind tag arity) -- cgit v1.2.3