[arch-commits] Commit in ucblogo/repos/community-x86_64 (4 files)

[Alexander Rødseth]

    Date: Friday, May 14, 2021 @ 16:40:16
  Author: arodseth
Revision: 934253

archrelease: copy trunk to community-x86_64

Added:
  ucblogo/repos/community-x86_64/PKGBUILD
    (from rev 934252, ucblogo/trunk/PKGBUILD)
  ucblogo/repos/community-x86_64/configure.patch
    (from rev 934252, ucblogo/trunk/configure.patch)
Deleted:
  ucblogo/repos/community-x86_64/PKGBUILD
  ucblogo/repos/community-x86_64/logo.sh

-----------------+
 PKGBUILD        |   98 ++++++++++++++++++++----------------------------------
 configure.patch |   20 +++++++++++
 logo.sh         |    7 ---
 3 files changed, 58 insertions(+), 67 deletions(-)

Deleted: PKGBUILD
===================================================================
--- PKGBUILD	2021-05-14 16:40:10 UTC (rev 934252)
+++ PKGBUILD	2021-05-14 16:40:16 UTC (rev 934253)
@@ -1,60 +0,0 @@
-# Maintainer: Alexander F. Rødseth <xyproto at archlinux.org>
-# Contributor: chiku <chirantan.mitra at gmail.com>
-
-pkgname=ucblogo
-pkgver=6.1
-pkgrel=1
-pkgdesc='Interpreter for the Logo programming language'
-url='https://www.cs.berkeley.edu/~bh/logo.html'
-arch=(x86_64)
-license=(GPL)
-makedepends=(setconf svn)
-depends=(libice libsm libx11 ncurses wxgtk3)
-source=("https://www.cs.berkeley.edu/~bh/downloads/$pkgname.tar.gz"
-        'https://people.eecs.berkeley.edu/~bh/logo-sample.html'
-        logo.sh)
-sha256sums=('f35d8faf2dd8c4347ff67816570b20d935c19e4f6acb5301708ef2b81d9f9339'
-            'd3dfeb90e5dd6cae6bc12c8b272e1203a2b2693963670a408d2a190d1ba819ab'
-            'b14dfea1bfc5f04df254e4067d8d6301851d42af6920bdb800fdd8ad4443682b')
-
-prepare() {
-  # Create an example logo file, to be placed in /usr/share/doc/ucblogo
-  echo '#!/usr/bin/env logo' > "$srcdir/sample.logo"
-  head -22 < "$srcdir/logo-sample.html" | grep -v '<' >> "$srcdir/sample.logo"
-}
-
-build() {
-  cd $pkgname-$pkgver
-
-  ./configure --prefix=/usr
-
-  setconf makefile LINKER '$(CXX)'
-
-  # The makefile does not respect CFLAGS, set it manually
-  setconf makefile CFLAGS "$CFLAGS -w -fPIC -pthread"
-  setconf makefile CXXFLAGS "$CXXFLAGS -w -fPIC -D_FILE_OFFSET_BITS=64 -D_LARGE_FILES -pthread"
-
-  make
-
-  # Cleanup
-  rm -rf $pkgname-$pkgver/csls/CVS
-}
-
-package() {
-  make -C $pkgname-$pkgver \
-    INFODIR="$pkgdir/usr/share/info" \
-    prefix="$pkgdir/usr" \
-    install
-
-  # Package executable and wrapper script
-  mv "$pkgdir/usr/bin/logo" "$pkgdir/usr/bin/logo.elf"
-  install -Dm755 logo.sh "$pkgdir/usr/bin/logo"
-
-  # Package documentation
-  install -d "$pkgdir/usr/share/doc"
-  mv "$pkgdir/usr/lib/logo/docs" "$pkgdir/usr/share/doc/$pkgname"
-  rm "$pkgdir/usr/share/doc/$pkgname/usermanual.ps"
-  install -Dm755 sample.logo "$pkgdir/usr/share/doc/$pkgname/sample.logo"
-}
-
-# vim: ts=2 sw=2 et:

