Bug 72744 - [PATCH] Fix detection of moc for Qt5
Summary: [PATCH] Fix detection of moc for Qt5
Status: RESOLVED FIXED
Alias: None
Product: poppler
Classification: Unclassified
Component: general (show other bugs)
Version: unspecified
Hardware: All All
: medium normal
Assignee: poppler-bugs
QA Contact:
URL:
Whiteboard:
Keywords:
Depends on:
Blocks:
 
Reported: 2013-12-16 07:36 UTC by Tuomas Jormola
Modified: 2016-08-01 20:51 UTC (History)
1 user (show)

See Also:
i915 platform:
i915 features:


Attachments
The patch fixing the bug described (2.28 KB, text/plain)
2013-12-16 07:36 UTC, Tuomas Jormola
Details
configure patch (510 bytes, patch)
2016-06-02 05:00 UTC, Richard PALO
Details | Splinter Review
More grep degnuifications. (964 bytes, patch)
2016-08-01 20:13 UTC, Matthias Kilian
Details | Splinter Review

Description Tuomas Jormola 2013-12-16 07:36:42 UTC
Created attachment 90821 [details]
The patch fixing the bug described

On my Mac OS X 10.9 Mavericks system with Qt 5.2.0 installed using
Homebrew, the output of the moc command doesn't include the string
"Qt 5" which is expected by the moc version detection logic in
configure.ac of poppler 0.24.4. This patch updates the grep pattern so
that the current expected moc version output and the version output of
this installation of Qt5 are both detected as a valid moc for Qt5. With
this patch applied, I was able to build and test poppler with Qt5
support successfully.

(09:26:05)(tj@gauri)(~)$ uname -a
Darwin gauri.ad.local.domain 13.0.0 Darwin Kernel Version 13.0.0: Thu Sep 19 22:22:27 PDT 2013; root:xnu-2422.1.72~6/RELEASE_X86_64 x86_64 i386 MacBookPro3,1 Darwin
(09:26:08)(tj@gauri)(~)$ /usr/local/opt/qt5/bin/moc -v
moc 5.2.0
(09:26:24)(tj@gauri)(~)$
Comment 1 Albert Astals Cid 2013-12-16 19:44:29 UTC
I've commited it to the repo and will be part of 0.26.0.

Thanks!
Comment 2 Richard PALO 2016-06-02 04:56:57 UTC
I've come across a situation in pkgsrc on SunOS i386 where the grep clause fails.
I've needed to apply the attached patch.  Could this be checked globally?
Comment 3 Richard PALO 2016-06-02 05:00:58 UTC
Created attachment 124253 [details] [review]
configure patch
Comment 4 Albert Astals Cid 2016-06-03 14:26:19 UTC
Can you explain why you need the patch?
Comment 5 Richard PALO 2016-07-24 17:04:59 UTC
(In reply to Albert Astals Cid from comment #4)
> Can you explain why you need the patch?

Sorry, seem to have missed your request...
This is because the clause seems to presume GNU grep and does not necessarily work with all native grep tools.

richard@omnis:/home/richard/src/pkgsrc/print/poppler$ echo $mocversion
moc 5.5.1
richard@omnis:/home/richard/src/pkgsrc/print/poppler$ echo $mocversion | grep "Qt 5\|moc 5"
richard@omnis:/home/richard/src/pkgsrc/print/poppler$ echo $mocversion | grep -E "Qt 5|moc 5"
moc 5.5.1
richard@omnis:/home/richard/src/pkgsrc/print/poppler$ echo $mocversion | ggrep "Qt 5\|moc 5"
moc 5.5.1
Comment 6 Albert Astals Cid 2016-07-24 21:53:19 UTC
Pushed.
Comment 7 Matthias Kilian 2016-08-01 20:11:31 UTC
There are too more invocations of grep(1) which could need some degnuification. Needed for OpenBSD, where the QT5 moc executable is named moc-qt5. Patch follows in a minute.
Comment 8 Matthias Kilian 2016-08-01 20:13:13 UTC
Created attachment 125469 [details] [review]
More grep degnuifications.
Comment 9 Albert Astals Cid 2016-08-01 20:51:42 UTC
Pushed


Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.