Don't remove all dependencies when patching the pkg.

Only remove dependencies that are known to cause unncessary warnings
from pkg files when patching them with patch_capabilities.pl script.

Task-number: QTBUG-8018
Reviewed-by: Janne Koskinen
(cherry picked from commit 5f887ce23a38fc6b9f395593a4f7ce1de5b80e8d)

1 files changed, 7 insertions, 3 deletions

diff --git a/bin/patch_capabilities.pl b/bin/patch_capabilities.pl
index 7ea4311..939840d 100755
--- a/bin/patch_capabilities.pl
+++ b/bin/patch_capabilities.pl
@@ -131,9 +131,13 @@ if (@ARGV)
                 }
             }
 
-            # Remove all dependencies to other packages to reduce unnecessary error messages
-            # from depended packages that are also patched and therefore have different UID.
-            if ($line =~ m/^\(0x[0-9|a-f|A-F]*\).*\{.*\}$/)
+            # Remove dependencies to known problem packages (i.e. packages that are likely to be patched, also)
+            # to reduce unnecessary error messages.
+            if ($line =~ m/^\(0x2002af5f\).*\{.*\}$/)
+            {
+                $newLine = "\n"
+            }
+            if ($line =~ m/^\(0x2001E61C\).*\{.*\}$/)
             {
                 $newLine = "\n"
             }