2021-05-11 07:35:57 +02:00
|
|
|
vcl: fix build with vlc backend enabled
|
|
|
|
|
|
|
|
|
|
avmedia/source/vlc/vlcplayer.cxx tries to access the aWindow member
|
|
|
|
|
directly, which leads to a compilation failure, since it's private.
|
|
|
|
|
|
|
|
|
|
diff --git include/vcl/sysdata.hxx include/vcl/sysdata.hxx
|
|
|
|
|
index 63b7c810de3d..0cd0e037c823 100644
|
srcpkgs/l*: convert patches to -Np1
```sh
git grep -l '^patch_args=-Np0' "srcpkgs/$1*/template" |
while read template; do
for p in ${template%/template}/patches/*; do
sed -i '
\,^[+-][+-][+-] /dev/null,b
/^[*-]\+ [0-9]\+\(,[0-9]\+\)\? [*-]\+$/b
s,^[*][*][*] ,&a/,
/^--- /{
s,\(^--- \)\(./\)*,\1a/,
s,[.][Oo][Rr][Ii][Gg]\([ /]\),\1,
s/[.][Oo][Rr][Ii][Gg]$//
s/[.]patched[.]\([^.]\)/.\1/
h
}
/^+++ -/{
g
s/^--- a/+++ b/
b
}
s,\(^+++ \)\(./\)*,\1b/,
' "$p"
done
sed -i '/^patch_args=/d' $template
done
```
2021-06-19 05:03:21 +02:00
|
|
|
--- a/include/vcl/sysdata.hxx
|
|
|
|
|
+++ b/include/vcl/sysdata.hxx
|
2021-05-11 07:35:57 +02:00
|
|
|
@@ -73,9 +73,8 @@ struct VCL_DLLPUBLIC SystemEnvData
|
|
|
|
|
// however, the GTK3 vclplug wants to store pointers in here!
|
|
|
|
|
sal_IntPtr aShellWindow; // the window of the frame's shell
|
|
|
|
|
Platform platform; // the windowing system in use
|
|
|
|
|
-private:
|
|
|
|
|
- sal_uIntPtr aWindow; // the window of the object
|
|
|
|
|
public:
|
|
|
|
|
+ sal_uIntPtr aWindow; // the window of the object
|
|
|
|
|
|
|
|
|
|
void SetWindowHandle(sal_uIntPtr nWindow)
|
|
|
|
|
{
|
