diff --git a/.github/workflows/build_starc_linux.yml b/.github/workflows/build_starc_linux.yml index b26e9dc9d..bfa28e273 100644 --- a/.github/workflows/build_starc_linux.yml +++ b/.github/workflows/build_starc_linux.yml @@ -36,7 +36,7 @@ jobs: if: ${{ github.event_name == 'pull_request' }} shell: bash run: | - git submodule update --init --recursive src/3rd_party/qbreakpad/ + git submodule update --init --recursive src/3rd_party/qbreakpad/ src/3rd_party/pdfhummus/ src/3rd_party/pdftextextraction/ - name: Add info about dev build to the env shell: bash diff --git a/.github/workflows/build_starc_mac.yml b/.github/workflows/build_starc_mac.yml index 0778ec8ec..3df248be9 100644 --- a/.github/workflows/build_starc_mac.yml +++ b/.github/workflows/build_starc_mac.yml @@ -36,7 +36,7 @@ jobs: if: ${{ github.event_name == 'pull_request' }} shell: bash run: | - git submodule update --init --recursive src/3rd_party/qbreakpad/ + git submodule update --init --recursive src/3rd_party/qbreakpad/ src/3rd_party/pdfhummus/ src/3rd_party/pdftextextraction/ - name: Add info about dev build to the env shell: bash diff --git a/.github/workflows/build_starc_windows.yml b/.github/workflows/build_starc_windows.yml index 2d406be71..5da5b1cab 100644 --- a/.github/workflows/build_starc_windows.yml +++ b/.github/workflows/build_starc_windows.yml @@ -36,7 +36,7 @@ jobs: if: ${{ github.event_name == 'pull_request' }} shell: bash run: | - git submodule update --init --recursive src/3rd_party/qbreakpad/ + git submodule update --init --recursive src/3rd_party/qbreakpad/ src/3rd_party/pdfhummus/ src/3rd_party/pdftextextraction/ - name: Add info about dev build to the env shell: bash @@ -154,7 +154,7 @@ jobs: if: ${{ github.event_name == 'pull_request' }} shell: bash run: | - git submodule update --init --recursive src/3rd_party/qbreakpad/ + git submodule update --init --recursive src/3rd_party/qbreakpad/ src/3rd_party/pdfhummus/ src/3rd_party/pdftextextraction/ - name: Add info about dev build to the env shell: bash diff --git a/.gitmodules b/.gitmodules index 15034e3d5..2c89159fb 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,6 +1,14 @@ [submodule "src/3rd_party/qbreakpad"] path = src/3rd_party/qbreakpad url = https://github.com/story-apps/qBreakpad.git +[submodule "src/3rd_party/pdfhummus"] + path = src/3rd_party/pdfhummus + url = https://github.com/story-apps/PDF-Writer.git + branch = qmake-build +[submodule "src/3rd_party/pdftextextraction"] + path = src/3rd_party/pdftextextraction + url = https://github.com/story-apps/pdf-text-extraction.git + branch = qmake-build [submodule "src/cloud"] path = src/cloud url = git@github.com:story-apps/starcloud diff --git a/src/3rd_party/3rd_party.pro b/src/3rd_party/3rd_party.pro index 5d03a4e85..fe285ff27 100755 --- a/src/3rd_party/3rd_party.pro +++ b/src/3rd_party/3rd_party.pro @@ -7,4 +7,6 @@ SUBDIRS = \ qbreakpad/qBreakpad.pro \ qgumboparser \ webloader \ - qtxlsxwriter + qtxlsxwriter \ + pdfhummus \ + pdftextextraction \ diff --git a/src/3rd_party/pdfhummus b/src/3rd_party/pdfhummus new file mode 160000 index 000000000..b3d65a7b0 --- /dev/null +++ b/src/3rd_party/pdfhummus @@ -0,0 +1 @@ +Subproject commit b3d65a7b011b1b5c83af7d9c516c8fbc457a5cc4 diff --git a/src/3rd_party/pdftextextraction b/src/3rd_party/pdftextextraction new file mode 160000 index 000000000..6aeae3869 --- /dev/null +++ b/src/3rd_party/pdftextextraction @@ -0,0 +1 @@ +Subproject commit 6aeae386905b07ec9654bdd1f4b5f658c4580561 diff --git a/src/corelib/corelib.pro b/src/corelib/corelib.pro index 4dfd144ea..39177a66e 100644 --- a/src/corelib/corelib.pro +++ b/src/corelib/corelib.pro @@ -35,7 +35,11 @@ win32-msvc*:QMAKE_LFLAGS += /WHOLEARCHIVE:$$LIBSDIR/fileformats.lib INCLUDEPATH += $$PWD/../3rd_party/fileformats DEPENDPATH += $$PWD/../3rd_party/fileformats PRE_TARGETDEPS += $$PWD/../3rd_party/fileformats +# +# +# Подключаем библиотеку Zlib +# mac:LIBS += -lz # @@ -97,6 +101,61 @@ INCLUDEPATH += $$PWD/../3rd_party/libavoid/ DEPENDPATH += $$PWD/../3rd_party/libavoid # +# +# Подключаем библиотеку TextExtraction +# +LIBS += -L$$LIBSDIR/ -lTextExtraction +INCLUDEPATH += $$PWD/../3rd_party/pdftextextraction/TextExtraction +DEPENDPATH += $$PWD/../3rd_party/pdftextextraction/TextExtraction +# + +# +# Подключаем библиотеку PDFWriter +# +LIBS += -L$$LIBSDIR/ -lPDFWriter +INCLUDEPATH += $$PWD/../3rd_party/pdfhummus/PDFWriter +DEPENDPATH += $$PWD/../3rd_party/pdfhummus/PDFWriter +# + +# +# Подключаем библиотеку FreeType +# +LIBS += -L$$LIBSDIR/ -lFreeType +INCLUDEPATH += $$PWD/../3rd_party/pdfhummus/FreeType/include +DEPENDPATH += $$PWD/../3rd_party/pdfhummus/FreeType/include + +# +# Подключаем библиотеку LibAesgm +# +LIBS += -L$$LIBSDIR/ -lLibAesgm +INCLUDEPATH += $$PWD/../3rd_party/pdfhummus/LibAesgm +DEPENDPATH += $$PWD/../3rd_party/pdfhummus/LibAesgm +# + +# +# Подключаем библиотеку LibJpeg +# +LIBS += -L$$LIBSDIR/ -lLibJpeg +INCLUDEPATH += $$PWD/../3rd_party/pdfhummus/LibJpeg +DEPENDPATH += $$PWD/../3rd_party/pdfhummus/LibJpeg +# + +# +# Подключаем библиотеку LibPng +# +LIBS += -L$$LIBSDIR/ -lLibPng +INCLUDEPATH += $$PWD/../3rd_party/pdfhummus/LibPng +DEPENDPATH += $$PWD/../3rd_party/pdfhummus/LibPng +# + +# +# Подключаем библиотеку LibTiff +# +LIBS += -L$$LIBSDIR/ -lLibTiff +INCLUDEPATH += $$PWD/../3rd_party/pdfhummus/LibTiff +DEPENDPATH += $$PWD/../3rd_party/pdfhummus/LibTiff +# + SOURCES += \ business_layer/chronometry/chronometer.cpp \ business_layer/document/audioplay/text/audioplay_text_corrector.cpp \