Mercurial Mercurial > upstream > spec-files-extra / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
2010-11-11 Brian Cameron <[email protected]>
authoryippi
Thu, 11 Nov 2010 14:02:46 +0000
changeset 3018 7949b316d9d4
parent 3017 ec9e2d2819a8
child 3019 338cdda28524
2010-11-11 Brian Cameron <[email protected]> * SFEqt.spec, patches/qt-02-libpng.diff: Add new patch needed to build. * patches/qt-01-use-bash.diff: Update so it applies with -p1 instead of -p10. * patches/qt-02-temp-removal-of-getresuid.diff: Remove unused patch.
ChangeLog file | annotate | diff | comparison | revisions
SFEqt.spec file | annotate | diff | comparison | revisions
patches/qt-01-use_bash.diff file | annotate | diff | comparison | revisions
patches/qt-02-libpng.diff file | annotate | diff | comparison | revisions
patches/qt-02-temp-removal-of-getresuid.diff file | annotate | diff | comparison | revisions 
--- a/ChangeLog	Wed Nov 10 22:57:45 2010 +0000
+++ b/ChangeLog	Thu Nov 11 14:02:46 2010 +0000
@@ -1,3 +1,10 @@
+2010-11-11  Brian Cameron  <[email protected]>
+
+	* SFEqt.spec, patches/qt-02-libpng.diff: Add new patch needed to build.
+	* patches/qt-01-use-bash.diff: Update so it applies with -p1 instead
+	  of -p10.
+	* patches/qt-02-temp-removal-of-getresuid.diff: Remove unused patch.
+
 2010-11-10  Alex Viskovatoff
 
 	* SFEmplayer-snap.spec: use fixed (constant) tarball by default,
--- a/SFEqt.spec	Wed Nov 10 22:57:45 2010 +0000
+++ b/SFEqt.spec	Thu Nov 11 14:02:46 2010 +0000
@@ -14,6 +14,7 @@
 Version:             4.4.3
 Source:              ftp://ftp.trolltech.com/qt/source/qt-x11-opensource-src-%{version}.tar.bz2
 Patch1:              qt-01-use_bash.diff
+Patch2:              qt-02-libpng.diff
 
 SUNW_BaseDir:        %{_basedir}
 BuildRoot:           %{_tmppath}/%{name}-%{version}-build
@@ -36,7 +37,8 @@
 
 %prep
 %setup -q -n qt-x11-opensource-src-%version
-%patch1 -p10
+%patch1 -p1
+%patch2 -p1
 
 %build
 CPUS=`/usr/sbin/psrinfo | grep on-line | wc -l | tr -d ' '`
--- a/patches/qt-01-use_bash.diff	Wed Nov 10 22:57:45 2010 +0000
+++ b/patches/qt-01-use_bash.diff	Thu Nov 11 14:02:46 2010 +0000
@@ -1,84 +1,84 @@
-diff -ur /zones/build/root/.zfs/snapshot/qt-original/export/home/user/packages/SOURCES/qt-x11-opensource-src-4.4.3/config.tests/mac/dwarf2.test /zones/build/root/export/home/user/packages/SOURCES/qt-x11-opensource-src-4.4.3/config.tests/mac/dwarf2.test
---- /zones/build/root/.zfs/snapshot/qt-original/export/home/user/packages/SOURCES/qt-x11-opensource-src-4.4.3/config.tests/mac/dwarf2.test	2008-09-27 10:58:41.000000000 +0200
-+++ /zones/build/root/export/home/user/packages/SOURCES/qt-x11-opensource-src-4.4.3/config.tests/mac/dwarf2.test	2008-11-24 09:02:33.253802603 +0100
+diff -ur qt-x11-opensource-src-4.4.3/config.tests/mac/dwarf2.test qt-x11-opensource-src-4.4.3/config.tests/mac/dwarf2.test
+--- qt-x11-opensource-src-4.4.3/config.tests/mac/dwarf2.test	2008-09-27 10:58:41.000000000 +0200
++++ qt-x11-opensource-src-4.4.3/config.tests/mac/dwarf2.test	2008-11-24 09:02:33.253802603 +0100
 @@ -1,1 +1,1 @@
 -#!/bin/sh
 +#!/bin/bash
-diff -ur /zones/build/root/.zfs/snapshot/qt-original/export/home/user/packages/SOURCES/qt-x11-opensource-src-4.4.3/config.tests/unix/bsymbolic_functions.test /zones/build/root/export/home/user/packages/SOURCES/qt-x11-opensource-src-4.4.3/config.tests/unix/bsymbolic_functions.test
---- /zones/build/root/.zfs/snapshot/qt-original/export/home/user/packages/SOURCES/qt-x11-opensource-src-4.4.3/config.tests/unix/bsymbolic_functions.test	2008-09-27 10:58:41.000000000 +0200
-+++ /zones/build/root/export/home/user/packages/SOURCES/qt-x11-opensource-src-4.4.3/config.tests/unix/bsymbolic_functions.test	2008-11-24 09:02:33.333810266 +0100
+diff -ur qt-x11-opensource-src-4.4.3/config.tests/unix/bsymbolic_functions.test qt-x11-opensource-src-4.4.3/config.tests/unix/bsymbolic_functions.test
+--- qt-x11-opensource-src-4.4.3/config.tests/unix/bsymbolic_functions.test	2008-09-27 10:58:41.000000000 +0200
++++ qt-x11-opensource-src-4.4.3/config.tests/unix/bsymbolic_functions.test	2008-11-24 09:02:33.333810266 +0100
 @@ -1,1 +1,1 @@
 -#!/bin/sh
 +#!/bin/bash
-diff -ur /zones/build/root/.zfs/snapshot/qt-original/export/home/user/packages/SOURCES/qt-x11-opensource-src-4.4.3/config.tests/unix/compile.test /zones/build/root/export/home/user/packages/SOURCES/qt-x11-opensource-src-4.4.3/config.tests/unix/compile.test
---- /zones/build/root/.zfs/snapshot/qt-original/export/home/user/packages/SOURCES/qt-x11-opensource-src-4.4.3/config.tests/unix/compile.test	2008-09-27 10:58:41.000000000 +0200
-+++ /zones/build/root/export/home/user/packages/SOURCES/qt-x11-opensource-src-4.4.3/config.tests/unix/compile.test	2008-11-24 09:02:33.342654826 +0100
+diff -ur qt-x11-opensource-src-4.4.3/config.tests/unix/compile.test qt-x11-opensource-src-4.4.3/config.tests/unix/compile.test
+--- qt-x11-opensource-src-4.4.3/config.tests/unix/compile.test	2008-09-27 10:58:41.000000000 +0200
++++ qt-x11-opensource-src-4.4.3/config.tests/unix/compile.test	2008-11-24 09:02:33.342654826 +0100
 @@ -1,1 +1,1 @@
 -#!/bin/sh
 +#!/bin/bash
-diff -ur /zones/build/root/.zfs/snapshot/qt-original/export/home/user/packages/SOURCES/qt-x11-opensource-src-4.4.3/config.tests/unix/doubleformat.test /zones/build/root/export/home/user/packages/SOURCES/qt-x11-opensource-src-4.4.3/config.tests/unix/doubleformat.test
---- /zones/build/root/.zfs/snapshot/qt-original/export/home/user/packages/SOURCES/qt-x11-opensource-src-4.4.3/config.tests/unix/doubleformat.test	2008-09-27 10:58:41.000000000 +0200
-+++ /zones/build/root/export/home/user/packages/SOURCES/qt-x11-opensource-src-4.4.3/config.tests/unix/doubleformat.test	2008-11-24 09:02:33.298452923 +0100
+diff -ur qt-x11-opensource-src-4.4.3/config.tests/unix/doubleformat.test qt-x11-opensource-src-4.4.3/config.tests/unix/doubleformat.test
+--- qt-x11-opensource-src-4.4.3/config.tests/unix/doubleformat.test	2008-09-27 10:58:41.000000000 +0200
++++ qt-x11-opensource-src-4.4.3/config.tests/unix/doubleformat.test	2008-11-24 09:02:33.298452923 +0100
 @@ -1,1 +1,1 @@
 -#!/bin/sh
 +#!/bin/bash
