diff options
| author | joerg <joerg> | 2015-06-17 20:46:51 +0000 |
|---|---|---|
| committer | joerg <joerg> | 2015-06-17 20:46:51 +0000 |
| commit | e7c0ab4ddabb49354a17d04d17091317b2f4f5c0 (patch) | |
| tree | c7e8ff2aab38fdf7937121545e777fa77ad82117 /print/scribus-qt4 | |
| parent | c1e98e722a6ea72f66905ee244e00eafa70f0e27 (diff) | |
| download | pkgsrc-e7c0ab4ddabb49354a17d04d17091317b2f4f5c0.tar.gz | |
scribus13format.cpp hits the same issue as scribus134format.cpp in
Clang's value propagation pass, so apply the same workaround. Use the
variable from mk/compiler/clang.mk.
Diffstat (limited to 'print/scribus-qt4')
| -rw-r--r-- | print/scribus-qt4/Makefile | 4 | ||||
| -rw-r--r-- | print/scribus-qt4/distinfo | 3 | ||||
| -rw-r--r-- | print/scribus-qt4/patches/patch-scribus_plugins_fileloader_scribus13format_CMakeLists.txt | 13 |
3 files changed, 17 insertions, 3 deletions
diff --git a/print/scribus-qt4/Makefile b/print/scribus-qt4/Makefile index 1fb99416b49..8d9f4bc6d10 100644 --- a/print/scribus-qt4/Makefile +++ b/print/scribus-qt4/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.37 2015/06/12 10:50:59 wiz Exp $ +# $NetBSD: Makefile,v 1.38 2015/06/17 20:46:51 joerg Exp $ DISTNAME= scribus-1.4.3 PKGREVISION= 6 @@ -26,7 +26,7 @@ INSTALLATION_DIRS+= share/pixmaps .include "../../mk/compiler.mk" .if !empty(PKGSRC_COMPILER:Mclang) -CMAKE_ARGS+= -DCLANG_NO_OPT=-O0 +CMAKE_ARGS+= -DCLANG_NO_OPT=${CLANG_NO_VALUE_PROPAGATION_PASS:Q} .endif post-install: diff --git a/print/scribus-qt4/distinfo b/print/scribus-qt4/distinfo index ab1aec1988f..8f5a0359fce 100644 --- a/print/scribus-qt4/distinfo +++ b/print/scribus-qt4/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.7 2013/12/15 19:44:02 joerg Exp $ +$NetBSD: distinfo,v 1.8 2015/06/17 20:46:51 joerg Exp $ SHA1 (scribus-1.4.3.tar.xz) = 30c111762790e4407c13236bbb4b06f04e907f71 RMD160 (scribus-1.4.3.tar.xz) = 0c3103536610ca1881d1b65b549886bf9f0d8650 @@ -10,3 +10,4 @@ SHA1 (patch-ba) = ecddb2304b0ab37fbca41a662773107923df273b SHA1 (patch-bb) = c39d78679e0cd17a0fe19a98ecabe7eadfc5b881 SHA1 (patch-bc) = 1b93d844b40ebe9b425ac7e6fb6b05189c194b6b SHA1 (patch-scribus_plugins_fileloader_scribus134format_CMakeLists.txt) = b0fa6cabcbcdc46d2a662df313b02f61f4926d2b +SHA1 (patch-scribus_plugins_fileloader_scribus13format_CMakeLists.txt) = 5d7ee482d4afd8acf2c3741f2660539069c5d5cc diff --git a/print/scribus-qt4/patches/patch-scribus_plugins_fileloader_scribus13format_CMakeLists.txt b/print/scribus-qt4/patches/patch-scribus_plugins_fileloader_scribus13format_CMakeLists.txt new file mode 100644 index 00000000000..e181ce0245f --- /dev/null +++ b/print/scribus-qt4/patches/patch-scribus_plugins_fileloader_scribus13format_CMakeLists.txt @@ -0,0 +1,13 @@ +$NetBSD: patch-scribus_plugins_fileloader_scribus13format_CMakeLists.txt,v 1.1 2015/06/17 20:46:51 joerg Exp $ + +--- scribus/plugins/fileloader/scribus13format/CMakeLists.txt.orig 2015-06-17 20:04:41.000000000 +0000 ++++ scribus/plugins/fileloader/scribus13format/CMakeLists.txt +@@ -13,6 +13,8 @@ scribus13format.cpp + scribus13formatimpl.cpp + ) + ++SET_SOURCE_FILES_PROPERTIES(scribus13format.cpp PROPERTIES COMPILE_FLAGS "${CLANG_NO_OPT}") ++ + SET(SCRIBUS_SCR13FORMAT_FL_PLUGIN "scribus13format") + + QT4_WRAP_CPP(SCR13FORMAT_FL_PLUGIN_MOC_SOURCES ${SCR13FORMAT_FL_PLUGIN_MOC_CLASSES}) |