haikuprojects/haikuports
1
0
Fork 0
mirror of https://github.com/yann64/haikuports.git synced 2026-05-05 06:28:55 +02:00
Code Issues Packages Projects Releases Wiki Activity

Flacon: bump (#5956)

Browse Source 
* Flacon: bump

* Clenaup
This commit is contained in:
extrowerk
2021-06-08 21:09:01 +02:00
committed by GitHub
parent 15535c41d5
commit 975a98ce76
2 changed files with 16 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
media-sound/flacon/flacon-6.1.0.recipe → media-sound/flacon/flacon-7.0.1.recipe
View File

@@ -9,7 +9,7 @@ COPYRIGHT="2012-2019 Alexander Sokoloff"
LICENSE="GNU LGPL v2.1" LICENSE="GNU LGPL v2.1"
REVISION="1" REVISION="1"
SOURCE_URI="https://github.com/flacon/flacon/archive/v$portVersion.tar.gz" SOURCE_URI="https://github.com/flacon/flacon/archive/v$portVersion.tar.gz"
CHECKSUM_SHA256="b6af83ed30697ed82369d3eefaf8fcceabea69fc86a1d6d1a5594cc5768bad7b" CHECKSUM_SHA256="f63b959099e7b97b02a7f9ccf2c922a99de6c0d1ec83e74c436fd10e41630b6e"
SOURCE_FILENAME="flacon-$portVersion.tar.gz" SOURCE_FILENAME="flacon-$portVersion.tar.gz"
PATCHES="flacon-$portVersion.patchset" PATCHES="flacon-$portVersion.patchset"
ADDITIONAL_FILES="flacon.rdef.in" ADDITIONAL_FILES="flacon.rdef.in"
@@ -62,21 +62,19 @@ BUILD_PREREQUIRES="
BUILD() BUILD()
{ {
mkdir -p build && cd "$_" rm -rf build
cmake -B build -S . \
cmake .. \
-DBIN_DIR=$appsDir \ -DBIN_DIR=$appsDir \
-DDATA_DIR=$dataDir \ -DDATA_DIR=$dataDir \
-DMAN_DIR=$manDir \ -DMAN_DIR=$manDir \
-DTRANSLATIONS_DIR=$dataDir/Flacon/translations -DTRANSLATIONS_DIR=$dataDir/Flacon/translations
make $jobArgs make $jobArgs -C build
} }
INSTALL() INSTALL()
{ {
cd build make -C build install
make install
mv $appsDir/flacon $appsDir/Flacon mv $appsDir/flacon $appsDir/Flacon

24
media-sound/flacon/patches/flacon-6.1.0.patchset → media-sound/flacon/patches/flacon-7.0.1.patchset
View File

@@ -1,17 +1,14 @@
From b47ecb7a4e35c6ec4e1620e8aa7de4916e6e294e Mon Sep 17 00:00:00 2001 From a339b35794dfd9ddc5109e4dfbf705b9dd532953 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Zolt=C3=A1n=20Mizsei?= <zmizsei@extrowerk.com> From: =?UTF-8?q?Zolt=C3=A1n=20Mizsei?= <zmizsei@extrowerk.com>
Date: Tue, 1 Oct 2019 19:03:50 +0200 Date: Fri, 4 Jun 2021 17:59:44 +0200
Subject: [PATCH] Haiku supporting patches Subject: Haiku supporting patches
---
CMakeLists.txt | 32 ++++++++++++++++++++++++++------
1 file changed, 26 insertions(+), 6 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt diff --git a/CMakeLists.txt b/CMakeLists.txt
index e61a5b9..b428b74 100644 index c666c0f..8da975b 100644
--- a/CMakeLists.txt --- a/CMakeLists.txt
+++ b/CMakeLists.txt +++ b/CMakeLists.txt
@@ -195,13 +195,28 @@ file (GLOB TS_FILES @@ -177,13 +177,28 @@ file (GLOB TS_FILES
translations/flacon*.ts translations/flacon*.ts
) )
@@ -45,16 +42,17 @@ index e61a5b9..b428b74 100644
-) -)
add_definitions(-DTRANSLATIONS_DIR=\"${TRANSLATIONS_DIR}\") add_definitions(-DTRANSLATIONS_DIR=\"${TRANSLATIONS_DIR}\")
set (CMAKE_CXX_STANDARD 11) set (CMAKE_CXX_STANDARD 14)
@@ -338,6 +353,7 @@ add_custom_command(TARGET ${PROJECT_NAME} @@ -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(NOT HAIKU)
if(${CMAKE_SYSTEM_NAME} STREQUAL "Darwin") if(${CMAKE_SYSTEM_NAME} STREQUAL "Darwin")
set_target_properties(${PROJECT_NAME} PROPERTIES OUTPUT_NAME "Flacon") set_target_properties(${PROJECT_NAME} PROPERTIES OUTPUT_NAME "Flacon")
install(TARGETS ${PROJECT_NAME} RUNTIME DESTINATION Flacon.app/Contents/MacOS) install(TARGETS ${PROJECT_NAME} RUNTIME DESTINATION Flacon.app/Contents/MacOS)
@@ -363,6 +379,10 @@ else() @@ -355,6 +370,10 @@ else()
install(FILES images/mainicon/flacon.svg DESTINATION "share/icons/hicolor/scalable/apps" RENAME "flacon.svg") install(FILES images/mainicon/flacon.svg DESTINATION "share/icons/hicolor/scalable/apps" RENAME "flacon.svg")
endif() endif()
@@ -66,5 +64,5 @@ index e61a5b9..b428b74 100644
include("cmake/tests.cmake") include("cmake/tests.cmake")
add_tests(tests) add_tests(tests)
-- --
2.23.0 2.30.2