diff options
| author | V3n3RiX <venerix@redcorelinux.org> | 2020-11-25 22:39:15 +0000 |
|---|---|---|
| committer | V3n3RiX <venerix@redcorelinux.org> | 2020-11-25 22:39:15 +0000 |
| commit | d934827bf44b7cfcf6711964418148fa60877668 (patch) | |
| tree | 0625f358789b5e015e49db139cc1dbc9be00428f /app-text/xournalpp | |
| parent | 2e34d110f164bf74d55fced27fe0000201b3eec5 (diff) | |
gentoo resync : 25.11.2020
Diffstat (limited to 'app-text/xournalpp')
| -rw-r--r-- | app-text/xournalpp/Manifest | 4 | ||||
| -rw-r--r-- | app-text/xournalpp/files/xournalpp-1.0.17-translations.patch | 24 | ||||
| -rw-r--r-- | app-text/xournalpp/files/xournalpp-1.0.18-nostrip.patch | 15 | ||||
| -rw-r--r-- | app-text/xournalpp/xournalpp-1.0.18-r1.ebuild | 6 |
4 files changed, 22 insertions, 27 deletions
diff --git a/app-text/xournalpp/Manifest b/app-text/xournalpp/Manifest index 93867f5f6ff8..aa7c8deb4097 100644 --- a/app-text/xournalpp/Manifest +++ b/app-text/xournalpp/Manifest @@ -1,5 +1,5 @@ -AUX xournalpp-1.0.17-translations.patch 716 BLAKE2B df50ccfdf86069f08b29168af42955d80b363db5d271bd0c97f07cdc626995922471186cd83f7860f0eecbf8e53982639e23a5a2b817310f6d3d12e529577c45 SHA512 83ae3ff7ae1dd4933f063c9e35a38684eeb6638fbc9ec52b863bd1499d2fe958b7565e8609060d9ba8388eb6c89e046b8908c0fd7387981154cf86da3b574184 +AUX xournalpp-1.0.18-nostrip.patch 498 BLAKE2B 451eff71c86eff703d7b9dbee910c8938e10fe963d416c10fc0a5da04071672a26313d7c6fd887e960df3dc9b717a74d7b3974020ea6dfafefe2f06ec539cd6e SHA512 b883ba8094f46462c8415df10154fcbe2e773df981bc31fae5695a7d34de97bb984aa7b912cab3c9dcb121f10d52796c766f295d1d6a6ff424fa4d99a9f04e2e DIST xournalpp-1.0.18.tgz 14892343 BLAKE2B d2aaede0e85d724cf8032f38a6fa2c3c4862f26d410dbab8264dd50ab8ee0d26889eeab433ef615fe9ce271710192eca380ff80149431d5368125926cf8d2b25 SHA512 90568a2674a18ff711ecef5f1a66ea1c5746d7f1fde271b36342d9bf48e096e63075cf7fd8b69e39e144273a4d1b922c415eee929eba94b2fa515a0bb481815a -EBUILD xournalpp-1.0.18-r1.ebuild 852 BLAKE2B 0aadb7823ff69ec04308c4c0a70e5c69724912342cbface8855c9aac2639d89ef5d738a4dc376793d24f31aa2f0b15a8e8ee190b1fcfaf2fec15323412b380ef SHA512 4abf0f2f5cf053d58b4200aa11e6b44ef961ae1cec62a62f93db0c9550923751af32a56201f60095a2c6a2647fa568c3b064ea19ba7f5d9e174386c9f705ff53 +EBUILD xournalpp-1.0.18-r1.ebuild 911 BLAKE2B a00d8ba904bfa33a5323d8dc8a80c457886263e08240e364423f99b26b4278e4d6f54532207e7a33a122b8b7bd9b7dac2083697e4f756277bf616824b88cb2ab SHA512 019fabd488c5418652583c15aa0e06f13a3d68eec69b4dce656ca27c5d464201307c31c45c501e96ef86021de8b6ca8e93e386dc5abc56d61fee2e5c6e84110f EBUILD xournalpp-9999.ebuild 852 BLAKE2B 0aadb7823ff69ec04308c4c0a70e5c69724912342cbface8855c9aac2639d89ef5d738a4dc376793d24f31aa2f0b15a8e8ee190b1fcfaf2fec15323412b380ef SHA512 4abf0f2f5cf053d58b4200aa11e6b44ef961ae1cec62a62f93db0c9550923751af32a56201f60095a2c6a2647fa568c3b064ea19ba7f5d9e174386c9f705ff53 MISC metadata.xml 220 BLAKE2B a2c3e050477292c8000b5bb0ffa26d84a57fb435ba5c96dac5c5f4d6f3e823c07116520102eacefd24227a4490dd340c7836cf8d1ba28d23fc76eeaadf04c7b9 SHA512 594861f664581733d740d9f501b84c56f9c9c67f932e97f5905a37d4f19b5a19ef4045c50571a412fbc64d318f3ad1d403ed37c61449b37e74df3d5753aedda8 diff --git a/app-text/xournalpp/files/xournalpp-1.0.17-translations.patch b/app-text/xournalpp/files/xournalpp-1.0.17-translations.patch deleted file mode 100644 index 95283b014009..000000000000 --- a/app-text/xournalpp/files/xournalpp-1.0.17-translations.patch +++ /dev/null @@ -1,24 +0,0 @@ -From 12387b01a1c7e529580c6f27e92dad3e8b4f9858 Mon Sep 17 00:00:00 2001 -From: Bryan Tan <techniux@gmail.com> -Date: Fri, 7 Feb 2020 19:47:18 -0800 -Subject: [PATCH] Fix translation target - -- Do not modify po files in place -- Always build translations ---- - po/CMakeLists.txt | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/po/CMakeLists.txt b/po/CMakeLists.txt -index f957a199d..73ce0f04f 100644 ---- a/po/CMakeLists.txt -+++ b/po/CMakeLists.txt -@@ -20,7 +20,7 @@ if (XGETTEXT_FOUND) - "${PROJECT_SOURCE_DIR}/ui/*.glade" - ) - -- gettext_create_translations ("${potfile}") -+ gettext_create_translations ("${potfile}" ALL NOUPDATE) - - else (XGETTEXT_FOUND) - message (ERROR "Gettext not found!") diff --git a/app-text/xournalpp/files/xournalpp-1.0.18-nostrip.patch b/app-text/xournalpp/files/xournalpp-1.0.18-nostrip.patch new file mode 100644 index 000000000000..120e86ff586f --- /dev/null +++ b/app-text/xournalpp/files/xournalpp-1.0.18-nostrip.patch @@ -0,0 +1,15 @@ +diff --git a/src/xoj-preview-extractor/CMakeLists.txt b/src/xoj-preview-extractor/CMakeLists.txt +index b2029d68..2e1d68ba 100644 +--- a/src/xoj-preview-extractor/CMakeLists.txt ++++ b/src/xoj-preview-extractor/CMakeLists.txt +@@ -36,10 +36,6 @@ target_link_libraries (xournal-thumbnailer + + set (THUMBNAILER_BIN "xournal-thumbnailer") + +-add_custom_command (TARGET xournal-thumbnailer POST_BUILD +- COMMAND ${CMAKE_STRIP} ${THUMBNAILER_BIN} +-) +- + ## Install ## + + install (TARGETS xournal-thumbnailer diff --git a/app-text/xournalpp/xournalpp-1.0.18-r1.ebuild b/app-text/xournalpp/xournalpp-1.0.18-r1.ebuild index 7057d336d41d..f04ebe22737e 100644 --- a/app-text/xournalpp/xournalpp-1.0.18-r1.ebuild +++ b/app-text/xournalpp/xournalpp-1.0.18-r1.ebuild @@ -10,7 +10,7 @@ if [[ ${PV} == *9999 ]]; then EGIT_REPO_URI="https://github.com/xournalpp/xournalpp.git" unset SRC_URI else - KEYWORDS="~amd64" + KEYWORDS="amd64" SRC_URI="https://github.com/xournalpp/xournalpp/archive/${PV}.tar.gz -> ${P}.tgz" fi @@ -40,6 +40,10 @@ BDEPEND=" sys-apps/lsb-release " +PATCHES=( + "${FILESDIR}/${P}-nostrip.patch" # bug 745255 +) + src_prepare() { cmake-utils_src_prepare } |