mirror of
https://github.com/gentoo-mirror/gentoo.git
synced 2026-08-06 00:48:18 -07:00
app-office/scribus: QA: Remove duplicate patches
Package-Manager: Portage-2.3.36, Repoman-2.3.9
This commit is contained in:
@@ -1,42 +0,0 @@
|
||||
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()
|
||||
- if(TAG_VERSION OR BUILD_OSX_BUNDLE)
|
||||
- set(DOCDIR "${CMAKE_INSTALL_DATAROOTDIR}/doc/${MAIN_DIR_NAME}${TAG_VERSION}/")
|
||||
- else()
|
||||
- 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()
|
||||
+if(NOT DOCDIR)
|
||||
+ 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}/")
|
||||
+ else()
|
||||
+ 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()
|
||||
if(NOT IS_ABSOLUTE ${DOCDIR})
|
||||
add_definitions("-DDOCDIR=\\\"${CMAKE_INSTALL_PREFIX}/${DOCDIR}\\\"")
|
||||
else()
|
||||
@@ -1,16 +0,0 @@
|
||||
scribus/third_party/prc/CMakeLists.txt | 2 ++
|
||||
1 file changed, 2 insertions(+)
|
||||
|
||||
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
|
||||
@@ -94,8 +94,8 @@ DEPEND="${COMMON_DEPEND}
|
||||
virtual/pkgconfig"
|
||||
|
||||
PATCHES=(
|
||||
"${FILESDIR}"/${P}-docdir.patch
|
||||
"${FILESDIR}"/${P}-fpic.patch
|
||||
"${FILESDIR}"/${PN}-1.5.3-docdir.patch
|
||||
"${FILESDIR}"/${PN}-1.5.3-fpic.patch
|
||||
)
|
||||
|
||||
src_prepare() {
|
||||
|
||||
Reference in New Issue
Block a user