From 2bb2ed8337958cd238d62a859cc71bd0fe8a1ace Mon Sep 17 00:00:00 2001
From: Kevin Mihelich <kevin@archlinuxarm.org>
Date: Wed, 12 May 2021 20:23:49 +0000
Subject: [PATCH] community/erlang to 24.0-1

---
 community/erlang/PKGBUILD                     |  52 ++++----
 .../erlang-22.0-dont-ignore-LDFLAGS.patch     |  27 -----
 community/erlang/wx3.patch                    | 113 ------------------
 3 files changed, 20 insertions(+), 172 deletions(-)
 delete mode 100644 community/erlang/erlang-22.0-dont-ignore-LDFLAGS.patch
 delete mode 100644 community/erlang/wx3.patch

diff --git a/community/erlang/PKGBUILD b/community/erlang/PKGBUILD
index d7a600351..f67e81599 100644
--- a/community/erlang/PKGBUILD
+++ b/community/erlang/PKGBUILD
@@ -11,55 +11,43 @@
 
 pkgbase=erlang
 pkgname=(erlang erlang-unixodbc)
-pkgver=23.3.2
+pkgver=24.0
 pkgrel=1
-_docver=23.3
+_docver=24.0
 arch=(x86_64)
-url='https://www.erlang.org'
+url='https://erlang.org'
 license=(Apache)
-makedepends=(fop git glu java-environment libxslt lksctp-tools
-             mesa perl unixodbc wxgtk3)
+makedepends=(fop git glu java-environment libxslt lksctp-tools mesa perl unixodbc wxgtk3)
 options=(staticlibs)
