Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore: update cmake make ocr optional #128

Open
wants to merge 1 commit into
base: master
Choose a base branch
from

Conversation

Decodetalkers
Copy link

@Decodetalkers Decodetalkers commented Feb 21, 2023

Log: cmake and ocr optional
resolve: linuxdeepin/developer-center#3780

@Decodetalkers
Copy link
Author

等下,我只是--build了下,怎么翻译也变化了

libdraw使用源的,不要在项目里面放了

@Decodetalkers
Copy link
Author

qtquick_compiler_add_resources(RCC_SOURCES ${RESOURCES})
这玩意要干掉,这个很快就会废弃了

@wineee
Copy link
Member

wineee commented Feb 21, 2023

这个我改过一部分了,#127 我们重复了

@Decodetalkers
Copy link
Author

这个我改过一部分了,#127 我们重复了

libdraw应该用pkgconfig,这个在代码里面的应该直接扔掉才对

@wineee
Copy link
Member

wineee commented Feb 21, 2023

这个我改过一部分了,#127 我们重复了

libdraw应该用pkgconfig,这个在代码里面的应该直接扔掉才对

libraw 本来就是用的系统的,你删除的不是不是 libraw 本体,应该是插件吧?
https://github.com/LibRaw/LibRaw

@Decodetalkers
Copy link
Author

哦,那我搞错了

Log: cmake and ocr optional
@Decodetalkers
Copy link
Author

Decodetalkers commented Feb 21, 2023

这个我改过一部分了,#127 我们重复了

libdraw应该用pkgconfig,这个在代码里面的应该直接扔掉才对

libraw 本来就是用的系统的,你删除的不是不是 libraw 本体,应该是插件吧? https://github.com/LibRaw/LibRaw

那我先等你那个合并咯,你的处理好点

@wineee
Copy link
Member

wineee commented Feb 21, 2023

ok, linuxdeepin/developer-center#3786 这个也要改,以后单独搞个 pr 吧

@@ -67,14 +69,15 @@ int main(int argc, char *argv[])
CursorTool *cursorTool = new CursorTool();
engine.rootContext()->setContextProperty("cursorTool", cursorTool);
// OCR分析工具
#ifdef ENABLEOCR
auto liveTextAnalyzer = new LiveTextAnalyzer;
engine.rootContext()->setContextProperty("liveTextAnalyzer", liveTextAnalyzer);
engine.addImageProvider(QLatin1String("liveTextAnalyzer"), liveTextAnalyzer);

engine.load(QUrl(QStringLiteral("qrc:/qml/main.qml")));
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

main.qml 被包括进宏

@@ -8,15 +8,24 @@ set(CMAKE_AUTORCC ON)
set(CMAKE_CXX_STANDARD 17)
set(CMAKE_CXX_STANDARD_REQUIRED ON)

option(ENABLEOCR "Enable OCR" OFF)
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

应该在 debian/rules 中加参数设置为 ON

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

修正文件权限等修改后面可以 rebase

@deepin-bot
Copy link
Contributor

deepin-bot bot commented Jan 31, 2024

TAG Bot

New tag: 5.9.17
DISTRIBUTION: unstable
Suggest: synchronizing this PR through rebase #163

@deepin-bot
Copy link
Contributor

deepin-bot bot commented Aug 15, 2024

TAG Bot

New tag: 6.0.4
DISTRIBUTION: unstable
Suggest: synchronizing this PR through rebase #183

@deepin-bot
Copy link
Contributor

deepin-bot bot commented Sep 5, 2024

TAG Bot

New tag: 6.0.5
DISTRIBUTION: unstable
Suggest: synchronizing this PR through rebase #186

@deepin-bot
Copy link
Contributor

deepin-bot bot commented Sep 20, 2024

TAG Bot

New tag: 6.0.6
DISTRIBUTION: unstable
Suggest: synchronizing this PR through rebase #193

@deepin-bot
Copy link
Contributor

deepin-bot bot commented Sep 27, 2024

TAG Bot

New tag: 6.0.7
DISTRIBUTION: unstable
Suggest: synchronizing this PR through rebase #195

@deepin-bot
Copy link
Contributor

deepin-bot bot commented Dec 7, 2024

TAG Bot

New tag: 6.0.8
DISTRIBUTION: unstable
Suggest: synchronizing this PR through rebase #202

@deepin-bot
Copy link
Contributor

deepin-bot bot commented Dec 14, 2024

TAG Bot

New tag: 6.0.9
DISTRIBUTION: unstable
Suggest: synchronizing this PR through rebase #205

@deepin-bot
Copy link
Contributor

deepin-bot bot commented Dec 27, 2024

TAG Bot

New tag: 6.0.10
DISTRIBUTION: unstable
Suggest: synchronizing this PR through rebase #207

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

deepin-image-viewer:OCR相关功能支持为可选
4 participants