pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/x11/py-qt4 Revert the below commit as it didn't work. ...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/dba068897a35
branches:  trunk
changeset: 607333:dba068897a35
user:      sbd <sbd%pkgsrc.org@localhost>
date:      Thu Aug 09 10:15:05 2012 +0000

description:
Revert the below commit as it didn't work.  The py-qt4 buildlink3.mk may
be included after pyversion.mk, which means the setting has no affect.

---
   Module Name: pkgsrc
   Committed By:        sbd
   Date:                Tue Aug  7 09:44:03 UTC 2012

   Modified Files:
        pkgsrc/x11/py-qt4: buildlink3.mk

   Log Message:
   Set PYTHON_VERSIONS_INCOMPATIBLE+=25 in the buildlink3.mk so that dependent
   packages won't try to build with python25.

   Fixes Global dependency resolution failure.


   To generate a diff of this commit:
   cvs rdiff -u -r1.3 -r1.4 pkgsrc/x11/py-qt4/buildlink3.mk

diffstat:

 x11/py-qt4/buildlink3.mk |  4 +---
 1 files changed, 1 insertions(+), 3 deletions(-)

diffs (17 lines):

diff -r 60c42ae7f994 -r dba068897a35 x11/py-qt4/buildlink3.mk
--- a/x11/py-qt4/buildlink3.mk  Thu Aug 09 10:06:46 2012 +0000
+++ b/x11/py-qt4/buildlink3.mk  Thu Aug 09 10:15:05 2012 +0000
@@ -1,12 +1,10 @@
-# $NetBSD: buildlink3.mk,v 1.4 2012/08/07 09:44:02 sbd Exp $
+# $NetBSD: buildlink3.mk,v 1.5 2012/08/09 10:15:05 sbd Exp $
 
 BUILDLINK_TREE+=       py-qt4
 
 .if !defined(PY_QT4_BUILDLINK3_MK)
 PY_QT4_BUILDLINK3_MK:=
 
-PYTHON_VERSIONS_INCOMPATIBLE+= 25
-
 .include "../../lang/python/pyversion.mk"
 
 BUILDLINK_API_DEPENDS.py-qt4+= ${PYPKGPREFIX}-qt4>=4.4.4



Home | Main Index | Thread Index | Old Index