-diff -ur /zones/build/root/.zfs/snapshot/qt-original/export/home/user/packages/SOURCES/qt-x11-opensource-src-4.4.3/config.tests/unix/endian.test /zones/build/root/export/home/user/packages/SOURCES/qt-x11-opensource-src-4.4.3/config.tests/unix/endian.test
---- /zones/build/root/.zfs/snapshot/qt-original/export/home/user/packages/SOURCES/qt-x11-opensource-src-4.4.3/config.tests/unix/endian.test	2008-09-27 10:58:41.000000000 +0200
-+++ /zones/build/root/export/home/user/packages/SOURCES/qt-x11-opensource-src-4.4.3/config.tests/unix/endian.test	2008-11-24 09:02:33.307157996 +0100
+diff -ur qt-x11-opensource-src-4.4.3/config.tests/unix/endian.test qt-x11-opensource-src-4.4.3/config.tests/unix/endian.test
+--- qt-x11-opensource-src-4.4.3/config.tests/unix/endian.test	2008-09-27 10:58:41.000000000 +0200
++++ qt-x11-opensource-src-4.4.3/config.tests/unix/endian.test	2008-11-24 09:02:33.307157996 +0100
 @@ -1,1 +1,1 @@
 -#!/bin/sh
 +#!/bin/bash
-diff -ur /zones/build/root/.zfs/snapshot/qt-original/export/home/user/packages/SOURCES/qt-x11-opensource-src-4.4.3/config.tests/unix/fvisibility.test /zones/build/root/export/home/user/packages/SOURCES/qt-x11-opensource-src-4.4.3/config.tests/unix/fvisibility.test
---- /zones/build/root/.zfs/snapshot/qt-original/export/home/user/packages/SOURCES/qt-x11-opensource-src-4.4.3/config.tests/unix/fvisibility.test	2008-09-27 10:58:41.000000000 +0200
-+++ /zones/build/root/export/home/user/packages/SOURCES/qt-x11-opensource-src-4.4.3/config.tests/unix/fvisibility.test	2008-11-24 09:02:33.288763411 +0100
+diff -ur qt-x11-opensource-src-4.4.3/config.tests/unix/fvisibility.test qt-x11-opensource-src-4.4.3/config.tests/unix/fvisibility.test
+--- qt-x11-opensource-src-4.4.3/config.tests/unix/fvisibility.test	2008-09-27 10:58:41.000000000 +0200
++++ qt-x11-opensource-src-4.4.3/config.tests/unix/fvisibility.test	2008-11-24 09:02:33.288763411 +0100
 @@ -1,1 +1,1 @@
 -#!/bin/sh
 +#!/bin/bash
-diff -ur /zones/build/root/.zfs/snapshot/qt-original/export/home/user/packages/SOURCES/qt-x11-opensource-src-4.4.3/config.tests/unix/makeabs /zones/build/root/export/home/user/packages/SOURCES/qt-x11-opensource-src-4.4.3/config.tests/unix/makeabs
---- /zones/build/root/.zfs/snapshot/qt-original/export/home/user/packages/SOURCES/qt-x11-opensource-src-4.4.3/config.tests/unix/makeabs	2008-09-27 10:58:41.000000000 +0200
-+++ /zones/build/root/export/home/user/packages/SOURCES/qt-x11-opensource-src-4.4.3/config.tests/unix/makeabs	2008-11-24 09:02:33.271326461 +0100
+diff -ur qt-x11-opensource-src-4.4.3/config.tests/unix/makeabs qt-x11-opensource-src-4.4.3/config.tests/unix/makeabs
+--- qt-x11-opensource-src-4.4.3/config.tests/unix/makeabs	2008-09-27 10:58:41.000000000 +0200
++++ qt-x11-opensource-src-4.4.3/config.tests/unix/makeabs	2008-11-24 09:02:33.271326461 +0100
 @@ -1,1 +1,1 @@
 -#!/bin/sh
 +#!/bin/bash
-diff -ur /zones/build/root/.zfs/snapshot/qt-original/export/home/user/packages/SOURCES/qt-x11-opensource-src-4.4.3/config.tests/unix/objcopy.test /zones/build/root/export/home/user/packages/SOURCES/qt-x11-opensource-src-4.4.3/config.tests/unix/objcopy.test
---- /zones/build/root/.zfs/snapshot/qt-original/export/home/user/packages/SOURCES/qt-x11-opensource-src-4.4.3/config.tests/unix/objcopy.test	2008-09-27 10:58:41.000000000 +0200
-+++ /zones/build/root/export/home/user/packages/SOURCES/qt-x11-opensource-src-4.4.3/config.tests/unix/objcopy.test	2008-11-24 09:02:33.324931256 +0100
+diff -ur qt-x11-opensource-src-4.4.3/config.tests/unix/objcopy.test qt-x11-opensource-src-4.4.3/config.tests/unix/objcopy.test
+--- qt-x11-opensource-src-4.4.3/config.tests/unix/objcopy.test	2008-09-27 10:58:41.000000000 +0200
++++ qt-x11-opensource-src-4.4.3/config.tests/unix/objcopy.test	2008-11-24 09:02:33.324931256 +0100
 @@ -1,1 +1,1 @@
 -#!/bin/sh
 +#!/bin/bash
-diff -ur /zones/build/root/.zfs/snapshot/qt-original/export/home/user/packages/SOURCES/qt-x11-opensource-src-4.4.3/config.tests/unix/padstring /zones/build/root/export/home/user/packages/SOURCES/qt-x11-opensource-src-4.4.3/config.tests/unix/padstring
---- /zones/build/root/.zfs/snapshot/qt-original/export/home/user/packages/SOURCES/qt-x11-opensource-src-4.4.3/config.tests/unix/padstring	2008-09-27 10:58:41.000000000 +0200
-+++ /zones/build/root/export/home/user/packages/SOURCES/qt-x11-opensource-src-4.4.3/config.tests/unix/padstring	2008-11-24 09:02:33.351450722 +0100
+diff -ur qt-x11-opensource-src-4.4.3/config.tests/unix/padstring qt-x11-opensource-src-4.4.3/config.tests/unix/padstring
+--- qt-x11-opensource-src-4.4.3/config.tests/unix/padstring	2008-09-27 10:58:41.000000000 +0200
++++ qt-x11-opensource-src-4.4.3/config.tests/unix/padstring	2008-11-24 09:02:33.351450722 +0100
 @@ -1,1 +1,1 @@
 -#!/bin/sh
 +#!/bin/bash
-diff -ur /zones/build/root/.zfs/snapshot/qt-original/export/home/user/packages/SOURCES/qt-x11-opensource-src-4.4.3/config.tests/unix/precomp.test /zones/build/root/export/home/user/packages/SOURCES/qt-x11-opensource-src-4.4.3/config.tests/unix/precomp.test
---- /zones/build/root/.zfs/snapshot/qt-original/export/home/user/packages/SOURCES/qt-x11-opensource-src-4.4.3/config.tests/unix/precomp.test	2008-09-27 10:58:41.000000000 +0200
-+++ /zones/build/root/export/home/user/packages/SOURCES/qt-x11-opensource-src-4.4.3/config.tests/unix/precomp.test	2008-11-24 09:02:33.315708268 +0100
+diff -ur qt-x11-opensource-src-4.4.3/config.tests/unix/precomp.test qt-x11-opensource-src-4.4.3/config.tests/unix/precomp.test
+--- qt-x11-opensource-src-4.4.3/config.tests/unix/precomp.test	2008-09-27 10:58:41.000000000 +0200
++++ qt-x11-opensource-src-4.4.3/config.tests/unix/precomp.test	2008-11-24 09:02:33.315708268 +0100
 @@ -1,1 +1,1 @@
 -#!/bin/sh
 +#!/bin/bash
-diff -ur /zones/build/root/.zfs/snapshot/qt-original/export/home/user/packages/SOURCES/qt-x11-opensource-src-4.4.3/config.tests/unix/ptrsize.test /zones/build/root/export/home/user/packages/SOURCES/qt-x11-opensource-src-4.4.3/config.tests/unix/ptrsize.test
---- /zones/build/root/.zfs/snapshot/qt-original/export/home/user/packages/SOURCES/qt-x11-opensource-src-4.4.3/config.tests/unix/ptrsize.test	2008-09-27 10:58:41.000000000 +0200
-+++ /zones/build/root/export/home/user/packages/SOURCES/qt-x11-opensource-src-4.4.3/config.tests/unix/ptrsize.test	2008-11-24 09:02:33.359890415 +0100
+diff -ur qt-x11-opensource-src-4.4.3/config.tests/unix/ptrsize.test qt-x11-opensource-src-4.4.3/config.tests/unix/ptrsize.test
+--- qt-x11-opensource-src-4.4.3/config.tests/unix/ptrsize.test	2008-09-27 10:58:41.000000000 +0200
++++ qt-x11-opensource-src-4.4.3/config.tests/unix/ptrsize.test	2008-11-24 09:02:33.359890415 +0100
 @@ -1,1 +1,1 @@
 -#!/bin/sh
 +#!/bin/bash
