go to 3.5.7 as well. make sure it uses python 2.4 for now.

This commit is contained in:
espie 2007-05-27 16:49:44 +00:00
parent 4a658f98ba
commit 75c000fc78
6 changed files with 35 additions and 37 deletions

View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.42 2007/05/09 11:31:43 bernd Exp $
# $OpenBSD: Makefile,v 1.43 2007/05/27 16:49:44 espie Exp $
.if ${MACHINE_ARCH} == "powerpc"
BROKEN= "gcc spins on x_20.cpp"
@ -6,10 +6,10 @@ BROKEN= "gcc spins on x_20.cpp"
COMMENT= "K Desktop Environment, extra language support"
CATEGORIES= x11 x11/kde devel
VERSION= 3.5.6
VERSION= 3.5.7
DISTNAME= kdebindings-${VERSION}
PKGNAME= ${DISTNAME}p1
MODKDE_VERSION= 3.5.3
PKGNAME= ${DISTNAME}
MODKDE_VERSION= 3.5.7
SHARED_LIBS += kjsembed 2.0 # .1.0
SHARED_LIBS += smokeqt 4.0 # .3.2
SHARED_LIBS += smokekde 4.0 # .3.2
@ -24,9 +24,11 @@ LIB_DEPENDS=DCOP,kdecore.>=6,kdefx,kdeprint,kdesu,kdeui,khtml,kio,kjs,kmdi,knews
WANTLIB= GLU Xext stdc++ X11 util m ICE Xrender SM pthread \
c fontconfig z GL \
png pcre jpeg art_lgpl_2 pcreposix iconv idn
png pcre jpeg art_lgpl_2 pcreposix iconv idn \
Xau Xdmcp expat fam freetype rpcsvc
PYTHON_VER= 2.4
BUILD_DEPENDS= ::lang/python/${PYTHON_VER}
BUILD_DEPENDS= :python-${PYTHON_VER}.*:lang/python/${PYTHON_VER}
# ::devel/tmake
MAKE_FLAGS+= TMAKEPATH=${LOCALBASE}/share/tmake/openbsd-g++/ \
@ -37,8 +39,5 @@ CONFIGURE_ENV+=DO_NOT_COMPILE=python
GNU_ARCH=${MACHINE_ARCH:S/amd64/x86_64/}
SUBST_VARS=GNU_ARCH OSREV
USE_X11= Yes
USE_LIBTOOL= Yes
LIBTOOL_FLAGS+= --tag=disable-static
.include <bsd.port.mk>

View File

@ -1,5 +1,5 @@
MD5 (kde/kdebindings-3.5.6.tar.bz2) = 0mtfVPBit2WpSdZmV8KrPA==
RMD160 (kde/kdebindings-3.5.6.tar.bz2) = PGVHxetLqp7+DpRHPU2vThRRT4A=
SHA1 (kde/kdebindings-3.5.6.tar.bz2) = 6ETvkp7LnWzPIiXHj0ufWGfmo4Q=
SHA256 (kde/kdebindings-3.5.6.tar.bz2) = n60m1YJ9mWy9iNkmeIO1vERPIo2fyOAxLbVuX21zY9g=
SIZE (kde/kdebindings-3.5.6.tar.bz2) = 5421905
MD5 (kde/kdebindings-3.5.7.tar.bz2) = vIqV8M/VKtBVmndc8EXyMA==
RMD160 (kde/kdebindings-3.5.7.tar.bz2) = hHkHogT+AuOpmp1RpxnSA9iDEJk=
SHA1 (kde/kdebindings-3.5.7.tar.bz2) = nOU5n+rTzcF7TBtQhtz/e/JtQtI=
SHA256 (kde/kdebindings-3.5.7.tar.bz2) = pFPjCXIxw+wnj1AAm/00jeqdgYpBrG45QLI05G9ZYEM=
SIZE (kde/kdebindings-3.5.7.tar.bz2) = 5577725

View File

