Major update to scribus 1.4.1, switches from qt3 to qt4.

Based on a diff from Jiri B on ports@.
This commit is contained in:
landry 2012-05-28 12:32:04 +00:00
parent 91fd0336d0
commit cba6867b0c
11 changed files with 1828 additions and 615 deletions

View File

@ -1,86 +1,65 @@
# $OpenBSD: Makefile,v 1.41 2012/02/21 16:21:42 ajacoutot Exp $
# $OpenBSD: Makefile,v 1.42 2012/05/28 12:32:04 landry Exp $
SHARED_ONLY= Yes
COMMENT= DTP program
DISTNAME= scribus-1.3.4
REVISION= 17
DISTNAME= scribus-1.4.1
CATEGORIES= print
# These are actually internal modules, not generic shared libs
SHARED_LIBS= scribus12format 0.0 \
scribus134format 0.0 \
scribus13format 0.0
HOMEPAGE= http://www.scribus.net/
# GPLv2+
PERMIT_PACKAGE_CDROM?= Yes
PERMIT_PACKAGE_FTP?= Yes
PERMIT_DISTFILES_CDROM?=Yes
PERMIT_DISTFILES_FTP?= Yes
PERMIT_PACKAGE_CDROM= Yes
PERMIT_PACKAGE_FTP= Yes
PERMIT_DISTFILES_CDROM=Yes
PERMIT_DISTFILES_FTP= Yes
WANTLIB += ICE SM X11 Xau Xdmcp Xext asn1 c crypto expat fontconfig
WANTLIB += freetype gssapi krb5 m pthread pthread-stubs ssl stdc++
WANTLIB += util xcb z jpeg lcms art_lgpl_2 png tiff cups xml2
WANTLIB += ${MODPY_WANTLIB}
WANTLIB += QtGui QtNetwork QtXml aspell c cairo cups execinfo
WANTLIB += fontconfig freetype jpeg lcms2 m pthread python2.7 stdc++
WANTLIB += tiff util xml2 z ${MODPY_WANTLIB}
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=scribus/}
EXTRACT_SUFX= .tar.bz2
MODULES= x11/qt3 \
converters/libiconv \
MODULES= x11/qt4 \
devel/cmake \
lang/python
MODPY_VERSION= 2.7
MODPY_RUNDEP= No
RUN_DEPENDS= misc/shared-mime-info \
devel/desktop-file-utils
LIB_DEPENDS= graphics/jpeg \
graphics/lcms \
graphics/libart \
graphics/png \
devel/desktop-file-utils \
${MODPY_TKINTER_DEPENDS} \
textproc/antiword \
print/ghostscript/gnu \
graphics/py-Imaging
LIB_DEPENDS= graphics/jpeg \
graphics/lcms2 \
graphics/tiff \
${MODPY_LIB_DEPENDS} \
print/cups>=1.5 \
textproc/libxml
USE_GMAKE= Yes
USE_LIBTOOL= Yes
USE_GROFF = Yes
CONFIGURE_STYLE=autoconf
AUTOCONF_VERSION=2.60
CONFIGURE_ARGS= ${MODQT_CONFIGURE_ARGS} \
--with-extra-libs=${LOCALBASE}/lib \
--with-extra-includes=${LOCALBASE}/include/libpng:${LOCALBASE}/include
CONFIGURE_ENV+= UIC_PATH=${MODQT_UIC} \
CPPFLAGS='-I${MODQT_INCDIR} -I${LOCALBASE}/include/libpng \
-I${LOCALBASE}/include' LDFLAGS='-L${MODQT_LIBDIR} \
-L${LOCALBASE}/lib'
print/cups \
textproc/libxml \
textproc/aspell/core \
devel/libexecinfo
FLAVORS= debug
FLAVOR?=
WRKDIST= ${WRKDIR}/Scribus
CONFIGURE_ARGS += -DCMAKE_SKIP_RPATH:BOOL=1 \
-DCMAKE_CXX_FLAGS="${CXXFLAGS}" \
-DCMAKE_C_FLAGS="${CFLAGS}"
.if ${FLAVOR:L:Mdebug}
CONFIGURE_ARGS+=--enable-debug=Yes
CFLAGS+=-g
CXXFLAGS+=-g
CONFIGURE_ARGS+=-DWANT_DEBUG=1
.endif
PLUGINS=about charselect csvim fontpreview htmlim importps \
newfromtemplateplugin odtimplugin oodrawimp pdf postscript preferences \
preview saveastemplateplugin scribusexportpixmap scribusshortwords \
scriptplugin svgexplugin svgimplugin sxwimplugin textfilterplugin \
txtim barcodegenerator colorwheel docim oldscribusformat pdbim
.for _n in ${PLUGINS}
MAKE_FLAGS+= lib${_n}_la_LDFLAGS='-module -avoid-version'
.endfor
post-install:
rm -rf ${WRKINST}/usr/local/share/doc/scribus
mv ${WRKINST}/usr/local/share/doc/${DISTNAME} \
${WRKINST}/usr/local/share/doc/scribus
@${INSTALL_DATA_DIR} ${PREFIX}/share/applications
@${INSTALL_DATA} ${WRKSRC}/scribus.desktop ${PREFIX}/share/applications
@${INSTALL_DATA} ${WRKSRC}/scribus.desktop \
${PREFIX}/share/applications/scribus.desktop
.include <bsd.port.mk>

