Date: Wed, 24 Aug 2011 18:02:11 GMT From: Ruslan Mahmatkhanov <cvs-src@yandex.ru> To: freebsd-gnats-submit@FreeBSD.org Subject: ports/160070: [PATCH] multimedia/miro: eliminate py-pysqlite2x dependency Message-ID: <201108241802.p7OI2Bdq097061@red.freebsd.org> Resent-Message-ID: <201108241810.p7OIAAVp073216@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 160070 >Category: ports >Synopsis: [PATCH] multimedia/miro: eliminate py-pysqlite2x dependency >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Wed Aug 24 18:10:09 UTC 2011 >Closed-Date: >Last-Modified: >Originator: Ruslan Mahmatkhanov >Release: 9.0-BETA1 >Organization: >Environment: 9.0-BETA1 i386 >Description: - bump USE_PYTHON to 2.5+ (the point is to not depend on python24) - since it now requires 2.5+ use databases/py-sqlite3 instead of databases/py-pysqlite2x - while here, move LICENSE to proper block - remove CONFLICTS since we don't have other Miro version in the tree anymore - bump portrevision cause of deps change I checked the source. They use this pattern to deal with sqlite: """ 61 try: 62 import sqlite3 63 except ImportError: 64 from pysqlite2 import dbapi2 as sqlite3 """ So nothing will be broken with sqlite3. >How-To-Repeat: >Fix: Patch attached with submission follows: diff -ruNa miro.orig/Makefile miro/Makefile --- miro.orig/Makefile 2011-06-25 02:38:59.000000000 +0400 +++ miro/Makefile 2011-08-24 21:56:46.000000000 +0400 @@ -7,7 +7,7 @@ PORTNAME= miro PORTVERSION= 4.0.1 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= multimedia MASTER_SITES= ftp://ftp.osuosl.org/pub/pculture.org/miro/src/ \ http://ftp.osuosl.org/pub/pculture.org/miro/src/ @@ -15,6 +15,8 @@ MAINTAINER= armin@frozen-zone.org COMMENT= A video player to get internet TV broadcasts +LICENSE= GPLv2 + BUILD_DEPENDS= pyrexc:${PORTSDIR}/devel/pyrex \ ${PYTHON_SITELIBDIR}/webkit/__init__.py:${PORTSDIR}/www/py-webkitgtk \ update-mime-database:${PORTSDIR}/misc/shared-mime-info @@ -22,7 +24,7 @@ LIB_DEPENDS= avutil.1:${PORTSDIR}/multimedia/ffmpeg RUN_DEPENDS= ${PYTHON_SITELIBDIR}/_bsddb.so:${PORTSDIR}/databases/py-bsddb \ - ${PYTHON_SITELIBDIR}/pysqlite2/_sqlite.so:${PORTSDIR}/databases/py-pysqlite23 \ + ${PYTHON_SITELIBDIR}/_sqlite3.so:${PORTSDIR}/databases/py-sqlite3 \ ${PYTHON_SITELIBDIR}/dbus/glib.py:${PORTSDIR}/devel/py-dbus \ ${PYTHON_SITELIBDIR}/gtk-2.0/pynotify/_pynotify.so:${PORTSDIR}/devel/py-notify \ ${PYTHON_SITELIBDIR}/libtorrent.so:${PORTSDIR}/net-p2p/libtorrent-rasterbar-15-python \ @@ -34,14 +36,10 @@ BUILD_WRKSRC= ${WRKSRC}/linux INSTALL_WRKSRC= ${WRKSRC}/linux -CONFLICTS= Miro-[0-9]* - -LICENSE= GPLv2 - USE_GNOME= gconf2 gtk20 USE_GSTREAMER= python USE_GETTEXT= yes -USE_PYTHON= yes +USE_PYTHON= 2.5+ USE_PYDISTUTILS= yes USE_LDCONFIG= yes MAKE_ENV= CPPFLAGS="${CPPFLAGS}" >Release-Note: >Audit-Trail: >Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201108241802.p7OI2Bdq097061>