diff options
author | Robin H. Johnson <robbat2@gentoo.org> | 2015-08-08 13:49:04 -0700 |
---|---|---|
committer | Robin H. Johnson <robbat2@gentoo.org> | 2015-08-08 17:38:18 -0700 |
commit | 56bd759df1d0c750a065b8c845e93d5dfa6b549d (patch) | |
tree | 3f91093cdb475e565ae857f1c5a7fd339e2d781e /app-office/scribus/files | |
download | gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.tar.gz gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.tar.bz2 gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.zip |
proj/gentoo: Initial commit
This commit represents a new era for Gentoo:
Storing the gentoo-x86 tree in Git, as converted from CVS.
This commit is the start of the NEW history.
Any historical data is intended to be grafted onto this point.
Creation process:
1. Take final CVS checkout snapshot
2. Remove ALL ChangeLog* files
3. Transform all Manifests to thin
4. Remove empty Manifests
5. Convert all stale $Header$/$Id$ CVS keywords to non-expanded Git $Id$
5.1. Do not touch files with -kb/-ko keyword flags.
Signed-off-by: Robin H. Johnson <robbat2@gentoo.org>
X-Thanks: Alec Warner <antarus@gentoo.org> - did the GSoC 2006 migration tests
X-Thanks: Robin H. Johnson <robbat2@gentoo.org> - infra guy, herding this project
X-Thanks: Nguyen Thai Ngoc Duy <pclouds@gentoo.org> - Former Gentoo developer, wrote Git features for the migration
X-Thanks: Brian Harring <ferringb@gentoo.org> - wrote much python to improve cvs2svn
X-Thanks: Rich Freeman <rich0@gentoo.org> - validation scripts
X-Thanks: Patrick Lauer <patrick@gentoo.org> - Gentoo dev, running new 2014 work in migration
X-Thanks: Michał Górny <mgorny@gentoo.org> - scripts, QA, nagging
X-Thanks: All of other Gentoo developers - many ideas and lots of paint on the bikeshed
Diffstat (limited to 'app-office/scribus/files')
-rw-r--r-- | app-office/scribus/files/scribus-1.4.0-minizip.patch | 60 | ||||
-rw-r--r-- | app-office/scribus/files/scribus-1.4.2-docs.patch | 29 | ||||
-rw-r--r-- | app-office/scribus/files/scribus-1.4.4-ppc64-fpic.patch | 19 | ||||
-rw-r--r-- | app-office/scribus/files/scribus-1.5.0-QObject.patch | 15 | ||||
-rw-r--r-- | app-office/scribus/files/scribus-1.5.0-docdir.patch | 42 | ||||
-rw-r--r-- | app-office/scribus/files/scribus-1.5.0-fpic.patch | 178 |
6 files changed, 343 insertions, 0 deletions
diff --git a/app-office/scribus/files/scribus-1.4.0-minizip.patch b/app-office/scribus/files/scribus-1.4.0-minizip.patch new file mode 100644 index 000000000000..c0a4b7cb38eb --- /dev/null +++ b/app-office/scribus/files/scribus-1.4.0-minizip.patch @@ -0,0 +1,60 @@ + Scribus.pro | 4 ---- + scribus/CMakeLists.txt | 2 -- + 2 files changed, 0 insertions(+), 6 deletions(-) + +diff --git a/Scribus.pro b/Scribus.pro +index 17b5417..0cc23c9 100644 +--- a/Scribus.pro ++++ b/Scribus.pro +@@ -276,7 +276,6 @@ HEADERS += scribus/about.h \ + scribus/insertaframe.h \ + scribus/insertTable.h \ + scribus/inspage.h \ +- scribus/ioapi.h \ + scribus/javadocs.h \ + scribus/KarbonCurveFit.h \ + scribus/langmgr.h \ +@@ -496,7 +495,6 @@ HEADERS += scribus/about.h \ + scribus/undostate.h \ + scribus/unicodesearch.h \ + scribus/units.h \ +- scribus/unzip.h \ + scribus/updatemanager.h \ + scribus/upgradechecker.h \ + scribus/urllauncher.h \ +@@ -933,7 +931,6 @@ SOURCES += scribus/about.cpp \ + scribus/insertaframe.cpp \ + scribus/insertTable.cpp \ + scribus/inspage.cpp \ +- scribus/ioapi.c \ + scribus/javadocs.cpp \ + scribus/KarbonCurveFit.cpp \ + scribus/langmgr.cpp \ +@@ -1143,7 +1140,6 @@ SOURCES += scribus/about.cpp \ + scribus/undostate.cpp \ + scribus/unicodesearch.cpp \ + scribus/units.cpp \ +- scribus/unzip.c \ + scribus/updatemanager.cpp \ + scribus/upgradechecker.cpp \ + scribus/urllauncher.cpp \ +diff --git a/scribus/CMakeLists.txt b/scribus/CMakeLists.txt +index dcd7e10..3aca69b 100644 +--- a/scribus/CMakeLists.txt ++++ b/scribus/CMakeLists.txt +@@ -405,7 +405,6 @@ SET(SCRIBUS_SOURCES + insertTable.cpp + insertaframe.cpp + inspage.cpp +- ioapi.c + javadocs.cpp + KarbonCurveFit.cpp + langmgr.cpp +@@ -613,7 +612,6 @@ SET(SCRIBUS_SOURCES + undostate.cpp + unicodesearch.cpp + units.cpp +- unzip.c + updatemanager.cpp + upgradechecker.cpp + urllauncher.cpp diff --git a/app-office/scribus/files/scribus-1.4.2-docs.patch b/app-office/scribus/files/scribus-1.4.2-docs.patch new file mode 100644 index 000000000000..977bfe0e2559 --- /dev/null +++ b/app-office/scribus/files/scribus-1.4.2-docs.patch @@ -0,0 +1,29 @@ + CMakeLists.txt | 4 +--- + 1 files changed, 1 insertions(+), 3 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 3f34048..4880594 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -267,7 +267,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) +@@ -801,12 +801,11 @@ INSTALL(FILES + BUILDING + ChangeLog + ChangeLogSVN +- COPYING + LINKS + NEWS + PACKAGING + README + TODO + TRANSLATION + DESTINATION ${DOCDIR} + ) diff --git a/app-office/scribus/files/scribus-1.4.4-ppc64-fpic.patch b/app-office/scribus/files/scribus-1.4.4-ppc64-fpic.patch new file mode 100644 index 000000000000..295cec391286 --- /dev/null +++ b/app-office/scribus/files/scribus-1.4.4-ppc64-fpic.patch @@ -0,0 +1,19 @@ + 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." diff --git a/app-office/scribus/files/scribus-1.5.0-QObject.patch b/app-office/scribus/files/scribus-1.5.0-QObject.patch new file mode 100644 index 000000000000..1ad2d1a575cc --- /dev/null +++ b/app-office/scribus/files/scribus-1.5.0-QObject.patch @@ -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)
diff --git a/app-office/scribus/files/scribus-1.5.0-docdir.patch b/app-office/scribus/files/scribus-1.5.0-docdir.patch new file mode 100644 index 000000000000..2ff316a91b57 --- /dev/null +++ b/app-office/scribus/files/scribus-1.5.0-docdir.patch @@ -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 (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) +-ENDIF (WIN32 OR OS2) ++IF(NOT DOCDIR) ++ 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) ++ ENDIF (WIN32 OR OS2) ++ENDIF(NOT DOCDIR) + IF(NOT IS_ABSOLUTE ${DOCDIR}) + ADD_DEFINITIONS("-DDOCDIR=\\\"${CMAKE_INSTALL_PREFIX}/${DOCDIR}\\\"") + ELSE() diff --git a/app-office/scribus/files/scribus-1.5.0-fpic.patch b/app-office/scribus/files/scribus-1.5.0-fpic.patch new file mode 100644 index 000000000000..9f6a6c4e0aba --- /dev/null +++ b/app-office/scribus/files/scribus-1.5.0-fpic.patch @@ -0,0 +1,178 @@ + CMakeLists.txt | 15 +++++++++++++++ + 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/pgf/CMakeLists.txt | 2 ++ + scribus/third_party/prc/CMakeLists.txt | 2 ++ + scribus/third_party/wpg/CMakeLists.txt | 7 ++++--- + scribus/third_party/zip/CMakeLists.txt | 2 ++ + 11 files changed, 33 insertions(+), 10 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 29d66f3..a92da7e 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -131,6 +131,21 @@ IF (_machine_sparc64) + SET(ARCH64BIT 1) + ENDIF (_machine_sparc64) + ++STRING(REGEX MATCH "(hppa*)" _machine_hppa "${MACHINE}") ++IF (_machine_hppa) ++ MESSAGE(STATUS "Found target Hppa") ++ SET(ARCH_HPPA 1) ++ENDIF (_machine_hppa) ++ ++ ++# 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/pgf/CMakeLists.txt b/scribus/third_party/pgf/CMakeLists.txt +index f84b3d4..d3b1db6 100644 +--- a/scribus/third_party/pgf/CMakeLists.txt ++++ b/scribus/third_party/pgf/CMakeLists.txt +@@ -3,6 +3,8 @@ ${CMAKE_SOURCE_DIR} + ${CMAKE_SOURCE_DIR}/scribus + ) + ++SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${CMAKE_CXX_FLAGS_FPIC}") ++ + SET(SCRIBUS_PGF_LIB_SOURCES + Decoder.cpp + Encoder.cpp +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 +diff --git a/scribus/third_party/wpg/CMakeLists.txt b/scribus/third_party/wpg/CMakeLists.txt +index ff31e9f..fbc5cd4 100644 +--- a/scribus/third_party/wpg/CMakeLists.txt ++++ b/scribus/third_party/wpg/CMakeLists.txt +@@ -2,10 +2,11 @@ INCLUDE_DIRECTORIES( + ${CMAKE_SOURCE_DIR}
+ ${CMAKE_SOURCE_DIR}/scribus
+ )
++
+ SET(LIB_TYPE STATIC)
+-IF (ARCH_X86_64 EQUAL 1)
+- SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fPIC")
+-ENDIF (ARCH_X86_64 EQUAL 1)
++
++SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${CMAKE_CXX_FLAGS_FPIC}")
++
+ SET(WPG_SOURCES
+ WPG1Parser.cpp
+ WPG2Parser.cpp
+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 |