diff options
author | Florent Thoumie <flz@FreeBSD.org> | 2007-05-19 20:36:56 +0000 |
---|---|---|
committer | Florent Thoumie <flz@FreeBSD.org> | 2007-05-19 20:36:56 +0000 |
commit | d4f0d0048a8755106a4b0445221a19761e746984 (patch) | |
tree | c87184c5bfeaf942c827c5f706186ce9786a2588 /x11/libX11 | |
parent | Document png -- DoS crash vulnerability. (diff) |
- Welcome X.org 7.2 \o/.
- Set X11BASE to ${LOCALBASE} for recent ${OSVERSION}.
- Bump PORTREVISION for ports intalling files in ${X11BASE}.
Notes
Notes:
svn path=/head/; revision=191544
Diffstat (limited to 'x11/libX11')
-rw-r--r-- | x11/libX11/Makefile | 36 | ||||
-rw-r--r-- | x11/libX11/distinfo | 6 | ||||
-rw-r--r-- | x11/libX11/files/patch-src_ImUtil.c | 87 | ||||
-rw-r--r-- | x11/libX11/manpages | 614 | ||||
-rw-r--r-- | x11/libX11/pkg-plist | 222 |
5 files changed, 871 insertions, 94 deletions
diff --git a/x11/libX11/Makefile b/x11/libX11/Makefile index 5b29ff81d12f..cba2f780bb21 100644 --- a/x11/libX11/Makefile +++ b/x11/libX11/Makefile @@ -6,31 +6,29 @@ # PORTNAME= libX11 -PORTVERSION= 6.2.1 -PORTREVISION= 3 +PORTVERSION= 1.1.1 +PORTREVISION= 1 +PORTEPOCH= 1 CATEGORIES= x11 -MASTER_SITES= http://freedesktop.org/~ajax/xlibs-release/ MAINTAINER= x11@FreeBSD.org COMMENT= X11 library -LIB_PC_DEPENDS= ${X11BASE}/libdata/pkgconfig/xau.pc:${PORTSDIR}/x11/libXau \ - ${X11BASE}/libdata/pkgconfig/xdmcp.pc:${PORTSDIR}/x11/libXdmcp -BUILD_DEPENDS= ${X11BASE}/libdata/pkgconfig/xextensions.pc:${PORTSDIR}/x11/xextensions \ - ${X11BASE}/libdata/pkgconfig/xtrans.pc:${PORTSDIR}/x11/libXtrans \ - ${LIB_PC_DEPENDS} -RUN_DEPENDS= ${LIB_PC_DEPENDS} +.if defined(WITH_XCB) +BUILD_DEPENDS= ${X11BASE}/libdata/pkgconfig/xcb-xlib.pc:${PORTSDIR}/x11/libxcb +RUN_DEPENDS= ${BUILD_DEPENDS} +CONFIGURE_ARGS= --with-xcb=yes +PLIST_SUB+= XCB="" +.else +CONFIGURE_ARGS= --with-xcb=no +PLIST_SUB+= XCB="@comment " +.endif -CONFLICTS= XFree86-libraries-* xorg-libraries-* - -USE_BZIP2= yes -PREFIX?= ${X11BASE} +XORG_CAT= lib +USE_XORG= bigreqsproto xau xdmcp xextproto xtrans xcmiscproto kbproto:both \ + inputproto:both xf86bigfontproto xproto:both USE_AUTOTOOLS= libtool:15 -CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} -USE_GMAKE= yes -CONFIGURE_ARGS+= --enable-xdmauth -CFLAGS+= -DMALLOC_0_RETURNS_NULL -USE_LDCONFIG= yes -USE_GNOME= gnomehack pkgconfig +CONFIGURE_ARGS+= --enable-xdmauth +.include "${.CURDIR}/manpages" .include <bsd.port.mk> diff --git a/x11/libX11/distinfo b/x11/libX11/distinfo index dcb2669f24ef..6b9af7b0f53e 100644 --- a/x11/libX11/distinfo +++ b/x11/libX11/distinfo @@ -1,3 +1,3 @@ -MD5 (libX11-6.2.1.tar.bz2) = 59b6fa7cd6fe7ee1da92fd1b56d1cee3 -SHA256 (libX11-6.2.1.tar.bz2) = 32f7cb9dd3e72c557c37be337828ddeec036de55ce1e32b6866a010d3794b78d -SIZE (libX11-6.2.1.tar.bz2) = 1047586 +MD5 (xorg/lib/libX11-1.1.1.tar.bz2) = 848b80f77b20ae1fa5c882bbfa531ebc +SHA256 (xorg/lib/libX11-1.1.1.tar.bz2) = 5359db57793430429786b648ac570d4ab205797306e049bf1e8675250af21541 +SIZE (xorg/lib/libX11-1.1.1.tar.bz2) = 1426405 diff --git a/x11/libX11/files/patch-src_ImUtil.c b/x11/libX11/files/patch-src_ImUtil.c new file mode 100644 index 000000000000..2579201bad8b --- /dev/null +++ b/x11/libX11/files/patch-src_ImUtil.c @@ -0,0 +1,87 @@ +diff --git src/ImUtil.c src/ImUtil.c +index 83fd030..9e667bb 100644 +--- src/ImUtil.c ++++ src/ImUtil.c +@@ -327,12 +327,13 @@ XImage *XCreateImage (dpy, visual, depth + { + register XImage *image; + int bits_per_pixel = 1; ++ int min_bytes_per_line; + + if (depth == 0 || depth > 32 || + (format != XYBitmap && format != XYPixmap && format != ZPixmap) || + (format == XYBitmap && depth != 1) || + (xpad != 8 && xpad != 16 && xpad != 32) || +- offset < 0 || image_bytes_per_line < 0) ++ offset < 0) + return (XImage *) NULL; + if ((image = (XImage *) Xcalloc(1, (unsigned) sizeof(XImage))) == NULL) + return (XImage *) NULL; +@@ -363,16 +364,21 @@ XImage *XCreateImage (dpy, visual, depth + /* + * compute per line accelerator. + */ +- if (image_bytes_per_line == 0) + { + if (format == ZPixmap) +- image->bytes_per_line = ++ min_bytes_per_line = + ROUNDUP((bits_per_pixel * width), image->bitmap_pad); + else +- image->bytes_per_line = ++ min_bytes_per_line = + ROUNDUP((width + offset), image->bitmap_pad); + } +- else image->bytes_per_line = image_bytes_per_line; ++ if (image_bytes_per_line == 0) { ++ image->bytes_per_line = min_bytes_per_line; ++ } else if (image_bytes_per_line < min_bytes_per_line) { ++ return 0; ++ } else { ++ image->bytes_per_line = image_bytes_per_line; ++ } + + image->bits_per_pixel = bits_per_pixel; + image->obdata = NULL; +@@ -384,7 +390,11 @@ XImage *XCreateImage (dpy, visual, depth + Status XInitImage (image) + XImage *image; + { ++ int min_bytes_per_line; ++ + if (image->depth == 0 || image->depth > 32 || ++ image->bits_per_pixel > 32 || image->bitmap_unit > 32 || ++ image->bits_per_pixel < 0 || image->bitmap_unit < 0 || + (image->format != XYBitmap && + image->format != XYPixmap && + image->format != ZPixmap) || +@@ -392,21 +402,24 @@ Status XInitImage (image) + (image->bitmap_pad != 8 && + image->bitmap_pad != 16 && + image->bitmap_pad != 32) || +- image->xoffset < 0 || image->bytes_per_line < 0) ++ image->xoffset < 0) + return 0; + + /* + * compute per line accelerator. + */ +- if (image->bytes_per_line == 0) +- { + if (image->format == ZPixmap) +- image->bytes_per_line = ++ min_bytes_per_line = + ROUNDUP((image->bits_per_pixel * image->width), + image->bitmap_pad); + else +- image->bytes_per_line = ++ min_bytes_per_line = + ROUNDUP((image->width + image->xoffset), image->bitmap_pad); ++ ++ if (image->bytes_per_line == 0) { ++ image->bytes_per_line = min_bytes_per_line; ++ } else if (image->bytes_per_line < min_bytes_per_line) { ++ return 0; + } + + _XInitImageFuncPtrs (image); diff --git a/x11/libX11/manpages b/x11/libX11/manpages new file mode 100644 index 000000000000..d018aca79868 --- /dev/null +++ b/x11/libX11/manpages @@ -0,0 +1,614 @@ +MAN3= \ +AllPlanes.3 \ +BitmapBitOrder.3 \ +BitmapPad.3 \ +BitmapUnit.3 \ +BlackPixel.3 \ +BlackPixelOfScreen.3 \ +CellsOfScreen.3 \ +ClientWhitePointOfCCC.3 \ +ConnectionNumber.3 \ +DefaultColormap.3 \ +DefaultColormapOfScreen.3 \ +DefaultDepth.3 \ +DefaultDepthOfScreen.3 \ +DefaultGC.3 \ +DefaultGCOfScreen.3 \ +DefaultRootWindow.3 \ +DefaultScreen.3 \ +DefaultScreenOfDisplay.3 \ +DefaultVisual.3 \ +DefaultVisualOfScreen.3 \ +DisplayCells.3 \ +DisplayHeight.3 \ +DisplayHeightMM.3 \ +DisplayOfCCC.3 \ +DisplayOfScreen.3 \ +DisplayPlanes.3 \ +DisplayString.3 \ +DisplayWidth.3 \ +DisplayWidthMM.3 \ +DoesBackingStore.3 \ +DoesSaveUnders.3 \ +EventMaskOfScreen.3 \ +HeightMMOfScreen.3 \ +HeightOfScreen.3 \ +ImageByteOrder.3 \ +IsCursorKey.3 \ +IsFunctionKey.3 \ +IsKeypadKey.3 \ +IsMiscFunctionKey.3 \ +IsModifierKey.3 \ +IsPFKey.3 \ +IsPrivateKeypadKey.3 \ +LastKnownRequestProcessed.3 \ +MaxCmapsOfScreen.3 \ +MinCmapsOfScreen.3 \ +NextRequest.3 \ +PlanesOfScreen.3 \ +ProtocolRevision.3 \ +ProtocolVersion.3 \ +QLength.3 \ +RootWindow.3 \ +RootWindowOfScreen.3 \ +ScreenCount.3 \ +ScreenNumberOfCCC.3 \ +ScreenOfDisplay.3 \ +ScreenWhitePointOfCCC.3 \ +ServerVendor.3 \ +VendorRelease.3 \ +VisualOfCCC.3 \ +WhitePixel.3 \ +WhitePixelOfScreen.3 \ +WidthMMOfScreen.3 \ +WidthOfScreen.3 \ +XActivateScreenSaver.3 \ +XAddConnectionWatch.3 \ +XAddHost.3 \ +XAddHosts.3 \ +XAddPixel.3 \ +XAddToSaveSet.3 \ +XAllocClassHint.3 \ +XAllocColor.3 \ +XAllocColorCells.3 \ +XAllocColorPlanes.3 \ +XAllocIconSize.3 \ +XAllocNamedColor.3 \ +XAllocSizeHints.3 \ +XAllocStandardColormap.3 \ +XAllocWMHints.3 \ +XAllowEvents.3 \ +XAnyEvent.3 \ +XArc.3 \ +XAutoRepeatOff.3 \ +XAutoRepeatOn.3 \ +XBaseFontNameListOfFontSet.3 \ +XBell.3 \ +XButtonEvent.3 \ +XChangeActivePointerGrab.3 \ +XChangeGC.3 \ +XChangeKeyboardControl.3 \ +XChangeKeyboardMapping.3 \ +XChangePointerControl.3 \ +XChangeProperty.3 \ +XChangeSaveSet.3 \ +XChangeWindowAttributes.3 \ +XChar2b.3 \ +XCharStruct.3 \ +XCheckIfEvent.3 \ +XCheckMaskEvent.3 \ +XCheckTypedEvent.3 \ +XCheckTypedWindowEvent.3 \ +XCheckWindowEvent.3 \ +XCirculateEvent.3 \ +XCirculateRequestEvent.3 \ +XCirculateSubwindows.3 \ +XCirculateSubwindowsDown.3 \ +XCirculateSubwindowsUp.3 \ +XClassHint.3 \ +XClearArea.3 \ +XClearWindow.3 \ +XClientMessageEvent.3 \ +XClipBox.3 \ +XCloseDisplay.3 \ +XCloseIM.3 \ +XCloseOM.3 \ +XColor.3 \ +XColormapEvent.3 \ +XConfigureEvent.3 \ +XConfigureRequestEvent.3 \ +XConfigureWindow.3 \ +XContextDependentDrawing.3 \ +XContextualDrawing.3 \ +XConvertCase.3 \ +XConvertSelection.3 \ +XCopyArea.3 \ +XCopyColormapAndFree.3 \ +XCopyGC.3 \ +XCopyPlane.3 \ +XCreateBitmapFromData.3 \ +XCreateColormap.3 \ +XCreateFontCursor.3 \ +XCreateFontSet.3 \ +XCreateGC.3 \ +XCreateGlyphCursor.3 \ +XCreateIC.3 \ +XCreateImage.3 \ +XCreateOC.3 \ +XCreatePixmap.3 \ +XCreatePixmapCursor.3 \ +XCreatePixmapFromBitmapData.3 \ +XCreateRegion.3 \ +XCreateSimpleWindow.3 \ +XCreateWindow.3 \ +XCreateWindowEvent.3 \ +XCrossingEvent.3 \ +XDefaultString.3 \ +XDefineCursor.3 \ +XDeleteContext.3 \ +XDeleteModifiermapEntry.3 \ +XDeleteProperty.3 \ +XDestroyIC.3 \ +XDestroyImage.3 \ +XDestroyOC.3 \ +XDestroyRegion.3 \ +XDestroySubwindows.3 \ +XDestroyWindow.3 \ +XDestroyWindowEvent.3 \ +XDirectionalDependentDrawing.3 \ +XDisableAccessControl.3 \ +XDisplayKeycodes.3 \ +XDisplayMotionBufferSize.3 \ +XDisplayName.3 \ +XDisplayOfIM.3 \ +XDisplayOfOM.3 \ +XDrawArc.3 \ +XDrawArcs.3 \ +XDrawImageString.3 \ +XDrawImageString16.3 \ +XDrawLine.3 \ +XDrawLines.3 \ +XDrawPoint.3 \ +XDrawPoints.3 \ +XDrawRectangle.3 \ +XDrawRectangles.3 \ +XDrawSegments.3 \ +XDrawString.3 \ +XDrawString16.3 \ +XDrawText.3 \ +XDrawText16.3 \ +XEmptyRegion.3 \ +XEnableAccessControl.3 \ +XEqualRegion.3 \ +XErrorEvent.3 \ +XEvent.3 \ +XEventsQueued.3 \ +XExposeEvent.3 \ +XExtendedMaxRequestSize.3 \ +XExtentsOfFontSet.3 \ +XFetchBuffer.3 \ +XFetchBytes.3 \ +XFetchName.3 \ +XFillArc.3 \ +XFillArcs.3 \ +XFillPolygon.3 \ +XFillRectangle.3 \ +XFillRectangles.3 \ +XFilterEvent.3 \ +XFindContext.3 \ +XFlush.3 \ +XFocusChangeEvent.3 \ +XFontProp.3 \ +XFontSetExtents.3 \ +XFontStruct.3 \ +XFontsOfFontSet.3 \ +XForceScreenSaver.3 \ +XFree.3 \ +XFreeColormap.3 \ +XFreeColors.3 \ +XFreeCursor.3 \ +XFreeExtensionList.3 \ +XFreeFont.3 \ +XFreeFontInfo.3 \ +XFreeFontNames.3 \ +XFreeFontPath.3 \ +XFreeFontSet.3 \ +XFreeGC.3 \ +XFreeModifierMap.3 \ +XFreePixmap.3 \ +XFreeStringList.3 \ +XGCValues.3 \ +XGContextFromGC.3 \ +XGetAtomName.3 \ +XGetAtomNames.3 \ +XGetClassHint.3 \ +XGetCommand.3 \ +XGetErrorDatabaseText.3 \ +XGetErrorText.3 \ +XGetFontPath.3 \ +XGetFontProperty.3 \ +XGetGCValues.3 \ +XGetGeometry.3 \ +XGetICValues.3 \ +XGetIMValues.3 \ +XGetIconName.3 \ +XGetIconSizes.3 \ +XGetImage.3 \ +XGetInputFocus.3 \ +XGetKeyboardControl.3 \ +XGetKeyboardMapping.3 \ +XGetModifierMapping.3 \ +XGetMotionEvents.3 \ +XGetOCValues.3 \ +XGetOMValues.3 \ +XGetPixel.3 \ +XGetPointerControl.3 \ +XGetPointerMapping.3 \ +XGetRGBColormaps.3 \ +XGetScreenSaver.3 \ +XGetSelectionOwner.3 \ +XSetEventQueueOwner.3 \ +XGetSubImage.3 \ +XGetTextProperty.3 \ +XGetTransientForHint.3 \ +XGetVisualInfo.3 \ +XGetWMClientMachine.3 \ +XGetWMColormapWindows.3 \ +XGetWMHints.3 \ +XGetWMIconName.3 \ +XGetWMName.3 \ +XGetWMNormalHints.3 \ +XGetWMProtocols.3 \ +XGetWMSizeHints.3 \ +XGetWindowAttributes.3 \ +XGetWindowProperty.3 \ +XGetXCBConnection.3 \ +XGrabButton.3 \ +XGrabKey.3 \ +XGrabKeyboard.3 \ +XGrabPointer.3 \ +XGrabServer.3 \ +XGraphicsExposeEvent.3 \ +XGravityEvent.3 \ +XHostAddress.3 \ +XIMOfIC.3 \ +XIconSize.3 \ +XIconifyWindow.3 \ +XIfEvent.3 \ +XInitImage.3 \ +XInitThreads.3 \ +XInsertModifiermapEntry.3 \ +XInstallColormap.3 \ +XInternAtom.3 \ +XInternAtoms.3 \ +XInternalConnectionNumbers.3 \ +XIntersectRegion.3 \ +XKeyEvent.3 \ +XKeyboardControl.3 \ +XKeycodeToKeysym.3 \ +XKeymapEvent.3 \ +XKeysymToKeycode.3 \ +XKeysymToString.3 \ +XKillClient.3 \ +XListDepths.3 \ +XListExtensions.3 \ +XListFonts.3 \ +XListFontsWithInfo.3 \ +XListHosts.3 \ +XListInstalledColormaps.3 \ +XListPixmapFormats.3 \ +XListProperties.3 \ +XLoadFont.3 \ +XLoadQueryFont.3 \ +XLocaleOfFontSet.3 \ +XLocaleOfIM.3 \ +XLocaleOfOM.3 \ +XLockDisplay.3 \ +XLookupColor.3 \ +XLookupKeysym.3 \ +XLookupString.3 \ +XLowerWindow.3 \ +XMapEvent.3 \ +XMapRaised.3 \ +XMapRequestEvent.3 \ +XMapSubwindows.3 \ +XMapWindow.3 \ +XMappingEvent.3 \ +XMaskEvent.3 \ +XMatchVisualInfo.3 \ +XMaxRequestSize.3 \ +XModifierKeymap.3 \ +XMotionEvent.3 \ +XMoveResizeWindow.3 \ +XMoveWindow.3 \ +XNewModifiermap.3 \ +XNextEvent.3 \ +XNoExposeEvent.3 \ +XNoOp.3 \ +XOMOfOC.3 \ +XOffsetRegion.3 \ +XOpenDisplay.3 \ +XOpenIM.3 \ +XOpenOM.3 \ +XParseColor.3 \ +XParseGeometry.3 \ +XPeekEvent.3 \ +XPeekIfEvent.3 \ +XPending.3 \ +XPixmapFormatValues.3 \ +XPoint.3 \ +XPointInRegion.3 \ +XPolygonRegion.3 \ +XProcessInternalConnection.3 \ +XPropertyEvent.3 \ +XPutBackEvent.3 \ +XPutImage.3 \ +XPutPixel.3 \ +XQueryBestCursor.3 \ +XQueryBestSize.3 \ +XQueryBestStipple.3 \ +XQueryBestTile.3 \ +XQueryColor.3 \ +XQueryColors.3 \ +XQueryExtension.3 \ +XQueryFont.3 \ +XQueryKeymap.3 \ +XQueryPointer.3 \ +XQueryTextExtents.3 \ +XQueryTextExtents16.3 \ +XQueryTree.3 \ +XRaiseWindow.3 \ +XReadBitmapFile.3 \ +XReadBitmapFileData.3 \ +XRebindKeysym.3 \ +XRecolorCursor.3 \ +XReconfigureWMWindow.3 \ +XRectInRegion.3 \ +XRectangle.3 \ +XRefreshKeyboardMapping.3 \ +XRegisterIMInstantiateCallback.3 \ +XRemoveConnectionWatch.3 \ +XRemoveFromSaveSet.3 \ +XRemoveHost.3 \ +XRemoveHosts.3 \ +XReparentEvent.3 \ +XReparentWindow.3 \ +XResetScreenSaver.3 \ +XResizeRequestEvent.3 \ +XResizeWindow.3 \ +XResourceManagerString.3 \ +XRestackWindows.3 \ +XRotateBuffers.3 \ +XRotateWindowProperties.3 \ +XSaveContext.3 \ +XScreenNumberOfScreen.3 \ +XScreenResourceString.3 \ +XSegment.3 \ +XSelectInput.3 \ +XSelectionClearEvent.3 \ +XSelectionEvent.3 \ +XSelectionRequestEvent.3 \ +XSendEvent.3 \ +XSetAccessControl.3 \ +XSetAfterFunction.3 \ +XSetArcMode.3 \ +XSetBackground.3 \ +XSetClassHint.3 \ +XSetClipMask.3 \ +XSetClipOrigin.3 \ +XSetClipRectangles.3 \ +XSetCloseDownMode.3 \ +XSetCommand.3 \ +XSetDashes.3 \ +XSetErrorHandler.3 \ +XSetFillRule.3 \ +XSetFillStyle.3 \ +XSetFont.3 \ +XSetFontPath.3 \ +XSetForeground.3 \ +XSetFunction.3 \ +XSetGraphicsExposure.3 \ +XSetICFocus.3 \ +XSetICValues.3 \ +XSetIMValues.3 \ +XSetIOErrorHandler.3 \ +XSetIconName.3 \ +XSetIconSizes.3 \ +XSetInputFocus.3 \ +XSetLineAttributes.3 \ +XSetLocaleModifiers.3 \ +XSetModifierMapping.3 \ +XSetOCValues.3 \ +XSetOMValues.3 \ +XSetPlaneMask.3 \ +XSetPointerMapping.3 \ +XSetRGBColormaps.3 \ +XSetRegion.3 \ +XSetScreenSaver.3 \ +XSetSelectionOwner.3 \ +XSetState.3 \ +XSetStipple.3 \ +XSetSubwindowMode.3 \ +XSetTSOrigin.3 \ +XSetTextProperty.3 \ +XSetTile.3 \ +XSetTransientForHint.3 \ +XSetWMClientMachine.3 \ +XSetWMColormapWindows.3 \ +XSetWMHints.3 \ +XSetWMIconName.3 \ +XSetWMName.3 \ +XSetWMNormalHints.3 \ +XSetWMProperties.3 \ +XSetWMProtocols.3 \ +XSetWMSizeHints.3 \ +XSetWindowAttributes.3 \ +XSetWindowBackground.3 \ +XSetWindowBackgroundPixmap.3 \ +XSetWindowBorder.3 \ +XSetWindowBorderPixmap.3 \ +XSetWindowBorderWidth.3 \ +XSetWindowColormap.3 \ +XShrinkRegion.3 \ +XSizeHints.3 \ +XStandardColormap.3 \ +XStoreBuffer.3 \ +XStoreBytes.3 \ +XStoreColor.3 \ +XStoreColors.3 \ +XStoreName.3 \ +XStoreNamedColor.3 \ +XStringListToTextProperty.3 \ +XStringToKeysym.3 \ +XSubImage.3 \ +XSubtractRegion.3 \ +XSupportsLocale.3 \ +XSync.3 \ +XSynchronize.3 \ +XTextExtents.3 \ +XTextExtents16.3 \ +XTextItem.3 \ +XTextItem16.3 \ +XTextProperty.3 \ +XTextPropertyToStringList.3 \ +XTextWidth.3 \ +XTextWidth16.3 \ +XTimeCoord.3 \ +XTranslateCoordinates.3 \ +XUndefineCursor.3 \ +XUngrabButton.3 \ +XUngrabKey.3 \ +XUngrabKeyboard.3 \ +XUngrabPointer.3 \ +XUngrabServer.3 \ +XUninstallColormap.3 \ +XUnionRectWithRegion.3 \ +XUnionRegion.3 \ +XUniqueContext.3 \ +XUnloadFont.3 \ +XUnlockDisplay.3 \ +XUnmapEvent.3 \ +XUnmapSubwindows.3 \ +XUnmapWindow.3 \ +XUnregisterIMInstantiateCallback.3 \ +XUnsetICFocus.3 \ +XVaCreateNestedList.3 \ +XVisibilityEvent.3 \ +XVisualIDFromVisual.3 \ +XVisualInfo.3 \ +XWMGeometry.3 \ +XWMHints.3 \ +XWarpPointer.3 \ +XWindowAttributes.3 \ +XWindowChanges.3 \ +XWindowEvent.3 \ +XWithdrawWindow.3 \ +XWriteBitmapFile.3 \ +XXorRegion.3 \ +XcmsAllocColor.3 \ +XcmsAllocNamedColor.3 \ +XcmsCCCOfColormap.3 \ +XcmsCIELab.3 \ +XcmsCIELabQueryMaxC.3 \ +XcmsCIELabQueryMaxL.3 \ +XcmsCIELabQueryMaxLC.3 \ +XcmsCIELabQueryMinL.3 \ +XcmsCIELuv.3 \ +XcmsCIELuvQueryMaxC.3 \ +XcmsCIELuvQueryMaxL.3 \ +XcmsCIELuvQueryMaxLC.3 \ +XcmsCIELuvQueryMinL.3 \ +XcmsCIEXYZ.3 \ +XcmsCIEuvY.3 \ +XcmsCIExyY.3 \ +XcmsColor.3 \ +XcmsConvertColors.3 \ +XcmsCreateCCC.3 \ +XcmsDefaultCCC.3 \ +XcmsFreeCCC.3 \ +XcmsLookupColor.3 \ +XcmsPad.3 \ +XcmsQueryBlack.3 \ +XcmsQueryBlue.3 \ +XcmsQueryColor.3 \ +XcmsQueryColors.3 \ +XcmsQueryGreen.3 \ +XcmsQueryRed.3 \ +XcmsQueryWhite.3 \ +XcmsRGB.3 \ +XcmsRGBi.3 \ +XcmsSetCCCOfColormap.3 \ +XcmsSetWhiteAdjustProc.3 \ +XcmsSetWhitePoint.3 \ +XcmsStoreColor.3 \ +XcmsStoreColors.3 \ +XcmsTekHVC.3 \ +XcmsTekHVCQueryMaxC.3 \ +XcmsTekHVCQueryMaxV.3 \ +XcmsTekHVCQueryMaxVC.3 \ +XcmsTekHVCQueryMaxVSamples.3 \ +XcmsTekHVCQueryMinV.3 \ +XmbDrawImageString.3 \ +XmbDrawString.3 \ +XmbDrawText.3 \ +XmbLookupString.3 \ +XmbResetIC.3 \ +XmbSetWMProperties.3 \ +XmbTextEscapement.3 \ +XmbTextExtents.3 \ +XmbTextListToTextProperty.3 \ +XmbTextPerCharExtents.3 \ +XmbTextPropertyToTextList.3 \ +XrmCombineDatabase.3 \ +XrmCombineFileDatabase.3 \ +XrmDestroyDatabase.3 \ +XrmEnumerateDatabase.3 \ +XrmGetDatabase.3 \ +XrmGetFileDatabase.3 \ +XrmGetResource.3 \ +XrmGetStringDatabase.3 \ +XrmInitialize.3 \ +XrmLocaleOfDatabase.3 \ +XrmMergeDatabases.3 \ +XrmOptionDescRec.3 \ +XrmOptionKind.3 \ +XrmParseCommand.3 \ +XrmPermStringToQuark.3 \ +XrmPutFileDatabase.3 \ +XrmPutLineResource.3 \ +XrmPutResource.3 \ +XrmPutStringResource.3 \ +XrmQGetResource.3 \ +XrmQGetSearchList.3 \ +XrmQGetSearchResource.3 \ +XrmQPutResource.3 \ +XrmQPutStringResource.3 \ +XrmQuarkToString.3 \ +XrmSetDatabase.3 \ +XrmStringToBindingQuarkList.3 \ +XrmStringToQuark.3 \ +XrmStringToQuarkList.3 \ +XrmUniqueQuark.3 \ +XrmValue.3 \ +Xutf8DrawImageString.3 \ +Xutf8DrawString.3 \ +Xutf8DrawText.3 \ +Xutf8LookupString.3 \ +Xutf8ResetIC.3 \ +Xutf8SetWMProperties.3 \ +Xutf8TextEscapement.3 \ +Xutf8TextExtents.3 \ +Xutf8TextListToTextProperty.3 \ +Xutf8TextPerCharExtents.3 \ +Xutf8TextPropertyToTextList.3 \ +XwcDrawImageString.3 \ +XwcDrawString.3 \ +XwcDrawText.3 \ +XwcFreeStringList.3 \ +XwcLookupString.3 \ +XwcResetIC.3 \ +XwcTextEscapement.3 \ +XwcTextExtents.3 \ +XwcTextListToTextProperty.3 \ +XwcTextPerCharExtents.3 \ +XwcTextPropertyToTextList.3 diff --git a/x11/libX11/pkg-plist b/x11/libX11/pkg-plist index a934f8fd4812..f7f69cceda36 100644 --- a/x11/libX11/pkg-plist +++ b/x11/libX11/pkg-plist @@ -2,179 +2,257 @@ include/X11/ImUtil.h include/X11/XKBlib.h include/X11/Xcms.h include/X11/Xlib.h +%%XCB%%include/X11/Xlib-xcb.h +include/X11/XlibConf.h include/X11/Xlibint.h include/X11/Xlocale.h +include/X11/Xregion.h include/X11/Xresource.h include/X11/Xutil.h include/X11/cursorfont.h -include/X11/region.h +lib/X11/Xcms.txt lib/libX11.a lib/libX11.la lib/libX11.so lib/libX11.so.6 +%%XCB%%lib/libX11-xcb.a +%%XCB%%lib/libX11-xcb.la +%%XCB%%lib/libX11-xcb.so +%%XCB%%lib/libX11-xcb.so.1 libdata/pkgconfig/x11.pc +%%XCB%%libdata/pkgconfig/x11-xcb.pc share/X11/XErrorDB share/X11/XKeysymDB -share/X11/locale/C/XI18N_OBJS -share/X11/locale/C/XLC_LOCALE share/X11/locale/armscii-8/XI18N_OBJS share/X11/locale/armscii-8/XLC_LOCALE -share/X11/locale/compose.dir +share/X11/locale/armscii-8/Compose +share/X11/locale/C/XI18N_OBJS +share/X11/locale/C/XLC_LOCALE +share/X11/locale/C/Compose +share/X11/locale/el_GR.UTF-8/XI18N_OBJS +share/X11/locale/el_GR.UTF-8/XLC_LOCALE +share/X11/locale/el_GR.UTF-8/Compose share/X11/locale/en_US.UTF-8/XI18N_OBJS share/X11/locale/en_US.UTF-8/XLC_LOCALE +share/X11/locale/en_US.UTF-8/Compose share/X11/locale/georgian-academy/XI18N_OBJS share/X11/locale/georgian-academy/XLC_LOCALE +share/X11/locale/georgian-academy/Compose share/X11/locale/georgian-ps/XI18N_OBJS share/X11/locale/georgian-ps/XLC_LOCALE +share/X11/locale/georgian-ps/Compose share/X11/locale/ibm-cp1133/XI18N_OBJS share/X11/locale/ibm-cp1133/XLC_LOCALE +share/X11/locale/ibm-cp1133/Compose share/X11/locale/iscii-dev/XI18N_OBJS share/X11/locale/iscii-dev/XLC_LOCALE +share/X11/locale/iscii-dev/Compose share/X11/locale/isiri-3342/XI18N_OBJS share/X11/locale/isiri-3342/XLC_LOCALE +share/X11/locale/isiri-3342/Compose share/X11/locale/iso8859-1/XI18N_OBJS share/X11/locale/iso8859-1/XLC_LOCALE +share/X11/locale/iso8859-1/Compose share/X11/locale/iso8859-10/XI18N_OBJS share/X11/locale/iso8859-10/XLC_LOCALE +share/X11/locale/iso8859-10/Compose share/X11/locale/iso8859-11/XI18N_OBJS share/X11/locale/iso8859-11/XLC_LOCALE +share/X11/locale/iso8859-11/Compose share/X11/locale/iso8859-13/XI18N_OBJS share/X11/locale/iso8859-13/XLC_LOCALE +share/X11/locale/iso8859-13/Compose share/X11/locale/iso8859-14/XI18N_OBJS share/X11/locale/iso8859-14/XLC_LOCALE +share/X11/locale/iso8859-14/Compose share/X11/locale/iso8859-15/XI18N_OBJS share/X11/locale/iso8859-15/XLC_LOCALE +share/X11/locale/iso8859-15/Compose share/X11/locale/iso8859-2/XI18N_OBJS share/X11/locale/iso8859-2/XLC_LOCALE +share/X11/locale/iso8859-2/Compose share/X11/locale/iso8859-3/XI18N_OBJS share/X11/locale/iso8859-3/XLC_LOCALE +share/X11/locale/iso8859-3/Compose share/X11/locale/iso8859-4/XI18N_OBJS share/X11/locale/iso8859-4/XLC_LOCALE +share/X11/locale/iso8859-4/Compose share/X11/locale/iso8859-5/XI18N_OBJS share/X11/locale/iso8859-5/XLC_LOCALE +share/X11/locale/iso8859-5/Compose share/X11/locale/iso8859-6/XI18N_OBJS share/X11/locale/iso8859-6/XLC_LOCALE +share/X11/locale/iso8859-6/Compose share/X11/locale/iso8859-7/XI18N_OBJS share/X11/locale/iso8859-7/XLC_LOCALE +share/X11/locale/iso8859-7/Compose share/X11/locale/iso8859-8/XI18N_OBJS share/X11/locale/iso8859-8/XLC_LOCALE +share/X11/locale/iso8859-8/Compose share/X11/locale/iso8859-9/XI18N_OBJS share/X11/locale/iso8859-9/XLC_LOCALE +share/X11/locale/iso8859-9/Compose share/X11/locale/iso8859-9e/XI18N_OBJS share/X11/locale/iso8859-9e/XLC_LOCALE +share/X11/locale/iso8859-9e/Compose +share/X11/locale/ja/XI18N_OBJS +share/X11/locale/ja/XLC_LOCALE +share/X11/locale/ja/Compose share/X11/locale/ja.JIS/XI18N_OBJS share/X11/locale/ja.JIS/XLC_LOCALE +share/X11/locale/ja.JIS/Compose +share/X11/locale/ja_JP.UTF-8/XI18N_OBJS +share/X11/locale/ja_JP.UTF-8/XLC_LOCALE +share/X11/locale/ja_JP.UTF-8/Compose share/X11/locale/ja.S90/XI18N_OBJS share/X11/locale/ja.S90/XLC_LOCALE +share/X11/locale/ja.S90/Compose share/X11/locale/ja.SJIS/XI18N_OBJS share/X11/locale/ja.SJIS/XLC_LOCALE +share/X11/locale/ja.SJIS/Compose share/X11/locale/ja.U90/XI18N_OBJS share/X11/locale/ja.U90/XLC_LOCALE -share/X11/locale/ja/XI18N_OBJS -share/X11/locale/ja/XLC_LOCALE -share/X11/locale/ja_JP.UTF-8/XI18N_OBJS -share/X11/locale/ja_JP.UTF-8/XLC_LOCALE +share/X11/locale/ja.U90/Compose share/X11/locale/ko/XI18N_OBJS share/X11/locale/ko/XLC_LOCALE -share/X11/locale/ko_KR.UTF-8/XI18N_OBJS -share/X11/locale/ko_KR.UTF-8/XLC_LOCALE +share/X11/locale/ko/Compose share/X11/locale/koi8-c/XI18N_OBJS share/X11/locale/koi8-c/XLC_LOCALE +share/X11/locale/koi8-c/Compose share/X11/locale/koi8-r/XI18N_OBJS share/X11/locale/koi8-r/XLC_LOCALE +share/X11/locale/koi8-r/Compose share/X11/locale/koi8-u/XI18N_OBJS share/X11/locale/koi8-u/XLC_LOCALE -share/X11/locale/locale.alias -share/X11/locale/locale.dir +share/X11/locale/koi8-u/Compose +share/X11/locale/ko_KR.UTF-8/XI18N_OBJS +share/X11/locale/ko_KR.UTF-8/XLC_LOCALE +share/X11/locale/ko_KR.UTF-8/Compose share/X11/locale/microsoft-cp1251/XI18N_OBJS share/X11/locale/microsoft-cp1251/XLC_LOCALE +share/X11/locale/microsoft-cp1251/Compose share/X11/locale/microsoft-cp1255/XI18N_OBJS share/X11/locale/microsoft-cp1255/XLC_LOCALE +share/X11/locale/microsoft-cp1255/Compose share/X11/locale/microsoft-cp1256/XI18N_OBJS share/X11/locale/microsoft-cp1256/XLC_LOCALE +share/X11/locale/microsoft-cp1256/Compose share/X11/locale/mulelao-1/XI18N_OBJS share/X11/locale/mulelao-1/XLC_LOCALE +share/X11/locale/mulelao-1/Compose share/X11/locale/nokhchi-1/XI18N_OBJS share/X11/locale/nokhchi-1/XLC_LOCALE +share/X11/locale/nokhchi-1/Compose +share/X11/locale/pt_BR.UTF-8/XI18N_OBJS +share/X11/locale/pt_BR.UTF-8/XLC_LOCALE +share/X11/locale/pt_BR.UTF-8/Compose share/X11/locale/tatar-cyr/XI18N_OBJS share/X11/locale/tatar-cyr/XLC_LOCALE -share/X11/locale/th_TH.UTF-8/XI18N_OBJS -share/X11/locale/th_TH.UTF-8/XLC_LOCALE +share/X11/locale/tatar-cyr/Compose share/X11/locale/th_TH/XI18N_OBJS share/X11/locale/th_TH/XLC_LOCALE +share/X11/locale/th_TH/Compose +share/X11/locale/th_TH.UTF-8/XI18N_OBJS +share/X11/locale/th_TH.UTF-8/XLC_LOCALE +share/X11/locale/th_TH.UTF-8/Compose share/X11/locale/tscii-0/XI18N_OBJS share/X11/locale/tscii-0/XLC_LOCALE +share/X11/locale/tscii-0/Compose share/X11/locale/vi_VN.tcvn/XI18N_OBJS share/X11/locale/vi_VN.tcvn/XLC_LOCALE +share/X11/locale/vi_VN.tcvn/Compose share/X11/locale/vi_VN.viscii/XI18N_OBJS share/X11/locale/vi_VN.viscii/XLC_LOCALE -share/X11/locale/zh_CN.UTF-8/XI18N_OBJS -share/X11/locale/zh_CN.UTF-8/XLC_LOCALE -share/X11/locale/zh_CN.gbk/XI18N_OBJS -share/X11/locale/zh_CN.gbk/XLC_LOCALE +share/X11/locale/vi_VN.viscii/Compose share/X11/locale/zh_CN/XI18N_OBJS share/X11/locale/zh_CN/XLC_LOCALE +share/X11/locale/zh_CN/Compose +share/X11/locale/zh_CN.gb18030/XI18N_OBJS +share/X11/locale/zh_CN.gb18030/XLC_LOCALE +share/X11/locale/zh_CN.gb18030/Compose +share/X11/locale/zh_CN.gbk/XI18N_OBJS +share/X11/locale/zh_CN.gbk/XLC_LOCALE +share/X11/locale/zh_CN.gbk/Compose +share/X11/locale/zh_TW/XI18N_OBJS +share/X11/locale/zh_TW/XLC_LOCALE +share/X11/locale/zh_TW/Compose +share/X11/locale/zh_CN.UTF-8/XI18N_OBJS +share/X11/locale/zh_CN.UTF-8/XLC_LOCALE +share/X11/locale/zh_CN.UTF-8/Compose +share/X11/locale/zh_HK.big5/XI18N_OBJS share/X11/locale/zh_HK.big5/XLC_LOCALE +share/X11/locale/zh_HK.big5/Compose share/X11/locale/zh_HK.big5hkscs/XI18N_OBJS share/X11/locale/zh_HK.big5hkscs/XLC_LOCALE -share/X11/locale/zh_TW.UTF-8/XI18N_OBJS -share/X11/locale/zh_TW.UTF-8/XLC_LOCALE +share/X11/locale/zh_HK.big5hkscs/Compose +share/X11/locale/zh_HK.UTF-8/XI18N_OBJS +share/X11/locale/zh_HK.UTF-8/XLC_LOCALE +share/X11/locale/zh_HK.UTF-8/Compose share/X11/locale/zh_TW.big5/XI18N_OBJS share/X11/locale/zh_TW.big5/XLC_LOCALE -share/X11/locale/zh_TW/XI18N_OBJS -share/X11/locale/zh_TW/XLC_LOCALE -@dirrm share/X11/locale/C -@dirrm share/X11/locale/armscii-8 -@dirrm share/X11/locale/georgian-academy -@dirrm share/X11/locale/georgian-ps -@dirrm share/X11/locale/ibm-cp1133 -@dirrm share/X11/locale/iscii-dev -@dirrm share/X11/locale/isiri-3342 -@dirrm share/X11/locale/iso8859-1 -@dirrm share/X11/locale/iso8859-2 -@dirrm share/X11/locale/iso8859-3 -@dirrm share/X11/locale/iso8859-4 -@dirrm share/X11/locale/iso8859-5 -@dirrm share/X11/locale/iso8859-6 -@dirrm share/X11/locale/iso8859-7 -@dirrm share/X11/locale/iso8859-8 -@dirrm share/X11/locale/iso8859-9 -@dirrm share/X11/locale/iso8859-10 -@dirrm share/X11/locale/iso8859-11 -@dirrm share/X11/locale/iso8859-13 -@dirrm share/X11/locale/iso8859-14 -@dirrm share/X11/locale/iso8859-15 -@dirrm share/X11/locale/iso8859-9e -@dirrm share/X11/locale/ja -@dirrm share/X11/locale/ja.JIS -@dirrm share/X11/locale/ja.S90 -@dirrm share/X11/locale/ja.SJIS -@dirrm share/X11/locale/ja.U90 -@dirrm share/X11/locale/ko -@dirrm share/X11/locale/koi8-r -@dirrm share/X11/locale/koi8-u -@dirrm share/X11/locale/koi8-c -@dirrm share/X11/locale/microsoft-cp1251 -@dirrm share/X11/locale/microsoft-cp1255 -@dirrm share/X11/locale/microsoft-cp1256 -@dirrm share/X11/locale/mulelao-1 -@dirrm share/X11/locale/nokhchi-1 -@dirrm share/X11/locale/tatar-cyr -@dirrm share/X11/locale/tscii-0 -@dirrm share/X11/locale/vi_VN.tcvn -@dirrm share/X11/locale/vi_VN.viscii -@dirrm share/X11/locale/zh_CN -@dirrm share/X11/locale/zh_CN.gbk -@dirrm share/X11/locale/zh_CN.UTF-8 +share/X11/locale/zh_TW.big5/Compose +share/X11/locale/zh_TW.UTF-8/XI18N_OBJS +share/X11/locale/zh_TW.UTF-8/XLC_LOCALE +share/X11/locale/zh_TW.UTF-8/Compose +share/X11/locale/locale.alias +share/X11/locale/locale.dir +share/X11/locale/compose.dir +@dirrm share/X11/locale/zh_TW.UTF-8 +@dirrm share/X11/locale/zh_TW.big5 +@dirrm share/X11/locale/zh_HK.UTF-8 @dirrm share/X11/locale/zh_HK.big5hkscs +@dirrm share/X11/locale/zh_HK.big5 +@dirrm share/X11/locale/zh_CN.UTF-8 @dirrm share/X11/locale/zh_TW -@dirrm share/X11/locale/zh_TW.big5 +@dirrm share/X11/locale/zh_CN.gbk +@dirrm share/X11/locale/zh_CN.gb18030 +@dirrm share/X11/locale/zh_CN +@dirrm share/X11/locale/vi_VN.viscii +@dirrm share/X11/locale/vi_VN.tcvn +@dirrm share/X11/locale/tscii-0 +@dirrm share/X11/locale/th_TH.UTF-8 @dirrm share/X11/locale/th_TH -@dirrm share/X11/locale/en_US.UTF-8 -@dirrm share/X11/locale/ja_JP.UTF-8 +@dirrm share/X11/locale/tatar-cyr +@dirrm share/X11/locale/pt_BR.UTF-8 +@dirrm share/X11/locale/nokhchi-1 +@dirrm share/X11/locale/mulelao-1 +@dirrm share/X11/locale/microsoft-cp1256 +@dirrm share/X11/locale/microsoft-cp1255 +@dirrm share/X11/locale/microsoft-cp1251 @dirrm share/X11/locale/ko_KR.UTF-8 -@dirrm share/X11/locale/th_TH.UTF-8 -@dirrm share/X11/locale/zh_TW.UTF-8 -@dirrm share/X11/locale/zh_HK.big5 +@dirrm share/X11/locale/koi8-u +@dirrm share/X11/locale/koi8-r +@dirrm share/X11/locale/koi8-c +@dirrm share/X11/locale/ko +@dirrm share/X11/locale/ja.U90 +@dirrm share/X11/locale/ja.SJIS +@dirrm share/X11/locale/ja.S90 +@dirrm share/X11/locale/ja_JP.UTF-8 +@dirrm share/X11/locale/ja.JIS +@dirrm share/X11/locale/ja +@dirrm share/X11/locale/iso8859-9e +@dirrm share/X11/locale/iso8859-9 +@dirrm share/X11/locale/iso8859-8 +@dirrm share/X11/locale/iso8859-7 +@dirrm share/X11/locale/iso8859-6 +@dirrm share/X11/locale/iso8859-5 +@dirrm share/X11/locale/iso8859-4 +@dirrm share/X11/locale/iso8859-3 +@dirrm share/X11/locale/iso8859-2 +@dirrm share/X11/locale/iso8859-15 +@dirrm share/X11/locale/iso8859-14 +@dirrm share/X11/locale/iso8859-13 +@dirrm share/X11/locale/iso8859-11 +@dirrm share/X11/locale/iso8859-10 +@dirrm share/X11/locale/iso8859-1 +@dirrm share/X11/locale/isiri-3342 +@dirrm share/X11/locale/iscii-dev +@dirrm share/X11/locale/ibm-cp1133 +@dirrm share/X11/locale/georgian-ps +@dirrm share/X11/locale/georgian-academy +@dirrm share/X11/locale/en_US.UTF-8 +@dirrm share/X11/locale/el_GR.UTF-8 +@dirrm share/X11/locale/C +@dirrm share/X11/locale/armscii-8 @dirrm share/X11/locale -@unexec rmdir %D/share/X11 +@dirrm share/X11 |