[SCM] Qt 4 packaging branch, qt4.7.3, updated. debian/4.7.3-8-3-gf99f68f

[Pino Toscano]

The following commit has been merged in the qt4.7.3 branch:
commit f99f68f38ec9b0474d0369bb80fff6d60b6bf708
Author: Pino Toscano <pino at debian.org>
Date:   Wed Dec 14 14:48:58 2011 +0100

    add patch Bug-fix-Allow-QTDIR-to-contain-regex-metacharacters.patch
    
    fixes the headers generation if the source path contains special characters (like '+')
---
 debian/changelog                                   |    3 +
 ...low-QTDIR-to-contain-regex-metacharacters.patch |   82 ++++++++++++++++++++
 debian/patches/series                              |    1 +
 3 files changed, 86 insertions(+), 0 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 46b7e1c..88de9c3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,9 @@ qt4-x11 (4:4.7.3-9) UNRELEASED; urgency=low
 
   [ Pino Toscano ]
   * Force a non-parallel build on ia64, maybe it fixes the build on this arch.
+  * Add patch Bug-fix-Allow-QTDIR-to-contain-regex-metacharacters.patch to fix
+    the headers generation if the source path contains special characters
+    (like '+').
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Wed, 14 Dec 2011 14:15:47 +0100
 
diff --git a/debian/patches/Bug-fix-Allow-QTDIR-to-contain-regex-metacharacters.patch b/debian/patches/Bug-fix-Allow-QTDIR-to-contain-regex-metacharacters.patch
new file mode 100644
index 0000000..94faa9f
--- /dev/null
+++ b/debian/patches/Bug-fix-Allow-QTDIR-to-contain-regex-metacharacters.patch
@@ -0,0 +1,82 @@
+From 388705d3616c3edd0bb1c7bfef2f093a446ff13a Mon Sep 17 00:00:00 2001
+From: James Perrett <james.perrett at tandberg.com>
+Date: Mon, 15 Mar 2010 15:54:31 +0100
+Subject: [PATCH] Bug fix: Allow $QTDIR to contain regex metacharacters
+
+Quote $QTDIR (and variables based on it) when they are used in regex
+patterns - this allows $QTDIR to contain valid pathname characters that
+are also regex metacharacters, such as '.' and '+'.
+
+Merge-Request: 506
+Reviewed-by: Zeno Albisser
+---
+ bin/syncqt |   17 ++++++++---------
+ 1 files changed, 8 insertions(+), 9 deletions(-)
+
+--- a/bin/syncqt
++++ b/bin/syncqt
+@@ -75,6 +75,7 @@
+ $force_relative = 1 if ( -d "/System/Library/Frameworks" );
+ my $out_basedir = $basedir;
+ $out_basedir =~ s=\=/=g;
++my $quoted_basedir = "\Q$basedir";
+ 
+ # functions ----------------------------------------------------------
+ 
+@@ -350,11 +351,9 @@
+ ######################################################################
+ sub fixPaths {
+     my ($file, $dir) = @_;
+-    $dir =~ s=^$basedir/=$out_basedir/= if(!($basedir eq $out_basedir));
++    $dir =~ s=^$quoted_basedir/=$out_basedir/= if(!($basedir eq $out_basedir));
+     $file =~ s=\=/=g;
+-    $file =~ s/\+/\+/g;
+     $dir =~ s=\=/=g;
+-    $dir =~ s/\+/\+/g;
+ 
+     #setup
+     my $ret = $file;
+@@ -378,7 +377,7 @@
+         my $slash = index($file_dir, "/", $i);
+         last if($slash == -1);
+         my $tmp = substr($file_dir, 0, $slash);
+-        last unless($dir =~ m,^$tmp/,);
++        last unless($dir =~ m,^\Q$tmp\E/,);
+         $match_dir = $tmp;
+         $i = $slash;
+     }
+@@ -389,7 +388,7 @@
+         for(my $i = 0; $i < $count; $i++) {
+             $dots .= "../";
+         }
+-        $ret =~ s,^$match_dir,$dots,;
++        $ret =~ s,^\Q$match_dir\E,$dots,;
+     }
+     $ret =~ s,/+,/,g;
+     return $ret;
+@@ -507,13 +506,13 @@
+ 
+     if ($isunix) {
+         print "symlink created for $file " unless $quiet;
+-        if ( $force_relative && ($ifile =~ /^$basedir/)) {
++        if ( $force_relative && ($ifile =~ /^$quoted_basedir/)) {
+             my $t = getcwd();
+             my $c = -1;
+             my $p = "../";
+-            $t =~ s-^$basedir/--;
++            $t =~ s-^$quoted_basedir/--;
+             $p .= "../" while( ($c = index( $t, "/", $c + 1)) != -1 );
+-            $file =~ s-^$basedir/-$p-;
++            $file =~ s-^$quoted_basedir/-$p-;
+             print " ($file)
" unless $quiet;
+         }
+         print "
" unless $quiet;
+@@ -837,7 +836,7 @@
+                             @headers = ( "$out_basedir/include/$lib/$header" );
+ 
+                             # write forwarding headers to include/Qt
+-                            if ($lib ne "phonon" && $subdir =~ /^$basedir\/src/) {
++                            if ($lib ne "phonon" && $subdir =~ /^$quoted_basedir\/src/) {
+                                 my $file_name = "$out_basedir/include/Qt/$header";
+                                 my $file_op = '>';
+                                 my $header_content = '';
diff --git a/debian/patches/series b/debian/patches/series
index 694e119..5bacdb7 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -14,6 +14,7 @@ Fixed_bug_in_X11_backend_when_creating_translucent_windows.patch
 Take_Xft.hintstyle_by_default_to_match_the_behavior_of_GTK+.patch
 Fix_fontconfig_usage_in_X11_font_database.patch
 Check-if-the-interpolators-have-already-been-deleted.patch
+Bug-fix-Allow-QTDIR-to-contain-regex-metacharacters.patch
 
 # qt-copy patches
 0195-compositing-properties.diff

-- 
Qt 4 packaging