Gentoo Archives: gentoo-commits

From: Aaron Bauman <bman@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: app-office/scribus/files/
Date: Wed, 01 Jan 2020 23:08:29
Message-Id: 1577920091.534c58cdbefddb55d4fd9689b1a59c9b8768765b.bman@gentoo
1 commit: 534c58cdbefddb55d4fd9689b1a59c9b8768765b
2 Author: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail <DOT> com>
3 AuthorDate: Wed Jan 1 21:12:22 2020 +0000
4 Commit: Aaron Bauman <bman <AT> gentoo <DOT> org>
5 CommitDate: Wed Jan 1 23:08:11 2020 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=534c58cd
7
8 app-office/scribus: remove unused patch
9
10 Signed-off-by: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail.com>
11 Closes: https://github.com/gentoo/gentoo/pull/14205
12 Signed-off-by: Aaron Bauman <bman <AT> gentoo.org>
13
14 .../scribus/files/scribus-1.5.3-docdir.patch | 42 ----------------------
15 1 file changed, 42 deletions(-)
16
17 diff --git a/app-office/scribus/files/scribus-1.5.3-docdir.patch b/app-office/scribus/files/scribus-1.5.3-docdir.patch
18 deleted file mode 100644
19 index d866922fa18..00000000000
20 --- a/app-office/scribus/files/scribus-1.5.3-docdir.patch
21 +++ /dev/null
22 @@ -1,42 +0,0 @@
23 - CMakeLists.txt | 28 +++++++++++++++-------------
24 - 1 file changed, 15 insertions(+), 13 deletions(-)
25 -
26 -diff --git a/CMakeLists.txt b/CMakeLists.txt
27 -index 29d66f3..1c08cdd 100644
28 ---- a/CMakeLists.txt
29 -+++ b/CMakeLists.txt
30 -@@ -244,19 +244,21 @@ else()
31 - endif()
32 -
33 - #SHARE - use the default on Apple as TAG_VERSION is empty
34 --if(WIN32 OR OS2)
35 -- set(DOCDIR "${CMAKE_INSTALL_DATAROOTDIR}/doc/")
36 --else()
37 -- if(TAG_VERSION OR BUILD_OSX_BUNDLE)
38 -- set(DOCDIR "${CMAKE_INSTALL_DATAROOTDIR}/doc/${MAIN_DIR_NAME}${TAG_VERSION}/")
39 -- else()
40 -- if(NOT WANT_VERSIONING)
41 -- set(DOCDIR "${CMAKE_INSTALL_DATAROOTDIR}/doc/${MAIN_DIR_NAME}/")
42 -- else()
43 -- set(DOCDIR "${CMAKE_INSTALL_DATAROOTDIR}/doc/${MAIN_DIR_NAME}-${VERSION}/")
44 -- endif()
45 -- endif()
46 --endif()
47 -+if(NOT DOCDIR)
48 -+ if(WIN32 OR OS2)
49 -+ set(DOCDIR "${CMAKE_INSTALL_DATAROOTDIR}/doc/")
50 -+ else()
51 -+ if(TAG_VERSION OR BUILD_OSX_BUNDLE)
52 -+ set(DOCDIR "${CMAKE_INSTALL_DATAROOTDIR}/doc/${MAIN_DIR_NAME}${TAG_VERSION}/")
53 -+ else()
54 -+ if(NOT WANT_VERSIONING)
55 -+ set(DOCDIR "${CMAKE_INSTALL_DATAROOTDIR}/doc/${MAIN_DIR_NAME}/")
56 -+ else()
57 -+ set(DOCDIR "${CMAKE_INSTALL_DATAROOTDIR}/doc/${MAIN_DIR_NAME}-${VERSION}/")
58 -+ endif()
59 -+ endif()
60 -+ endif()
61 -+endif()
62 - if(NOT IS_ABSOLUTE ${DOCDIR})
63 - add_definitions("-DDOCDIR=\\\"${CMAKE_INSTALL_PREFIX}/${DOCDIR}\\\"")
64 - else()