Paths

Table of Contentst

Fix devel/qt4-linguist build against clang 4.0
ClosedPublic
Actions

Authored by adridg on Jan 14 2017, 9:23 PM.

Details

Reviewers

tcberner
rakuco

Commits

rP431847: MFH: r431792
rP431792: devel/qt4-linguist: unbreak with clang 4.0

Summary

Fix for https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=216051 ,
build failure for qt4-linguist with clang 4.0. Blocker for the clang 4.0
import project.

Test Plan

Will be picked up by the exp-run for clang 4.0.

Diff Detail

Repository

rP FreeBSD ports repository

Lint

No Lint Coverage

Unit

No Test Coverage

Build Status

Buildable 6771
Build 6984: arc lint + arc unit

Event Timeline

adridg updated this revision to Diff 24006.Jan 14 2017, 9:23 PM

adridg retitled this revision from to Fix devel/qt4-linguist build against clang 4.0.

adridg updated this object.

adridg edited the test plan for this revision. (Show Details)

adridg added reviewers: tcberner, rakuco.

adridg added a subscriber: kde.

Herald added a subscriber: mat. · View Herald TranscriptJan 14 2017, 9:23 PM

tcberner added a subscriber: jbeich.Jan 14 2017, 9:26 PM

tcberner added inline comments.

devel/qt4-linguist/files/patch-tools__linguist__linguist__messagemodel.cpp
11	couldn't you simply use if (c->findMessage(m->text(), m->comment()))

adridg marked an inline comment as done.Jan 14 2017, 9:35 PM

adridg added inline comments.

devel/qt4-linguist/files/patch-tools__linguist__linguist__messagemodel.cpp
11	While I could do that, and it would be idiomatic C, the Qt sources tend to use != 0 explicitly, so this patch sticks closer to the style of the source. (But it's just "tend", since you can see from tools/designer/src/components/objectinspector/objectinspector.cpp lines 286 and 307 that sometimes they use !p, sometimes p != 0)

tcberner added inline comments.Jan 14 2017, 9:40 PM

devel/qt4-linguist/files/patch-tools__linguist__linguist__messagemodel.cpp
11	Ah, that makes sense.

With the change poudriere builds for 10.3 i386 and /projects/clang400-import@311940 amd64 are green. Thanks.

devel/qt4-linguist/files/patch-tools__linguist__linguist__messagemodel.cpp
5	Can you format the patch with `make makepatch`? It uses timestamps in UTC and single underscore for directory separator in filename.

This revision is now accepted and ready to land.Jan 15 2017, 2:10 AM

jbeich added inline comments.Jan 15 2017, 2:15 AM

devel/qt4-linguist/files/patch-tools__linguist__linguist__messagemodel.cpp
11	Before the change the conditional always took true branch but now it sometimes doesn't. Maybe bump PORTREVISION.

I think it's also a good idea to call this a backport of this Qt5 commit. No objections to bumping PORTREVISION.

In D9184#189893, @rakuco wrote:

call this a backport of this Qt5 commit.

Hmm, I'd prefer we take that commit as is then.

This revision now requires review to proceed.Jan 17 2017, 1:59 PM

Made makepatch (this renames an unrelated patch as well)
Used upstream commit
Bumped PORTREVISION

Could you add the commit message/some explanation to the top of the new patch? So we know why it is there :)

Apart from that it should be good to go.

This revision is now accepted and ready to land.Jan 18 2017, 10:32 AM

Add patch-comment

This revision now requires review to proceed.Jan 18 2017, 10:39 AM

Closed by commit rP431792: devel/qt4-linguist: unbreak with clang 4.0 (authored by jbeich). · Explain WhyJan 18 2017, 11:54 AM

This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

Path

Size

devel/

qt4-linguist/

files/

patch-tools__linguist__linguist__messagemodel.cpp

14 lines

Diff 24006

View Options

devel/qt4-linguist/files/patch-toolslinguistlinguist__messagemodel.cpp

Fix devel/qt4-linguist build against clang 4.0ClosedPublicActions