Projects
Eulaceura:Factory
ukui-notebook
_service:obs_scm:0001-fix-build-error-of-ukui-n...
Sign Up
Log In
Username
Password
Overview
Repositories
Revisions
Requests
Users
Attributes
Meta
File _service:obs_scm:0001-fix-build-error-of-ukui-notebook-3.2.1.1.patch of Package ukui-notebook
From b034eba46e3a632d614df22661215f4fd434af7d Mon Sep 17 00:00:00 2001 From: Super User <root@localhost.localdomain> Date: Thu, 18 Apr 2024 10:56:36 +0800 Subject: [PATCH] fix build error of ukui-notebook-3.2.0.1 --- sh/apply_translations.sh | 2 +- sh/common.sh | 4 ++-- sh/generate_translations.sh | 6 +++--- sh/update_translations.sh | 8 ++++---- src/CMakeLists.txt | 2 +- uNoteDbusServer/CMakeLists.txt | 4 ++-- 6 files changed, 13 insertions(+), 13 deletions(-) diff --git a/sh/apply_translations.sh b/sh/apply_translations.sh index e8fd207..7476a74 100644 --- a/sh/apply_translations.sh +++ b/sh/apply_translations.sh @@ -26,7 +26,7 @@ fi ${CD} $src_dir for locale in ${locales[@]}; do - lconvert -i ${translations_dir}/${projet_name}_${locale}.ts -o ${po_dir}/${locale}.po + lconvert-qt5 -i ${translations_dir}/${projet_name}_${locale}.ts -o ${po_dir}/${locale}.po done file_list=`sed '/^#.*\|^$/d' ${po_dir}/POTFILES.in` diff --git a/sh/common.sh b/sh/common.sh index 537493a..dfab0ad 100644 --- a/sh/common.sh +++ b/sh/common.sh @@ -32,8 +32,8 @@ ${src_dir}/src" RM='rm -rf' MKDIR='mkdir' CD='cd' -LUPDATE='lupdate -silent' -LRELEASE='lrelease -silent' +LUPDATE='lupdate-qt5 -silent' +LRELEASE='lrelease-qt5 -silent' case `uname` in Linux) SED_I='sed -i ' diff --git a/sh/generate_translations.sh b/sh/generate_translations.sh index ffb81a0..10a8c69 100644 --- a/sh/generate_translations.sh +++ b/sh/generate_translations.sh @@ -28,12 +28,12 @@ for locale in ${locales[@]} do xgettext -i ${projet_name}.pot -o ${locale}.po --from-code=UTF-8 --omit-header -Lpo - lconvert -i ${po_dir}/${locale}.po -o ${po_dir}/${locale}.ts + lconvert-qt5 -i ${po_dir}/${locale}.po -o ${po_dir}/${locale}.ts - lconvert -i ${translations_dir}/${projet_name}_${locale}.ts ${po_dir}/${locale}.ts \ + lconvert-qt5 -i ${translations_dir}/${projet_name}_${locale}.ts ${po_dir}/${locale}.ts \ -o ${translations_dir}/${projet_name}_${locale}.ts done clear_po ${CD} $src_dir -find . -name "*.desktop" | xargs ${RM} \ No newline at end of file +find . -name "*.desktop" | xargs ${RM} diff --git a/sh/update_translations.sh b/sh/update_translations.sh index f9852d4..b779663 100644 --- a/sh/update_translations.sh +++ b/sh/update_translations.sh @@ -27,7 +27,7 @@ cd $src_dir for locale in ${locales[@]} do - lconvert -i ${translations_dir}/${projet_name}_${locale}.ts \ + lconvert-qt5 -i ${translations_dir}/${projet_name}_${locale}.ts \ -o ${po_dir}/${locale}.po done @@ -38,10 +38,10 @@ done cd $src_dir for locale in ${locales[@]}; do - lconvert -no-obsolete -i ${po_dir}/${locale}.po -o ${po_dir}/${locale}.ts + lconvert-qt5 -no-obsolete -i ${po_dir}/${locale}.po -o ${po_dir}/${locale}.ts - lconvert -i ${translations_dir}/${projet_name}_${locale}.ts ${po_dir}/${locale}.ts \ + lconvert-qt5 -i ${translations_dir}/${projet_name}_${locale}.ts ${po_dir}/${locale}.ts \ -o ${translations_dir}/${projet_name}_${locale}.ts done -clear_po \ No newline at end of file +clear_po diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 28c9acd..9a9fc72 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -88,4 +88,4 @@ install(TARGETS ${PROJECT_NAME} DESTINATION /usr/bin/) file(GLOB TRANS "${PROJECT_SOURCE_DIR}/../translations/${PROJECT_NAME}/*.qm") install(FILES ${TRANS} DESTINATION /usr/share/${PROJECT_NAME}/translations/) install(DIRECTORY ${PROJECT_SOURCE_DIR}/../data/kylin-notebook DESTINATION /usr/share/kylin-user-guide/data/guide/) -install(FILES ${PROJECT_SOURCE_DIR}/../data/${PROJECT_NAME}.desktop DESTINATION /usr/share/applications/) +install(FILES ${PROJECT_SOURCE_DIR}/../data/${PROJECT_NAME}.desktop.in DESTINATION /usr/share/applications/) diff --git a/uNoteDbusServer/CMakeLists.txt b/uNoteDbusServer/CMakeLists.txt index bd1aa7a..5185ed7 100644 --- a/uNoteDbusServer/CMakeLists.txt +++ b/uNoteDbusServer/CMakeLists.txt @@ -2,8 +2,8 @@ project(ukui-notebook-server) include(${PROJECT_SOURCE_DIR}/../cmake/common.cmake) -execute_process(COMMAND qdbusxml2cpp ${PROJECT_SOURCE_DIR}/../data/org.ukui.note.xml -a ${PROJECT_SOURCE_DIR}/note_adaptor) -execute_process(COMMAND qdbusxml2cpp ${PROJECT_SOURCE_DIR}/../data/org.ukui.note.xml -p ${PROJECT_SOURCE_DIR}/note_interface) +execute_process(COMMAND qdbusxml2cpp-qt5 ${PROJECT_SOURCE_DIR}/../data/org.ukui.note.xml -a ${PROJECT_SOURCE_DIR}/note_adaptor) +execute_process(COMMAND qdbusxml2cpp-qt5 ${PROJECT_SOURCE_DIR}/../data/org.ukui.note.xml -p ${PROJECT_SOURCE_DIR}/note_interface) set(CMAKE_AUTOUIC ON) set(CMAKE_AUTOMOC ON) set(CMAKE_AUTORCC ON) -- 2.43.0
Locations
Projects
Search
Status Monitor
Help
Open Build Service
OBS Manuals
API Documentation
OBS Portal
Reporting a Bug
Contact
Mailing List
Forums
Chat (IRC)
Twitter
Open Build Service (OBS)
is an
openSUSE project
.
浙ICP备2022010568号-2