Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

PyQt 4.11 compatibility #15

Closed
wants to merge 3 commits into from
Closed

PyQt 4.11 compatibility #15

wants to merge 3 commits into from

Conversation

pallegro
Copy link

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
"pyqt_version_str": QtCore.PYQT_VERSION_STR,
"pyqt_bin_dir": PyQt4.__path__[0],
"pyqt_mod_dir": PyQt4.__path__[0],
"pyqt_sip_dir": "/usr/share/sip",

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

Note: this PR aims at solving #13.

@pallegro
Copy link
Author

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

@bchretien
Copy link

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

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
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.

None yet

3 participants