Update to wxPython-2.8.12.0.
Based on a diff for 2.8.11.0 by rpointel@ Tested in a bulk build by landry@ OK rpointel@, landry@, alek@ (maintainer)
This commit is contained in:
dcoppa
parent
9637d13311
commit
84126e0d3f
@ -1,13 +1,12 @@
|
||||
# $OpenBSD: Makefile,v 1.10 2010/11/22 08:37:04 espie Exp $
|
||||
# $OpenBSD: Makefile,v 1.11 2011/05/22 08:21:34 dcoppa Exp $
|
||||
|
||||
SHARED_ONLY= Yes
|
||||
|
||||
COMMENT= Python bindings for wxWidgets C++ class library
|
||||
|
||||
V= 2.8.6.0
|
||||
V= 2.8.12.0
|
||||
DISTNAME= wxPython-src-$V
|
||||
PKGNAME= py-wxPython-$V
|
||||
REVISION= 1
|
||||
CATEGORIES= x11 devel
|
||||
|
||||
HOMEPAGE= http://www.wxpython.org/
|
||||
@ -24,17 +23,20 @@ MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=wxpython/}
|
||||
EXTRACT_SUFX= .tar.bz2
|
||||
|
||||
MODULES= lang/python
|
||||
LIB_DEPENDS= x11/wxWidgets>=2.8.6
|
||||
LIB_DEPENDS= x11/wxWidgets>=2.8.12
|
||||
WANTLIB += wx_gtk2_aui wx_gtk2_richtext wx_gtk2_gizmos wx_gtk2_stc \
|
||||
wx_base_xml wx_gtk2_qa wx_base_odbc wx_gtk2_html \
|
||||
wx_gtk2_gl wx_base wx_gtk2_adv wx_gtk2_xrc wx_gtk2_core \
|
||||
wx_base_net wx_gtk2_dbgrid
|
||||
wx_base_net wx_gtk2_dbgrid m stdc++
|
||||
|
||||
WRKSRC= ${WRKDIST}/wxPython
|
||||
|
||||
SUBST_VARS += WRKINST
|
||||
|
||||
NO_REGRESS= Yes
|
||||
|
||||
pre-build:
|
||||
@perl -pi -e "s,!!WRKINST!!,${WRKINST},g" ${WRKSRC}/config.py
|
||||
${SUBST_CMD} ${WRKSRC}/config.py
|
||||
|
||||
post-install:
|
||||
${INSTALL_DATA_DIR} ${PREFIX}/share/examples/py-wxPython
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
MD5 (wxPython-src-2.8.6.0.tar.bz2) = llnW3QQ4NH2e5L3bie+rvw==
|
||||
RMD160 (wxPython-src-2.8.6.0.tar.bz2) = yTVzBAtav+Pma0BBq3lUJNp5h5s=
|
||||
SHA1 (wxPython-src-2.8.6.0.tar.bz2) = 2iulsQ1wivmkc13yq5iK8y42fmQ=
|
||||
SHA256 (wxPython-src-2.8.6.0.tar.bz2) = uEsMDA2aZbaA6b1VT8li9b/NxzEWjNp8yfMHhNEEbRc=
|
||||
SIZE (wxPython-src-2.8.6.0.tar.bz2) = 25192541
|
||||
MD5 (wxPython-src-2.8.12.0.tar.bz2) = QC4LgeBvWW2EniIaenasxg==
|
||||
RMD160 (wxPython-src-2.8.12.0.tar.bz2) = ZCCo5uWThrNErAWENaSuZpPCwEs=
|
||||
SHA1 (wxPython-src-2.8.12.0.tar.bz2) = +c6AbctVF76249LuDsv45Wm3+OQ=
|
||||
SHA256 (wxPython-src-2.8.12.0.tar.bz2) = bV6CdyuHmBwqDXjXoIs6RJhSkSe+LwUBaJLohm6Yur0=
|
||||
SIZE (wxPython-src-2.8.12.0.tar.bz2) = 31156191
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
$OpenBSD: patch-wxPython_config_py,v 1.2 2007/10/23 11:45:14 steven Exp $
|
||||
$OpenBSD: patch-wxPython_config_py,v 1.3 2011/05/22 08:21:34 dcoppa Exp $
|
||||
--- wxPython/config.py.orig Wed Oct 3 11:20:46 2007
|
||||
+++ wxPython/config.py Wed Oct 3 11:21:52 2007
|
||||
@@ -121,7 +121,7 @@ UNDEF_NDEBUG = 1 # Python 2.2 on Unix/Linux by defau
|
||||
@@ -132,7 +132,7 @@ UNDEF_NDEBUG = 1 # Python 2.2 on Unix/Linux by defau
|
||||
NO_SCRIPTS = 0 # Don't install the tool scripts
|
||||
NO_HEADERS = 0 # Don't install the wxPython *.h and *.i files
|
||||
|
||||
@ -10,7 +10,7 @@ $OpenBSD: patch-wxPython_config_py,v 1.2 2007/10/23 11:45:14 steven Exp $
|
||||
# can co-exist. When turned on the wx and wxPython
|
||||
# pacakges will be installed in a versioned subdir
|
||||
# of site-packages, and a *.pth file will be
|
||||
@@ -134,7 +134,7 @@ INSTALL_MULTIVERSION = 1 # Install the packages such t
|
||||
@@ -145,7 +145,7 @@ INSTALL_MULTIVERSION = 1 # Install the packages such t
|
||||
FLAVOUR = "" # Optional flavour string to be appended to VERSION
|
||||
# in MULTIVERSION installs
|
||||
|
||||
@ -19,16 +19,16 @@ $OpenBSD: patch-wxPython_config_py,v 1.2 2007/10/23 11:45:14 steven Exp $
|
||||
# ansi/unicode settings can optionally be added to the
|
||||
# subdir path used in site-packages
|
||||
|
||||
@@ -486,7 +486,7 @@ class wx_install_headers(distutils.command.install_hea
|
||||
@@ -520,7 +520,7 @@ class wx_install_headers(distutils.command.install_hea
|
||||
if not headers:
|
||||
return
|
||||
|
||||
- root = self.root
|
||||
+ root = "!!WRKINST!!"
|
||||
+ root = '${WRKINST}'
|
||||
#print "WXPREFIX is %s, root is %s" % (WXPREFIX, root)
|
||||
# hack for universal builds, which append i386/ppc
|
||||
# to the root
|
||||
@@ -495,7 +495,7 @@ class wx_install_headers(distutils.command.install_hea
|
||||
@@ -529,7 +529,7 @@ class wx_install_headers(distutils.command.install_hea
|
||||
for header, location in headers:
|
||||
install_dir = os.path.normpath(root +
|
||||
WXPREFIX +
|
||||
@ -37,16 +37,16 @@ $OpenBSD: patch-wxPython_config_py,v 1.2 2007/10/23 11:45:14 steven Exp $
|
||||
location)
|
||||
self.mkpath(install_dir)
|
||||
(out, _) = self.copy_file(header, install_dir)
|
||||
@@ -549,7 +549,7 @@ def find_data_files(srcdir, *wildcards):
|
||||
@@ -594,7 +594,7 @@ def find_data_files(srcdir, *wildcards, **kw):
|
||||
|
||||
def makeLibName(name):
|
||||
if os.name == 'posix':
|
||||
if os.name == 'posix' or COMPILER == 'mingw32':
|
||||
- libname = '%s_%s-%s' % (WXBASENAME, name, WXRELEASE)
|
||||
+ libname = '%s_%s' % (WXBASENAME, name)
|
||||
elif name:
|
||||
libname = 'wxmsw%s%s_%s' % (WXDLLVER, libFlag(), name)
|
||||
else:
|
||||
@@ -893,8 +893,6 @@ elif os.name == 'posix':
|
||||
@@ -1013,8 +1013,6 @@ elif os.name == 'posix' or COMPILER == 'mingw32':
|
||||
if debug:
|
||||
cflags.append('-g')
|
||||
cflags.append('-O0')
|
||||
|
||||
@ -1,12 +1,12 @@
|
||||
$OpenBSD: patch-wxPython_setup_py,v 1.2 2007/10/23 11:45:14 steven Exp $
|
||||
$OpenBSD: patch-wxPython_setup_py,v 1.3 2011/05/22 08:21:34 dcoppa Exp $
|
||||
--- wxPython/setup.py.orig Thu Jul 19 00:33:55 2007
|
||||
+++ wxPython/setup.py Wed Oct 3 11:08:48 2007
|
||||
@@ -912,7 +912,7 @@ if __name__ == "__main__":
|
||||
packages = ['wxaddons']
|
||||
)
|
||||
@@ -1053,7 +1053,7 @@ if __name__ == "__main__":
|
||||
)
|
||||
|
||||
- if INSTALL_MULTIVERSION:
|
||||
+ if 1:
|
||||
setup(name = 'wxPython-common',
|
||||
version = VERSION,
|
||||
description = DESCRIPTION,
|
||||
if not EGGing:
|
||||
- if INSTALL_MULTIVERSION:
|
||||
+ if 1:
|
||||
setup(name = 'wxPython-common',
|
||||
version = VERSION,
|
||||
description = DESCRIPTION,
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
Loading…
x
Reference in New Issue
Block a user