-diff -ur /zones/build/root/.zfs/snapshot/qt-original/export/home/user/packages/SOURCES/qt-x11-opensource-src-4.4.3/config.tests/unix/which.test /zones/build/root/export/home/user/packages/SOURCES/qt-x11-opensource-src-4.4.3/config.tests/unix/which.test
---- /zones/build/root/.zfs/snapshot/qt-original/export/home/user/packages/SOURCES/qt-x11-opensource-src-4.4.3/config.tests/unix/which.test	2008-09-27 10:58:41.000000000 +0200
-+++ /zones/build/root/export/home/user/packages/SOURCES/qt-x11-opensource-src-4.4.3/config.tests/unix/which.test	2008-11-24 09:02:33.279702219 +0100
+diff -ur qt-x11-opensource-src-4.4.3/config.tests/unix/which.test qt-x11-opensource-src-4.4.3/config.tests/unix/which.test
+--- qt-x11-opensource-src-4.4.3/config.tests/unix/which.test	2008-09-27 10:58:41.000000000 +0200
++++ qt-x11-opensource-src-4.4.3/config.tests/unix/which.test	2008-11-24 09:02:33.279702219 +0100
 @@ -1,1 +1,1 @@
 -#!/bin/sh
 +#!/bin/bash
-diff -ur /zones/build/root/.zfs/snapshot/qt-original/export/home/user/packages/SOURCES/qt-x11-opensource-src-4.4.3/config.tests/x11/notype.test /zones/build/root/export/home/user/packages/SOURCES/qt-x11-opensource-src-4.4.3/config.tests/x11/notype.test
---- /zones/build/root/.zfs/snapshot/qt-original/export/home/user/packages/SOURCES/qt-x11-opensource-src-4.4.3/config.tests/x11/notype.test	2008-09-27 10:58:41.000000000 +0200
-+++ /zones/build/root/export/home/user/packages/SOURCES/qt-x11-opensource-src-4.4.3/config.tests/x11/notype.test	2008-11-24 09:02:33.262332934 +0100
+diff -ur qt-x11-opensource-src-4.4.3/config.tests/x11/notype.test qt-x11-opensource-src-4.4.3/config.tests/x11/notype.test
+--- qt-x11-opensource-src-4.4.3/config.tests/x11/notype.test	2008-09-27 10:58:41.000000000 +0200
++++ qt-x11-opensource-src-4.4.3/config.tests/x11/notype.test	2008-11-24 09:02:33.262332934 +0100
 @@ -1,1 +1,1 @@
 -#!/bin/sh
 +#!/bin/bash
-diff -ur /zones/build/root/.zfs/snapshot/qt-original/export/home/user/packages/SOURCES/qt-x11-opensource-src-4.4.3/configure /zones/build/root/export/home/user/packages/SOURCES/qt-x11-opensource-src-4.4.3/configure
---- /zones/build/root/.zfs/snapshot/qt-original/export/home/user/packages/SOURCES/qt-x11-opensource-src-4.4.3/configure	2008-09-27 10:58:41.000000000 +0200
-+++ /zones/build/root/export/home/user/packages/SOURCES/qt-x11-opensource-src-4.4.3/configure	2008-11-24 09:02:33.377355914 +0100
+diff -ur qt-x11-opensource-src-4.4.3/configure qt-x11-opensource-src-4.4.3/configure
+--- qt-x11-opensource-src-4.4.3/configure	2008-09-27 10:58:41.000000000 +0200
++++ qt-x11-opensource-src-4.4.3/configure	2008-11-24 09:02:33.377355914 +0100
 @@ -1,4 +1,4 @@
 -#!/bin/sh
 +#!/bin/bash
@@ -103,126 +103,126 @@
      echo "if [ \"\$#\" -gt 0 ]; then" >> "$outpath/config.status"
      echo "  $CONFIG_STATUS \"\$@\"" >> "$outpath/config.status"
      echo "else" >> "$outpath/config.status"
-diff -ur /zones/build/root/.zfs/snapshot/qt-original/export/home/user/packages/SOURCES/qt-x11-opensource-src-4.4.3/src/3rdparty/freetype/autogen.sh /zones/build/root/export/home/user/packages/SOURCES/qt-x11-opensource-src-4.4.3/src/3rdparty/freetype/autogen.sh
---- /zones/build/root/.zfs/snapshot/qt-original/export/home/user/packages/SOURCES/qt-x11-opensource-src-4.4.3/src/3rdparty/freetype/autogen.sh	2008-09-27 10:58:44.000000000 +0200
-+++ /zones/build/root/export/home/user/packages/SOURCES/qt-x11-opensource-src-4.4.3/src/3rdparty/freetype/autogen.sh	2008-11-24 09:02:33.140634197 +0100
+diff -ur qt-x11-opensource-src-4.4.3/src/3rdparty/freetype/autogen.sh qt-x11-opensource-src-4.4.3/src/3rdparty/freetype/autogen.sh
+--- qt-x11-opensource-src-4.4.3/src/3rdparty/freetype/autogen.sh	2008-09-27 10:58:44.000000000 +0200
++++ qt-x11-opensource-src-4.4.3/src/3rdparty/freetype/autogen.sh	2008-11-24 09:02:33.140634197 +0100
 @@ -1,1 +1,1 @@
 -#!/bin/sh
 +#!/bin/bash
  
  # Copyright 2005, 2006, 2007 by
  # David Turner, Robert Wilhelm, and Werner Lemberg.
-diff -ur /zones/build/root/.zfs/snapshot/qt-original/export/home/user/packages/SOURCES/qt-x11-opensource-src-4.4.3/src/3rdparty/freetype/builds/unix/config.guess /zones/build/root/export/home/user/packages/SOURCES/qt-x11-opensource-src-4.4.3/src/3rdparty/freetype/builds/unix/config.guess
---- /zones/build/root/.zfs/snapshot/qt-original/export/home/user/packages/SOURCES/qt-x11-opensource-src-4.4.3/src/3rdparty/freetype/builds/unix/config.guess	2008-09-27 10:58:44.000000000 +0200
-+++ /zones/build/root/export/home/user/packages/SOURCES/qt-x11-opensource-src-4.4.3/src/3rdparty/freetype/builds/unix/config.guess	2008-11-24 09:02:33.208987503 +0100
+diff -ur qt-x11-opensource-src-4.4.3/src/3rdparty/freetype/builds/unix/config.guess qt-x11-opensource-src-4.4.3/src/3rdparty/freetype/builds/unix/config.guess
+--- qt-x11-opensource-src-4.4.3/src/3rdparty/freetype/builds/unix/config.guess	2008-09-27 10:58:44.000000000 +0200
++++ qt-x11-opensource-src-4.4.3/src/3rdparty/freetype/builds/unix/config.guess	2008-11-24 09:02:33.208987503 +0100
 @@ -1,1 +1,1 @@
 -#! /bin/sh
 +#! /bin/bash
-diff -ur /zones/build/root/.zfs/snapshot/qt-original/export/home/user/packages/SOURCES/qt-x11-opensource-src-4.4.3/src/3rdparty/freetype/builds/unix/config.sub /zones/build/root/export/home/user/packages/SOURCES/qt-x11-opensource-src-4.4.3/src/3rdparty/freetype/builds/unix/config.sub
---- /zones/build/root/.zfs/snapshot/qt-original/export/home/user/packages/SOURCES/qt-x11-opensource-src-4.4.3/src/3rdparty/freetype/builds/unix/config.sub	2008-09-27 10:58:44.000000000 +0200
-+++ /zones/build/root/export/home/user/packages/SOURCES/qt-x11-opensource-src-4.4.3/src/3rdparty/freetype/builds/unix/config.sub	2008-11-24 09:02:33.198106789 +0100
+diff -ur qt-x11-opensource-src-4.4.3/src/3rdparty/freetype/builds/unix/config.sub qt-x11-opensource-src-4.4.3/src/3rdparty/freetype/builds/unix/config.sub
+--- qt-x11-opensource-src-4.4.3/src/3rdparty/freetype/builds/unix/config.sub	2008-09-27 10:58:44.000000000 +0200
++++ qt-x11-opensource-src-4.4.3/src/3rdparty/freetype/builds/unix/config.sub	2008-11-24 09:02:33.198106789 +0100
 @@ -1,1 +1,1 @@
 -#! /bin/sh
 +#! /bin/bash
