# # Patch managed by http://www.holgerschurig.de/patcher.html # --- PyQt4-gpl-4.0beta1/configure.py~cross-compile.patch +++ PyQt4-gpl-4.0beta1/configure.py @@ -471,7 +471,7 @@ sipconfig.error("Unable to create the %s directory." % mname) # Build the SIP command line. - argv = ['"' + sipcfg.sip_bin + '"'] + argv = ['"' + sipcfg.sip_bin + '4"'] argv.extend(qt_sip_flags) @@ -846,7 +846,15 @@ """Set the qt_dir, qt_incdir, qt_libdir, qt_bindir and qt_datadir globals for the Qt installation. """ - sipconfig.inform("Determining the layout of your Qt installation...") + sipconfig.inform("Determining the layout of your Qt installation... - patched for OpenEmbedded by :M:") + + global qt_dir, qt_incdir, qt_libdir, qt_bindir, qt_datadir + qt_dir = os.getenv( "QTDIR" ) + qt_incdir = "%s/include" % qt_dir + qt_libdir = "%s/lib" % qt_dir + qt_bindir = "%s/bin" % qt_dir + qt_datadir = "%s/share" % qt_dir + return if not opt_qmake: sipconfig.error("Make sure you have a working Qt v4 qmake on your PATH or use the -q argument to explicitly specify a working Qt v4 qmake.") http://thread.gmane.org/gmane.comp.handhelds.openembedded/21326 http://thread.gmane.org/gmane.comp.handhelds.openembedded/21816 Signed-off-by: Denys Dmytriyenko <denis@denix.org> Acked-by: Mike Westerhof <mwester@dls.net> Acked-by: Philip Balister <philip@balister.org> Acked-by: Khem Raj <raj.khem@gmail.com> Acked-by: Marcin Juszkiewicz <hrw@openembedded.org> Acked-by: Koen Kooi <koen@openembedded.org> Acked-by: Frans Meulenbroeks <fransmeulenbroeks@gmail.com> mtn2git: remove .mtn2git_empty files in non-empty directories 2008-10-15T13:27:49+00:00 Jan Luebbe jluebbe@debian.org 2008-10-15T13:26:10+00:00 869ba9e1fb2237b75560feed13545a35f3c3569d

xorg mega commit: merge in change from poky 2007-08-02T07:15:30+00:00 Koen Kooi koen@openembedded.org 2007-08-02T07:15:30+00:00 b3e110eff605bd2361ea92bd748f59e48d508f33

xrandr: fix uclibc build (from Poky) 2007-05-30T10:03:42+00:00 Marcin Juszkiewicz hrw@openembedded.org 2007-05-30T10:03:42+00:00 2a63faf24bf2c3880138734f2f14c4b2f81fd5d2