From 7d7ef4b6a3d3becdbf91353f291c1a24750c14f4 Mon Sep 17 00:00:00 2001 From: David Spencer Date: Tue, 29 Dec 2015 16:02:54 +0000 Subject: development/ucblogo: Fixed build with gcc-5.3.0. Moved /usr/lib/logo to /usr/share/logo. Signed-off-by: David Spencer Signed-off-by: Willy Sudiarto Raharjo --- development/ucblogo/01-makefiles.patch | 106 --------------------- .../ucblogo-6.0-include-math.h-earlier.patch | 34 +++++++ development/ucblogo/ucblogo.SlackBuild | 12 ++- 3 files changed, 42 insertions(+), 110 deletions(-) create mode 100644 development/ucblogo/ucblogo-6.0-include-math.h-earlier.patch diff --git a/development/ucblogo/01-makefiles.patch b/development/ucblogo/01-makefiles.patch index 5827abf49c..a50f032da7 100644 --- a/development/ucblogo/01-makefiles.patch +++ b/development/ucblogo/01-makefiles.patch @@ -23,112 +23,6 @@ diff -Nur ucblogo-6.0/docs/makefile ucblogo-6.0.new/docs/makefile -cp -f html/*.html $(HTMLDIR)/. -cp -f usermanual.ps $(DOCSDIR)/. -cp -f usermanual.pdf $(DOCSDIR)/. -diff -Nur ucblogo-6.0/makefile ucblogo-6.0.new/makefile ---- ucblogo-6.0/makefile 2008-09-13 23:21:18.000000000 +0200 -+++ ucblogo-6.0.new/makefile 1970-01-01 01:00:00.000000000 +0100 -@@ -1,102 +0,0 @@ --CC = gcc --CFLAGS = -g -O -DHAVE_WX -O0 --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 --prefix = /usr/local --BINDIR = $(prefix)/bin --LIBLOC = $(prefix)/lib/logo --LINKER = $(CXX) -- --# 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 -- --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 -- --HDRS = globals.h logo.h xgraphics.h -- --logo: $(OBJS) -- $(LINKER) $(CFLAGS) $(LDFLAGS) $(OBJS) $(LIBS) -o logo -- --everything: logo logolib/Messages helpfiles helpfiles/HELPCONTENTS --#logo-mode -- --mem.o: mem.c -- $(CC) $(CFLAGS) -O0 -c mem.c -- --svn.c: $(SRCS) -- echo 'char* SVN = "('`svnversion|tr -d '\r'`')";' > svn.c -- --tags: $(SRCS) -- ctags --format=1 -N $(SRCS) $(HDRS) --# ctags -t $(SRCS) $(HDRS) -- --libloc.c: -- echo 'char *libloc="'$(LIBLOC)'/logolib";' > libloc.c -- echo 'char *helploc="'$(LIBLOC)'/helpfiles";' >> libloc.c -- echo 'char *cslsloc="'$(LIBLOC)'/csls";' >> libloc.c -- echo 'char *temploc="/tmp";' >> libloc.c -- echo 'char *separator="/";' >> libloc.c -- --logolib/Messages: makelib Messages -- chmod +x makelib -- ./makelib -- cp -f Messages logolib -- --helpfiles: -- mkdir helpfiles -- --helpfiles/HELPCONTENTS: makehelp usermanual -- ./makehelp -- sort helptemp | pr -5 -t -l999 -w80 >> helpfiles/HELPCONTENTS -- rm helptemp -- --makehelp: makehelp.c -- $(CC) -o makehelp makehelp.c -- --clean: -- rm -f *.o libloc.c --# cd emacs; $(MAKE) clean -- --ship: -- rm -f config.h config.cache config.log config.status -- rm -f makefile makehelp logo *.o libloc.c --# cd emacs; $(MAKE) ship -- cd docs; $(MAKE) ship -- --install: all -- 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/. -- cp -f helpfiles/* $(LIBLOC)/helpfiles/. -- cp -f csls/* $(LIBLOC)/csls/. --# (cd emacs; prefix=$(prefix) LIBLOC=$(LIBLOC) BINDIR=$(BINDIR) $(MAKE) install) -- (cd docs; prefix=$(prefix) LIBLOC=$(LIBLOC) BINDIR=$(BINDIR) $(MAKE) install) --# prefix=$(prefix); LIBLOC=$(LIBLOC); BINDIR=$(BINDIR); export prefix LIBLOC BINDIR; cd emacs; $(MAKE) install -- --logo-mode: --# (cd emacs; prefix=$(prefix) LIBLOC=$(LIBLOC) BINDIR=$(BINDIR) $(MAKE)) --# @prefix=$(prefix); LIBLOC=$(LIBLOC); BINDIR=$(BINDIR); export prefix LIBLOC BINDIR; cd emacs; $(MAKE) -- --make-docs: -- (cd docs; prefix=$(prefix) LIBLOC=$(LIBLOC) $(MAKE) all) -- --mac: all -- mkdir -p UCBLogo.app -- mkdir -p UCBLogo.app/Contents -- cp Info.plist UCBLogo.app/Contents/ -- cp PkgInfo UCBLogo.app/Contents/ -- cp pbdevelopment.plist UCBLogo.app/Contents/ -- mkdir -p UCBLogo.app/Contents/Resources -- cp csls/[a-z]* UCBLogo.app/Contents/Resources/csls -- cp -r helpfiles UCBLogo.app/Contents/Resources/ -- cp -r logolib UCBLogo.app/Contents/Resources/ -- cp logo.icns UCBLogo.app/Contents/Resources/ -- mkdir -p UCBLogo.app/Contents/MacOS/ -- cp logo UCBLogo.app/Contents/MacOS/UCBLogo diff -Nur ucblogo-6.0/makefile.in ucblogo-6.0.new/makefile.in --- ucblogo-6.0/makefile.in 2008-09-14 01:27:17.000000000 +0200 +++ ucblogo-6.0.new/makefile.in 2014-12-19 00:46:50.621593132 +0100 diff --git a/development/ucblogo/ucblogo-6.0-include-math.h-earlier.patch b/development/ucblogo/ucblogo-6.0-include-math.h-earlier.patch new file mode 100644 index 0000000000..47e6efb567 --- /dev/null +++ b/development/ucblogo/ucblogo-6.0-include-math.h-earlier.patch @@ -0,0 +1,34 @@ +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 ++ + #define WANT_EVAL_REGS 1 + #include "logo.h" + #include "globals.h" +-#include + #ifdef HAVE_UNISTD_H + #include + #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 + #endif /* WIN32 */ +- ++ ++#include ++ + #define WANT_EVAL_REGS 1 + #include "logo.h" + /* #include "globals.h" has been moved further down */ +-#include + + #ifdef HAVE_WX + #include "wxGraphics.h" diff --git a/development/ucblogo/ucblogo.SlackBuild b/development/ucblogo/ucblogo.SlackBuild index 0b5ebb94bb..070539b9c8 100644 --- a/development/ucblogo/ucblogo.SlackBuild +++ b/development/ucblogo/ucblogo.SlackBuild @@ -43,7 +43,6 @@ mkdir -p $TMP $PKG $OUTPUT cd $TMP rm -rf $PRGNAM-$VERSION tar zxvf $CWD/${PRGNAM}.tar.gz -cat $CWD/01-makefiles.patch | patch -p0 || exit cd $PRGNAM-$VERSION chown -R root:root . find -L . \ @@ -52,17 +51,22 @@ find -L . \ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; +patch -p1 < $CWD/01-makefiles.patch +sed -i -e 's:lib/logo:share/logo:' makefile.in +# Fix build with gcc-5 (thanks to Arch Linux) +patch -p1 < $CWD/ucblogo-6.0-include-math.h-earlier.patch + +CFLAGS="$SLKCFLAGS -std=gnu89" \ ./configure \ --prefix=/usr \ - --libdir=/usr/lib${LIBDIRSUFFIX} \ --sysconfdir=/etc \ --localstatedir=/var \ --mandir=/usr/man \ --with-x \ --build=$ARCH-slackware-linux - make - make install DESTDIR=$PKG +make +make install DESTDIR=$PKG find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \ | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true -- cgit v1.2.3