bakabtw/packages
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

pyqt4: Update to latest stable

Browse Source 
git-svn-id: svn://svn.openwrt.org/openwrt/packages@26121 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
mb 2011-03-13 15:27:56 +00:00
parent ff77489658
commit 4b35585a4a
4 changed files with 59 additions and 63 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lang/pyqt4/Makefile
View File

@ -8,12 +8,12 @@
include $(TOPDIR)/rules.mk include $(TOPDIR)/rules.mk
PKG_NAME:=pyqt4 PKG_NAME:=pyqt4
PKG_VERSION:=4.7.4 PKG_VERSION:=4.8.3
PKG_RELEASE:=1 PKG_RELEASE:=1
PKG_SOURCE:=PyQt-x11-gpl-$(PKG_VERSION).tar.gz PKG_SOURCE:=PyQt-x11-gpl-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=http://bu3sch.de/pyqt4/ PKG_SOURCE_URL:=http://bu3sch.de/pyqt4/
PKG_MD5SUM:=88e9f1bc467cccf424d2032e3470982c PKG_MD5SUM:=d54fd1c37a74864faf42709c8102f254
PKG_BUILD_DIR:=$(BUILD_DIR)/PyQt-x11-gpl-$(PKG_VERSION) PKG_BUILD_DIR:=$(BUILD_DIR)/PyQt-x11-gpl-$(PKG_VERSION)
PKG_INSTALL:=1 PKG_INSTALL:=1
PKG_BUILD_PARALLEL:=1 PKG_BUILD_PARALLEL:=1

76
lang/pyqt4/patches/100-cross-compile.patch
View File

