[arch-commits] Commit in ucblogo/trunk (7 files)
Alexander Rødseth
arodseth at archlinux.org
Sun Nov 11 11:03:14 UTC 2018
Date: Sunday, November 11, 2018 @ 11:03:14
Author: arodseth
Revision: 406348
upgpkg: ucblogo 6.0-8
Added:
ucblogo/trunk/no-tex.patch
(from rev 406347, ucblogo/trunk/ucblogo-6.0-no-texinfo.patch)
ucblogo/trunk/no-wx.patch
(from rev 406347, ucblogo/trunk/ucblogo-6.0-no-wxWidgets.patch)
Modified:
ucblogo/trunk/PKGBUILD
ucblogo/trunk/logo.sh
Deleted:
ucblogo/trunk/ucblogo-6.0-include-math.h-earlier.patch
ucblogo/trunk/ucblogo-6.0-no-texinfo.patch
ucblogo/trunk/ucblogo-6.0-no-wxWidgets.patch
------------------------------------------+
PKGBUILD | 55 +++++++++++++++--------------
logo.sh | 2 -
no-tex.patch | 12 ++++++
no-wx.patch | 52 +++++++++++++++++++++++++++
ucblogo-6.0-include-math.h-earlier.patch | 34 -----------------
ucblogo-6.0-no-texinfo.patch | 12 ------
ucblogo-6.0-no-wxWidgets.patch | 52 ---------------------------
7 files changed, 95 insertions(+), 124 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2018-11-11 10:56:51 UTC (rev 406347)
+++ PKGBUILD 2018-11-11 11:03:14 UTC (rev 406348)
@@ -1,48 +1,53 @@
-# Maintainer: Alexander F Rødseth <xyproto at archlinux.org>
-# Contributor: chiku <chirantan DOT mitra AT gmail DOT com>
+# Maintainer: Alexander F. Rødseth <xyproto at archlinux.org>
+# Contributor: chiku <chirantan.mitra at gmail.com>
pkgname=ucblogo
pkgver=6.0
-pkgrel=7
-pkgdesc='Portable interpreter for the Logo programming language'
+pkgrel=8
+pkgdesc='Interpreter for the Logo programming language'
url='https://www.cs.berkeley.edu/~bh/logo.html'
arch=('x86_64')
license=('GPL')
-depends=('libx11' 'ncurses' 'bash' 'libsm')
+makedepends=('addinclude' 'setconf')
+depends=('libice' 'libsm' 'libx11' 'ncurses')
source=("https://www.cs.berkeley.edu/~bh/downloads/$pkgname.tar.gz"
- "$pkgname-$pkgver-no-wxWidgets.patch"
- "$pkgname-$pkgver-no-texinfo.patch"
- "$pkgname-$pkgver-include-math.h-earlier.patch"
- 'logo.sh')
+ 'https://people.eecs.berkeley.edu/~bh/logo-sample.html'
+ 'logo.sh'
+ 'no-wx.patch'
+ 'no-tex.patch')
sha256sums=('c659e989e9284efc0f904ebd7de24b559c2d7434a98bb9c92c23e6c11b49cef3'
+ 'd3dfeb90e5dd6cae6bc12c8b272e1203a2b2693963670a408d2a190d1ba819ab'
+ 'b14dfea1bfc5f04df254e4067d8d6301851d42af6920bdb800fdd8ad4443682b'
'e360ac71ac785fa8b00b89ff0c5bf8ed738114013143245d3bc0e62eb7d0333d'
- 'e83fb9d656a9064685cde5ebc0ee36242ac848228380b0567fe683901435707c'
- '1e33b748bdf74550963c4052bf6feab8019cea34afa7b0d4eac71aa60c486583'
- '3dcf0a5472acda2343ff7d4942ff6589149929a50af92b0994fbb0520d2a3849')
+ 'e83fb9d656a9064685cde5ebc0ee36242ac848228380b0567fe683901435707c')
prepare() {
- patch -Np1 -i "$pkgname-$pkgver-no-wxWidgets.patch"
- patch -Np1 -i "$pkgname-$pkgver-no-texinfo.patch"
- patch -Np0 -i "$pkgname-$pkgver-include-math.h-earlier.patch"
+ echo '#!/usr/bin/env logo' >sample.logo
+ head -22 <logo-sample.html | grep -v '<' >>sample.logo
+ cd "$pkgname-$pkgver"
+ patch -Np2 -i ../no-wx.patch
+ patch -Np2 -i ../no-tex.patch
+ addinclude -t coms.c math
+ addinclude -t graphics.c math
+ setconf makefile CFLAGS "$CFLAGS -w -fPIC"
+ setconf svn.c 'char* SVN' '"(1)";'
+ sed -i 's/define HAVE_MATHERR 1/undef HAVE_MATHERR/' config.h
}
build() {
- cd "$pkgname-$pkgver"
-
- make
+ CFLAGS="$CFLAGS -fPIC -w" make -C "$pkgname-$pkgver"
+ rm -rf "$srcdir/$pkgname-$pkgver/csls/CVS"
}
package() {
- cd "$pkgname-$pkgver"
-
- # csls/CVS interferes with make
- rm -r "$srcdir/$pkgname-$pkgver/csls/CVS"
- make prefix="$pkgdir/usr" INFODIR="$pkgdir/usr/share/info" install
+ make -C "$pkgname-$pkgver" INFODIR="$pkgdir/usr/share/info" \
+ prefix="$pkgdir/usr" install
mv "$pkgdir/usr/bin/logo" "$pkgdir/usr/bin/logo.elf"
- install -Dm755 "$srcdir/logo.sh" "$pkgdir/usr/bin/logo"
+ install -Dm755 logo.sh "$pkgdir/usr/bin/logo"
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:set ts=2 sw=2 et:
+# vim: ts=2 sw=2 et:
Modified: logo.sh
===================================================================
--- logo.sh 2018-11-11 10:56:51 UTC (rev 406347)
+++ logo.sh 2018-11-11 11:03:14 UTC (rev 406348)
@@ -1,7 +1,7 @@
#!/bin/sh
export LOGOLIB=/usr/lib/logo/logolib
if [[ -f "$1" ]]; then
- cat "$1" | /usr/bin/logo.elf "$*" | head -n-2
+ /usr/bin/logo.elf "$*" < "$1" | head -n-2
else
/usr/bin/logo.elf "$@"
fi
Copied: ucblogo/trunk/no-tex.patch (from rev 406347, ucblogo/trunk/ucblogo-6.0-no-texinfo.patch)
===================================================================
--- no-tex.patch (rev 0)
+++ no-tex.patch 2018-11-11 11:03:14 UTC (rev 406348)
@@ -0,0 +1,12 @@
+diff -ENwbur ucblogo-6.0-no-wxWidgets/docs/makefile ucblogo-6.0-no-texinfo/docs/makefile
+--- src/ucblogo-6.0/docs/makefile 2013-03-19 07:18:52.000000000 +0530
++++ src/ucblogo-6.0-b/docs/makefile 2013-03-21 06:21:03.000000000 +0530
+@@ -30,7 +30,7 @@
+ ship:
+ -rm -f *.{aux,cp,cps,dvi,fn,ky,log,pg,toc,tp,vr}
+
+-install: all
++install:
+ for d in $(INFODIR) $(DOCSDIR) $(HTMLDIR); do [ -d $$d ] || mkdir -p $$d || exit 1; done
+ -cp -f *.info* $(INFODIR)/.
+ -cp -f html/*.html $(HTMLDIR)/.
Copied: ucblogo/trunk/no-wx.patch (from rev 406347, ucblogo/trunk/ucblogo-6.0-no-wxWidgets.patch)
===================================================================
--- no-wx.patch (rev 0)
+++ no-wx.patch 2018-11-11 11:03:14 UTC (rev 406348)
@@ -0,0 +1,52 @@
+diff -ENwbur ucblogo-6.0/config.h ucblogo-6.0-no-wxWidgets/config.h
+--- src/ucblogo-6.0/config.h 2007-11-27 00:42:40.000000000 +0530
++++ src/ucblogo-6.0-b/config.h 2013-03-19 07:19:15.000000000 +0530
+@@ -74,4 +74,4 @@
+ /* #undef HAVE_LIBTERMLIB */
+
+ /* Define if you have the wx library. */
+-#define HAVE_WX 1
++/* #undef HAVE_WX */
+Binary files ucblogo-6.0/logo and ucblogo-6.0-no-wxWidgets/logo differ
+diff -ENwbur ucblogo-6.0/makefile ucblogo-6.0-no-wxWidgets/makefile
+--- src/ucblogo-6.0/makefile 2008-09-14 02:51:18.000000000 +0530
++++ src/ucblogo-6.0-b/makefile 2013-03-19 07:25:44.000000000 +0530
+@@ -1,23 +1,23 @@
+ CC = gcc
+-CFLAGS = -g -O -DHAVE_WX -O0
++CFLAGS = -g -O2
+ CXX = g++
+-CXXFLAGS = -g -DHAVE_WX -I/usr/local/lib/wx/include/gtk2-ansi-release-static-2.8 -I/usr/local/include/wx-2.8 -D_FILE_OFFSET_BITS=64 -D_LARGE_FILES -D__WXGTK__ -pthread
+ LDFLAGS =
+-LIBS = -lbsd -lm -L/usr/local/lib -pthread /usr/local/lib/libwx_gtk2_richtext-2.8.a /usr/local/lib/libwx_gtk2_aui-2.8.a /usr/local/lib/libwx_gtk2_xrc-2.8.a /usr/local/lib/libwx_gtk2_qa-2.8.a /usr/local/lib/libwx_gtk2_html-2.8.a /usr/local/lib/libwx_gtk2_adv-2.8.a /usr/local/lib/libwx_gtk2_core-2.8.a /usr/local/lib/libwx_base_xml-2.8.a /usr/local/lib/libwx_base_net-2.8.a /usr/local/lib/libwx_base-2.8.a -pthread -L/lib -lgtk-x11-2.0 -lgdk-x11-2.0 -latk-1.0 -lgdk_pixbuf-2.0 -lpango-1.0 -lgobject-2.0 -lgmodule-2.0 -lgthread-2.0 -lrt -lglib-2.0 -lXinerama -lXxf86vm -lSM -lpng -ljpeg -ltiff -lexpat -lz -ldl -lm -ltermcap -lX11
++LIBS = -lSM -lICE -lm -lcurses -lX11
+ prefix = /usr/local
+ BINDIR = $(prefix)/bin
+ LIBLOC = $(prefix)/lib/logo
+-LINKER = $(CXX)
++LINKER = $(CC)
++
+
+ # LIBLOC = `pwd`
+
+ OBJS = coms.o error.o eval.o files.o graphics.o init.o intern.o \
+ libloc.o lists.o logodata.o main.o math.o mem.o paren.o parse.o \
+- print.o wrksp.o nographics.o svn.o wxMain.o wxTerminal.o wxTurtleGraphics.o TextEditor.o wxterm.o
++ print.o wrksp.o nographics.o svn.o term.o xgraphics.o
+
+ SRCS = coms.c error.c eval.c files.c graphics.c init.c intern.c \
+ libloc.c lists.c logodata.c main.c math.c mem.c paren.c parse.c \
+- print.c wrksp.c nographics.c wxMain.cpp wxTerminal.cpp wxTurtleGraphics.cpp TextEditor.cpp wxterm.c
++ print.c wrksp.c nographics.c term.c xgraphics.c
+
+ HDRS = globals.h logo.h xgraphics.h
+
+@@ -70,7 +70,7 @@
+ # cd emacs; $(MAKE) ship
+ cd docs; $(MAKE) ship
+
+-install: all
++install:
+ for d in $(BINDIR) $(LIBLOC) $(LIBLOC)/logolib $(LIBLOC)/helpfiles $(LIBLOC)/csls; do [ -d $$d ] || mkdir -p $$d || exit 1; done
+ cp logo $(BINDIR)/.
+ cp -f logolib/* $(LIBLOC)/logolib/.
Deleted: ucblogo-6.0-include-math.h-earlier.patch
===================================================================
--- ucblogo-6.0-include-math.h-earlier.patch 2018-11-11 10:56:51 UTC (rev 406347)
+++ ucblogo-6.0-include-math.h-earlier.patch 2018-11-11 11:03:14 UTC (rev 406348)
@@ -1,34 +0,0 @@
-diff -upr ucblogo-6.0.orig/coms.c ucblogo-6.0/coms.c
---- ucblogo-6.0.orig/coms.c 2008-08-23 22:51:14.000000000 +0300
-+++ ucblogo-6.0/coms.c 2015-09-09 19:48:45.375415764 +0300
-@@ -24,10 +24,11 @@
- extern int check_wx_stop(int force_yield);
- #endif
-
-+#include <math.h>
-+
- #define WANT_EVAL_REGS 1
- #include "logo.h"
- #include "globals.h"
--#include <math.h>
- #ifdef HAVE_UNISTD_H
- #include <unistd.h>
- #endif
-diff -upr ucblogo-6.0.orig/graphics.c ucblogo-6.0/graphics.c
---- ucblogo-6.0.orig/graphics.c 2008-09-03 20:58:13.000000000 +0300
-+++ ucblogo-6.0/graphics.c 2015-09-09 19:49:04.289294029 +0300
-@@ -22,11 +22,12 @@
- #ifdef WIN32
- #include <windows.h>
- #endif /* WIN32 */
--
-+
-+#include <math.h>
-+
- #define WANT_EVAL_REGS 1
- #include "logo.h"
- /* #include "globals.h" has been moved further down */
--#include <math.h>
-
- #ifdef HAVE_WX
- #include "wxGraphics.h"
Deleted: ucblogo-6.0-no-texinfo.patch
===================================================================
--- ucblogo-6.0-no-texinfo.patch 2018-11-11 10:56:51 UTC (rev 406347)
+++ ucblogo-6.0-no-texinfo.patch 2018-11-11 11:03:14 UTC (rev 406348)
@@ -1,12 +0,0 @@
-diff -ENwbur ucblogo-6.0-no-wxWidgets/docs/makefile ucblogo-6.0-no-texinfo/docs/makefile
---- src/ucblogo-6.0/docs/makefile 2013-03-19 07:18:52.000000000 +0530
-+++ src/ucblogo-6.0-b/docs/makefile 2013-03-21 06:21:03.000000000 +0530
-@@ -30,7 +30,7 @@
- ship:
- -rm -f *.{aux,cp,cps,dvi,fn,ky,log,pg,toc,tp,vr}
-
--install: all
-+install:
- for d in $(INFODIR) $(DOCSDIR) $(HTMLDIR); do [ -d $$d ] || mkdir -p $$d || exit 1; done
- -cp -f *.info* $(INFODIR)/.
- -cp -f html/*.html $(HTMLDIR)/.
Deleted: ucblogo-6.0-no-wxWidgets.patch
===================================================================
--- ucblogo-6.0-no-wxWidgets.patch 2018-11-11 10:56:51 UTC (rev 406347)
+++ ucblogo-6.0-no-wxWidgets.patch 2018-11-11 11:03:14 UTC (rev 406348)
@@ -1,52 +0,0 @@
-diff -ENwbur ucblogo-6.0/config.h ucblogo-6.0-no-wxWidgets/config.h
---- src/ucblogo-6.0/config.h 2007-11-27 00:42:40.000000000 +0530
-+++ src/ucblogo-6.0-b/config.h 2013-03-19 07:19:15.000000000 +0530
-@@ -74,4 +74,4 @@
- /* #undef HAVE_LIBTERMLIB */
-
- /* Define if you have the wx library. */
--#define HAVE_WX 1
-+/* #undef HAVE_WX */
-Binary files ucblogo-6.0/logo and ucblogo-6.0-no-wxWidgets/logo differ
-diff -ENwbur ucblogo-6.0/makefile ucblogo-6.0-no-wxWidgets/makefile
---- src/ucblogo-6.0/makefile 2008-09-14 02:51:18.000000000 +0530
-+++ src/ucblogo-6.0-b/makefile 2013-03-19 07:25:44.000000000 +0530
-@@ -1,23 +1,23 @@
- CC = gcc
--CFLAGS = -g -O -DHAVE_WX -O0
-+CFLAGS = -g -O2
- CXX = g++
--CXXFLAGS = -g -DHAVE_WX -I/usr/local/lib/wx/include/gtk2-ansi-release-static-2.8 -I/usr/local/include/wx-2.8 -D_FILE_OFFSET_BITS=64 -D_LARGE_FILES -D__WXGTK__ -pthread
- LDFLAGS =
--LIBS = -lbsd -lm -L/usr/local/lib -pthread /usr/local/lib/libwx_gtk2_richtext-2.8.a /usr/local/lib/libwx_gtk2_aui-2.8.a /usr/local/lib/libwx_gtk2_xrc-2.8.a /usr/local/lib/libwx_gtk2_qa-2.8.a /usr/local/lib/libwx_gtk2_html-2.8.a /usr/local/lib/libwx_gtk2_adv-2.8.a /usr/local/lib/libwx_gtk2_core-2.8.a /usr/local/lib/libwx_base_xml-2.8.a /usr/local/lib/libwx_base_net-2.8.a /usr/local/lib/libwx_base-2.8.a -pthread -L/lib -lgtk-x11-2.0 -lgdk-x11-2.0 -latk-1.0 -lgdk_pixbuf-2.0 -lpango-1.0 -lgobject-2.0 -lgmodule-2.0 -lgthread-2.0 -lrt -lglib-2.0 -lXinerama -lXxf86vm -lSM -lpng -ljpeg -ltiff -lexpat -lz -ldl -lm -ltermcap -lX11
-+LIBS = -lSM -lICE -lm -lcurses -lX11
- prefix = /usr/local
- BINDIR = $(prefix)/bin
- LIBLOC = $(prefix)/lib/logo
--LINKER = $(CXX)
-+LINKER = $(CC)
-+
-
- # LIBLOC = `pwd`
-
- OBJS = coms.o error.o eval.o files.o graphics.o init.o intern.o \
- libloc.o lists.o logodata.o main.o math.o mem.o paren.o parse.o \
-- print.o wrksp.o nographics.o svn.o wxMain.o wxTerminal.o wxTurtleGraphics.o TextEditor.o wxterm.o
-+ print.o wrksp.o nographics.o svn.o term.o xgraphics.o
-
- SRCS = coms.c error.c eval.c files.c graphics.c init.c intern.c \
- libloc.c lists.c logodata.c main.c math.c mem.c paren.c parse.c \
-- print.c wrksp.c nographics.c wxMain.cpp wxTerminal.cpp wxTurtleGraphics.cpp TextEditor.cpp wxterm.c
-+ print.c wrksp.c nographics.c term.c xgraphics.c
-
- HDRS = globals.h logo.h xgraphics.h
-
-@@ -70,7 +70,7 @@
- # cd emacs; $(MAKE) ship
- cd docs; $(MAKE) ship
-
--install: all
-+install:
- for d in $(BINDIR) $(LIBLOC) $(LIBLOC)/logolib $(LIBLOC)/helpfiles $(LIBLOC)/csls; do [ -d $$d ] || mkdir -p $$d || exit 1; done
- cp logo $(BINDIR)/.
- cp -f logolib/* $(LIBLOC)/logolib/.
More information about the arch-commits
mailing list