diff options
| author | dsainty <dsainty> | 2009-04-17 01:07:29 +0000 |
|---|---|---|
| committer | dsainty <dsainty> | 2009-04-17 01:07:29 +0000 |
| commit | a8ba1da4d9343c5fb83d42399e085339b1418c4e (patch) | |
| tree | b835256387ebb899bd45573c7d2d9210c35f0b57 /x11 | |
| parent | 93c1279f863abd992caf73ebf01908abd685d3d8 (diff) | |
| download | pkgsrc-a8ba1da4d9343c5fb83d42399e085339b1418c4e.tar.gz | |
Fix build in some environments and some compilers. x11/libXaw provides
"xaw7", (not "xaw8") which causes xmore to deselect the printer support. The
straggling unused static function would cause link time failure if the
compiler didn't optimise it out.
Also, don't bother to buildlink in libXprintUtil, since it currently can't be
used.
Bump PKGREVISION for yucks.
Diffstat (limited to 'x11')
| -rw-r--r-- | x11/xmore/Makefile | 5 | ||||
| -rw-r--r-- | x11/xmore/distinfo | 3 | ||||
| -rw-r--r-- | x11/xmore/patches/patch-aa | 24 |
3 files changed, 28 insertions, 4 deletions
diff --git a/x11/xmore/Makefile b/x11/xmore/Makefile index b77ffac7536..42f55349a6b 100644 --- a/x11/xmore/Makefile +++ b/x11/xmore/Makefile @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.5 2008/11/10 17:21:39 wiz Exp $ +# $NetBSD: Makefile,v 1.6 2009/04/17 01:07:29 dsainty Exp $ # DISTNAME= xmore-1.0.1 -PKGREVISION= 2 +PKGREVISION= 3 CATEGORIES= x11 MASTER_SITES= ${MASTER_SITE_XORG:=app/} EXTRACT_SUFX= .tar.bz2 @@ -19,5 +19,4 @@ USE_TOOLS+= pkg-config CONFIGURE_ENV+= APP_MAN_SUFFIX=1 .include "../../x11/libXaw/buildlink3.mk" -.include "../../x11/libXprintUtil/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/x11/xmore/distinfo b/x11/xmore/distinfo index 2f1b8dc9229..4f421f70a7a 100644 --- a/x11/xmore/distinfo +++ b/x11/xmore/distinfo @@ -1,5 +1,6 @@ -$NetBSD: distinfo,v 1.1.1.1 2007/04/10 13:47:04 joerg Exp $ +$NetBSD: distinfo,v 1.2 2009/04/17 01:07:29 dsainty Exp $ SHA1 (xmore-1.0.1.tar.bz2) = abd0b926fc11c9d8c886f91b0b6a4834512cb0ba RMD160 (xmore-1.0.1.tar.bz2) = 98c437125fb5c7cb384bb78b536ef69d4ca363f2 Size (xmore-1.0.1.tar.bz2) = 92060 bytes +SHA1 (patch-aa) = 57b764a06f364898035130be8f2688e904288781 diff --git a/x11/xmore/patches/patch-aa b/x11/xmore/patches/patch-aa new file mode 100644 index 00000000000..0c87a8f2350 --- /dev/null +++ b/x11/xmore/patches/patch-aa @@ -0,0 +1,24 @@ +$NetBSD: patch-aa,v 1.1 2009/04/17 01:07:30 dsainty Exp $ + +XawPrintDialogClosePrinterConnection isn't available if USE_XPRINT isn't +defined. + +--- xmore.c.orig 2009-04-16 15:00:34.037637683 +1200 ++++ xmore.c 2009-04-16 15:01:03.532901704 +1200 +@@ -147,14 +147,14 @@ + XtCallActionProc(w, "quit", NULL, NULL, 0); + } + ++#ifdef USE_XPRINT ++ + static void + printshellDestroyXtProc(Widget w, XtPointer client_data, XtPointer callData) + { + XawPrintDialogClosePrinterConnection(printdialog, False); + } + +-#ifdef USE_XPRINT +- + static void + printOKXtProc(Widget w, XtPointer client_data, XtPointer callData) + { |