Gentoo Archives: gentoo-commits

From: David Heidelberg <david@××××.cz>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/proj/guru:dev commit in: app-misc/mobile-datovka/, app-misc/mobile-datovka/files/
Date: Sat, 25 Apr 2020 08:12:28
Message-Id: 1587802330.a68cdc0f9131de0c9531c144b76e459e2f5dd301.okias@gentoo
1 commit: a68cdc0f9131de0c9531c144b76e459e2f5dd301
2 Author: David Heidelberg <david <AT> ixit <DOT> cz>
3 AuthorDate: Sat Apr 25 08:12:10 2020 +0000
4 Commit: David Heidelberg <david <AT> ixit <DOT> cz>
5 CommitDate: Sat Apr 25 08:12:10 2020 +0000
6 URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=a68cdc0f
7
8 app-misc/mobile-datovka: add dependency on dev-qt/qttranslations
9
10 Previously used dirty fix can be dropped now!
11
12 Package-Manager: Portage-2.3.99, Repoman-2.3.22
13 Signed-off-by: David Heidelberg <david <AT> ixit.cz>
14
15 .../files/mobile-datovka-1.9.1-quickdirtyfix.patch | 48 ----------------------
16 .../mobile-datovka/mobile-datovka-1.9.1.ebuild | 3 +-
17 2 files changed, 1 insertion(+), 50 deletions(-)
18
19 diff --git a/app-misc/mobile-datovka/files/mobile-datovka-1.9.1-quickdirtyfix.patch b/app-misc/mobile-datovka/files/mobile-datovka-1.9.1-quickdirtyfix.patch
20 deleted file mode 100644
21 index 6f8c432..0000000
22 --- a/app-misc/mobile-datovka/files/mobile-datovka-1.9.1-quickdirtyfix.patch
23 +++ /dev/null
24 @@ -1,48 +0,0 @@
25 -From a8613894370b5ff66731896b293e024151dba66c Mon Sep 17 00:00:00 2001
26 -From: David Heidelberg <david@××××.cz>
27 -Date: Thu, 23 Apr 2020 21:53:14 +0200
28 -Subject: [PATCH 1/3] Compile under Linux.
29 -
30 -Signed-off-by: David Heidelberg <david@××××.cz>
31 ----
32 - mobile-datovka.pro | 15 ++++++++-------
33 - 1 file changed, 8 insertions(+), 7 deletions(-)
34 -
35 -diff --git a/mobile-datovka.pro b/mobile-datovka.pro
36 -index 8cef44c..635279f 100644
37 ---- a/mobile-datovka.pro
38 -+++ b/mobile-datovka.pro
39 -@@ -64,13 +64,13 @@ command = $$LRELEASE mobile-datovka.pro
40 - system($$command)|error("Failed to run: $$command")
41 -
42 - # Copy translation files at qmake invocation.
43 --message(Copying Qt translation from $$system_path($$[QT_INSTALL_DATA]).)
44 --system($$QMAKE_COPY $$system_path($$[QT_INSTALL_DATA]/translations/qtbase_cs.qm) $$system_path(res/locale/qtbase_cs.qm))
45 --system($$QMAKE_COPY $$system_path($$[QT_INSTALL_DATA]/translations/qtbase_en.qm) $$system_path(res/locale/qtbase_en.qm))
46 -+#message(Copying Qt translation from $$system_path($$[QT_INSTALL_DATA]).)
47 -+#system($$QMAKE_COPY $$system_path($$[QT_INSTALL_DATA]/translations/qtbase_cs.qm) $$system_path(res/locale/qtbase_cs.qm))
48 -+#system($$QMAKE_COPY $$system_path($$[QT_INSTALL_DATA]/translations/qtbase_en.qm) $$system_path(res/locale/qtbase_en.qm))
49 -
50 - TRANSLATIONS_FILES += \
51 -- res/locale/qtbase_cs.qm \
52 -- res/locale/qtbase_en.qm \
53 -+# res/locale/qtbase_cs.qm \
54 -+# res/locale/qtbase_en.qm \
55 - res/locale/datovka_cs.qm \
56 - res/locale/datovka_en.qm
57 -
58 -@@ -374,8 +374,9 @@ HEADERS += \
59 - src/zfo.h
60 -
61 - RESOURCES += \
62 -- res/qml.qrc \
63 -- res/translations.qrc
64 -+ res/qml.qrc
65 -+# res/qml.qrc \
66 -+# res/translations.qrc
67 -
68 - # Linux target.
69 - linux {
70 ---
71 -2.26.2
72 -
73
74 diff --git a/app-misc/mobile-datovka/mobile-datovka-1.9.1.ebuild b/app-misc/mobile-datovka/mobile-datovka-1.9.1.ebuild
75 index 085bad5..1f5e332 100644
76 --- a/app-misc/mobile-datovka/mobile-datovka-1.9.1.ebuild
77 +++ b/app-misc/mobile-datovka/mobile-datovka-1.9.1.ebuild
78 @@ -27,6 +27,7 @@ RDEPEND="
79 >=dev-qt/qtwidgets-${QT_PV}
80 >=dev-qt/qtquickcontrols-${QT_PV}
81 >=dev-qt/qtquickcontrols2-${QT_PV}
82 + >=dev-qt/qttranslations-${QT_PV}
83 "
84 DEPEND="
85 ${RDEPEND}
86 @@ -37,10 +38,8 @@ DEPEND="
87 S="${WORKDIR}/${PN}-v${PV}"
88
89 PATCHES=(
90 - "${FILESDIR}/${PN}-1.9.1-quickdirtyfix.patch"
91 "${FILESDIR}/${P}-0001-add-metainfo-for-distributions.patch"
92 "${FILESDIR}/${P}-0002-Support-Linux-phones-and-desktop.patch"
93 -
94 )
95
96 src_configure() {