diff options
author | Gluzskiy Alexandr <sss@sss.chaoslab.ru> | 2018-11-15 22:55:48 +0300 |
---|---|---|
committer | Gluzskiy Alexandr <sss@sss.chaoslab.ru> | 2018-11-15 22:55:48 +0300 |
commit | da54f7626e590dd954fc527154e510dadabc64c4 (patch) | |
tree | 60ecc80741070336914f08c3b8d2362657e3ef82 | |
parent | 233b4478f2de381ba6d947459abae2a7f876337a (diff) |
psi: changes requested by exherbo devs
-rw-r--r-- | packages/dev-util/codelite/codelite.exlib | 2 | ||||
-rw-r--r-- | packages/net-im/psi/psi-scm.exheres-0 | 37 |
2 files changed, 21 insertions, 18 deletions
diff --git a/packages/dev-util/codelite/codelite.exlib b/packages/dev-util/codelite/codelite.exlib index 549070b..cd60a36 100644 --- a/packages/dev-util/codelite/codelite.exlib +++ b/packages/dev-util/codelite/codelite.exlib @@ -22,7 +22,7 @@ MYOPTIONS=" DEPENDENCIES=" build+run: dev-db/sqlite:3 - x11-libs/wxGTK:*[>=3] + x11-libs/wxGTK:=[>=3] clang? ( dev-lang/clang ) flex? ( sys-devel/flex ) ssh? ( net-libs/libssh ) diff --git a/packages/net-im/psi/psi-scm.exheres-0 b/packages/net-im/psi/psi-scm.exheres-0 index b011f84..7bf0ebe 100644 --- a/packages/net-im/psi/psi-scm.exheres-0 +++ b/packages/net-im/psi/psi-scm.exheres-0 @@ -45,27 +45,26 @@ MYOPTIONS=" crypt debug doc - ( providers: - aspell - hunspell - enchant - ) - [[ number-selected = at-most-one ]] - extras + extras [[ description = [ apply extra patches, \"psi-plus\" ] ]] ( - sql - iconsets + sql [[ description = [ support sql backend for data storage ] ]] + iconsets [[ description = [ install additional icon sets ] ]] ) [[ *requires = extras ]] + whiteboarding [[ description = [ Build whiteboarding plugin ] ]] + xscreensaver [[ description = [ support xscrinsaver (preventing) ] ]] + linguas: ( ${LANGS} ) + ( providers: + aspell [[ description = [ spell checking support ] ]] + hunspell [[ description = [ spell checking support ] ]] + enchant [[ description = [ spell checking support ] ]] + ) + [[ number-selected = at-most-one ]] ( providers: - webengine - webkit + webengine [[ description = [ support html/js rendering via qtwebengine ] ]] + webkit [[ description = [ support html/js rendering via qtwebkit (deprecated) ] ]] ) [[ number-selected = at-most-one ]] - webp - whiteboarding - xscreensaver - linguas: ( ${LANGS} ) " DEPENDENCIES=" @@ -79,7 +78,6 @@ DEPENDENCIES=" x11-libs/libX11 x11-libs/libxcb crypt? ( app-crypt/qca[gnupg] ) - webp? ( x11-libs/qtimageformats ) whiteboarding? ( x11-libs/qtsvg:5 ) xscreensaver? ( x11-libs/libXScrnSaver ) providers:aspell? ( app-spell/aspell ) @@ -94,6 +92,11 @@ DEPENDENCIES=" build: doc? ( app-doc/doxygen ) extras? ( sys-devel/qconf[>=2.4] ) + suggestion: + x11-libs/qtimageformats [[ + description = [ for webp image format support ] + + ]] " #$DEFAULT_SRC_PREPARE_PATCHES=( @@ -153,7 +156,7 @@ src_configure() { # This may generate warnings if passed option already matches with default. # Just ignore them. It's how qconf-based configure works and will be fixed in # future qconf versions. - ./configure "${CONF[@]}" || die "configure failed" + edo ./configure "${CONF[@]}" eqmake psi.pro |