Page MenuHomeFreeBSD
Differential D9184

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

Authored by adridg on Jan 14 2017, 9:23 PM.
Tags
None
Referenced Files
Unknown Object (File)
Wed, Mar 26, 10:41 AM
Unknown Object (File)
Sat, Mar 15, 9:48 PM
Unknown Object (File)
Mar 7 2025, 2:36 AM
Unknown Object (File)
Feb 27 2025, 4:18 PM
Unknown Object (File)
Feb 24 2025, 10:33 AM
Unknown Object (File)
Jan 31 2025, 2:38 AM
Unknown Object (File)
Jan 22 2025, 6:44 PM
Unknown Object (File)
Jan 22 2025, 3:48 PM
View All 97 Files
Subscribers
jbeich
mat
kde

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
Lint Not Applicable
Unit
Tests Not Applicable

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 ↗(On Diff #24006)

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 ↗(On Diff #24006)

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 ↗(On Diff #24006)

Ah, that makes sense.

jbeich accepted this revision.Jan 15 2017, 2:10 AM
jbeich added a reviewer: jbeich.

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 ↗(On Diff #24006)

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 ↗(On Diff #24006)

Before the change the conditional always took true branch but now it sometimes doesn't. Maybe bump PORTREVISION.

rakuco edited edge metadata.Jan 15 2017, 1:02 PM

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

jbeich resigned from this revision.Jan 17 2017, 1:59 PM
jbeich removed a reviewer: jbeich.
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
adridg updated this revision to Diff 24149.Jan 18 2017, 9:56 AM
adridg marked an inline comment as done.
adridg edited edge metadata.
  • Made makepatch (this renames an unrelated patch as well)
  • Used upstream commit
  • Bumped PORTREVISION
tcberner accepted this revision.Jan 18 2017, 10:32 AM
tcberner edited edge metadata.

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
adridg updated this revision to Diff 24150.Jan 18 2017, 10:39 AM
adridg edited edge metadata.

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

PathSize
head/
devel/
qt4-linguist/
1 line
files/
14 lines

Diff 24153

View Options

head/devel/qt4-linguist/Makefile

PropertyOld ValueNew Value
svn:eol-stylenullnative
\ No newline at end of property
svn:keywordsnullFreeBSD=%H
\ No newline at end of property
svn:mime-typenulltext/plain
\ No newline at end of property
# $FreeBSD$
PORTNAME= pyfda
PORTVERSION= 0.1
DISTVERSIONSUFFIX= rc6
CATEGORIES= cad python devel
MASTER_SITES= CHEESESHOP
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
MAINTAINER= yuri@FreeBSD.org
COMMENT= GUI tool for designing and analysing discrete time filters
LICENSE= MIT
LICENSE_FILE= ${WRKSRC}/LICENSE
RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}docutils>0:textproc/py-docutils@${FLAVOR} \
${PYTHON_PKGNAMEPREFIX}matplotlib>0:math/py-matplotlib@${FLAVOR} \
${PYNUMPY} \
${PYTHON_PKGNAMEPREFIX}scipy>0:science/py-scipy@${FLAVOR}
USES= python:3.4+ pyqt:5
USE_PYTHON= distutils autoplist noflavors
matUnsubmitted
Not Done
Inline Actions

Also, setting noflavors (which is weird, no reason to do it) means that the FLAVOR variable is empty, thus, it makes this port broken because the dependencies line end with @ with no flavor.

mat: Also, setting noflavors (which is weird, no reason to do it) means that the FLAVOR variable is…
yuriAuthorUnsubmitted
Not Done
Inline Actions

But this is an app, not a library. Shouldn't python apps all be noflavors?

yuri: But this is an app, not a library. Shouldn't python apps all be `noflavors`?
matUnsubmitted
Not Done
Inline Actions

this has a PKGNAMEPREFIX, nothing against it having noflavors.

mat: this has a PKGNAMEPREFIX, nothing against it having noflavors.
USE_PYQT= core_run gui_run widgets_run
NO_ARCH= yes
post-extract:
@${MV} ${WRKSRC}/pyfda/pyfda_log.conf ${WRKSRC}/pyfda/pyfda_log.conf.sample
@${MV} ${WRKSRC}/pyfda/pyfda_log_debug.conf ${WRKSRC}/pyfda/pyfda_log_debug.conf.sample
post-patch:
@${REINPLACE_CMD} -e " \
s|package_data={'pyfda': \['pyfda_log.conf', 'pyfda_log_debug.conf',|package_data={'pyfda': [|; \
s|data_files = \[|data_files = [('${PREFIX}/etc', ['pyfda/pyfda_log.conf.sample', 'pyfda/pyfda_log_debug.conf.sample'])|" \
${WRKSRC}/setup.py
@${REINPLACE_CMD} -e " \
s|logging.config.fileConfig(os.path.join(base_dir, rc.log_config_file))|logging.config.fileConfig(os.path.join('${PREFIX}/etc', rc.log_config_file))|" \
${WRKSRC}/pyfda/pyfdax.py
@${REINPLACE_CMD} -e " \
s|'pyfda.log'|'/tmp/pyfda.log'|" \
${WRKSRC}/pyfda/*.conf.sample
post-stage:
@${REINPLACE_CMD} -E " \
s|(.*\.sample)$$|@sample \1|" \
${WRKDIR}/.PLIST.pymodtmp
.include <bsd.port.mk>
View Options

head/devel/qt4-linguist/files/patch-tools_linguist_linguist_messagemodel.cpp

PropertyOld ValueNew Value
svn:eol-stylenullnative
\ No newline at end of property
svn:keywordsnullFreeBSD=%H
\ No newline at end of property
svn:mime-typenulltext/plain
\ No newline at end of property
# $FreeBSD$
PORTNAME= pyfda
PORTVERSION= 0.1
DISTVERSIONSUFFIX= rc6
CATEGORIES= cad python devel
MASTER_SITES= CHEESESHOP
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
MAINTAINER= yuri@FreeBSD.org
COMMENT= GUI tool for designing and analysing discrete time filters
LICENSE= MIT
LICENSE_FILE= ${WRKSRC}/LICENSE
RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}docutils>0:textproc/py-docutils@${FLAVOR} \
${PYTHON_PKGNAMEPREFIX}matplotlib>0:math/py-matplotlib@${FLAVOR} \
${PYNUMPY} \
${PYTHON_PKGNAMEPREFIX}scipy>0:science/py-scipy@${FLAVOR}
USES= python:3.4+ pyqt:5
USE_PYTHON= distutils autoplist noflavors
matUnsubmitted
Not Done
Inline Actions

Also, setting noflavors (which is weird, no reason to do it) means that the FLAVOR variable is empty, thus, it makes this port broken because the dependencies line end with @ with no flavor.

mat: Also, setting noflavors (which is weird, no reason to do it) means that the FLAVOR variable is…
yuriAuthorUnsubmitted
Not Done
Inline Actions

But this is an app, not a library. Shouldn't python apps all be noflavors?

yuri: But this is an app, not a library. Shouldn't python apps all be `noflavors`?
matUnsubmitted
Not Done
Inline Actions

this has a PKGNAMEPREFIX, nothing against it having noflavors.

mat: this has a PKGNAMEPREFIX, nothing against it having noflavors.
USE_PYQT= core_run gui_run widgets_run
NO_ARCH= yes
post-extract:
@${MV} ${WRKSRC}/pyfda/pyfda_log.conf ${WRKSRC}/pyfda/pyfda_log.conf.sample
@${MV} ${WRKSRC}/pyfda/pyfda_log_debug.conf ${WRKSRC}/pyfda/pyfda_log_debug.conf.sample
post-patch:
@${REINPLACE_CMD} -e " \
s|package_data={'pyfda': \['pyfda_log.conf', 'pyfda_log_debug.conf',|package_data={'pyfda': [|; \
s|data_files = \[|data_files = [('${PREFIX}/etc', ['pyfda/pyfda_log.conf.sample', 'pyfda/pyfda_log_debug.conf.sample'])|" \
${WRKSRC}/setup.py
@${REINPLACE_CMD} -e " \
s|logging.config.fileConfig(os.path.join(base_dir, rc.log_config_file))|logging.config.fileConfig(os.path.join('${PREFIX}/etc', rc.log_config_file))|" \
${WRKSRC}/pyfda/pyfdax.py
@${REINPLACE_CMD} -e " \
s|'pyfda.log'|'/tmp/pyfda.log'|" \
${WRKSRC}/pyfda/*.conf.sample
post-stage:
@${REINPLACE_CMD} -E " \
s|(.*\.sample)$$|@sample \1|" \
${WRKDIR}/.PLIST.pymodtmp
.include <bsd.port.mk>