Skip to content
Browse files

Fix loading of Sql drivers

MySQL drivers were only loaded for MythFrontend and MythWelcome package.
Install it for all packages.

Also load qt_menu.nib in QtGui framework
  • Loading branch information...
1 parent 337f024 commit b9331e02889489e81e93d98325c4ae2837f254a5 @jyavenard jyavenard committed Apr 11, 2012
Showing with 23 additions and 8 deletions.
  1. +23 −8 OSX/build/osx-packager-qtsdk.pl
View
31 OSX/build/osx-packager-qtsdk.pl
@@ -1617,23 +1617,24 @@ END
if ( $OPT{'qtsrc'} && -d "$PREFIX/lib/qt_menu.nib" )
{
- &Syscall([ 'cp', '-R', "$PREFIX/lib/qt_menu.nib", "$finalTarget/Contents/Resources" ]);
+ if ( -d "$finalTarget/Contents/Frameworks/QtGui.framework/Resources" )
+ {
+ &Syscall([ 'cp', '-R', "$PREFIX/lib/qt_menu.nib", "$finalTarget/Contents/Frameworks/QtGui.framework/Resources" ]);
+ }
+ else
+ {
+ &Syscall([ 'cp', '-R', "$PREFIX/lib/qt_menu.nib", "$finalTarget/Contents/Resources" ]);
+ }
}
# Copy the required Qt plugins
- foreach my $plugin ( "sqldrivers", "imageformats")
+ foreach my $plugin ( "imageformats" )
{
&Syscall([ 'mkdir', "$finalTarget/Contents/$BundlePlugins/$plugin" ]) or die;
# Have to create links in application folder due to QTBUG-24541
&Syscall([ 'ln', '-s', "../$BundlePlugins/$plugin", "$finalTarget/Contents/MacOs/$plugin" ]) or die;
}
- # copy the MySQL sqldriver
- &Syscall([ 'cp', "$PREFIX/qtplugins-$QTVERSION/libqsqlmysql.dylib", "$finalTarget/Contents/$BundlePlugins/sqldrivers/" ])
- or die;
- &Syscall([ @bundler, "$finalTarget/Contents/$BundlePlugins/sqldrivers/libqsqlmysql.dylib", @libs ])
- or die;
-
foreach my $plugin ( 'imageformats/libqgif.dylib', 'imageformats/libqjpeg.dylib' )
{
my $pluginSrc = "$QTPLUGINS/$plugin";
@@ -1705,6 +1706,20 @@ END
"$finalTarget/Contents/MacOS" ]) or die;
}
+ # Copy the required Qt plugins
+ foreach my $plugin ( "sqldrivers" )
+ {
+ &Syscall([ 'mkdir', "-p", "$finalTarget/Contents/$BundlePlugins/$plugin" ]) or die;
+ # Have to create links in application folder due to QTBUG-24541
+ &Syscall([ 'ln', '-s', "../$BundlePlugins/$plugin", "$finalTarget/Contents/MacOs/$plugin" ]) or die;
+ }
+
+ # copy the MySQL sqldriver
+ &Syscall([ 'cp', "$PREFIX/qtplugins-$QTVERSION/libqsqlmysql.dylib", "$finalTarget/Contents/$BundlePlugins/sqldrivers/" ])
+ or die;
+ &Syscall([ @bundler, "$finalTarget/Contents/$BundlePlugins/sqldrivers/libqsqlmysql.dylib", @libs ])
+ or die;
+
# rebase segfault on my mac, so disable it for the time being
# Run 'rebase' on all the frameworks, for slightly faster loading.
# Note that we process the real library, not symlinks to it,

0 comments on commit b9331e0

Please sign in to comment.
Something went wrong with that request. Please try again.