update to scribus-1.4.6
kill backtrace_symbols/execinfo use while there
This commit is contained in:
sthen
parent
9c09644f20
commit
93f27fd1d4
@ -1,22 +1,21 @@
|
||||
# $OpenBSD: Makefile,v 1.61 2018/01/04 06:00:50 bentley Exp $
|
||||
# $OpenBSD: Makefile,v 1.62 2018/04/13 20:51:12 sthen Exp $
|
||||
|
||||
COMMENT= desktop publishing program
|
||||
DISTNAME= scribus-1.4.5
|
||||
DISTNAME= scribus-1.4.6
|
||||
CATEGORIES= print
|
||||
REVISION= 1
|
||||
|
||||
HOMEPAGE= https://www.scribus.net/
|
||||
|
||||
# GPLv2+
|
||||
PERMIT_PACKAGE_CDROM= Yes
|
||||
|
||||
WANTLIB += QtGui QtNetwork QtXml c cairo cups execinfo
|
||||
WANTLIB += fontconfig freetype hyphen jpeg lcms2 m podofo pthread
|
||||
WANTLIB += ${COMPILER_LIBCXX} tiff util xml2 z ${MODPY_WANTLIB}
|
||||
WANTLIB += ${COMPILER_LIBCXX} ${MODPY_WANTLIB}
|
||||
WANTLIB += QtGui QtNetwork QtXml c cairo cups fontconfig freetype
|
||||
WANTLIB += hyphen jpeg lcms2 m podofo tiff xml2 z
|
||||
|
||||
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=scribus/}
|
||||
|
||||
EXTRACT_SUFX= .tar.bz2
|
||||
EXTRACT_SUFX= .tar.xz
|
||||
|
||||
MODULES= x11/qt4 \
|
||||
devel/cmake \
|
||||
@ -31,8 +30,7 @@ RUN_DEPENDS= devel/desktop-file-utils \
|
||||
textproc/antiword \
|
||||
misc/shared-mime-info \
|
||||
${MODPY_TKINTER_DEPENDS}
|
||||
LIB_DEPENDS= devel/libexecinfo \
|
||||
graphics/lcms2 \
|
||||
LIB_DEPENDS= graphics/lcms2 \
|
||||
graphics/tiff \
|
||||
print/cups,-libs \
|
||||
textproc/hyphen \
|
||||
@ -46,7 +44,8 @@ FLAVOR?=
|
||||
|
||||
CONFIGURE_ARGS += -DCMAKE_SKIP_RPATH:BOOL=1 \
|
||||
-DCMAKE_CXX_FLAGS="${CXXFLAGS}" \
|
||||
-DCMAKE_C_FLAGS="${CFLAGS}"
|
||||
-DCMAKE_C_FLAGS="${CFLAGS}" \
|
||||
-DMANDIR="${LOCALBASE}/man/"
|
||||
|
||||
.if ${FLAVOR:Mdebug}
|
||||
CONFIGURE_ARGS+=-DWANT_DEBUG=1
|
||||
|
||||
@ -1,2 +1,2 @@
|
||||
SHA256 (scribus-1.4.5.tar.bz2) = n3BvBWHSa7EbvlWGkK4FB802ieOB9uF6qUEdnE71hJg=
|
||||
SIZE (scribus-1.4.5.tar.bz2) = 78251228
|
||||
SHA256 (scribus-1.4.6.tar.xz) = IeM2UA2e3JyQzPcwh+XvPfWew+Sjy/7BU2e82NB4oZo=
|
||||
SIZE (scribus-1.4.6.tar.xz) = 73601104
|
||||
|
||||
@ -1,16 +1,19 @@
|
||||
$OpenBSD: patch-CMakeLists_txt,v 1.2 2016/01/05 11:24:05 landry Exp $
|
||||
--- CMakeLists.txt.orig Mon Jan 5 22:53:23 2015
|
||||
+++ CMakeLists.txt Mon Jan 4 17:08:50 2016
|
||||
@@ -274,7 +274,7 @@ ENDIF (APPLEBUNDLE)
|
||||
$OpenBSD: patch-CMakeLists_txt,v 1.3 2018/04/13 20:51:12 sthen Exp $
|
||||
Index: CMakeLists.txt
|
||||
--- CMakeLists.txt.orig
|
||||
+++ CMakeLists.txt
|
||||
@@ -275,7 +275,9 @@ ENDIF (APPLEBUNDLE)
|
||||
#Setp all the directories we will use
|
||||
#MAN
|
||||
CMAKE_POLICY(SET CMP0005 OLD)
|
||||
-SET(MANDIR "share/man/")
|
||||
+SET(MANDIR "man/")
|
||||
-SET(MANDIR "${CMAKE_INSTALL_DATAROOTDIR}/man/")
|
||||
+IF(!MANDIR)
|
||||
+ SET(MANDIR "${CMAKE_INSTALL_DATAROOTDIR}/man/")
|
||||
+ENDIF(MANDIR)
|
||||
IF(WANT_VERSIONING)
|
||||
SET(SHAREDIR "share/${MAIN_DIR_NAME}${TAG_VERSION}/")
|
||||
SET(SHAREDIR "${CMAKE_INSTALL_DATAROOTDIR}/${MAIN_DIR_NAME}${TAG_VERSION}/")
|
||||
ELSE(WANT_VERSIONING)
|
||||
@@ -345,7 +345,7 @@ IF(WANT_LIB64)
|
||||
@@ -374,7 +376,7 @@ IF(WANT_LIB64)
|
||||
ENDIF(NOT ARCH_X86_64)
|
||||
SET(LIB_SUFFIX "64" CACHE TYPE STRING)
|
||||
ENDIF(WANT_LIB64)
|
||||
|
||||
18
print/scribus/patches/patch-scribus_CMakeLists_txt
Normal file
18
print/scribus/patches/patch-scribus_CMakeLists_txt
Normal file
@ -0,0 +1,18 @@
|
||||
$OpenBSD: patch-scribus_CMakeLists_txt,v 1.1 2018/04/13 20:51:12 sthen Exp $
|
||||
|
||||
Index: scribus/CMakeLists.txt
|
||||
--- scribus/CMakeLists.txt.orig
|
||||
+++ scribus/CMakeLists.txt
|
||||
@@ -791,10 +791,9 @@ IF(UNIX AND NOT CMAKE_SYSTEM_NAME STREQUAL "OpenBSD" A
|
||||
TARGET_LINK_LIBRARIES(${EXE_NAME} dl)
|
||||
ENDIF(UNIX AND NOT CMAKE_SYSTEM_NAME STREQUAL "OpenBSD" AND NOT CMAKE_SYSTEM_NAME STREQUAL "FreeBSD" AND NOT HAIKU)
|
||||
|
||||
-# #9311 for the OpenBSD addition
|
||||
-IF(CMAKE_SYSTEM_NAME STREQUAL "OpenBSD" OR CMAKE_SYSTEM_NAME STREQUAL "FreeBSD")
|
||||
+IF(CMAKE_SYSTEM_NAME STREQUAL "FreeBSD")
|
||||
TARGET_LINK_LIBRARIES(${EXE_NAME} util execinfo)
|
||||
-ENDIF(CMAKE_SYSTEM_NAME STREQUAL "OpenBSD" OR CMAKE_SYSTEM_NAME STREQUAL "FreeBSD")
|
||||
+ENDIF(CMAKE_SYSTEM_NAME STREQUAL "FreeBSD")
|
||||
|
||||
IF(WIN32)
|
||||
TARGET_LINK_LIBRARIES(${EXE_NAME} ${QT_QTMAIN_LIBRARY})
|
||||
15
print/scribus/patches/patch-scribus_util_cpp
Normal file
15
print/scribus/patches/patch-scribus_util_cpp
Normal file
@ -0,0 +1,15 @@
|
||||
$OpenBSD: patch-scribus_util_cpp,v 1.1 2018/04/13 20:51:12 sthen Exp $
|
||||
|
||||
Index: scribus/util.cpp
|
||||
--- scribus/util.cpp.orig
|
||||
+++ scribus/util.cpp
|
||||
@@ -38,7 +38,9 @@ for which a new license (GPL+exception) is in place.
|
||||
#include <signal.h>
|
||||
|
||||
#if !defined(_WIN32) && !defined(Q_OS_MAC) && !defined(Q_OS_HAIKU)
|
||||
+#ifndef __OpenBSD__
|
||||
#include <execinfo.h>
|
||||
+#endif
|
||||
#include <cxxabi.h>
|
||||
#endif
|
||||
#if defined(_WIN32)
|
||||
@ -1,4 +1,4 @@
|
||||
@comment $OpenBSD: PLIST,v 1.15 2016/01/05 11:24:05 landry Exp $
|
||||
@comment $OpenBSD: PLIST,v 1.16 2018/04/13 20:51:12 sthen Exp $
|
||||
@bin bin/scribus
|
||||
include/scribus/
|
||||
include/scribus/KarbonCurveFit.h
|
||||
@ -748,6 +748,7 @@ share/doc/scribus/de/color10.html
|
||||
share/doc/scribus/de/color2.html
|
||||
share/doc/scribus/de/color3.html
|
||||
share/doc/scribus/de/color4.html
|
||||
share/doc/scribus/de/color4a.html
|
||||
share/doc/scribus/de/color5.html
|
||||
share/doc/scribus/de/color6.html
|
||||
share/doc/scribus/de/color7.html
|
||||
@ -943,6 +944,7 @@ share/doc/scribus/de/images/eps-imp4.png
|
||||
share/doc/scribus/de/images/eps-imp5.png
|
||||
share/doc/scribus/de/images/externallink.png
|
||||
share/doc/scribus/de/images/externalweblink.png
|
||||
share/doc/scribus/de/images/faecher_hlc-lab.png
|
||||
share/doc/scribus/de/images/file-error1.png
|
||||
share/doc/scribus/de/images/file-error2.png
|
||||
share/doc/scribus/de/images/file-error3.png
|
||||
@ -1289,6 +1291,7 @@ share/doc/scribus/en/color10.html
|
||||
share/doc/scribus/en/color2.html
|
||||
share/doc/scribus/en/color3.html
|
||||
share/doc/scribus/en/color4.html
|
||||
share/doc/scribus/en/color4a.html
|
||||
share/doc/scribus/en/color5.html
|
||||
share/doc/scribus/en/color6.html
|
||||
share/doc/scribus/en/color7.html
|
||||
@ -1481,6 +1484,7 @@ share/doc/scribus/en/images/eps-imp4.png
|
||||
share/doc/scribus/en/images/eps-imp5.png
|
||||
share/doc/scribus/en/images/externallink.png
|
||||
share/doc/scribus/en/images/externalweblink.png
|
||||
share/doc/scribus/en/images/faecher_hlc-lab.png
|
||||
share/doc/scribus/en/images/file-error1.png
|
||||
share/doc/scribus/en/images/file-error2.png
|
||||
share/doc/scribus/en/images/file-error3.png
|
||||
@ -2996,6 +3000,10 @@ share/scribus/swatches/Baumann System Prase_zd01_4.eps
|
||||
share/scribus/swatches/Bundesregierung_CMYK.xml
|
||||
share/scribus/swatches/Bundesregierung_CMYK_TZ.xml
|
||||
share/scribus/swatches/Bundesregierung_HKS.xml
|
||||
share/scribus/swatches/CIE-HLC_CMYK.xml
|
||||
share/scribus/swatches/CIE-HLC_RGB.xml
|
||||
share/scribus/swatches/CIE-LAB_CMYK.xml
|
||||
share/scribus/swatches/CIE-LAB_RGB.xml
|
||||
share/scribus/swatches/COPYING_RESENE.txt
|
||||
share/scribus/swatches/Classic_Kit.xml
|
||||
share/scribus/swatches/ColorBrewer.xml
|
||||
|
||||
Loading…
Reference in New Issue
Block a user