summaryrefslogtreecommitdiff
path: root/print/scribus-qt4
diff options
context:
space:
mode:
authorjoerg <joerg@pkgsrc.org>2016-02-28 19:48:17 +0000
committerjoerg <joerg@pkgsrc.org>2016-02-28 19:48:17 +0000
commit9df1fc069cadfcb7aa23607886bd940d0d9155e0 (patch)
treee4173da5d6a98ad3e42bf6f8dbfdbf135b8afd75 /print/scribus-qt4
parenta30596731940a4215e1a4792354a29d4721aef9e (diff)
downloadpkgsrc-9df1fc069cadfcb7aa23607886bd940d0d9155e0.tar.gz
Avoid clang's CVP pass for one more file.
Diffstat (limited to 'print/scribus-qt4')
-rw-r--r--print/scribus-qt4/distinfo4
-rw-r--r--print/scribus-qt4/patches/patch-ah17
2 files changed, 15 insertions, 6 deletions
diff --git a/print/scribus-qt4/distinfo b/print/scribus-qt4/distinfo
index 4c183aa5ee7..e71feb14920 100644
--- a/print/scribus-qt4/distinfo
+++ b/print/scribus-qt4/distinfo
@@ -1,11 +1,11 @@
-$NetBSD: distinfo,v 1.9 2015/11/04 01:01:40 agc Exp $
+$NetBSD: distinfo,v 1.10 2016/02/28 19:48:17 joerg Exp $
SHA1 (scribus-1.4.3.tar.xz) = 30c111762790e4407c13236bbb4b06f04e907f71
RMD160 (scribus-1.4.3.tar.xz) = 0c3103536610ca1881d1b65b549886bf9f0d8650
SHA512 (scribus-1.4.3.tar.xz) = e4841b346803bc096c2e00b2071d03ce3bae6af8d7317353ebf8e724b5a9b6461d95406bee61c2a316bc6ee5d9e302e3fee7b51dd89eae9adc9e69b3aa40454e
Size (scribus-1.4.3.tar.xz) = 70503072 bytes
SHA1 (patch-ag) = 906fa6305015ec3b2589350d338cf2dcb30d5c58
-SHA1 (patch-ah) = ac77e8d21941d78f7463a6650352a673b878ec83
+SHA1 (patch-ah) = 7640b9509d764323d546cbf958521768965d7ff0
SHA1 (patch-ai) = fbd6212fc9190d1b2ede4d54806355e5d0ed389e
SHA1 (patch-ba) = ecddb2304b0ab37fbca41a662773107923df273b
SHA1 (patch-bb) = c39d78679e0cd17a0fe19a98ecabe7eadfc5b881
diff --git a/print/scribus-qt4/patches/patch-ah b/print/scribus-qt4/patches/patch-ah
index a7d87f5be43..5802b57b91d 100644
--- a/print/scribus-qt4/patches/patch-ah
+++ b/print/scribus-qt4/patches/patch-ah
@@ -1,8 +1,17 @@
-$NetBSD: patch-ah,v 1.3 2013/08/09 11:06:28 drochner Exp $
+$NetBSD: patch-ah,v 1.4 2016/02/28 19:48:17 joerg Exp $
--- scribus/CMakeLists.txt.orig 2013-02-26 20:28:44.000000000 +0000
+++ scribus/CMakeLists.txt
-@@ -737,13 +737,13 @@ ELSE(WIN32)
+@@ -641,6 +641,8 @@ SET(SCRIBUS_SOURCES
+ vruler.cpp
+ )
+
++SET_SOURCE_FILES_PROPERTIES(prefsmanager.cpp PROPERTIES COMPILE_FLAGS "${CLANG_NO_OPT}")
++
+ IF(NOT HAVE_HYPHEN)
+ SET(SCRIBUS_SOURCES
+ ${SCRIBUS_SOURCES}
+@@ -737,13 +739,13 @@ ELSE(WIN32)
ENDIF(WIN32)
##TEST FIX FOR 6897
@@ -18,7 +27,7 @@ $NetBSD: patch-ah,v 1.3 2013/08/09 11:06:28 drochner Exp $
IF (GCC AND NOT WIN32)
# Use the -E / --export-dynamic flag to ensure that symbols in the Scribus
# binary are in the public symbol table for plugins. The symbols must also
-@@ -785,9 +785,9 @@ ENDIF(NOT WIN32 AND NOT HAIKU)
+@@ -785,9 +787,9 @@ ENDIF(NOT WIN32 AND NOT HAIKU)
# required to resolve symbols from libdl when ld is called with --no-add-needed
# #9310 for the OpenBSD addition
@@ -30,7 +39,7 @@ $NetBSD: patch-ah,v 1.3 2013/08/09 11:06:28 drochner Exp $
# #9311 for the OpenBSD addition
IF(CMAKE_SYSTEM_NAME STREQUAL "OpenBSD" OR CMAKE_SYSTEM_NAME STREQUAL "FreeBSD")
-@@ -891,6 +891,7 @@ IF(NOT WANT_NOHEADERINSTALL)
+@@ -891,6 +893,7 @@ IF(NOT WANT_NOHEADERINSTALL)
PATTERN "manpages" EXCLUDE
PATTERN "old" EXCLUDE
PATTERN ".svn" EXCLUDE