-diff -ur /zones/build/root/.zfs/snapshot/qt-original/export/home/user/packages/SOURCES/qt-x11-opensource-src-4.4.3/src/3rdparty/freetype/builds/unix/configure /zones/build/root/export/home/user/packages/SOURCES/qt-x11-opensource-src-4.4.3/src/3rdparty/freetype/builds/unix/configure
---- /zones/build/root/.zfs/snapshot/qt-original/export/home/user/packages/SOURCES/qt-x11-opensource-src-4.4.3/src/3rdparty/freetype/builds/unix/configure	2008-09-27 10:58:44.000000000 +0200
-+++ /zones/build/root/export/home/user/packages/SOURCES/qt-x11-opensource-src-4.4.3/src/3rdparty/freetype/builds/unix/configure	2008-11-24 09:02:33.186318744 +0100
+diff -ur qt-x11-opensource-src-4.4.3/src/3rdparty/freetype/builds/unix/configure qt-x11-opensource-src-4.4.3/src/3rdparty/freetype/builds/unix/configure
+--- qt-x11-opensource-src-4.4.3/src/3rdparty/freetype/builds/unix/configure	2008-09-27 10:58:44.000000000 +0200
++++ qt-x11-opensource-src-4.4.3/src/3rdparty/freetype/builds/unix/configure	2008-11-24 09:02:33.186318744 +0100
 @@ -1,1 +1,1 @@
 -#! /bin/sh
 +#! /bin/bash
-diff -ur /zones/build/root/.zfs/snapshot/qt-original/export/home/user/packages/SOURCES/qt-x11-opensource-src-4.4.3/src/3rdparty/freetype/builds/unix/freetype-config.in /zones/build/root/export/home/user/packages/SOURCES/qt-x11-opensource-src-4.4.3/src/3rdparty/freetype/builds/unix/freetype-config.in
---- /zones/build/root/.zfs/snapshot/qt-original/export/home/user/packages/SOURCES/qt-x11-opensource-src-4.4.3/src/3rdparty/freetype/builds/unix/freetype-config.in	2008-09-27 10:58:44.000000000 +0200
-+++ /zones/build/root/export/home/user/packages/SOURCES/qt-x11-opensource-src-4.4.3/src/3rdparty/freetype/builds/unix/freetype-config.in	2008-11-24 09:02:33.218018602 +0100
+diff -ur qt-x11-opensource-src-4.4.3/src/3rdparty/freetype/builds/unix/freetype-config.in qt-x11-opensource-src-4.4.3/src/3rdparty/freetype/builds/unix/freetype-config.in
+--- qt-x11-opensource-src-4.4.3/src/3rdparty/freetype/builds/unix/freetype-config.in	2008-09-27 10:58:44.000000000 +0200
++++ qt-x11-opensource-src-4.4.3/src/3rdparty/freetype/builds/unix/freetype-config.in	2008-11-24 09:02:33.218018602 +0100
 @@ -1,1 +1,1 @@
 -#! /bin/sh
 +#! /bin/bash
-diff -ur /zones/build/root/.zfs/snapshot/qt-original/export/home/user/packages/SOURCES/qt-x11-opensource-src-4.4.3/src/3rdparty/freetype/builds/unix/install-sh /zones/build/root/export/home/user/packages/SOURCES/qt-x11-opensource-src-4.4.3/src/3rdparty/freetype/builds/unix/install-sh
---- /zones/build/root/.zfs/snapshot/qt-original/export/home/user/packages/SOURCES/qt-x11-opensource-src-4.4.3/src/3rdparty/freetype/builds/unix/install-sh	2008-09-27 10:58:44.000000000 +0200
-+++ /zones/build/root/export/home/user/packages/SOURCES/qt-x11-opensource-src-4.4.3/src/3rdparty/freetype/builds/unix/install-sh	2008-11-24 09:02:33.150200976 +0100
+diff -ur qt-x11-opensource-src-4.4.3/src/3rdparty/freetype/builds/unix/install-sh qt-x11-opensource-src-4.4.3/src/3rdparty/freetype/builds/unix/install-sh
+--- qt-x11-opensource-src-4.4.3/src/3rdparty/freetype/builds/unix/install-sh	2008-09-27 10:58:44.000000000 +0200
++++ qt-x11-opensource-src-4.4.3/src/3rdparty/freetype/builds/unix/install-sh	2008-11-24 09:02:33.150200976 +0100
 @@ -1,1 +1,1 @@
 -#!/bin/sh
 +#!/bin/bash
-diff -ur /zones/build/root/.zfs/snapshot/qt-original/export/home/user/packages/SOURCES/qt-x11-opensource-src-4.4.3/src/3rdparty/freetype/builds/unix/mkinstalldirs /zones/build/root/export/home/user/packages/SOURCES/qt-x11-opensource-src-4.4.3/src/3rdparty/freetype/builds/unix/mkinstalldirs
---- /zones/build/root/.zfs/snapshot/qt-original/export/home/user/packages/SOURCES/qt-x11-opensource-src-4.4.3/src/3rdparty/freetype/builds/unix/mkinstalldirs	2008-09-27 10:58:44.000000000 +0200
-+++ /zones/build/root/export/home/user/packages/SOURCES/qt-x11-opensource-src-4.4.3/src/3rdparty/freetype/builds/unix/mkinstalldirs	2008-11-24 09:02:33.158972305 +0100
+diff -ur qt-x11-opensource-src-4.4.3/src/3rdparty/freetype/builds/unix/mkinstalldirs qt-x11-opensource-src-4.4.3/src/3rdparty/freetype/builds/unix/mkinstalldirs
+--- qt-x11-opensource-src-4.4.3/src/3rdparty/freetype/builds/unix/mkinstalldirs	2008-09-27 10:58:44.000000000 +0200
++++ qt-x11-opensource-src-4.4.3/src/3rdparty/freetype/builds/unix/mkinstalldirs	2008-11-24 09:02:33.158972305 +0100
 @@ -1,1 +1,1 @@
 -#! /bin/sh
 +#! /bin/bash
-diff -ur /zones/build/root/.zfs/snapshot/qt-original/export/home/user/packages/SOURCES/qt-x11-opensource-src-4.4.3/src/3rdparty/freetype/configure /zones/build/root/export/home/user/packages/SOURCES/qt-x11-opensource-src-4.4.3/src/3rdparty/freetype/configure
---- /zones/build/root/.zfs/snapshot/qt-original/export/home/user/packages/SOURCES/qt-x11-opensource-src-4.4.3/src/3rdparty/freetype/configure	2008-09-27 10:58:44.000000000 +0200
-+++ /zones/build/root/export/home/user/packages/SOURCES/qt-x11-opensource-src-4.4.3/src/3rdparty/freetype/configure	2008-11-24 09:02:33.131796789 +0100
+diff -ur qt-x11-opensource-src-4.4.3/src/3rdparty/freetype/configure qt-x11-opensource-src-4.4.3/src/3rdparty/freetype/configure
+--- qt-x11-opensource-src-4.4.3/src/3rdparty/freetype/configure	2008-09-27 10:58:44.000000000 +0200
++++ qt-x11-opensource-src-4.4.3/src/3rdparty/freetype/configure	2008-11-24 09:02:33.131796789 +0100
 @@ -1,1 +1,1 @@
 -#!/bin/sh
 +#!/bin/bash
-diff -ur /zones/build/root/.zfs/snapshot/qt-original/export/home/user/packages/SOURCES/qt-x11-opensource-src-4.4.3/src/3rdparty/harfbuzz/autogen.sh /zones/build/root/export/home/user/packages/SOURCES/qt-x11-opensource-src-4.4.3/src/3rdparty/harfbuzz/autogen.sh
---- /zones/build/root/.zfs/snapshot/qt-original/export/home/user/packages/SOURCES/qt-x11-opensource-src-4.4.3/src/3rdparty/harfbuzz/autogen.sh	2008-09-27 10:58:44.000000000 +0200
-+++ /zones/build/root/export/home/user/packages/SOURCES/qt-x11-opensource-src-4.4.3/src/3rdparty/harfbuzz/autogen.sh	2008-11-24 09:02:33.087773395 +0100
+diff -ur qt-x11-opensource-src-4.4.3/src/3rdparty/harfbuzz/autogen.sh qt-x11-opensource-src-4.4.3/src/3rdparty/harfbuzz/autogen.sh
+--- qt-x11-opensource-src-4.4.3/src/3rdparty/harfbuzz/autogen.sh	2008-09-27 10:58:44.000000000 +0200
++++ qt-x11-opensource-src-4.4.3/src/3rdparty/harfbuzz/autogen.sh	2008-11-24 09:02:33.087773395 +0100
 @@ -1,1 +1,1 @@
 -#!/bin/sh
 +#!/bin/bash
