public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
From: "David Seifert" <soap@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: app-crypt/nitrokey-app/
Date: Sat, 26 May 2018 09:45:55 +0000 (UTC)	[thread overview]
Message-ID: <1527327938.3f35ce0a62d2bc3686a061c912b275fcddffc48b.soap@gentoo> (raw)

commit:     3f35ce0a62d2bc3686a061c912b275fcddffc48b
Author:     Luigi 'Comio' Mantellini <luigi.mantellini <AT> gmail <DOT> com>
AuthorDate: Mon Apr 16 08:22:33 2018 +0000
Commit:     David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Sat May 26 09:45:38 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3f35ce0a

app-crypt/nitrokey-app: Fix resources build.

We need to remove qt5_add_resources() call from CMakeLists.txt becuase AUTORCC mode is enabled.
Keeping both flags doesn't permit (in some setup) to include the resources into the final executable producing the following log messages:

qt.svg: Cannot open file ':/images/new/icon_NK.svg', because: No such file or directory
qt.svg: Cannot open file ':/images/new/icon_NK.svg', because: No such file or directory
qt.svg: Cannot open file ':/images/new/icon_NK.svg', because: No such file or directory
qt.svg: Cannot open file ':/images/new/icon_NK.svg', because: No such file or directory
...

Also translations will not work because the translation files are included by means resources.

See also https://github.com/Nitrokey/nitrokey-app/pull/346

Closes: https://bugs.gentoo.org/653158
Closes: https://github.com/gentoo/gentoo/pull/8024

 app-crypt/nitrokey-app/nitrokey-app-1.3.ebuild  | 9 +++++++--
 app-crypt/nitrokey-app/nitrokey-app-9999.ebuild | 4 ++--
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/app-crypt/nitrokey-app/nitrokey-app-1.3.ebuild b/app-crypt/nitrokey-app/nitrokey-app-1.3.ebuild
index 045fd86b4d0..1bd4aaad069 100644
--- a/app-crypt/nitrokey-app/nitrokey-app-1.3.ebuild
+++ b/app-crypt/nitrokey-app/nitrokey-app-1.3.ebuild
@@ -36,10 +36,15 @@ DEPEND="
 	dev-qt/linguist-tools:5
 	virtual/pkgconfig"
 
-pkg_postinst(){
+src_prepare() {
+	cmake-utils_src_prepare
+	sed -i '/^qt5_add_resources/d' CMakeLists.txt || die
+}
+
+pkg_postinst() {
 	gnome2_icon_cache_update
 }
 
-pkg_postrm(){
+pkg_postrm() {
 	gnome2_icon_cache_update
 }

diff --git a/app-crypt/nitrokey-app/nitrokey-app-9999.ebuild b/app-crypt/nitrokey-app/nitrokey-app-9999.ebuild
index 045fd86b4d0..f1ed0d3dfac 100644
--- a/app-crypt/nitrokey-app/nitrokey-app-9999.ebuild
+++ b/app-crypt/nitrokey-app/nitrokey-app-9999.ebuild
@@ -36,10 +36,10 @@ DEPEND="
 	dev-qt/linguist-tools:5
 	virtual/pkgconfig"
 
-pkg_postinst(){
+pkg_postinst() {
 	gnome2_icon_cache_update
 }
 
-pkg_postrm(){
+pkg_postrm() {
 	gnome2_icon_cache_update
 }


             reply	other threads:[~2018-05-26  9:45 UTC|newest]

Thread overview: 22+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2018-05-26  9:45 David Seifert [this message]
  -- strict thread matches above, loose matches on Subject: below --
2021-01-31 18:48 [gentoo-commits] repo/gentoo:master commit in: app-crypt/nitrokey-app/ Sam James
2021-01-25  0:42 Sam James
2020-08-20 14:02 David Seifert
2020-08-20 14:02 David Seifert
2020-08-17  8:49 David Seifert
2020-01-09  6:38 Georgy Yakovlev
2020-01-09  6:38 Georgy Yakovlev
2019-08-12  8:02 Agostino Sarubbo
2019-07-18 14:36 Thomas Deutschmann
2019-07-08  7:51 David Seifert
2019-06-30 20:57 David Seifert
2019-06-30 20:57 David Seifert
2018-07-15  2:54 David Seifert
2018-06-01 10:05 David Seifert
2018-04-15 13:06 David Seifert
2018-04-15 10:25 David Seifert
2018-04-11 20:37 David Seifert
2018-04-11  9:36 David Seifert
2018-04-11  9:36 David Seifert
2018-03-11 10:41 David Seifert
2017-02-01 22:16 David Seifert

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1527327938.3f35ce0a62d2bc3686a061c912b275fcddffc48b.soap@gentoo \
    --to=soap@gentoo.org \
    --cc=gentoo-commits@lists.gentoo.org \
    --cc=gentoo-dev@lists.gentoo.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox