From: "Aaron Bauman" <bman@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: app-office/scribus/files/
Date: Wed, 1 Jan 2020 23:08:25 +0000 (UTC) [thread overview]
Message-ID: <1577920091.534c58cdbefddb55d4fd9689b1a59c9b8768765b.bman@gentoo> (raw)
commit: 534c58cdbefddb55d4fd9689b1a59c9b8768765b
Author: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail <DOT> com>
AuthorDate: Wed Jan 1 21:12:22 2020 +0000
Commit: Aaron Bauman <bman <AT> gentoo <DOT> org>
CommitDate: Wed Jan 1 23:08:11 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=534c58cd
app-office/scribus: remove unused patch
Signed-off-by: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/14205
Signed-off-by: Aaron Bauman <bman <AT> gentoo.org>
.../scribus/files/scribus-1.5.3-docdir.patch | 42 ----------------------
1 file changed, 42 deletions(-)
diff --git a/app-office/scribus/files/scribus-1.5.3-docdir.patch b/app-office/scribus/files/scribus-1.5.3-docdir.patch
deleted file mode 100644
index d866922fa18..00000000000
--- a/app-office/scribus/files/scribus-1.5.3-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()
next reply other threads:[~2020-01-01 23:08 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-01-01 23:08 Aaron Bauman [this message]
-- strict thread matches above, loose matches on Subject: below --
2024-01-13 18:51 [gentoo-commits] repo/gentoo:master commit in: app-office/scribus/files/ Michał Górny
2021-10-10 0:54 Sam James
2019-01-16 18:39 Andreas Sturmlechner
2017-12-12 20:17 Patrice Clement
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1577920091.534c58cdbefddb55d4fd9689b1a59c9b8768765b.bman@gentoo \
--to=bman@gentoo.org \
--cc=gentoo-commits@lists.gentoo.org \
--cc=gentoo-dev@lists.gentoo.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox