From 1574d0ed18dbf63330cf998e4af831a10d065a97 Mon Sep 17 00:00:00 2001 From: Paul Menzel Date: Mon, 29 Oct 2018 12:52:58 +0100 Subject: [PATCH 1/2] xscreensaver: Update version from 5.37 to 5.40 --- xscreensaver.be0 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xscreensaver.be0 b/xscreensaver.be0 index ef6e937cb..677000020 100755 --- a/xscreensaver.be0 +++ b/xscreensaver.be0 @@ -1,6 +1,6 @@ #!/usr/bin/env beesh -# BEE_VERSION xscreensaver-5.37-0 +# BEE_VERSION xscreensaver-5.40-0 ## this file was created by bee init and should be executed to build a ## bee-package. (Additional hints are located at the end of this file.) From 5084b9b13a1046bb5d20e60348de1822c1623ce3 Mon Sep 17 00:00:00 2001 From: Paul Menzel Date: Tue, 30 Oct 2018 11:00:01 +0100 Subject: [PATCH 2/2] xscreensaver: Build in source directory MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit There is a regression between version 5.37 and version 5.40, causing the build to fail when building outside the source directory. ``` $ make -j1 […] make[1]: Leaving directory '/dev/shm/bee-root/xscreensaver/xscreensaver-5.40-0/build/hacks/images' make[1]: Entering directory '/dev/shm/bee-root/xscreensaver/xscreensaver-5.40-0/build/hacks' gcc -pedantic -Wall -Wstrict-prototypes -Wnested-externs -Wmissing-prototypes -Wno-overlength-strings -Wdeclaration-after-statement -std=c89 -U__STRICT_ANSI__ -c -I. -I/dev/shm/bee-root/xscreensaver/xscreensaver-5.40-0/source/hacks -I/dev/shm/bee-root/xscreensaver/xscreensaver-5.40-0/source/hacks/../utils -I.. -pthread -I/usr/include/gtk-2.0 -I/usr/lib/gtk-2.0/include -I/usr/include/atk-1.0 -I/usr/include/cairo -I/usr/include/gdk-pixbuf-2.0 -I/usr/include/pango-1.0 -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -I/usr/include/fribidi -I/usr/include/harfbuzz -I/usr/include/freetype2 -I/usr/include/libpng16 -I/usr/include/pixman-1 -I/usr/include/libxml2 -I/usr/include/libglade-2.0 -pthread -I/usr/include/gdk-pixbuf-2.0 -I/usr/include/libpng16 -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -I/usr/include/freetype2 -I/usr/include/libpng16 -I/usr/include/harfbuzz -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -I/usr/include -DSTANDALONE -DHAVE_CONFIG_H -g -O2 /dev/shm/bee-root/xscreensaver/xscreensaver-5.40-0/source/hacks/attraction.c gcc -pedantic -Wall -Wstrict-prototypes -Wnested-externs -Wmissing-prototypes -Wno-overlength-strings -Wdeclaration-after-statement -std=c89 -U__STRICT_ANSI__ -c -I. -I/dev/shm/bee-root/xscreensaver/xscreensaver-5.40-0/source/hacks -I/dev/shm/bee-root/xscreensaver/xscreensaver-5.40-0/source/hacks/../utils -I.. -pthread -I/usr/include/gtk-2.0 -I/usr/lib/gtk-2.0/include -I/usr/include/atk-1.0 -I/usr/include/cairo -I/usr/include/gdk-pixbuf-2.0 -I/usr/include/pango-1.0 -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -I/usr/include/fribidi -I/usr/include/harfbuzz -I/usr/include/freetype2 -I/usr/include/libpng16 -I/usr/include/pixman-1 -I/usr/include/libxml2 -I/usr/include/libglade-2.0 -pthread -I/usr/include/gdk-pixbuf-2.0 -I/usr/include/libpng16 -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -I/usr/include/freetype2 -I/usr/include/libpng16 -I/usr/include/harfbuzz -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -I/usr/include -DSTANDALONE -DHAVE_CONFIG_H -g -O2 /dev/shm/bee-root/xscreensaver/xscreensaver-5.40-0/source/hacks/screenhack.c gcc -pedantic -Wall -Wstrict-prototypes -Wnested-externs -Wmissing-prototypes -Wno-overlength-strings -Wdeclaration-after-statement -std=c89 -U__STRICT_ANSI__ -c -I. -I/dev/shm/bee-root/xscreensaver/xscreensaver-5.40-0/source/hacks -I/dev/shm/bee-root/xscreensaver/xscreensaver-5.40-0/source/hacks/../utils -I.. -pthread -I/usr/include/gtk-2.0 -I/usr/lib/gtk-2.0/include -I/usr/include/atk-1.0 -I/usr/include/cairo -I/usr/include/gdk-pixbuf-2.0 -I/usr/include/pango-1.0 -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -I/usr/include/fribidi -I/usr/include/harfbuzz -I/usr/include/freetype2 -I/usr/include/libpng16 -I/usr/include/pixman-1 -I/usr/include/libxml2 -I/usr/include/libglade-2.0 -pthread -I/usr/include/gdk-pixbuf-2.0 -I/usr/include/libpng16 -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -I/usr/include/freetype2 -I/usr/include/libpng16 -I/usr/include/harfbuzz -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -I/usr/include -DSTANDALONE -DHAVE_CONFIG_H -g -O2 /dev/shm/bee-root/xscreensaver/xscreensaver-5.40-0/source/hacks/fps.c gcc -pedantic -Wall -Wstrict-prototypes -Wnested-externs -Wmissing-prototypes -Wno-overlength-strings -Wdeclaration-after-statement -std=c89 -U__STRICT_ANSI__ -L/usr/lib -o attraction attraction.o screenhack.o fps.o ../utils/resources.o ../utils/visual.o ../utils/usleep.o ../utils/yarandom.o ../utils/utf8wc.o ../utils/font-retry-xft.o ../utils/hsv.o ../utils/colors.o ../utils/spline.o -lSM -lICE -lXft -lXt -lX11 -lXmu -lXext -lm make[1]: *** No rule to make target '/dev/shm/bee-root/xscreensaver/xscreensaver-5.40-0/source/hacks/images/gen/som_png.h', needed by 'blitspin.o'. Stop. make[1]: Leaving directory '/dev/shm/bee-root/xscreensaver/xscreensaver-5.40-0/build/hacks' make: *** [Makefile:25: default] Error 5 ``` --- xscreensaver.be0 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xscreensaver.be0 b/xscreensaver.be0 index 677000020..817a453aa 100755 --- a/xscreensaver.be0 +++ b/xscreensaver.be0 @@ -28,7 +28,7 @@ SRCURL[0]="https://www.jwz.org/xscreensaver/xscreensaver-${PKGVERSION}.tar.gz" ## outside the source directory and need to be build inside the source ## directory. -# build_in_sourcedir +build_in_sourcedir ############################################################################### ## bee cannot detect buildtypes specified in subdirectories.