From 50738658e6d66391fe4115e80db1658e177e0192 Mon Sep 17 00:00:00 2001 From: Rmys Date: Thu, 24 Aug 2017 01:07:49 +0300 Subject: [PATCH] scribus-1.5.3:Version bump --- office/misc/scribus/actions.py | 5 +-- .../PisiLinux-correctly_link_to_libxml2.patch | 8 ++-- office/misc/scribus/files/findOpenSSL.patch | 15 +++++++ .../scribus/files/scribus-1.5.3-docdir.patch | 42 +++++++++++++++++++ .../scribus/files/scribus-1.5.3-fpic.patch | 16 +++++++ office/misc/scribus/pspec.xml | 20 +++++++-- 6 files changed, 95 insertions(+), 11 deletions(-) create mode 100644 office/misc/scribus/files/findOpenSSL.patch create mode 100644 office/misc/scribus/files/scribus-1.5.3-docdir.patch create mode 100644 office/misc/scribus/files/scribus-1.5.3-fpic.patch diff --git a/office/misc/scribus/actions.py b/office/misc/scribus/actions.py index 530086a9ec..7632aa9996 100644 --- a/office/misc/scribus/actions.py +++ b/office/misc/scribus/actions.py @@ -14,8 +14,7 @@ def setup(): pisitools.dosed("CMakeLists.txt", "\"share\/doc\/\$\{MAIN_DIR_NAME\}.*", "\"share/doc/${MAIN_DIR_NAME}/\")") cmaketools.configure("-DWANT_DISTROBUILD=YES \ - -DWANT_QT5SUPPORT=ON \ - -DWANT_GRAPHICSMAGICK=1") + -DWANT_QT5SUPPORT=ON") def build(): @@ -25,6 +24,6 @@ def install(): autotools.rawInstall("DESTDIR=%s" % get.installDIR()) - pisitools.insinto("/usr/share/applications", "vnd.scribus.desktop", "scribus.desktop") + pisitools.insinto("/usr/share/applications", "scribus.desktop") pisitools.insinto("/usr/share/pixmaps", "resources/iconsets/1_5_1/scribus.png") pisitools.insinto("/usr/share/pixmaps", "resources/iconsets/1_5_0/scribusdoc.png", "x-scribus.png") diff --git a/office/misc/scribus/files/PisiLinux-correctly_link_to_libxml2.patch b/office/misc/scribus/files/PisiLinux-correctly_link_to_libxml2.patch index 49df70a70d..a31af74db3 100644 --- a/office/misc/scribus/files/PisiLinux-correctly_link_to_libxml2.patch +++ b/office/misc/scribus/files/PisiLinux-correctly_link_to_libxml2.patch @@ -5,8 +5,8 @@ diff -Naur scribus-1.3.6.orig/scribus/plugins/gettext/htmlim/CMakeLists.txt scri ADD_LIBRARY(${SCRIBUS_HTML_GT_PLUGIN} MODULE ${HTML_GT_PLUGIN_SOURCES} ${HTML_GT_PLUGIN_MOC_SOURCES}) --TARGET_LINK_LIBRARIES(${SCRIBUS_HTML_GT_PLUGIN} ${PLUGIN_LIBRARIES}) -+TARGET_LINK_LIBRARIES(${SCRIBUS_HTML_GT_PLUGIN} ${PLUGIN_LIBRARIES} ${LIBXML2_LIBRARIES} ${ZLIB_LIBRARIES}) +-target_link_libraries(${SCRIBUS_HTML_GT_PLUGIN} ${PLUGIN_LIBRARIES}) ++target_link_libraries(${SCRIBUS_HTML_GT_PLUGIN} ${PLUGIN_LIBRARIES} ${LIBXML2_LIBRARIES} ${ZLIB_LIBRARIES}) INSTALL(TARGETS ${SCRIBUS_HTML_GT_PLUGIN} LIBRARY @@ -17,8 +17,8 @@ diff -Naur scribus-1.3.6.orig/scribus/plugins/gettext/odtim/CMakeLists.txt scrib ADD_LIBRARY(${SCRIBUS_ODT_IM_PLUGIN} MODULE ${ODT_IM_PLUGIN_SOURCES} ${ODT_IM_PLUGIN_MOC_SOURCES}) --TARGET_LINK_LIBRARIES(${SCRIBUS_ODT_IM_PLUGIN} ${PLUGIN_LIBRARIES}) -+TARGET_LINK_LIBRARIES(${SCRIBUS_ODT_IM_PLUGIN} ${PLUGIN_LIBRARIES} ${LIBXML2_LIBRARIES} ${ZLIB_LIBRARIES}) +-target_link_libraries(${SCRIBUS_ODT_IM_PLUGIN} ${PLUGIN_LIBRARIES}) ++target_link_libraries(${SCRIBUS_ODT_IM_PLUGIN} ${PLUGIN_LIBRARIES} ${LIBXML2_LIBRARIES} ${ZLIB_LIBRARIES}) INSTALL(TARGETS ${SCRIBUS_ODT_IM_PLUGIN} LIBRARY diff --git a/office/misc/scribus/files/findOpenSSL.patch b/office/misc/scribus/files/findOpenSSL.patch new file mode 100644 index 0000000000..c2cb5e9dd5 --- /dev/null +++ b/office/misc/scribus/files/findOpenSSL.patch @@ -0,0 +1,15 @@ +Description: Fix case of "OpenSSL" to match the case of the file shipped by cmake +Author: Mattia Rizzolo +Last-Update: 2017-06-05 + +--- a/cmake/modules/FindLIBPODOFO.cmake ++++ b/cmake/modules/FindLIBPODOFO.cmake +@@ -45,7 +45,7 @@ + #message(STATUS "PODOFO PATCH VERSION ${PODOFO_PATCH_VER}") + set(LIBPODOFO_VERSION "${PODOFO_MAJOR_VER}.${PODOFO_MINOR_VER}.${PODOFO_PATCH_VER}" CACHE STRING "PoDoFo version string") + if(LIBPODOFO_VERSION VERSION_GREATER "0.9.4") +- find_package(OPENSSL) ++ find_package(OpenSSL) + if (OPENSSL_FOUND) + message("OpenSSL found OK for installed version of PoDoFo (>= 0.9.5) - Enabling support for PDF embedded in AI") + set(LIBPODOFO_FOUND TRUE CACHE BOOLEAN "Was libpodofo found") diff --git a/office/misc/scribus/files/scribus-1.5.3-docdir.patch b/office/misc/scribus/files/scribus-1.5.3-docdir.patch new file mode 100644 index 0000000000..d866922fa1 --- /dev/null +++ b/office/misc/scribus/files/scribus-1.5.3-docdir.patch @@ -0,0 +1,42 @@ + CMakeLists.txt | 28 +++++++++++++++------------- + 1 file changed, 15 insertions(+), 13 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 29d66f3..1c08cdd 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -244,19 +244,21 @@ else() + endif() + + #SHARE - use the default on Apple as TAG_VERSION is empty +-if(WIN32 OR OS2) +- set(DOCDIR "${CMAKE_INSTALL_DATAROOTDIR}/doc/") +-else() +- if(TAG_VERSION OR BUILD_OSX_BUNDLE) +- set(DOCDIR "${CMAKE_INSTALL_DATAROOTDIR}/doc/${MAIN_DIR_NAME}${TAG_VERSION}/") +- else() +- if(NOT WANT_VERSIONING) +- set(DOCDIR "${CMAKE_INSTALL_DATAROOTDIR}/doc/${MAIN_DIR_NAME}/") +- else() +- set(DOCDIR "${CMAKE_INSTALL_DATAROOTDIR}/doc/${MAIN_DIR_NAME}-${VERSION}/") +- endif() +- endif() +-endif() ++if(NOT DOCDIR) ++ if(WIN32 OR OS2) ++ set(DOCDIR "${CMAKE_INSTALL_DATAROOTDIR}/doc/") ++ else() ++ if(TAG_VERSION OR BUILD_OSX_BUNDLE) ++ set(DOCDIR "${CMAKE_INSTALL_DATAROOTDIR}/doc/${MAIN_DIR_NAME}${TAG_VERSION}/") ++ else() ++ if(NOT WANT_VERSIONING) ++ set(DOCDIR "${CMAKE_INSTALL_DATAROOTDIR}/doc/${MAIN_DIR_NAME}/") ++ else() ++ set(DOCDIR "${CMAKE_INSTALL_DATAROOTDIR}/doc/${MAIN_DIR_NAME}-${VERSION}/") ++ endif() ++ endif() ++ endif() ++endif() + if(NOT IS_ABSOLUTE ${DOCDIR}) + add_definitions("-DDOCDIR=\\\"${CMAKE_INSTALL_PREFIX}/${DOCDIR}\\\"") + else() diff --git a/office/misc/scribus/files/scribus-1.5.3-fpic.patch b/office/misc/scribus/files/scribus-1.5.3-fpic.patch new file mode 100644 index 0000000000..ba0721955e --- /dev/null +++ b/office/misc/scribus/files/scribus-1.5.3-fpic.patch @@ -0,0 +1,16 @@ + scribus/third_party/prc/CMakeLists.txt | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/scribus/third_party/prc/CMakeLists.txt b/scribus/third_party/prc/CMakeLists.txt +index 5f7c2c6..1da7177 100644 +--- a/scribus/third_party/prc/CMakeLists.txt ++++ b/scribus/third_party/prc/CMakeLists.txt +@@ -5,6 +5,8 @@ ${OPENGL_INCLUDE_DIR} + ${FREETYPE_INCLUDE_DIRS} + ) + ++set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${CMAKE_CXX_FLAGS_FPIC}") ++ + set(SCRIBUS_PRC_LIB_SOURCES + oPRCFile.cc + PRCbitStream.cc diff --git a/office/misc/scribus/pspec.xml b/office/misc/scribus/pspec.xml index b873b16b7a..ec6847a535 100644 --- a/office/misc/scribus/pspec.xml +++ b/office/misc/scribus/pspec.xml @@ -13,7 +13,7 @@ app:gui Desktop Publishing (DTP) and Layout program Scribus is an opensource desktop publishing application with features like CMYK colorspace and PDF output. - http://sourceforge.net/projects/scribus/files/scribus-devel/1.5.2/scribus-1.5.2.tar.xz + http://sourceforge.net/projects/scribus/files/scribus-devel/1.5.3/scribus-1.5.3.tar.xz cmake cups-devel @@ -45,18 +45,22 @@ libcdr-devel GraphicsMagick-devel libpagemaker-devel + harfbuzz-devel - scribus-standard-font-paths.patch - PisiLinux-default-font.patch + scribus-1.5.3-docdir.patch + findOpenSSL.patch + scribus-1.5.3-fpic.patch PisiLinux-correctly_link_to_libxml2.patch - + scribus-standard-font-paths.patch + scribus + icu4c cups tiff zlib @@ -80,6 +84,7 @@ GraphicsMagick libvisio libmspub + harfbuzz /usr/bin @@ -97,6 +102,13 @@ + + 2017-08-23 + 1.5.3 + Version bump + Mustafa Cinasal + admin@pisilinux.org + 2017-04-17 1.5.2