-diff -ur /zones/build/root/.zfs/snapshot/qt-original/export/home/user/packages/SOURCES/qt-x11-opensource-src-4.4.3/src/3rdparty/kdelibs/phonon/preprocessandextract.sh /zones/build/root/export/home/user/packages/SOURCES/qt-x11-opensource-src-4.4.3/src/3rdparty/kdelibs/phonon/preprocessandextract.sh
---- /zones/build/root/.zfs/snapshot/qt-original/export/home/user/packages/SOURCES/qt-x11-opensource-src-4.4.3/src/3rdparty/kdelibs/phonon/preprocessandextract.sh	2008-09-27 10:58:44.000000000 +0200
-+++ /zones/build/root/export/home/user/packages/SOURCES/qt-x11-opensource-src-4.4.3/src/3rdparty/kdelibs/phonon/preprocessandextract.sh	2008-11-24 09:02:32.964675528 +0100
+diff -ur qt-x11-opensource-src-4.4.3/src/3rdparty/kdelibs/phonon/preprocessandextract.sh qt-x11-opensource-src-4.4.3/src/3rdparty/kdelibs/phonon/preprocessandextract.sh
+--- qt-x11-opensource-src-4.4.3/src/3rdparty/kdelibs/phonon/preprocessandextract.sh	2008-09-27 10:58:44.000000000 +0200
++++ qt-x11-opensource-src-4.4.3/src/3rdparty/kdelibs/phonon/preprocessandextract.sh	2008-11-24 09:02:32.964675528 +0100
 @@ -1,1 +1,1 @@
 -#!/bin/sh
 +#!/bin/bash
-diff -ur /zones/build/root/.zfs/snapshot/qt-original/export/home/user/packages/SOURCES/qt-x11-opensource-src-4.4.3/src/3rdparty/libpng/configure /zones/build/root/export/home/user/packages/SOURCES/qt-x11-opensource-src-4.4.3/src/3rdparty/libpng/configure
---- /zones/build/root/.zfs/snapshot/qt-original/export/home/user/packages/SOURCES/qt-x11-opensource-src-4.4.3/src/3rdparty/libpng/configure	2008-09-27 10:58:44.000000000 +0200
-+++ /zones/build/root/export/home/user/packages/SOURCES/qt-x11-opensource-src-4.4.3/src/3rdparty/libpng/configure	2008-11-24 09:02:32.955400176 +0100
+diff -ur qt-x11-opensource-src-4.4.3/src/3rdparty/libpng/configure qt-x11-opensource-src-4.4.3/src/3rdparty/libpng/configure
+--- qt-x11-opensource-src-4.4.3/src/3rdparty/libpng/configure	2008-09-27 10:58:44.000000000 +0200
++++ qt-x11-opensource-src-4.4.3/src/3rdparty/libpng/configure	2008-11-24 09:02:32.955400176 +0100
 @@ -1,1 +1,1 @@
 -#!/bin/sh
 +#!/bin/bash
-diff -ur /zones/build/root/.zfs/snapshot/qt-original/export/home/user/packages/SOURCES/qt-x11-opensource-src-4.4.3/src/3rdparty/libpng/scripts/libpng-config-head.in /zones/build/root/export/home/user/packages/SOURCES/qt-x11-opensource-src-4.4.3/src/3rdparty/libpng/scripts/libpng-config-head.in
---- /zones/build/root/.zfs/snapshot/qt-original/export/home/user/packages/SOURCES/qt-x11-opensource-src-4.4.3/src/3rdparty/libpng/scripts/libpng-config-head.in	2008-09-27 10:58:44.000000000 +0200
-+++ /zones/build/root/export/home/user/packages/SOURCES/qt-x11-opensource-src-4.4.3/src/3rdparty/libpng/scripts/libpng-config-head.in	2008-11-24 09:02:32.946702882 +0100
+diff -ur qt-x11-opensource-src-4.4.3/src/3rdparty/libpng/scripts/libpng-config-head.in qt-x11-opensource-src-4.4.3/src/3rdparty/libpng/scripts/libpng-config-head.in
+--- qt-x11-opensource-src-4.4.3/src/3rdparty/libpng/scripts/libpng-config-head.in	2008-09-27 10:58:44.000000000 +0200
++++ qt-x11-opensource-src-4.4.3/src/3rdparty/libpng/scripts/libpng-config-head.in	2008-11-24 09:02:32.946702882 +0100
 @@ -1,1 +1,1 @@
 -#! /bin/sh
 +#! /bin/bash
-diff -ur /zones/build/root/.zfs/snapshot/qt-original/export/home/user/packages/SOURCES/qt-x11-opensource-src-4.4.3/src/3rdparty/libpng/scripts/libpng-config.in /zones/build/root/export/home/user/packages/SOURCES/qt-x11-opensource-src-4.4.3/src/3rdparty/libpng/scripts/libpng-config.in
---- /zones/build/root/.zfs/snapshot/qt-original/export/home/user/packages/SOURCES/qt-x11-opensource-src-4.4.3/src/3rdparty/libpng/scripts/libpng-config.in	2008-09-27 10:58:44.000000000 +0200
-+++ /zones/build/root/export/home/user/packages/SOURCES/qt-x11-opensource-src-4.4.3/src/3rdparty/libpng/scripts/libpng-config.in	2008-11-24 09:02:32.938212197 +0100
+diff -ur qt-x11-opensource-src-4.4.3/src/3rdparty/libpng/scripts/libpng-config.in qt-x11-opensource-src-4.4.3/src/3rdparty/libpng/scripts/libpng-config.in
+--- qt-x11-opensource-src-4.4.3/src/3rdparty/libpng/scripts/libpng-config.in	2008-09-27 10:58:44.000000000 +0200
++++ qt-x11-opensource-src-4.4.3/src/3rdparty/libpng/scripts/libpng-config.in	2008-11-24 09:02:32.938212197 +0100
 @@ -1,1 +1,1 @@
 -#! /bin/sh
 +#! /bin/bash
-diff -ur /zones/build/root/.zfs/snapshot/qt-original/export/home/user/packages/SOURCES/qt-x11-opensource-src-4.4.3/src/3rdparty/libtiff/autogen.sh /zones/build/root/export/home/user/packages/SOURCES/qt-x11-opensource-src-4.4.3/src/3rdparty/libtiff/autogen.sh
---- /zones/build/root/.zfs/snapshot/qt-original/export/home/user/packages/SOURCES/qt-x11-opensource-src-4.4.3/src/3rdparty/libtiff/autogen.sh	2008-09-27 10:58:44.000000000 +0200
-+++ /zones/build/root/export/home/user/packages/SOURCES/qt-x11-opensource-src-4.4.3/src/3rdparty/libtiff/autogen.sh	2008-11-24 09:02:33.043075526 +0100
+diff -ur qt-x11-opensource-src-4.4.3/src/3rdparty/libtiff/autogen.sh qt-x11-opensource-src-4.4.3/src/3rdparty/libtiff/autogen.sh
+--- qt-x11-opensource-src-4.4.3/src/3rdparty/libtiff/autogen.sh	2008-09-27 10:58:44.000000000 +0200
++++ qt-x11-opensource-src-4.4.3/src/3rdparty/libtiff/autogen.sh	2008-11-24 09:02:33.043075526 +0100
 @@ -1,1 +1,1 @@
 -#!/bin/sh
 +#!/bin/bash
-diff -ur /zones/build/root/.zfs/snapshot/qt-original/export/home/user/packages/SOURCES/qt-x11-opensource-src-4.4.3/src/3rdparty/libtiff/config/compile /zones/build/root/export/home/user/packages/SOURCES/qt-x11-opensource-src-4.4.3/src/3rdparty/libtiff/config/compile
---- /zones/build/root/.zfs/snapshot/qt-original/export/home/user/packages/SOURCES/qt-x11-opensource-src-4.4.3/src/3rdparty/libtiff/config/compile	2008-09-27 10:58:44.000000000 +0200
-+++ /zones/build/root/export/home/user/packages/SOURCES/qt-x11-opensource-src-4.4.3/src/3rdparty/libtiff/config/compile	2008-11-24 09:02:32.974245808 +0100
+diff -ur qt-x11-opensource-src-4.4.3/src/3rdparty/libtiff/config/compile qt-x11-opensource-src-4.4.3/src/3rdparty/libtiff/config/compile
+--- qt-x11-opensource-src-4.4.3/src/3rdparty/libtiff/config/compile	2008-09-27 10:58:44.000000000 +0200
++++ qt-x11-opensource-src-4.4.3/src/3rdparty/libtiff/config/compile	2008-11-24 09:02:32.974245808 +0100
 @@ -1,1 +1,1 @@
 -#! /bin/sh
 +#! /bin/bash
