cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

update to 2.8.6

Browse Source 
ok mjc@ and Joerg Zinke who maintains some dependent ports
This commit is contained in:
naddy 2006-06-27 19:14:00 +00:00
parent 6efa2257b7
commit 16aa0f2ba9
7 changed files with 34 additions and 137 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
x11/py-gtk2/Makefile
View File

@ -1,12 +1,12 @@
# $OpenBSD: Makefile,v 1.14 2006/06/13 13:41:20 bernd Exp $
# $OpenBSD: Makefile,v 1.15 2006/06/27 19:14:00 naddy Exp $
SHARED_ONLY= Yes
COMMENT= "GTK+2 Python bindings"
V= 2.6.3
V= 2.8.6
DISTNAME= pygtk-${V}
PKGNAME= py-gtk2-${V}p1
PKGNAME= py-gtk2-${V}
CATEGORIES= x11
HOMEPAGE= http://www.pygtk.org/
@ -19,19 +19,19 @@ PERMIT_PACKAGE_FTP= Yes
PERMIT_DISTFILES_CDROM= Yes
PERMIT_DISTFILES_FTP= Yes
MASTER_SITES= ${MASTER_SITE_GNOME:=sources/pygtk/2.6/}
MASTER_SITES= ${MASTER_SITE_GNOME:=sources/pygtk/${V:R}/}
EXTRACT_SUFX= .tar.bz2
WANTLIB= X11 Xext Xrender atk-1.0.0.0 fontconfig freetype \
gdk-x11-2.0.801.0 gdk_pixbuf-2.0.801.0 glib-2.0.800.0 \
gmodule-2.0.800.0 gobject-2.0.800.0 gthread-2.0.800.0 \
gtk-x11-2.0.801.0 m pango-1.0.0.0 pangoft2-1.0.0.0 \
gdk-x11-2.0.802.0 gdk_pixbuf-2.0.802.0 glib-2.0.1000.0 \
gmodule-2.0.1000.0 gobject-2.0.1000.0 gthread-2.0.1000.0 \
gtk-x11-2.0.802.0 m pango-1.0.0.0 pangoft2-1.0.0.0 \
pangocairo-1.0.0.0 xml2 z cairo glitz png
MODULES= devel/gettext lang/python
BUILD_DEPENDS= :pkgconfig-*:devel/pkgconfig \
:py-Numeric-*:math/py-Numeric
:py-cairo->=1.0.2p1:graphics/py-cairo
LIB_DEPENDS= glade-2.0.0.0::devel/libglade2
USE_LIBTOOL= Yes

8
x11/py-gtk2/distinfo
View File

@ -1,4 +1,4 @@
MD5 (pygtk-2.6.3.tar.bz2) = 5acd4a4f5807f93a80389c1e9af48808
RMD160 (pygtk-2.6.3.tar.bz2) = ce53b05f7ad717aeacb4d0309a16f9d358aada30
SHA1 (pygtk-2.6.3.tar.bz2) = a670ff36b60658ac4a2231d2367aba04af4f19ab
SIZE (pygtk-2.6.3.tar.bz2) = 731516
MD5 (pygtk-2.8.6.tar.bz2) = c69c2e5e86a8f21a5773df20e265fc3a
RMD160 (pygtk-2.8.6.tar.bz2) = f2bc07556b15444add5cd31c0e494e85ad52b89b
SHA1 (pygtk-2.8.6.tar.bz2) = 088e5aeddee9e42f8c8ea0e1a171f1b8f363ba33
SIZE (pygtk-2.8.6.tar.bz2) = 756885

14
x11/py-gtk2/patches/patch-codegen_Makefile_in
View File

@ -1,12 +1,12 @@
$OpenBSD: patch-codegen_Makefile_in,v 1.1 2006/05/08 13:44:18 naddy Exp $
--- codegen/Makefile.in.orig Sat Apr 15 16:15:54 2006
+++ codegen/Makefile.in Sat Apr 15 16:16:14 2006
@@ -181,7 +181,7 @@ PLATFORM_VERSION = 2.0
$OpenBSD: patch-codegen_Makefile_in,v 1.2 2006/06/27 19:14:00 naddy Exp $
--- codegen/Makefile.in.orig Tue Jun 20 20:51:27 2006
+++ codegen/Makefile.in Tue Jun 20 20:51:53 2006
@@ -207,7 +207,7 @@ sysconfdir = @sysconfdir@
target_alias = @target_alias@
PLATFORM_VERSION = 2.0
bin_SCRIPTS = pygtk-codegen-$(PLATFORM_VERSION)
-codegendir = $(pkgdatadir)/$(PLATFORM_VERSION)/codegen
+codegendir = $(pkglibdir)/$(PLATFORM_VERSION)/codegen
codegen_PYTHON = \
__init__.py \
argtypes.py \

