--- /dev/null
+diff -up PyQt-x11-gpl-4.4.4/configure.py.64bit PyQt-x11-gpl-4.4.4/configure.py
+--- PyQt-x11-gpl-4.4.4/configure.py.64bit 2008-11-08 05:55:49.000000000 -0600
++++ PyQt-x11-gpl-4.4.4/configure.py 2008-11-10 14:01:14.000000000 -0600
+@@ -756,16 +756,15 @@ include(%s)
+ else:
+ # Use distutils to get the additional configuration.
+ from distutils.sysconfig import get_config_vars
++ from distutils.sysconfig import get_python_lib
+ ducfg = get_config_vars()
+
+ if sys.platform == "darwin":
+ # We need to work out how to specify the right framework
+ # version.
+ link = "-framework Python"
+- elif ("--enable-shared" in ducfg.get("CONFIG_ARGS", "") and
+- glob.glob("%s/lib/libpython%d.%d*" % (ducfg["exec_prefix"], py_major, py_minor))):
+- lib_dir_flag = quote("-L%s/lib" % ducfg["exec_prefix"])
+- link = "%s -lpython%d.%d" % (lib_dir_flag, py_major, py_minor)
++ elif ("--enable-shared" in ducfg.get("CONFIG_ARGS", "") ):
++ link = "-L%s -lpython%d.%d" % (get_python_lib(plat_specific=1, standard_lib=1), py_major, py_minor)
+ else:
+ sipconfig.inform("Qt Designer plugin disabled because Python library is static")
+ opts.designer_plugin = False
--- /dev/null
+diff -up PyQt-x11-gpl-4.5.1/pyuic/uic/pyuic.py.shbang PyQt-x11-gpl-4.5.1/pyuic/uic/pyuic.py
+--- PyQt-x11-gpl-4.5.1/pyuic/uic/pyuic.py.shbang 2009-06-16 03:37:46.000000000 -0500
++++ PyQt-x11-gpl-4.5.1/pyuic/uic/pyuic.py 2009-07-02 14:01:44.218147410 -0500
+@@ -1,3 +1,5 @@
++#!/usr/bin/python -tt
++
+ import sys
+ import optparse
+
--- /dev/null
+diff -up PyQt-x11-gpl-4.5.2/configure.py.QT_SHARED PyQt-x11-gpl-4.5.2/configure.py
+--- PyQt-x11-gpl-4.5.2/configure.py.QT_SHARED 2009-07-16 08:34:48.419358104 -0500
++++ PyQt-x11-gpl-4.5.2/configure.py 2009-07-16 08:34:54.260358064 -0500
+@@ -1679,11 +1679,11 @@ int main(int, char **)
+
+ out << QLibraryInfo::licensee() << '\\n';
+
+-#if defined(QT_SHARED) || defined(QT_DLL)
++//#if defined(QT_SHARED) || defined(QT_DLL)
+ out << "shared\\n";
+-#else
+- out << "\\n";
+-#endif
++//#else
++// out << "\\n";
++//#endif
+
+ // Determine which features should be disabled.
+
--- /dev/null
+diff -up PyQt-x11-gpl-4.6.2/pyrcc/rcc.cpp.orig PyQt-x11-gpl-4.6.2/pyrcc/rcc.cpp
+--- PyQt-x11-gpl-4.6.2/pyrcc/rcc.cpp.orig 2010-02-23 12:33:44.000000000 +0100
++++ PyQt-x11-gpl-4.6.2/pyrcc/rcc.cpp 2010-02-23 12:45:03.000000000 +0100
+@@ -399,8 +399,7 @@ RCCResourceLibrary::writeHeader(FILE *ou
+ fprintf(out, "# -*- coding: utf-8 -*-\n\n");
+ fprintf(out, "# Resource object code\n");
+ fprintf(out, "#\n");
+- fprintf(out, "# Created: %s\n", QDateTime::currentDateTime().toString().toLatin1().constData());
+- fprintf(out, "# by: The Resource Compiler for PyQt (Qt v%s)\n", QT_VERSION_STR);
++ fprintf(out, "# Created by: The Resource Compiler for PyQt (Qt v%s)\n", QT_VERSION_STR);
+ fprintf(out, "#\n");
+ fprintf(out, "# WARNING! All changes made in this file will be lost!\n");
+ fprintf(out, "\n");
--- /dev/null
+diff -up PyQt-x11-gpl-4.7.2/configure.py.fix-implicit-linking PyQt-x11-gpl-4.7.2/configure.py
+--- PyQt-x11-gpl-4.7.2/configure.py.fix-implicit-linking 2010-03-18 07:08:13.000000000 -0500
++++ PyQt-x11-gpl-4.7.2/configure.py 2010-03-18 07:09:46.157734414 -0500
+@@ -1173,7 +1173,7 @@ def compile_qt_program(name, mname, extr
+ opengl = (mname == "QtOpenGL")
+
+ qt = [mname]
+- if mname in ("QtOpenGL", "QtWebKit"):
++ if mname in ("QtOpenGL", "QtWebKit", "QtAssistant", "QtHelp"):
+ qt.append("QtCore")
+
+ makefile = sipconfig.ProgramMakefile(sipcfg, console=1, qt=qt, warnings=0,
--- /dev/null
+###############################################################################
+# #
+# IPFire.org - A linux based firewall #
+# Copyright (C) 2007, 2008 Michael Tremer & Christian Schmidt #
+# #
+# This program is free software: you can redistribute it and/or modify #
+# it under the terms of the GNU General Public License as published by #
+# the Free Software Foundation, either version 3 of the License, or #
+# (at your option) any later version. #
+# #
+# This program is distributed in the hope that it will be useful, #
+# but WITHOUT ANY WARRANTY; without even the implied warranty of #
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the #
+# GNU General Public License for more details. #
+# #
+# You should have received a copy of the GNU General Public License #
+# along with this program. If not, see <http://www.gnu.org/licenses/>. #
+# #
+###############################################################################
+
+###############################################################################
+# Definitions
+###############################################################################
+
+include $(PKGROOT)/Include
+
+PKG_NAME = pyQt
+PKG_VER = 4.7.4
+PKG_REL = 0
+
+PKG_MAINTAINER =
+PKG_GROUP = Development/Languages
+PKG_URL = http://www.riverbankcomputing.com/software/pyqt/
+PKG_LICENSE = GPLv3 or GPLv2 with exceptions
+PKG_SUMMARY = Python bindings for Qt4.
+
+PKG_BUILD_DEPS+= sip
+PKG_DEPS += python qt
+
+define PKG_DESCRIPTION
+ Python bindings for Qt4
+endef
+
+PKG_TARBALL = PyQt-x11-gpl-$(PKG_VER).tar.gz
+
+DIR_APP = $(DIR_SRC)/PyQt-x11-gpl-$(PKG_VER)
+
+define STAGE_BUILD
+ cd $(DIR_APP) && python configure.py \
+ --confirm-license \
+ --verbose
+
+ cd $(DIR_APP) && make $(PARALLELISMFLAGS)
+endef
+
+STAGE_INSTALLTARGET += INSTALL_ROOT=$(BUILDROOT)
projects / ipfire-3.x.git / commitdiff
