switch compizconfig-python from pyrex to cython

This port is the last user of pyrex, so switching to cython will let us
retire pyrex.
This commit is contained in:
daniel 2021-02-28 21:01:32 +00:00
parent 03edc50d87
commit 53850840be
5 changed files with 54 additions and 9 deletions

View File

@ -1,9 +1,9 @@
# $OpenBSD: Makefile,v 1.5 2021/02/23 19:39:49 sthen Exp $
# $OpenBSD: Makefile,v 1.6 2021/02/28 21:01:32 daniel Exp $
COMMENT = compiz configuration system bindings
DISTNAME = compizconfig-python-0.8.4
REVISION = 2
REVISION = 3
MASTER_SITES = http://releases.compiz.org/components/compizconfig-python/
@ -16,14 +16,17 @@ LIB_DEPENDS = x11/compiz/libcompizconfig
MODULES = lang/python
MODPY_VERSION = ${MODPY_DEFAULT_VERSION_2}
BUILD_DEPENDS = devel/pyrex
BUILD_DEPENDS = lang/cython${MODPY_FLAVOR}
LIBTOOL_FLAGS = --tag=disable-static
CONFIGURE_STYLE = gnu
AUTOCONF_VERSION = 2.63
AUTOMAKE_VERSION = 1.12
CONFIGURE_STYLE = autoreconf
pre-patch:
@ln -s ${MODPY_BIN} ${WRKDIR}/bin/python
@ln -s ${LOCALBASE}/bin/cython${MODPY_BIN_SUFFIX} ${WRKDIR}/bin/cython
pre-build:
@rm -f ${WRKSRC}/src/compizconfig.c

View File

@ -0,0 +1,18 @@
$OpenBSD: patch-configure_ac,v 1.1 2021/02/28 21:01:32 daniel Exp $
Index: configure.ac
--- configure.ac.orig
+++ configure.ac
@@ -31,10 +31,10 @@ else
AM_PATH_PYTHON_VERSION(2.5,2.5.0)
fi
-AC_CHECK_PROGS(PYREX, pyrexc)
+AC_CHECK_PROGS(PYREX, cython)
if test -z "$PYREX"
then
- AC_MSG_ERROR([Couldn't find Pyrex])
+ AC_MSG_ERROR([Couldn't find Cython])
fi
AC_CONFIG_FILES([

View File

@ -0,0 +1,14 @@
$OpenBSD: patch-src_Makefile_am,v 1.1 2021/02/28 21:01:32 daniel Exp $
Index: src/Makefile.am
--- src/Makefile.am.orig
+++ src/Makefile.am
@@ -3,7 +3,7 @@ INCLUDES=\
@CCS_CFLAGS@
compizconfig.c: compizconfig.pyx
- -pyrexc compizconfig.pyx
+ -cython compizconfig.pyx
compizconfig_la_LDFLAGS = -module -avoid-version -fPIC -export-symbols-regex initcompizconfig -lX11
compizconfig_la_LIBADD = @CCS_LIBS@

View File

@ -1,6 +1,7 @@
$OpenBSD: patch-src_compizconfig_pyx,v 1.1 2013/12/03 00:51:19 fgsch Exp $
--- src/compizconfig.pyx.orig Mon Feb 25 00:32:45 2013
+++ src/compizconfig.pyx Mon Feb 25 00:33:08 2013
$OpenBSD: patch-src_compizconfig_pyx,v 1.2 2021/02/28 21:01:32 daniel Exp $
Index: src/compizconfig.pyx
--- src/compizconfig.pyx.orig
+++ src/compizconfig.pyx
@@ -583,7 +583,7 @@ cdef class Setting:
cdef object extendedStrRestrictions
cdef object baseStrRestrictions
@ -10,6 +11,15 @@ $OpenBSD: patch-src_compizconfig_pyx,v 1.1 2013/12/03 00:51:19 fgsch Exp $
cdef CCSSettingType t
cdef CCSSettingInfo * i
@@ -653,7 +653,7 @@ cdef class Setting:
property Hints:
def __get__ (self):
- if self.ccsSetting.hints == '':
+ if not self.ccsSetting.hints:
return []
else:
return str (self.ccsSetting.hints).split (";")[:-1]
@@ -689,7 +689,7 @@ cdef class SSGroup:
cdef object display
cdef object screens

View File

@ -1,3 +1,3 @@
@comment $OpenBSD: PLIST,v 1.1 2013/12/03 00:51:19 fgsch Exp $
@comment $OpenBSD: PLIST,v 1.2 2021/02/28 21:01:32 daniel Exp $
lib/pkgconfig/compizconfig-python.pc
lib/python${MODPY_VERSION}/site-packages/compizconfig.so
@so lib/python${MODPY_VERSION}/site-packages/compizconfig.so