search

stefan-langenmaier / jami-overlay

Jami (formerly Ring (formerly SFLphone)) is a SIP compatible softphone for GNU/Linux.
GNU General Public License v3.0
21 stars 9 forks source link

[Close stefan-langenmaier/ring-overlay#11] Added patches from the ring project #18

Closed YogSottot closed 7 years ago

YogSottot commented 7 years ago

Added patches from the ring project

More about patches https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=843654#20

YogSottot commented 7 years ago

RepoMan scours the neighborhood... file.size.fatal [fatal] 1 (113 KiB) net-libs/pjproject/files/gnutls.patch

This patch can be split if it necessary

stefan-langenmaier commented 7 years ago

Thanks for your work! I don't think it's necessary to split the patch. It would be better if we could stick with the same files that are also used by the Ring team. That should reduce the confusion in the future.

No problem if repoman fails. :)

stefan-langenmaier commented 7 years ago

I'll try to merge it this afternoon.

YogSottot commented 7 years ago

Files slightly altered because of the "offset lines" and "fuzzy" and "unexpected end of file warnings". @@ -l,s +l,s @@ Just change the «l» part. And added more context when it need. Source of the patches https://github.com/savoirfairelinux/ring-daemon/tree/master/contrib/src/pjproject

stefan-langenmaier commented 7 years ago

The pull request is merged. Thanks again.

I tried to specify in the ring-daemon ebuild the dependency on pjproject to only consider this repository. It seems that the following code works only on the command line but not in the DEPEND list: net-voip/pjproject::ring-overlay.

So I tried to work around it with a very specific slot. Maybe you have a better idea.

YogSottot commented 7 years ago

Repository Dependency probably is available via "EAPI=4-python" in the progress overlay

https://bugs.gentoo.org/show_bug.cgi?id=427076

I think, that slot is ok.

stefan-langenmaier commented 7 years ago

Good to know. :)