From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-1203703-garchives=archives.gentoo.org@lists.gentoo.org>
Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80])
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
(No client certificate requested)
by finch.gentoo.org (Postfix) with ESMTPS id 1461A138359
for <garchives@archives.gentoo.org>; Mon, 7 Sep 2020 07:50:15 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id 3A0A9E08F0;
Mon, 7 Sep 2020 07:50:14 +0000 (UTC)
Received: from smtp.gentoo.org (smtp.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4])
(using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits))
(No client certificate requested)
by pigeon.gentoo.org (Postfix) with ESMTPS id 12453E08F0
for <gentoo-commits@lists.gentoo.org>; Mon, 7 Sep 2020 07:50:14 +0000 (UTC)
Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84])
(using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits))
(No client certificate requested)
by smtp.gentoo.org (Postfix) with ESMTPS id 6D3C5335D88
for <gentoo-commits@lists.gentoo.org>; Mon, 7 Sep 2020 07:50:04 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
by oystercatcher.gentoo.org (Postfix) with ESMTP id D1494320
for <gentoo-commits@lists.gentoo.org>; Mon, 7 Sep 2020 07:50:01 +0000 (UTC)
From: "Miroslav Šulc" <fordfrog@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: 8bit
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "Miroslav Šulc" <fordfrog@gentoo.org>
Message-ID: <1599464996.f3a7b2d7aa852019000f5281c765b7d82d64f3ff.fordfrog@gentoo>
Subject: [gentoo-commits] repo/gentoo:master commit in: media-sound/hydrogen/files/, media-sound/hydrogen/
X-VCS-Repository: repo/gentoo
X-VCS-Files: media-sound/hydrogen/files/hydrogen-1.0.0-i18n-path.patch media-sound/hydrogen/files/hydrogen-9999-i18n-path.patch media-sound/hydrogen/hydrogen-1.0.0.ebuild media-sound/hydrogen/hydrogen-9999.ebuild
X-VCS-Directories: media-sound/hydrogen/ media-sound/hydrogen/files/
X-VCS-Committer: fordfrog
X-VCS-Committer-Name: Miroslav Šulc
X-VCS-Revision: f3a7b2d7aa852019000f5281c765b7d82d64f3ff
X-VCS-Branch: master
Date: Mon, 7 Sep 2020 07:50:01 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply
X-Archives-Salt: 25133934-a0c0-4712-85f0-186f10403166
X-Archives-Hash: 1f9475f48f2c531ace89051a5acc9cf7
commit: f3a7b2d7aa852019000f5281c765b7d82d64f3ff
Author: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
AuthorDate: Mon Sep 7 07:49:24 2020 +0000
Commit: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Mon Sep 7 07:49:56 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f3a7b2d7
media-sound/hydrogen: fixed i18n install path
Package-Manager: Portage-3.0.5, Repoman-3.0.1
Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org>
media-sound/hydrogen/files/hydrogen-1.0.0-i18n-path.patch | 13 +++++++++++++
media-sound/hydrogen/files/hydrogen-9999-i18n-path.patch | 13 +++++++++++++
media-sound/hydrogen/hydrogen-1.0.0.ebuild | 5 ++++-
media-sound/hydrogen/hydrogen-9999.ebuild | 5 ++++-
4 files changed, 34 insertions(+), 2 deletions(-)
diff --git a/media-sound/hydrogen/files/hydrogen-1.0.0-i18n-path.patch b/media-sound/hydrogen/files/hydrogen-1.0.0-i18n-path.patch
new file mode 100644
index 00000000000..075d0d444a0
--- /dev/null
+++ b/media-sound/hydrogen/files/hydrogen-1.0.0-i18n-path.patch
@@ -0,0 +1,13 @@
+--- a/data/i18n/CMakeLists.txt 2020-09-07 08:47:15.743516826 +0200
++++ b/data/i18n/CMakeLists.txt 2020-09-07 09:03:56.084304480 +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/files/hydrogen-9999-i18n-path.patch b/media-sound/hydrogen/files/hydrogen-9999-i18n-path.patch
new file mode 100644
index 00000000000..3c32e2b3e62
--- /dev/null
+++ b/media-sound/hydrogen/files/hydrogen-9999-i18n-path.patch
@@ -0,0 +1,13 @@
+--- 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-1.0.0.ebuild b/media-sound/hydrogen/hydrogen-1.0.0.ebuild
index bfd663bbc55..12ec74567cf 100644
--- a/media-sound/hydrogen/hydrogen-1.0.0.ebuild
+++ b/media-sound/hydrogen/hydrogen-1.0.0.ebuild
@@ -57,7 +57,10 @@ RDEPEND="${CDEPEND}"
DOCS=( AUTHORS ChangeLog DEVELOPERS README.txt )
-PATCHES=( "${FILESDIR}/${P}-gnuinstalldirs.patch" )
+PATCHES=(
+ "${FILESDIR}/${P}-gnuinstalldirs.patch"
+ "${FILESDIR}/${P}-i18n-path.patch"
+)
src_prepare() {
cmake_src_prepare
diff --git a/media-sound/hydrogen/hydrogen-9999.ebuild b/media-sound/hydrogen/hydrogen-9999.ebuild
index 245dc874f11..87e5b809fe3 100644
--- a/media-sound/hydrogen/hydrogen-9999.ebuild
+++ b/media-sound/hydrogen/hydrogen-9999.ebuild
@@ -57,7 +57,10 @@ RDEPEND="${CDEPEND}"
DOCS=( AUTHORS ChangeLog DEVELOPERS README.txt )
-PATCHES=( "${FILESDIR}/${PN}-1.0.0-gnuinstalldirs.patch" )
+PATCHES=(
+ "${FILESDIR}/${PN}-1.0.0-gnuinstalldirs.patch"
+ "${FILESDIR}/${P}-i18n-path.patch"
+)
src_prepare() {
cmake_src_prepare