Pisilinux/main
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

scribus-1.5.3:Version bump

Browse Source
This commit is contained in:
Rmys
2017-08-24 01:07:49 +03:00
parent d4917d1953
commit 50738658e6
6 changed files with 95 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
office/misc/scribus/files/PisiLinux-correctly_link_to_libxml2.patch
+4 -4
View File
@@ -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
office/misc/scribus/files/findOpenSSL.patch
+15
View File
@@ -0,0 +1,15 @@
Description: Fix case of "OpenSSL" to match the case of the file shipped by cmake
Author: Mattia Rizzolo <mattia@debian.org>
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")
office/misc/scribus/files/scribus-1.5.3-docdir.patch
+42
View File
@@ -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()
office/misc/scribus/files/scribus-1.5.3-fpic.patch
+16
View File
@@ -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