@ -0,0 +1,14 @@
$OpenBSD: patch-acinclude_m4,v 1.1 2007/05/27 16:49:44 espie Exp $
--- acinclude.m4.orig Fri May 25 16:11:24 2007
+++ acinclude.m4 Fri May 25 16:11:35 2007
@@ -4624,8 +4624,8 @@ fi
AC_DEFUN([KDE_CHECK_PYTHON],
[
- KDE_CHECK_PYTHON_INTERN("2.5",
- [KDE_CHECK_PYTHON_INTERN("2.4",
+ KDE_CHECK_PYTHON_INTERN("2.4",
+ [KDE_CHECK_PYTHON_INTERN("2.5",
[KDE_CHECK_PYTHON_INTERN("2.3",
[KDE_CHECK_PYTHON_INTERN("2.2",
[KDE_CHECK_PYTHON_INTERN("2.1",

View File

@ -1,15 +0,0 @@
$OpenBSD: patch-dcoppython_shell_marshaller_cpp,v 1.1 2007/01/28 15:16:17 espie Exp $
--- dcoppython/shell/marshaller.cpp.orig Sun Jan 28 14:31:33 2007
+++ dcoppython/shell/marshaller.cpp Sun Jan 28 14:31:57 2007
@@ -124,7 +124,11 @@ namespace PythonDCOP {
if (!PyDict_Check(obj)) return false;
+#if PY_MAJOR_VERSION == 2 && PY_MINOR_VERSION == 4
+ int c =0;
+#else
ssize_t c=0;
+#endif
PyObject *key, *val;
while (PyDict_Next(obj, &c, &key, &val)==1)
if (!key_type.isMarshallable(key) ||

View File

@ -1,7 +1,7 @@
$OpenBSD: patch-kjsembed_Makefile_in,v 1.11 2006/02/04 16:39:47 espie Exp $
--- kjsembed/Makefile.in.orig Fri Jan 20 18:26:37 2006
+++ kjsembed/Makefile.in Sat Feb 4 15:56:16 2006
@@ -521,7 +521,7 @@ libkjsembed_la_LDFLAGS = -no-undefined $
$OpenBSD: patch-kjsembed_Makefile_in,v 1.12 2007/05/27 16:49:44 espie Exp $
--- kjsembed/Makefile.in.orig Mon May 14 13:28:53 2007
+++ kjsembed/Makefile.in Fri May 25 16:11:06 2007
@@ -527,7 +527,7 @@ libkjsembed_la_LDFLAGS = -no-undefined $(KDE_NO_UNDEFI
libkjsembed_la_LIBADD = bindings/libkjsembedbindings.la \
builtins/libkjsembedbuiltins.la \
qtbindings/libkjsembedqtbindings.la \

View File

@ -1,7 +1,7 @@
$OpenBSD: patch-qtruby_rubylib_designer_uilib_Makefile_in,v 1.5 2006/02/04 16:39:47 espie Exp $
--- qtruby/rubylib/designer/uilib/Makefile.in.orig Fri Jan 20 18:26:38 2006
+++ qtruby/rubylib/designer/uilib/Makefile.in Sat Feb 4 15:56:16 2006
@@ -411,7 +411,7 @@ rubylibdir = $(RUBY_SITEARCHDIR)
$OpenBSD: patch-qtruby_rubylib_designer_uilib_Makefile_in,v 1.6 2007/05/27 16:49:44 espie Exp $
--- qtruby/rubylib/designer/uilib/Makefile.in.orig Mon May 14 13:28:58 2007
+++ qtruby/rubylib/designer/uilib/Makefile.in Fri May 25 16:11:06 2007
@@ -417,7 +417,7 @@ rubylibdir = $(RUBY_SITEARCHDIR)
rubylib_LTLIBRARIES = qui.la
qui_la_SOURCES = qui.cpp
qui_la_LDFLAGS = -module -export-dynamic $(all_libraries) -version-info 0:0:0