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

Merge pull request #3909 from Rmys/master

Browse Source 
scribus-1.5.3:Version bump
This commit is contained in:
Rmys
2017-08-24 01:10:06 +03:00
committed by GitHub
parent 35df320cbd 50738658e6
commit 9a3341fe35
6 changed files with 95 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
office/misc/scribus/actions.py
+2 -3
View File
@@ -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")
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
office/misc/scribus/pspec.xml
+16 -4
View File
@@ -13,7 +13,7 @@
<IsA>app:gui</IsA>
<Summary>Desktop Publishing (DTP) and Layout program</Summary>
<Description>Scribus is an opensource desktop publishing application with features like CMYK colorspace and PDF output.
</Description><Archive sha1sum="87f426863be8057d83e73b58649ccc2a3266c73b" type="tarxz">http://sourceforge.net/projects/scribus/files/scribus-devel/1.5.2/scribus-1.5.2.tar.xz</Archive>
</Description><Archive sha1sum="787d427e5e2c1b508e1b0a6cb9cba04075b9e5ca" type="tarxz">http://sourceforge.net/projects/scribus/files/scribus-devel/1.5.3/scribus-1.5.3.tar.xz</Archive>
<BuildDependencies>
<Dependency>cmake</Dependency>
<Dependency>cups-devel</Dependency>
@@ -45,18 +45,22 @@
<Dependency>libcdr-devel</Dependency>
<Dependency>GraphicsMagick-devel</Dependency>
<Dependency>libpagemaker-devel</Dependency>
<Dependency>harfbuzz-devel</Dependency>
</BuildDependencies>
<Patches>
<Patch>scribus-standard-font-paths.patch</Patch>
<Patch>PisiLinux-default-font.patch</Patch>
<Patch>scribus-1.5.3-docdir.patch</Patch>
<Patch>findOpenSSL.patch</Patch>
<Patch>scribus-1.5.3-fpic.patch</Patch>
<Patch>PisiLinux-correctly_link_to_libxml2.patch</Patch>
<!--<Patch>scribus-1.5.0-QObject.patch</Patch>-->
<Patch>scribus-standard-font-paths.patch</Patch>
<!--Patch>scribus-1.5.2-qt57-build.patch</Patch-->
</Patches>
</Source>
<Package>
<Name>scribus</Name>
<RuntimeDependencies>
<Dependency>icu4c</Dependency>
<Dependency>cups</Dependency>
<Dependency>tiff</Dependency>
<Dependency>zlib</Dependency>
@@ -80,6 +84,7 @@
<Dependency>GraphicsMagick</Dependency>
<Dependency>libvisio</Dependency>
<Dependency>libmspub</Dependency>
<Dependency>harfbuzz</Dependency>
</RuntimeDependencies>
<Files>
<Path fileType="executable">/usr/bin</Path>
@@ -97,6 +102,13 @@
</Package>
<History>
<Update release="4">
<Date>2017-08-23</Date>
<Version>1.5.3</Version>
<Comment>Version bump</Comment>
<Name>Mustafa Cinasal</Name>
<Email>admin@pisilinux.org</Email>
</Update>
<Update release="3">
<Date>2017-04-17</Date>
<Version>1.5.2</Version>