View File

@ -1,5 +1,5 @@
MD5 (scribus-1.3.4.tar.bz2) = zTvGzGwuKCbraJNC5DlEPQ==
RMD160 (scribus-1.3.4.tar.bz2) = ZPGVReGj3iR5SNjxNtBYz4Nlqus=
SHA1 (scribus-1.3.4.tar.bz2) = bp1sEiAlAbfIS8OGveKggvGmK5s=
SHA256 (scribus-1.3.4.tar.bz2) = qXa+j33ZqZDQPYzHJiC1A0CAP7T8okEyVD2Tf1bQiec=
SIZE (scribus-1.3.4.tar.bz2) = 14798993
MD5 (scribus-1.4.1.tar.bz2) = qmt0UowpUVOrO9qIyGug1g==
RMD160 (scribus-1.4.1.tar.bz2) = etqiTbhzMVu5WN4BZJI5TvtxMDE=
SHA1 (scribus-1.4.1.tar.bz2) = fgwBIu1Vfr9PhWkODmk5I2cYutI=
SHA256 (scribus-1.4.1.tar.bz2) = 82A8od5scPSmorCVcVk1gdTlqu2GO2xZhuN6OiRpgBs=
SIZE (scribus-1.4.1.tar.bz2) = 68006491

View File

@ -0,0 +1,21 @@
$OpenBSD: patch-CMakeLists_txt,v 1.1 2012/05/28 12:32:04 landry Exp $
--- CMakeLists.txt.orig Sun May 6 22:39:38 2012
+++ CMakeLists.txt Sun May 6 22:40:11 2012
@@ -251,7 +251,7 @@ ENDIF (APPLEBUNDLE)
#Setp all the directories we will use
#MAN
CMAKE_POLICY(SET CMP0005 OLD)
-SET(MANDIR "share/man/")
+SET(MANDIR "man/")
IF(WANT_VERSIONING)
SET(SHAREDIR "share/${MAIN_DIR_NAME}${TAG_VERSION}/")
ELSE(WANT_VERSIONING)
@@ -322,7 +322,7 @@ IF(WANT_LIB64)
ENDIF(NOT ARCH_X86_64)
SET(LIB_SUFFIX "64" CACHE TYPE STRING)
ENDIF(WANT_LIB64)
-SET(LIB_DIR_NAME "lib${LIB_SUFFIX}")
+SET(LIB_DIR_NAME "lib")
SET(LIBDIR "${LIB_DIR_NAME}/${MAIN_DIR_NAME}${TAG_VERSION}/")
ADD_DEFINITIONS("-DLIBDIR=\\\"${CMAKE_INSTALL_PREFIX}/${LIBDIR}\\\"")

View File

