Skip site navigation (1)Skip section navigation (2)
Date:      Mon, 24 Jan 2005 19:51:07 +0100
From:      Danny Pansters <danny@ricin.com>
To:        FreeBSD-gnats-submit@FreeBSD.org
Subject:   ports/76625: [MAINTAINER] x11-toolkits/py-kde: Unbreak with KDE > 3.3.0
Message-ID:  <20050124185120.7919A43D2D@mx1.FreeBSD.org>
Resent-Message-ID: <200501241900.j0OJ0Wtn080326@freefall.freebsd.org>

next in thread | raw e-mail | index | archive | help

>Number:         76625
>Category:       ports
>Synopsis:       [MAINTAINER] x11-toolkits/py-kde: Unbreak with KDE > 3.3.0
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Mon Jan 24 19:00:32 GMT 2005
>Closed-Date:
>Last-Modified:
>Originator:     Danny Pansters
>Release:        FreeBSD 5.3-STABLE i386
>Organization:
>Environment:
System: FreeBSD workstation.homenet 5.3-STABLE FreeBSD 5.3-STABLE #2: Fri Jan 21 19:51:02 CET 2005
>Description:
Didn't compile with KDE 3.3.1 and 3.3.2 because of KDE version number being
used in some filenames. The port now renames those accordingly when needed.
This is also dealt with in newer PyKDE snapshots. Tested with KDE 3.3.2.

Generated with FreeBSD Port Tools 0.63
>How-To-Repeat:
>Fix:

--- py24-kde-3.11.3_1.patch begins here ---
diff -ruN --exclude=CVS /usr/ports/x11-toolkits/py-kde/Makefile /usr/ports/x11-toolkits/py-kde.new/Makefile
--- /usr/ports/x11-toolkits/py-kde/Makefile	Sun Jan 23 15:46:11 2005
+++ /usr/ports/x11-toolkits/py-kde.new/Makefile	Mon Jan 24 15:54:58 2005
@@ -7,19 +7,15 @@
 
 PORTNAME=	kde
 PORTVERSION=	3.11.3
+PORTREVISION=	1
 CATEGORIES=	x11-toolkits kde python
 MASTER_SITES=	http://www.river-bank.demon.co.uk/download/PyKDE2/
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 DISTNAME=	PyKDE-${PORTVERSION}
-DISTFILES=	${DISTNAME}${EXTRACT_SUFX}
 
 MAINTAINER=	danny@ricin.com
 COMMENT=	Python Bindings for KDE3
 
-BROKEN=		"Does not compile with KDE >= 3.3.1"
-EXPIRATION_DATE=2005-02-18
-DEPRECATED=	"${BROKEN}"
-
 BUILD_DEPENDS=	pyuic:${PORTSDIR}/x11-toolkits/py-qt
 RUN_DEPENDS=	${BUILD_DEPENDS}
 
@@ -32,10 +28,21 @@
 
 NO_FILTER_SHLIBS=	yes
 
+MODULES=	kdecore kdefx kdeui kio kfile kparts kspell kdeprint kmdi
+
 .include <bsd.port.pre.mk>
 
 post-patch:
 	@${REINPLACE_CMD} -e 's#/usr/bin/python#${PYTHON_CMD}#' ${WRKSRC}/postproc
+	@( cd ${WRKSRC} && \
+		ver=`${ECHO} ${KDE_VERSION} | ${SED} -e 's/\.//g'` && \
+		if [ "$${ver}" -gt "330" ]; then \
+			( ${MV} extra/kde330 extra/kde$${ver} && \
+			for i in ${MODULES}; do \
+				${MV} sip/$${i}/$${i}-kde330.diff \
+					sip/$${i}/$${i}-kde$${ver}.diff; \
+			done ) \
+		fi )
 
 do-configure:
 	@( cd ${WRKSRC} && ${PYTHON_CMD} configure.py -c \
--- py24-kde-3.11.3_1.patch ends here ---

>Release-Note:
>Audit-Trail:
>Unformatted:



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20050124185120.7919A43D2D>