From: Klaus Ethgen <Klaus+gentoo@Ethgen.de>
To: gentoo-user@lists.gentoo.org
Subject: Re: [gentoo-user] PSI+ compile error
Date: Sun, 9 Sep 2018 17:30:30 +0100 [thread overview]
Message-ID: <20180909163029.GA23141@ikki.ethgen.ch> (raw)
In-Reply-To: <20180909093224.GA26670@ikki.ethgen.ch>
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA512
I created a ebuild patch that fixes the issue. Unfortunatelly I do not
know where to report that error in gentoo.
There is no reportbug binary and I do not know a mail address where to
post that to.
Does anybody have an idea?
For iterest, there ist the patch to the original ebuild file:
--- /usr/portage/net-im/psi/psi-9999.ebuild 2018-05-16 23:38:57.000000000 +0100
+++ psi-9999.ebuild 2018-09-09 17:16:06.628779038 +0100
@@ -20,13 +20,15 @@
LICENSE="GPL-2"
SLOT="0"
KEYWORDS=""
-IUSE="aspell crypt dbus debug doc enchant extras +hunspell iconsets sql ssl webengine webkit whiteboarding xscreensaver"
+IUSE="aspell crypt dbus debug doc enchant extras +hunspell iconsets otr plugins sql ssl webengine webkit whiteboarding xscreensaver"
REQUIRED_USE="
?? ( aspell enchant hunspell )
iconsets? ( extras )
sql? ( extras )
webengine? ( !webkit )
+ otr? ( plugins )
+ plugins? ( extras )
"
RDEPEND="
@@ -57,6 +59,10 @@
webkit? ( dev-qt/qtwebkit:5 )
whiteboarding? ( dev-qt/qtsvg:5 )
xscreensaver? ( x11-libs/libXScrnSaver )
+ otr? (
+ net-libs/libotr
+ app-text/tidy-html5
+ )
"
DEPEND="${RDEPEND}
dev-qt/linguist-tools:5
@@ -105,6 +111,19 @@
EGIT_REPO_URI="${PSI_PLUS_URI}/main.git" \
git-r3_src_unpack
+ if use plugins; then
+ unset EGIT_BRANCH EGIT_COMMIT
+ EGIT_CHECKOUT_DIR="${WORKDIR}/plugins" \
+ EGIT_REPO_URI="${PSI_URI}/plugins.git" \
+ git-r3_src_unpack
+ ln -s "${S}/src/plugins/include" "${WORKDIR}/plugins/include"
+
+ # Remove broken plugins
+ sed -i -e '/omemoplugin/d' -e '/screenshotplugin/d' -e '/videostatusplugin/d' "${WORKDIR}/plugins/generic/CMakeLists.txt"
+ use webkit || sed -i -e '/imagepreviewplugin/d' -e '/juickplugin/d' "${WORKDIR}/plugins/generic/CMakeLists.txt"
+ use otr || sed -i -e '/otrplugin/d' "${WORKDIR}/plugins/generic/CMakeLists.txt"
+ fi
+
if use iconsets; then
unset EGIT_BRANCH EGIT_COMMIT
EGIT_CHECKOUT_DIR="${WORKDIR}/resources" \
@@ -159,22 +178,35 @@
./configure "${CONF[@]}" || die "configure failed"
eqmake5 psi.pro
+
+ MODCONF=(
+ -DENABLE_PLUGINS=ON
+ -DONLY_PLUGINS=ON
+ -DCMAKE_INSTALL_PREFIX="/usr"
+ -DLIB_SUFFIX=""
+ -DMAIN_PROGRAM_NAME="${MY_PN}"
+ -DCMAKE_MODULE_PATH="${S}/cmake/modules"
+ )
+ use webkit || MODCONF+=("-DENABLE_WEBKIT=OFF")
+ use plugins && (cd "${WORKDIR}/plugins" && cmake "${MODCONF[@]}")
}
src_compile() {
emake
use doc && emake -C doc api_public
+ use plugins && emake -C "${WORKDIR}/plugins"
}
src_install() {
emake INSTALL_ROOT="${D}" install
# this way the docs will be installed in the standard gentoo dir
- rm "${ED}"/usr/share/${MY_PN}/{COPYING,README} || die "Installed file set seems to be changed by upstream"
+ rm "${ED}"/usr/share/${MY_PN}/{COPYING,README.html} || die "Installed file set seems to be changed by upstream"
newdoc iconsets/roster/README README.roster
newdoc iconsets/system/README README.system
newdoc certs/README README.certs
- dodoc README
+ dodoc README.md
+ dodoc README.html
use doc && HTML_DOCS=( doc/api/. )
einstalldocs
@@ -188,6 +220,8 @@
doins "translations/${PN}_${1}.qm"
}
l10n_for_each_locale_do install_locale
+
+ use plugins && emake -C "${WORKDIR}/plugins" DESTDIR="${D}" install
}
pkg_postinst() {
Regards
Klaus
- --
Klaus Ethgen http://www.ethgen.ch/
pub 4096R/4E20AF1C 2011-05-16 Klaus Ethgen <Klaus@Ethgen.ch>
Fingerprint: 85D4 CA42 952C 949B 1753 62B3 79D0 B06F 4E20 AF1C
-----BEGIN PGP SIGNATURE-----
Comment: Charset: ISO-8859-1
iQGzBAEBCgAdFiEEMWF28vh4/UMJJLQEpnwKsYAZ9qwFAluVSqAACgkQpnwKsYAZ
9qyITAv/SSsUAcEZ+l+hs9ufJP/n3Rs2TyQ9YsFf9buNes+IQ6Eyped9zSQsr5HJ
xjXu7oMLEdQgHFmir7DsJSWe/Rxdr61AcTDZz/TzWH1iQTVXyN4lHrkYAlHs705d
y5u9H4Z0vHc5yRXssYZSL+O97Wz1Hmo8RKdyfkYTVrtERXdIPcB579i5mEm72aUs
7eblV1SmEzXJp7UgHUo7A3Go/benvmu1nZMxjgGySTVZb0SwwcE2rpBCr7+en/HY
bubHYG8gRbxgI5QgvFbE5qI4Y8fE2Jlr83VBWbZbxeSo3Lb856uSSbdQ8+CALHsY
1yWuGO8GoZXxclCyKA+i5rPUZ+O7ljb5nAZBsYKsjADlHoKFzlOB9p519Kqdyi7u
uXvXkCjoUoYu5IDCkJXDaIWWPIRelpEFHODPtWW5E89Mv7JgrvaEpVxxawV01G5x
ObaxAAHqIy1KdV7A3E3G8bZCCKK9xKswKY+EdhPIktFmGqJv53mVMVc8aZ/Q8ReX
/+1+jKji
=5z3p
-----END PGP SIGNATURE-----
next prev parent reply other threads:[~2018-09-09 16:30 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-09-09 9:32 [gentoo-user] PSI+ compile error Klaus Ethgen
2018-09-09 16:30 ` Klaus Ethgen [this message]
2018-09-10 10:09 ` [gentoo-user] " Nuno Silva
2018-09-10 10:11 ` Nuno Silva
2018-09-10 12:44 ` Klaus Ethgen
2018-09-10 14:08 ` Klaus Ethgen
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=20180909163029.GA23141@ikki.ethgen.ch \
--to=klaus+gentoo@ethgen.de \
--cc=gentoo-user@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