[arch-commits] Commit in erlang/trunk (PKGBUILD)

[Alexander Rødseth]

    Date: Monday, January 11, 2021 @ 14:01:17
  Author: arodseth
Revision: 817868

fix for autoconf + use wxgtk3

Modified:
  erlang/trunk/PKGBUILD

----------+
 PKGBUILD |   16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2021-01-11 13:56:17 UTC (rev 817867)
+++ PKGBUILD	2021-01-11 14:01:17 UTC (rev 817868)
@@ -1,4 +1,5 @@
 # Maintainer: Alexander F. Rødseth <xyproto at archlinux.org>
+# Contributor: loqs
 # Contributor: Lukas Fleischer <lfleischer at archlinux.org>
 # Contributor: Vesa Kaihlavirta <vesa at archlinux.org>
 # Contributor: Sarah Hay <sarahhay at mb.sympatico.ca>
@@ -8,7 +9,7 @@
 pkgbase=erlang
 pkgname=(erlang erlang-unixodbc)
 pkgver=23.2
-pkgrel=2
+pkgrel=3
 _docver=23.2
 arch=(x86_64)
 url='https://www.erlang.org'
@@ -32,12 +33,19 @@
             '998a759e4cea4527f9d9b241bf9f32527d7378d63ea40afa38443c6c3ceaea34')
 
 prepare() {
+  # For Erlang to find wx-config-gtk3 as wx-config in the $PATH
   mkdir -p bin
-  ln -s /usr/bin/wx-config bin/wx-config
+  ln -s /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
-  export PATH="$srcdir/bin:$PATH"
+
   ./otp_build autoconf
 }
 
@@ -56,7 +64,7 @@
 
 package_erlang() {
   pkgdesc='General-purpose concurrent functional programming language developed by Ericsson'
-  depends=(glu ncurses openssl wxgtk)
+  depends=(glu ncurses openssl wxgtk3)
   optdepends=('erlang-unixodbc: database support'
               'java-environment: for Java support'
               'lksctp-tools: for SCTP support')