@ -1,12 +1,8 @@
--- Index: PyQt-x11-gpl-4.8.3/configure.py
configure.py | 218 ++++++++++++++++++++++++++++++++++++++++-------------------
1 file changed, 149 insertions(+), 69 deletions(-)
Index: PyQt-x11-gpl-4.7.4/configure.py
=================================================================== ===================================================================
--- PyQt-x11-gpl-4.7.4.orig/configure.py 2010-07-12 12:41:15.000000000 +0200 --- PyQt-x11-gpl-4.8.3.orig/configure.py 2011-01-23 11:08:20.000000000 +0100
+++ PyQt-x11-gpl-4.7.4/configure.py 2010-10-27 12:30:01.000000000 +0200 +++ PyQt-x11-gpl-4.8.3/configure.py 2011-03-13 15:03:08.279673485 +0100
@@ -33,6 +33,7 @@ @@ -33,6 +33,7 @@ import os
import glob import glob
import optparse import optparse
import shutil import shutil
@ -14,9 +10,9 @@ Index: PyQt-x11-gpl-4.7.4/configure.py
import sipconfig import sipconfig
@@ -173,25 +174,17 @@ @@ -184,25 +185,17 @@ def create_optparser():
metavar="PLUGIN", dest="staticplugins", help="add PLUGIN to the " "in the header comments of generated code [default: include "
"list be linked (if Qt is built as static libraries)") "timestamps]")
- if sys.platform != 'win32': - if sys.platform != 'win32':
- if sys.platform in ('linux2', 'darwin'): - if sys.platform in ('linux2', 'darwin'):
@ -51,7 +47,7 @@ Index: PyQt-x11-gpl-4.7.4/configure.py
g.add_option("-s", "--dbus", action="callback", metavar="DIR", g.add_option("-s", "--dbus", action="callback", metavar="DIR",
dest="pydbusincdir", callback=store_abspath_dir, type="string", dest="pydbusincdir", callback=store_abspath_dir, type="string",
@@ -199,13 +192,13 @@ @@ -210,13 +203,13 @@ def create_optparser():
"[default: supplied by pkg-config]") "[default: supplied by pkg-config]")
p.add_option_group(g) p.add_option_group(g)
@ -72,7 +68,7 @@ Index: PyQt-x11-gpl-4.7.4/configure.py
# Installation. # Installation.
g = optparse.OptionGroup(p, title="Installation") g = optparse.OptionGroup(p, title="Installation")
@@ -264,12 +257,42 @@ @@ -275,12 +268,42 @@ def create_optparser():
"QTDIR/qsci]") "QTDIR/qsci]")
p.add_option_group(g) p.add_option_group(g)
@ -116,7 +112,7 @@ Index: PyQt-x11-gpl-4.7.4/configure.py
""" """
def __init__(self): def __init__(self):
@@ -282,6 +305,8 @@ @@ -294,6 +317,8 @@ class pyrccMakefile(sipconfig.ProgramMak
def generate_target_default(self, mfile): def generate_target_default(self, mfile):
"""Generate the default target.""" """Generate the default target."""
sipconfig.ProgramMakefile.generate_target_default(self, mfile) sipconfig.ProgramMakefile.generate_target_default(self, mfile)
@ -125,7 +121,7 @@ Index: PyQt-x11-gpl-4.7.4/configure.py
# The correct call to pyrcc depends on the Python version. # The correct call to pyrcc depends on the Python version.
if sys.hexversion >= 0x03000000: if sys.hexversion >= 0x03000000:
@@ -772,7 +797,7 @@ @@ -807,7 +832,7 @@ include(%s)
f.close() f.close()
@ -134,7 +130,7 @@ Index: PyQt-x11-gpl-4.7.4/configure.py
os.chdir(cwd) os.chdir(cwd)
sipconfig.inform("Creating QPy support libraries Makefile...") sipconfig.inform("Creating QPy support libraries Makefile...")
@@ -825,12 +850,16 @@ @@ -861,12 +886,16 @@ include(%s)
# not on Windows (so that normal console use will work). # not on Windows (so that normal console use will work).
sipconfig.inform("Creating pyuic4 wrapper...") sipconfig.inform("Creating pyuic4 wrapper...")
@ -153,17 +149,17 @@ Index: PyQt-x11-gpl-4.7.4/configure.py
+ gui = False + gui = False
+ use_arch = '' + use_arch = ''
uicdir=os.path.join(pyqt_modroot, "uic") # The pyuic directory may not exist if we are building away from the
wrapper = sipconfig.create_wrapper(os.path.join(uicdir, "pyuic.py"), os.path.join("pyuic", "pyuic4"), gui, use_arch) # source directory.
@@ -880,6 +909,7 @@ @@ -926,6 +955,7 @@ include(%s)
py_major = sipcfg.py_version >> 16
py_minor = (sipcfg.py_version >> 8) & 0x0ff abi = getattr(sys, 'abiflags', '')
+ print "FIXME CROSSCOMPILE" #FIXME: Crosscompile + print "FIXME CROSSCOMPILE" #FIXME: Crosscompile
if sys.platform == 'win32': if sys.platform == 'win32':
# Use abiflags in case it is supported in a future version.
lib_dir_flag = quote("-L%s" % sipcfg.py_lib_dir) lib_dir_flag = quote("-L%s" % sipcfg.py_lib_dir)
link = "%s -lpython%d%d" % (lib_dir_flag, py_major, py_minor) @@ -988,7 +1018,7 @@ include(%s)
@@ -938,7 +968,7 @@
fout.write(prj) fout.write(prj)
fout.close() fout.close()
@ -172,7 +168,7 @@ Index: PyQt-x11-gpl-4.7.4/configure.py
os.chdir(cwd) os.chdir(cwd)
tool.append("designer") tool.append("designer")
@@ -1056,6 +1086,14 @@ @@ -1106,6 +1136,14 @@ def create_config(module, template, macr
sipconfig.create_config_module(module, template, content, macros) sipconfig.create_config_module(module, template, content, macros)
@ -184,10 +180,10 @@ Index: PyQt-x11-gpl-4.7.4/configure.py
+ spec = "" + spec = ""
+ run_command(pfx + " " + opts.qmake + " " + spec + " " + args) + run_command(pfx + " " + opts.qmake + " " + spec + " " + args)
+ +
def run_command(cmd): def run_command(cmd, envvars=None):
"""Run a command and display the output if verbose mode is enabled. """Run a command and display the output if verbose mode is enabled.
@@ -1272,30 +1310,38 @@ @@ -1334,30 +1372,38 @@ def check_dbus():
""" """
sipconfig.inform("Checking to see if the dbus support module should be built...") sipconfig.inform("Checking to see if the dbus support module should be built...")
@ -247,7 +243,7 @@ Index: PyQt-x11-gpl-4.7.4/configure.py
# Try and find dbus-python.h. We don't use pkg-config because it is broken # Try and find dbus-python.h. We don't use pkg-config because it is broken
# for dbus-python (at least for versions up to and including v0.81.0). # for dbus-python (at least for versions up to and including v0.81.0).
@@ -1381,6 +1427,7 @@ @@ -1443,6 +1489,7 @@ def set_sip_flags(pyqt):
pyqt is the configuration instance. pyqt is the configuration instance.
""" """
@ -255,19 +251,19 @@ Index: PyQt-x11-gpl-4.7.4/configure.py
# If we don't check for signed interpreters, we exclude the 'VendorID' # If we don't check for signed interpreters, we exclude the 'VendorID'
# feature # feature
if not opts.vendorcheck: if not opts.vendorcheck:
@@ -1525,7 +1572,10 @@ @@ -1588,7 +1635,10 @@ def generate_code(mname, extra_include_d
needed_qt_libs(mname, qt_libs) needed_qt_libs(mname, qt_libs)
# Build the SIP command line. Keyword argument support is enabled. # Build the SIP command line.
- argv = ['"' + sipcfg.sip_bin + '"', '-k'] - argv = ['"' + sipcfg.sip_bin + '"', '-w']
+ sip_bin = sipcfg.sip_bin + sip_bin = sipcfg.sip_bin
+ if opts.host_sip_bin: + if opts.host_sip_bin:
+ sip_bin = opts.host_sip_bin + sip_bin = opts.host_sip_bin
+ argv = ['"' + sip_bin + '"', '-k'] + argv = ['"' + sip_bin + '"', '-w']
if not opts.no_docstrings: if opts.no_timestamp:
argv.append("-o"); argv.append("-T")
@@ -1779,6 +1829,8 @@ @@ -1890,6 +1940,8 @@ def check_qt_installation(macros):
def fix_qmake_args(args=""): def fix_qmake_args(args=""):
"""Make any platform specific adjustments to the arguments passed to qmake. """Make any platform specific adjustments to the arguments passed to qmake.
""" """
@ -276,7 +272,7 @@ Index: PyQt-x11-gpl-4.7.4/configure.py
if sys.platform == "darwin": if sys.platform == "darwin":
# The Qt binary installer has macx-xcode as the default. # The Qt binary installer has macx-xcode as the default.
args = "-spec %s %s" % (sipcfg.platform, args) args = "-spec %s %s" % (sipcfg.platform, args)
@@ -1930,7 +1982,7 @@ @@ -2041,7 +2093,7 @@ int main(int, char **)
# Create the makefile, first making sure it doesn't already exist. # Create the makefile, first making sure it doesn't already exist.
remove_file(make_file) remove_file(make_file)
@ -285,7 +281,7 @@ Index: PyQt-x11-gpl-4.7.4/configure.py
if not os.access(make_file, os.F_OK): if not os.access(make_file, os.F_OK):
sipconfig.error("%s failed to create a makefile. %s" % (opts.qmake, MSG_CHECK_QMAKE)) sipconfig.error("%s failed to create a makefile. %s" % (opts.qmake, MSG_CHECK_QMAKE))
@@ -1952,15 +2004,30 @@ @@ -2063,15 +2115,30 @@ int main(int, char **)
if not os.access(exe_file, os.X_OK): if not os.access(exe_file, os.X_OK):
sipconfig.error("Failed to determine the layout of your Qt installation. Try again using the --verbose flag to see more detail about the problem.") sipconfig.error("Failed to determine the layout of your Qt installation. Try again using the --verbose flag to see more detail about the problem.")
@ -323,7 +319,7 @@ Index: PyQt-x11-gpl-4.7.4/configure.py
lines = f.read().strip().split("\n") lines = f.read().strip().split("\n")
f.close() f.close()
@@ -2022,6 +2089,24 @@ @@ -2136,6 +2203,24 @@ int main(int, char **)
sipconfig.error("Qt has been built as static libraries so either the -g or -k argument should be used.") sipconfig.error("Qt has been built as static libraries so either the -g or -k argument should be used.")
@ -348,8 +344,8 @@ Index: PyQt-x11-gpl-4.7.4/configure.py
def main(): def main():
"""Create the configuration module module. """Create the configuration module module.
""" """
@@ -2036,7 +2121,7 @@ @@ -2154,7 +2239,7 @@ def main():
opts, args = p.parse_args() opts.no_timestamp = False
# Provide defaults for platform-specific options. # Provide defaults for platform-specific options.
- if sys.platform == 'win32': - if sys.platform == 'win32':
@ -357,7 +353,7 @@ Index: PyQt-x11-gpl-4.7.4/configure.py
opts.qmake = find_default_qmake() opts.qmake = find_default_qmake()
opts.prot_is_public = False opts.prot_is_public = False
@@ -2069,12 +2154,14 @@ @@ -2187,12 +2272,14 @@ def main():
# Install the API file if the default directory exists. # Install the API file if the default directory exists.
opts.api = os.path.isdir(opts.qscidir) opts.api = os.path.isdir(opts.qscidir)

4
lang/python-sip/Makefile
View File

@ -8,12 +8,12 @@
include $(TOPDIR)/rules.mk include $(TOPDIR)/rules.mk
PKG_NAME:=python-sip PKG_NAME:=python-sip
PKG_VERSION:=4.10.5 PKG_VERSION:=4.12.1
PKG_RELEASE:=1 PKG_RELEASE:=1
PKG_SOURCE:=sip-$(PKG_VERSION).tar.gz PKG_SOURCE:=sip-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=http://bu3sch.de/pyqt4/ PKG_SOURCE_URL:=http://bu3sch.de/pyqt4/
PKG_MD5SUM:=0a591ef6e59aa16e56822d3eb9fe21b8 PKG_MD5SUM:=0f8e8305b14c1812191de2e0ee22fea9
PKG_INSTALL:=1 PKG_INSTALL:=1
PKG_BUILD_PARALLEL:=1 PKG_BUILD_PARALLEL:=1
HOST_BUILD_PARALLEL:=1 HOST_BUILD_PARALLEL:=1

38
lang/python-sip/patches/100-cross-compile.patch
View File

@ -2,11 +2,11 @@
configure.py | 52 ++++++++++++++++++++++++++++++++++++++++++++-------- configure.py | 52 ++++++++++++++++++++++++++++++++++++++++++++--------
1 file changed, 44 insertions(+), 8 deletions(-) 1 file changed, 44 insertions(+), 8 deletions(-)
Index: sip-4.10.5/configure.py Index: sip-4.12.1/configure.py
=================================================================== ===================================================================
--- sip-4.10.5.orig/configure.py 2010-07-16 16:15:08.000000000 +0200 --- sip-4.12.1.orig/configure.py 2011-01-22 14:47:21.000000000 +0100
+++ sip-4.10.5/configure.py 2010-10-26 16:07:37.000000000 +0200 +++ sip-4.12.1/configure.py 2011-03-13 14:53:54.056261960 +0100
@@ -19,7 +19,6 @@ @@ -19,7 +19,6 @@ import sys
import os import os
import glob import glob
import optparse import optparse
@ -14,7 +14,7 @@ Index: sip-4.10.5/configure.py
import siputils import siputils
@@ -193,21 +192,45 @@ @@ -197,21 +196,45 @@ def set_platform_directories():
global plat_py_site_dir, plat_py_inc_dir, plat_py_conf_inc_dir global plat_py_site_dir, plat_py_inc_dir, plat_py_conf_inc_dir
global plat_bin_dir, plat_py_lib_dir, plat_sip_dir global plat_bin_dir, plat_py_lib_dir, plat_sip_dir
@ -73,8 +73,8 @@ Index: sip-4.10.5/configure.py
+ siputils.error("Need to specify all --py-... options for crosscompile.") + siputils.error("Need to specify all --py-... options for crosscompile.")
def create_config(module, template, macros): def patch_files():
@@ -302,6 +325,11 @@ @@ -337,6 +360,11 @@ def create_optparser():
def store_abspath(option, opt_str, value, parser): def store_abspath(option, opt_str, value, parser):
setattr(parser.values, option.dest, os.path.abspath(value)) setattr(parser.values, option.dest, os.path.abspath(value))
@ -86,7 +86,7 @@ Index: sip-4.10.5/configure.py
p = optparse.OptionParser(usage="python %prog [opts] [macro=value] " p = optparse.OptionParser(usage="python %prog [opts] [macro=value] "
"[macro+=value]", version=sip_version_str) "[macro+=value]", version=sip_version_str)
@@ -369,9 +397,62 @@ @@ -411,9 +439,62 @@ def create_optparser():
"are normally installed [default: %s]" % default_sipsipdir) "are normally installed [default: %s]" % default_sipsipdir)
p.add_option_group(g) p.add_option_group(g)
@ -149,7 +149,7 @@ Index: sip-4.10.5/configure.py
def main(argv): def main(argv):
"""Create the configuration module module. """Create the configuration module module.
@@ -382,9 +463,6 @@ @@ -424,9 +505,6 @@ def main(argv):
if py_version < 0x020300: if py_version < 0x020300:
siputils.error("This version of SIP requires Python v2.3 or later.") siputils.error("This version of SIP requires Python v2.3 or later.")
@ -159,7 +159,7 @@ Index: sip-4.10.5/configure.py
# Build up the list of valid specs. # Build up the list of valid specs.
for s in os.listdir(os.path.join(src_dir, "specs")): for s in os.listdir(os.path.join(src_dir, "specs")):
platform_specs.append(s) platform_specs.append(s)
@@ -396,6 +474,9 @@ @@ -438,6 +516,9 @@ def main(argv):
p = create_optparser() p = create_optparser()
opts, args = p.parse_args() opts, args = p.parse_args()
@ -169,7 +169,7 @@ Index: sip-4.10.5/configure.py
# Make sure MacOS specific options get initialised. # Make sure MacOS specific options get initialised.
if sys.platform != 'darwin': if sys.platform != 'darwin':
opts.universal = '' opts.universal = ''
@@ -434,14 +515,16 @@ @@ -477,14 +558,16 @@ def main(argv):
else: else:
opts.universal = '' opts.universal = ''
@ -179,7 +179,7 @@ Index: sip-4.10.5/configure.py
- args) - args)
- -
- if macros is None: - if macros is None:
- p.print_help() - siputils.error("Unsupported macro name specified. Use the --show-build-macros flag to see a list of supported macros.")
- sys.exit(2) - sys.exit(2)
+ if opts.sipconfig_macros: + if opts.sipconfig_macros:
+ macros = load_sipconfig_macros(opts.sipconfig_macros) + macros = load_sipconfig_macros(opts.sipconfig_macros)
@ -189,16 +189,16 @@ Index: sip-4.10.5/configure.py
+ os.path.join(src_dir, "specs", opts.platform), build_macro_names, + os.path.join(src_dir, "specs", opts.platform), build_macro_names,
+ args) + args)
+ if macros is None: + if macros is None:
+ p.print_help() + siputils.error("Unsupported macro name specified. Use the --show-build-macros flag to see a list of supported macros.")
+ sys.exit(2) + sys.exit(2)
# Tell the user what's been found. # Fix the name of the sip module.
inform_user() global sip_module_base
Index: sip-4.10.5/siputils.py Index: sip-4.12.1/siputils.py
=================================================================== ===================================================================
--- sip-4.10.5.orig/siputils.py 2010-07-16 16:07:33.000000000 +0200 --- sip-4.12.1.orig/siputils.py 2011-01-22 14:45:38.000000000 +0100
+++ sip-4.10.5/siputils.py 2010-10-26 16:02:14.000000000 +0200 +++ sip-4.12.1/siputils.py 2011-03-13 14:50:38.523221990 +0100
@@ -1026,9 +1026,11 @@ @@ -1044,9 +1044,11 @@ class Makefile:
for f in self.optional_list("DEFINES"): for f in self.optional_list("DEFINES"):
cppflags.append("-D" + f) cppflags.append("-D" + f)