extra/erlang to 26.2.4-1

extra/erlang/.SRCINFO

@@ -1,5 +1,5 @@
 pkgbase = erlang
-	pkgver = 26.2.3
+	pkgver = 26.2.4
 	pkgrel = 1
 	url = https://erlang.org
 	arch = x86_64
@@ -12,19 +12,18 @@ pkgbase = erlang
 	makedepends = lksctp-tools
 	makedepends = mesa
 	makedepends = perl
-	makedepends = unixodbc
 	makedepends = wxwidgets-gtk3
 	options = staticlibs
 	source = epmd.conf
 	source = epmd.service
 	source = epmd.socket
 	source = https://erlang.org/download/otp_doc_man_26.1.tar.gz
-	source = git+https://github.com/erlang/otp#commit=928d03e6da416208fce7b9a7dbbfbb4f25d26c37
+	source = git+https://github.com/erlang/otp#commit=e26c5206dc98ec1b8f978fceaa61fd1354266ccb
 	b2sums = 1675ac9bf948ab19e8b63077d870ccf356fcdbce14de2777f00b3488aa1ce34a5e0a5cdc0428707f744dee5940b12653a44e0ded0554de95ebb31bce4676ff87
 	b2sums = 1f765318bcd322ce697a48c064ccdb1bd107b4a84e164a87f62678391cb82a9ab17a397d679cf266e037a5a2d91772b85f7a97f9cc5478c0f18118743b30045f
 	b2sums = c37706f5f6e2d49100104fb442ebf15edd6ee0a1e8038d0364794cf34fd3f02a61b9ad2706228b3327b85b0cadcd11aac6087e7c98408eae2d307a09191b6553
 	b2sums = 2eed8963d425fe5ff3cd02eeacfd0eb86051225578613e374b71818a91e4f0b6953c4297a06ee59803d9421730c93871660ce66150a13d808f122a6f84f74f2a
-	b2sums = SKIP
+	b2sums = d114d9de971b3389e71e6310ee865d6051546abd1223be132a013e053ec4476a22381f49a4e26a7a7839d332e7b6cd590ef4bca7f43d92943cff812de8998def
 
 pkgname = erlang
 	pkgdesc = General-purpose concurrent functional programming language developed by Ericsson
@@ -33,13 +32,7 @@ pkgname = erlang
 	depends = openssl
 	depends = webkit2gtk
 	depends = wxwidgets-gtk3
-	optdepends = erlang-unixodbc: database support
 	optdepends = java-environment: for Java support
 	optdepends = lksctp-tools: for SCTP support
 	provides = erlang-nox
 	conflicts = erlang-nox
-
-pkgname = erlang-unixodbc
-	pkgdesc = Unixodbc support for Erlang
-	depends = erlang-nox
-	depends = unixodbc

extra/erlang/PKGBUILD

@@ -10,16 +10,16 @@
 #  - configure with --disable-pgo to fix ARM FTBFS
 
 pkgbase=erlang
-pkgname=(erlang erlang-unixodbc)
+pkgname=(erlang)
-pkgver=26.2.3
+pkgver=26.2.4
 pkgrel=1
 _docver=26.1
 # https://github.com/erlang/otp/tags
-_commit=928d03e6da416208fce7b9a7dbbfbb4f25d26c37 # OTP-26.2.3
+_commit=e26c5206dc98ec1b8f978fceaa61fd1354266ccb # OTP-26.2.4
 arch=(x86_64)
 url='https://erlang.org'
 license=(Apache)
-makedepends=(fop git glu java-environment libxslt lksctp-tools mesa perl unixodbc wxwidgets-gtk3)
+makedepends=(fop git glu java-environment libxslt lksctp-tools mesa perl wxwidgets-gtk3)
 options=(staticlibs)
 source=(epmd.conf
         epmd.service
@@ -30,11 +30,11 @@ b2sums=('1675ac9bf948ab19e8b63077d870ccf356fcdbce14de2777f00b3488aa1ce34a5e0a5cd
         '1f765318bcd322ce697a48c064ccdb1bd107b4a84e164a87f62678391cb82a9ab17a397d679cf266e037a5a2d91772b85f7a97f9cc5478c0f18118743b30045f'
         'c37706f5f6e2d49100104fb442ebf15edd6ee0a1e8038d0364794cf34fd3f02a61b9ad2706228b3327b85b0cadcd11aac6087e7c98408eae2d307a09191b6553'
         '2eed8963d425fe5ff3cd02eeacfd0eb86051225578613e374b71818a91e4f0b6953c4297a06ee59803d9421730c93871660ce66150a13d808f122a6f84f74f2a'
-        'SKIP')
+        'd114d9de971b3389e71e6310ee865d6051546abd1223be132a013e053ec4476a22381f49a4e26a7a7839d332e7b6cd590ef4bca7f43d92943cff812de8998def')
 
 prepare() {
   # adjust how LDFLAGS are handled
-  sed -i 's/^LDFLAGS = /LDFLAGS += /g' otp/lib/{odbc/c_src,megaco/src/flex}/Makefile.in
+  sed -i 's/^LDFLAGS = /LDFLAGS += /g' otp/lib/megaco/src/flex/Makefile.in
 
   # let the Java bindings support version 11 or later, ref https://gitlab.archlinux.org/archlinux/packaging/packages/erlang/-/issues/1
   sed -i 's/^JAVA_OPTIONS =/JAVA_OPTIONS = --release 11/g' otp/lib/jinterface/java_src/com/ericsson/otp/erlang/Makefile
@@ -49,7 +49,7 @@ build() {
     --enable-shared-zlib \
     --enable-ssl=dynamic-ssl-lib \
     --prefix=/usr \
-    --with-odbc \
+    --without-odbc \
     --disable-pgo
   DOC_TARGETS=chunks make all
   DOC_TARGETS=chunks make docs
@@ -58,8 +58,7 @@ build() {
 package_erlang() {
   pkgdesc='General-purpose concurrent functional programming language developed by Ericsson'
   depends=(glu ncurses openssl webkit2gtk wxwidgets-gtk3)
-  optdepends=('erlang-unixodbc: database support'
+  optdepends=('java-environment: for Java support'
-              'java-environment: for Java support'
               'lksctp-tools: for SCTP support')
   provides=(erlang-nox)
   conflicts=(erlang-nox)
@@ -67,10 +66,6 @@ package_erlang() {
   export PATH="$srcdir/bin:$PATH"
   make -C otp DESTDIR="$pkgdir" DOC_TARGETS=chunks install install-docs
 
-  # move files that belong to the erlang-unixodbc package
-  mkdir -p unixodbc
-  mv "$pkgdir/usr/lib/erlang/lib/odbc"* "$srcdir/unixodbc/"
-
   # services and configuration
   install -Dm644 epmd.service "$pkgdir/usr/lib/systemd/system/epmd.service"
   install -Dm644 epmd.socket "$pkgdir/usr/lib/systemd/system/epmd.socket"
@@ -85,13 +80,3 @@ package_erlang() {
   # man pages
   cp -r -v man "$pkgdir/usr/lib/erlang/"
 }
-
-package_erlang-unixodbc() {
-  pkgdesc='Unixodbc support for Erlang'
-  depends=(erlang-nox unixodbc)
-
-  install -d "$pkgdir/usr/lib/erlang/lib"
-  mv unixodbc/* "$pkgdir/usr/lib/erlang/lib/"
-  install -Dm644 otp/LICENSE.txt \
-    "$pkgdir/usr/share/licenses/$pkgname/LICENCE.txt"
-}