Copied: ucblogo/repos/community-x86_64/PKGBUILD (from rev 934252, ucblogo/trunk/PKGBUILD)
===================================================================
--- PKGBUILD	                        (rev 0)
+++ PKGBUILD	2021-05-14 16:40:16 UTC (rev 934253)
@@ -0,0 +1,38 @@
+# Maintainer: Alexander F. Rødseth <xyproto at archlinux.org>
+# Contributor: chiku <chirantan.mitra at gmail.com>
+
+pkgname=ucblogo
+pkgver=6.2.1
+pkgrel=1
+pkgdesc='Interpreter for the Logo programming language'
+url='https://www.cs.berkeley.edu/~bh/logo.html'
+arch=(x86_64)
+license=(GPL)
+makedepends=(git texinfo texlive-bin texlive-core)
+depends=(libice libsm libx11 ncurses wxgtk3)
+source=(configure.patch
+        "$pkgname::git+https://github.com/jrincayc/ucblogo-code#commit=e023b8fcadc2e1b35a37b911250b251e0ec1da0b") # tag: version_6.2.1
+b2sums=('609a8a2304d6867a83a581dfa8065c05c6847c0983a29fce39efdfc18cfecfeca54989937f472c4339b2bc7fa4bce51951083d2d48b33614bf751dc67abd0e61'
+        'SKIP')
+
+prepare() {
+  cd $pkgname
+  patch -p1 -i ../configure.patch
+  autoreconf -i
+}
+
+build() {
+  cd $pkgname
+  ./configure \
+    --enable-docs \
+    --prefix=/usr \
+    --with-wx-config=/usr/bin/wx-config-gtk3
+  make
+}
+
+package() {
+  make -C $pkgname \
+    DESTDIR="$pkgdir" \
+    INFODIR="$pkgdir/usr/share/info" \
+    install
+}

Copied: ucblogo/repos/community-x86_64/configure.patch (from rev 934252, ucblogo/trunk/configure.patch)
===================================================================
--- configure.patch	                        (rev 0)
+++ configure.patch	2021-05-14 16:40:16 UTC (rev 934253)
@@ -0,0 +1,20 @@
+--- a/configure.ac	2021-05-14 16:58:39.897389483 +0200
++++ b/configure.ac	2021-05-14 16:58:51.890750976 +0200
+@@ -72,17 +72,6 @@
+ AC_MSG_RESULT([$enable_docs])
+ AM_CONDITIONAL([DOCS], [test x${enable_docs} = xyes])
+
+-dnl Enable Compiler Warnings
+-AX_CFLAGS_WARN_ALL
+-dnl Disable a warning with many false positives; perhaps rethink later
+-AX_CHECK_COMPILE_FLAG([-Wno-write-strings],
+-[CFLAGS="$CFLAGS -Wno-write-strings"
+-CXXFLAGS="$CXXFLAGS -Wno-write-strings"])
+-dnl Disable voluminous cloud of rather harmless warnings
+-AX_CHECK_COMPILE_FLAG([-Wno-unused-variable],
+-[CFLAGS="$CFLAGS -Wno-unused-variable"
+-CXXFLAGS="$CXXFLAGS -Wno-unused-variable"])
+-
+ dnl Checks for libraries.
+ AC_SEARCH_LIBS(sqrt,[m])
+ AC_SEARCH_LIBS(atan,[m])

Deleted: logo.sh
===================================================================
--- logo.sh	2021-05-14 16:40:10 UTC (rev 934252)
+++ logo.sh	2021-05-14 16:40:16 UTC (rev 934253)
@@ -1,7 +0,0 @@
-#!/bin/sh
-export LOGOLIB=/usr/lib/logo/logolib
-if [[ -f "$1" ]]; then
-  /usr/bin/logo.elf "$*" < "$1" | head -n-2
-else
-  /usr/bin/logo.elf "$@"
-fi