@ -1,24 +0,0 @@
$OpenBSD: patch-acinclude_m4,v 1.2 2011/06/22 13:50:43 sthen Exp $
--- acinclude.m4.orig Sun May 27 22:05:55 2007
+++ acinclude.m4 Wed Jun 22 14:43:58 2011
@@ -4182,8 +4182,9 @@ fi
AC_DEFUN([KDE_CHECK_PYTHON],
-[
- KDE_CHECK_PYTHON_INTERN("2.5",
+[KDE_CHECK_PYTHON_INTERN("2.7",
+[KDE_CHECK_PYTHON_INTERN("2.6",
+[KDE_CHECK_PYTHON_INTERN("2.5",
[KDE_CHECK_PYTHON_INTERN("2.4",
[KDE_CHECK_PYTHON_INTERN("2.3",
[KDE_CHECK_PYTHON_INTERN("2.2",
@@ -4195,6 +4196,8 @@ AC_DEFUN([KDE_CHECK_PYTHON],
])
])
])
+ ])
+])
])
AC_DEFUN([KDE_CHECK_STL],

View File

@ -1,36 +0,0 @@
$OpenBSD: patch-configure_in,v 1.1 2009/08/12 21:03:56 sthen Exp $
--- configure.in.orig Sun May 27 22:05:57 2007
+++ configure.in Mon Aug 10 21:35:43 2009
@@ -445,7 +445,7 @@ hastif=
dnl Check if we have libtiff
SAVE_LDFLAGS="$LDFLAGS"
LDFLAGS="$all_libraries $LDFLAGS"
-AC_CHECK_LIB(tiff, TIFFOpen, [LIBTIFF="-ltiff";hastif=yes],[LIBTIFF="";hastif=no],[-lm])
+AC_CHECK_LIB(tiff, TIFFOpen, [LIBTIFF="-ltiff";hastif=yes],[LIBTIFF="";hastif=no],[-lm -ljpeg -lz -lm])
LDFLAGS="$SAVE_LDFLAGS"
if test $hastif = yes; then
dnl Check for tiffvers.h
@@ -550,9 +550,9 @@ else
GS_VER_MAJOR=`gs --version | cut -d . -f 1`
GS_VER_MINOR=`gs --version | cut -d . -f 2`
AC_MSG_RESULT([${GS_VER_MAJOR}.${GS_VER_MINOR}])
- if (( "${GS_VER_MAJOR}" < 7 )) ; then
+ if test "${GS_VER_MAJOR}" -lt 7 ; then
AC_MSG_WARN("GhostScript found, but older than v7. v8 recommended.")
- elif (( "${GS_VER_MAJOR}" < 8 )) ; then
+ elif test "${GS_VER_MAJOR}" -lt 8 ; then
AC_MSG_WARN("GhostScript v7 found. v8 recommended.")
fi
fi
@@ -873,9 +873,9 @@ if test -z "${GS_PATH}" ; then
echo "***GhostScript could not be found. See README.***"
else
echo "GhostScript ${GS_VER_MAJOR}.${GS_VER_MINOR} was found at ${GS_PATH}"
- if (( "${GS_VER_MAJOR}" < 7 )) ; then
+ if test "${GS_VER_MAJOR}" -lt 7 ; then
echo " *** GhostScript versions older than 7 MAY NOT WORK; v8 recommended ***"
- elif (( "${GS_VER_MAJOR}" < 8 )) ; then
+ elif test "${GS_VER_MAJOR}" -lt 8 ; then
echo " *** GhostScript 8 is STRONGLY recommended ***"
fi
fi

View File

@ -1,12 +0,0 @@
$OpenBSD: patch-scribus_Makefile_in,v 1.3 2007/08/25 20:16:32 mbalmer Exp $
--- scribus/Makefile.in.orig Sun May 27 23:09:23 2007
+++ scribus/Makefile.in Sun Aug 19 18:18:08 2007
@@ -1134,7 +1134,7 @@ DISTCLEANFILES = $(scribus_METASOURCES)
# this is to enable Qt behavoir of am_edit
KDE_OPTIONS = qtonly
AM_CPPFLAGS = \
- -DDOCDIR=\"$(datadir)/doc/scribus-$(VERSION)/\" \
+ -DDOCDIR=\"$(datadir)/doc/scribus/\" \
-DICONDIR=\"$(datadir)/scribus/icons/\" \
-DSAMPLESDIR=\"$(datadir)/scribus/samples/\" \
-DSCRIPTSDIR=\"$(datadir)/scribus/scripts/\" \

View File

@ -1,14 +0,0 @@
$OpenBSD: patch-scribus_cupsoptions_cpp,v 1.1 2011/09/08 10:34:25 ajacoutot Exp $
Fix build fix cups >=1.5.
--- scribus/cupsoptions.cpp.orig Fri May 4 10:25:19 2007
+++ scribus/cupsoptions.cpp Thu Sep 8 11:09:08 2011
@@ -33,6 +33,7 @@ for which a new license (GPL+exception) is in place.
#include <qstringlist.h>
#ifdef HAVE_CUPS
#include <cups/cups.h>
+#include <cups/ppd.h>
#endif
#include <qtooltip.h>
extern QPixmap loadIcon(QString nam);

View File

@ -1,12 +0,0 @@
$OpenBSD: patch-scribus_pluginmanager_cpp,v 1.1 2007/08/25 20:16:32 mbalmer Exp $
--- scribus/pluginmanager.cpp.orig Sun Feb 11 16:59:26 2007
+++ scribus/pluginmanager.cpp Thu Aug 23 23:45:43 2007
@@ -179,7 +179,7 @@ void PluginManager::initPlugs()
psimp before barcode.You know, security by obscurity ;) PV */
QDir dirList(ScPaths::instance().pluginDir(),
libPattern, QDir::Name | QDir::Reversed,
- QDir::Files | QDir::Executable | QDir::NoSymLinks);
+ QDir::Files | QDir::Readable | QDir::NoSymLinks);
if ((!dirList.exists()) || (dirList.count() == 0))
return;

View File

@ -1,14 +0,0 @@
$OpenBSD: patch-scribus_printerutil_cpp,v 1.1 2011/09/08 10:34:25 ajacoutot Exp $
Fix build fix cups >=1.5.
--- scribus/printerutil.cpp.orig Thu Sep 8 11:26:43 2011
+++ scribus/printerutil.cpp Thu Sep 8 11:26:54 2011
@@ -9,6 +9,7 @@ for which a new license (GPL+exception) is in place.
#if defined( HAVE_CUPS )
#include <cups/cups.h>
+ #include <cups/ppd.h>
#elif defined(_WIN32)
#include <windows.h>
#include <winspool.h>

View File

@ -1 +1,6 @@
Desktop publishing
Scribus is an Open Source desktop publishing suite that brings
professional page layout to desktops with a combination of press-ready
output and new approaches to page design.
Underneath a modern and user-friendly interface, Scribus supports
professional publishing features, such as color separations, CMYK and
Spot Color support, ICC color management, and versatile PDF creation.

File diff suppressed because it is too large Load Diff