Ticket #4200: Trac4200.0-20-fixes.diff

.osx-packager/src/myth-svn/mythtv/contrib/osx-packager.pl

@@ -111 +111 @@
     'url'
     => 'http://subversion.tigris.org/downloads/subversion-1.4.3.tar.bz2',
     'pre-conf'
-    => 'tar -xjf subversion-deps-1.4.3.tar.bz2',
+    => 'tar -xjf ../subversion-deps-1.4.3.tar.bz2',
     'conf'
     =>  [
            '--disable-keychain',  # Workaround a 10.3 build problem
@@ -200 +200 @@
 #   },
   {
     'url'
-    =>  'http://ftp.iasi.roedu.net/mirrors/ftp.trolltech.com/qt/source/qt-mac-free-3.3.6.tar.gz',
+    =>  'http://ftp.iasi.roedu.net/mirrors/ftp.trolltech.com/qt/source/qt-mac-free-3.3.8.tar.gz',
+    'pre-conf' =>
+    'echo \'' . q^
+diff -ru qt-mac-free-3.3.8.orig/config.tests/mac/mac_version.test qt-mac-free-3.3.8.new/config.tests/mac/mac_version.test
+--- qt-mac-free-3.3.8.orig/config.tests/mac/mac_version.test    2004-04-24 02:40:40.000000000 +1000
++++ qt-mac-free-3.3.8.new/config.tests/mac/mac_version.test     2008-01-01 10:33:55.000000000 +1100
+@@ -17,13 +17,17 @@
+ TSTFILE=mac_version.cpp
+ 
+ rm -f $TSTFILE
+-echo "#include <Carbon/Carbon.h>" >$TSTFILE
+-echo "#include <stdio.h>" >>$TSTFILE
+-echo "int main() {" >>$TSTFILE
+-echo "  long gestalt_version;" >>$TSTFILE
+-echo "  fprintf(stdout, \"%d\\\n\", (Gestalt(gestaltSystemVersion, &gestalt_version) == noErr) ? gestalt_version : 0);" >>$TSTFILE
+-echo "  return 1;" >>$TSTFILE
+-echo "}" >>$TSTFILE
++cat << END >$TSTFILE
++#include <Carbon/Carbon.h>
++#include <stdio.h>
++int main() {
++  long gestalt_version;
++  if (Gestalt(gestaltSystemVersion, &gestalt_version) != noErr)
++    gestalt_version=0;
++  fprintf(stdout, "0x%x\n", gestalt_version);
++  return 1;
++}
++END
+ 
+ COMPILE_ERROR=yes
+ if [ "$VERBOSE" = "yes" ]; then
+diff -ru qt-mac-free-3.3.8.orig/include/qglobal.h qt-mac-free-3.3.8.new/include/qglobal.h
+--- qt-mac-free-3.3.8.orig/include/qglobal.h    2007-02-03 01:01:04.000000000 +1100
++++ qt-mac-free-3.3.8.new/include/qglobal.h     2008-01-01 10:47:28.000000000 +1100
+@@ -183,7 +183,10 @@
+ #  if !defined(MAC_OS_X_VERSION_10_4)
+ #       define MAC_OS_X_VERSION_10_4 MAC_OS_X_VERSION_10_3 + 1
+ #  endif
+-#  if (MAC_OS_X_VERSION_MAX_ALLOWED > MAC_OS_X_VERSION_10_4)
++#  if !defined(MAC_OS_X_VERSION_10_5)
++#       define MAC_OS_X_VERSION_10_5 MAC_OS_X_VERSION_10_4 + 1
++#  endif
++#  if (MAC_OS_X_VERSION_MAX_ALLOWED > MAC_OS_X_VERSION_10_5)
+ #    error "This version of Mac OS X is unsupported"
+ #  endif
+ #endif
+diff -ru qt-mac-free-3.3.8.orig/src/kernel/qcursor_mac.cpp qt-mac-free-3.3.8.new/src/kernel/qcursor_mac.cpp
+--- qt-mac-free-3.3.8.orig/src/kernel/qcursor_mac.cpp   2007-02-03 01:01:16.000000000 +1100
++++ qt-mac-free-3.3.8.new/src/kernel/qcursor_mac.cpp    2008-01-01 10:45:15.000000000 +1100
+@@ -177,7 +177,9 @@
+ #ifdef QMAC_USE_BIG_CURSOR_API
+        char *big_cursor_name;
+ #endif
++#ifdef QMAC_NO_FAKECURSOR
+        CursorImageRec *ci;
++#endif
+        struct {
+            QMacAnimateCursor *anim;
+            ThemeCursor curs;
+@@ -258,7 +260,9 @@
+        if(curs.cp.hcurs && curs.cp.my_cursor)
+            free(curs.cp.hcurs);
+     } else if(type == TYPE_CursorImage) {
++#ifdef QMAC_NO_FAKECURSOR
+        free(curs.ci);
++#endif
+ #ifdef QMAC_USE_BIG_CURSOR_API
+     } else if(type == TYPE_BigCursor) {
+        QDUnregisterNamedPixMapCursur(curs.big_cursor_name);
+diff -ru qt-mac-free-3.3.8.orig/src/kernel/qt_mac.h qt-mac-free-3.3.8.new/src/kernel/qt_mac.h
+--- qt-mac-free-3.3.8.orig/src/kernel/qt_mac.h  2007-02-03 01:01:13.000000000 +1100
++++ qt-mac-free-3.3.8.new/src/kernel/qt_mac.h   2008-01-01 18:03:04.000000000 +1100
+@@ -54,7 +54,7 @@
+ # define QMAC_DEFAULT_STYLE "QMacStyle" //DefaultStyle
+ #endif
+ 
+-#if !defined(Q_WS_MACX) || QT_MACOSX_VERSION < 0x1020 || QT_MACOSX_VERSION >= 0x1030
++#if !defined(Q_WS_MACX) || QT_MACOSX_VERSION < 0x1020 || (QT_MACOSX_VERSION >= 0x1030 && QT_MACOSX_VERSION < 0x1050)
+ # define QMAC_NO_FAKECURSOR
+ #endif
+ 
+diff -ru qt-mac-free-3.3.8.orig/src/tools/qglobal.h qt-mac-free-3.3.8.new/src/tools/qglobal.h
+--- qt-mac-free-3.3.8.orig/src/tools/qglobal.h  2007-02-03 01:01:04.000000000 +1100
++++ qt-mac-free-3.3.8.new/src/tools/qglobal.h   2008-01-01 10:47:28.000000000 +1100
+@@ -183,7 +183,10 @@
+ #  if !defined(MAC_OS_X_VERSION_10_4)
+ #       define MAC_OS_X_VERSION_10_4 MAC_OS_X_VERSION_10_3 + 1
+ #  endif
+-#  if (MAC_OS_X_VERSION_MAX_ALLOWED > MAC_OS_X_VERSION_10_4)
++#  if !defined(MAC_OS_X_VERSION_10_5)
++#       define MAC_OS_X_VERSION_10_5 MAC_OS_X_VERSION_10_4 + 1
++#  endif
++#  if (MAC_OS_X_VERSION_MAX_ALLOWED > MAC_OS_X_VERSION_10_5)
+ #    error "This version of Mac OS X is unsupported"
+ #  endif
+ #endif
+^ . '\' | patch -p1',
     'conf-cmd'
     =>  'echo yes | ./configure',
     'conf'
@@ -638 +734 @@
     }
   }
   
-  if ($pkg->{'pre-conf'})
-  { 
-    &Syscall([ $pkg->{'pre-conf'} ], 'munge' => 1) or die;
-  }
-
   # Configure
   chdir($dirname);
   unless (-e '.osx-config')
   {
     &Verbose("Configuring $sw");
+    if ($pkg->{'pre-conf'})
+    { 
+      &Syscall([ $pkg->{'pre-conf'} ], 'munge' => 1) or die;
+    }
+
     my (@configure, $munge);
     
     if ($pkg->{'conf-cmd'})
@@ -985 +1081 @@
   }
 }
 
-if ( $backend )
+if ( $backend && grep(m/MythBackend/, @targets) )
 {
   my $BE = "$SCRIPTDIR/MythBackend.app";