-diff -ur /zones/build/root/.zfs/snapshot/qt-original/export/home/user/packages/SOURCES/qt-x11-opensource-src-4.4.3/src/3rdparty/libtiff/config/config.guess /zones/build/root/export/home/user/packages/SOURCES/qt-x11-opensource-src-4.4.3/src/3rdparty/libtiff/config/config.guess
---- /zones/build/root/.zfs/snapshot/qt-original/export/home/user/packages/SOURCES/qt-x11-opensource-src-4.4.3/src/3rdparty/libtiff/config/config.guess	2008-09-27 10:58:44.000000000 +0200
-+++ /zones/build/root/export/home/user/packages/SOURCES/qt-x11-opensource-src-4.4.3/src/3rdparty/libtiff/config/config.guess	2008-11-24 09:02:33.034069805 +0100
+diff -ur qt-x11-opensource-src-4.4.3/src/3rdparty/libtiff/config/config.guess qt-x11-opensource-src-4.4.3/src/3rdparty/libtiff/config/config.guess
+--- qt-x11-opensource-src-4.4.3/src/3rdparty/libtiff/config/config.guess	2008-09-27 10:58:44.000000000 +0200
++++ qt-x11-opensource-src-4.4.3/src/3rdparty/libtiff/config/config.guess	2008-11-24 09:02:33.034069805 +0100
 @@ -1,1 +1,1 @@
 -#! /bin/sh
 +#! /bin/bash
-diff -ur /zones/build/root/.zfs/snapshot/qt-original/export/home/user/packages/SOURCES/qt-x11-opensource-src-4.4.3/src/3rdparty/libtiff/config/config.sub /zones/build/root/export/home/user/packages/SOURCES/qt-x11-opensource-src-4.4.3/src/3rdparty/libtiff/config/config.sub
---- /zones/build/root/.zfs/snapshot/qt-original/export/home/user/packages/SOURCES/qt-x11-opensource-src-4.4.3/src/3rdparty/libtiff/config/config.sub	2008-09-27 10:58:44.000000000 +0200
-+++ /zones/build/root/export/home/user/packages/SOURCES/qt-x11-opensource-src-4.4.3/src/3rdparty/libtiff/config/config.sub	2008-11-24 09:02:32.994937427 +0100
+diff -ur qt-x11-opensource-src-4.4.3/src/3rdparty/libtiff/config/config.sub qt-x11-opensource-src-4.4.3/src/3rdparty/libtiff/config/config.sub
+--- qt-x11-opensource-src-4.4.3/src/3rdparty/libtiff/config/config.sub	2008-09-27 10:58:44.000000000 +0200
++++ qt-x11-opensource-src-4.4.3/src/3rdparty/libtiff/config/config.sub	2008-11-24 09:02:32.994937427 +0100
 @@ -1,1 +1,1 @@
 -#! /bin/sh
 +#! /bin/bash
-diff -ur /zones/build/root/.zfs/snapshot/qt-original/export/home/user/packages/SOURCES/qt-x11-opensource-src-4.4.3/src/3rdparty/libtiff/config/depcomp /zones/build/root/export/home/user/packages/SOURCES/qt-x11-opensource-src-4.4.3/src/3rdparty/libtiff/config/depcomp
---- /zones/build/root/.zfs/snapshot/qt-original/export/home/user/packages/SOURCES/qt-x11-opensource-src-4.4.3/src/3rdparty/libtiff/config/depcomp	2008-09-27 10:58:44.000000000 +0200
-+++ /zones/build/root/export/home/user/packages/SOURCES/qt-x11-opensource-src-4.4.3/src/3rdparty/libtiff/config/depcomp	2008-11-24 09:02:33.014195475 +0100
+diff -ur qt-x11-opensource-src-4.4.3/src/3rdparty/libtiff/config/depcomp qt-x11-opensource-src-4.4.3/src/3rdparty/libtiff/config/depcomp
+--- qt-x11-opensource-src-4.4.3/src/3rdparty/libtiff/config/depcomp	2008-09-27 10:58:44.000000000 +0200
++++ qt-x11-opensource-src-4.4.3/src/3rdparty/libtiff/config/depcomp	2008-11-24 09:02:33.014195475 +0100
 @@ -1,1 +1,1 @@
 -#! /bin/sh
 +#! /bin/bash
-diff -ur /zones/build/root/.zfs/snapshot/qt-original/export/home/user/packages/SOURCES/qt-x11-opensource-src-4.4.3/src/3rdparty/libtiff/config/install-sh /zones/build/root/export/home/user/packages/SOURCES/qt-x11-opensource-src-4.4.3/src/3rdparty/libtiff/config/install-sh
---- /zones/build/root/.zfs/snapshot/qt-original/export/home/user/packages/SOURCES/qt-x11-opensource-src-4.4.3/src/3rdparty/libtiff/config/install-sh	2008-09-27 10:58:44.000000000 +0200
-+++ /zones/build/root/export/home/user/packages/SOURCES/qt-x11-opensource-src-4.4.3/src/3rdparty/libtiff/config/install-sh	2008-11-24 09:02:33.023778896 +0100
+diff -ur qt-x11-opensource-src-4.4.3/src/3rdparty/libtiff/config/install-sh qt-x11-opensource-src-4.4.3/src/3rdparty/libtiff/config/install-sh
+--- qt-x11-opensource-src-4.4.3/src/3rdparty/libtiff/config/install-sh	2008-09-27 10:58:44.000000000 +0200
++++ qt-x11-opensource-src-4.4.3/src/3rdparty/libtiff/config/install-sh	2008-11-24 09:02:33.023778896 +0100
 @@ -1,1 +1,1 @@
 -#!/bin/sh
 +#!/bin/bash
-diff -ur /zones/build/root/.zfs/snapshot/qt-original/export/home/user/packages/SOURCES/qt-x11-opensource-src-4.4.3/src/3rdparty/libtiff/config/missing /zones/build/root/export/home/user/packages/SOURCES/qt-x11-opensource-src-4.4.3/src/3rdparty/libtiff/config/missing
---- /zones/build/root/.zfs/snapshot/qt-original/export/home/user/packages/SOURCES/qt-x11-opensource-src-4.4.3/src/3rdparty/libtiff/config/missing	2008-09-27 10:58:44.000000000 +0200
-+++ /zones/build/root/export/home/user/packages/SOURCES/qt-x11-opensource-src-4.4.3/src/3rdparty/libtiff/config/missing	2008-11-24 09:02:33.004261846 +0100
+diff -ur qt-x11-opensource-src-4.4.3/src/3rdparty/libtiff/config/missing qt-x11-opensource-src-4.4.3/src/3rdparty/libtiff/config/missing
+--- qt-x11-opensource-src-4.4.3/src/3rdparty/libtiff/config/missing	2008-09-27 10:58:44.000000000 +0200
++++ qt-x11-opensource-src-4.4.3/src/3rdparty/libtiff/config/missing	2008-11-24 09:02:33.004261846 +0100
 @@ -1,4 +1,4 @@
 -#! /bin/sh
 +#! /bin/bash
@@ -238,15 +238,15 @@
  	echo "# Created by GNU Automake missing as a replacement of"
  	echo "#  $ $@"
  	echo "exit 0"
-diff -ur /zones/build/root/.zfs/snapshot/qt-original/export/home/user/packages/SOURCES/qt-x11-opensource-src-4.4.3/src/3rdparty/libtiff/config/mkinstalldirs /zones/build/root/export/home/user/packages/SOURCES/qt-x11-opensource-src-4.4.3/src/3rdparty/libtiff/config/mkinstalldirs
---- /zones/build/root/.zfs/snapshot/qt-original/export/home/user/packages/SOURCES/qt-x11-opensource-src-4.4.3/src/3rdparty/libtiff/config/mkinstalldirs	2008-09-27 10:58:44.000000000 +0200
-+++ /zones/build/root/export/home/user/packages/SOURCES/qt-x11-opensource-src-4.4.3/src/3rdparty/libtiff/config/mkinstalldirs	2008-11-24 09:02:32.983340474 +0100
+diff -ur qt-x11-opensource-src-4.4.3/src/3rdparty/libtiff/config/mkinstalldirs qt-x11-opensource-src-4.4.3/src/3rdparty/libtiff/config/mkinstalldirs
+--- qt-x11-opensource-src-4.4.3/src/3rdparty/libtiff/config/mkinstalldirs	2008-09-27 10:58:44.000000000 +0200
++++ qt-x11-opensource-src-4.4.3/src/3rdparty/libtiff/config/mkinstalldirs	2008-11-24 09:02:32.983340474 +0100
 @@ -1,1 +1,1 @@
 -#! /bin/sh
 +#! /bin/bash
