Page MenuHomeFreeBSD

biology/libgtextutils: Unbreak for FreeBSD 12
ClosedPublic

Authored by jwb on Mar 29 2018, 1:46 PM.

Details

Summary

biology/libgtextutils: Unbreak for FreeBSD 12

From pkg-fallout:

libtool: compile: c++ -DHAVE_CONFIG_H -I. -I../.. -O2 -pipe -fstack-protector -fno-strict-aliasing -Wall -Wextra -Wformat-nonliteral -Wformat-security -Wswitch-default -Wswitch-enum -Wunused-parameter -Wfloat-equal -Werror -DDEBUG -g -O1 -DDEBUG -g -O1 -MT text_line_reader.lo -MD -MP -MF .deps/text_line_reader.Tpo -c text_line_reader.cpp -fPIC -DPIC -o .libs/text_line_reader.o
text_line_reader.cpp:47:9: error: no viable conversion from returned value of type 'std::istream' (aka 'basic_istream<char>') to function return type 'bool'

return input_stream ;
       ^~~~~~~~~~~~

Newer C++ compilers are stricter about implicit conversions. This is
a standard fix seen in many packages and taken from an upstream commit:

https://github.com/agordon/libgtextutils/commit/d8bb66d26288293ebde7f8d88979c13c208ffce5

Approved by: jrm or wen
Will include differential in commit

Test Plan

Tested on FreeBSD 11
I don't currently have a FreeBSD 12 installation, but I'm confident that this
will fix the issue and if I'm wrong, there's no harm done. Still plenty of
time before 12-RELEASE.

Diff Detail

Repository
rP FreeBSD ports repository
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Event Timeline

jwb created this revision.Mar 29 2018, 1:46 PM
jrm accepted this revision.Mar 29 2018, 1:57 PM
This revision is now accepted and ready to land.Mar 29 2018, 1:57 PM
mat added inline comments.Mar 29 2018, 3:05 PM
biology/libgtextutils/Makefile
4 ↗(On Diff #40873)

Please do not change PORTVERSION to DISTVERSION without changing the version itself.

jrm added inline comments.Mar 29 2018, 3:11 PM
biology/libgtextutils/Makefile
4 ↗(On Diff #40873)

As you correctly pointed out in the past, there are good reasons not to do this in general, but in this specific case, PORTREVISION does not change. Is there still harm that we are missing?

mat added inline comments.Mar 29 2018, 3:16 PM
biology/libgtextutils/Makefile
4 ↗(On Diff #40873)

Like all other cosmetic changes, it breaks svn annotate/git blame, it adds unnecessary churn to the repository.

jrm added inline comments.Mar 29 2018, 3:19 PM
biology/libgtextutils/Makefile
4 ↗(On Diff #40873)

Logical and clear reason (as usual). Thanks @mat.

jrm requested changes to this revision.Mar 29 2018, 3:19 PM
This revision now requires changes to proceed.Mar 29 2018, 3:19 PM
This revision was not accepted when it landed; it landed in state Needs Revision.Mar 29 2018, 3:41 PM
This revision was automatically updated to reflect the committed changes.
jwb added a comment.Mar 29 2018, 3:45 PM

Crap, sorry. I didn't scroll down to see your comment. I'm just overwhelmed with juggling too many things here...

Should I revert it?

jwb added a comment.Mar 29 2018, 3:49 PM

Updated my checklist so this won't happen again.