| 1 |
jlec 15/05/29 09:37:12 |
| 2 |
|
| 3 |
Modified: scribus-1.5.0-fpic.patch |
| 4 |
Log: |
| 5 |
Enhance fPIC patch and fix configure options with USE=osg, bug #550130 |
| 6 |
|
| 7 |
(Portage version: 2.2.20/cvs/Linux x86_64, signed Manifest commit with key E9402A79B03529A2!) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.2 app-office/scribus/files/scribus-1.5.0-fpic.patch |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/scribus/files/scribus-1.5.0-fpic.patch?rev=1.2&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/scribus/files/scribus-1.5.0-fpic.patch?rev=1.2&content-type=text/plain |
| 14 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/scribus/files/scribus-1.5.0-fpic.patch?r1=1.1&r2=1.2 |
| 15 |
|
| 16 |
Index: scribus-1.5.0-fpic.patch |
| 17 |
=================================================================== |
| 18 |
RCS file: /var/cvsroot/gentoo-x86/app-office/scribus/files/scribus-1.5.0-fpic.patch,v |
| 19 |
retrieving revision 1.1 |
| 20 |
retrieving revision 1.2 |
| 21 |
diff -u -r1.1 -r1.2 |
| 22 |
--- scribus-1.5.0-fpic.patch 21 May 2015 12:12:02 -0000 1.1 |
| 23 |
+++ scribus-1.5.0-fpic.patch 29 May 2015 09:37:12 -0000 1.2 |
| 24 |
@@ -5,8 +5,11 @@ |
| 25 |
scribus/styles/CMakeLists.txt | 2 ++ |
| 26 |
scribus/text/CMakeLists.txt | 1 + |
| 27 |
scribus/third_party/lib2geom/CMakeLists.txt | 8 +------- |
| 28 |
+ scribus/third_party/pgf/CMakeLists.txt | 2 ++ |
| 29 |
+ scribus/third_party/prc/CMakeLists.txt | 2 ++ |
| 30 |
+ scribus/third_party/wpg/CMakeLists.txt | 7 ++++--- |
| 31 |
scribus/third_party/zip/CMakeLists.txt | 2 ++ |
| 32 |
- 8 files changed, 18 insertions(+), 7 deletions(-) |
| 33 |
+ 11 files changed, 26 insertions(+), 10 deletions(-) |
| 34 |
|
| 35 |
diff --git a/CMakeLists.txt b/CMakeLists.txt |
| 36 |
index 29d66f3..62d145f 100644 |
| 37 |
@@ -108,6 +111,51 @@ |
| 38 |
|
| 39 |
OPTION(2GEOM_BUILD_SHARED |
| 40 |
"Build lib2geom and libtoy as shared libraries." |
| 41 |
+diff --git a/scribus/third_party/pgf/CMakeLists.txt b/scribus/third_party/pgf/CMakeLists.txt |
| 42 |
+index f84b3d4..d3b1db6 100644 |
| 43 |
+--- a/scribus/third_party/pgf/CMakeLists.txt |
| 44 |
++++ b/scribus/third_party/pgf/CMakeLists.txt |
| 45 |
+@@ -3,6 +3,8 @@ ${CMAKE_SOURCE_DIR} |
| 46 |
+ ${CMAKE_SOURCE_DIR}/scribus |
| 47 |
+ ) |
| 48 |
+ |
| 49 |
++SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${CMAKE_CXX_FLAGS_FPIC}") |
| 50 |
++ |
| 51 |
+ SET(SCRIBUS_PGF_LIB_SOURCES |
| 52 |
+ Decoder.cpp |
| 53 |
+ Encoder.cpp |
| 54 |
+diff --git a/scribus/third_party/prc/CMakeLists.txt b/scribus/third_party/prc/CMakeLists.txt |
| 55 |
+index 5f7c2c6..1da7177 100644 |
| 56 |
+--- a/scribus/third_party/prc/CMakeLists.txt |
| 57 |
++++ b/scribus/third_party/prc/CMakeLists.txt |
| 58 |
+@@ -5,6 +5,8 @@ ${OPENGL_INCLUDE_DIR} |
| 59 |
+ ${FREETYPE_INCLUDE_DIRS} |
| 60 |
+ ) |
| 61 |
+ |
| 62 |
++SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${CMAKE_CXX_FLAGS_FPIC}") |
| 63 |
++ |
| 64 |
+ SET(SCRIBUS_PRC_LIB_SOURCES |
| 65 |
+ oPRCFile.cc |
| 66 |
+ PRCbitStream.cc |
| 67 |
+diff --git a/scribus/third_party/wpg/CMakeLists.txt b/scribus/third_party/wpg/CMakeLists.txt |
| 68 |
+index ff31e9f..fbc5cd4 100644 |
| 69 |
+--- a/scribus/third_party/wpg/CMakeLists.txt |
| 70 |
++++ b/scribus/third_party/wpg/CMakeLists.txt |
| 71 |
+@@ -2,10 +2,11 @@ INCLUDE_DIRECTORIES( |
| 72 |
+ ${CMAKE_SOURCE_DIR} |
| 73 |
+ ${CMAKE_SOURCE_DIR}/scribus |
| 74 |
+ ) |
| 75 |
++ |
| 76 |
+ SET(LIB_TYPE STATIC) |
| 77 |
+-IF (ARCH_X86_64 EQUAL 1) |
| 78 |
+- SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fPIC") |
| 79 |
+-ENDIF (ARCH_X86_64 EQUAL 1) |
| 80 |
++ |
| 81 |
++SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${CMAKE_CXX_FLAGS_FPIC}") |
| 82 |
++ |
| 83 |
+ SET(WPG_SOURCES |
| 84 |
+ WPG1Parser.cpp |
| 85 |
+ WPG2Parser.cpp |
| 86 |
diff --git a/scribus/third_party/zip/CMakeLists.txt b/scribus/third_party/zip/CMakeLists.txt |
| 87 |
index edf9683..f7676ab 100644 |
| 88 |
--- a/scribus/third_party/zip/CMakeLists.txt |
Archives