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

[Alexander Rødseth]

    Date: Sunday, December 20, 2020 @ 16:56:58
  Author: arodseth
Revision: 780551

gtk2 todo

Modified:
  smalltalk/trunk/PKGBUILD

----------+
 PKGBUILD |   58 +++++++++++++++++++++++-----------------------------------
 1 file changed, 23 insertions(+), 35 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2020-12-20 16:17:02 UTC (rev 780550)
+++ PKGBUILD	2020-12-20 16:56:58 UTC (rev 780551)
@@ -5,67 +5,55 @@
 
 pkgname=smalltalk
 pkgver=3.2.91
-pkgrel=8
+pkgrel=9
 pkgdesc='GNU Smalltalk interpreter and libraries'
 url='http://smalltalk.gnu.org/'
-license=('GPL' 'LGPL')
-arch=('x86_64')
-options=('!emptydirs' 'staticlibs')
-depends=('gmp' 'libffi' 'libltdl' 'libsigsegv')
-makedepends=('gdbm' 'git' 'gmp' 'gtk2' 'sqlite' 'tk' 'zip')
-# Use latest commit where "make check" works. Found with git bisect:
+license=(GPL LGPL)
+arch=(x86_64)
+options=('!emptydirs' staticlibs)
+depends=(gmp libffi libltdl libsigsegv)
+makedepends=(gdbm git gmp gtk3 sqlite tk zip)
+# Use latest commit where "make check" works. Found by using "git bisect".
 source=("git://git.sv.gnu.org/smalltalk.git#commit=edb6bad6950c787f4b4c7f8ac5f7047ac1e8b984")
-#source=("git://git.sv.gnu.org/smalltalk.git#tag=$pkgver")
-md5sums=('SKIP')
-optdepends=('tk: for gst-blox'
+sha256sums=('SKIP')
+optdepends=('gtk3: GUI toolkit'
             'sqlite: database in a file'
-            'gtk2: GUI toolkit')
+            'tk: for gst-blox')
 
 prepare() {
-  cd "$pkgname"
-
-  autoreconf -vi
-  sed 's/int yylineno = 1;//g' -i libgst/genpr-scan.l
-  sed 's/int yylineno = 1;//g' -i libgst/genvm-scan.l
-  sed 's/int yylineno = 1;//g' -i libgst/genbc-scan.l
-
+  cd $pkgname
+  autoreconf -iv
+  sed 's/int yylineno = 1;//g' -i libgst/gen{bc,pr,vm}-scan.l
   sed '/XML-Expat/d' -i tests/testsuite.at
 }
 
 build() {
-  cd "$pkgname"
-
-  export CFLAGS="$CFLAGS -w"
-
+  cd $pkgname
+  export CFLAGS="$CFLAGS -Wl,--allow-multiple-definition -w"
   ./configure \
+    --enable-gtk=yes \
+    --libexecdir=/usr/lib/smalltalk \
     --prefix=/usr \
-    --libexecdir=/usr/lib/smalltalk \
     --with-imagedir=/var/lib/smalltalk \
-    --enable-gtk=yes \
     --with-readline \
+    --with-system-libffi \
+    --with-system-libsigsegv \
+    --with-tk \
     --with-tcl \
     --with-x \
-    --without-emacs \
-    --with-tk \
-    --with-system-libffi \
-    --with-system-libsigsegv
-
+    --without-emacs
   echo '#define USE_INTERP_RESULT 1' >> config.h
   make -j1
 }
 
 check() {
-  make -C "$pkgname" check
+  make -C $pkgname check -j1
 }
 
 package() {
-  cd "$pkgname"
-
+  cd $pkgname
   make DESTDIR="$pkgdir" install
-
   # Fix manpage symlink
   rm -f "$pkgdir/usr/share/man/man1/gst-reload.1"
   ln -s gst-load.1 "$pkgdir/usr/share/man/man1/gst-reload.1"
 }
-
-# vim: ts=2 sw=2 et: