Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

net-libs/libwebsockets: Fix compile issue. #14262

Closed

Conversation

jkroonza
Copy link
Contributor

@jkroonza jkroonza commented Jan 6, 2020

Closes: https://bugs.gentoo.org/704180
Package-Manager: Portage-2.3.79, Repoman-2.3.16
Signed-off-by: Jaco Kroon jaco@uls.co.za

Closes: https://bugs.gentoo.org/704180
Package-Manager: Portage-2.3.79, Repoman-2.3.16
Signed-off-by: Jaco Kroon <jaco@uls.co.za>
@gentoo-bot
Copy link

Pull Request assignment

Submitter: @jkroonza
Areas affected: ebuilds
Packages affected: net-libs/libwebsockets

net-libs/libwebsockets: @jkroonza, @gentoo/proxy-maint

Linked bugs

Bugs linked: 704180


In order to force reassignment and/or bug reference scan, please append [please reassign] to the pull request title.

Docs: Code of ConductCopyright policy (expl.) ● DevmanualGitHub PRsProxy-maint guide

@gentoo-bot gentoo-bot added self-maintained The PR changes only packages that are maintained by the submitter (i.e. no need to ask anybody else) assigned PR successfully assigned to the package maintainer(s). bug linked Bug/Closes found in footer, and cross-linked with the PR. labels Jan 6, 2020
@gentoo-repo-qa-bot
Copy link
Collaborator

Pull request CI report

Report generated at: 2020-01-06 12:27 UTC
Newest commit scanned: c55db46
Status: ✅ good

Issues already there before the PR (double-check them):
https://qa-reports.gentoo.org/output/gentoo-ci/ceede8d/output.html#global
https://qa-reports.gentoo.org/output/gentoo-ci/ceede8d/output.html#app-admin/puppet-agent
https://qa-reports.gentoo.org/output/gentoo-ci/ceede8d/output.html#app-emulation/virtualbox-additions
https://qa-reports.gentoo.org/output/gentoo-ci/ceede8d/output.html#app-emulation/virtualbox-guest-additions
https://qa-reports.gentoo.org/output/gentoo-ci/ceede8d/output.html#app-emulation/virtualbox-modules
https://qa-reports.gentoo.org/output/gentoo-ci/ceede8d/output.html#app-forensics/sleuthkit
https://qa-reports.gentoo.org/output/gentoo-ci/ceede8d/output.html#app-laptop/hdaps-gl
https://qa-reports.gentoo.org/output/gentoo-ci/ceede8d/output.html#app-misc/screenfetch
https://qa-reports.gentoo.org/output/gentoo-ci/ceede8d/output.html#app-text/jabref-bin
https://qa-reports.gentoo.org/output/gentoo-ci/ceede8d/output.html#app-text/wscr
https://qa-reports.gentoo.org/output/gentoo-ci/ceede8d/output.html#dev-db/postgresql
https://qa-reports.gentoo.org/output/gentoo-ci/ceede8d/output.html#dev-java/icedtea
https://qa-reports.gentoo.org/output/gentoo-ci/ceede8d/output.html#dev-java/netbeans-platform
https://qa-reports.gentoo.org/output/gentoo-ci/ceede8d/output.html#dev-libs/qtkeychain
https://qa-reports.gentoo.org/output/gentoo-ci/ceede8d/output.html#dev-python/parver
https://qa-reports.gentoo.org/output/gentoo-ci/ceede8d/output.html#dev-python/pygame
https://qa-reports.gentoo.org/output/gentoo-ci/ceede8d/output.html#dev-ros/roslaunch
https://qa-reports.gentoo.org/output/gentoo-ci/ceede8d/output.html#dev-util/cmt
https://qa-reports.gentoo.org/output/gentoo-ci/ceede8d/output.html#dev-util/google-perftools
https://qa-reports.gentoo.org/output/gentoo-ci/ceede8d/output.html#dev-vcs/gitsh
https://qa-reports.gentoo.org/output/gentoo-ci/ceede8d/output.html#games-strategy/freeciv
https://qa-reports.gentoo.org/output/gentoo-ci/ceede8d/output.html#games-util/pogo-manager-bin
https://qa-reports.gentoo.org/output/gentoo-ci/ceede8d/output.html#gnustep-apps/sogo
https://qa-reports.gentoo.org/output/gentoo-ci/ceede8d/output.html#mail-filter/spamassassin
https://qa-reports.gentoo.org/output/gentoo-ci/ceede8d/output.html#media-gfx/iscan
https://qa-reports.gentoo.org/output/gentoo-ci/ceede8d/output.html#media-sound/podcatcher
https://qa-reports.gentoo.org/output/gentoo-ci/ceede8d/output.html#media-tv/gentoo-vdr-scripts
https://qa-reports.gentoo.org/output/gentoo-ci/ceede8d/output.html#net-analyzer/dnsmap
https://qa-reports.gentoo.org/output/gentoo-ci/ceede8d/output.html#net-analyzer/metasploit
https://qa-reports.gentoo.org/output/gentoo-ci/ceede8d/output.html#net-analyzer/nagios-check_multiple
https://qa-reports.gentoo.org/output/gentoo-ci/ceede8d/output.html#net-analyzer/nagios-plugins
https://qa-reports.gentoo.org/output/gentoo-ci/ceede8d/output.html#net-analyzer/ntopng
https://qa-reports.gentoo.org/output/gentoo-ci/ceede8d/output.html#net-analyzer/snort
https://qa-reports.gentoo.org/output/gentoo-ci/ceede8d/output.html#net-analyzer/tcpstat
https://qa-reports.gentoo.org/output/gentoo-ci/ceede8d/output.html#net-analyzer/wireshark
https://qa-reports.gentoo.org/output/gentoo-ci/ceede8d/output.html#net-analyzer/zabbix
https://qa-reports.gentoo.org/output/gentoo-ci/ceede8d/output.html#net-dns/unbound
https://qa-reports.gentoo.org/output/gentoo-ci/ceede8d/output.html#net-ftp/lftp
https://qa-reports.gentoo.org/output/gentoo-ci/ceede8d/output.html#net-libs/nodejs
https://qa-reports.gentoo.org/output/gentoo-ci/ceede8d/output.html#net-misc/gerbera
https://qa-reports.gentoo.org/output/gentoo-ci/ceede8d/output.html#net-misc/icaclient
https://qa-reports.gentoo.org/output/gentoo-ci/ceede8d/output.html#net-misc/kea
https://qa-reports.gentoo.org/output/gentoo-ci/ceede8d/output.html#net-misc/youtube-dl
https://qa-reports.gentoo.org/output/gentoo-ci/ceede8d/output.html#net-p2p/bisq
https://qa-reports.gentoo.org/output/gentoo-ci/ceede8d/output.html#net-p2p/fms
https://qa-reports.gentoo.org/output/gentoo-ci/ceede8d/output.html#net-print/cups
https://qa-reports.gentoo.org/output/gentoo-ci/ceede8d/output.html#net-vpn/strongswan
https://qa-reports.gentoo.org/output/gentoo-ci/ceede8d/output.html#net-wireless/kismet
https://qa-reports.gentoo.org/output/gentoo-ci/ceede8d/output.html#sci-libs/scikits_learn
https://qa-reports.gentoo.org/output/gentoo-ci/ceede8d/output.html#sci-libs/tensorflow
https://qa-reports.gentoo.org/output/gentoo-ci/ceede8d/output.html#sci-libs/tensorflow-estimator
https://qa-reports.gentoo.org/output/gentoo-ci/ceede8d/output.html#sci-mathematics/geogebra
https://qa-reports.gentoo.org/output/gentoo-ci/ceede8d/output.html#sci-mathematics/lrcalc
https://qa-reports.gentoo.org/output/gentoo-ci/ceede8d/output.html#sci-visualization/veusz
https://qa-reports.gentoo.org/output/gentoo-ci/ceede8d/output.html#sys-apps/usbguard
https://qa-reports.gentoo.org/output/gentoo-ci/ceede8d/output.html#sys-auth/nss-pam-ldapd
https://qa-reports.gentoo.org/output/gentoo-ci/ceede8d/output.html#sys-cluster/crmsh
https://qa-reports.gentoo.org/output/gentoo-ci/ceede8d/output.html#sys-cluster/kube-apiserver
https://qa-reports.gentoo.org/output/gentoo-ci/ceede8d/output.html#sys-cluster/kube-controller-manager
https://qa-reports.gentoo.org/output/gentoo-ci/ceede8d/output.html#sys-cluster/kube-scheduler
https://qa-reports.gentoo.org/output/gentoo-ci/ceede8d/output.html#sys-cluster/neutron
https://qa-reports.gentoo.org/output/gentoo-ci/ceede8d/output.html#sys-fs/tmsu
https://qa-reports.gentoo.org/output/gentoo-ci/ceede8d/output.html#virtual/cargo
https://qa-reports.gentoo.org/output/gentoo-ci/ceede8d/output.html#virtual/jdk
https://qa-reports.gentoo.org/output/gentoo-ci/ceede8d/output.html#virtual/jre
https://qa-reports.gentoo.org/output/gentoo-ci/ceede8d/output.html#www-apps/netbox
https://qa-reports.gentoo.org/output/gentoo-ci/ceede8d/output.html#www-apps/postfixadmin
https://qa-reports.gentoo.org/output/gentoo-ci/ceede8d/output.html#www-misc/shellinabox
https://qa-reports.gentoo.org/output/gentoo-ci/ceede8d/output.html#www-servers/nginx

@juippis
Copy link
Member

juippis commented Jan 6, 2020

I had some trouble merging your patch,

Applying: net-libs/libwebsockets: Fix compile issue.
Using index info to reconstruct a base tree...
M	net-libs/libwebsockets/libwebsockets-3.2.1.ebuild
.git/rebase-apply/patch:31: space before tab in indent.
 	struct lws_protocols *lwsp;
.git/rebase-apply/patch:32: space before tab in indent.
 	int m, f = !info->pvo, fx = 0, abs_pcol_count = 0;
.git/rebase-apply/patch:33: space before tab in indent.
 	char buf[96];
.git/rebase-apply/patch:36: space before tab in indent.
 	char *p;
.git/rebase-apply/patch:38: space before tab in indent.
 	int n;
warning: squelched 2 whitespace errors
warning: 7 lines add whitespace errors.
Falling back to patching base and 3-way merge...
Auto-merging net-libs/libwebsockets/libwebsockets-3.2.1.ebuild

I removed some spaces from the patch file, and tested that it still works. Please test also that nothing breaks after it's merged :P

@gentoo-bot gentoo-bot closed this in cb92583 Jan 6, 2020
@jkroonza jkroonza deleted the libwebsockets-3.2.1-compilefix branch March 13, 2020 14:16
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
assigned PR successfully assigned to the package maintainer(s). bug linked Bug/Closes found in footer, and cross-linked with the PR. self-maintained The PR changes only packages that are maintained by the submitter (i.e. no need to ask anybody else)
Projects
None yet
4 participants