Skip site navigation (1)Skip section navigation (2)
Date:      Tue, 18 Oct 2016 11:11:51 +0000 (UTC)
From:      Tijl Coosemans <tijl@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r424155 - in head/print/kde4-print-manager: . files
Message-ID:  <201610181111.u9IBBpKU045505@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: tijl
Date: Tue Oct 18 11:11:51 2016
New Revision: 424155
URL: https://svnweb.freebsd.org/changeset/ports/424155

Log:
  - Fix build with CUPS 2.2.x.
  - Fix printing test page.

Added:
  head/print/kde4-print-manager/files/
  head/print/kde4-print-manager/files/patch-libkcups-KCupsRequest.cpp   (contents, props changed)
Modified:
  head/print/kde4-print-manager/Makefile

Modified: head/print/kde4-print-manager/Makefile
==============================================================================
--- head/print/kde4-print-manager/Makefile	Tue Oct 18 10:58:49 2016	(r424154)
+++ head/print/kde4-print-manager/Makefile	Tue Oct 18 11:11:51 2016	(r424155)
@@ -2,7 +2,7 @@
 
 PORTNAME=	print-manager
 PORTVERSION=	${KDE4_VERSION}
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	print kde
 MASTER_SITES=	KDE/${KDE4_BRANCH}/${PORTVERSION}/src
 DIST_SUBDIR=	KDE/${PORTVERSION}
@@ -11,10 +11,15 @@ MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Printer manager for KDE 4
 
 LIB_DEPENDS=	libcups.so:print/cups
+RUN_DEPENDS=	${LOCALBASE}/share/cups/data/testprint:print/cups-filters
 
 USES=		cmake:outsource kde:4 tar:xz
 USE_KDE=	kdelibs automoc4
 USE_QT4=	designer network \
 		qmake_build moc_build uic_build rcc_build
 
+post-patch:
+	@${REINPLACE_CMD} 's,/usr/share/cups,${LOCALBASE}/share/cups,' \
+		${WRKSRC}/libkcups/KCupsRequest.cpp
+
 .include <bsd.port.mk>

Added: head/print/kde4-print-manager/files/patch-libkcups-KCupsRequest.cpp
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/print/kde4-print-manager/files/patch-libkcups-KCupsRequest.cpp	Tue Oct 18 11:11:51 2016	(r424155)
@@ -0,0 +1,10 @@
+--- libkcups/KCupsRequest.cpp.orig	2014-10-16 19:09:36 UTC
++++ libkcups/KCupsRequest.cpp
+@@ -29,6 +29,7 @@
+ #include <QStringBuilder>
+ 
+ #include <cups/adminutil.h>
++#include <cups/ppd.h>
+ 
+ #define CUPS_DATADIR    "/usr/share/cups"
+ 



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