[gentoo-commits] repo/gentoo:master commit in: media-sound/hydrogen/files/, media-sound/hydrogen/

public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed

From: "Miroslav Šulc" <fordfrog@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: media-sound/hydrogen/files/, media-sound/hydrogen/
Date: Sat, 28 Nov 2020 09:53:24 +0000 (UTC)	[thread overview]
Message-ID: <1606557193.e6eb98765bc67d766c28d3990b0f70a874867c0d.fordfrog@gentoo> (raw)

commit:     e6eb98765bc67d766c28d3990b0f70a874867c0d
Author:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
AuthorDate: Sat Nov 28 09:12:22 2020 +0000
Commit:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Sat Nov 28 09:53:13 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e6eb9876

media-sound/hydrogen: updated 9999's patches

Package-Manager: Portage-3.0.10, Repoman-3.0.2
Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org>

 .../files/hydrogen-9999-gnuinstalldirs.patch       | 29 ++++++++++++++++++++++
 .../hydrogen/files/hydrogen-9999-i18n-path.patch   | 13 ----------
 media-sound/hydrogen/hydrogen-9999.ebuild          |  3 +--
 3 files changed, 30 insertions(+), 15 deletions(-)

diff --git a/media-sound/hydrogen/files/hydrogen-9999-gnuinstalldirs.patch b/media-sound/hydrogen/files/hydrogen-9999-gnuinstalldirs.patch
new file mode 100644
index 00000000000..ef70497abf7
--- /dev/null
+++ b/media-sound/hydrogen/files/hydrogen-9999-gnuinstalldirs.patch
@@ -0,0 +1,29 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 04aa6380..e979783e 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -362,10 +362,10 @@ ELSE()
+ 	INSTALL(DIRECTORY data DESTINATION ${H2_SYS_PATH} PATTERN ".git" EXCLUDE PATTERN "i18n" EXCLUDE PATTERN doc EXCLUDE)
+ ENDIF()
+ IF(NOT MINGW AND NOT APPLE)
+-	INSTALL(FILES ${CMAKE_SOURCE_DIR}/linux/org.hydrogenmusic.Hydrogen.appdata.xml DESTINATION "${CMAKE_INSTALL_DATAROOTDIR}/appdata")
+-	INSTALL(FILES ${CMAKE_SOURCE_DIR}/linux/org.hydrogenmusic.Hydrogen.desktop DESTINATION "${CMAKE_INSTALL_DATAROOTDIR}/applications")
++	INSTALL(FILES ${CMAKE_SOURCE_DIR}/linux/org.hydrogenmusic.Hydrogen.appdata.xml DESTINATION "${CMAKE_INSTALL_FULL_DATAROOTDIR}/metainfo")
++	INSTALL(FILES ${CMAKE_SOURCE_DIR}/linux/org.hydrogenmusic.Hydrogen.desktop DESTINATION "${CMAKE_INSTALL_FULL_DATAROOTDIR}/applications")
+ 	INSTALL(FILES ${CMAKE_SOURCE_DIR}/data/img/gray/h2-icon.svg DESTINATION "${CMAKE_INSTALL_FULL_DATAROOTDIR}/icons/hicolor/scalable/apps" RENAME "org.hydrogenmusic.Hydrogen.svg")
+-	INSTALL(FILES ${CMAKE_SOURCE_DIR}/linux/hydrogen.1 DESTINATION "${CMAKE_INSTALL_MANDIR}/man1")
++	INSTALL(FILES ${CMAKE_SOURCE_DIR}/linux/hydrogen.1 DESTINATION "${CMAKE_INSTALL_FULL_MANDIR}/man1")
+ ENDIF()
+ 
+ #
+diff --git a/src/core/CMakeLists.txt b/src/core/CMakeLists.txt
+index cfdc72a7..b7b0dbcb 100644
+--- a/src/core/CMakeLists.txt
++++ b/src/core/CMakeLists.txt
+@@ -66,5 +66,5 @@ INSTALL(TARGETS hydrogen-core-${VERSION}
+ 
+ IF(NOT APPLE AND NOT WIN32)
+     INSTALL(DIRECTORY ${CMAKE_SOURCE_DIR}/src/core DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/hydrogen" FILES_MATCHING PATTERN "*.h" PATTERN ".svn" EXCLUDE)
+-    INSTALL(FILES "${CMAKE_CURRENT_BINARY_DIR}/config.h" DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/hydrogen" )
++    INSTALL(FILES "${CMAKE_CURRENT_BINARY_DIR}/config.h" DESTINATION "${CMAKE_INSTALL_FULL_INCLUDEDIR}/hydrogen" )
+ ENDIF()

diff --git a/media-sound/hydrogen/files/hydrogen-9999-i18n-path.patch b/media-sound/hydrogen/files/hydrogen-9999-i18n-path.patch
deleted file mode 100644
index 3c32e2b3e62..00000000000
--- a/media-sound/hydrogen/files/hydrogen-9999-i18n-path.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- a/data/i18n/CMakeLists.txt	2020-09-07 09:31:57.481066097 +0200
-+++ b/data/i18n/CMakeLists.txt	2020-09-07 09:29:27.612763184 +0200
-@@ -5,4 +5,9 @@
- 
- QT5_ADD_TRANSLATION(QM_FILES ${TS_FILES})
- ADD_CUSTOM_TARGET(translations ALL DEPENDS ${QM_FILES})
--INSTALL(FILES ${QM_FILES} DESTINATION "./data/i18n")
-+
-+IF(MINGW)
-+	INSTALL(FILES ${QM_FILES} DESTINATION "data/i18n")
-+ELSE()
-+	INSTALL(FILES ${QM_FILES} DESTINATION "${H2_SYS_PATH}/data/i18n")
-+ENDIF()

diff --git a/media-sound/hydrogen/hydrogen-9999.ebuild b/media-sound/hydrogen/hydrogen-9999.ebuild
index 87e5b809fe3..aa141dadf06 100644
--- a/media-sound/hydrogen/hydrogen-9999.ebuild
+++ b/media-sound/hydrogen/hydrogen-9999.ebuild
@@ -58,8 +58,7 @@ RDEPEND="${CDEPEND}"
 DOCS=( AUTHORS ChangeLog DEVELOPERS README.txt )
 
 PATCHES=(
-	"${FILESDIR}/${PN}-1.0.0-gnuinstalldirs.patch"
-	"${FILESDIR}/${P}-i18n-path.patch"
+	"${FILESDIR}/${P}-gnuinstalldirs.patch"
 )
 
 src_prepare() {

next             reply	other threads:[~2020-11-28  9:53 UTC|newest]

Thread overview: 15+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-11-28  9:53 Miroslav Šulc [this message]
  -- strict thread matches above, loose matches on Subject: below --
2024-12-06  7:57 [gentoo-commits] repo/gentoo:master commit in: media-sound/hydrogen/files/, media-sound/hydrogen/ Miroslav Šulc
2024-10-30 12:19 Miroslav Šulc
2024-04-01  6:46 Sam James
2023-10-10  8:39 Miroslav Šulc
2020-10-07  8:12 Miroslav Šulc
2020-09-18  8:21 Miroslav Šulc
2020-09-07  7:50 Miroslav Šulc
2020-08-07 10:26 Miroslav Šulc
2020-06-15 10:02 Miroslav Šulc
2020-05-12  8:34 Miroslav Šulc
2020-04-01 16:23 Miroslav Šulc
2018-11-09  1:54 Andreas Sturmlechner
2018-03-18 12:31 Andreas Sturmlechner
2017-09-26 18:11 Andreas Hüttel

find likely ancestor, descendant, or conflicting patches for this message:
( dfblob:ef70497abf dfblob:3c32e2b3e6 dfblob:87e5b809fe
dfblob:aa141dadf0 )
 OR (
bs:"[gentoo-commits] repo/gentoo:master commit in: media-sound/hydrogen/files/, media-sound/hydrogen/" )
	(help)

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=1606557193.e6eb98765bc67d766c28d3990b0f70a874867c0d.fordfrog@gentoo \
    --to=fordfrog@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