From 75c000fc7871f35c129961d272cb8fef82bf94ff Mon Sep 17 00:00:00 2001 From: espie Date: Sun, 27 May 2007 16:49:44 +0000 Subject: [PATCH] go to 3.5.7 as well. make sure it uses python 2.4 for now. --- x11/kde/bindings3/Makefile | 17 ++++++++--------- x11/kde/bindings3/distinfo | 10 +++++----- x11/kde/bindings3/patches/patch-acinclude_m4 | 14 ++++++++++++++ .../patch-dcoppython_shell_marshaller_cpp | 15 --------------- .../patches/patch-kjsembed_Makefile_in | 8 ++++---- ...ch-qtruby_rubylib_designer_uilib_Makefile_in | 8 ++++---- 6 files changed, 35 insertions(+), 37 deletions(-) create mode 100644 x11/kde/bindings3/patches/patch-acinclude_m4 delete mode 100644 x11/kde/bindings3/patches/patch-dcoppython_shell_marshaller_cpp diff --git a/x11/kde/bindings3/Makefile b/x11/kde/bindings3/Makefile index d2a14db1910..415a5a87809 100644 --- a/x11/kde/bindings3/Makefile +++ b/x11/kde/bindings3/Makefile @@ -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 diff --git a/x11/kde/bindings3/distinfo b/x11/kde/bindings3/distinfo index b07b89151d5..283cb984210 100644 --- a/x11/kde/bindings3/distinfo +++ b/x11/kde/bindings3/distinfo @@ -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 diff --git a/x11/kde/bindings3/patches/patch-acinclude_m4 b/x11/kde/bindings3/patches/patch-acinclude_m4 new file mode 100644 index 00000000000..72da88f4ec6 --- /dev/null +++ b/x11/kde/bindings3/patches/patch-acinclude_m4 @@ -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", diff --git a/x11/kde/bindings3/patches/patch-dcoppython_shell_marshaller_cpp b/x11/kde/bindings3/patches/patch-dcoppython_shell_marshaller_cpp deleted file mode 100644 index c4807a70c10..00000000000 --- a/x11/kde/bindings3/patches/patch-dcoppython_shell_marshaller_cpp +++ /dev/null @@ -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) || diff --git a/x11/kde/bindings3/patches/patch-kjsembed_Makefile_in b/x11/kde/bindings3/patches/patch-kjsembed_Makefile_in index 3d87d36f84d..477593bc22b 100644 --- a/x11/kde/bindings3/patches/patch-kjsembed_Makefile_in +++ b/x11/kde/bindings3/patches/patch-kjsembed_Makefile_in @@ -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 \ diff --git a/x11/kde/bindings3/patches/patch-qtruby_rubylib_designer_uilib_Makefile_in b/x11/kde/bindings3/patches/patch-qtruby_rubylib_designer_uilib_Makefile_in index 10aceb9465b..5a91cf433fc 100644 --- a/x11/kde/bindings3/patches/patch-qtruby_rubylib_designer_uilib_Makefile_in +++ b/x11/kde/bindings3/patches/patch-qtruby_rubylib_designer_uilib_Makefile_in @@ -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