Skip to content

PyQt 4.11 compatibility - #15

Closed
pallegro wants to merge 3 commits into
ros-visualization:groovy-develfrom
pallegro:groovy-devel
Closed

pallegro wants to merge 3 commits into
ros-visualization:groovy-develfrom
pallegro:groovy-devel

Conversation

@pallegro

Copy link
Copy Markdown

Starting in PyQt 4.11, there is no pyqtconfig, so this patch imitates it when its not found.
pyqtconfig.QtGuiModuleMakefile simply calls sipconfig.SIPModuleMakefile with qt=['QtCore', 'QtGui'],
thus this patches has no effect if pyqtconfig is found (i.e. if the user has PyQt <=4.10)

bchretien pushed a commit to bchretien/arch-ros-stacks that referenced this pull request Dec 21, 2014
Comment thread cmake/sip_configure.py Outdated

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This fails on Arch. /usr/share/sip contains several directories:

  • Py2-PyQt4
  • Py2-PyQt5
  • PyQt4
  • PyQt5
  • Qwt5

I had to set "pyqt_sip_dir" to "/usr/share/sip/Py2-PyQt4" to fix the compilation of rviz.

cc @v01d

bchretien pushed a commit to bchretien/arch-ros-stacks that referenced this pull request Feb 14, 2015
@bchretien

Copy link
Copy Markdown

Note: this PR aims at solving #13.

@pallegro

Copy link
Copy Markdown
Author

/usr/share/sip/PyQt4 is what's used by Ubuntu Utopic, so I've updated the path to that.

@bchretien

Copy link
Copy Markdown

If I'm not mistaken, /usr/share/sip/PyQt4 is the default path for PyQt4, so the one that packagers keep for the PyQt4 version associated with their distribution's default Python version (Python 3 for Arch, Python 2 for Ubuntu). Arch's PKGBUILD for PyQt4 seems to confirm it.

I guess that if this is the only part really specific for Arch, I can just keep a good ol' sed replace in the PKGBUILD, unless there's a way to get these values from somewhere else.

@bchretien

Copy link
Copy Markdown

But as you said on the AUR, if sip files in /usr/share/*PyQt4 are identical, this could be solved in Arch's PyQt4 package.

@dirk-thomas

Copy link
Copy Markdown
Contributor

Superseded by #21.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants