Minor (mostly bugfix) update of Kid3 to 3.8.5.
All our patches went upstream.
This commit is contained in:
parent
21f6d3cc6a
commit
5b6fb7209e
@ -1,10 +1,9 @@
|
||||
# $OpenBSD: Makefile,v 1.3 2021/02/23 19:39:30 sthen Exp $
|
||||
# $OpenBSD: Makefile,v 1.4 2021/03/04 12:53:42 zhuk Exp $
|
||||
|
||||
COMMENT = multimedia files tag editor
|
||||
DISTNAME = kid3-3.8.4
|
||||
DISTNAME = kid3-3.8.5
|
||||
CATEGORIES = multimedia x11
|
||||
HOMEPAGE = https://kid3.kde.org/
|
||||
REVISION = 0
|
||||
|
||||
MAINTAINER = Vadim Zhukov <zhuk@openbsd.org>
|
||||
|
||||
|
@ -1,2 +1,2 @@
|
||||
SHA256 (kid3-3.8.4.tar.gz) = WYuEOqMu2VMOv6mkVCRXnmInFER/DWfPNqYuaTJ3vAc=
|
||||
SIZE (kid3-3.8.4.tar.gz) = 3161673
|
||||
SHA256 (kid3-3.8.5.tar.gz) = DEZ5J1QendgXJ1gBZ3h0LwsVTLL1vPznJ7Nc+97jFB8=
|
||||
SIZE (kid3-3.8.5.tar.gz) = 3181228
|
||||
|
@ -1,15 +0,0 @@
|
||||
$OpenBSD: patch-src_app_cli_standardiohandler_cpp,v 1.1.1.1 2020/10/30 20:40:53 zhuk Exp $
|
||||
Unbreak build: do not prefix macros with "::".
|
||||
|
||||
Index: src/app/cli/standardiohandler.cpp
|
||||
--- src/app/cli/standardiohandler.cpp.orig
|
||||
+++ src/app/cli/standardiohandler.cpp
|
||||
@@ -55,7 +55,7 @@ StandardIOHandler::StandardIOHandler(const char* promp
|
||||
DWORD mode;
|
||||
m_consoleMode = GetConsoleMode(GetStdHandle(STD_OUTPUT_HANDLE), &mode);
|
||||
#else
|
||||
- m_consoleMode = ::isatty(::fileno(stdout));
|
||||
+ m_consoleMode = isatty(fileno(stdout));
|
||||
#endif
|
||||
}
|
||||
|
@ -1,15 +0,0 @@
|
||||
$OpenBSD: patch-src_core_CMakeLists_txt,v 1.1.1.1 2020/10/30 20:40:53 zhuk Exp $
|
||||
Do not version an internal library.
|
||||
|
||||
Index: src/core/CMakeLists.txt
|
||||
--- src/core/CMakeLists.txt.orig
|
||||
+++ src/core/CMakeLists.txt
|
||||
@@ -175,7 +175,7 @@ target_compile_definitions(kid3-core
|
||||
PUBLIC QT_ASCII_CAST_WARNINGS QT_NO_CAST_TO_ASCII QT_NO_URL_CAST_FROM_STRING QT_STRICT_ITERATORS QT_NO_EXCEPTIONS QT_NO_STL
|
||||
)
|
||||
|
||||
-set_target_properties(kid3-core PROPERTIES VERSION ${KID3_VERSION})
|
||||
+# set_target_properties(kid3-core PROPERTIES VERSION ${KID3_VERSION})
|
||||
if(CMAKE_VERSION VERSION_GREATER "3.8")
|
||||
target_compile_features(kid3-core PUBLIC cxx_std_11)
|
||||
else()
|
@ -1,15 +0,0 @@
|
||||
$OpenBSD: patch-src_gui_CMakeLists_txt,v 1.1.1.1 2020/10/30 20:40:53 zhuk Exp $
|
||||
Do not version an internal library.
|
||||
|
||||
Index: src/gui/CMakeLists.txt
|
||||
--- src/gui/CMakeLists.txt.orig
|
||||
+++ src/gui/CMakeLists.txt
|
||||
@@ -109,7 +109,7 @@ target_include_directories(kid3-gui PRIVATE widgets PU
|
||||
|
||||
target_compile_definitions(kid3-gui PRIVATE KID3_BUILD_GUI_LIB)
|
||||
|
||||
-set_target_properties(kid3-gui PROPERTIES VERSION ${KID3_VERSION})
|
||||
+# set_target_properties(kid3-gui PROPERTIES VERSION ${KID3_VERSION})
|
||||
target_link_libraries(kid3-gui kid3-core Qt5::Widgets Qt5::Multimedia)
|
||||
|
||||
if(BUILD_SHARED_LIBS)
|
Loading…
x
Reference in New Issue
Block a user