* [gentoo-commits] repo/gentoo:master commit in: net-misc/x2goclient/, net-misc/x2goclient/files/
@ 2016-09-28 20:53 Bernard Cafarelli
0 siblings, 0 replies; 5+ messages in thread
From: Bernard Cafarelli @ 2016-09-28 20:53 UTC (permalink / raw
To: gentoo-commits
commit: ac4564c55f3ab355e1820711748b0719c6e615c3
Author: Bernard Cafarelli <voyageur <AT> gentoo <DOT> org>
AuthorDate: Wed Sep 28 20:46:11 2016 +0000
Commit: Bernard Cafarelli <voyageur <AT> gentoo <DOT> org>
CommitDate: Wed Sep 28 20:48:00 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ac4564c5
net-misc/x2goclient: version bump to 0.4.5.2, add qt5 support
Thanks kensington for tracking down a resources bundling problem
in the qt5 build:
rcc is the compiled version of qrc, so it looks like for some reason
qmake5 assumes the rcc files are already compiled, and bundles them
as-is instead of processing them
Package-Manager: portage-2.3.1
net-misc/x2goclient/Manifest | 1 +
.../files/x2goclient-4.0.5.2-rcc_to_qrc.patch | 293 +++++++++++++++++++++
net-misc/x2goclient/x2goclient-4.0.5.2.ebuild | 100 +++++++
3 files changed, 394 insertions(+)
diff --git a/net-misc/x2goclient/Manifest b/net-misc/x2goclient/Manifest
index fede39f..8924331 100644
--- a/net-misc/x2goclient/Manifest
+++ b/net-misc/x2goclient/Manifest
@@ -2,3 +2,4 @@ DIST x2goclient-4.0.3.2.tar.gz 1560536 SHA256 f65a70463eae3d6d9fe6e4379f4ffacda5
DIST x2goclient-4.0.4.0.tar.gz 1571218 SHA256 86d05ce10039fe0a965cdc55086e00f4f3abc573a96f128b92f87081b7251657 SHA512 53c12e31e9cddc732f1d85f963103c99d3e051946f56b6eef861cb450a5ac69b7d09aceb2a1cb4ff8af949d56abe0c00dff649a1980e21ffbc6980a1a1f87e14 WHIRLPOOL 69bc539e2dd8b4953d3e15417f583d47a4aa6419e207fc6fda666de6b8cf695b85871c3e9995bcfd8cc930bc4b2334d08b1a905a77d5cc97377abde01cbed8bb
DIST x2goclient-4.0.5.0.tar.gz 1577271 SHA256 242e91720c1e5830f64a632c111ac3c4b6f6690d5005454c8e025b00bfbe42a1 SHA512 4fd3ca6061a4a86d04a699e41b17a546b0ed31e784ff357749d56a8015b60e86d1205580e6e57347a64c6ce47eaa47f054a783c6c90fd6716912333c7858309a WHIRLPOOL 72125958ade3baebdc272621834980ca07290adb16ab3a2129325d7d7ad7692061d5a24c1d48bbcda1c6b925a84bcf97dc30386910d533c0c4ac2db11d0f239f
DIST x2goclient-4.0.5.1.tar.gz 1657361 SHA256 844e983fbbddfe8a626506e4140b1ad65591e14f794c735412402bee3163ed11 SHA512 29bfd3a1c678b4b36536bfe90ee66007d38fb69d9ef2e4421bc72dd697832e879af5765297a56e18ed05c6fcc1b960115865adb51d838c4e5b083cd9355563b8 WHIRLPOOL f1b1e5e560a7b5684f373180d243e1cc54ca94ce927b987fb5653049fb610e34d4285efeafa57186decc8216058213eff3110ba1e9de96e42d36bb0764ae4e61
+DIST x2goclient-4.0.5.2.tar.gz 1666082 SHA256 0d0adfd5c03cef42367a5894948ee804ae13ffb7ed30a608e7c54351addd1530 SHA512 d1d9eecc17bfeb5067bca32f3fbbe14bcfde8d10f44a3d91cd32edc797371547b9b22adfbcff1f5b33c4869b6d1427424c052cb18e4c91e7905ba22ed2c69c29 WHIRLPOOL d56c9ad8a4e0375f76f4c20f90803c6369f18ada3003fe9d9acde95d7076274fc0e092f88de03a9af95a72039f4951d5f2d36e04b679f432e16bf48f83225319
diff --git a/net-misc/x2goclient/files/x2goclient-4.0.5.2-rcc_to_qrc.patch b/net-misc/x2goclient/files/x2goclient-4.0.5.2-rcc_to_qrc.patch
new file mode 100644
index 00000000..f055942
--- /dev/null
+++ b/net-misc/x2goclient/files/x2goclient-4.0.5.2-rcc_to_qrc.patch
@@ -0,0 +1,293 @@
+diff -Naur x2goclient-4.0.5.2.orig/res/changelog.qrc x2goclient-4.0.5.2/res/changelog.qrc
+--- x2goclient-4.0.5.2.orig/res/changelog.qrc 1970-01-01 01:00:00.000000000 +0100
++++ x2goclient-4.0.5.2/res/changelog.qrc 2016-09-19 06:17:43.000000000 +0200
+@@ -0,0 +1,5 @@
++<RCC>
++ <qresource>
++ <file>txt/changelog</file>
++ </qresource>
++</RCC>
+diff -Naur x2goclient-4.0.5.2.orig/res/changelog.rcc x2goclient-4.0.5.2/res/changelog.rcc
+--- x2goclient-4.0.5.2.orig/res/changelog.rcc 2016-09-19 06:17:43.000000000 +0200
++++ x2goclient-4.0.5.2/res/changelog.rcc 1970-01-01 01:00:00.000000000 +0100
+@@ -1,5 +0,0 @@
+-<RCC>
+- <qresource>
+- <file>txt/changelog</file>
+- </qresource>
+-</RCC>
+diff -Naur x2goclient-4.0.5.2.orig/res/git.qrc x2goclient-4.0.5.2/res/git.qrc
+--- x2goclient-4.0.5.2.orig/res/git.qrc 1970-01-01 01:00:00.000000000 +0100
++++ x2goclient-4.0.5.2/res/git.qrc 2016-09-19 06:17:43.000000000 +0200
+@@ -0,0 +1,5 @@
++<RCC>
++ <qresource>
++ <file>txt/git-info</file>
++ </qresource>
++</RCC>
+diff -Naur x2goclient-4.0.5.2.orig/res/git.rcc x2goclient-4.0.5.2/res/git.rcc
+--- x2goclient-4.0.5.2.orig/res/git.rcc 2016-09-19 06:17:43.000000000 +0200
++++ x2goclient-4.0.5.2/res/git.rcc 1970-01-01 01:00:00.000000000 +0100
+@@ -1,5 +0,0 @@
+-<RCC>
+- <qresource>
+- <file>txt/git-info</file>
+- </qresource>
+-</RCC>
+diff -Naur x2goclient-4.0.5.2.orig/res/resources.qrc x2goclient-4.0.5.2/res/resources.qrc
+--- x2goclient-4.0.5.2.orig/res/resources.qrc 1970-01-01 01:00:00.000000000 +0100
++++ x2goclient-4.0.5.2/res/resources.qrc 2016-09-19 06:17:44.000000000 +0200
+@@ -0,0 +1,113 @@
++<RCC>
++ <qresource>
++ <file>img/svg/bg.svg</file>
++ <file>img/svg/bg_hildon.svg</file>
++ <file>img/svg/line.svg</file>
++ <file>img/svg/onlogo.svg</file>
++ <file>img/svg/x2gologo.svg</file>
++ <file>img/svg/passform.svg</file>
++ <file>img/svg/sessionbut.svg</file>
++ <file>img/svg/folder.svg</file>
++ <file>img/svg/folder_grey.svg</file>
++ <file>img/svg/sessionbut_grey.svg</file>
++ <file>img/png/ico.png</file>
++ <file>img/png/ico_mini.png</file>
++ <file>img/png/sess_ico.png</file>
++ <file>img/png/ico_440x180.png</file>
++ <file>img/png/power-button.png</file>
++ <file>img/icons/128x128/x2go.png</file>
++ <file>img/icons/128x128/folder.png</file>
++ <file>img/icons/128x128/x2gosession.png</file>
++ <file>img/icons/128x128/create_file.png</file>
++ <file>img/icons/128x128/lxde.png</file>
++ <file>img/icons/128x128/preferences.png</file>
++ <file>img/icons/128x128/rdp.png</file>
++ <file>img/icons/64x64/audio.png</file>
++ <file>img/icons/64x64/personal.png</file>
++ <file>img/icons/64x64/create_file.png</file>
++ <file>img/icons/64x64/lxde.png</file>
++ <file>img/icons/64x64/preferences.png</file>
++ <file>img/icons/64x64/rdp.png</file>
++ <file>img/icons/32x32/edit.png</file>
++ <file>img/icons/32x32/edit_settings.png</file>
++ <file>img/icons/32x32/exit.png</file>
++ <file>img/icons/32x32/file-open.png</file>
++ <file>img/icons/32x32/new_file.png</file>
++ <file>img/icons/32x32/create_file.png</file>
++ <file>img/icons/32x32/lxde.png</file>
++ <file>img/icons/32x32/preferences.png</file>
++ <file>img/icons/32x32/rdp.png</file>
++ <file>img/icons/32x32/reconnect.png</file>
++ <file>img/icons/32x32/tbhide.png</file>
++ <file>img/icons/32x32/tbshow.png</file>
++ <file>img/icons/32x32/attach.png</file>
++ <file>img/icons/32x32/detach.png</file>
++ <file>img/icons/32x32/suspend.png</file>
++ <file>img/icons/32x32/stop.png</file>
++ <file>img/icons/32x32/auth.png</file>
++ <file>img/icons/32x32/x2goclient.png</file>
++ <file>img/icons/32x32/resolution.png</file>
++ <file>img/icons/32x32/contest.png</file>
++ <file>img/icons/32x32/apps.png</file>
++ <file>img/icons/32x32/open_dir.png</file>
++ <file>img/icons/32x32/suspend_session.png</file>
++ <file>img/icons/32x32/stop_session.png</file>
++ <file>img/icons/16x16/audio.png</file>
++ <file>img/icons/16x16/file-open.png</file>
++ <file>img/icons/16x16/delete.png</file>
++ <file>img/icons/16x16/edit.png</file>
++ <file>img/icons/16x16/gnome.png</file>
++ <file>img/icons/16x16/unity.png</file>
++ <file>img/icons/16x16/xfce.png</file>
++ <file>img/icons/16x16/mate.png</file>
++ <file>img/icons/16x16/kde.png</file>
++ <file>img/icons/16x16/cinnamon.png</file>
++ <file>img/icons/16x16/trinity.png</file>
++ <file>img/icons/16x16/openbox.png</file>
++ <file>img/icons/16x16/icewm.png</file>
++ <file>img/icons/16x16/new_file.png</file>
++ <file>img/icons/16x16/resolution.png</file>
++ <file>img/icons/16x16/session.png</file>
++ <file>img/icons/16x16/x2go.png</file>
++ <file>img/icons/16x16/tbshow.png</file>
++ <file>img/icons/16x16/X.png</file>
++ <file>img/icons/16x16/create_file.png</file>
++ <file>img/icons/16x16/lxde.png</file>
++ <file>img/icons/16x16/preferences.png</file>
++ <file>img/icons/16x16/rdp.png</file>
++ <file>img/icons/22x22/applications-development.png</file>
++ <file>img/icons/22x22/applications-education.png</file>
++ <file>img/icons/22x22/applications-games.png</file>
++ <file>img/icons/22x22/applications-graphics.png</file>
++ <file>img/icons/22x22/applications-internet.png</file>
++ <file>img/icons/22x22/applications-multimedia.png</file>
++ <file>img/icons/22x22/applications-office.png</file>
++ <file>img/icons/22x22/applications-other.png</file>
++ <file>img/icons/22x22/applications-system.png</file>
++ <file>img/icons/22x22/applications-utilities.png</file>
++ <file>img/icons/22x22/preferences-system.png</file>
++ <file>txt/packs</file>
++ <file>txt/encodings</file>
++ <file>i18n/x2goclient_da.qm</file>
++ <file>i18n/x2goclient_de.qm</file>
++ <file>i18n/x2goclient_es.qm</file>
++ <file>i18n/x2goclient_et.qm</file>
++ <file>i18n/x2goclient_fi.qm</file>
++ <file>i18n/x2goclient_fr.qm</file>
++ <file>i18n/x2goclient_nb_no.qm</file>
++ <file>i18n/x2goclient_nl.qm</file>
++ <file>i18n/x2goclient_pt.qm</file>
++ <file>i18n/x2goclient_ru.qm</file>
++ <file>i18n/x2goclient_sv.qm</file>
++ <file>i18n/x2goclient_tr.qm</file>
++ <file>i18n/x2goclient_zh_tw.qm</file>
++ <file>i18n/qt_da.qm</file>
++ <file>i18n/qt_de.qm</file>
++ <file>i18n/qt_es.qm</file>
++ <file>i18n/qt_fr.qm</file>
++ <file>i18n/qt_pt.qm</file>
++ <file>i18n/qt_ru.qm</file>
++ <file>i18n/qt_sv.qm</file>
++ <file>i18n/qt_zh_tw.qm</file>
++ </qresource>
++</RCC>
+diff -Naur x2goclient-4.0.5.2.orig/res/resources.rcc x2goclient-4.0.5.2/res/resources.rcc
+--- x2goclient-4.0.5.2.orig/res/resources.rcc 2016-09-19 06:17:44.000000000 +0200
++++ x2goclient-4.0.5.2/res/resources.rcc 1970-01-01 01:00:00.000000000 +0100
+@@ -1,113 +0,0 @@
+-<RCC>
+- <qresource>
+- <file>img/svg/bg.svg</file>
+- <file>img/svg/bg_hildon.svg</file>
+- <file>img/svg/line.svg</file>
+- <file>img/svg/onlogo.svg</file>
+- <file>img/svg/x2gologo.svg</file>
+- <file>img/svg/passform.svg</file>
+- <file>img/svg/sessionbut.svg</file>
+- <file>img/svg/folder.svg</file>
+- <file>img/svg/folder_grey.svg</file>
+- <file>img/svg/sessionbut_grey.svg</file>
+- <file>img/png/ico.png</file>
+- <file>img/png/ico_mini.png</file>
+- <file>img/png/sess_ico.png</file>
+- <file>img/png/ico_440x180.png</file>
+- <file>img/png/power-button.png</file>
+- <file>img/icons/128x128/x2go.png</file>
+- <file>img/icons/128x128/folder.png</file>
+- <file>img/icons/128x128/x2gosession.png</file>
+- <file>img/icons/128x128/create_file.png</file>
+- <file>img/icons/128x128/lxde.png</file>
+- <file>img/icons/128x128/preferences.png</file>
+- <file>img/icons/128x128/rdp.png</file>
+- <file>img/icons/64x64/audio.png</file>
+- <file>img/icons/64x64/personal.png</file>
+- <file>img/icons/64x64/create_file.png</file>
+- <file>img/icons/64x64/lxde.png</file>
+- <file>img/icons/64x64/preferences.png</file>
+- <file>img/icons/64x64/rdp.png</file>
+- <file>img/icons/32x32/edit.png</file>
+- <file>img/icons/32x32/edit_settings.png</file>
+- <file>img/icons/32x32/exit.png</file>
+- <file>img/icons/32x32/file-open.png</file>
+- <file>img/icons/32x32/new_file.png</file>
+- <file>img/icons/32x32/create_file.png</file>
+- <file>img/icons/32x32/lxde.png</file>
+- <file>img/icons/32x32/preferences.png</file>
+- <file>img/icons/32x32/rdp.png</file>
+- <file>img/icons/32x32/reconnect.png</file>
+- <file>img/icons/32x32/tbhide.png</file>
+- <file>img/icons/32x32/tbshow.png</file>
+- <file>img/icons/32x32/attach.png</file>
+- <file>img/icons/32x32/detach.png</file>
+- <file>img/icons/32x32/suspend.png</file>
+- <file>img/icons/32x32/stop.png</file>
+- <file>img/icons/32x32/auth.png</file>
+- <file>img/icons/32x32/x2goclient.png</file>
+- <file>img/icons/32x32/resolution.png</file>
+- <file>img/icons/32x32/contest.png</file>
+- <file>img/icons/32x32/apps.png</file>
+- <file>img/icons/32x32/open_dir.png</file>
+- <file>img/icons/32x32/suspend_session.png</file>
+- <file>img/icons/32x32/stop_session.png</file>
+- <file>img/icons/16x16/audio.png</file>
+- <file>img/icons/16x16/file-open.png</file>
+- <file>img/icons/16x16/delete.png</file>
+- <file>img/icons/16x16/edit.png</file>
+- <file>img/icons/16x16/gnome.png</file>
+- <file>img/icons/16x16/unity.png</file>
+- <file>img/icons/16x16/xfce.png</file>
+- <file>img/icons/16x16/mate.png</file>
+- <file>img/icons/16x16/kde.png</file>
+- <file>img/icons/16x16/cinnamon.png</file>
+- <file>img/icons/16x16/trinity.png</file>
+- <file>img/icons/16x16/openbox.png</file>
+- <file>img/icons/16x16/icewm.png</file>
+- <file>img/icons/16x16/new_file.png</file>
+- <file>img/icons/16x16/resolution.png</file>
+- <file>img/icons/16x16/session.png</file>
+- <file>img/icons/16x16/x2go.png</file>
+- <file>img/icons/16x16/tbshow.png</file>
+- <file>img/icons/16x16/X.png</file>
+- <file>img/icons/16x16/create_file.png</file>
+- <file>img/icons/16x16/lxde.png</file>
+- <file>img/icons/16x16/preferences.png</file>
+- <file>img/icons/16x16/rdp.png</file>
+- <file>img/icons/22x22/applications-development.png</file>
+- <file>img/icons/22x22/applications-education.png</file>
+- <file>img/icons/22x22/applications-games.png</file>
+- <file>img/icons/22x22/applications-graphics.png</file>
+- <file>img/icons/22x22/applications-internet.png</file>
+- <file>img/icons/22x22/applications-multimedia.png</file>
+- <file>img/icons/22x22/applications-office.png</file>
+- <file>img/icons/22x22/applications-other.png</file>
+- <file>img/icons/22x22/applications-system.png</file>
+- <file>img/icons/22x22/applications-utilities.png</file>
+- <file>img/icons/22x22/preferences-system.png</file>
+- <file>txt/packs</file>
+- <file>txt/encodings</file>
+- <file>i18n/x2goclient_da.qm</file>
+- <file>i18n/x2goclient_de.qm</file>
+- <file>i18n/x2goclient_es.qm</file>
+- <file>i18n/x2goclient_et.qm</file>
+- <file>i18n/x2goclient_fi.qm</file>
+- <file>i18n/x2goclient_fr.qm</file>
+- <file>i18n/x2goclient_nb_no.qm</file>
+- <file>i18n/x2goclient_nl.qm</file>
+- <file>i18n/x2goclient_pt.qm</file>
+- <file>i18n/x2goclient_ru.qm</file>
+- <file>i18n/x2goclient_sv.qm</file>
+- <file>i18n/x2goclient_tr.qm</file>
+- <file>i18n/x2goclient_zh_tw.qm</file>
+- <file>i18n/qt_da.qm</file>
+- <file>i18n/qt_de.qm</file>
+- <file>i18n/qt_es.qm</file>
+- <file>i18n/qt_fr.qm</file>
+- <file>i18n/qt_pt.qm</file>
+- <file>i18n/qt_ru.qm</file>
+- <file>i18n/qt_sv.qm</file>
+- <file>i18n/qt_zh_tw.qm</file>
+- </qresource>
+-</RCC>
+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++ {
diff --git a/net-misc/x2goclient/x2goclient-4.0.5.2.ebuild b/net-misc/x2goclient/x2goclient-4.0.5.2.ebuild
new file mode 100644
index 00000000..52527c8
--- /dev/null
+++ b/net-misc/x2goclient/x2goclient-4.0.5.2.ebuild
@@ -0,0 +1,100 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+inherit nsplugins qmake-utils
+
+DESCRIPTION="The X2Go Qt client"
+HOMEPAGE="http://www.x2go.org"
+SRC_URI="http://code.x2go.org/releases/source/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="ldap nsplugin +qt4 qt5"
+
+REQUIRED_USE="^^ ( qt4 qt5 )"
+
+DEPEND=">=net-libs/libssh-0.6.0_rc1
+ net-print/cups
+ x11-libs/libXpm
+ ldap? ( net-nds/openldap )
+ qt4? (
+ dev-qt/qtcore:4[ssl]
+ dev-qt/qtgui:4
+ dev-qt/qtsvg:4
+ )
+ qt5? (
+ dev-qt/qtcore:5
+ dev-qt/qtgui:5
+ dev-qt/qtnetwork:5[ssl]
+ dev-qt/qtsvg:5
+ dev-qt/qtwidgets:5
+ dev-qt/qtx11extras:5
+ )"
+
+RDEPEND="${DEPEND}
+ net-misc/nx"
+
+CLIENT_BUILD=${WORKDIR}/${P}.client_build
+PLUGIN_BUILD=${WORKDIR}/${P}.plugin_build
+
+PATCHES=( "${FILESDIR}"/${P}-rcc_to_qrc.patch )
+
+src_prepare() {
+ if ! use ldap; then
+ sed -e "s/-lldap//" -i x2goclient.pro || die
+ sed -e "s/#define USELDAP//" -i src/x2goclientconfig.h || die
+ fi
+
+ mkdir -p "${CLIENT_BUILD}"
+ use nsplugin && mkdir -p "${PLUGIN_BUILD}"
+
+ default
+}
+
+src_configure() {
+ local EQMAKE
+ use qt4 && EQMAKE=eqmake4
+ use qt5 && EQMAKE=eqmake5
+
+ cd "${CLIENT_BUILD}"
+ ${EQMAKE} "${S}"/x2goclient.pro
+
+ if use nsplugin;
+ then
+ cd "${PLUGIN_BUILD}"
+ X2GO_CLIENT_TARGET=plugin ${EQMAKE} "${S}"/x2goclient.pro
+ fi
+}
+
+src_compile() {
+ cd "${CLIENT_BUILD}"
+ emake
+
+ if use nsplugin;
+ then
+ cd "${PLUGIN_BUILD}"
+ emake
+ fi
+}
+
+src_install() {
+ dobin "${CLIENT_BUILD}"/${PN}
+
+ insinto /usr/share/pixmaps/x2goclient
+ doins res/img/icons/${PN}.xpm
+
+ domenu desktop/${PN}.desktop
+ doman man/man?/*
+
+ if use nsplugin;
+ then
+ # PLUGINS_DIR comes from nsplugins.eclass
+ exeinto /usr/$(get_libdir)/${PLUGINS_DIR}
+ doexe "${PLUGIN_BUILD}"/libx2goplugin.so
+ fi
+
+ emake DESTDIR="${D}" PREFIX=/usr install_pluginprovider
+}
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-misc/x2goclient/, net-misc/x2goclient/files/
@ 2016-11-06 18:11 David Seifert
0 siblings, 0 replies; 5+ messages in thread
From: David Seifert @ 2016-11-06 18:11 UTC (permalink / raw
To: gentoo-commits
commit: b1a32afbbc081e9a09f6929a7f44f5e8220dc14d
Author: Andreas Sturmlechner <andreas.sturmlechner <AT> gmail <DOT> com>
AuthorDate: Wed Oct 26 23:11:03 2016 +0000
Commit: David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Sun Nov 6 18:11:30 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b1a32afb
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 <AT> gentoo.org>
.../files/x2goclient-4.0.5.2-r1-rcc_to_qrc.patch | 23 +++++
net-misc/x2goclient/x2goclient-4.0.5.2-r1.ebuild | 106 +++++++++++++++++++++
2 files changed, 129 insertions(+)
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 00000000..724c176
--- /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++ {
diff --git a/net-misc/x2goclient/x2goclient-4.0.5.2-r1.ebuild b/net-misc/x2goclient/x2goclient-4.0.5.2-r1.ebuild
new file mode 100644
index 00000000..e948f9b
--- /dev/null
+++ b/net-misc/x2goclient/x2goclient-4.0.5.2-r1.ebuild
@@ -0,0 +1,106 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+inherit nsplugins qmake-utils
+
+DESCRIPTION="The X2Go Qt client"
+HOMEPAGE="http://www.x2go.org"
+SRC_URI="http://code.x2go.org/releases/source/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="ldap nsplugin qt5"
+
+REQUIRED_USE="nsplugin? ( !qt5 )"
+
+DEPEND=">=net-libs/libssh-0.6.0_rc1
+ net-print/cups
+ x11-libs/libXpm
+ ldap? ( net-nds/openldap )
+ !qt5? (
+ dev-qt/qtcore:4[ssl]
+ dev-qt/qtgui:4
+ dev-qt/qtsvg:4
+ )
+ qt5? (
+ dev-qt/qtcore:5
+ dev-qt/qtgui:5
+ dev-qt/qtnetwork:5[ssl]
+ dev-qt/qtsvg:5
+ dev-qt/qtwidgets:5
+ dev-qt/qtx11extras:5
+ )
+"
+RDEPEND="${DEPEND}
+ net-misc/nx"
+
+CLIENT_BUILD="${WORKDIR}"/${P}.client_build
+PLUGIN_BUILD="${WORKDIR}"/${P}.plugin_build
+
+PATCHES=( "${FILESDIR}"/${P}-r1-rcc_to_qrc.patch )
+
+src_prepare() {
+ default
+
+ local f
+ for f in res/*rcc; do
+ mv ${f} ${f/rcc/qrc} || die
+ done
+
+ if ! use ldap; then
+ sed -e "s/-lldap//" -i x2goclient.pro || die
+ sed -e "s/#define USELDAP//" -i src/x2goclientconfig.h || die
+ fi
+
+ mkdir -p "${CLIENT_BUILD}" || die
+ if use nsplugin; then
+ mkdir -p "${PLUGIN_BUILD}" || die
+ fi
+}
+
+src_configure() {
+ cd "${CLIENT_BUILD}" || die
+
+ if use qt5; then
+ eqmake5 "${S}"/x2goclient.pro
+ else
+ eqmake4 "${S}"/x2goclient.pro
+ fi
+
+ if use nsplugin; then
+ cd "${PLUGIN_BUILD}" || die
+ X2GO_CLIENT_TARGET=plugin eqmake4 "${S}"/x2goclient.pro
+ fi
+}
+
+src_compile() {
+ cd "${CLIENT_BUILD}" || die
+ emake
+
+ if use nsplugin; then
+ cd "${PLUGIN_BUILD}" || die
+ emake
+ fi
+}
+
+src_install() {
+ dobin "${CLIENT_BUILD}"/${PN}
+
+ insinto /usr/share/pixmaps/x2goclient
+ doins res/img/icons/${PN}.xpm
+
+ domenu desktop/${PN}.desktop
+ doman man/man?/*
+
+ if use nsplugin; then
+ # PLUGINS_DIR comes from nsplugins.eclass
+ exeinto /usr/$(get_libdir)/${PLUGINS_DIR}
+ doexe "${PLUGIN_BUILD}"/libx2goplugin.so
+ fi
+
+ emake DESTDIR="${D}" PREFIX=/usr install_pluginprovider
+}
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-misc/x2goclient/, net-misc/x2goclient/files/
@ 2018-07-05 8:05 Lars Wendler
0 siblings, 0 replies; 5+ messages in thread
From: Lars Wendler @ 2018-07-05 8:05 UTC (permalink / raw
To: gentoo-commits
commit: ad2967e3adec92ae3078a6073b2d1eb8ceda03e7
Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Thu Jul 5 08:04:53 2018 +0000
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Thu Jul 5 08:04:53 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ad2967e3
net-misc/x2goclient: Fixed compilation with qt-5.11
Package-Manager: Portage-2.3.41, Repoman-2.3.9
.../x2goclient/files/x2goclient-4.1.2.1-qt511.patch | 20 ++++++++++++++++++++
net-misc/x2goclient/x2goclient-4.1.2.1.ebuild | 6 +++++-
2 files changed, 25 insertions(+), 1 deletion(-)
diff --git a/net-misc/x2goclient/files/x2goclient-4.1.2.1-qt511.patch b/net-misc/x2goclient/files/x2goclient-4.1.2.1-qt511.patch
new file mode 100644
index 00000000000..2329813defd
--- /dev/null
+++ b/net-misc/x2goclient/files/x2goclient-4.1.2.1-qt511.patch
@@ -0,0 +1,20 @@
+From: Mihai Moldovan <ionic@ionic.de>
+Date: Thu, 5 Jul 2018 06:52:18 +0000 (+0200)
+Subject: src/printwidget.cpp: add QButtonGroup include, fixes compile errors with Qt 5.11+.
+X-Git-Url: https://code.x2go.org/gitweb?p=x2goclient.git;a=commitdiff_plain;h=ce14cfda34175b6456a8cc7d1e336dce2b0b0682
+
+src/printwidget.cpp: add QButtonGroup include, fixes compile errors with Qt 5.11+.
+---
+
+diff --git a/src/printwidget.cpp b/src/printwidget.cpp
+index 58a8af7..131d340 100644
+--- a/src/printwidget.cpp
++++ b/src/printwidget.cpp
+@@ -23,6 +23,7 @@
+ #include "x2gosettings.h"
+ #include "x2gologdebug.h"
+ #include <QDir>
++#include <QButtonGroup>
+ #ifdef Q_OS_WIN
+ #include "wapi.h"
+ #endif
diff --git a/net-misc/x2goclient/x2goclient-4.1.2.1.ebuild b/net-misc/x2goclient/x2goclient-4.1.2.1.ebuild
index ae8b67cda78..3b19d911564 100644
--- a/net-misc/x2goclient/x2goclient-4.1.2.1.ebuild
+++ b/net-misc/x2goclient/x2goclient-4.1.2.1.ebuild
@@ -3,7 +3,7 @@
EAPI=6
-inherit eutils gnome2-utils qmake-utils
+inherit desktop gnome2-utils qmake-utils
DESCRIPTION="The X2Go Qt client"
HOMEPAGE="http://www.x2go.org"
@@ -32,6 +32,10 @@ RDEPEND="${COMMON_DEPEND}
CLIENT_BUILD="${WORKDIR}"/${P}.client_build
PLUGIN_BUILD="${WORKDIR}"/${P}.plugin_build
+PATCHES=(
+ "${FILESDIR}/${P}-qt511.patch"
+)
+
src_prepare() {
default
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-misc/x2goclient/, net-misc/x2goclient/files/
@ 2019-07-30 20:48 Bernard Cafarelli
0 siblings, 0 replies; 5+ messages in thread
From: Bernard Cafarelli @ 2019-07-30 20:48 UTC (permalink / raw
To: gentoo-commits
commit: 13eb61d316b00795d68f15c975e3a9ed03d9d3be
Author: Bernard Cafarelli <voyageur <AT> gentoo <DOT> org>
AuthorDate: Tue Jul 30 20:31:58 2019 +0000
Commit: Bernard Cafarelli <voyageur <AT> gentoo <DOT> org>
CommitDate: Tue Jul 30 20:47:03 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=13eb61d3
net-misc/x2goclient: support 17.1 profiles
Closes: https://bugs.gentoo.org/689280
Package-Manager: Portage-2.3.69, Repoman-2.3.16
Signed-off-by: Bernard Cafarelli <voyageur <AT> gentoo.org>
.../files/x2goclient-4.1.2.1-gentoo-17.1.patch | 14 ++++
net-misc/x2goclient/x2goclient-4.1.2.1-r1.ebuild | 75 ++++++++++++++++++++++
2 files changed, 89 insertions(+)
diff --git a/net-misc/x2goclient/files/x2goclient-4.1.2.1-gentoo-17.1.patch b/net-misc/x2goclient/files/x2goclient-4.1.2.1-gentoo-17.1.patch
new file mode 100644
index 00000000000..b9a63264be9
--- /dev/null
+++ b/net-misc/x2goclient/files/x2goclient-4.1.2.1-gentoo-17.1.patch
@@ -0,0 +1,14 @@
+X-Git-Url: https://code.x2go.org/gitweb?p=x2goclient.git;a=blobdiff_plain;f=src%2Fonmainwindow.cpp;h=cd97e6c7f28a6ab4e9495f7a9ba4b447f2b47a2f;hp=cb6bb72918cdc1d54f57cbf0b426adb03a6f4dc8;hb=567223f;hpb=fc5c93518b9023e2499a945740cd6559233ed301
+
+diff --git a/src/onmainwindow.cpp b/src/onmainwindow.cpp
+index cb6bb72..cd97e6c 100644
+--- a/src/onmainwindow.cpp
++++ b/src/onmainwindow.cpp
+@@ -10754,6 +10754,7 @@ void ONMainWindow::generateEtcFiles()
+ << "/usr/libexec/openssh" /* Fedora, CentOS, hopefully also RHEL */
+ << "/usr/lib/ssh" /* Mageia, OpenSUSE, SLE{S,D} < 12 x86, SLE{S,D} 12, Arch */
+ << "/usr/lib64/ssh" /* SLE{S,D} < 12 x86_64 */
++ << "/usr/lib64/misc" /* Gentoo *64 with 17.1 profile - has no lib compat-symlink. */
+ << "/usr/lib/misc" /* Gentoo */
+ << "/run/current-system/sw/bin" /* NixOS */
+ << "/usr/libexec"; /* Slackware, OS X */
diff --git a/net-misc/x2goclient/x2goclient-4.1.2.1-r1.ebuild b/net-misc/x2goclient/x2goclient-4.1.2.1-r1.ebuild
new file mode 100644
index 00000000000..953c984a775
--- /dev/null
+++ b/net-misc/x2goclient/x2goclient-4.1.2.1-r1.ebuild
@@ -0,0 +1,75 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit desktop gnome2-utils qmake-utils
+
+DESCRIPTION="The X2Go Qt client"
+HOMEPAGE="http://www.x2go.org"
+SRC_URI="http://code.x2go.org/releases/source/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="ldap"
+
+COMMON_DEPEND="dev-qt/qtcore:5
+ dev-qt/qtgui:5
+ dev-qt/qtnetwork:5[ssl]
+ dev-qt/qtsvg:5
+ dev-qt/qtwidgets:5
+ dev-qt/qtx11extras:5
+ >=net-libs/libssh-0.7.5-r2
+ net-print/cups
+ x11-libs/libXpm
+ ldap? ( net-nds/openldap )"
+DEPEND="${COMMON_DEPEND}
+ dev-qt/linguist-tools:5"
+RDEPEND="${COMMON_DEPEND}
+ net-misc/nx"
+
+CLIENT_BUILD="${WORKDIR}"/${P}.client_build
+PLUGIN_BUILD="${WORKDIR}"/${P}.plugin_build
+
+PATCHES=(
+ "${FILESDIR}/${P}-qt511.patch"
+ "${FILESDIR}/${P}-gentoo-17.1.patch"
+)
+
+src_prepare() {
+ default
+
+ if ! use ldap; then
+ sed -e "s/-lldap//" -i x2goclient.pro || die
+ sed -e "s/#define USELDAP//" -i src/x2goclientconfig.h || die
+ fi
+}
+
+src_configure() {
+ eqmake5 "${S}"/x2goclient.pro
+}
+
+src_install() {
+ dobin ${PN}
+
+ local size
+ for size in 16 32 48 64 128 ; do
+ doicon -s ${size} res/img/icons/${size}x${size}/${PN}.png
+ done
+ newicon -s scalable res/img/icons/hildon/${PN}_hildon.svg ${PN}.svg
+
+ insinto /usr/share/pixmaps
+ doins res/img/icons/${PN}.xpm
+
+ domenu desktop/${PN}.desktop
+ doman man/man?/*
+}
+
+pkg_postinst() {
+ gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+ gnome2_icon_cache_update
+}
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-misc/x2goclient/, net-misc/x2goclient/files/
@ 2020-07-19 21:07 Bernard Cafarelli
0 siblings, 0 replies; 5+ messages in thread
From: Bernard Cafarelli @ 2020-07-19 21:07 UTC (permalink / raw
To: gentoo-commits
commit: 87d3875af1b1eba08ced8fad636fef420f23cae4
Author: Bernard Cafarelli <voyageur <AT> gentoo <DOT> org>
AuthorDate: Sun Jul 19 21:07:20 2020 +0000
Commit: Bernard Cafarelli <voyageur <AT> gentoo <DOT> org>
CommitDate: Sun Jul 19 21:07:34 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=87d3875a
net-misc/x2goclient: drop old stable
Package-Manager: Portage-3.0.0, Repoman-2.3.23
Signed-off-by: Bernard Cafarelli <voyageur <AT> gentoo.org>
net-misc/x2goclient/Manifest | 1 -
.../files/x2goclient-4.1.2.1-gentoo-17.1.patch | 14 ----
.../files/x2goclient-4.1.2.1-qt511.patch | 20 ------
net-misc/x2goclient/x2goclient-4.1.2.1-r1.ebuild | 75 ----------------------
net-misc/x2goclient/x2goclient-4.1.2.1.ebuild | 74 ---------------------
5 files changed, 184 deletions(-)
diff --git a/net-misc/x2goclient/Manifest b/net-misc/x2goclient/Manifest
index 367d0a90f6a..451425b8871 100644
--- a/net-misc/x2goclient/Manifest
+++ b/net-misc/x2goclient/Manifest
@@ -1,2 +1 @@
-DIST x2goclient-4.1.2.1.tar.gz 2735905 BLAKE2B 9ac70e350b0c586f76915edc187a2c6b179cb69bf28c082ef1d8122d4c32b79dd7bcb685e846a62481a4a3334eb902a3fe84aa8422099a5088559a3b548fbe20 SHA512 0dc4ef0b154c582e62d8e1c5fd0284510fd8c7ddac1d8f49638ca68244ac24f9220c9089e93a105cfa8978d1e2af9a4379deeb934d58741f51ee473ab041d369
DIST x2goclient-4.1.2.2.tar.gz 2576404 BLAKE2B 2a29f73516282af119cc4ea0a511c29156cdb71564adcdbf307f60298b87c2a7eee0ca121a3e165a63c110130c2704b49b90b3b9abc6a39b6105b1f22ac5afd0 SHA512 85e6db6a34629512be64376883c205d8bf0696c4697cf216970b57a91ffe68dcf7f38bfda0d396c104602f6991b596c5fb0934e75fa4a93f7d0e41c2b3f5ac4d
diff --git a/net-misc/x2goclient/files/x2goclient-4.1.2.1-gentoo-17.1.patch b/net-misc/x2goclient/files/x2goclient-4.1.2.1-gentoo-17.1.patch
deleted file mode 100644
index b9a63264be9..00000000000
--- a/net-misc/x2goclient/files/x2goclient-4.1.2.1-gentoo-17.1.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-X-Git-Url: https://code.x2go.org/gitweb?p=x2goclient.git;a=blobdiff_plain;f=src%2Fonmainwindow.cpp;h=cd97e6c7f28a6ab4e9495f7a9ba4b447f2b47a2f;hp=cb6bb72918cdc1d54f57cbf0b426adb03a6f4dc8;hb=567223f;hpb=fc5c93518b9023e2499a945740cd6559233ed301
-
-diff --git a/src/onmainwindow.cpp b/src/onmainwindow.cpp
-index cb6bb72..cd97e6c 100644
---- a/src/onmainwindow.cpp
-+++ b/src/onmainwindow.cpp
-@@ -10754,6 +10754,7 @@ void ONMainWindow::generateEtcFiles()
- << "/usr/libexec/openssh" /* Fedora, CentOS, hopefully also RHEL */
- << "/usr/lib/ssh" /* Mageia, OpenSUSE, SLE{S,D} < 12 x86, SLE{S,D} 12, Arch */
- << "/usr/lib64/ssh" /* SLE{S,D} < 12 x86_64 */
-+ << "/usr/lib64/misc" /* Gentoo *64 with 17.1 profile - has no lib compat-symlink. */
- << "/usr/lib/misc" /* Gentoo */
- << "/run/current-system/sw/bin" /* NixOS */
- << "/usr/libexec"; /* Slackware, OS X */
diff --git a/net-misc/x2goclient/files/x2goclient-4.1.2.1-qt511.patch b/net-misc/x2goclient/files/x2goclient-4.1.2.1-qt511.patch
deleted file mode 100644
index 2329813defd..00000000000
--- a/net-misc/x2goclient/files/x2goclient-4.1.2.1-qt511.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-From: Mihai Moldovan <ionic@ionic.de>
-Date: Thu, 5 Jul 2018 06:52:18 +0000 (+0200)
-Subject: src/printwidget.cpp: add QButtonGroup include, fixes compile errors with Qt 5.11+.
-X-Git-Url: https://code.x2go.org/gitweb?p=x2goclient.git;a=commitdiff_plain;h=ce14cfda34175b6456a8cc7d1e336dce2b0b0682
-
-src/printwidget.cpp: add QButtonGroup include, fixes compile errors with Qt 5.11+.
----
-
-diff --git a/src/printwidget.cpp b/src/printwidget.cpp
-index 58a8af7..131d340 100644
---- a/src/printwidget.cpp
-+++ b/src/printwidget.cpp
-@@ -23,6 +23,7 @@
- #include "x2gosettings.h"
- #include "x2gologdebug.h"
- #include <QDir>
-+#include <QButtonGroup>
- #ifdef Q_OS_WIN
- #include "wapi.h"
- #endif
diff --git a/net-misc/x2goclient/x2goclient-4.1.2.1-r1.ebuild b/net-misc/x2goclient/x2goclient-4.1.2.1-r1.ebuild
deleted file mode 100644
index 911efdf18ac..00000000000
--- a/net-misc/x2goclient/x2goclient-4.1.2.1-r1.ebuild
+++ /dev/null
@@ -1,75 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit desktop gnome2-utils qmake-utils
-
-DESCRIPTION="The X2Go Qt client"
-HOMEPAGE="http://www.x2go.org"
-SRC_URI="http://code.x2go.org/releases/source/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="ldap"
-
-COMMON_DEPEND="dev-qt/qtcore:5
- dev-qt/qtgui:5
- dev-qt/qtnetwork:5[ssl]
- dev-qt/qtsvg:5
- dev-qt/qtwidgets:5
- dev-qt/qtx11extras:5
- >=net-libs/libssh-0.7.5-r2
- net-print/cups
- x11-libs/libXpm
- ldap? ( net-nds/openldap )"
-DEPEND="${COMMON_DEPEND}
- dev-qt/linguist-tools:5"
-RDEPEND="${COMMON_DEPEND}
- net-misc/nx"
-
-CLIENT_BUILD="${WORKDIR}"/${P}.client_build
-PLUGIN_BUILD="${WORKDIR}"/${P}.plugin_build
-
-PATCHES=(
- "${FILESDIR}/${P}-qt511.patch"
- "${FILESDIR}/${P}-gentoo-17.1.patch"
-)
-
-src_prepare() {
- default
-
- if ! use ldap; then
- sed -e "s/-lldap//" -i x2goclient.pro || die
- sed -e "s/#define USELDAP//" -i src/x2goclientconfig.h || die
- fi
-}
-
-src_configure() {
- eqmake5 "${S}"/x2goclient.pro
-}
-
-src_install() {
- dobin ${PN}
-
- local size
- for size in 16 32 48 64 128 ; do
- doicon -s ${size} res/img/icons/${size}x${size}/${PN}.png
- done
- newicon -s scalable res/img/icons/hildon/${PN}_hildon.svg ${PN}.svg
-
- insinto /usr/share/pixmaps
- doins res/img/icons/${PN}.xpm
-
- domenu desktop/${PN}.desktop
- doman man/man?/*
-}
-
-pkg_postinst() {
- gnome2_icon_cache_update
-}
-
-pkg_postrm() {
- gnome2_icon_cache_update
-}
diff --git a/net-misc/x2goclient/x2goclient-4.1.2.1.ebuild b/net-misc/x2goclient/x2goclient-4.1.2.1.ebuild
deleted file mode 100644
index 9912ac58712..00000000000
--- a/net-misc/x2goclient/x2goclient-4.1.2.1.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit desktop gnome2-utils qmake-utils
-
-DESCRIPTION="The X2Go Qt client"
-HOMEPAGE="http://www.x2go.org"
-SRC_URI="http://code.x2go.org/releases/source/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="ldap"
-
-COMMON_DEPEND="dev-qt/qtcore:5
- dev-qt/qtgui:5
- dev-qt/qtnetwork:5[ssl]
- dev-qt/qtsvg:5
- dev-qt/qtwidgets:5
- dev-qt/qtx11extras:5
- >=net-libs/libssh-0.7.5-r2
- net-print/cups
- x11-libs/libXpm
- ldap? ( net-nds/openldap )"
-DEPEND="${COMMON_DEPEND}
- dev-qt/linguist-tools:5"
-RDEPEND="${COMMON_DEPEND}
- net-misc/nx"
-
-CLIENT_BUILD="${WORKDIR}"/${P}.client_build
-PLUGIN_BUILD="${WORKDIR}"/${P}.plugin_build
-
-PATCHES=(
- "${FILESDIR}/${P}-qt511.patch"
-)
-
-src_prepare() {
- default
-
- if ! use ldap; then
- sed -e "s/-lldap//" -i x2goclient.pro || die
- sed -e "s/#define USELDAP//" -i src/x2goclientconfig.h || die
- fi
-}
-
-src_configure() {
- eqmake5 "${S}"/x2goclient.pro
-}
-
-src_install() {
- dobin ${PN}
-
- local size
- for size in 16 32 48 64 128 ; do
- doicon -s ${size} res/img/icons/${size}x${size}/${PN}.png
- done
- newicon -s scalable res/img/icons/hildon/${PN}_hildon.svg ${PN}.svg
-
- insinto /usr/share/pixmaps
- doins res/img/icons/${PN}.xpm
-
- domenu desktop/${PN}.desktop
- doman man/man?/*
-}
-
-pkg_postinst() {
- gnome2_icon_cache_update
-}
-
-pkg_postrm() {
- gnome2_icon_cache_update
-}
^ permalink raw reply related [flat|nested] 5+ messages in thread
end of thread, other threads:[~2020-07-19 21:07 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-11-06 18:11 [gentoo-commits] repo/gentoo:master commit in: net-misc/x2goclient/, net-misc/x2goclient/files/ David Seifert
-- strict thread matches above, loose matches on Subject: below --
2020-07-19 21:07 Bernard Cafarelli
2019-07-30 20:48 Bernard Cafarelli
2018-07-05 8:05 Lars Wendler
2016-09-28 20:53 Bernard Cafarelli
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox