diff options
| -rw-r--r-- | packages/net-im/psi/psi-scm.exheres-0 | 46 |
1 files changed, 13 insertions, 33 deletions
diff --git a/packages/net-im/psi/psi-scm.exheres-0 b/packages/net-im/psi/psi-scm.exheres-0 index 811f6d4..f8921a7 100644 --- a/packages/net-im/psi/psi-scm.exheres-0 +++ b/packages/net-im/psi/psi-scm.exheres-0 @@ -50,13 +50,8 @@ MYOPTIONS=" crypt debug doc - extras [[ description = [ apply extra patches, \"psi-plus\" ] ]] - ( - sql [[ description = [ support sql backend for data storage ] ]] - iconsets [[ description = [ install additional icon sets ] ]] - plugins [[ description = [ build all available psi-plus plugins ] ]] - ) - [[ *requires = extras ]] + sql [[ description = [ support sql backend for data storage ] ]] + plugins [[ description = [ build all available psi-plus plugins ] ]] whiteboarding [[ description = [ Build whiteboarding plugin ] ]] xscreensaver [[ description = [ support xscrinsaver (preventing) ] ]] linguas: ( ${LANGS} ) @@ -107,7 +102,6 @@ DEPENDENCIES=" # 'extras BUILD_PSIMEDIA' CMAKE_SRC_CONFIGURE_OPTIONS=( - 'extras IS_PSIPLUS' 'providers:webkit IS_WEBKIT' 'providers:webengine IS_WEBENGINE' ) @@ -121,20 +115,17 @@ CMAKE_SRC_CONFIGURE_OPTION_ENABLES=( 'plugins PLUGINS' ) -#TODO: add webengine option CMAKE_SRC_CONFIGURE_PARAMS+=( -DBUNDLED_IRIS=ON -DUSE_CCACHE=OFF -DBUILD_PSIMEDIA=OFF -DCHAT_TYPE=BASIC + -DPSI_PLUS=ON ) pkg_setup() { - MY_PN=psi - if option extras; then - MY_PN=psi-plus - fi + MY_PN=psi-plus } src_prepare() { @@ -154,26 +145,17 @@ src_prepare() { expatch "${FILES}"/disable_plugins.patch edo cd ../../ - if option extras; then - edo cp -a "${WORKBASE}/${PNV}/psi-plus/iconsets" . - if option iconsets; then - edo cp -a "${WORKBASE}/${PNV}/resources/iconsets" . - fi - expatch "${WORKBASE}/${PNV}/psi-plus/patches"/*.diff - option sql && expatch "${WORKBASE}/${PNV}/psi-plus/patches/dev/psi-new-history.patch" - vergen="${WORKBASE}/${PNV}/psi-plus/admin/psi-plus-nightly-version" - - local features=() + vergen="${WORKBASE}/${PNV}/psi-plus/admin/psi-plus-nightly-version" - option providers:webkit && features+="--webkit" - option providers:webengine && features+="--webengine" - option sql && features+="--sql" + local features=() - features="$(option providers:webkit && echo '--webkit') $(option providers:webengine && echo '--webengine') $(option sql && echo '--sql')" - NIGHTLY_VER=$("${vergen}" ./ $features) - elog "Prepared version: ${NIGHTLY_VER}" - echo "${NIGHTLY_VER}" > version || die "Failed to write version file" - fi + option providers:webkit && features+="--webkit" + option providers:webengine && features+="--webengine" + option sql && features+="--sql" + features="$(option providers:webkit && echo '--webkit') $(option providers:webengine && echo '--webengine') $(option sql && echo '--sql')" + NIGHTLY_VER=$("${vergen}" ./ $features) + elog "Prepared version: ${NIGHTLY_VER}" + echo "${NIGHTLY_VER}" > version || die "Failed to write version file" edo sed -e "s/pkg-config/$(exhost --target)-pkg-config/g" -i "${WORKBASE}/${PNV}"/configure edo sed -e "s/pkg-config/$(exhost --target)-pkg-config/g" -i "${WORKBASE}/${PNV}"/iris/configure cd "${WORK}" @@ -185,8 +167,6 @@ src_install() { cmake_src_install # 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.html option doc && HTML_DOCS=( doc/api/. ) |