haikuprojects/haikuports
1
0
Fork 0
mirror of https://github.com/yann64/haikuports.git synced 2026-04-21 19:20:08 +02:00
Code Issues Packages Projects Releases Wiki Activity

Flacon 4.1.0 (#2765)

Browse Source
This commit is contained in:
miqlas
2018-07-21 17:46:00 +02:00
committed by GitHub
parent ab9e602283
commit d7b58b5d97
3 changed files with 108 additions and 124 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
media-sound/flacon/flacon-4.0.0.recipe → media-sound/flacon/flacon-4.1.0.recipe
View File

@@ -9,7 +9,7 @@ COPYRIGHT="2012-2015 Alexander Sokoloff"
LICENSE="GNU LGPL v2.1"
REVISION="1"
SOURCE_URI="https://github.com/flacon/flacon/archive/v$portVersion.tar.gz"
CHECKSUM_SHA256="3e128d32e6bc0d1bf618a2312953f9a894cce2699d36abe5f9c38ff1b153dc32"
CHECKSUM_SHA256="8e9b7e9b12b79d7dbe1b1e4f47d7561538a62a55ab752a7269736a77bf56dd70"
SOURCE_FILENAME="flacon-$portVersion.tar.gz"
PATCHES="flacon-$portVersion.patchset"
ADDITIONAL_FILES="flacon.rdef.in"
@@ -80,7 +80,7 @@ INSTALL()
mv $appsDir/flacon $appsDir/Flacon
# Add Haiku resources
local APP_SIGNATURE="application/x-vnd.qt5-mudlet"
local APP_SIGNATURE="application/x-vnd.qt5-flacon"
local MAJOR="`echo "$portVersion" | cut -d. -f1`"
local MIDDLE="`echo "$portVersion" | cut -d. -f2`"
local MINOR="`echo "$portVersion" | cut -d. -f3`"

122
media-sound/flacon/patches/flacon-4.0.0.patchset
View File

@@ -1,122 +0,0 @@
From 38675d87e220090e90a402ea15460004e93cb9e1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Zolt=C3=A1n=20Mizsei?= <zmizsei@extrowerk.com>
Date: Sun, 4 Mar 2018 12:56:48 +0100
Subject: [PATCH] Haiku supporting patches
---
CMakeLists.txt | 54 +++++++++++++++++++++++++++++++++---------------------
1 file changed, 33 insertions(+), 21 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index d4d9d23..98d7ac9 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -174,13 +174,17 @@ file (GLOB TS_FILES
translations/flacon*.ts
)
-set(DATA_DIR
- ${CMAKE_INSTALL_PREFIX}/share/${PROJECT_NAME}
-)
-
-set(TRANSLATIONS_DIR
- "${DATA_DIR}/translations"
-)
+if(NOT DEFINED DATA_DIR)
+ set(DATA_DIR
+ ${CMAKE_INSTALL_PREFIX}/share/${PROJECT_NAME}
+ )
+endif(NOT DEFINED DATA_DIR)
+
+if(NOT DEFINED TRANSLATIONS_DIR)
+ set(TRANSLATIONS_DIR
+ "${DATA_DIR}/translations"
+ )
+endif(NOT DEFINED TRANSLATIONS_DIR)
add_definitions(-DTRANSLATIONS_DIR=\"${TRANSLATIONS_DIR}\")
set (CMAKE_CXX_STANDARD 11)
@@ -269,19 +273,20 @@ function(CREATE_DESKTOP_FILE _IN_FILE _OUT_FILE _TRANSLATIONS_PATTERN)
file(APPEND ${_OUT_FILE} "${genericname_tag}\n")
endfunction()
-CREATE_DESKTOP_FILE(misc/${PROJECT_NAME}.desktop ${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}.desktop translations/*.desktop)
-CREATE_PLIST_FILE(misc/Info.plist.in ${CMAKE_CURRENT_BINARY_DIR}/Info.plist translations/*.desktop)
-
-install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}.desktop DESTINATION "share/applications")
-install(FILES images/mainicon/flacon-16x16.png DESTINATION "share/icons/hicolor/16x16/apps" RENAME "flacon.png")
-install(FILES images/mainicon/flacon-32x32.png DESTINATION "share/icons/hicolor/32x32/apps" RENAME "flacon.png")
-install(FILES images/mainicon/flacon-48x48.png DESTINATION "share/icons/hicolor/48x48/apps" RENAME "flacon.png")
-install(FILES images/mainicon/flacon-64x64.png DESTINATION "share/icons/hicolor/64x64/apps" RENAME "flacon.png")
-install(FILES images/mainicon/flacon-128x128.png DESTINATION "share/icons/hicolor/128x128/apps" RENAME "flacon.png")
-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")
-
+if(NOT HAIKU)
+ CREATE_DESKTOP_FILE(misc/${PROJECT_NAME}.desktop ${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}.desktop translations/*.desktop)
+ CREATE_PLIST_FILE(misc/Info.plist.in ${CMAKE_CURRENT_BINARY_DIR}/Info.plist translations/*.desktop)
+
+ install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}.desktop DESTINATION "share/applications")
+ install(FILES images/mainicon/flacon-16x16.png DESTINATION "share/icons/hicolor/16x16/apps" RENAME "flacon.png")
+ install(FILES images/mainicon/flacon-32x32.png DESTINATION "share/icons/hicolor/32x32/apps" RENAME "flacon.png")
+ install(FILES images/mainicon/flacon-48x48.png DESTINATION "share/icons/hicolor/48x48/apps" RENAME "flacon.png")
+ install(FILES images/mainicon/flacon-64x64.png DESTINATION "share/icons/hicolor/64x64/apps" RENAME "flacon.png")
+ install(FILES images/mainicon/flacon-128x128.png DESTINATION "share/icons/hicolor/128x128/apps" RENAME "flacon.png")
+ 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(NOT HAIKU)
install(FILES ${QM_FILES} DESTINATION ${TRANSLATIONS_DIR})
install(TARGETS ${PROJECT_NAME} RUNTIME DESTINATION bin)
@@ -301,7 +306,14 @@ configure_file(
add_custom_command(TARGET ${PROJECT_NAME}
COMMAND gzip -c -n ${CMAKE_CURRENT_BINARY_DIR}/flacon.1 > ${CMAKE_CURRENT_BINARY_DIR}/flacon.1.gz
)
-install(FILES ${CMAKE_CURRENT_BINARY_DIR}/flacon.1.gz DESTINATION share/man/man1)
+
+if(NOT DEFINED MAN_DIR)
+ set(MAN_DIR
+ ${CMAKE_INSTALL_PREFIX}/share/man/man1
+ )
+endif(NOT DEFINED MAN_DIR)
+
+install(FILES ${CMAKE_CURRENT_BINARY_DIR}/flacon.1.gz DESTINATION ${MAN_DIR})
# Add make dist target **************************
if(NOT CPACK_PACKAGE_VERSION)
--
2.16.2
From cc44c155e842782ff7ffe15061d6917f282ed5a1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Zolt=C3=A1n=20Mizsei?= <zmizsei@extrowerk.com>
Date: Sun, 4 Mar 2018 13:02:48 +0100
Subject: [PATCH] Bindir
---
CMakeLists.txt | 9 ++++++++-
1 file changed, 8 insertions(+), 1 deletion(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 98d7ac9..f3e5dea 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -289,7 +289,14 @@ if(NOT HAIKU)
endif(NOT HAIKU)
install(FILES ${QM_FILES} DESTINATION ${TRANSLATIONS_DIR})
-install(TARGETS ${PROJECT_NAME} RUNTIME DESTINATION bin)
+
+if(NOT DEFINED BIN_DIR)
+ set(MAN_DIR
+ ${CMAKE_INSTALL_PREFIX}/share/man/man1
+ )
+endif(NOT DEFINED BIN_DIR)
+
+install(TARGETS ${PROJECT_NAME} RUNTIME DESTINATION ${BIN_DIR})
include("cmake/tests.cmake")
--
2.16.2

106
media-sound/flacon/patches/flacon-4.1.0.patchset Normal file
View File

@@ -0,0 +1,106 @@
From 7e1ce0df4991297a84eeecc5693152ed372197ab Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Zolt=C3=A1n=20Mizsei?= <zmizsei@extrowerk.com>
Date: Sat, 28 Apr 2018 19:06:00 +0200
Subject: Haiku supporting patches
diff --git a/CMakeLists.txt b/CMakeLists.txt
index c7d5467..8240333 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -176,13 +176,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 11)
@@ -302,30 +317,34 @@ add_custom_command(TARGET ${PROJECT_NAME}
COMMAND gzip -c -n ${CMAKE_CURRENT_BINARY_DIR}/flacon.1 > ${CMAKE_CURRENT_BINARY_DIR}/flacon.1.gz
)
-
-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)
- install(FILES ${QM_FILES} DESTINATION Flacon.app/Contents/translations)
- install(FILES ${CMAKE_CURRENT_BINARY_DIR}/flacon.1.gz DESTINATION Flacon.app/Contents/Resources)
- install(FILES ${CMAKE_CURRENT_BINARY_DIR}/Info.plist DESTINATION Flacon.app/Contents)
- install(FILES images/mainicon/Flacon.icns DESTINATION Flacon.app/Contents/Resources)
-
+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)
+ install(FILES ${QM_FILES} DESTINATION Flacon.app/Contents/translations)
+ install(FILES ${CMAKE_CURRENT_BINARY_DIR}/flacon.1.gz DESTINATION Flacon.app/Contents/Resources)
+ install(FILES ${CMAKE_CURRENT_BINARY_DIR}/Info.plist DESTINATION Flacon.app/Contents)
+ install(FILES images/mainicon/Flacon.icns DESTINATION Flacon.app/Contents/Resources)
+
+ else()
+ install(TARGETS ${PROJECT_NAME} RUNTIME DESTINATION bin)
+ 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}/${PROJECT_NAME}.desktop DESTINATION "share/applications")
+ install(FILES images/mainicon/flacon-16x16.png DESTINATION "share/icons/hicolor/16x16/apps" RENAME "flacon.png")
+ install(FILES images/mainicon/flacon-32x32.png DESTINATION "share/icons/hicolor/32x32/apps" RENAME "flacon.png")
+ install(FILES images/mainicon/flacon-48x48.png DESTINATION "share/icons/hicolor/48x48/apps" RENAME "flacon.png")
+ install(FILES images/mainicon/flacon-64x64.png DESTINATION "share/icons/hicolor/64x64/apps" RENAME "flacon.png")
+ install(FILES images/mainicon/flacon-128x128.png DESTINATION "share/icons/hicolor/128x128/apps" RENAME "flacon.png")
+ 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()
else()
- install(TARGETS ${PROJECT_NAME} RUNTIME DESTINATION bin)
- 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}/${PROJECT_NAME}.desktop DESTINATION "share/applications")
- install(FILES images/mainicon/flacon-16x16.png DESTINATION "share/icons/hicolor/16x16/apps" RENAME "flacon.png")
- install(FILES images/mainicon/flacon-32x32.png DESTINATION "share/icons/hicolor/32x32/apps" RENAME "flacon.png")
- install(FILES images/mainicon/flacon-48x48.png DESTINATION "share/icons/hicolor/48x48/apps" RENAME "flacon.png")
- install(FILES images/mainicon/flacon-64x64.png DESTINATION "share/icons/hicolor/64x64/apps" RENAME "flacon.png")
- install(FILES images/mainicon/flacon-128x128.png DESTINATION "share/icons/hicolor/128x128/apps" RENAME "flacon.png")
- 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")
-
+ 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")
--
2.16.2