deepin-movie-reborn: update to 5.0.0.

This commit is contained in:
John 2019-07-30 02:53:07 +00:00
parent c9e614b817
commit a68cb54323
2 changed files with 45 additions and 2 deletions

View file

@ -0,0 +1,43 @@
From 0a46b32065fc7508cc9af611d6809187a42be91d Mon Sep 17 00:00:00 2001
From: Gary Wang <wzc782970009@gmail.com>
Date: Tue, 30 Jul 2019 11:24:28 +0800
Subject: [PATCH] fix: build failed if cannot find dtk-settings tool
---
src/CMakeLists.txt | 16 +++++++++-------
1 file changed, 9 insertions(+), 7 deletions(-)
diff --git src/CMakeLists.txt src/CMakeLists.txt
index b403c96..55b0318 100644
--- src/CMakeLists.txt
+++ src/CMakeLists.txt
@@ -42,12 +42,15 @@ list(APPEND SRCS ${MPV_SRCS})
list(APPEND PROJECT_INCLUDE ${PROJECT_SOURCE_DIR}/src/backends/mpv)
#~
-add_custom_target(json_i18n ALL
- /usr/lib/dtk2/dtk-settings resources/data/settings.json -o common/settings_translation.cpp
- COMMAND sed -i "s,#include .*,#include <DSettings>," common/settings_translation.cpp
- VERBATIM
- SOURCES resources/data/settings.json
- WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}/src/)
+set (DTK_SETTINGS_TOOLS_EXECUTABLE ${DTKCORE_TOOL_DIR}/dtk-settings)
+if (EXISTS ${DTK_SETTINGS_TOOLS_EXECUTABLE})
+ add_custom_target(json_i18n ALL
+ ${DTKCORE_TOOL_DIR}/dtk-settings resources/data/settings.json -o common/settings_translation.cpp
+ COMMAND sed -i "s,#include .*,#include <DSettings>," common/settings_translation.cpp
+ VERBATIM
+ SOURCES resources/data/settings.json
+ WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}/src/)
+endif ()
## translations
file(GLOB TS LIST_DIRECTORIES false translations/${CMD_NAME}*.ts)
@@ -61,7 +64,6 @@ endif ()
# ~
add_executable(${CMD_NAME} ${SRCS} ${RCS} ${QM})
-add_dependencies(${CMD_NAME} json_i18n)
target_include_directories(${CMD_NAME} PUBLIC ${PROJECT_INCLUDE})
set(TARGET_LIBS X11 Xext Xtst PkgConfig::Xcb Qt5::Widgets Qt5::X11Extras Qt5::Network

View file

@ -1,6 +1,6 @@
# Template file for 'deepin-movie-reborn'
pkgname=deepin-movie-reborn
version=3.2.24.2
version=5.0.0
revision=1
build_style=cmake
hostmakedepends="pkg-config qt5-host-tools qt5-qmake"
@ -15,7 +15,7 @@ license="GPL-3.0-or-later"
homepage="https://github.com/linuxdeepin/deepin-movie-reborn"
changelog="https://github.com/linuxdeepin/deepin-movie-reborn/blob/${version}/CHANGELOG.md"
distfiles="https://github.com/linuxdeepin/deepin-movie-reborn/archive/${version}.tar.gz"
checksum=176e34c8ac236f21b0d058b9c10ceaf812e9fb6a0405907ec4a3da30592a054c
checksum=b52456ef8c373c1738edc15cfbdb7127f2dbdf57153594bb2b716f02573ef1ef
CXXFLAGS="-I${XBPS_CROSS_BASE}/usr/include/libdtk-2.0.6/DWidget"
CXXFLAGS+=" -I${XBPS_CROSS_BASE}/usr/include/libdtk-2.0.6/DCore"
CXXFLAGS+=" -I${XBPS_CROSS_BASE}/usr/include/libdtk-2.0.6/DWm"