diff options
| -rw-r--r-- | x11/kdebase3/Makefile | 7 | ||||
| -rw-r--r-- | x11/kdebase3/PLIST | 3 | ||||
| -rw-r--r-- | x11/kdebase3/distinfo | 9 | ||||
| -rw-r--r-- | x11/kdebase3/patches/patch-ap | 41 |
4 files changed, 49 insertions, 11 deletions
diff --git a/x11/kdebase3/Makefile b/x11/kdebase3/Makefile index 9390f8652ca..6238f7db388 100644 --- a/x11/kdebase3/Makefile +++ b/x11/kdebase3/Makefile @@ -1,7 +1,6 @@ -# $NetBSD: Makefile,v 1.118 2006/10/08 07:49:27 markd Exp $ +# $NetBSD: Makefile,v 1.119 2006/10/12 10:35:55 markd Exp $ DISTNAME= kdebase-${_KDE_VERSION} -PKGREVISION= 1 CATEGORIES= x11 COMMENT= Base modules for the KDE 3 integrated X11 desktop @@ -68,10 +67,6 @@ RCD_SCRIPTS= kdm LIBS.NetBSD+= ${EXPORT_SYMBOLS_LDFLAGS} -.if ${OPSYS} == "SunOS" -USE_TOOLS+= gawk:pkgsrc -.endif - PLIST_SRC= ${WRKDIR}/PLIST.Xdpms _KDE3_EXTRA_INCLUDES= ${LOCALBASE}/include:${X11BASE}/include:${BUILDLINK_PREFIX.freetype2}/include/freetype2 diff --git a/x11/kdebase3/PLIST b/x11/kdebase3/PLIST index 086ee5174be..50c2059d53c 100644 --- a/x11/kdebase3/PLIST +++ b/x11/kdebase3/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.44 2006/08/02 13:45:51 markd Exp $ +@comment $NetBSD: PLIST,v 1.45 2006/10/12 10:35:55 markd Exp $ bin/appletproxy bin/drkonqi bin/extensionproxy @@ -2084,6 +2084,7 @@ share/kde/apps/konsole/vim.schema share/kde/apps/konsole/vt100.keytab share/kde/apps/konsole/vt420pc.keytab share/kde/apps/konsole/wallpapers/Blkmarble.jpg +share/kde/apps/konsole/wallpapers/Metric-Monospace-14.png share/kde/apps/konsole/wallpapers/Paper01.jpg share/kde/apps/konsole/wallpapers/gray02.jpg share/kde/apps/konsole/x11r5.keytab diff --git a/x11/kdebase3/distinfo b/x11/kdebase3/distinfo index 0ebc0924777..bfa99e1ad86 100644 --- a/x11/kdebase3/distinfo +++ b/x11/kdebase3/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.89 2006/10/08 07:49:27 markd Exp $ +$NetBSD: distinfo,v 1.90 2006/10/12 10:35:55 markd Exp $ SHA1 (Daemon.README) = eb1e6af52adc02ded77af17e8953134b7e60d23b RMD160 (Daemon.README) = 39edd92ed4314397080f32a8caff0ac3f716ecf4 @@ -9,9 +9,9 @@ Size (Daemon.png) = 15725 bytes SHA1 (NetBSD-flag-1.0.png) = a9cf264a52ae0a602eec956d91222e299c7dee5c RMD160 (NetBSD-flag-1.0.png) = 2eac20df70396169819059a704e6a85ae10234b0 Size (NetBSD-flag-1.0.png) = 4532 bytes -SHA1 (kdebase-3.5.4.tar.bz2) = 18f2bb3643a40f937bf260d5969d6919aa52abf4 -RMD160 (kdebase-3.5.4.tar.bz2) = 29f763ec9de2cf3437b94567b317642e7df5e295 -Size (kdebase-3.5.4.tar.bz2) = 23636847 bytes +SHA1 (kdebase-3.5.5.tar.bz2) = f9f1907ce71fd2f934cf7404f1db1d350c2b9544 +RMD160 (kdebase-3.5.5.tar.bz2) = 6cf804de0487347a3e1d4ea6e5ba5114d23d9806 +Size (kdebase-3.5.5.tar.bz2) = 23851886 bytes SHA1 (patch-aa) = 28647cdec95367504e582ceb871e67dd3c321e29 SHA1 (patch-ab) = 6565b0ea0566446cdf823726b0b9d65118f41632 SHA1 (patch-ac) = 8be0f15be839f4f01d3e079501b83e27f1fab2eb @@ -25,6 +25,7 @@ SHA1 (patch-al) = 555384dc03ab59845e5794e081dd5d1a92e2959e SHA1 (patch-am) = 07ed2a5717a8f72bc36906ef4fafc360ac63479c SHA1 (patch-an) = e1620c558d300db98580109e64ee44a63571e5f7 SHA1 (patch-ao) = 78caab47eececf32ba928d646ca5c8fcc0bb13fc +SHA1 (patch-ap) = 86e8bfab36cd765ffceda8b6fd0245624d7fcd9f SHA1 (patch-bb) = 4c85002b95661db18619283e50512f3ab131a0ba SHA1 (patch-bc) = fd7e784b584763b7351dbdaefda58443bd1aaadb SHA1 (patch-bx) = d58d16fd484fc0a46c1ae93267af19e73af6f990 diff --git a/x11/kdebase3/patches/patch-ap b/x11/kdebase3/patches/patch-ap new file mode 100644 index 00000000000..1e180e82d46 --- /dev/null +++ b/x11/kdebase3/patches/patch-ap @@ -0,0 +1,41 @@ +$NetBSD: patch-ap,v 1.4 2006/10/12 10:35:55 markd Exp $ + +--- kwin/client.cpp.orig 2006-10-02 06:32:07.000000000 +1300 ++++ kwin/client.cpp +@@ -477,17 +477,30 @@ void Client::updateShape() + // calls it or when the decoration is created/destroyed + + if( Shape::version() >= 0x11 ) // 1.1, has input shape support +- { // there appears to be no way to find out if a window has input +- // shape set or not, so always set propagate the input shape +- // (it's the same like the bounding shape by default) +- XShapeCombineShape( qt_xdisplay(), frameId(), ShapeInput, 0, 0, ++ { // There appears to be no way to find out if a window has input ++ // shape set or not, so always propagate the input shape ++ // (it's the same like the bounding shape by default). ++ // Also, build the shape using a helper window, not directly ++ // in the frame window, because the sequence set-shape-to-frame, ++ // remove-shape-of-client, add-input-shape-of-client has the problem ++ // that after the second step there's a hole in the input shape ++ // until the real shape of the client is added and that can make ++ // the window lose focus (which is a problem with mouse focus policies) ++ static Window helper_window = None; ++ if( helper_window == None ) ++ helper_window = XCreateSimpleWindow( qt_xdisplay(), qt_xrootwin(), ++ 0, 0, 1, 1, 0, 0, 0 ); ++ XResizeWindow( qt_xdisplay(), helper_window, width(), height()); ++ XShapeCombineShape( qt_xdisplay(), helper_window, ShapeInput, 0, 0, + frameId(), ShapeBounding, ShapeSet ); +- XShapeCombineShape( qt_xdisplay(), frameId(), ShapeInput, ++ XShapeCombineShape( qt_xdisplay(), helper_window, ShapeInput, + clientPos().x(), clientPos().y(), + window(), ShapeBounding, ShapeSubtract ); +- XShapeCombineShape( qt_xdisplay(), frameId(), ShapeInput, ++ XShapeCombineShape( qt_xdisplay(), helper_window, ShapeInput, + clientPos().x(), clientPos().y(), + window(), ShapeInput, ShapeUnion ); ++ XShapeCombineShape( qt_xdisplay(), frameId(), ShapeInput, 0, 0, ++ helper_window, ShapeInput, ShapeSet ); + } + } + |