108
x11/py-gtk2/patches/patch-codegen_argtypes_py
View File

@ -1,108 +0,0 @@
$OpenBSD: patch-codegen_argtypes_py,v 1.1 2006/05/08 13:44:18 naddy Exp $
--- codegen/argtypes.py.orig Wed Jun 15 19:17:43 2005
+++ codegen/argtypes.py Sat Apr 15 19:20:38 2006
@@ -175,16 +175,36 @@ class IntArg(ArgType):
info.codeafter.append(' return PyInt_FromLong(ret);')
class UIntArg(ArgType):
+ dflt = (' if (py_%(name)s) {\n'
+ ' if (PyLong_Check(py_%(name)s))\n'
+ ' %(name)s = PyLong_AsUnsignedLong(py_%(name)s);\n'
+ ' else if (PyInt_Check(py_%(name)s))\n'
+ ' %(name)s = PyInt_AsLong(py_%(name)s);\n'
+ ' else\n'
+ ' PyErr_SetString(PyExc_TypeError, "Parameter \'%(name)s\' must be an int or a long");\n'
+ ' if (PyErr_Occurred())\n'
+ ' return NULL;\n'
+ ' }\n')
+ before = (' if (PyLong_Check(py_%(name)s))\n'
+ ' %(name)s = PyLong_AsUnsignedLong(py_%(name)s);\n'
+ ' else if (PyInt_Check(py_%(name)s))\n'
+ ' %(name)s = PyInt_AsLong(py_%(name)s);\n'
+ ' else\n'
+ ' PyErr_SetString(PyExc_TypeError, "Parameter \'%(name)s\' must be an int or a long");\n'
+ ' if (PyErr_Occurred())\n'
+ ' return NULL;\n')
def write_param(self, ptype, pname, pdflt, pnull, info):
- if pdflt:
- info.varlist.add(ptype, pname + ' = ' + pdflt)
- else:
- info.varlist.add(ptype, pname)
- info.arglist.append(pname)
- info.add_parselist('I', ['&' + pname], [pname])
+ if not pdflt:
+ pdflt = '0';
+
+ info.varlist.add(ptype, pname + ' = ' + pdflt)
+ info.codebefore.append(self.dflt % {'name':pname})
+ info.varlist.add('PyObject', "*py_" + pname + ' = NULL')
+ info.arglist.append(pname)
+ info.add_parselist('O', ['&py_' + pname], [pname])
def write_return(self, ptype, ownsreturn, info):
info.varlist.add(ptype, 'ret')
- info.codeafter.append(' return PyLong_FromUnsignedLong(ret);\n')
+ info.codeafter.append(' return PyLong_FromUnsignedLong(ret);')
class SizeArg(ArgType):
@@ -264,23 +284,31 @@ class TimeTArg(ArgType):
info.codeafter.append(' return PyInt_FromLong(ret);')
class ULongArg(ArgType):
- dflt = ' if (py_%(name)s)\n' \
- ' %(name)s = PyLong_AsUnsignedLong(py_%(name)s);\n'
- before = ' %(name)s = PyLong_AsUnsignedLong(py_%(name)s);\n'
def write_param(self, ptype, pname, pdflt, pnull, info):
- if pdflt:
- info.varlist.add('gulong', pname + ' = ' + pdflt)
- info.codebefore.append(self.dflt % {'name':pname})
- else:
- info.varlist.add('gulong', pname)
- info.codebefore.append(self.before % {'name':pname})
- info.varlist.add('PyObject', "*py_" + pname + ' = NULL')
- info.arglist.append(pname)
- info.add_parselist('O!', ['&PyLong_Type', '&py_' + pname], [pname])
+ if pdflt:
+ info.varlist.add('unsigned long', pname + ' = ' + pdflt)
+ else:
+ info.varlist.add('unsigned long', pname)
+ info.arglist.append(pname)
+ info.add_parselist('k', ['&' + pname], [pname])
def write_return(self, ptype, ownsreturn, info):
- info.varlist.add('gulong', 'ret')
- info.codeafter.append(' return PyLong_FromUnsignedLong(ret);')
+ info.varlist.add(ptype, 'ret')
+ info.codeafter.append(' return PyLong_FromUnsignedLong(ret);\n')
+class UInt32Arg(ULongArg):
+ def write_param(self, ptype, pname, pdflt, pnull, info):
+ ULongArg.write_param(self, ptype, pname, pdflt, pnull, info)
+ ## if sizeof(unsigned long) > sizeof(unsigned int), we need to
+ ## check the value is within guint32 range
+ if struct.calcsize('L') > struct.calcsize('I'):
+ info.codebefore.append((
+ ' if (%(pname)s > G_MAXUINT32) {\n'
+ ' PyErr_SetString(PyExc_ValueError,\n'
+ ' "Value out of range in conversion of"\n'
+ ' " %(pname)s parameter to unsigned 32 bit integer");\n'
+ ' return NULL;\n'
+ ' }\n') % vars())
+
class Int64Arg(ArgType):
def write_param(self, ptype, pname, pdflt, pnull, info):
if pdflt:
@@ -901,13 +929,7 @@ matcher.register('gboolean', arg)
arg = TimeTArg()
matcher.register('time_t', arg)
-# If the system maxint is smaller than unsigned int, we need to use
-# Long objects with PyLong_AsUnsignedLong
-if sys.maxint >= (1L << 32):
- matcher.register('guint32', arg)
-else:
- arg = ULongArg()
- matcher.register('guint32', arg)
+matcher.register('guint32', UInt32Arg())
arg = ULongArg()
matcher.register('gulong', arg)

