gentoo auto-resync : 14:11:2023 - 16:34:53

6 files changed, 43 insertions, 11 deletions

diff --git a/media-sound/hydrogen/Manifest b/media-sound/hydrogen/Manifest
index 92938f02adf1..126b7ccae725 100644
--- a/media-sound/hydrogen/Manifest
+++ b/media-sound/hydrogen/Manifest
@@ -1,6 +1,8 @@
-AUX hydrogen-1.2.1-gnuinstalldirs.patch 1893 BLAKE2B 5c73531087d253791c0168db9454e9a3da31afa3989eb08291053939b5fe4ff438364a632f42ce965434a64a09cf18a67d34538892348ff554d4e49b75493e87 SHA512 b957b08ad9f92a0238ec55732024c43dfcba66b294fea5f0ac37c4c714ed88499726b0fcc4e4c7995d22c42f587a5ece3fb13886a132a3dbc11e66d0e84e83da
-AUX hydrogen-1.2.2-cflags.patch 357 BLAKE2B 1d1373088426ed706f5d338bd2473b505bcabae1eba0220cfdb49267323ed57358126d6de2f1300cdc7037687c3de847158469d1858013f98873ae0e73d9d9b0 SHA512 5e1fd16f821c0f8d0ca409c9c92a06ab6eb36bdef53d409c351156e136ad9b7b3b085c95a27d6a9739ed23b5c6bf6ac0766be386eed568378f5aedbc587d55e7
+AUX hydrogen-1.2.1-gnuinstalldirs.patch 1725 BLAKE2B e6b4b0f00b3a155d391ee21ad031b3a12882e652914b9ab40550bade3fc2465c327abe2edb9a4a9ff8e7d15d6700a16ba3e081bba696110ce96f21b91c90ed98 SHA512 d81f04c4f66d860832d767cdb0ef85fbfd05c4846c38ea1b4128ed1bb7e384b54e9844f91236b8fa39af50691334f22efcbea348fc48fc71e844a5b9bd03acab
+AUX hydrogen-1.2.2-cflags.patch 282 BLAKE2B 9535b11fe3d29d5a2ae621aa25084d3cf1540143a3c17979ef9f088b99a7ace4a7e0307f06582f660cb3e7820f27486d130d0f9738670d84e2892a5553043021 SHA512 07d1d0fad5d018507fbf533d71f38ba2325fefb2e51973e3b032fe029b4688695388e7962556d57d9f128178c05235a0aad2281d4b4bd5c293f2f8e10eb51815
+AUX hydrogen-1.3.0-cflags.patch 282 BLAKE2B c16bd70b48e231f98787d416d2658c95c329237433f5734a24bd50caa4cf4922964afe80d2a4c4e08e5e169dacfbe415e75db9502169dfae15e6b9ded3d4eb68 SHA512 ff7733a3e1123e6851f5697f2c36c46a457ba22e9543399abe1cd9969d75eddd1c5afc27b4eb97747f86457485acb42c8154fc423b49c8a8a112c519639bae39
+AUX hydrogen-1.3.0-gnuinstalldirs.patch 1677 BLAKE2B 3346a4043f26f7cb9eb65ecb2f42c996b14fc9eab6ba87ace41e928868248e1ed12c00eef55b4d6ea54205d8fb561e42cdb39a6f7e21ca1e3e6497571c17055f SHA512 0e675e6fa839aa0451bdf1caf6fee66b973092ef5ac32ff301f8e9d5f114461d0d95b836012da5cc2fcf756c38eed33ff7233bb44ff83f6275f439eecdd247f5
 DIST hydrogen-1.2.2.tar.gz 12948890 BLAKE2B 30d8624078a29a0514aee01d56865e5923f755de02acfddde45a26d6ffbd68cf3c8c774827fe4538b7d03faefaabb9ddcfd9a28bb404c535ad7f6734eb5b1aff SHA512 bd6b102b14d30a8e2f4ea7e405199bb34f9b7691b57c3f9f3096c9e30c25c158e3bfd40bcfdd2d449bc153b7d3d9717df401f1e7a086e33dc953247870f1dee0
 EBUILD hydrogen-1.2.2-r1.ebuild 2113 BLAKE2B f78e407369f85ca05f053950ae826a51903f9750830bacee886b5ef594c249a4787949f804248b6bde73257d817b5770fe31244ce9a59bfdcd81edeeb27d707c SHA512 25022dae42bf24fa3b4f076a7635036554c21fa634c68fc9e30adaf6aac7c3f69da8da6355a20945241192810d056ef3c3116d34fbb4f70df5530d2ac171a76c
-EBUILD hydrogen-9999.ebuild 2120 BLAKE2B 8574c965293a8b6c081e02498519b8cc647640cf2d21a6319f476b690d15bd4190870c5ae4a5272b87ad3da3e45e0c9b2afa9c520cc4b9df9dcca4ba7aec11dc SHA512 dd477d0a775e5b4d268c0aa273f8cc1a2b81d0a26cc55acec57a366b94d24f353400ca6eae857236c2248e3cbc6c04cd5a0bbf2adf743a5a385251b670334e7e
+EBUILD hydrogen-9999.ebuild 2120 BLAKE2B 903cbde4cf7fd4276a2f514ee7c3254868cc901518c7208ca5854ad99fcf04bad52e8557f9d5a3de699fbf08a909581b1e7f099eaeacb1c21f5f23c50fb34e0f SHA512 d1655b2d89514636eeb31c93ee455c088a87a93dddd6e060425a089aa73754caf6c8064bc42fae6b3797243174a043da8422f286f4190d2bda521aa3c65fd724
 MISC metadata.xml 478 BLAKE2B bd59feef45263e2f2440696d657c0845f70498b64dec764dc4fff3e0c837a725195f55a2a651498f5c38448ae7c45fdc50def9a8068fe58e93332ad66de7e1ab SHA512 757c7766697ad73293ed281df0079de5775068bc6b899a9dc6bd3a41a36ed024646e01d242177948be1756d407e44cacd2bb2ed7ec0e4698fd358ec0031db3c4
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() {