-diff -ur /zones/build/root/.zfs/snapshot/qt-original/export/home/user/packages/SOURCES/qt-x11-opensource-src-4.4.3/src/3rdparty/libtiff/configure /zones/build/root/export/home/user/packages/SOURCES/qt-x11-opensource-src-4.4.3/src/3rdparty/libtiff/configure
---- /zones/build/root/.zfs/snapshot/qt-original/export/home/user/packages/SOURCES/qt-x11-opensource-src-4.4.3/src/3rdparty/libtiff/configure	2008-09-27 10:58:44.000000000 +0200
-+++ /zones/build/root/export/home/user/packages/SOURCES/qt-x11-opensource-src-4.4.3/src/3rdparty/libtiff/configure	2008-11-24 09:02:33.078569342 +0100
+diff -ur qt-x11-opensource-src-4.4.3/src/3rdparty/libtiff/configure qt-x11-opensource-src-4.4.3/src/3rdparty/libtiff/configure
+--- qt-x11-opensource-src-4.4.3/src/3rdparty/libtiff/configure	2008-09-27 10:58:44.000000000 +0200
++++ qt-x11-opensource-src-4.4.3/src/3rdparty/libtiff/configure	2008-11-24 09:02:33.078569342 +0100
 @@ -1,1 +1,1 @@
 -#! /bin/sh
 +#! /bin/bash
@@ -268,51 +268,51 @@
    echo  "exit 0"   >>conf$$.sh
    chmod +x conf$$.sh
    if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
-diff -ur /zones/build/root/.zfs/snapshot/qt-original/export/home/user/packages/SOURCES/qt-x11-opensource-src-4.4.3/src/3rdparty/webkit/JavaScriptCore/make-generated-sources.sh /zones/build/root/export/home/user/packages/SOURCES/qt-x11-opensource-src-4.4.3/src/3rdparty/webkit/JavaScriptCore/make-generated-sources.sh
---- /zones/build/root/.zfs/snapshot/qt-original/export/home/user/packages/SOURCES/qt-x11-opensource-src-4.4.3/src/3rdparty/webkit/JavaScriptCore/make-generated-sources.sh	2008-09-27 10:58:45.000000000 +0200
-+++ /zones/build/root/export/home/user/packages/SOURCES/qt-x11-opensource-src-4.4.3/src/3rdparty/webkit/JavaScriptCore/make-generated-sources.sh	2008-11-24 09:02:33.096504351 +0100
+diff -ur qt-x11-opensource-src-4.4.3/src/3rdparty/webkit/JavaScriptCore/make-generated-sources.sh qt-x11-opensource-src-4.4.3/src/3rdparty/webkit/JavaScriptCore/make-generated-sources.sh
+--- qt-x11-opensource-src-4.4.3/src/3rdparty/webkit/JavaScriptCore/make-generated-sources.sh	2008-09-27 10:58:45.000000000 +0200
++++ qt-x11-opensource-src-4.4.3/src/3rdparty/webkit/JavaScriptCore/make-generated-sources.sh	2008-11-24 09:02:33.096504351 +0100
 @@ -1,1 +1,1 @@
 -#!/bin/sh
 +#!/bin/bash
-diff -ur /zones/build/root/.zfs/snapshot/qt-original/export/home/user/packages/SOURCES/qt-x11-opensource-src-4.4.3/src/3rdparty/webkit/WebCore/make-generated-sources.sh /zones/build/root/export/home/user/packages/SOURCES/qt-x11-opensource-src-4.4.3/src/3rdparty/webkit/WebCore/make-generated-sources.sh
---- /zones/build/root/.zfs/snapshot/qt-original/export/home/user/packages/SOURCES/qt-x11-opensource-src-4.4.3/src/3rdparty/webkit/WebCore/make-generated-sources.sh	2008-09-27 10:58:46.000000000 +0200
-+++ /zones/build/root/export/home/user/packages/SOURCES/qt-x11-opensource-src-4.4.3/src/3rdparty/webkit/WebCore/make-generated-sources.sh	2008-11-24 09:02:33.114238243 +0100
+diff -ur qt-x11-opensource-src-4.4.3/src/3rdparty/webkit/WebCore/make-generated-sources.sh qt-x11-opensource-src-4.4.3/src/3rdparty/webkit/WebCore/make-generated-sources.sh
+--- qt-x11-opensource-src-4.4.3/src/3rdparty/webkit/WebCore/make-generated-sources.sh	2008-09-27 10:58:46.000000000 +0200
++++ qt-x11-opensource-src-4.4.3/src/3rdparty/webkit/WebCore/make-generated-sources.sh	2008-11-24 09:02:33.114238243 +0100
 @@ -1,1 +1,1 @@
 -#!/bin/sh
 +#!/bin/bash
-diff -ur /zones/build/root/.zfs/snapshot/qt-original/export/home/user/packages/SOURCES/qt-x11-opensource-src-4.4.3/src/3rdparty/webkit/WebCore/move-js-headers.sh /zones/build/root/export/home/user/packages/SOURCES/qt-x11-opensource-src-4.4.3/src/3rdparty/webkit/WebCore/move-js-headers.sh
---- /zones/build/root/.zfs/snapshot/qt-original/export/home/user/packages/SOURCES/qt-x11-opensource-src-4.4.3/src/3rdparty/webkit/WebCore/move-js-headers.sh	2008-09-27 10:58:46.000000000 +0200
-+++ /zones/build/root/export/home/user/packages/SOURCES/qt-x11-opensource-src-4.4.3/src/3rdparty/webkit/WebCore/move-js-headers.sh	2008-11-24 09:02:33.105567198 +0100
+diff -ur qt-x11-opensource-src-4.4.3/src/3rdparty/webkit/WebCore/move-js-headers.sh qt-x11-opensource-src-4.4.3/src/3rdparty/webkit/WebCore/move-js-headers.sh
+--- qt-x11-opensource-src-4.4.3/src/3rdparty/webkit/WebCore/move-js-headers.sh	2008-09-27 10:58:46.000000000 +0200
++++ qt-x11-opensource-src-4.4.3/src/3rdparty/webkit/WebCore/move-js-headers.sh	2008-11-24 09:02:33.105567198 +0100
 @@ -1,1 +1,1 @@
 -#!/bin/sh
 +#!/bin/bash
-diff -ur /zones/build/root/.zfs/snapshot/qt-original/export/home/user/packages/SOURCES/qt-x11-opensource-src-4.4.3/src/3rdparty/zlib/configure /zones/build/root/export/home/user/packages/SOURCES/qt-x11-opensource-src-4.4.3/src/3rdparty/zlib/configure
---- /zones/build/root/.zfs/snapshot/qt-original/export/home/user/packages/SOURCES/qt-x11-opensource-src-4.4.3/src/3rdparty/zlib/configure	2008-09-27 10:58:46.000000000 +0200
-+++ /zones/build/root/export/home/user/packages/SOURCES/qt-x11-opensource-src-4.4.3/src/3rdparty/zlib/configure	2008-11-24 09:02:33.123219985 +0100
+diff -ur qt-x11-opensource-src-4.4.3/src/3rdparty/zlib/configure qt-x11-opensource-src-4.4.3/src/3rdparty/zlib/configure
+--- qt-x11-opensource-src-4.4.3/src/3rdparty/zlib/configure	2008-09-27 10:58:46.000000000 +0200
++++ qt-x11-opensource-src-4.4.3/src/3rdparty/zlib/configure	2008-11-24 09:02:33.123219985 +0100
 @@ -1,1 +1,1 @@
 -#!/bin/sh
 +#!/bin/bash
-diff -ur /zones/build/root/.zfs/snapshot/qt-original/export/home/user/packages/SOURCES/qt-x11-opensource-src-4.4.3/src/corelib/xml/make-parser.sh /zones/build/root/export/home/user/packages/SOURCES/qt-x11-opensource-src-4.4.3/src/corelib/xml/make-parser.sh
---- /zones/build/root/.zfs/snapshot/qt-original/export/home/user/packages/SOURCES/qt-x11-opensource-src-4.4.3/src/corelib/xml/make-parser.sh	2008-09-27 10:58:47.000000000 +0200
-+++ /zones/build/root/export/home/user/packages/SOURCES/qt-x11-opensource-src-4.4.3/src/corelib/xml/make-parser.sh	2008-11-24 09:02:33.236683174 +0100
+diff -ur qt-x11-opensource-src-4.4.3/src/corelib/xml/make-parser.sh qt-x11-opensource-src-4.4.3/src/corelib/xml/make-parser.sh
+--- qt-x11-opensource-src-4.4.3/src/corelib/xml/make-parser.sh	2008-09-27 10:58:47.000000000 +0200
++++ qt-x11-opensource-src-4.4.3/src/corelib/xml/make-parser.sh	2008-11-24 09:02:33.236683174 +0100
 @@ -1,1 +1,1 @@
 -#!/bin/sh
 +#!/bin/bash
