summaryrefslogtreecommitdiff
path: root/app-office/scribus
diff options
context:
space:
mode:
authorV3n3RiX <venerix@redcorelinux.org>2018-05-11 16:02:49 +0100
committerV3n3RiX <venerix@redcorelinux.org>2018-05-11 16:02:49 +0100
commit88ebe56470c37b02a044e1091cad6b2df0f3be8f (patch)
treed80b2d9337c01c4a0fe11a2ef9691fc3153ed6d3 /app-office/scribus
parent4645b6f17f0da81e9fe84081fb126a37102ba153 (diff)
gentoo resync : 11.05.2018
Diffstat (limited to 'app-office/scribus')
-rw-r--r--app-office/scribus/Manifest4
-rw-r--r--app-office/scribus/files/scribus-9999-docdir.patch42
-rw-r--r--app-office/scribus/files/scribus-9999-fpic.patch16
-rw-r--r--app-office/scribus/scribus-9999.ebuild4
4 files changed, 3 insertions, 63 deletions
diff --git a/app-office/scribus/Manifest b/app-office/scribus/Manifest
index 05cece9cc29c..0280291133df 100644
--- a/app-office/scribus/Manifest
+++ b/app-office/scribus/Manifest
@@ -4,9 +4,7 @@ AUX scribus-1.5.3-fpic.patch 499 BLAKE2B 68790e6d7a76c4ae01490956b0db09bc79e1c27
AUX scribus-1.5.3-poppler-0.58.patch 17057 BLAKE2B 87a0e55baa398ed412b48cb5c4d3c8c2dd8f15f40da5a20f9d09a652191c77dc103640357dc5928fbfeae90031762e288221c13115da97a7d307b676f697510d SHA512 e9ad65c1c20ca6efd204829bec141336d250c073ebed08f74f07c416213bf46204826abc410510f7a72df21a00a43f7e1793847107612981dedbe96a5927956d
AUX scribus-1.5.3-qt-5.11.patch 2165 BLAKE2B 57d76b3eda506465442a4fffcf268f1db559a341273350825d5d7e67610f5873501e16c3c1c7a27312250d4fcde920131ca2671fb349833756aa4ba372277c29 SHA512 5cbb775ab034ecf3a26a3181fdf9985418af555cfec42fc67fe314a0cf8b3ddcc01fdbded81591c7a309dc7a47611ea0126bf2d86c39fb4825d6766f0a1fff46
AUX scribus-1.5.3-x86-fpic.patch 759 BLAKE2B 0abaed6521042c9398ea12075ffe88f3ec47b2f020a7040beb7312dfbb298e733b380935d5676102df7b04512f866bea2fb67fc9135cc741db208ad4b451176a SHA512 8b843098e31be3ad07ed82225a6b9bb7e46ae29b369508cdea6f092142d27071908c510ccbfe11b778d970e0b3a5bf14277e0124c781ba0f8bc230716a9c03e0
-AUX scribus-9999-docdir.patch 1309 BLAKE2B 978a5b54992bc2d2e84cc7435ffe15c2ace03a649de6b240a5b7a8a513134eb1ffac3f9a0f8adcf8679bf07f7beef47b4216102f9d3e3c84333b208b68e41e00 SHA512 5f3bd4fe4f61a2c8d2a58e3f480c95d32280358366a7eabc3c483abe1f3ef07ef5e3864be8ffce8b48584da23f81cb9b96b81c83a59ad4f3da5c7a5c34234063
-AUX scribus-9999-fpic.patch 499 BLAKE2B 68790e6d7a76c4ae01490956b0db09bc79e1c27269fa4cd4c4752bd60b228e36973a1c32d5d8156c12782091fa15614ba274be07dee0d92df9ef521f2d4361a2 SHA512 e38fc85e72af67c0fea4c14dad92a759f5065cd4e337ef2257a90f27e39297c6991c467e53e9c51ae247bf2f8c34fa62fa76cf839a53b386c9c378e53756d015
DIST scribus-1.5.3.tar.xz 74222084 BLAKE2B ffb50c728c0669ab8a22c416c143e8dd47c818120247b4cf5a890872857326b53491be99004a344d78ea2cf2b174ae2987ddcddb4cef39a6e95fe1695be45d48 SHA512 487cea685869397bc52acc7be8e8e9f4bad3f594c1f95740207e4d9e26b07461a7fd2a95d5337b38f1b0fa6504a9f6059cca6740c78cc165eab0b779ffdfe980
EBUILD scribus-1.5.3-r1.ebuild 7057 BLAKE2B 3fb1fa669b1742ff4426032e0c0caddcd3c7f2f3653acfe41c9cac88d46bddd85051d688d25a52f82f5f77cba0637ea64e90be89c0424d8355d9b439650f08af SHA512 0040419091f78c69532d82d86a45f0d43fd66d1a72d495382e2c30f1358404f7faa5a9e8df14344f7cfba297afd2cd78e48ee7c3f3cc846d3ac345c28ae828c5
-EBUILD scribus-9999.ebuild 6905 BLAKE2B b0d53f60e39fd23d041faa595dc8a26c5404fd4920c0f084d0805854b9d3b46ab01a7b4799098c8d9ff9004206b9b5837f2c14d46ca98d2297fdc907a1fba971 SHA512 c8c651d3375c4f5c3090cd5a202b6ca8c19e9c978245ba7275f6db374aa6336c71d4aa0e7d7c2a9dad7865bd5de54bf895d06c75619d67272e068d04ae37932a
+EBUILD scribus-9999.ebuild 6919 BLAKE2B 001f1dd93db566b3403db7066cb3f1e9067449f39af08335d54cbf5880a265f1b51f33fd5036b42851d1420cd375c0a08e97b15a29e6d49f3556ea65ecef7cc3 SHA512 92bbd75dd620a61f03373b969e38d939a32ddddc9f4db39213c0b52c8edc5897d594fb1e5a9b62060abbe79ff70f5845b150efbc7738b2f2ea93b6ab73cda008
MISC metadata.xml 845 BLAKE2B 6522fd7c428e4f5f8bd77c03a09408e443e91d45fb0bbe72a312d48f1cdee38ab62a4059940237f18aa2e63b0595b79598846d5acb3d7289427b9d1cae768510 SHA512 18872713a1aa8d6739186ffa60f8f747f8ee9de41339c8a2d20c49d97771ce3967839044f7573bab2d7717a73c2705722071d16441bb458060db5f9e5c15f3d1
diff --git a/app-office/scribus/files/scribus-9999-docdir.patch b/app-office/scribus/files/scribus-9999-docdir.patch
deleted file mode 100644
index d866922fa18a..000000000000
--- a/app-office/scribus/files/scribus-9999-docdir.patch
+++ /dev/null
@@ -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()
diff --git a/app-office/scribus/files/scribus-9999-fpic.patch b/app-office/scribus/files/scribus-9999-fpic.patch
deleted file mode 100644
index ba0721955ef8..000000000000
--- a/app-office/scribus/files/scribus-9999-fpic.patch
+++ /dev/null
@@ -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
diff --git a/app-office/scribus/scribus-9999.ebuild b/app-office/scribus/scribus-9999.ebuild
index e0fb1c4035f2..742448b27386 100644
--- a/app-office/scribus/scribus-9999.ebuild
+++ b/app-office/scribus/scribus-9999.ebuild
@@ -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() {