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

scribus moved into main for pisi 2.0

Browse Source
This commit is contained in:
ayhanyalcinsoy
2016-01-24 16:00:43 +02:00
parent 7a29c67520
commit 9a81689be6
10 changed files with 389 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
office/misc/scribus/files/PisiLinux-correctly_link_to_libxml2.patch
+24
View File
@@ -0,0 +1,24 @@
diff -Naur scribus-1.3.6.orig/scribus/plugins/gettext/htmlim/CMakeLists.txt scribus-1.3.6/scribus/plugins/gettext/htmlim/CMakeLists.txt
--- scribus-1.3.6.orig/scribus/plugins/gettext/htmlim/CMakeLists.txt 2007-09-30 22:55:37.000000000 +0300
+++ scribus-1.3.6/scribus/plugins/gettext/htmlim/CMakeLists.txt 2010-05-17 16:39:49.842776114 +0300
@@ -18,7 +18,7 @@
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})
INSTALL(TARGETS ${SCRIBUS_HTML_GT_PLUGIN}
LIBRARY
diff -Naur scribus-1.3.6.orig/scribus/plugins/gettext/odtim/CMakeLists.txt scribus-1.3.6/scribus/plugins/gettext/odtim/CMakeLists.txt
--- scribus-1.3.6.orig/scribus/plugins/gettext/odtim/CMakeLists.txt 2007-09-30 22:55:37.000000000 +0300
+++ scribus-1.3.6/scribus/plugins/gettext/odtim/CMakeLists.txt 2010-05-17 16:40:13.467775741 +0300
@@ -20,7 +20,7 @@
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})
INSTALL(TARGETS ${SCRIBUS_ODT_IM_PLUGIN}
LIBRARY
office/misc/scribus/files/PisiLinux-default-font.patch
+11
View File
@@ -0,0 +1,11 @@
--- scribus/prefsmanager.cpp 2006-07-29 02:29:59.000000000 +0300
+++ scribus/prefsmanager.cpp.new 2006-10-07 22:25:58.000000000 +0300
@@ -117,7 +117,7 @@
bool goodFont = false;
for ( SCFontsIterator itf(appPrefs.AvailFonts); itf.current(); ++itf)
{
- if ((itf.currentKey() == "Arial Regular") || (itf.currentKey() == "Times New Roman Regular"))
+ if ((itf.currentKey() == "Arial Regular") || (itf.currentKey() == "Times New Roman Regular") || (itf.currentKey() == "Nimbus Roman No9 L Regular"))
{
appPrefs.toolSettings.defFont = itf.currentKey();
goodFont = true;
office/misc/scribus/files/desktoppath.patch
+11
View File
@@ -0,0 +1,11 @@
--- CMakeLists.orig.txt 2010-03-23 15:13:30.838325329 +0200
+++ CMakeLists.txt 2010-03-23 15:13:03.968450007 +0200
@@ -325,7 +325,7 @@
# Set the XDG mime stuff
SET(MIMEDIR "share/mime/packages/")
-SET(MIMELNKDIR "share/mimelnk/application/")
+SET(MIMELNKDIR "share/applications/")
##############################################################################################################
########## Build Setup ##########
office/misc/scribus/files/scribus-1.5.0-QObject.patch
+15
View File
@@ -0,0 +1,15 @@
scribus/sclayer.cpp | 1 +
1 file changed, 1 insertion(+)
diff --git a/scribus/sclayer.cpp b/scribus/sclayer.cpp
index 502112b..4da7bd5 100644
--- a/scribus/sclayer.cpp
+++ b/scribus/sclayer.cpp
@@ -9,6 +9,7 @@ for which a new license (GPL+exception) is in place.
#include <QHash> //necessary to avoid msvc warnings induced by SCRIBUS_API on ScLayers + early instanciation of templates
#include <QVector> //necessary to avoid msvc warnings induced by SCRIBUS_API on ScLayers + early instanciation of templates
+#include <QObject>
#include <QtAlgorithms>
ScLayer::ScLayer(void)
office/misc/scribus/files/scribus-1.5.0-fpic.patch
+123
View File
@@ -0,0 +1,123 @@
CMakeLists.txt | 8 ++++++++
scribus/colormgmt/CMakeLists.txt | 2 ++
scribus/desaxe/CMakeLists.txt | 1 +
scribus/fonts/CMakeLists.txt | 1 +
scribus/styles/CMakeLists.txt | 2 ++
scribus/text/CMakeLists.txt | 1 +
scribus/third_party/lib2geom/CMakeLists.txt | 8 +-------
scribus/third_party/zip/CMakeLists.txt | 2 ++
8 files changed, 18 insertions(+), 7 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 29d66f3..62d145f 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -131,6 +131,14 @@ IF (_machine_sparc64)
SET(ARCH64BIT 1)
ENDIF (_machine_sparc64)
+# We need to pass -fPIC to lib2geom on amd64, mips, mipsel, and hppa. See:
+# http://www.gentoo.org/proj/en/base/amd64/howtos/index.xml?part=1&chap=3 and
+# http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=559133
+
+IF (ARCH_X86_64 EQUAL 1 OR ARCH_HPPA EQUAL 1 OR ARCH_MIPS EQUAL 1 OR ARCH_MIPS_64 EQUAL 1 OR ARCH_PPC_64 EQUAL 1)
+ SET(CMAKE_CXX_FLAGS_FPIC "-fPIC")
+ENDIF (ARCH_X86_64 EQUAL 1 OR ARCH_HPPA EQUAL 1 OR ARCH_MIPS EQUAL 1 OR ARCH_MIPS_64 EQUAL 1 OR ARCH_PPC_64 EQUAL 1)
+
## Do our Apple OSX version setup
IF (APPLE AND CMAKE_SIZEOF_VOID_P EQUAL 8 AND (ARCH_X86 EQUAL 1 OR ARCH_X86_64 EQUAL 1))
STRING(REGEX REPLACE ".*-darwin([0-9]+).*" "\\1" _apple_ver "${MACHINE}")
diff --git a/scribus/colormgmt/CMakeLists.txt b/scribus/colormgmt/CMakeLists.txt
index 7298a28..87c4f5e 100644
--- a/scribus/colormgmt/CMakeLists.txt
+++ b/scribus/colormgmt/CMakeLists.txt
@@ -3,6 +3,8 @@ ${CMAKE_SOURCE_DIR}
${CMAKE_SOURCE_DIR}/scribus
)
+SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${CMAKE_CXX_FLAGS_FPIC}")
+
INCLUDE_DIRECTORIES( ${LCMS2_INCLUDE_DIR} )
SET(SCRIBUS_LCMS_IMPL_SOURCES
sclcms2colormgmtengineimpl.cpp
diff --git a/scribus/desaxe/CMakeLists.txt b/scribus/desaxe/CMakeLists.txt
index 0098028..85e76b6 100644
--- a/scribus/desaxe/CMakeLists.txt
+++ b/scribus/desaxe/CMakeLists.txt
@@ -4,6 +4,7 @@ ${CMAKE_SOURCE_DIR}/scribus
${FREETYPE_INCLUDE_DIRS}
)
+SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${CMAKE_CXX_FLAGS_FPIC}")
SET(SCRIBUS_DESAXE_LIB_SOURCES
saxXML.cpp
diff --git a/scribus/fonts/CMakeLists.txt b/scribus/fonts/CMakeLists.txt
index 799e102..f04c680 100644
--- a/scribus/fonts/CMakeLists.txt
+++ b/scribus/fonts/CMakeLists.txt
@@ -4,6 +4,7 @@ ${CMAKE_SOURCE_DIR}/scribus
${FREETYPE_INCLUDE_DIRS}
)
+SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${CMAKE_CXX_FLAGS_FPIC}")
SET(SCRIBUS_FONTS_LIB_SOURCES
scface.cpp
diff --git a/scribus/styles/CMakeLists.txt b/scribus/styles/CMakeLists.txt
index 6e0cf0a..2839689 100644
--- a/scribus/styles/CMakeLists.txt
+++ b/scribus/styles/CMakeLists.txt
@@ -4,6 +4,8 @@ INCLUDE_DIRECTORIES(
${FREETYPE_INCLUDE_DIRS}
)
+SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${CMAKE_CXX_FLAGS_FPIC}")
+
SET(SCRIBUS_STYLES_MOC_CLASSES
)
diff --git a/scribus/text/CMakeLists.txt b/scribus/text/CMakeLists.txt
index 1cd112f..4f658e3 100644
--- a/scribus/text/CMakeLists.txt
+++ b/scribus/text/CMakeLists.txt
@@ -4,6 +4,7 @@ INCLUDE_DIRECTORIES(
${FREETYPE_INCLUDE_DIRS}
)
+SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${CMAKE_CXX_FLAGS_FPIC}")
SET(SCRIBUS_TEXT_MOC_CLASSES
storytext.h
diff --git a/scribus/third_party/lib2geom/CMakeLists.txt b/scribus/third_party/lib2geom/CMakeLists.txt
index 6187d96..3106f6e 100755
--- a/scribus/third_party/lib2geom/CMakeLists.txt
+++ b/scribus/third_party/lib2geom/CMakeLists.txt
@@ -5,13 +5,7 @@ ${CMAKE_SOURCE_DIR}/scribus
SET(2GEOM_VERSION 0.1.0)
-# We need to pass -fPIC to lib2geom on amd64, mips, mipsel, and hppa. See:
-# http://www.gentoo.org/proj/en/base/amd64/howtos/index.xml?part=1&chap=3 and
-# http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=559133
-
-IF (ARCH_X86_64 EQUAL 1 OR ARCH_HPPA EQUAL 1 OR ARCH_MIPS EQUAL 1 OR ARCH_MIPS_64 EQUAL 1 OR ARCH_PPC_64 EQUAL 1)
- SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fPIC")
-ENDIF (ARCH_X86_64 EQUAL 1 OR ARCH_HPPA EQUAL 1 OR ARCH_MIPS EQUAL 1 OR ARCH_MIPS_64 EQUAL 1 OR ARCH_PPC_64 EQUAL 1)
+SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${CMAKE_CXX_FLAGS_FPIC}")
OPTION(2GEOM_BUILD_SHARED
"Build lib2geom and libtoy as shared libraries."
diff --git a/scribus/third_party/zip/CMakeLists.txt b/scribus/third_party/zip/CMakeLists.txt
index edf9683..f7676ab 100644
--- a/scribus/third_party/zip/CMakeLists.txt
+++ b/scribus/third_party/zip/CMakeLists.txt
@@ -4,6 +4,8 @@ ${CMAKE_SOURCE_DIR}/scribus
${ZLIB_INCLUDE_DIR}
)
+SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${CMAKE_CXX_FLAGS_FPIC}")
+
SET(SCRIBUS_ZIP_LIB_SOURCES
unzip.cpp
zip.cpp
office/misc/scribus/files/scribus-standard-font-paths.patch
+10
View File
@@ -0,0 +1,10 @@
--- scribus-0.8/scribus/scfonts.cpp.orig Sun Sep 22 10:54:38 2002
+++ scribus-0.8/scribus/scfonts.cpp Thu Oct 24 11:53:26 2002
@@ -463,6 +463,7 @@
char **fontpath=XGetFontPath(display,&pathcount);
for(i=0; i<pathcount; ++i)
AddPath(fontpath[i]);
+ AddPath("/usr/share/fonts/Type1");
XFreeFontPath(fontpath);
}