From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 89541158089 for ; Tue, 14 Nov 2023 10:24:55 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id A874F2BC01A; Tue, 14 Nov 2023 10:24:54 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 840872BC01A for ; Tue, 14 Nov 2023 10:24:54 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 582C5335C7A for ; Tue, 14 Nov 2023 10:24:53 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id B5E7CAAB for ; Tue, 14 Nov 2023 10:24:51 +0000 (UTC) From: "Miroslav Šulc" 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" Message-ID: <1699957489.000fd2c16ef1c7c0cabe77ada00bbb5b454e0578.fordfrog@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: media-sound/hydrogen/, media-sound/hydrogen/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: media-sound/hydrogen/files/hydrogen-1.2.1-gnuinstalldirs.patch media-sound/hydrogen/files/hydrogen-1.2.2-cflags.patch media-sound/hydrogen/files/hydrogen-1.3.0-cflags.patch media-sound/hydrogen/files/hydrogen-1.3.0-gnuinstalldirs.patch media-sound/hydrogen/hydrogen-9999.ebuild X-VCS-Directories: media-sound/hydrogen/files/ media-sound/hydrogen/ X-VCS-Committer: fordfrog X-VCS-Committer-Name: Miroslav Šulc X-VCS-Revision: 000fd2c16ef1c7c0cabe77ada00bbb5b454e0578 X-VCS-Branch: master Date: Tue, 14 Nov 2023 10:24:51 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: f206905f-841f-472a-af83-dcbba42ebff3 X-Archives-Hash: b30d000ec4dec7dfcaea2be3898eb520 commit: 000fd2c16ef1c7c0cabe77ada00bbb5b454e0578 Author: Miroslav Šulc gentoo org> AuthorDate: Tue Nov 14 10:24:39 2023 +0000 Commit: Miroslav Šulc gentoo org> CommitDate: Tue Nov 14 10:24:49 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=000fd2c1 media-sound/hydrogen: updated live ebuild patches + scrubbed patches Signed-off-by: Miroslav Šulc gentoo.org> .../files/hydrogen-1.2.1-gnuinstalldirs.patch | 4 ---- .../hydrogen/files/hydrogen-1.2.2-cflags.patch | 2 -- .../hydrogen/files/hydrogen-1.3.0-cflags.patch | 11 ++++++++++ .../files/hydrogen-1.3.0-gnuinstalldirs.patch | 25 ++++++++++++++++++++++ media-sound/hydrogen/hydrogen-9999.ebuild | 4 ++-- 5 files changed, 38 insertions(+), 8 deletions(-) diff --git a/media-sound/hydrogen/files/hydrogen-1.2.1-gnuinstalldirs.patch b/media-sound/hydrogen/files/hydrogen-1.2.1-gnuinstalldirs.patch index d7b6105a42ff..61f94d84bfc7 100644 --- a/media-sound/hydrogen/files/hydrogen-1.2.1-gnuinstalldirs.patch +++ b/media-sound/hydrogen/files/hydrogen-1.2.1-gnuinstalldirs.patch @@ -1,5 +1,3 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index dc368f7..b764d7c 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -418,10 +418,10 @@ IF(EXISTS ${CMAKE_SOURCE_DIR}/data/doc/CMakeLists.txt) @@ -16,8 +14,6 @@ index dc368f7..b764d7c 100644 ENDIF() # -diff --git a/src/core/CMakeLists.txt b/src/core/CMakeLists.txt -index e96d7ed..79b74e0 100644 --- a/src/core/CMakeLists.txt +++ b/src/core/CMakeLists.txt @@ -77,5 +77,5 @@ ENDIF() diff --git a/media-sound/hydrogen/files/hydrogen-1.2.2-cflags.patch b/media-sound/hydrogen/files/hydrogen-1.2.2-cflags.patch index f244b4edcc08..13bd531df885 100644 --- a/media-sound/hydrogen/files/hydrogen-1.2.2-cflags.patch +++ b/media-sound/hydrogen/files/hydrogen-1.2.2-cflags.patch @@ -1,5 +1,3 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 1fe4013..180aa2f 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -141,7 +141,7 @@ ENDIF() diff --git a/media-sound/hydrogen/files/hydrogen-1.3.0-cflags.patch b/media-sound/hydrogen/files/hydrogen-1.3.0-cflags.patch new file mode 100644 index 000000000000..f08f1af10ddd --- /dev/null +++ b/media-sound/hydrogen/files/hydrogen-1.3.0-cflags.patch @@ -0,0 +1,11 @@ +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -173,7 +173,7 @@ endif() + if(WANT_DEBUG) + set(CMAKE_CXX_FLAGS "$ENV{CMAKE_CXX_FLAGS} -O0") + else() +- set(CMAKE_CXX_FLAGS "$ENV{CMAKE_CXX_FLAGS} -O3 -ffast-math") ++ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}") + endif() + + if(WANT_APPIMAGE) diff --git a/media-sound/hydrogen/files/hydrogen-1.3.0-gnuinstalldirs.patch b/media-sound/hydrogen/files/hydrogen-1.3.0-gnuinstalldirs.patch new file mode 100644 index 000000000000..c716ca75ac9e --- /dev/null +++ b/media-sound/hydrogen/files/hydrogen-1.3.0-gnuinstalldirs.patch @@ -0,0 +1,25 @@ +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -478,10 +478,10 @@ else() + endif() + install(DIRECTORY data DESTINATION ${H2_DATA_PATH} PATTERN ".git" EXCLUDE PATTERN "i18n" EXCLUDE PATTERN doc EXCLUDE) + if(NOT MINGW AND NOT APPLE) +- install(FILES ${CMAKE_SOURCE_DIR}/linux/org.hydrogenmusic.Hydrogen.metainfo.xml DESTINATION "${CMAKE_INSTALL_DATAROOTDIR}/metainfo") +- install(FILES ${CMAKE_SOURCE_DIR}/linux/org.hydrogenmusic.Hydrogen.desktop DESTINATION "${CMAKE_INSTALL_DATAROOTDIR}/applications") ++ install(FILES ${CMAKE_SOURCE_DIR}/linux/org.hydrogenmusic.Hydrogen.metainfo.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() + + # +--- a/src/core/CMakeLists.txt ++++ b/src/core/CMakeLists.txt +@@ -77,5 +77,5 @@ endif() + + 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/hydrogen-9999.ebuild b/media-sound/hydrogen/hydrogen-9999.ebuild index 28fdaf94ba63..440fe2ae3992 100644 --- a/media-sound/hydrogen/hydrogen-9999.ebuild +++ b/media-sound/hydrogen/hydrogen-9999.ebuild @@ -59,8 +59,8 @@ RDEPEND="${CDEPEND}" DOCS=( AUTHORS ChangeLog DEVELOPERS.md README.md ) PATCHES=( - "${FILESDIR}/${PN}-1.2.1-gnuinstalldirs.patch" - "${FILESDIR}/${PN}-1.2.2-cflags.patch" + "${FILESDIR}/${PN}-1.3.0-gnuinstalldirs.patch" + "${FILESDIR}/${PN}-1.3.0-cflags.patch" ) src_prepare() {