From owner-svn-ports-all@freebsd.org Thu Oct 26 22:56:55 2017 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 70959E54EC6; Thu, 26 Oct 2017 22:56:55 +0000 (UTC) (envelope-from bsam@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 360246D22C; Thu, 26 Oct 2017 22:56:55 +0000 (UTC) (envelope-from bsam@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v9QMusfs009755; Thu, 26 Oct 2017 22:56:54 GMT (envelope-from bsam@FreeBSD.org) Received: (from bsam@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v9QMusDD009754; Thu, 26 Oct 2017 22:56:54 GMT (envelope-from bsam@FreeBSD.org) Message-Id: <201710262256.v9QMusDD009754@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: bsam set sender to bsam@FreeBSD.org using -f From: Boris Samorodov Date: Thu, 26 Oct 2017 22:56:54 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r452960 - head/print/photoprint X-SVN-Group: ports-head X-SVN-Commit-Author: bsam X-SVN-Commit-Paths: head/print/photoprint X-SVN-Commit-Revision: 452960 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 26 Oct 2017 22:56:55 -0000 Author: bsam Date: Thu Oct 26 22:56:54 2017 New Revision: 452960 URL: https://svnweb.freebsd.org/changeset/ports/452960 Log: print/photoprint: Fix crashes with recent cups. 1. Finally I've found some spare time to diagnose and fix crashes: include cups/ppd.h, not cups/cups.h at stp_support/printerqueues_unix.c file. 2. While here: pet portlint, add some dependencies. Happy photoprinting! Modified: head/print/photoprint/Makefile Modified: head/print/photoprint/Makefile ============================================================================== --- head/print/photoprint/Makefile Thu Oct 26 22:46:35 2017 (r452959) +++ head/print/photoprint/Makefile Thu Oct 26 22:56:54 2017 (r452960) @@ -2,7 +2,7 @@ PORTNAME= photoprint DISTVERSION= 0.4.2-pre2 -PORTREVISION= 6 +PORTREVISION= 7 CATEGORIES= print graphics MASTER_SITES= http://www.blackfiveimaging.co.uk/photoprint/ @@ -12,6 +12,8 @@ COMMENT= Utility to print multiple images per sheet LICENSE= GPLv2 LIB_DEPENDS= libcups.so:print/cups \ + libfontconfig.so:x11-fonts/fontconfig \ + libfreetype.so:print/freetype2 \ libgutenprint.so:print/gutenprint \ liblcms.so:graphics/lcms \ libnetpbm.so:graphics/netpbm \ @@ -20,7 +22,7 @@ LIB_DEPENDS= libcups.so:print/cups \ GNU_CONFIGURE= yes USES= desktop-file-utils gettext jpeg libtool pkgconfig -USE_GNOME= gdkpixbuf2 gtk20 +USE_GNOME= cairo gdkpixbuf2 gtk20 USE_XORG= x11 INSTALLS_ICONS= yes @@ -30,5 +32,7 @@ LIBS+= -L${LOCALBASE}/lib -lX11 post-patch: @${REINPLACE_CMD} -e 's|glib/gstrfuncs.h|glib.h|g' \ ${WRKSRC}/gp_cppsupport/gprinter.cpp + @${REINPLACE_CMD} -e 's|cups/cups.h|cups/ppd.h|g' \ + ${WRKSRC}/stp_support/printerqueues_unix.c .include