?mode=patch&uid=2006091813230947680

Applied Patch: 2006091813230947680 (by blindcoder)

+ blindcoder

Votecheck 'core-relaxed': Missing 1 qualified vote(s) (clifford, daja77, fake, stefanp, teha)

package/kde/kdelibs/wrappers.in

package/kde/kdelibs/parse-config

Votecheck 'core-strong': Missing 1 qualified vote(s) (clifford, fake, teha)

scripts/Build-Tools

Benjamin Schieder:
        KDE: install documentation into /usr/share/doc/$xpkg/HTML
             instead of /usr/share/doc/HTML
        Build-Tools: add $cmd_WRAPPER_OUTPUTFILTER, an optional environment
                     variable for filtering the output of wrapped commands.
                     Necessary for above KDE fix

Benjamin Schieder:
        KDE: install documentation into /usr/share/doc/$xpkg/HTML
             instead of /usr/share/doc/HTML
        Build-Tools: add $cmd_WRAPPER_OUTPUTFILTER, an optional environment
                     variable for filtering the output of wrapped commands.
                     Necessary for above KDE fix
--- scripts/Build-Tools (Revision 27)
+++ scripts/Build-Tools (Arbeitskopie)
@@ -178,7 +178,10 @@
                                echo -n "${z}\$${y}_WRAPPER_FILTER"; z="|"
                        done ; echo '"'
 
-                       echo 'exec cmd_wrapper $( basename $0 ) "$@"'
+                       echo -n 'exec cmd_wrapper $( basename $0 ) "$@"'
+                       eval "outputfilter=\"\$${y}_WRAPPER_OUTPUTFILTER\""
+                       [ -n "${outputfilter}" ] && echo -n " | ${outputfilter}"
+                       echo
                } > $tmp
                chmod +rx $tmp
                mv $tmp "build/$ROCKCFG_ID/ROCK/$toolsdir/wrapper/$1"
--- package/kde/kdelibs/wrappers.in     (Revision 0)
+++ package/kde/kdelibs/wrappers.in     (Revision 0)
@@ -0,0 +1,2 @@
+KDECONFIG_WRAPPER_OUTPUTFILTER='sed "s,/doc/,/doc/$ROCK_XPKG/,"'
+build_wrapper KDECONFIG kde-config
--- package/kde/kdelibs/parse-config    (Revision 0)
+++ package/kde/kdelibs/parse-config    (Revision 0)
@@ -0,0 +1 @@
+export kde_htmldir="`${KDECONFIG:-kde-config} --install html --expandvars`"

[Download this patch]