commit: 629920556e825d37fb5009d828ef8c09d934ceea Author: Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at> AuthorDate: Mon Sep 12 17:19:39 2022 +0000 Commit: Matthew Smith <matthew <AT> gentoo <DOT> org> CommitDate: Mon Sep 12 18:17:20 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=62992055
dev-lang/erlang: remove unused patches Signed-off-by: Michael Mair-Keimberger <mmk <AT> levelnine.at> Portage 3.0.36 / pkgdev 0.2.1 / pkgcheck 0.10.14 Closes: https://github.com/gentoo/gentoo/pull/27229 Signed-off-by: Matthew Smith <matthew <AT> gentoo.org> dev-lang/erlang/files/18.2.1-wx3.0.patch | 113 ----------------- .../files/erlang-23.3.4.14-emacs28-compat.patch | 137 --------------------- 2 files changed, 250 deletions(-) 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 <o...@survex.com> -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 <jrc...@gmail.com> -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)
