From 094afd47dffa0f03e9417345210300561ac8e013 Mon Sep 17 00:00:00 2001 From: Schrijvers Luc Date: Sat, 2 Sep 2023 13:35:51 +0000 Subject: [PATCH] flacon, bump version (#9337) --- .../flacon/additional-files/flacon.rdef.in | 2 +- ...acon-8.3.0.recipe => flacon-11.2.0.recipe} | 8 +- .../flacon/patches/flacon-11.2.0.patchset | 315 ++++++++++++++++++ .../flacon/patches/flacon-8.3.0.patchset | 68 ---- 4 files changed, 320 insertions(+), 73 deletions(-) rename media-sound/flacon/{flacon-8.3.0.recipe => flacon-11.2.0.recipe} (93%) create mode 100644 media-sound/flacon/patches/flacon-11.2.0.patchset delete mode 100644 media-sound/flacon/patches/flacon-8.3.0.patchset diff --git a/media-sound/flacon/additional-files/flacon.rdef.in b/media-sound/flacon/additional-files/flacon.rdef.in index 3982edc4b..8c651bb23 100644 --- a/media-sound/flacon/additional-files/flacon.rdef.in +++ b/media-sound/flacon/additional-files/flacon.rdef.in @@ -1,5 +1,5 @@ -resource app_flags B_SINGLE_LAUNCH | B_ARGV_ONLY; +resource app_flags B_SINGLE_LAUNCH; resource app_version { major = @MAJOR@, diff --git a/media-sound/flacon/flacon-8.3.0.recipe b/media-sound/flacon/flacon-11.2.0.recipe similarity index 93% rename from media-sound/flacon/flacon-8.3.0.recipe rename to media-sound/flacon/flacon-11.2.0.recipe index 34a9eb13e..2e6c5dcb6 100644 --- a/media-sound/flacon/flacon-8.3.0.recipe +++ b/media-sound/flacon/flacon-11.2.0.recipe @@ -9,7 +9,7 @@ COPYRIGHT="2012-2022 Alexander Sokoloff" LICENSE="GNU LGPL v2.1" REVISION="1" SOURCE_URI="https://github.com/flacon/flacon/archive/v$portVersion.tar.gz" -CHECKSUM_SHA256="3b58a973df8c70c1a7b879f6449c1dc3a7edb7494f4c2a8b132ae2a659187768" +CHECKSUM_SHA256="5009025a1f3b3f5829631578d9a4985efded85cdf754f1c1594cf3d41f3890a7" SOURCE_FILENAME="flacon-$portVersion.tar.gz" PATCHES="flacon-$portVersion.patchset" ADDITIONAL_FILES="flacon.rdef.in" @@ -64,15 +64,15 @@ BUILD_PREREQUIRES=" cmd:pkg_config$secondaryArchSuffix " + BUILD() { rm -rf build cmake -B build -S . \ -DCMAKE_BUILD_TYPE=Release \ -DBIN_DIR=$appsDir \ - -DDATA_DIR=$dataDir \ - -DMAN_DIR=$manDir \ - -DTRANSLATIONS_DIR=$dataDir/Flacon/translations + -DMAN_DIR=$manDir/man1 \ + -DTRANSLATIONS_DIR=$dataDir/Qt5/translations -Wno-dev make $jobArgs -C build } diff --git a/media-sound/flacon/patches/flacon-11.2.0.patchset b/media-sound/flacon/patches/flacon-11.2.0.patchset new file mode 100644 index 000000000..1ddf4f7c9 --- /dev/null +++ b/media-sound/flacon/patches/flacon-11.2.0.patchset @@ -0,0 +1,315 @@ +From 866d6fcc3564d603d59d6ef4d41a0be48dcb8612 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Zolt=C3=A1n=20Mizsei?= +Date: Fri, 4 Jun 2021 17:59:44 +0200 +Subject: Haiku supporting patches + + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 4627ef2..6ba112d 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -171,13 +171,28 @@ file (GLOB TS_FILES + translations/flacon*.ts + ) + +-set(DATA_DIR +- ${CMAKE_INSTALL_PREFIX}/share/${PROJECT_NAME} +-) ++if(NOT DEFINED DATA_DIR) ++ set(DATA_DIR ++ ${CMAKE_INSTALL_PREFIX}/share/${PROJECT_NAME} ++ ) ++endif() + +-set(TRANSLATIONS_DIR +- "${DATA_DIR}/translations" +-) ++if(NOT DEFINED TRANSLATIONS_DIR) ++ set(TRANSLATIONS_DIR ++ "${DATA_DIR}/translations" ++ ) ++endif() ++ ++if(NOT DEFINED MAN_DIR) ++ set(MAN_DIR ++ ${CMAKE_INSTALL_PREFIX}/share/man/man1 ++ ) ++endif() ++ ++if(NOT DEFINED BIN_DIR) ++ set(BIN_DIR ++ ${CMAKE_INSTALL_PREFIX}/bin) ++endif() + add_definitions(-DTRANSLATIONS_DIR=\"${TRANSLATIONS_DIR}\") + + +@@ -335,10 +350,11 @@ if(${CMAKE_SYSTEM_NAME} STREQUAL "Darwin") + install(SCRIPT "${CMAKE_BINARY_DIR}/macdelopy.cmake") + + else() +- install(TARGETS ${PROJECT_NAME} RUNTIME DESTINATION bin) ++ install(TARGETS ${PROJECT_NAME} RUNTIME DESTINATION ${BIN_DIR}) + install(FILES ${QM_FILES} DESTINATION ${TRANSLATIONS_DIR}) +- install(FILES ${CMAKE_CURRENT_BINARY_DIR}/flacon.1.gz DESTINATION share/man/man1) ++ install(FILES ${CMAKE_CURRENT_BINARY_DIR}/flacon.1.gz DESTINATION ${MAN_DIR}) + ++if(NOT HAIKU) + install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}.desktop DESTINATION "share/applications") + install(FILES ${CMAKE_CURRENT_BINARY_DIR}/com.github.Flacon.metainfo.xml DESTINATION "share/metainfo") + install(FILES images/mainicon/flacon-16x16.png DESTINATION "share/icons/hicolor/16x16/apps" RENAME "flacon.png") +@@ -349,6 +365,7 @@ else() + install(FILES images/mainicon/flacon-256x256.png DESTINATION "share/icons/hicolor/256x256/apps" RENAME "flacon.png") + install(FILES images/mainicon/flacon-512x512.png DESTINATION "share/icons/hicolor/512x512/apps" RENAME "flacon.png") + install(FILES images/mainicon/flacon.svg DESTINATION "share/icons/hicolor/scalable/apps" RENAME "flacon.svg") ++endif() + + endif() + +-- +2.37.3 + + +From 53ea751c43c18f6aa8273f6249240bf2565feb2c Mon Sep 17 00:00:00 2001 +From: Begasus +Date: Sat, 2 Sep 2023 14:07:25 +0200 +Subject: Add some needed Dutch translation strings + + +diff --git a/translations/flacon_nl.ts b/translations/flacon_nl.ts +index 424b6c9..35286f1 100644 +--- a/translations/flacon_nl.ts ++++ b/translations/flacon_nl.ts +@@ -490,13 +490,13 @@ In CBR-modus stelt het de specifieke uitvoerbitsnelheid in. + Write to file + CUE mode combobox item + CUE mode combobox item +- ++ Schrijf naar bestand + + + Embed to audio files + CUE mode combobox item + CUE mode combobox item +- ++ Integreer in audio bestanden + + + Insert "Artist" +@@ -606,7 +606,7 @@ Dit heeft enkel een invloed op de bestandsgrootte, alle instellingen zijn zonder + + Use heuristic definition of track performer + Checkbox text on preferences +- ++ Gebruik een heuristische definitie van trackartiest + + + +@@ -743,13 +743,13 @@ Als u delen van tekst die een token bevatten met accolades omsluit zullen deze d + Add disc… + Main menu item + Main menu item +- ++ Schijf toevoegen... + + + Add disc + Toolbar item + Toolbar item +- ++ Schijf toevoegen + + + Add CUE or audio file +@@ -801,11 +801,11 @@ Als u delen van tekst die een token bevatten met accolades omsluit zullen deze d + + + Remove disc +- ++ Schijf verwijderen + + + Remove disc from project +- ++ Schijf verwijderen van project + + + Ctrl+Del +@@ -823,13 +823,13 @@ Als u delen van tekst die een token bevatten met accolades omsluit zullen deze d + Add folder… + Main menu item + Main menu item +- ++ Folder toevoegen... + + + Add folder + Toolbar item + Toolbar item +- ++ Folder toevoegen + + + Recursive album search +@@ -950,55 +950,55 @@ Wil u doorgaan? + + + Get from Internet +- ++ Haal van Internet + + + Get album information from Internet +- ++ Haal album informatie van het Internet + + + Get data from Internet + context menu + context menu +- ++ Haal data van het Internet + + + Flacon - Converting + Main window title + Main window title +- ++ Flacon - Converteren + + + Warnings + Toolbar item caption +- ++ Waarschuwingen + + + Show Warnings + Toolbar item tooltip +- ++ Toon waarschuwingen + + + Errors + Toolbar item caption + Toolbar item caption +- ++ Fouten + + + Show Errors + Toolbar item tooltip + Toolbar item tooltip +- ++ Toon fouten + + + Trash Sources for successfully converted disks and Remove from list… +- ++ Bronnen verwijderen van succesvol geconverteerde schijven en verwijder van de lijst... + + + Conversion in progress.<br>Are you sure you want to exit? + Message box text + Message box text +- ++ Converteren is bezig.<br>Ben je zeker dat je wil afsluiten? + + + Exit +@@ -1010,23 +1010,23 @@ Wil u doorgaan? + The following files will be moved to the trash.</b>Remove the following files?%1 + Message box text, %1 is a list of files + Message box text, %1 is a list of files +- ++ De volgende bestanden worden verplaatst naar de prullenbak.</b>Verwijder de volgende bestanden?%1 + + + %1% completed + Status bar, progress text + Status bar, progress text +- ++ %1% voltooid + + + Trash sources for converted disks and remove from list… +- ++ Verwijden bronnen van geconverteerde schijven en verwijder van de lijst... + + + Some disks have errors, and will be skipped when converting: + Error message title + Error message title +- ++ Sommige schrijven bevatten fouten en zullen overgeslagen worden bij het converteren: + + + Disk %1 "%2 - %3" +@@ -1169,7 +1169,7 @@ Wil u doorgaan? + + + Audio profiles +- ++ Audio profielen + + + I can't apply your preferences. +@@ -1263,7 +1263,7 @@ Als u delen van tekst die een token bevatten met accolades omsluit zullen deze d + + Resampling settings: + Preferences dialog: group caption +- ++ Resample instellingen + + + Maximum bit depth: +@@ -1275,7 +1275,7 @@ Als u delen van tekst die een token bevatten met accolades omsluit zullen deze d + + + ReplayGain settings: +- ++ Instellingen opnieuw afspelen + + + Calculate gain: +@@ -1285,11 +1285,11 @@ Als u delen van tekst die een token bevatten met accolades omsluit zullen deze d + CUE and Cover image + Preferences dialog tab title + Preferences dialog tab title +- ++ CUE en Cover afbeelding + + + Copy cover image +- ++ Kopiëer cover afbeelding + + + If the format is supported, the cover will be added to the meta information for all output files. +@@ -1299,7 +1299,7 @@ Als u delen van tekst die een token bevatten met accolades omsluit zullen deze d + + + Embed cover image in output files +- ++ Integreer cover afbeelding in output bestanden + + + Create per track CUE sheet +@@ -1392,7 +1392,7 @@ De analyse per album zal de verschillen in volume binnen een album bewaren.%1 encoder settings: + Preferences group title, %1 is a audio format name + Preferences group title, %1 is a audio format name +- ++ %1 encoder instellingen: + + + +@@ -1961,4 +1961,4 @@ You could change the "Start num" for one of them. + Compressie: + + +- +\ No newline at end of file ++ +-- +2.37.3 + diff --git a/media-sound/flacon/patches/flacon-8.3.0.patchset b/media-sound/flacon/patches/flacon-8.3.0.patchset deleted file mode 100644 index 75eba7e1c..000000000 --- a/media-sound/flacon/patches/flacon-8.3.0.patchset +++ /dev/null @@ -1,68 +0,0 @@ -From a339b35794dfd9ddc5109e4dfbf705b9dd532953 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Zolt=C3=A1n=20Mizsei?= -Date: Fri, 4 Jun 2021 17:59:44 +0200 -Subject: Haiku supporting patches - - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index c666c0f..8da975b 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -177,13 +177,28 @@ file (GLOB TS_FILES - translations/flacon*.ts - ) - --set(DATA_DIR -- ${CMAKE_INSTALL_PREFIX}/share/${PROJECT_NAME} --) -+if(NOT DEFINED DATA_DIR) -+ set(DATA_DIR -+ ${CMAKE_INSTALL_PREFIX}/share/${PROJECT_NAME} -+ ) -+endif() -+ -+if(NOT DEFINED TRANSLATIONS_DIR) -+ set(TRANSLATIONS_DIR -+ "${DATA_DIR}/translations" -+ ) -+endif() -+ -+if(NOT DEFINED MAN_DIR) -+ set(MAN_DIR -+ ${CMAKE_INSTALL_PREFIX}/share/man/man1 -+ ) -+endif() -+ -+if(NOT DEFINED BIN_DIR) -+ set(BIN_DIR bin) -+endif() - --set(TRANSLATIONS_DIR -- "${DATA_DIR}/translations" --) - add_definitions(-DTRANSLATIONS_DIR=\"${TRANSLATIONS_DIR}\") - - set (CMAKE_CXX_STANDARD 14) -@@ -329,7 +344,7 @@ add_custom_command(TARGET ${PROJECT_NAME} - COMMAND gzip -c -n ${CMAKE_CURRENT_BINARY_DIR}/flacon.1 > ${CMAKE_CURRENT_BINARY_DIR}/flacon.1.gz - ) - -- -+if(NOT HAIKU) - if(${CMAKE_SYSTEM_NAME} STREQUAL "Darwin") - set_target_properties(${PROJECT_NAME} PROPERTIES OUTPUT_NAME "Flacon") - install(TARGETS ${PROJECT_NAME} RUNTIME DESTINATION Flacon.app/Contents/MacOS) -@@ -355,6 +370,10 @@ else() - install(FILES images/mainicon/flacon.svg DESTINATION "share/icons/hicolor/scalable/apps" RENAME "flacon.svg") - - endif() -+else() -+ install(FILES ${CMAKE_CURRENT_BINARY_DIR}/flacon.1.gz DESTINATION ${MAN_DIR}) -+ install(TARGETS ${PROJECT_NAME} RUNTIME DESTINATION ${BIN_DIR}) -+endif() - - include("cmake/tests.cmake") - add_tests(tests) --- -2.30.2 -