From 2b62754b8500296b984eb954c0a4c797bc646324 Mon Sep 17 00:00:00 2001 From: liuminghang Date: Tue, 29 Jun 2021 14:06:52 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E6=94=B9=E6=89=93=E5=8C=85?= =?UTF-8?q?=E6=96=B9=E5=BC=8F=E5=8F=98=E4=B8=BAcmake=E6=89=93=E5=8C=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Description: 修改打包方式变为cmake打包 Log: 修改打包方式变为cmake打包 Change-Id: I17ea901b63c290f2ebe406f36737f165c419eff2 --- debian/control | 2 +- debian/rules | 9 +++++--- translations.pri | 58 ++++++++++++++++++++++++------------------------ 3 files changed, 36 insertions(+), 33 deletions(-) diff --git a/debian/control b/debian/control index 8c24935..bd478e7 100644 --- a/debian/control +++ b/debian/control @@ -2,7 +2,7 @@ Source: deepin-ocr Section: utils Priority: optional Maintainer: Deepin Packages Builder -Build-Depends: debhelper (>= 11), qt5-qmake, qtbase5-dev, pkg-config,libdtkwidget-dev,libleptonica-dev,libtesseract-dev ,qttools5-dev-tools,qttools5-dev +Build-Depends: debhelper (>= 11), cmake, qtbase5-dev, pkg-config,libdtkwidget-dev,libleptonica-dev,libtesseract-dev ,qttools5-dev-tools,qttools5-dev Standards-Version: 4.1.3 Homepage: http://www.deepin.org diff --git a/debian/rules b/debian/rules index 771925a..bb75c52 100755 --- a/debian/rules +++ b/debian/rules @@ -1,11 +1,14 @@ #!/usr/bin/make -f include /usr/share/dpkg/default.mk -export QT_SELECT=qt5 +export QT_SELECT=5 +DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH) %: dh $@ override_dh_auto_configure: - qmake - dh_auto_configure -- VERSION=$(VERSION) LIB_INSTALL_DIR=/usr/lib/$(DEB_HOST_MULTIARCH) DEFINES+="VERSION=$(DEB_VERSION_UPSTREAM)" + dh_auto_configure -- \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DAPP_VERSION=$(DEB_VERSION_UPSTREAM) -DVERSION=$(DEB_VERSION_UPSTREAM) LIB_INSTALL_DIR=/usr/lib/$(DEB_HOST_MULTIARCH) DH_AUTO_ARGS = --parallel --buildsystem=cmake diff --git a/translations.pri b/translations.pri index f9e6c40..9e8532e 100644 --- a/translations.pri +++ b/translations.pri @@ -1,35 +1,35 @@ TRANSLATIONS += \ -# $$PWD/translations/deepin-ocr_zh_CN.ts \ -# $$PWD/translations/deepin-ocr_en_US.ts \ + $$PWD/translations/deepin-ocr_zh_CN.ts \ + $$PWD/translations/deepin-ocr_en_US.ts \ $$PWD/translations/deepin-ocr_zh_HK.ts \ $$PWD/translations/deepin-ocr_zh_TW.ts \ -# $$PWD/translations/deepin-ocr_ar.ts \ -# $$PWD/translations/deepin-ocr_br.ts \ -# $$PWD/translations/deepin-ocr_ca.ts \ -# $$PWD/translations/deepin-ocr_cs.ts \ -# $$PWD/translations/deepin-ocr_da.ts \ -# $$PWD/translations/deepin-ocr_de.ts \ -# $$PWD/translations/deepin-ocr_es.ts \ -# $$PWD/translations/deepin-ocr_fi.ts \ -# $$PWD/translations/deepin-ocr_fr.ts \ -# $$PWD/translations/deepin-ocr_gl_ES.ts \ -# $$PWD/translations/deepin-ocr_hu.ts \ -# $$PWD/translations/deepin-ocr_it.ts \ -# $$PWD/translations/deepin-ocr_ko.ts \ -# $$PWD/translations/deepin-ocr_ms.ts \ -# $$PWD/translations/deepin-ocr_nl.ts \ -# $$PWD/translations/deepin-ocr_pl.ts \ -# $$PWD/translations/deepin-ocr_pt.ts \ -# $$PWD/translations/deepin-ocr_pt_BR.ts \ -# $$PWD/translations/deepin-ocr_ru.ts \ -# $$PWD/translations/deepin-ocr_sq.ts \ -# $$PWD/translations/deepin-ocr_sr.ts \ -# $$PWD/translations/deepin-ocr_tr.ts \ -# $$PWD/translations/deepin-ocr_uk.ts \ -# $$PWD/translations/deepin-ocr_ug.ts \ -# $$PWD/translations/deepin-ocr_bo.ts + $$PWD/translations/deepin-ocr_ar.ts \ + $$PWD/translations/deepin-ocr_br.ts \ + $$PWD/translations/deepin-ocr_ca.ts \ + $$PWD/translations/deepin-ocr_cs.ts \ + $$PWD/translations/deepin-ocr_da.ts \ + $$PWD/translations/deepin-ocr_de.ts \ + $$PWD/translations/deepin-ocr_es.ts \ + $$PWD/translations/deepin-ocr_fi.ts \ + $$PWD/translations/deepin-ocr_fr.ts \ + $$PWD/translations/deepin-ocr_gl_ES.ts \ + $$PWD/translations/deepin-ocr_hu.ts \ + $$PWD/translations/deepin-ocr_it.ts \ + $$PWD/translations/deepin-ocr_ko.ts \ + $$PWD/translations/deepin-ocr_ms.ts \ + $$PWD/translations/deepin-ocr_nl.ts \ + $$PWD/translations/deepin-ocr_pl.ts \ + $$PWD/translations/deepin-ocr_pt.ts \ + $$PWD/translations/deepin-ocr_pt_BR.ts \ + $$PWD/translations/deepin-ocr_ru.ts \ + $$PWD/translations/deepin-ocr_sq.ts \ + $$PWD/translations/deepin-ocr_sr.ts \ + $$PWD/translations/deepin-ocr_tr.ts \ + $$PWD/translations/deepin-ocr_uk.ts \ + $$PWD/translations/deepin-ocr_ug.ts \ + $$PWD/translations/deepin-ocr_bo.ts -#DISTFILES += \ -# $$PWD/translations/deepin-ocr_en_US.ts +DISTFILES += \ + $$PWD/translations/deepin-ocr_en_US.ts