diff options
| author | Omar Vega Ramos <ovruni@gnu.org.pe> | 2013-04-02 15:43:26 -0500 |
|---|---|---|
| committer | Omar Vega Ramos <ovruni@gnu.org.pe> | 2013-04-02 15:43:26 -0500 |
| commit | d2e9c77d6881eb7ef37edf747a77f83168bbe9b7 (patch) | |
| tree | 4914a72642c1e36cf32a6350553d3c6751e1c41d | |
| parent | 60aaf4dddde2e0d5dc77a1b48943b2ea9aa7fb14 (diff) | |
Removing PyQt-x11-gpl-3.18.1-configure.patch
| -rw-r--r-- | community/pyqt3/PKGBUILD | 1 | ||||
| -rw-r--r-- | community/pyqt3/PyQt-x11-gpl-3.18.1-configure.patch | 37 |
2 files changed, 0 insertions, 38 deletions
diff --git a/community/pyqt3/PKGBUILD b/community/pyqt3/PKGBUILD index 6b0e4cd8b..0806187e9 100644 --- a/community/pyqt3/PKGBUILD +++ b/community/pyqt3/PKGBUILD @@ -17,7 +17,6 @@ md5sums=('f1d120495d1aaf393819e988c0a7bb7e') build() { cd ${srcdir}/PyQt-x11-gpl-${pkgver} - patch -Np1 -i ${srcdir}/PyQt-x11-gpl-3.18.1-configure.patch . /etc/profile.d/qt3.sh echo yes | python2 configure.py -b /usr/bin \ -d /usr/lib/python2.7/site-packages \ diff --git a/community/pyqt3/PyQt-x11-gpl-3.18.1-configure.patch b/community/pyqt3/PyQt-x11-gpl-3.18.1-configure.patch deleted file mode 100644 index 66150ba72..000000000 --- a/community/pyqt3/PyQt-x11-gpl-3.18.1-configure.patch +++ /dev/null @@ -1,37 +0,0 @@ ---- PyQt-x11-gpl-3.18.1.orig/configure.py 2009-06-16 03:47:29.000000000 -0500 -+++ PyQt-x11-gpl-3.18.1/configure.py 2012-12-27 08:45:18.859375913 -0500 -@@ -258,27 +258,27 @@ - } - - def code(self, extra_include_dirs, extra_lib_dir, extra_libs): -- generate_code("qt", extra_include_dirs=extra_include_dirs, extra_lib_dir=extra_lib_dir, extra_libs=extra_libs) -+ generate_code("qt", extra_include_dirs=extra_include_dirs, extra_lib_dir=extra_lib_dir, extra_libs=extra_libs, extra_cxxflags="-DANY=void") - - if "qtext" in pyqt_modules: -- generate_code("qtext", extra_define=qsci_define, extra_include_dirs=[opt_qsciincdir], extra_lib_dir=opt_qscilibdir, extra_libs=["qscintilla"], sip_flags=qtext_sip_flags) -+ generate_code("qtext", extra_define=qsci_define, extra_include_dirs=[opt_qsciincdir], extra_lib_dir=opt_qscilibdir, extra_libs=["qscintilla"], sip_flags=qtext_sip_flags, extra_cxxflags="-DANY=void") - - if "qtgl" in pyqt_modules: -- generate_code("qtgl", opengl=1) -+ generate_code("qtgl", opengl=1, extra_cxxflags="-DANY=void") - - if "qtpe" in pyqt_modules: -- generate_code("qtpe", extra_libs=["qpe"], sip_flags=qtpe_sip_flags) -+ generate_code("qtpe", extra_libs=["qpe"], sip_flags=qtpe_sip_flags, extra_cxxflags="-DANY=void") - - if "qtui" in pyqt_modules: -- generate_code("qtui", extra_libs=["qui"]) -+ generate_code("qtui", extra_libs=["qui"], extra_cxxflags="-DANY=void") - - if "qtaxcontainer" in pyqt_modules: -- generate_code("qtaxcontainer", extra_libs=["qaxcontainer"]) -+ generate_code("qtaxcontainer", extra_libs=["qaxcontainer"], extra_cxxflags="-DANY=void") - - # The rest don't need special handling. - for m in ("qtcanvas", "qtnetwork", "qtsql", "qttable", "qtxml"): - if m in pyqt_modules: -- generate_code(m) -+ generate_code(m, extra_cxxflags="-DANY=void") - - def tools(self): - tool_dirs = [] |