jlec 15/05/18 16:56:51 Modified: scribus-1.5.0-docs.patch Added: scribus-1.4.4-ppc64-fpic.patch Log: Build all 64bit arch with fPIC, bug #549746; Update live doc patch, bug #548160; use LINGUAS for all localizable files in this app, bug #538238 (Portage version: 2.2.19/cvs/Linux x86_64, signed Manifest commit with key E9402A79B03529A2!)
Revision Changes Path 1.3 app-office/scribus/files/scribus-1.5.0-docs.patch file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/scribus/files/scribus-1.5.0-docs.patch?rev=1.3&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/scribus/files/scribus-1.5.0-docs.patch?rev=1.3&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/scribus/files/scribus-1.5.0-docs.patch?r1=1.2&r2=1.3 Index: scribus-1.5.0-docs.patch =================================================================== RCS file: /var/cvsroot/gentoo-x86/app-office/scribus/files/scribus-1.5.0-docs.patch,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- scribus-1.5.0-docs.patch 14 Aug 2014 07:15:15 -0000 1.2 +++ scribus-1.5.0-docs.patch 18 May 2015 16:56:51 -0000 1.3 @@ -1,24 +1,21 @@ - CMakeLists.txt | 3 +-- - 1 file changed, 1 insertion(+), 2 deletions(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index c97080b..46742c7 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -244,7 +244,7 @@ ELSE (WIN32 OR OS2) - SET(DOCDIR "share/doc/${MAIN_DIR_NAME}${TAG_VERSION}/") - ELSE(TAG_VERSION OR BUILD_OSX_BUNDLE) - IF(NOT WANT_VERSIONING) -- SET(DOCDIR "share/doc/${MAIN_DIR_NAME}/") -+ SET(DOCDIR "share/doc/${MAIN_DIR_NAME}-${GENTOOVERSION}/") - ELSE(NOT WANT_VERSIONING) - SET(DOCDIR "share/doc/${MAIN_DIR_NAME}-${VERSION}/") - ENDIF(NOT WANT_VERSIONING) -@@ -883,7 +883,6 @@ INSTALL(FILES - BUILDING - ChangeLog - ChangeLogSVN -- COPYING - LINKS - NEWS - PACKAGING +Index: CMakeLists.txt +=================================================================== +--- CMakeLists.txt (revision 20042) ++++ CMakeLists.txt (working copy) +@@ -247,15 +247,7 @@ + IF(WIN32 OR OS2) + SET(DOCDIR "${CMAKE_INSTALL_DATAROOTDIR}/doc/") + ELSE (WIN32 OR OS2) +- IF(TAG_VERSION OR BUILD_OSX_BUNDLE) +- SET(DOCDIR "${CMAKE_INSTALL_DATAROOTDIR}/doc/${MAIN_DIR_NAME}${TAG_VERSION}/") +- ELSE(TAG_VERSION OR BUILD_OSX_BUNDLE) +- IF(NOT WANT_VERSIONING) +- SET(DOCDIR "${CMAKE_INSTALL_DATAROOTDIR}/doc/${MAIN_DIR_NAME}/") +- ELSE(NOT WANT_VERSIONING) +- SET(DOCDIR "${CMAKE_INSTALL_DATAROOTDIR}/doc/${MAIN_DIR_NAME}-${VERSION}/") +- ENDIF(NOT WANT_VERSIONING) +- ENDIF (TAG_VERSION OR BUILD_OSX_BUNDLE) ++ SET(DOCDIR "${CMAKE_INSTALL_DATAROOTDIR}/doc/${MAIN_DIR_NAME}-${GENTOOVERSION}/") + ENDIF (WIN32 OR OS2) + IF(NOT IS_ABSOLUTE ${DOCDIR}) + ADD_DEFINITIONS("-DDOCDIR=\\\"${CMAKE_INSTALL_PREFIX}/${DOCDIR}\\\"") 1.1 app-office/scribus/files/scribus-1.4.4-ppc64-fpic.patch file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/scribus/files/scribus-1.4.4-ppc64-fpic.patch?rev=1.1&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/scribus/files/scribus-1.4.4-ppc64-fpic.patch?rev=1.1&content-type=text/plain Index: scribus-1.4.4-ppc64-fpic.patch =================================================================== scribus/plugins/tools/2geomtools/lib2geom/CMakeLists.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scribus/plugins/tools/2geomtools/lib2geom/CMakeLists.txt b/scribus/plugins/tools/2geomtools/lib2geom/CMakeLists.txt index 18898a7..ba872b9 100755 --- a/scribus/plugins/tools/2geomtools/lib2geom/CMakeLists.txt +++ b/scribus/plugins/tools/2geomtools/lib2geom/CMakeLists.txt @@ -18,9 +18,9 @@ SET(2GEOM_VERSION 0.1.0) # 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) +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) +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) OPTION(2GEOM_BUILD_SHARED "Build lib2geom and libtoy as shared libraries."