-source=("git+https://github.com/erlang/otp.git#tag=OTP-$pkgver"
-        "$url/download/otp_doc_man_$_docver.tar.gz"
-        wx3.patch
-        erlang-22.0-dont-ignore-LDFLAGS.patch
-        epmd.conf
+source=(epmd.conf
         epmd.service
-        epmd.socket)
-sha256sums=('SKIP'
-            'b890e99d3fe1b317ed083455985225550ebf74b4a8ec2af4c758e4ce6e2934ff'
-            'b0e1d2ed833feb0f308060c2a451fcd58fceb68c9c63432fab38ae4cd0264ee2'
-            'd84d3644621df383ba24d0f4132dfdc92dc175c12a8f82dd0f107c2d0e7fd626'
-            '78ce5e67b21758c767d727e56b20502f75dc4385ff9b6c6db312d8e8506f2df2'
-            'b121ec9053fb37abca5f910a81c526f93ec30fe13b574a12209223b346886a9e'
-            '998a759e4cea4527f9d9b241bf9f32527d7378d63ea40afa38443c6c3ceaea34')
+        epmd.socket
+        "$url/download/otp_doc_man_$_docver.tar.gz"
+        "git+https://github.com/erlang/otp#commit=583cba31eb09c14abd0b217fe7ac2e9a60425d51") # tag: OTP-24.0
+b2sums=('1675ac9bf948ab19e8b63077d870ccf356fcdbce14de2777f00b3488aa1ce34a5e0a5cdc0428707f744dee5940b12653a44e0ded0554de95ebb31bce4676ff87'
+        '1f765318bcd322ce697a48c064ccdb1bd107b4a84e164a87f62678391cb82a9ab17a397d679cf266e037a5a2d91772b85f7a97f9cc5478c0f18118743b30045f'
+        'c37706f5f6e2d49100104fb442ebf15edd6ee0a1e8038d0364794cf34fd3f02a61b9ad2706228b3327b85b0cadcd11aac6087e7c98408eae2d307a09191b6553'
+        'aaef8165322f39f7410840eafe562ec5038d9c89b4fa99b3b1d5748ba70fe755ba732de403dd916328e1fdcec895e2a347db4fb8c8837b5e41155439c9c54ef6'
+        'SKIP')
 
 prepare() {
-  # For Erlang to find wx-config-gtk3 as wx-config in the $PATH
+  # Hack so that erlang can find wx-config-gtk3 as wx-config in the $PATH
   mkdir -p bin
-  ln -s /usr/bin/wx-config-gtk3 bin/wx-config
+  ln -fs /usr/bin/wx-config-gtk3 bin/wx-config
   export PATH="$srcdir/bin:$PATH"
-
-  cd otp
-
-  # Patch for autoconf
-  git cherry-pick -n c5b04efb55304a7c6f569c33c8e5875a32877f31
-
-  patch -p1 -i ../erlang-22.0-dont-ignore-LDFLAGS.patch
-  patch -p1 -i ../wx3.patch
-
-  ./otp_build autoconf
+  sed -i 's/^LDFLAGS = /LDFLAGS += /g' otp/lib/megaco/src/flex/Makefile.in
+  sed -i 's/^LDFLAGS =  /LDFLAGS += /g' otp/lib/odbc/c_src/Makefile.in
 }
 
 build() {
-  cd otp
   export PATH="$srcdir/bin:$PATH"
   export WX_GKT_VER="3.0"
+  cd otp
+  ./otp_build autoconf
   ./configure \
-    --prefix=/usr \
     --enable-builtin-zlib \
     --enable-smp-support \
+    --prefix=/usr \
     --with-odbc \
     --with-wx-config=/usr/bin/wx-config-gtk3 \
     --disable-pgo
diff --git a/community/erlang/erlang-22.0-dont-ignore-LDFLAGS.patch b/community/erlang/erlang-22.0-dont-ignore-LDFLAGS.patch
deleted file mode 100644
index 3591c551f..000000000
--- a/community/erlang/erlang-22.0-dont-ignore-LDFLAGS.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-This is a forward port of erlang-20.3.2-dont-ignore-LDFLAGS.patch
-Anthony G. Basile <blueness@gentoo.org>
-
-diff -Naur otp-OTP-22.0.orig/lib/megaco/src/flex/Makefile.in otp-OTP-22.0/lib/megaco/src/flex/Makefile.in
---- otp-OTP-22.0.orig/lib/megaco/src/flex/Makefile.in	2019-05-10 12:42:49.000000000 +0000
-+++ otp-OTP-22.0/lib/megaco/src/flex/Makefile.in	2019-06-04 15:53:37.899372564 +0000
-@@ -47,7 +47,7 @@
- CC      = @DED_CC@
- CFLAGS_MT = $(CFLAGS) @DED_THR_DEFS@
- LD      = @DED_LD@
--LDFLAGS = @DED_LDFLAGS@
-+LDFLAGS += @DED_LDFLAGS@
- LEX     = @LEX@
- LEXLIB  = @LEXLIB@
- PERL    = @PERL@
-diff -Naur otp-OTP-22.0.orig/lib/odbc/c_src/Makefile.in otp-OTP-22.0/lib/odbc/c_src/Makefile.in
---- otp-OTP-22.0.orig/lib/odbc/c_src/Makefile.in	2019-05-10 12:42:49.000000000 +0000
-+++ otp-OTP-22.0/lib/odbc/c_src/Makefile.in	2019-06-04 15:53:37.900372572 +0000
-@@ -82,7 +82,7 @@
- CFLAGS = $(TYPEFLAGS) @CFLAGS@ @THR_DEFS@ @DEFS@
- EI_LDFLAGS = -L$(EI_ROOT)/obj$(TYPEMARKER)/$(TARGET)
- LD = @LD@
--LDFLAGS =  $(ODBC_LIB) $(EI_LDFLAGS)
-+LDFLAGS += $(ODBC_LIB) $(EI_LDFLAGS)
- LIBS = @LIBS@ @THR_LIBS@ $(EI_LIB)
- INCLUDES = -I. $(ODBC_INCLUDE) $(EI_INCLUDE)
- TARGET_FLAGS =  @TARGET_FLAGS@
diff --git a/community/erlang/wx3.patch b/community/erlang/wx3.patch
deleted file mode 100644
index aada0d9ea..000000000
--- a/community/erlang/wx3.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 <olly@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).