From eef727303c8e4a5eb00da759f45c5f0b8410c1b5 Mon Sep 17 00:00:00 2001 From: Niels Horn Date: Fri, 14 Sep 2012 11:48:15 -0300 Subject: [PATCH] libraries/gl2ps: Updated for version 1.3.7 (+gcc-4.7 fix) Signed-off-by: Niels Horn --- libraries/gl2ps/gl2ps.SlackBuild | 10 ++++------ libraries/gl2ps/gl2ps.info | 6 +++--- libraries/gl2ps/gl2ps_libsuffix.patch | 11 ----------- 3 files changed, 7 insertions(+), 20 deletions(-) delete mode 100644 libraries/gl2ps/gl2ps_libsuffix.patch diff --git a/libraries/gl2ps/gl2ps.SlackBuild b/libraries/gl2ps/gl2ps.SlackBuild index 386cc4c948..33c1192880 100644 --- a/libraries/gl2ps/gl2ps.SlackBuild +++ b/libraries/gl2ps/gl2ps.SlackBuild @@ -2,7 +2,7 @@ # Slackware build script for gl2ps -# Copyright 2011 Niels Horn, Rio de Janeiro, RJ, Brazil +# Copyright 2011-2012 Niels Horn, Rio de Janeiro, RJ, Brazil # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -22,10 +22,10 @@ # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -# revision date 2011/08/10 +# revision date 2012/09/14 PRGNAM=gl2ps -VERSION=${VERSION:-1.3.5} +VERSION=${VERSION:-1.3.7} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -71,13 +71,11 @@ find . \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ -exec chmod 644 {} \; -# Patch CMakeLists.txt to accept -DLIB_SUFFIX -patch -p1 <$CWD/gl2ps_libsuffix.patch - mkdir -p build cd build cmake \ -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \ + -DCMAKE_EXE_LINKER_FLAGS:STRING="-lm" \ -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \ -DCMAKE_INSTALL_PREFIX=/usr \ -DCMAKE_VERBOSE_MAKEFILE:BOOL=ON \ diff --git a/libraries/gl2ps/gl2ps.info b/libraries/gl2ps/gl2ps.info index ecd344c8a7..a94eaeb5ad 100644 --- a/libraries/gl2ps/gl2ps.info +++ b/libraries/gl2ps/gl2ps.info @@ -1,8 +1,8 @@ PRGNAM="gl2ps" -VERSION="1.3.5" +VERSION="1.3.7" HOMEPAGE="http://geuz.org/gl2ps/" -DOWNLOAD="http://geuz.org/gl2ps/src/gl2ps-1.3.5.tgz" -MD5SUM="22e51ff57ecd35cb1cc22497a178a017" +DOWNLOAD="http://geuz.org/gl2ps/src/gl2ps-1.3.7.tgz" +MD5SUM="3b8da8a24fa4eceb6fe229326c8fe08f" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" diff --git a/libraries/gl2ps/gl2ps_libsuffix.patch b/libraries/gl2ps/gl2ps_libsuffix.patch deleted file mode 100644 index 4758e5c7e6..0000000000 --- a/libraries/gl2ps/gl2ps_libsuffix.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- gl2ps-1.3.5-source/CMakeLists.txt 2009-10-16 16:14:07.000000000 -0300 -+++ gl2ps-1.3.5-source_patched/CMakeLists.txt 2011-08-10 17:24:43.000000000 -0300 -@@ -113,7 +113,7 @@ - set_target_properties(shared PROPERTIES COMPILE_FLAGS "-DGL2PSDLL -DGL2PSDLL_EXPORTS") - endif(MSVC) - -- install(TARGETS lib shared DESTINATION lib) -+ install(TARGETS lib shared DESTINATION lib${LIB_SUFFIX}) - endif(OPENGL_FOUND) - - if(WIN32)