diff options
| author |   Miroslav Šulc <fordfrog@gentoo.org> | 2023-11-14 11:24:39 +0100 |
|---|---|---|
| committer | Miroslav Šulc <fordfrog@gentoo.org> | 2023-11-14 11:24:49 +0100 |
| commit | 000fd2c16ef1c7c0cabe77ada00bbb5b454e0578 (patch) | |
| tree | 8f56a07e2c93611f4a61e94985bf2433b53c438e | |
| parent | app-text/coolreader: treeclean (diff) | |
| download | gentoo-000fd2c16ef1c7c0cabe77ada00bbb5b454e0578.tar.gz gentoo-000fd2c16ef1c7c0cabe77ada00bbb5b454e0578.tar.bz2 gentoo-000fd2c16ef1c7c0cabe77ada00bbb5b454e0578.zip | |
media-sound/hydrogen: updated live ebuild patches + scrubbed patches
Signed-off-by: Miroslav Šulc <fordfrog@gentoo.org>
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() { |