diff options
| author |   Miroslav Šulc <fordfrog@gentoo.org> | 2016-12-06 10:31:37 +0100 |
|---|---|---|
| committer | Miroslav Šulc <fordfrog@gentoo.org> | 2016-12-06 10:32:05 +0100 |
| commit | aec91a89bd09d87037e3d64c9d924faa644d71ed (patch) | |
| tree | 8f3fb4c666f742880187095193b622747d4b20f6 /app-office/scribus | |
| parent | x11-misc/x11vnc-0.9.14_p20161013-r0: stable on alpha (diff) | |
| download | gentoo-aec91a89bd09d87037e3d64c9d924faa644d71ed.tar.gz gentoo-aec91a89bd09d87037e3d64c9d924faa644d71ed.tar.bz2 gentoo-aec91a89bd09d87037e3d64c9d924faa644d71ed.zip | |
app-office/scribus-9999: fixed patching the sources (ajdusted docdir patch and not using fpic patch as it is already applied)
Package-Manager: portage-2.3.3
Diffstat (limited to 'app-office/scribus')
| -rw-r--r-- | app-office/scribus/files/scribus-9999-docdir.patch | 31 | ||||
| -rw-r--r-- | app-office/scribus/scribus-9999.ebuild | 3 |
2 files changed, 32 insertions, 2 deletions
diff --git a/app-office/scribus/files/scribus-9999-docdir.patch b/app-office/scribus/files/scribus-9999-docdir.patch new file mode 100644 index 000000000000..442829d3bda9 --- /dev/null +++ b/app-office/scribus/files/scribus-9999-docdir.patch @@ -0,0 +1,31 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 79b1feb..259d474 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -284,16 +284,18 @@ 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}/") ++if(NOT DOCDIR) ++ if(WIN32 OR OS2) ++ set(DOCDIR "${CMAKE_INSTALL_DATAROOTDIR}/doc/") + else() +- if(NOT WANT_VERSIONING) +- set(DOCDIR "${CMAKE_INSTALL_DATAROOTDIR}/doc/${MAIN_DIR_NAME}/") ++ if(TAG_VERSION OR BUILD_OSX_BUNDLE) ++ set(DOCDIR "${CMAKE_INSTALL_DATAROOTDIR}/doc/${MAIN_DIR_NAME}${TAG_VERSION}/") + else() +- set(DOCDIR "${CMAKE_INSTALL_DATAROOTDIR}/doc/${MAIN_DIR_NAME}-${VERSION}/") ++ 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() diff --git a/app-office/scribus/scribus-9999.ebuild b/app-office/scribus/scribus-9999.ebuild index e96e3f6e8417..ec8570cb5925 100644 --- a/app-office/scribus/scribus-9999.ebuild +++ b/app-office/scribus/scribus-9999.ebuild @@ -74,8 +74,7 @@ DEPEND="${COMMON_DEPEND} virtual/pkgconfig" PATCHES=( - "${FILESDIR}"/${PN}-1.5.0-docdir.patch - "${FILESDIR}"/${PN}-1.5.2-fpic.patch + "${FILESDIR}"/${P}-docdir.patch ) src_prepare() { |