From 8775ac6c416e35c75ba11c15250a2e89fa9de22d Mon Sep 17 00:00:00 2001 From: Alejandro Mery Date: Wed, 9 May 2007 01:40:08 +0000 Subject: [PATCH] * updated scribus (1.3.3.7 -> 1.3.3.9) * stl.diff patch disabled temporarily for renew * cmake integration hacked in, needs #326 to be cleaned git-svn-id: svn://svn.opensde.net/opensde/package/trunk@21012 10447126-35f2-4685-b0cf-6dd780d3921f --- graphic/scribus/scribus.conf | 18 ++++++++++++------ graphic/scribus/scribus.desc | 4 ++-- 2 files changed, 14 insertions(+), 8 deletions(-) diff --git a/graphic/scribus/scribus.conf b/graphic/scribus/scribus.conf index 67d1c00d3..3a4093f2f 100644 --- a/graphic/scribus/scribus.conf +++ b/graphic/scribus/scribus.conf @@ -1,8 +1,9 @@ -# --- T2-COPYRIGHT-NOTE-BEGIN --- +# --- SDE-COPYRIGHT-NOTE-BEGIN --- # This copyright note is auto-generated by ./scripts/Create-CopyPatch. # -# T2 SDE: package/.../scribus/scribus.conf +# Filename: package/.../scribus/scribus.conf +# Copyright (C) 2007 The OpenSDE Project # Copyright (C) 2004 - 2006 The T2 SDE Project # Copyright (C) 1998 - 2004 Clifford Wolf # @@ -12,7 +13,7 @@ # it under the terms of the GNU General Public License as published by # the Free Software Foundation; version 2 of the License. A copy of the # GNU General Public License can be found in the file COPYING. -# --- T2-COPYRIGHT-NOTE-END --- +# --- SDE-COPYRIGHT-NOTE-END --- # make sure the right qt and kde libs are used export LD_LIBRARY_PATH="$QTDIR/lib:/$prefix/lib:$LD_LIBRARY_PATH" @@ -23,6 +24,11 @@ confopt="$confopt --with-qt-dir=$QTDIR --with-qt-includes=$QTDIR/include \ [[ $libdir != *lib ]] && var_append confopt " " "--enable-libsuffix=${libdir##*/lib}" -if [ "$SDECFG_PKG_QT_EXCEPTION_STL" = 0 ] ; then - var_append patchfiles " " "$confdir/stl.diff" -fi +# FIXME: stl patch has to be reviewed/adapted +#if [ "$SDECFG_PKG_QT_EXCEPTION_STL" = 0 ] ; then +# var_append patchfiles " " "$confdir/stl.diff" +#fi + +# HACK: this has to be replaced with proper cmake integration +runconf=0 +hook_add preconf 5 "mkdir objdir; cd objdir; cmake ../ -DCMAKE_INSTALL_PREFIX:PATH=$root/$prefix -DFONTCONFIG_INCLUDE_DIR=$root$(pkgprefix includedir fontconfig )" diff --git a/graphic/scribus/scribus.desc b/graphic/scribus/scribus.desc index 71897727a..0df921047 100644 --- a/graphic/scribus/scribus.desc +++ b/graphic/scribus/scribus.desc @@ -30,9 +30,9 @@ [L] GPL [S] Stable -[V] 1.3.3.7 +[V] 1.3.3.9 [P] X -----5---9 216.500 #[D] 249868015 scribus-1.3.3.1.tar.bz2 http://www.scribus.org.uk/downloads/1.3.3.1/ -[D] 4229749439 scribus-1.3.3.7.tar.bz2 http://dl.sourceforge.net/sourceforge/scribus/ +[D] 1586913898 scribus-1.3.3.9.tar.bz2 http://dl.sourceforge.net/sourceforge/scribus/