diff --git a/deploy/Docker/archlinux/Dockerfile b/deploy/Docker/archlinux/Dockerfile index c3208ca..0c32f98 100644 --- a/deploy/Docker/archlinux/Dockerfile +++ b/deploy/Docker/archlinux/Dockerfile @@ -4,10 +4,7 @@ FROM archlinux RUN pacman --noconfirm -Sy #Build dependencies -RUN pacman --noconfirm -S sudo cmake git coreutils base-devel eigen - -#Dependencies from repos -RUN pacman --noconfirm -S qt5-base mbedtls +RUN pacman --noconfirm -S sudo cmake git coreutils base-devel qt5-base RUN echo "MAKEFLAGS=\"-j${nproc}\"" >> /etc/makepkg.conf @@ -24,15 +21,13 @@ RUN git clone https://aur.archlinux.org/yay.git && \ makepkg -si --noconfirm && \ cd .. && sudo rm -rf yay -RUN yay -Sy --noconfirm gtkglext -RUN yay -S --noconfirm cpr opencv opencv2 nlohmann-json tesseract tesseract-data-rus +RUN yay -S opencv zbar nlohmann-json tesseract tesseract-data-rus #building WORKDIR /home/checks-parser RUN git clone https://git.foxarmy.org/leca/checks-parser && \ cd checks-parser && \ - mkdir build && cd build && \ - cmake .. && \ + cmake . && \ make -j ${nproc} && \ sudo make install diff --git a/outputdialog.ui b/outputdialog.ui index f09f5da..c6e462f 100644 --- a/outputdialog.ui +++ b/outputdialog.ui @@ -60,7 +60,7 @@ 10 50 - 111 + 371 24 @@ -168,7 +168,7 @@ 10 90 - 111 + 381 24 diff --git a/translations/ru_RU.ts b/translations/ru_RU.ts index 1896d6f..bda4749 100644 --- a/translations/ru_RU.ts +++ b/translations/ru_RU.ts @@ -60,7 +60,7 @@ OCR Оптическое Распознавание Символов - ОСР + ОРС