diff options
| author |   Andreas Sturmlechner <andreas.sturmlechner@gmail.com> | 2016-10-27 01:11:03 +0200 |
|---|---|---|
| committer |   David Seifert <soap@gentoo.org> | 2016-11-06 19:11:30 +0100 |
| commit | b1a32afbbc081e9a09f6929a7f44f5e8220dc14d (patch) | |
| tree | 33d433f1a7208913d4951d301ab32d24ef8069fd /net-misc/x2goclient/files | |
| parent | sci-visualization/labplot: Drop old (diff) | |
| download | gentoo-b1a32afbbc081e9a09f6929a7f44f5e8220dc14d.tar.gz gentoo-b1a32afbbc081e9a09f6929a7f44f5e8220dc14d.tar.bz2 gentoo-b1a32afbbc081e9a09f6929a7f44f5e8220dc14d.zip | |
net-misc/x2goclient: Eliminate qt4 vs. qt5 REQUIRED_USE conflict
Instead, nsplugin does not work with USE=qt5
Gentoo-bug: 597420
Fix translations along the way.
Package-Manager: portage-2.3.0
Closes: https://github.com/gentoo/gentoo/pull/2672
Signed-off-by: David Seifert <soap@gentoo.org>
Diffstat (limited to 'net-misc/x2goclient/files')
| -rw-r--r-- | net-misc/x2goclient/files/x2goclient-4.0.5.2-r1-rcc_to_qrc.patch | 23 |
1 files changed, 23 insertions, 0 deletions
diff --git a/net-misc/x2goclient/files/x2goclient-4.0.5.2-r1-rcc_to_qrc.patch b/net-misc/x2goclient/files/x2goclient-4.0.5.2-r1-rcc_to_qrc.patch new file mode 100644 index 000000000000..724c176eebbd --- /dev/null +++ b/net-misc/x2goclient/files/x2goclient-4.0.5.2-r1-rcc_to_qrc.patch @@ -0,0 +1,23 @@ +diff -Naur x2goclient-4.0.5.2.orig/x2goclient.pro x2goclient-4.0.5.2/x2goclient.pro +--- x2goclient-4.0.5.2.orig/x2goclient.pro 2016-09-19 06:17:44.000000000 +0200 ++++ x2goclient-4.0.5.2/x2goclient.pro 2016-09-28 22:03:41.830790244 +0200 +@@ -167,16 +167,16 @@ + TEMPLATE = app + DEPENDPATH += . + INCLUDEPATH += src +-RESOURCES += res/resources.rcc ++RESOURCES += res/resources.qrc + + exists(res/txt/git-info) { + message("Configuring with --git-info") +- RESOURCES += res/git.rcc ++ RESOURCES += res/git.qrc + } + + exists(res/txt/changelog) { + message("Configuring with --changelog") +- RESOURCES += res/changelog.rcc ++ RESOURCES += res/changelog.qrc + } + + linux-g++ { |