Sun Dec 15 19:44:02 2013 UTC ()
Disable optimisations for Clang for the Scribus 1.3.4 import filter.


(joerg)
diff -r1.27 -r1.28 pkgsrc/print/scribus-qt4/Makefile
diff -r1.6 -r1.7 pkgsrc/print/scribus-qt4/distinfo
diff -r0 -r1.1 pkgsrc/print/scribus-qt4/patches/patch-scribus_plugins_fileloader_scribus134format_CMakeLists.txt
cvs diff -r1.27 -r1.28 pkgsrc/print/scribus-qt4/Makefile (expand / switch to unified diff)

--- pkgsrc/print/scribus-qt4/Makefile 2013/08/09 11:06:28 1.27
+++ pkgsrc/print/scribus-qt4/Makefile 2013/12/15 19:44:02 1.28
@@ -1,36 +1,41 @@ @@ -1,36 +1,41 @@
1# $NetBSD: Makefile,v 1.27 2013/08/09 11:06:28 drochner Exp $ 1# $NetBSD: Makefile,v 1.28 2013/12/15 19:44:02 joerg Exp $
2 2
3DISTNAME= scribus-1.4.3 3DISTNAME= scribus-1.4.3
4CATEGORIES= print 4CATEGORIES= print
5MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=scribus/} 5MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=scribus/}
6EXTRACT_SUFX= .tar.xz 6EXTRACT_SUFX= .tar.xz
7 7
8MAINTAINER= pkgsrc-users@NetBSD.org 8MAINTAINER= pkgsrc-users@NetBSD.org
9HOMEPAGE= http://www.scribus.net/ 9HOMEPAGE= http://www.scribus.net/
10COMMENT= Publishing layout with graphical interface 10COMMENT= Publishing layout with graphical interface
11 11
12USE_LANGUAGES= c c++ 12USE_LANGUAGES= c c++
13USE_LIBTOOL= YES 13USE_LIBTOOL= YES
14USE_TOOLS+= gmake perl pkg-config 14USE_TOOLS+= gmake perl pkg-config
15PTHREAD_OPTS+= require 15PTHREAD_OPTS+= require
16SHLIBTOOL_OVERRIDE= # empty 16SHLIBTOOL_OVERRIDE= # empty
17USE_CMAKE= yes 17USE_CMAKE= yes
18CMAKE_ARGS+= -DPNG_LIBRARY_RELEASE=${LOCALBASE}/lib 18CMAKE_ARGS+= -DPNG_LIBRARY_RELEASE=${LOCALBASE}/lib
19# XXX not yet 19# XXX not yet
20#CMAKE_ARGS+= -DWANT_HUNSPELL:BOOL=ON 20#CMAKE_ARGS+= -DWANT_HUNSPELL:BOOL=ON
21 21
22INSTALLATION_DIRS+= share/pixmaps 22INSTALLATION_DIRS+= share/pixmaps
23 23
 24.include "../../mk/compiler.mk"
 25.if !empty(PKGSRC_COMPILER:Mclang)
 26CMAKE_ARGS+= -DCLANG_NO_OPT=-O0
 27.endif
 28
24post-install: 29post-install:
25 ${INSTALL_DATA} ${WRKSRC}/resources/icons/scribus.png \ 30 ${INSTALL_DATA} ${WRKSRC}/resources/icons/scribus.png \
26 ${DESTDIR}${PREFIX}/share/pixmaps 31 ${DESTDIR}${PREFIX}/share/pixmaps
27 32
28.include "../../devel/boost-headers/buildlink3.mk" 33.include "../../devel/boost-headers/buildlink3.mk"
29.include "../../print/cups/buildlink3.mk" 34.include "../../print/cups/buildlink3.mk"
30.include "../../print/podofo/buildlink3.mk" 35.include "../../print/podofo/buildlink3.mk"
31.include "../../graphics/cairo/buildlink3.mk" 36.include "../../graphics/cairo/buildlink3.mk"
32.include "../../mk/jpeg.buildlink3.mk" 37.include "../../mk/jpeg.buildlink3.mk"
33.include "../../graphics/png/buildlink3.mk" 38.include "../../graphics/png/buildlink3.mk"
34.include "../../graphics/lcms2/buildlink3.mk" 39.include "../../graphics/lcms2/buildlink3.mk"
35BUILDLINK_API_DEPENDS.libart+= libart>=2.3.19nb1 40BUILDLINK_API_DEPENDS.libart+= libart>=2.3.19nb1
36.include "../../graphics/libart/buildlink3.mk" 41.include "../../graphics/libart/buildlink3.mk"
cvs diff -r1.6 -r1.7 pkgsrc/print/scribus-qt4/distinfo (expand / switch to unified diff)

--- pkgsrc/print/scribus-qt4/distinfo 2013/08/09 11:06:28 1.6
+++ pkgsrc/print/scribus-qt4/distinfo 2013/12/15 19:44:02 1.7
@@ -1,11 +1,12 @@ @@ -1,11 +1,12 @@
1$NetBSD: distinfo,v 1.6 2013/08/09 11:06:28 drochner Exp $ 1$NetBSD: distinfo,v 1.7 2013/12/15 19:44:02 joerg Exp $
2 2
3SHA1 (scribus-1.4.3.tar.xz) = 30c111762790e4407c13236bbb4b06f04e907f71 3SHA1 (scribus-1.4.3.tar.xz) = 30c111762790e4407c13236bbb4b06f04e907f71
4RMD160 (scribus-1.4.3.tar.xz) = 0c3103536610ca1881d1b65b549886bf9f0d8650 4RMD160 (scribus-1.4.3.tar.xz) = 0c3103536610ca1881d1b65b549886bf9f0d8650
5Size (scribus-1.4.3.tar.xz) = 70503072 bytes 5Size (scribus-1.4.3.tar.xz) = 70503072 bytes
6SHA1 (patch-ag) = 906fa6305015ec3b2589350d338cf2dcb30d5c58 6SHA1 (patch-ag) = 906fa6305015ec3b2589350d338cf2dcb30d5c58
7SHA1 (patch-ah) = ac77e8d21941d78f7463a6650352a673b878ec83 7SHA1 (patch-ah) = ac77e8d21941d78f7463a6650352a673b878ec83
8SHA1 (patch-ai) = fbd6212fc9190d1b2ede4d54806355e5d0ed389e 8SHA1 (patch-ai) = fbd6212fc9190d1b2ede4d54806355e5d0ed389e
9SHA1 (patch-ba) = ecddb2304b0ab37fbca41a662773107923df273b 9SHA1 (patch-ba) = ecddb2304b0ab37fbca41a662773107923df273b
10SHA1 (patch-bb) = c39d78679e0cd17a0fe19a98ecabe7eadfc5b881 10SHA1 (patch-bb) = c39d78679e0cd17a0fe19a98ecabe7eadfc5b881
11SHA1 (patch-bc) = 1b93d844b40ebe9b425ac7e6fb6b05189c194b6b 11SHA1 (patch-bc) = 1b93d844b40ebe9b425ac7e6fb6b05189c194b6b
 12SHA1 (patch-scribus_plugins_fileloader_scribus134format_CMakeLists.txt) = b0fa6cabcbcdc46d2a662df313b02f61f4926d2b
File Added: pkgsrc/print/scribus-qt4/patches/Attic/patch-scribus_plugins_fileloader_scribus134format_CMakeLists.txt
$NetBSD: patch-scribus_plugins_fileloader_scribus134format_CMakeLists.txt,v 1.1 2013/12/15 19:44:02 joerg Exp $

--- scribus/plugins/fileloader/scribus134format/CMakeLists.txt.orig	2013-12-14 22:12:14.000000000 +0000
+++ scribus/plugins/fileloader/scribus134format/CMakeLists.txt
@@ -14,6 +14,8 @@ scribus134format_save.cpp
 scribus134formatimpl.cpp
 )
 
+SET_SOURCE_FILES_PROPERTIES(scribus134format.cpp PROPERTIES COMPILE_FLAGS "${CLANG_NO_OPT}")
+
 SET(SCRIBUS_SCR134FORMAT_FL_PLUGIN "scribus134format")
 
 QT4_WRAP_CPP(SCR134FORMAT_FL_PLUGIN_MOC_SOURCES ${SCR134FORMAT_FL_PLUGIN_MOC_CLASSES})