9
x11/py-gtk2/patches/patch-codegen_pygtk-codegen-2_0_in
View File

@ -1,10 +1,11 @@
$OpenBSD: patch-codegen_pygtk-codegen-2_0_in,v 1.3 2006/05/08 13:44:18 naddy Exp $
--- codegen/pygtk-codegen-2.0.in.orig Wed Jul 4 04:22:34 2001
+++ codegen/pygtk-codegen-2.0.in Sat Apr 15 16:30:10 2006
@@ -1,8 +1,9 @@
$OpenBSD: patch-codegen_pygtk-codegen-2_0_in,v 1.4 2006/06/27 19:14:01 naddy Exp $
--- codegen/pygtk-codegen-2.0.in.orig Tue Jun 20 20:52:05 2006
+++ codegen/pygtk-codegen-2.0.in Tue Jun 20 20:52:41 2006
@@ -1,9 +1,9 @@
#!/bin/sh
prefix=@prefix@
-datarootdir=@datarootdir@
-datadir=@datadir@
-codegendir=${datadir}/pygtk/2.0/codegen
+exec_prefix=@exec_prefix@

8
x11/py-gtk2/patches/patch-examples_Makefile_in
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-examples_Makefile_in,v 1.1 2006/05/08 13:44:18 naddy Exp $
--- examples/Makefile.in.orig Thu Jul 14 14:33:21 2005
+++ examples/Makefile.in Mon Apr 10 00:51:36 2006
@@ -525,7 +525,7 @@ pygtk-demo/pygtk-demo: pygtk-demo/pygtk-
$OpenBSD: patch-examples_Makefile_in,v 1.2 2006/06/27 19:14:01 naddy Exp $
--- examples/Makefile.in.orig Thu Apr 6 00:54:31 2006
+++ examples/Makefile.in Tue Jun 20 20:53:02 2006
@@ -555,7 +555,7 @@ pygtk-demo/pygtk-demo: pygtk-demo/pygtk-
-mkdir pygtk-demo
sed -e s!\@PYTHON\@!@PYTHON@! \
-e s!\@libdir\@!@libdir@! \

8
x11/py-gtk2/pkg/PLIST
View File

@ -1,11 +1,10 @@
@comment $OpenBSD: PLIST,v 1.5 2006/05/08 13:44:18 naddy Exp $
@comment $OpenBSD: PLIST,v 1.6 2006/06/27 19:14:01 naddy Exp $
bin/pygtk-codegen-2.0
bin/pygtk-demo
include/pygtk-2.0/
include/pygtk-2.0/pygobject.h
include/pygtk-2.0/pygtk/
include/pygtk-2.0/pygtk/pygtk.h
lib/pkgconfig/
lib/pkgconfig/pygobject-2.0.pc
lib/pkgconfig/pygtk-2.0.pc
lib/pygtk/
@ -165,6 +164,9 @@ lib/python${MODPY_VERSION}/site-packages/gtk-2.0/gtk/keysyms.pyo
@comment lib/python${MODPY_VERSION}/site-packages/gtk-2.0/pango.a
@comment lib/python${MODPY_VERSION}/site-packages/gtk-2.0/pango.la
lib/python${MODPY_VERSION}/site-packages/gtk-2.0/pango.so
@comment lib/python${MODPY_VERSION}/site-packages/gtk-2.0/pangocairo.a
@comment lib/python${MODPY_VERSION}/site-packages/gtk-2.0/pangocairo.la
lib/python${MODPY_VERSION}/site-packages/gtk-2.0/pangocairo.so
lib/python${MODPY_VERSION}/site-packages/pygtk.pth
lib/python${MODPY_VERSION}/site-packages/pygtk.py
lib/python${MODPY_VERSION}/site-packages/pygtk.pyc
@ -182,3 +184,5 @@ share/pygtk/2.0/defs/gtk.defs
share/pygtk/2.0/defs/libglade.defs
share/pygtk/2.0/defs/pango-types.defs
share/pygtk/2.0/defs/pango.defs
share/pygtk/2.0/defs/pangocairo.defs
share/pygtk/2.0/defs/pangocairo.override