-diff -ur /zones/build/root/.zfs/snapshot/qt-original/export/home/user/packages/SOURCES/qt-x11-opensource-src-4.4.3/src/opengl/util/glsl_to_include.sh /zones/build/root/export/home/user/packages/SOURCES/qt-x11-opensource-src-4.4.3/src/opengl/util/glsl_to_include.sh
---- /zones/build/root/.zfs/snapshot/qt-original/export/home/user/packages/SOURCES/qt-x11-opensource-src-4.4.3/src/opengl/util/glsl_to_include.sh	2008-09-27 10:58:47.000000000 +0200
-+++ /zones/build/root/export/home/user/packages/SOURCES/qt-x11-opensource-src-4.4.3/src/opengl/util/glsl_to_include.sh	2008-11-24 09:02:32.929003012 +0100
+diff -ur qt-x11-opensource-src-4.4.3/src/opengl/util/glsl_to_include.sh qt-x11-opensource-src-4.4.3/src/opengl/util/glsl_to_include.sh
+--- qt-x11-opensource-src-4.4.3/src/opengl/util/glsl_to_include.sh	2008-09-27 10:58:47.000000000 +0200
++++ qt-x11-opensource-src-4.4.3/src/opengl/util/glsl_to_include.sh	2008-11-24 09:02:32.929003012 +0100
 @@ -1,1 +1,1 @@
 -#! /bin/sh
 +#! /bin/bash
-diff -ur /zones/build/root/.zfs/snapshot/qt-original/export/home/user/packages/SOURCES/qt-x11-opensource-src-4.4.3/src/tools/moc/util/generate.sh /zones/build/root/export/home/user/packages/SOURCES/qt-x11-opensource-src-4.4.3/src/tools/moc/util/generate.sh
---- /zones/build/root/.zfs/snapshot/qt-original/export/home/user/packages/SOURCES/qt-x11-opensource-src-4.4.3/src/tools/moc/util/generate.sh	2008-09-27 10:58:48.000000000 +0200
-+++ /zones/build/root/export/home/user/packages/SOURCES/qt-x11-opensource-src-4.4.3/src/tools/moc/util/generate.sh	2008-11-24 09:02:33.245212242 +0100
+diff -ur qt-x11-opensource-src-4.4.3/src/tools/moc/util/generate.sh qt-x11-opensource-src-4.4.3/src/tools/moc/util/generate.sh
+--- qt-x11-opensource-src-4.4.3/src/tools/moc/util/generate.sh	2008-09-27 10:58:48.000000000 +0200
++++ qt-x11-opensource-src-4.4.3/src/tools/moc/util/generate.sh	2008-11-24 09:02:33.245212242 +0100
 @@ -1,1 +1,1 @@
 -#!/bin/sh
 +#!/bin/bash
-diff -ur /zones/build/root/.zfs/snapshot/qt-original/export/home/user/packages/SOURCES/qt-x11-opensource-src-4.4.3/src/xmlpatterns/environment/createReportContext.sh /zones/build/root/export/home/user/packages/SOURCES/qt-x11-opensource-src-4.4.3/src/xmlpatterns/environment/createReportContext.sh
---- /zones/build/root/.zfs/snapshot/qt-original/export/home/user/packages/SOURCES/qt-x11-opensource-src-4.4.3/src/xmlpatterns/environment/createReportContext.sh	2008-09-27 10:58:48.000000000 +0200
-+++ /zones/build/root/export/home/user/packages/SOURCES/qt-x11-opensource-src-4.4.3/src/xmlpatterns/environment/createReportContext.sh	2008-11-24 09:02:33.227441886 +0100
+diff -ur qt-x11-opensource-src-4.4.3/src/xmlpatterns/environment/createReportContext.sh qt-x11-opensource-src-4.4.3/src/xmlpatterns/environment/createReportContext.sh
+--- qt-x11-opensource-src-4.4.3/src/xmlpatterns/environment/createReportContext.sh	2008-09-27 10:58:48.000000000 +0200
++++ qt-x11-opensource-src-4.4.3/src/xmlpatterns/environment/createReportContext.sh	2008-11-24 09:02:33.227441886 +0100
 @@ -1,1 +1,1 @@
 -#!/bin/sh
 +#!/bin/bash
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/qt-02-libpng.diff	Thu Nov 11 14:02:46 2010 +0000
@@ -0,0 +1,39 @@
+--- qt-x11-opensource-src-4.4.3/src/gui/image/qpnghandler.cpp-orig	2010-11-10 17:47:52.203891052 -0600
++++ qt-x11-opensource-src-4.4.3/src/gui/image/qpnghandler.cpp	2010-11-10 17:48:12.866370835 -0600
+@@ -310,7 +310,7 @@ void setup_qt(QImage& image, png_structp
+                 image.setColor(i, qRgba(c,c,c,0xff));
+             }
+             if (png_get_valid(png_ptr, info_ptr, PNG_INFO_tRNS)) {
+-                const int g = info_ptr->trans_values.gray;
++                const int g = info_ptr->trans_color.gray;
+                 if (g < ncols) {
+                     image.setColor(g, 0);
+                 }
+@@ -339,7 +339,7 @@ void setup_qt(QImage& image, png_structp
+                     info_ptr->palette[i].red,
+                     info_ptr->palette[i].green,
+                     info_ptr->palette[i].blue,
+-                    info_ptr->trans[i]
++                    info_ptr->trans_alpha[i]
+                    )
+                );
+                 i++;
+@@ -556,13 +556,13 @@ bool Q_INTERNAL_WIN_NO_THROW QPngHandler
+ #if 0 // libpng takes care of this.
+     png_get_valid(png_ptr, info_ptr, PNG_INFO_tRNS)
+         if (outImage->depth()==32 && png_get_valid(png_ptr, info_ptr, PNG_INFO_tRNS)) {
+-            QRgb trans = 0xFF000000 | qRgb(
+-                (info_ptr->trans_values.red << 8 >> bit_depth)&0xff,
+-                (info_ptr->trans_values.green << 8 >> bit_depth)&0xff,
+-                (info_ptr->trans_values.blue << 8 >> bit_depth)&0xff);
++            QRgb trans_alpha = 0xFF000000 | qRgb(
++                (info_ptr->trans_color.red << 8 >> bit_depth)&0xff,
++                (info_ptr->trans_color.green << 8 >> bit_depth)&0xff,
++                (info_ptr->trans_color.blue << 8 >> bit_depth)&0xff);
+             for (uint y=0; y<height; y++) {
+                 for (uint x=0; x<info_ptr->width; x++) {
+-                    if (((uint**)jt)[y][x] == trans) {
++                    if (((uint**)jt)[y][x] == trans_alpha) {
+                         ((uint**)jt)[y][x] &= 0x00FFFFFF;
+                     } else {
+                     }
--- a/patches/qt-02-temp-removal-of-getresuid.diff	Wed Nov 10 22:57:45 2010 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,37 +0,0 @@
---- qt-x11-opensource-src-4.5.0/src/gui/styles/gtksymbols.cpp.orig	Wed Feb 25 22:09:23 2009
-+++ qt-x11-opensource-src-4.5.0/src/gui/styles/gtksymbols.cpp	Sat Mar 14 02:02:17 2009
-@@ -638,20 +638,20 @@
- void QGtk::initGtkWidgets()
- {
-     // From gtkmain.c
--    uid_t ruid, rgid, euid, egid, suid, sgid;
--    if (getresuid (&ruid, &euid, &suid) != 0 || getresgid (&rgid, &egid, &sgid) != 0) {
--        suid = ruid = getuid ();
--        sgid = rgid = getgid ();
--        euid = geteuid ();
--        egid = getegid ();
--    }
--    if (ruid != euid || ruid != suid || rgid != egid || rgid != sgid) {
--        qWarning("\nThis process is currently running setuid or setgid.\nGTK+ does not allow this "
--                 "therefore Qt cannot use the GTK+ integration.\nTry launching your app using \'gksudo\', "
--                 "\'kdesudo\' or a similar tool.\n\n"
--                 "See http://www.gtk.org/setuid.html for more information.\n");
--        return;
--    }
-+    // uid_t ruid, rgid, euid, egid, suid, sgid;
-+    // if (getresuid (&ruid, &euid, &suid) != 0 || getresgid (&rgid, &egid, &sgid) != 0) {
-+    //     suid = ruid = getuid ();
-+    //     sgid = rgid = getgid ();
-+    //     euid = geteuid ();
-+    //     egid = getegid ();
-+    // }
-+    // if (ruid != euid || ruid != suid || rgid != egid || rgid != sgid) {
-+    //     qWarning("\nThis process is currently running setuid or setgid.\nGTK+ does not allow this "
-+    //              "therefore Qt cannot use the GTK+ integration.\nTry launching your app using \'gksudo\', "
-+    //              "\'kdesudo\' or a similar tool.\n\n"
-+    //              "See http://www.gtk.org/setuid.html for more information.\n");
-+    //     return;
-+    // }
-   
-     init_gtk_window();
-
upstream/spec-files-extra