[Midnightbsd-cvs] mports [24526] trunk/print/xfce4-print: update patchset
laffer1 at midnightbsd.org
laffer1 at midnightbsd.org
Tue Oct 16 00:07:38 EDT 2018
Revision: 24526
http://svnweb.midnightbsd.org/mports/?rev=24526
Author: laffer1
Date: 2018-10-16 00:07:37 -0400 (Tue, 16 Oct 2018)
Log Message:
-----------
update patchset
Modified Paths:
--------------
trunk/print/xfce4-print/Makefile
trunk/print/xfce4-print/pkg-descr
trunk/print/xfce4-print/pkg-plist
Added Paths:
-----------
trunk/print/xfce4-print/files/
trunk/print/xfce4-print/files/patch-printing-systems__cups__cups.c
Modified: trunk/print/xfce4-print/Makefile
===================================================================
--- trunk/print/xfce4-print/Makefile 2018-10-16 04:04:14 UTC (rev 24525)
+++ trunk/print/xfce4-print/Makefile 2018-10-16 04:07:37 UTC (rev 24526)
@@ -2,27 +2,26 @@
PORTNAME= xfce4-print
PORTVERSION= 4.6.1
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= print xfce
-MASTER_SITES= ${MASTER_SITE_XFCE}
-MASTER_SITE_SUBDIR= src/archive/xfprint/${PORTVERSION:R}
+MASTER_SITES= XFCE/src/archive/xfprint/${PORTVERSION:R}
DISTNAME= xfprint-${PORTVERSION}
DIST_SUBDIR= xfce4
MAINTAINER= xfce at FreeBSD.org
-COMMENT= Xfce 4 graphical frontend for printing
+COMMENT= Print system support for the Xfce Desktop
LICENSE= gpl2
-BUILD_DEPENDS+= a2ps:${PORTSDIR}/print/a2ps
-RUN_DEPENDS+= a2ps:${PORTSDIR}/print/a2ps
+BUILD_DEPENDS= a2ps:print/a2ps
+RUN_DEPENDS= a2ps:print/a2ps
GNU_CONFIGURE= yes
INSTALLS_ICONS= yes
-USES= gettext gmake pkgconfig pathfix tar:bzip2
+USES= gettext gmake libtool pathfix pkgconfig xfce tar:bzip2
USE_GNOME= glib20 gtk20 intltool intlhack
USE_LDCONFIG= yes
-USE_XFCE= libgui libutil xfconf
+USE_XFCE= libgui xfconf
OPTIONS_DEFINE= LETTER
OPTIONS_DEFAULT= LPR
@@ -29,35 +28,17 @@
OPTIONS_SINGLE= PRINTMETHOD
OPTIONS_SINGLE_PRINTMETHOD= LPR CUPS
LETTER_DESC= Use letter paper format instead of A4
-LPR_DESC= Use lpr as printing system
+LPR_DESC= LPR printing system support
+CUPS_LIB_DEPENDS= libcups.so:print/cups
+CUPS_CONFIGURE_ENABLE= cups
+LPR_CONFIGURE_ENABLE= bsdlpr
+LPR_CONFIGURE_WITH= printcap=/etc/printcap
+LETTER_CONFIGURE_ENABLE= letter
+OPTIONS_SUB= yes
-.include <bsd.port.pre.mk>
-
-.if ${PORT_OPTIONS:MCUPS}
-CONFIGURE_ARGS+=--enable-cups
-LIB_DEPENDS+= cups.2:${PORTSDIR}/print/cups-client
-PLIST_SUB+= CUPS=""
-.else
-CONFIGURE_ARGS+=--disable-cups
-PLIST_SUB+= CUPS="@comment "
-.endif
-
-.if ${PORT_OPTIONS:MLPR}
-CONFIGURE_ARGS+=--enable-bsdlpr --with-printcap=/etc/printcap
-PLIST_SUB+= LPR=""
-.else
-CONFIGURE_ARGS+=--disable-bsdlpr
-PLIST_SUB+= LPR="@comment "
-.endif
-
-.if ${PORT_OPTIONS:MLETTER}
-CONFIGURE_ARGS+=--enable-letter
-.else
-CONFIGURE_ARGS+=--disable-letter
-.endif
-
post-patch:
- @${REINPLACE_CMD} -e 's/@LDFLAGS@/& -Wl,-E/' ${WRKSRC}/xfprint/Makefile.in \
- ${WRKSRC}/xfprint-manager/Makefile.in
+ @${REINPLACE_CMD} '/_LDADD =/s/=/= -lX11/' \
+ ${WRKSRC}/xfprint/Makefile.in \
+ ${WRKSRC}/xfprint-manager/Makefile.in
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
Added: trunk/print/xfce4-print/files/patch-printing-systems__cups__cups.c
===================================================================
--- trunk/print/xfce4-print/files/patch-printing-systems__cups__cups.c (rev 0)
+++ trunk/print/xfce4-print/files/patch-printing-systems__cups__cups.c 2018-10-16 04:07:37 UTC (rev 24526)
@@ -0,0 +1,32 @@
+--- ./printing-systems/cups/cups.c.orig 2009-02-24 21:34:16.000000000 +0000
++++ ./printing-systems/cups/cups.c 2014-06-03 18:56:42.000000000 +0000
+@@ -23,7 +23,9 @@
+
+ #include <gmodule.h>
+
++#define _IPP_PRIVATE_STRUCTURES 1
+ #include <cups/ipp.h>
++#undef _IPP_PRIVATE_STRUCTURES
+ #include <cups/ppd.h>
+ #include <cups/cups.h>
+ #include <cups/language.h>
+@@ -133,8 +135,8 @@
+
+ language = cupsLangDefault ();
+ request = ippNew ();
+- request->request.op.operation_id = operation_id;
+- request->request.op.request_id = 1;
++ ippSetOperation(request,operation_id);
++ ippSetRequestId(request,1);
+
+ ippAddString (request, IPP_TAG_OPERATION, IPP_TAG_CHARSET, "attributes-charset", NULL, "utf-8");
+
+@@ -242,7 +244,7 @@
+
+ if (!request)
+ continue;
+- if (request->state == IPP_ERROR || request->state == IPP_IDLE) {
++ if (ippGetState(request) == IPP_ERROR || request->state == IPP_IDLE) {
+ ippDelete (request);
+ continue;
+ }
Property changes on: trunk/print/xfce4-print/files/patch-printing-systems__cups__cups.c
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Modified: trunk/print/xfce4-print/pkg-descr
===================================================================
--- trunk/print/xfce4-print/pkg-descr 2018-10-16 04:04:14 UTC (rev 24525)
+++ trunk/print/xfce4-print/pkg-descr 2018-10-16 04:07:37 UTC (rev 24526)
@@ -1,6 +1,4 @@
-The printing helper is a graphical frontend for printing, a printer
-management, and a job queue management. It doesn't let you configure
-printers but only use printing systems that have already been
-configured properly.
+Xfprint contains a print dialog and a printer manager for the Xfce Desktop
+Environment. It supports CUPS, BSD-LPR and file as printing destination.
-WWW: http://www.xfce.org/projects/xfprint/
+WWW: http://www.xfce.org/
Modified: trunk/print/xfce4-print/pkg-plist
===================================================================
--- trunk/print/xfce4-print/pkg-plist 2018-10-16 04:04:14 UTC (rev 24525)
+++ trunk/print/xfce4-print/pkg-plist 2018-10-16 04:07:37 UTC (rev 24526)
@@ -8,15 +8,13 @@
include/xfce4/libxfprint/printer-list-window.h
include/xfce4/libxfprint/printer-queue-window.h
include/xfce4/libxfprint/printing-system.h
+lib/libxfprint.a
+lib/libxfprint.so
lib/libxfprint.so.0
-lib/libxfprint.so
-lib/libxfprint.la
-lib/libxfprint.a
+lib/libxfprint.so.0.0.1
%%LPR%%lib/xfce4/xfprint-plugins/bsdlpr_plugin.a
-%%LPR%%lib/xfce4/xfprint-plugins/bsdlpr_plugin.la
%%LPR%%lib/xfce4/xfprint-plugins/bsdlpr_plugin.so
%%CUPS%%lib/xfce4/xfprint-plugins/cups_plugin.a
-%%CUPS%%lib/xfce4/xfprint-plugins/cups_plugin.la
%%CUPS%%lib/xfce4/xfprint-plugins/cups_plugin.so
libdata/pkgconfig/xfprint-1.0.pc
share/applications/xfprint.desktop
@@ -112,24 +110,3 @@
share/xfce4/doc/fr/images/xfprint_sheets.png
share/xfce4/doc/fr/images/xfprint_virtualpages.png
share/xfce4/doc/fr/xfprint.html
- at dirrm include/xfce4/libxfprint
- at dirrmtry include/xfce4
- at dirrmtry lib/xfce4/mcs-plugins
- at dirrmtry lib/xfce4/xfprint-plugins
- at dirrmtry lib/xfce4
- at dirrmtry share/applications
- at dirrm share/gtk-doc/html/libxfprint
- at dirrmtry share/gtk-doc/html
- at dirrmtry share/gtk-doc
- at dirrmtry share/locale/bn_IN/LC_MESSAGES
- at dirrmtry share/locale/bn_IN
- at dirrmtry share/locale/mr/LC_MESSAGES
- at dirrmtry share/locale/mr
- at dirrmtry share/locale/nb_NO/LC_MESSAGES
- at dirrmtry share/locale/nb_NO
- at dirrmtry share/xfce4/doc/C/images
- at dirrmtry share/xfce4/doc/C
- at dirrmtry share/xfce4/doc/fr/images
- at dirrmtry share/xfce4/doc/fr
- at dirrmtry share/xfce4/doc
- at dirrmtry share/xfce4
More information about the Midnightbsd-cvs
mailing list