Date: Monday, August 18, 2014 @ 04:08:38 Author: eric Revision: 117492
upgpkg: electricsheep 2.7b33-19 Rebuild against boost 1.55.0, Remove broken electricsheep-preferences utility Added: electricsheep/trunk/electricsheep-no-wxgtk.patch Modified: electricsheep/trunk/PKGBUILD ------------------------------+ PKGBUILD | 17 +++++---- electricsheep-no-wxgtk.patch | 77 +++++++++++++++++++++++++++++++++++++++++ 2 files changed, 88 insertions(+), 6 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2014-08-18 01:15:48 UTC (rev 117491) +++ PKGBUILD 2014-08-18 02:08:38 UTC (rev 117492) @@ -3,18 +3,20 @@ pkgname=electricsheep pkgver=2.7b33 -pkgrel=18 +pkgrel=19 pkgdesc="A screensaver that realize the collective dream of sleeping computers from all over the internet" arch=('i686' 'x86_64') url="http://community.electricsheep.org/" license=('GPL') -depends=('curl' 'flam3' 'ffmpeg' 'wxgtk' 'lua51' 'libgtop' 'boost-libs' 'freeglut' 'glee') +depends=('curl' 'flam3' 'ffmpeg' 'lua51' 'libgtop' 'boost-libs' 'freeglut' 'glee') makedepends=('boost' 'mesa' 'glu' 'tinyxml') optdepends=('xscreensaver: to use electricsheep with xscreensaver') options=('!emptydirs') -source=(ftp://ftp.archlinux.org/other/community/${pkgname}/${pkgname}-${pkgver}.tar.xz{,.sig}) +source=(ftp://ftp.archlinux.org/other/community/${pkgname}/${pkgname}-${pkgver}.tar.xz{,.sig} + electricsheep-no-wxgtk.patch) sha1sums=('d86607d97accad8519df2a21d67253abe45f5fdd' - 'fda3aae435507d03973f0c4d1ed3509067657f06') + 'SKIP' + 'b186318902dd0abac6e72a81fa374434d7244ac3') # source PKGBUILD && mksource mksource() { @@ -36,6 +38,9 @@ prepare() { cd ${pkgname}-${pkgver} +# Do not build broken electricsheep-preferences + patch -p0 -i "${srcdir}/electricsheep-no-wxgtk.patch" + sed -i -e 's/AM_PROG_CC_STDC/AC_PROG_CC/' configure.ac sed -i '12 i\ #include <cstdio>' Common/Singleton.h @@ -46,8 +51,8 @@ cd ${pkgname}-${pkgver} ./autogen.sh CPPFLAGS+=" -I/usr/include/lua5.1" ./configure --prefix=/usr - sed -i 's|-I /usr/include/libavutil||' MSVC/SettingsGUI/Makefile - make CXXFLAGS+="-DUSE_NEW_FFMPEG_API=1" GLEE_LIBS="-lGLee" + sed -i 's|-I /usr/include/libavutil||' MSVC/SettingsGUI/Makefile + make CXXFLAGS+="-DUSE_NEW_FFMPEG_API=1" GLEE_LIBS="-lGLee" } package() { Added: electricsheep-no-wxgtk.patch =================================================================== --- electricsheep-no-wxgtk.patch (rev 0) +++ electricsheep-no-wxgtk.patch 2014-08-18 02:08:38 UTC (rev 117492) @@ -0,0 +1,77 @@ +--- configure.ac.orig 2014-08-17 17:28:46.314141026 -0400 ++++ configure.ac 2014-08-17 17:29:21.084084594 -0400 +@@ -71,64 +71,7 @@ + + + +-dnl Check for WXWidgets +-WX_VER_291="" + +-AC_PATH_PROG(WX_CONFIG, wx-config, no) +- +-if test x$WX_CONFIG != xno; then +- WX_VERSION=`wx-config --version` +- +- WX_MAJOR=${WX_VERSION%%.*}; +- WX_MINOR=${WX_VERSION#*.}; +- WX_MINOR=${WX_MINOR%%.*}; +- WX_MICRO=${WX_VERSION##*.}; +- +- if test $WX_MAJOR -gt 2; then +- WX_VER_291=yes +- else +- if test $WX_MAJOR -eq 2; then +- if test $WX_MINOR -gt 9; then +- WX_VER_291=yes +- else +- if test $WX_MINOR -eq 9; then +- if test $WX_MICRO -ge 1; then +- WX_VER_291=yes +- fi +- fi +- fi +- fi +- fi +-fi +- +-if test "$WX_VER_291" != "yes"; then +- +-dnl Use static version +-echo "installed version is too old," +-echo "using static source version $reqwx" +- +-dnl Need to reset this, else it will override the value below ! +-WX_CONFIG="" +- +-AC_CHECK_PROG(WX_CONFIG, wx-config, yes, no) +- +-if test $WX_CONFIG = no; then +-echo +-echo YOU CAN FIX THIS ! +-AC_MSG_ERROR([Please install development libraries for wxWidgets 2.9.1 or higher, and then run this configure script again.]) +-fi +-fi +- +-WX_CXXFLAGS="`wx-config --cxxflags`" +-WX_LIBS="-static `wx-config --libs` `wx-config --libs richtext`" +- +-echo "WX_CXXFLAGS is $WX_CXXFLAGS" +-echo "WX_LIBS is $WX_LIBS" +- +-WX_LDADD="$WX_LIBS" +- +-AC_SUBST(WX_CXXFLAGS) +-AC_SUBST(WX_LDADD) + + + +--- MSVC/SettingsGUI/Makefile.am.orig 2014-08-17 20:22:59.680508699 -0400 ++++ MSVC/SettingsGUI/Makefile.am 2014-08-17 20:23:46.397099541 -0400 +@@ -28,7 +28,6 @@ + -I /usr/include/libswscale \ + -I /usr/include/libavutil + +-bin_PROGRAMS = electricsheep-preferences + + electricsheep_preferences_SOURCES = \ + config.cpp \