diff options
| author | marha <marha@users.sourceforge.net> | 2014-10-12 21:11:32 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2014-10-12 21:38:35 +0200 |
| commit | 1a83b8e49a75e2dab63805de25e384e0e38c27ed (patch) | |
| tree | 5280fe2a1bd2ce227e4bce9ce06134986e181de1 /libxcb/check-pc-requires | |
| parent | 4aea4b223604c589828beb1145875a5fbcc41eed (diff) | |
| parent | 9480392b8817f8bfa79cbc694ff039a73fc0a57f (diff) | |
| download | vcxsrv-1a83b8e49a75e2dab63805de25e384e0e38c27ed.tar.gz vcxsrv-1a83b8e49a75e2dab63805de25e384e0e38c27ed.tar.bz2 vcxsrv-1a83b8e49a75e2dab63805de25e384e0e38c27ed.zip | |
Merge remote-tracking branch 'origin/released'
Conflicts:
mesalib/src/glsl/glsl_symbol_table.h
mesalib/src/mesa/drivers/common/meta_blit.c
xorg-server/dix/dispatch.c
xorg-server/glx/indirect_dispatch.c
xorg-server/glx/indirect_dispatch_swap.c
xorg-server/mi/miexpose.c
Diffstat (limited to 'libxcb/check-pc-requires')
| -rw-r--r-- | libxcb/check-pc-requires | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libxcb/check-pc-requires b/libxcb/check-pc-requires index 0fd9c6597..063356fb4 100644 --- a/libxcb/check-pc-requires +++ b/libxcb/check-pc-requires @@ -23,7 +23,7 @@ for inc in src/*.h; do included=`grep '# *include' $inc | sed -e 's/[^<"]*[<"]//' -e 's/[>"]//' | grep -v 'xcb.h\|xproto.h'` - requires=`grep '^Requires:' $pcin` + requires=`grep '^Requires.private:' $pcin` missing="" for i in $included; do ibase=`basename $i .h` @@ -58,7 +58,7 @@ for inc in src/*.h; do *) if [ "$fix" = "y" ]; then echo $package adding dependency on $missing - sed -i '/^Requires:/s/$/ '"$missing"'/' $pcin + sed -i '/^Requires.private:/s/$/ '"$missing"'/' $pcin else echo $package missing $missing status=1 |