-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
On 6/28/11 1:40 PM, Simone Baroni wrote:
> Hello,
>
> I am trying to install kile-kde4-mac on my MacBookPro (Leopard 10.6).
> I have an error while compiling the package kdelibs4-mac-4.4.1-1 and I
> couldn't find a solution on the Web.
> Did anyone have the same problem before or know how to fix it?
> I already tried "fink selfupdate" and tried to install it again. Same
> exact error.
>
> Thanks a lot,
>
> Simone
>
>
> Here's the copy and paste of the error:
>
> --------------
> /sw/src/fink.build/kdelibs4-mac-4.4.1-1/kdelibs-4.4.1/kde3support/kdeui/k3passworddialog.cpp:89:
> error: call of overloaded 'QString(int)' is ambiguous
> /sw/lib/qt4-mac/include/QtCore/qstring.h:428: note: candidates are:
> QString::QString(const QByteArray&)
> /sw/lib/qt4-mac/include/QtCore/qstring.h:426: note:
> QString::QString(const char*)
> /sw/lib/qt4-mac/include/QtCore/qstring.h:728: note:
> QString::QString(const QString&)
> /sw/lib/qt4-mac/include/QtCore/qstring.h:106: note:
> QString::QString(QChar)
> /sw/lib/qt4-mac/include/QtCore/qstring.h:105: note:
> QString::QString(const QChar*)
> make[2]: ***
> [kde3support/CMakeFiles/kde3support.dir/kdeui/k3passworddialog.o] Error 1
> make[1]: *** [kde3support/CMakeFiles/kde3support.dir/all] Error 2
> make: *** [all] Error 2
> ### execution of /var/tmp/tmp.1.HsdnFL failed, exit code 2
> Removing runtime build-lock...
> Removing build-lock package...
> /sw/bin/dpkg-lockwait -r fink-buildlock-kdelibs4-mac-4.4.1-1
> (Reading database ... 151374 files and directories currently installed.)
> Removing fink-buildlock-kdelibs4-mac-4.4.1-1 ...
> Failed: phase compiling: kdelibs4-mac-4.4.1-1 failed
> ----------------
> --
> My photos on Flickr: http://www.flickr.com/photos/baronisimone/
>
> Email: [email protected] <mailto:[email protected]>
>
>
>
I've attached updates which worked for me. I recommend following the
guidelines in
http://finkers.wordpress.com/2009/06/08/local-packages/
to put them in a safe place in your Fink tree.
- --
Alexander Hansen, Ph.D.
Fink User Liaison
http://finkakh.wordpress.com/
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.11 (Darwin)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org/
iEYEARECAAYFAk4KUBQACgkQB8UpO3rKjQ+6OwCgm8E7YrucpsB4Js6raSyhCPUe
7DoAn2EXtenDuajdsEshRIIV5inPAsEb
=0n6H
-----END PGP SIGNATURE-----
Info4: <<
Package: kdelibs4-%type_pkg[kde]
Version: 4.4.1
Revision: 2
Description: KDE4 - essential libraries
Type: kde (x11 mac)
License: GPL/LGPL
Maintainer: Benjamin Reed <[email protected]>
Depends: <<
%N-shlibs (= %v-%r),
aspell,
dbus (>= 1.2.12-1),
default-icon-theme (>= 0.5-2),
hspell,
shared-desktop-ontologies,
shared-mime-info (>= 0.51-1)
<<
BuildDepends: <<
aspell-dev,
automoc-%type_pkg[kde] (>= 0.9.89-0),
avahi-dev,
bzip2-dev,
cmake (>= 2.6.4-1),
dbus-dev (>= 1.2.12-1),
enchant1-dev,
expat1,
fink (>= 0.29.7-1),
freetype219 (>= 2.3.7-7),
gettext-tools,
giflib,
hspell,
kde4-buildenv (>= 4.4.0-1),
libattica-%type_pkg[kde]-dev,
libgettext8-dev,
libidn,
libjasper.1,
libjpeg8,
liblzma,
libpng3,
libtiff,
libxml2,
libxslt,
openexr-dev,
pcre (>= 7.6-1),
pkgconfig (>= 0.23-1),
phonon-%type_pkg[kde] (>= 4.5.0-1),
qt4-base-%type_pkg[kde] (>= 4.7.3-1),
qtwebkit-%type_pkg[kde] (>= 2.0.0-4),
shared-desktop-ontologies,
shared-mime-info (>= 0.51-1),
soprano-%type_pkg[kde]-dev (>= 2.4.0-1),
strigi-dev (>= 0.6.3-1),
(%type_pkg[kde] = x11) x11-dev,
system-openssl-dev,
xmkmf
<<
BuildConflicts: gamin-dev
GCC: 4.0
Source: mirror:kde:stable/%v/src/kdelibs-%v.tar.bz2
Source-MD5: 5057908fb9dcf7997a87fe27a382bfc9
SourceDirectory: kdelibs-%v
PatchScript: sed -e 's,@KDEPREFIX@,%p,g' -e 's,@KDETYPE@,%type_pkg[kde],g'
%{PatchFile} | patch -p1
PatchFile: kdelibs4.patch
PatchFile-MD5: cf90f01c779ff22c07a27a49239bfefc
CompileScript: <<
#!/bin/sh -ev
export KDE4_PREFIX="%p" KDE4_TYPE="%type_pkg[kde]"
SKIP_VISIBILITY_OVERRIDE=1
. %p/sbin/kde4-buildenv.sh
mkdir -p build
pushd build
cmake $KDE4_CMAKE_ARGS ..
make VERBOSE=1
popd
<<
InstallScript: <<
#!/bin/sh -ev
pushd build
make -j1 install/fast DESTDIR="%d"
popd
install -c -m 755 kde4-postinst.sh kde4-check-sycoca.sh
%i/opt/kde4/%type_pkg[kde]/bin/
install -d -m 755 %i/etc/profile.d
echo "%p/opt/kde4/%type_pkg[kde]/bin/kde4-check-sycoca.sh" >
%i/etc/profile.d/%N.sh
echo "%p/opt/kde4/%type_pkg[kde]/bin/kde4-check-sycoca.sh" >
%i/etc/profile.d/%N.csh
chmod 755 %i/etc/profile.d/*
install -d -m 755 %i/opt/kde4/%type_pkg[kde]/etc
cat <<END >%i/opt/kde4/%type_pkg[kde]/etc/kde4rc
[Directories]
prefixes=%p/opt/kde4/%type_pkg[kde],%p/opt/akonadi/%type_pkg[kde],%p/opt/soprano/%type_pkg[kde],%p/opt/strigi/%type_pkg[kde],%p/lib/qt4-%type_pkg[kde]
END
<<
DocFiles: COPYING COPYING.LIB INSTALL
SplitOff: <<
Package: %N-shlibs
Description: KDE4 - essential shared libraries
Depends: <<
aspell-shlibs,
bzip2-shlibs,
dbus-shlibs (>= 1.2.12-1),
enchant1-shlibs,
giflib-shlibs,
libattica-%type_pkg[kde]-shlibs,
libavahi-client3-shlibs,
libgettext8-shlibs,
libidn-shlibs (>= 0.5.1-1),
libjasper.1-shlibs,
libjpeg8-shlibs,
liblzma-shlibs,
libpng3-shlibs (>= 1.2.8-1),
libtiff-shlibs,
libxml2-shlibs (>= 2.6.32-1),
libxslt-shlibs (>= 1.0.27-1),
macosx (>= 10.4.3-1),
pcre-shlibs (>= 7.6-1),
qt4-base-%type_pkg[kde]-qtdesigner-shlibs (>= 4.7.3-1),
qt4-base-%type_pkg[kde]-qt3support-shlibs (>= 4.7.3-1),
qt4-base-%type_pkg[kde]-qtdbus-shlibs (>= 4.7.3-1),
qt4-base-%type_pkg[kde]-qtdeclarative-shlibs (>= 4.7.3-1),
qt4-base-%type_pkg[kde]-qtgui-shlibs (>= 4.7.3-1),
qt4-base-%type_pkg[kde]-qthelp-shlibs (>= 4.7.3-1),
qt4-base-%type_pkg[kde]-qtmultimedia-shlibs (>= 4.7.3-1),
qt4-base-%type_pkg[kde]-qtopengl-shlibs (>= 4.7.3-1),
qt4-base-%type_pkg[kde]-qtscripttools-shlibs (>= 4.7.3-1),
qt4-base-%type_pkg[kde]-qtsvg-shlibs (>= 4.7.3-1),
phonon-%type_pkg[kde]-shlibs (>= 4.5.0-1),
phonon-%type_pkg[kde]-backend (>= 4.5.0-1),
qtwebkit-%type_pkg[kde]-shlibs (>= 2.0.0-4),
soprano-%type_pkg[kde]-shlibs (>= 2.4.0-1),
strigi-shlibs (>= 0.6.3-1),
xdg-base
<<
Replaces: <<
kdebase4-workspace-%type_pkg[kde]-shlibs (<< 4.4.1-1),
%N (<< 4.2.2-4)
<<
Recommends: %N (>= %v-%r)
Files: <<
opt/kde4/%type_pkg[kde]/etc/kde4rc
opt/kde4/%type_pkg[kde]/lib/kde4/*.so
opt/kde4/%type_pkg[kde]/lib/kde4/libexec
opt/kde4/%type_pkg[kde]/lib/kde4/plugins
opt/kde4/%type_pkg[kde]/lib/libkde3support.4*.dylib
opt/kde4/%type_pkg[kde]/lib/libkdecore.5*.dylib
opt/kde4/%type_pkg[kde]/lib/libkdefakes.5*.dylib
opt/kde4/%type_pkg[kde]/lib/libkdesu.5*.dylib
opt/kde4/%type_pkg[kde]/lib/libkdeui.5*.dylib
opt/kde4/%type_pkg[kde]/lib/libkdewebkit.5*.dylib
opt/kde4/%type_pkg[kde]/lib/libkdnssd.4*.dylib
opt/kde4/%type_pkg[kde]/lib/libkfile.4*.dylib
opt/kde4/%type_pkg[kde]/lib/libkhtml.5*.dylib
opt/kde4/%type_pkg[kde]/lib/libkimproxy.4*.dylib
opt/kde4/%type_pkg[kde]/lib/libkio.5*.dylib
opt/kde4/%type_pkg[kde]/lib/libkjs.4*.dylib
opt/kde4/%type_pkg[kde]/lib/libkjsapi.4*.dylib
opt/kde4/%type_pkg[kde]/lib/libkjsembed.4*.dylib
opt/kde4/%type_pkg[kde]/lib/libkmediaplayer.4*.dylib
opt/kde4/%type_pkg[kde]/lib/libknewstuff2.4*.dylib
opt/kde4/%type_pkg[kde]/lib/libknewstuff3.4*.dylib
opt/kde4/%type_pkg[kde]/lib/libknotifyconfig.4*.dylib
opt/kde4/%type_pkg[kde]/lib/libkntlm.4*.dylib
opt/kde4/%type_pkg[kde]/lib/libkparts.4*.dylib
opt/kde4/%type_pkg[kde]/lib/libkpty.4*.dylib
opt/kde4/%type_pkg[kde]/lib/libkrosscore.4*.dylib
opt/kde4/%type_pkg[kde]/lib/libkrossqtsplugin.4*.dylib
opt/kde4/%type_pkg[kde]/lib/libkrossui.4*.dylib
opt/kde4/%type_pkg[kde]/lib/libktexteditor.4*.dylib
opt/kde4/%type_pkg[kde]/lib/libkunitconversion.4*.dylib
opt/kde4/%type_pkg[kde]/lib/libkunittest.4*.dylib
opt/kde4/%type_pkg[kde]/lib/libkutils.4*.dylib
opt/kde4/%type_pkg[kde]/lib/libnepomuk.4*.dylib
opt/kde4/%type_pkg[kde]/lib/libnepomukquery.4*.dylib
opt/kde4/%type_pkg[kde]/lib/libplasma.3*.dylib
opt/kde4/%type_pkg[kde]/lib/libsolid.4*.dylib
opt/kde4/%type_pkg[kde]/lib/libthreadweaver.4*.dylib
<<
Shlibs: <<
%p/opt/kde4/%type_pkg[kde]/lib/libkde3support.4.dylib
4.0.0 %n (>= 4.2.4-1)
%p/opt/kde4/%type_pkg[kde]/lib/libkdecore.5.dylib
5.0.0 %n (>= 4.2.4-1)
%p/opt/kde4/%type_pkg[kde]/lib/libkdefakes.5.dylib
5.0.0 %n (>= 4.2.4-1)
%p/opt/kde4/%type_pkg[kde]/lib/libkdesu.5.dylib
5.0.0 %n (>= 4.2.4-1)
%p/opt/kde4/%type_pkg[kde]/lib/libkdeui.5.dylib
5.0.0 %n (>= 4.2.4-1)
%p/opt/kde4/%type_pkg[kde]/lib/libkdewebkit.5.dylib
5.0.0 %n (>= 4.3.90-1)
%p/opt/kde4/%type_pkg[kde]/lib/libkdnssd.4.dylib
4.0.0 %n (>= 4.2.4-1)
%p/opt/kde4/%type_pkg[kde]/lib/libkfile.4.dylib
4.0.0 %n (>= 4.2.4-1)
%p/opt/kde4/%type_pkg[kde]/lib/libkhtml.5.dylib
5.0.0 %n (>= 4.2.4-1)
%p/opt/kde4/%type_pkg[kde]/lib/libkimproxy.4.dylib
4.0.0 %n (>= 4.2.4-1)
%p/opt/kde4/%type_pkg[kde]/lib/libkio.5.dylib
5.0.0 %n (>= 4.2.4-1)
%p/opt/kde4/%type_pkg[kde]/lib/libkjs.4.dylib
4.0.0 %n (>= 4.2.4-1)
%p/opt/kde4/%type_pkg[kde]/lib/libkjsapi.4.dylib
4.0.0 %n (>= 4.2.4-1)
%p/opt/kde4/%type_pkg[kde]/lib/libkjsembed.4.dylib
4.0.0 %n (>= 4.2.4-1)
%p/opt/kde4/%type_pkg[kde]/lib/libkmediaplayer.4.dylib
4.0.0 %n (>= 4.2.4-1)
%p/opt/kde4/%type_pkg[kde]/lib/libknewstuff2.4.dylib
4.0.0 %n (>= 4.2.4-1)
%p/opt/kde4/%type_pkg[kde]/lib/libknewstuff3.4.dylib
4.0.0 %n (>= 4.3.90-1)
%p/opt/kde4/%type_pkg[kde]/lib/libknotifyconfig.4.dylib
4.0.0 %n (>= 4.2.4-1)
%p/opt/kde4/%type_pkg[kde]/lib/libkntlm.4.dylib
4.0.0 %n (>= 4.2.4-1)
%p/opt/kde4/%type_pkg[kde]/lib/libkparts.4.dylib
4.0.0 %n (>= 4.2.4-1)
%p/opt/kde4/%type_pkg[kde]/lib/libkpty.4.dylib
4.0.0 %n (>= 4.2.4-1)
%p/opt/kde4/%type_pkg[kde]/lib/libkrosscore.4.dylib
4.0.0 %n (>= 4.2.4-1)
%p/opt/kde4/%type_pkg[kde]/lib/libkrossqtsplugin.4.dylib
4.0.0 %n (>= 4.2.4-1)
%p/opt/kde4/%type_pkg[kde]/lib/libkrossui.4.dylib
4.0.0 %n (>= 4.2.4-1)
%p/opt/kde4/%type_pkg[kde]/lib/libktexteditor.4.dylib
4.0.0 %n (>= 4.2.4-1)
%p/opt/kde4/%type_pkg[kde]/lib/libkunitconversion.4.dylib
4.0.0 %n (>= 4.3.90-1)
%p/opt/kde4/%type_pkg[kde]/lib/libkunittest.4.dylib
4.0.0 %n (>= 4.2.4-1)
%p/opt/kde4/%type_pkg[kde]/lib/libkutils.4.dylib
4.0.0 %n (>= 4.2.4-1)
%p/opt/kde4/%type_pkg[kde]/lib/libnepomuk.4.dylib
4.0.0 %n (>= 4.2.4-1)
%p/opt/kde4/%type_pkg[kde]/lib/libnepomukquery.4.dylib
4.0.0 %n (>= 4.3.90-1)
%p/opt/kde4/%type_pkg[kde]/lib/libplasma.3.dylib
3.0.0 %n (>= 4.2.4-1)
%p/opt/kde4/%type_pkg[kde]/lib/libsolid.4.dylib
4.0.0 %n (>= 4.2.4-1)
%p/opt/kde4/%type_pkg[kde]/lib/libthreadweaver.4.dylib
4.0.0 %n (>= 4.2.4-1)
<<
ConfFiles: %p/opt/kde4/%type_pkg[kde]/etc/kde4rc
<<
SplitOff2: <<
Package: %N-dev
Description: KDE4 - essential development libraries and headers
Depends: <<
%N (= %v-%r),
xmkmf
<<
Replaces: <<
kdebase4-runtime-%type_pkg[kde] (<< 4.3.90-1),
kdebase4-workspace-%type_pkg[kde]-dev (<< 4.3.0-1)
<<
BuildDependsOnly: true
Files: <<
opt/kde4/%type_pkg[kde]/include
opt/kde4/%type_pkg[kde]/lib/libkde3support.dylib
opt/kde4/%type_pkg[kde]/lib/libkdecore.dylib
opt/kde4/%type_pkg[kde]/lib/libkdefakes.dylib
opt/kde4/%type_pkg[kde]/lib/libkdesu.dylib
opt/kde4/%type_pkg[kde]/lib/libkdeui.dylib
opt/kde4/%type_pkg[kde]/lib/libkdewebkit.dylib
opt/kde4/%type_pkg[kde]/lib/libkdnssd.dylib
opt/kde4/%type_pkg[kde]/lib/libkfile.dylib
opt/kde4/%type_pkg[kde]/lib/libkhtml.dylib
opt/kde4/%type_pkg[kde]/lib/libkimproxy.dylib
opt/kde4/%type_pkg[kde]/lib/libkio.dylib
opt/kde4/%type_pkg[kde]/lib/libkjs.dylib
opt/kde4/%type_pkg[kde]/lib/libkjsapi.dylib
opt/kde4/%type_pkg[kde]/lib/libkjsembed.dylib
opt/kde4/%type_pkg[kde]/lib/libkmediaplayer.dylib
opt/kde4/%type_pkg[kde]/lib/libknewstuff2.dylib
opt/kde4/%type_pkg[kde]/lib/libknewstuff3.dylib
opt/kde4/%type_pkg[kde]/lib/libknotifyconfig.dylib
opt/kde4/%type_pkg[kde]/lib/libkntlm.dylib
opt/kde4/%type_pkg[kde]/lib/libkparts.dylib
opt/kde4/%type_pkg[kde]/lib/libkpty.dylib
opt/kde4/%type_pkg[kde]/lib/libkrosscore.dylib
opt/kde4/%type_pkg[kde]/lib/libkrossqtsplugin.dylib
opt/kde4/%type_pkg[kde]/lib/libkrossui.dylib
opt/kde4/%type_pkg[kde]/lib/libktexteditor.dylib
opt/kde4/%type_pkg[kde]/lib/libkunitconversion.dylib
opt/kde4/%type_pkg[kde]/lib/libkunittest.dylib
opt/kde4/%type_pkg[kde]/lib/libkutils.dylib
opt/kde4/%type_pkg[kde]/lib/libnepomuk.dylib
opt/kde4/%type_pkg[kde]/lib/libnepomukquery.dylib
opt/kde4/%type_pkg[kde]/lib/libplasma.dylib
opt/kde4/%type_pkg[kde]/lib/libsolid.dylib
opt/kde4/%type_pkg[kde]/lib/libthreadweaver.dylib
opt/kde4/%type_pkg[kde]/share/apps/cmake
<<
<<
Shlibs: <<
!%p/opt/kde4/%type_pkg[kde]/lib/libkdeinit4_kbuildsycoca4.dylib
!%p/opt/kde4/%type_pkg[kde]/lib/libkdeinit4_kconf_update.dylib
!%p/opt/kde4/%type_pkg[kde]/lib/libkdeinit4_kded4.dylib
!%p/opt/kde4/%type_pkg[kde]/lib/libkdeinit4_kio_http_cache_cleaner.dylib
!%p/opt/kde4/%type_pkg[kde]/lib/libkdeinit4_klauncher.dylib
<<
PostInstScript: %p/opt/kde4/%type_pkg[kde]/bin/kde4-postinst.sh || :
PostRmScript: update-alternatives --remove "applications.menu"
"%p/opt/kde4/%type_pkg[kde]/etc/xdg/menus/applications.menu"
DescDetail: Libraries for the K Desktop Environment.
<<
diff -Nurd kdelibs-4.4.1/cmake/modules/FindFAM.cmake
kdelibs-4.4.1-new/cmake/modules/FindFAM.cmake
--- kdelibs-4.4.1/cmake/modules/FindFAM.cmake 2008-05-21 07:06:10.000000000
-0400
+++ kdelibs-4.4.1-new/cmake/modules/FindFAM.cmake 2010-03-06
12:39:25.000000000 -0500
@@ -16,12 +16,12 @@
set(FAM_FIND_QUIETLY TRUE)
endif (FAM_INCLUDE_DIR)
-FIND_PATH(FAM_INCLUDE_DIR fam.h)
-
-FIND_LIBRARY(FAM_LIBRARIES NAMES fam )
-
-include(FindPackageHandleStandardArgs)
-FIND_PACKAGE_HANDLE_STANDARD_ARGS(FAM DEFAULT_MSG FAM_INCLUDE_DIR
FAM_LIBRARIES )
+#FIND_PATH(FAM_INCLUDE_DIR fam.h)
+#
+#FIND_LIBRARY(FAM_LIBRARIES NAMES fam )
+#
+#include(FindPackageHandleStandardArgs)
+#FIND_PACKAGE_HANDLE_STANDARD_ARGS(FAM DEFAULT_MSG FAM_INCLUDE_DIR
FAM_LIBRARIES )
MARK_AS_ADVANCED(FAM_INCLUDE_DIR FAM_LIBRARIES)
diff -Nurd kdelibs-4.4.1/cmake/modules/FindSoprano.cmake
kdelibs-4.4.1-new/cmake/modules/FindSoprano.cmake
--- kdelibs-4.4.1/cmake/modules/FindSoprano.cmake 2009-12-04
18:10:02.000000000 -0500
+++ kdelibs-4.4.1-new/cmake/modules/FindSoprano.cmake 2010-03-06
12:39:25.000000000 -0500
@@ -46,14 +46,14 @@
include(FindLibraryWithDebug)
find_program(SOPRANO_SOPRANOCMD_EXECUTABLE
- NAMES sopranocmd
+ NAMES sopranocmd-@KDETYPE@
HINTS
${BIN_INSTALL_DIR}
${KDE4_BIN_INSTALL_DIR}
)
find_program(SOPRANO_ONTO2VOCABULARYCLASS_EXECUTABLE
- NAMES onto2vocabularyclass
+ NAMES onto2vocabularyclass-@KDETYPE@
HINTS
${BIN_INSTALL_DIR}
${KDE4_BIN_INSTALL_DIR}
diff -Nurd kdelibs-4.4.1/cmake/modules/Qt4ConfigDependentSettings.cmake
kdelibs-4.4.1-new/cmake/modules/Qt4ConfigDependentSettings.cmake
--- kdelibs-4.4.1/cmake/modules/Qt4ConfigDependentSettings.cmake
2010-01-19 18:15:16.000000000 -0500
+++ kdelibs-4.4.1-new/cmake/modules/Qt4ConfigDependentSettings.cmake
2010-03-06 12:39:38.000000000 -0500
@@ -77,7 +77,18 @@
# QtOpenGL dependencies
QT_QUERY_QMAKE(QMAKE_LIBS_OPENGL "QMAKE_LIBS_OPENGL")
-SEPARATE_ARGUMENTS(QMAKE_LIBS_OPENGL)
+IF(Q_WS_MAC)
+# On the Mac OpenGL is probably frameworks and QMAKE_LIBS_OPENGL can be e.g.
"-framework OpenGL -framework AGL".
+# The separate_arguments() call in the other branch makes
"-framework;-OpenGL;-framework;-lAGL" appear in the
+# linker command. So we need to protect the "-framework foo" as
non-separatable strings.
+# We do this by replacing the space after "-framework" with an underscore,
then calling separate_arguments(),
+# and then we replace the underscores again with spaces. So we get proper
linker commands. Alex
+ STRING(REGEX REPLACE "-framework +" "-framework_" QMAKE_LIBS_OPENGL
"${QMAKE_LIBS_OPENGL}")
+ SEPARATE_ARGUMENTS(QMAKE_LIBS_OPENGL)
+ STRING(REGEX REPLACE "-framework_" "-framework " QMAKE_LIBS_OPENGL
"${QMAKE_LIBS_OPENGL}")
+ELSE(Q_WS_MAC)
+ SEPARATE_ARGUMENTS(QMAKE_LIBS_OPENGL)
+ENDIF(Q_WS_MAC)
SET (QT_QTOPENGL_LIB_DEPENDENCIES ${QT_QTOPENGL_LIB_DEPENDENCIES}
${QMAKE_LIBS_OPENGL})
diff -Nurd kdelibs-4.4.1/config.h.cmake kdelibs-4.4.1-new/config.h.cmake
--- kdelibs-4.4.1/config.h.cmake 2009-10-26 05:15:52.000000000 -0400
+++ kdelibs-4.4.1-new/config.h.cmake 2010-03-06 12:39:25.000000000 -0500
@@ -74,6 +74,7 @@
#cmakedefine HAVE_UNISTD_H 1
#cmakedefine HAVE_ARPA_NAMESER_COMPAT_H
#cmakedefine HAVE_ARPA_NAMESER8_COMPAT_H
+#cmakedefine HAVE_ARPA_NAMESER_COMPAT_H
#cmakedefine HAVE_LANGINFO_H 1
#cmakedefine HAVE_XTEST 1
@@ -92,7 +93,9 @@
#cmakedefine HAVE_GETMNTINFO 1
#cmakedefine HAVE_GETPAGESIZE 1
#cmakedefine HAVE_INITGROUPS 1
+#ifndef __APPLE__
#cmakedefine HAVE_FDATASYNC 1
+#endif
#cmakedefine HAVE_MADVISE 1
#cmakedefine HAVE_MMAP 1
#cmakedefine HAVE_MKSTEMPS 1
diff -Nurd kdelibs-4.4.1/doc/api/Doxyfile.local
kdelibs-4.4.1-new/doc/api/Doxyfile.local
--- kdelibs-4.4.1/doc/api/Doxyfile.local 2008-10-30 10:18:53.000000000
-0400
+++ kdelibs-4.4.1-new/doc/api/Doxyfile.local 2010-03-06 12:39:25.000000000
-0500
@@ -173,6 +173,7 @@
Q_WS_MAC="" \
Q_OS_UNIX="" \
Q_OS_WIN="" \
+ Q_OS_DARWIN="" \
Q_OS_MACX="" \
\
Q_SLOTS="slots" \
diff -Nurd kdelibs-4.4.1/kde3support/kdecore/k3processcontroller.cpp
kdelibs-4.4.1-new/kde3support/kdecore/k3processcontroller.cpp
--- kdelibs-4.4.1/kde3support/kdecore/k3processcontroller.cpp 2008-05-21
07:06:17.000000000 -0400
+++ kdelibs-4.4.1-new/kde3support/kdecore/k3processcontroller.cpp
2010-03-06 12:39:25.000000000 -0500
@@ -114,7 +114,7 @@
K3ProcessController::~K3ProcessController()
{
-#ifndef Q_OS_MAC
+#if !defined(Q_OS_DARWIN) && !defined(Q_OS_MAC)
/* not sure why, but this is causing lockups */
close( d->fd[0] );
close( d->fd[1] );
diff -Nurd kdelibs-4.4.1/kde3support/kdeui/k3passworddialog.cpp
kdelibs-4.4.1-new/kde3support/kdeui/k3passworddialog.cpp
--- kdelibs-4.4.1/kde3support/kdeui/k3passworddialog.cpp 2008-05-21
07:06:15.000000000 -0400
+++ kdelibs-4.4.1-new/kde3support/kdeui/k3passworddialog.cpp 2011-06-15
07:11:00.000000000 -0400
@@ -83,7 +83,7 @@
{
public:
K3PasswordDialogPrivate()
- : m_MatchLabel( 0 ), iconName( 0 ), allowEmptyPasswords( false ),
+ : m_MatchLabel( 0 ), allowEmptyPasswords( false ),
minimumPasswordLength(0),
maximumPasswordLength(K3PasswordEdit::PassLen - 1),
passwordStrengthWarningLevel(1), m_strengthBar(0),
reasonablePasswordLength(8)
diff -Nurd kdelibs-4.4.1/kde4-check-sycoca.sh
kdelibs-4.4.1-new/kde4-check-sycoca.sh
--- kdelibs-4.4.1/kde4-check-sycoca.sh 1969-12-31 19:00:00.000000000 -0500
+++ kdelibs-4.4.1-new/kde4-check-sycoca.sh 2010-03-06 12:39:25.000000000
-0500
@@ -0,0 +1,18 @@
+#!/bin/sh
+
+if [ `id -u` -eq 0 ] || [ `id -un | grep -c -E '^fink-bld$'` -gt 0 ]; then
+ # skip root and fink build account
+ exit 0
+fi
+
+FULLPREFIX="@KDEPREFIX@/opt/kde4/@KDETYPE@"
+GLOBAL_SYCOCA_DIR="$FULLPREFIX/var/fink"
+LOCAL_SYCOCA_DIR="$HOME/.cache/kde4-@KDETYPE@-fink"
+TOUCHFILE="kbuildsycoca-updated"
+
+mkdir -p "$LOCAL_SYCOCA_DIR"
+
+if [ ! -e "$LOCAL_SYCOCA_DIR/$TOUCHFILE" ] || [
"$GLOBAL_SYCOCA_DIR/$TOUCHFILE" -nt "$LOCAL_SYCOCA_DIR/$TOUCHFILE" ];then
+ echo "* you've installed KDE4 (@KDETYPE@) applications since last time
you ran init -- updating desktop cache"
+ ("$FULLPREFIX/bin/kbuildsycoca4" >"$LOCAL_SYCOCA_DIR/kbuildsycoca4.log"
2>&1 && touch "$LOCAL_SYCOCA_DIR/$TOUCHFILE") &
+fi
diff -Nurd kdelibs-4.4.1/kde4-postinst.sh kdelibs-4.4.1-new/kde4-postinst.sh
--- kdelibs-4.4.1/kde4-postinst.sh 1969-12-31 19:00:00.000000000 -0500
+++ kdelibs-4.4.1-new/kde4-postinst.sh 2010-03-06 12:39:25.000000000 -0500
@@ -0,0 +1,81 @@
+#!/bin/sh
+
+if [ `id -u` -ne 0 ]; then
+ echo "you must run this as root!"
+ exit 1
+fi
+
+PREFIX="@KDEPREFIX@"
+TYPE="@KDETYPE@"
+FULLPREFIX="@KDEPREFIX@/opt/kde4/@KDETYPE@"
+KDE4RCFILE="$FULLPREFIX/etc/kde4rc"
+TEMPPATH="/tmp/kb$$"
+LOGFILE="$TEMPPATH/kde4-postinst.log"
+
+mkdir -p "$TEMPPATH"
+cd "$TEMPPATH"
+
+echo >$LOGFILE
+
+echo "== figuring out KDE directories from $KDE4RCFILE ==" >>$LOGFILE
+PREFIXES=`grep '^prefixes=' "$KDE4RCFILE" | cut -d= -f2-`
+orig_IFS=$IFS
+IFS=","
+for PRE in $PREFIXES; do
+ export _KDEDIRS="$_KDEDIRS:$PRE"
+ export _XDG_DATA_DIRS="$_XDG_DATA_DIRS:$PRE/share"
+ export _XDG_CONFIG_DIRS="$_XDG_CONFIG_DIRS:$PRE/etc/xdg"
+done
+IFS=$orig_IFS
+
+KDEDIRS=`echo $_KDEDIRS:$KDEDIRS | sed -e 's,^:,,' -e 's,:$,,'`
+XDG_DATA_DIRS=`echo $_XDG_DATA_DIRS:$XDG_DATA_DIRS | sed -e 's,^:,,' -e
's,:$,,'`
+XDG_CONFIG_DIRS=`echo $_XDG_CONFIG_DIRS:$XDG_CONFIG_DIRS | sed -e 's,^:,,' -e
's,:$,,'`
+export KDEDIRS XDG_DATA_DIRS XDG_CONFIG_DIRS
+
+echo "KDEDIRS=$KDEDIRS" >>$LOGFILE
+echo "XDG_DATA_DIRS=$XDG_DATA_DIRS" >>$LOGFILE
+echo "XDG_CONFIG_DIRS=$XDG_CONFIG_DIRS" >>$LOGFILE
+
+echo "== marking sycoca database as dirty ==" >>$LOGFILE 2>&1
+mkdir -p "$FULLPREFIX/var/fink"
+touch "$FULLPREFIX/var/fink/kbuildsycoca-updated"
+
+echo "== running update-desktop-database ==" >>$LOGFILE 2>&1
+"$PREFIX/bin/update-desktop-database" --verbose `echo $KDEDIRS: | sed -e
's,:,/share/applications ,g'` >>$LOGFILE 2>&1
+
+IFS=":"
+for DIR in $KDEDIRS; do
+ if [ -d "$DIR/share/mime" ]; then
+ echo "== running update-mime-database on $DIR ==" >>$LOGFILE
2>&1
+ "$PREFIX/bin/update-mime-database" -V "$DIR/share/mime"
>>$LOGFILE 2>&1
+ fi
+done
+IFS=$orig_IFS
+
+[ -z "$DO_SYMLINK_UPDATE" ] && export DO_SYMLINK_UPDATE=1
+
+if [ $DO_SYMLINK_UPDATE -eq 1 ]; then
+ mkdir -p "$PREFIX/share/dbus-1/interfaces"
+
+ IFS=":"
+ for DIR in $KDEDIRS; do
+ if [ -d "$DIR/share/dbus-1/interfaces" ] && [ "$DIR" !=
"$PREFIX" ]; then
+ cd "$DIR/share/dbus-1/interfaces"
+ for file in *.xml; do
+ ln -sf "$DIR/share/dbus-1/interfaces/$file"
"$PREFIX/share/dbus-1/interfaces/$file"
+ done
+ fi
+ done
+ IFS=$orig_IFS
+ for file in "$PREFIX/share/dbus-1/interfaces"/*.xml; do
+ if [ ! -f "$file" ]; then
+ rm -rf "$file"
+ fi
+ done
+fi
+
+echo ""
+echo "== KDE4 Applications Have Been Updated =="
+echo "You should start a new shell, or run
$FULLPREFIX/bin/kde4-check-sycoca.sh to update the KDE4 application database."
+echo ""
diff -Nurd kdelibs-4.4.1/kdecore/config/kconfig.cpp
kdelibs-4.4.1-new/kdecore/config/kconfig.cpp
--- kdelibs-4.4.1/kdecore/config/kconfig.cpp 2009-09-16 07:44:19.000000000
-0400
+++ kdelibs-4.4.1-new/kdecore/config/kconfig.cpp 2010-03-06
12:39:25.000000000 -0500
@@ -70,7 +70,7 @@
#ifdef Q_WS_WIN
QFile::decodeName( qgetenv("WINDIR") + "/kde4rc" );
#else
- QLatin1String("/etc/kde4rc");
+ QLatin1String("@KDEPREFIX@/lib/@KDETYPE@/etc/kde4rc");
#endif
if (!KStandardDirs::checkAccess(etc_kderc, R_OK)) {
etc_kderc.clear();
diff -Nurd kdelibs-4.4.1/kdecore/kernel/kcmdlineargs.cpp
kdelibs-4.4.1-new/kdecore/kernel/kcmdlineargs.cpp
--- kdelibs-4.4.1/kdecore/kernel/kcmdlineargs.cpp 2010-02-04
04:22:37.000000000 -0500
+++ kdelibs-4.4.1-new/kdecore/kernel/kcmdlineargs.cpp 2010-03-06
12:39:25.000000000 -0500
@@ -737,10 +737,6 @@
argument = opt.mid(j+1);
opt = opt.left(j);
}
-#ifdef Q_WS_MACX
- if(opt.startsWith("psn_")) // krazy:exclude=strings
- opt = "psn";
-#endif
bool enabled = true;
int result = 0;
@@ -801,10 +797,6 @@
{
if (s->ignoreUnknown)
return;
-#ifdef Q_WS_MACX
- if (_opt.startsWith("psn_")) // krazy:exclude=strings
- return;
-#endif
KCmdLineArgs::enable_i18n();
KCmdLineArgs::usageError( i18n("Unknown option '%1'.",
QString::fromLocal8Bit(_opt)));
}
@@ -821,10 +813,6 @@
{
if (s->ignoreUnknown)
return;
-#ifdef Q_WS_MACX
- if (_opt.startsWith("psn_")) // krazy:exclude=strings
- return;
-#endif
KCmdLineArgs::enable_i18n();
KCmdLineArgs::usageError( i18n("Unknown option '%1'.",
QString::fromLocal8Bit(_opt)));
}
@@ -889,6 +877,13 @@
{
KCmdLineArgs::usage(option.mid(5));
}
+#ifdef Q_WS_MAC
+ // skip the finder -psn_* crap
+ else if (option.startsWith("psn_"))
+ {
+ continue;
+ }
+#endif
else if ((option == "version") || (option == "v"))
{
KCmdLineArgs::enable_i18n();
diff -Nurd kdelibs-4.4.1/kdecore/kernel/kkernel_mac.cpp
kdelibs-4.4.1-new/kdecore/kernel/kkernel_mac.cpp
--- kdelibs-4.4.1/kdecore/kernel/kkernel_mac.cpp 2009-01-06
12:27:48.000000000 -0500
+++ kdelibs-4.4.1-new/kdecore/kernel/kkernel_mac.cpp 2010-03-06
12:39:25.000000000 -0500
@@ -21,7 +21,7 @@
#include <config.h>
-#ifdef Q_OS_MACX
+#if (defined (Q_OS_DARWIN) || defined (Q_OS_MAC))
#include <unistd.h>
#include <string.h>
@@ -142,7 +142,7 @@
return;
}
- dbusVar = QFile::decodeName(qgetenv("DBUS_LAUNCHD_SESSION_BUS_SOCKET"));
+ dbusVar = QFile::decodeName(qgetenv("DBUS_FINK_SESSION_BUS_SOCKET"));
if (mac_set_dbus_address(dbusVar)) {
dbus_initialized = true;
return;
@@ -161,22 +161,27 @@
}
if (!externalProc.isEmpty()) {
- QProcess qp;
- qp.setTextModeEnabled(true);
+ QProcess qp;
+ qp.setTextModeEnabled(true);
- qp.start(externalProc, QStringList() << "getenv" <<
"DBUS_LAUNCHD_SESSION_BUS_SOCKET");
- if (!qp.waitForFinished(timeout)) {
- kDebug() << "error running" << externalProc <<
qp.errorString();
- return;
- }
- if (qp.exitCode() != 0) {
- kDebug() << externalProc << "unsuccessful:" <<
qp.readAllStandardError();
- return;
- }
+ qp.start(externalProc, QStringList() << "load" <<
"@KDEPREFIX@/share/dbus/launchd/org.finkproject.dbus-session.plist");
+ if (!qp.waitForFinished(timeout)) {
+ kDebug() << "error running" << externalProc <<
qp.errorString();
+ }
- QString line = qp.readLine().trimmed(); // read the first line
- if (mac_set_dbus_address(line))
- dbus_initialized = true; // hooray
+ qp.start(externalProc, QStringList() << "getenv" <<
"DBUS_FINK_SESSION_BUS_SOCKET");
+ if (!qp.waitForFinished(timeout)) {
+ kDebug() << "error running" << externalProc <<
qp.errorString();
+ return;
+ }
+ if (qp.exitCode() != 0) {
+ kDebug() << externalProc << "unsuccessful:" <<
qp.readAllStandardError();
+ return;
+ }
+
+ QString line = qp.readLine().trimmed(); // read the first line
+ if (mac_set_dbus_address(line))
+ dbus_initialized = true; // hooray
}
if (dbus_initialized == false) {
@@ -185,6 +190,7 @@
}
+
QString mac_app_filename() {
static QString appFileName;
if (appFileName.isEmpty()) {
diff -Nurd kdelibs-4.4.1/kdecore/kernel/kkernel_mac.h
kdelibs-4.4.1-new/kdecore/kernel/kkernel_mac.h
--- kdelibs-4.4.1/kdecore/kernel/kkernel_mac.h 2009-01-01 11:28:04.000000000
-0500
+++ kdelibs-4.4.1-new/kdecore/kernel/kkernel_mac.h 2010-03-06
12:39:25.000000000 -0500
@@ -21,7 +21,7 @@
#include <QtCore/qglobal.h> // defines Q_OS_MACX
-#ifdef Q_OS_MACX
+#if (defined (Q_OS_DARWIN) || defined (Q_OS_MAC))
#include <kdecore_export.h>
#include <QtCore/QString>
@@ -50,5 +50,5 @@
*/
KDECORE_EXPORT QString mac_app_filename();
-#endif // Q_OS_MACX
+#endif // MAC
#endif // KKERNEL_MAC_H
diff -Nurd kdelibs-4.4.1/kdecore/kernel/kstandarddirs.cpp
kdelibs-4.4.1-new/kdecore/kernel/kstandarddirs.cpp
--- kdelibs-4.4.1/kdecore/kernel/kstandarddirs.cpp 2009-12-10
18:14:42.000000000 -0500
+++ kdelibs-4.4.1-new/kdecore/kernel/kstandarddirs.cpp 2010-03-06
12:39:25.000000000 -0500
@@ -1215,10 +1215,19 @@
QString bundle = path;
bundle += ".app/Contents/MacOS/" + bundle.section('/', -1);
info.setFile( bundle );
- if ( info.exists() && ( ignore || info.isExecutable() )
- && ( info.isFile() || info.isSymLink() ) ) {
- kDebug(180) << "getBundle(): returning " << bundle;
- return bundle;
+ FILE *file;
+ if (file = fopen(info.absoluteFilePath().toUtf8().constData(), "r")) {
+ fclose(file);
+ struct stat _stat;
+ if ((stat(info.absoluteFilePath().toUtf8().constData(), &_stat)) < 0) {
+ return QString();
+ }
+ if ( ignore || (_stat.st_mode & S_IXUSR) ) {
+ if ( ((_stat.st_mode & S_IFMT) == S_IFREG) || ((_stat.st_mode &
S_IFMT) == S_IFLNK) ) {
+ kDebug(180) << "getBundle(): returning " << bundle;
+ return bundle;
+ }
+ }
}
return QString();
}
@@ -1235,6 +1244,23 @@
#endif
QFileInfo info( path );
QFileInfo orig = info;
+#if defined(Q_OS_DARWIN) || defined(Q_OS_MAC)
+ FILE *file;
+ if (file = fopen(orig.absoluteFilePath().toUtf8().constData(), "r")) {
+ fclose(file);
+ struct stat _stat;
+ if ((stat(orig.absoluteFilePath().toUtf8().constData(), &_stat)) < 0) {
+ return QString();
+ }
+ if ( ignoreExecBit || (_stat.st_mode & S_IXUSR) ) {
+ if ( ((_stat.st_mode & S_IFMT) == S_IFREG) || ((_stat.st_mode &
S_IFMT) == S_IFLNK) ) {
+ orig.makeAbsolute();
+ return orig.filePath();
+ }
+ }
+ }
+ return QString();
+#else
if( info.exists() && info.isSymLink() )
info = QFileInfo( info.canonicalFilePath() );
if( info.exists() && ( ignoreExecBit || info.isExecutable() ) &&
info.isFile() ) {
@@ -1246,6 +1272,7 @@
}
//kDebug(180) << "checkExecutable(): failed, returning empty string";
return QString();
+#endif
}
QString KStandardDirs::findExe( const QString& appname,
diff -Nurd kdelibs-4.4.1/kdecore/localization/klocale.cpp
kdelibs-4.4.1-new/kdecore/localization/klocale.cpp
--- kdelibs-4.4.1/kdecore/localization/klocale.cpp 2009-12-10
18:14:43.000000000 -0500
+++ kdelibs-4.4.1-new/kdecore/localization/klocale.cpp 2010-03-06
12:39:25.000000000 -0500
@@ -2341,7 +2341,7 @@
// workaround
QByteArray systemLocale = nl_langinfo(CODESET);
-#if defined(Q_OS_MAC)
+#if (defined(Q_OS_DARWIN) || defined(Q_OS_MAC))
// Mac OX X is UTF-8, always.
systemLocale = "UTF-8";
#endif //Q_OS_MAC
diff -Nurd kdelibs-4.4.1/kdecore/tests/kconfigtest.cpp
kdelibs-4.4.1-new/kdecore/tests/kconfigtest.cpp
--- kdelibs-4.4.1/kdecore/tests/kconfigtest.cpp 2010-02-26 13:30:08.000000000
-0500
+++ kdelibs-4.4.1-new/kdecore/tests/kconfigtest.cpp 2010-03-06
12:39:25.000000000 -0500
@@ -415,7 +415,7 @@
QCOMPARE(group.readPathEntry("homePath2", QString()), QString("file://") +
HOMEPATH );
QVERIFY(group.hasKey("URL"));
QCOMPARE(group.readEntry("URL", QString()), QString("file://") + HOMEPATH );
-#if !defined(Q_OS_WIN32) && !defined(Q_OS_MAC)
+#if !defined(Q_OS_WIN32) && !defined(Q_OS_DARWIN) && !defined(Q_OS_MAC)
// I don't know if this will work on windows
// This test hangs on OS X
QVERIFY(group.hasKey("hostname"));
diff -Nurd kdelibs-4.4.1/kded/CMakeLists.txt
kdelibs-4.4.1-new/kded/CMakeLists.txt
--- kdelibs-4.4.1/kded/CMakeLists.txt 2009-10-02 10:55:17.000000000 -0400
+++ kdelibs-4.4.1-new/kded/CMakeLists.txt 2010-03-06 12:39:25.000000000
-0500
@@ -13,6 +13,12 @@
kde4_add_kdeinit_executable(kded4 ${kded_KDEINIT_SRCS})
+if (Q_WS_MAC)
+ set_target_properties(kded4 PROPERTIES MACOSX_BUNDLE_INFO_PLIST
${CMAKE_CURRENT_SOURCE_DIR}/Info.plist.template)
+ set_target_properties(kded4 PROPERTIES MACOSX_BUNDLE_GUI_IDENTIFIER
"org.kded.kded4")
+ set_target_properties(kded4 PROPERTIES MACOSX_BUNDLE_BUNDLE_NAME "KDE
Daemon")
+endif (Q_WS_MAC)
+
target_link_libraries(kdeinit_kded4 ${KDE4_KIO_LIBS} ${X11_LIBRARIES})
install(TARGETS kdeinit_kded4 ${INSTALL_TARGETS_DEFAULT_ARGS})
diff -Nurd kdelibs-4.4.1/kded/Info.plist.template
kdelibs-4.4.1-new/kded/Info.plist.template
--- kdelibs-4.4.1/kded/Info.plist.template 1969-12-31 19:00:00.000000000
-0500
+++ kdelibs-4.4.1-new/kded/Info.plist.template 2010-03-06 12:39:25.000000000
-0500
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN"
"http://www.apple.com/DTDs/PropertyList-1.0.dtd";>
+<plist version="1.0">
+<dict>
+ <key>CFBundleDevelopmentRegion</key>
+ <string>English</string>
+ <key>CFBundleExecutable</key>
+ <string>${MACOSX_BUNDLE_EXECUTABLE_NAME}</string>
+ <key>CFBundleGetInfoString</key>
+ <string>${MACOSX_BUNDLE_INFO_STRING}</string>
+ <key>CFBundleIconFile</key>
+ <string>${MACOSX_BUNDLE_ICON_FILE}</string>
+ <key>CFBundleIdentifier</key>
+ <string>${MACOSX_BUNDLE_GUI_IDENTIFIER}</string>
+ <key>CFBundleInfoDictionaryVersion</key>
+ <string>6.0</string>
+ <key>CFBundleLongVersionString</key>
+ <string>${MACOSX_BUNDLE_LONG_VERSION_STRING}</string>
+ <key>CFBundleName</key>
+ <string>${MACOSX_BUNDLE_BUNDLE_NAME}</string>
+ <key>CFBundlePackageType</key>
+ <string>APPL</string>
+ <key>CFBundleShortVersionString</key>
+ <string>${MACOSX_BUNDLE_SHORT_VERSION_STRING}</string>
+ <key>CFBundleVersion</key>
+ <string>${MACOSX_BUNDLE_BUNDLE_VERSION}</string>
+ <key>CSResourcesFileMapped</key>
+ <true/>
+ <key>LSRequiresCarbon</key>
+ <true/>
+ <key>LSUIElement</key>
+ <string>1</string>
+ <key>NSHumanReadableCopyright</key>
+ <string>${MACOSX_BUNDLE_COPYRIGHT}</string>
+</dict>
+</plist>
diff -Nurd kdelibs-4.4.1/kdeui/kernel/kapplication.cpp
kdelibs-4.4.1-new/kdeui/kernel/kapplication.cpp
--- kdelibs-4.4.1/kdeui/kernel/kapplication.cpp 2009-12-31 08:29:25.000000000
-0500
+++ kdelibs-4.4.1-new/kdeui/kernel/kapplication.cpp 2010-03-06
12:39:25.000000000 -0500
@@ -96,6 +96,9 @@
#include <Carbon/Carbon.h>
#include <QImage>
#include <ksystemtrayicon.h>
+#endif
+
+#if defined(Q_OS_DARWIN) || defined (Q_OS_MAC)
#include <kkernel_mac.h>
#endif
@@ -451,7 +454,7 @@
::exit(127);
}
-#ifdef Q_WS_MAC
+#if defined(Q_OS_DARWIN) || defined (Q_OS_MAC)
mac_initialize_dbus();
#endif
diff -Nurd kdelibs-4.4.1/kdeui/kernel/kuniqueapplication.cpp
kdelibs-4.4.1-new/kdeui/kernel/kuniqueapplication.cpp
--- kdelibs-4.4.1/kdeui/kernel/kuniqueapplication.cpp 2009-07-17
17:46:25.000000000 -0400
+++ kdelibs-4.4.1-new/kdeui/kernel/kuniqueapplication.cpp 2010-03-06
12:39:25.000000000 -0500
@@ -66,7 +66,7 @@
# endif
#endif
-#ifdef Q_WS_MAC
+#if defined(Q_OS_DARWIN) || defined (Q_OS_MAC)
#include <kkernel_mac.h>
#endif
@@ -117,16 +117,10 @@
s_kuniqueapplication_startCalled = true;
addCmdLineOptions(); // Make sure to add cmd line options
-#ifdef Q_WS_WIN
+#if defined(Q_WS_WIN) || defined(Q_WS_MACX)
Private::s_nofork = true;
#else
KCmdLineArgs *args = KCmdLineArgs::parsedArgs("kuniqueapp");
-#ifdef Q_WS_MACX
- // avoid focus loss caused by extra fork when launched from Finder
- if(args->isSet("psn"))
- Private::s_nofork = true;
- else
-#endif
Private::s_nofork = !args->isSet("fork");
#endif
@@ -141,14 +135,15 @@
appName.prepend(s);
}
-#ifdef Q_WS_MAC
- mac_initialize_dbus();
-#endif
-
bool forceNewProcess = Private::s_multipleInstances || flags &
NonUniqueInstance;
if (Private::s_nofork)
{
+
+#if defined(Q_OS_DARWIN) || defined (Q_OS_MAC)
+ mac_initialize_dbus();
+#endif
+
QDBusConnectionInterface* dbusService = tryToInitDBusConnection();
QString pid = QString::number(getpid());
@@ -182,7 +177,7 @@
// We'll call newInstance in the constructor. Do nothing here.
return true;
-#ifdef Q_WS_MACX
+#if defined(Q_OS_DARWIN) || defined (Q_OS_MAC)
} else {
mac_fork_and_reexec_self();
#endif
diff -Nurd kdelibs-4.4.1/kdeui/util/kpassivepopup.cpp
kdelibs-4.4.1-new/kdeui/util/kpassivepopup.cpp
--- kdelibs-4.4.1/kdeui/util/kpassivepopup.cpp 2009-12-31 08:29:27.000000000
-0500
+++ kdelibs-4.4.1-new/kdeui/util/kpassivepopup.cpp 2010-03-06
12:39:25.000000000 -0500
@@ -49,7 +49,11 @@
static const int DEFAULT_POPUP_TYPE = KPassivePopup::Boxed;
static const int DEFAULT_POPUP_TIME = 6*1000;
+#ifdef __APPLE__
+static const Qt::WindowFlags POPUP_FLAGS = Qt::Dialog |
Qt::X11BypassWindowManagerHint | Qt::WindowStaysOnTopHint |
Qt::FramelessWindowHint;
+#else
static const Qt::WindowFlags POPUP_FLAGS = Qt::Tool |
Qt::X11BypassWindowManagerHint | Qt::WindowStaysOnTopHint |
Qt::FramelessWindowHint;
+#endif
class KPassivePopup::Private
{
@@ -127,6 +131,10 @@
if( d->popupStyle == Boxed )
{
setFrameStyle( QFrame::Box| QFrame::Plain );
+#ifdef Q_OS_MAC
+ setAttribute( Qt::WA_ShowWithoutActivating );
+ setAttribute( Qt::WA_MacAlwaysShowToolWindow );
+#endif
setLineWidth( 2 );
}
else if( d->popupStyle == Balloon )
diff -Nurd kdelibs-4.4.1/kdeui/windowmanagement/kwindowinfo_mac.cpp
kdelibs-4.4.1-new/kdeui/windowmanagement/kwindowinfo_mac.cpp
--- kdelibs-4.4.1/kdeui/windowmanagement/kwindowinfo_mac.cpp 2009-07-17
17:46:29.000000000 -0400
+++ kdelibs-4.4.1-new/kdeui/windowmanagement/kwindowinfo_mac.cpp
2010-03-06 12:39:26.000000000 -0500
@@ -59,14 +59,14 @@
{
ProcessInfoRec pinfo;
char processName[512];
-#ifdef Q_OS_MAC32
+#if (defined(Q_OS_DARWIN32) || defined(Q_OS_MAC32))
FSSpec appSpec;
#else
FSRef ref;
#endif
pinfo.processInfoLength = sizeof pinfo;
pinfo.processName = (unsigned char*) processName;
-#ifdef Q_OS_MAC32
+#if (defined(Q_OS_DARWIN32) || defined(Q_OS_MAC32))
pinfo.processAppSpec = &appSpec;
#else
pinfo.processAppRef = &ref;
@@ -82,7 +82,7 @@
}
}
-#ifdef Q_OS_MAC32
+#if (defined(Q_OS_DARWIN32) || defined(Q_OS_MAC32))
iconSpec = appSpec;
FSRef ref;
@@ -100,7 +100,7 @@
ref = parentRef;
FSGetCatalogInfo(&ref, kFSCatInfoNone, 0, &name, 0, &parentRef);
if (QString::fromUtf16(name.unicode, name.length) == "Contents") {
-#ifdef Q_OS_MAC32
+#if (defined(Q_OS_DARWIN32) || defined(Q_OS_MAC32))
FSSpec spec;
ref = parentRef;
FSGetCatalogInfo(&ref, kFSCatInfoNone, 0, &name, &spec,
&parentRef);
diff -Nurd kdelibs-4.4.1/kdeui/windowmanagement/kwindowinfo_mac_p.h
kdelibs-4.4.1-new/kdeui/windowmanagement/kwindowinfo_mac_p.h
--- kdelibs-4.4.1/kdeui/windowmanagement/kwindowinfo_mac_p.h 2009-05-27
15:54:57.000000000 -0400
+++ kdelibs-4.4.1-new/kdeui/windowmanagement/kwindowinfo_mac_p.h
2010-03-06 12:39:26.000000000 -0500
@@ -43,7 +43,7 @@
pid_t pid() const { return m_pid; }
void setProcessSerialNumber(const ProcessSerialNumber& psn);
QString name;
-#ifdef Q_OS_MAC32
+#if (defined(Q_OS_DARWIN32) || defined(Q_OS_MAC32))
FSSpec iconSpec;
#else
FSRef iconSpec;
diff -Nurd kdelibs-4.4.1/kdeui/windowmanagement/kwindowsystem_mac.cpp
kdelibs-4.4.1-new/kdeui/windowmanagement/kwindowsystem_mac.cpp
--- kdelibs-4.4.1/kdeui/windowmanagement/kwindowsystem_mac.cpp 2009-07-17
17:46:29.000000000 -0400
+++ kdelibs-4.4.1-new/kdeui/windowmanagement/kwindowsystem_mac.cpp
2010-03-06 12:39:26.000000000 -0500
@@ -141,7 +141,7 @@
m_noEmit = false;
-#ifdef Q_OS_MAC32
+#if (defined(Q_OS_DARWIN32) || defined(Q_OS_MAC32))
// register callbacks for application launches/quits
m_eventTarget = GetApplicationEventTarget();
m_eventHandler = NewEventHandlerUPP(applicationEventHandler);
@@ -158,7 +158,7 @@
}
void KWindowSystemPrivate::applicationLaunched(const ProcessSerialNumber& psn)
{
-#ifdef Q_OS_MAC32
+#if (defined(Q_OS_DARWIN32) || defined(Q_OS_MAC32))
kDebug(240) << "new app: " << psn.lowLongOfPSN << ":" << psn.highLongOfPSN;
ProcessInfoRec pinfo;
FSSpec appSpec;
@@ -425,7 +425,7 @@
}
IconRef icon;
SInt16 label;
-#ifdef Q_OS_MAC32
+#if (defined(Q_OS_DARWIN32) || defined(Q_OS_MAC32))
OSErr err = GetIconRefFromFile(&info.d->iconSpec, &icon, &label);
#else
OSStatus err = GetIconRefFromFileInfo(&info.d->iconSpec, 0, 0,
@@ -473,7 +473,7 @@
void KWindowSystem::setType( WId winid, NET::WindowType windowType )
{
-#ifdef Q_OS_MAC32
+#if (defined(Q_OS_DARWIN32) || defined(Q_OS_MAC32))
// not supported for 'global' windows; only for windows in the current
process
if (hasWId(winid)) return;
diff -Nurd kdelibs-4.4.1/kimgio/CMakeLists.txt
kdelibs-4.4.1-new/kimgio/CMakeLists.txt
--- kdelibs-4.4.1/kimgio/CMakeLists.txt 2009-09-16 07:44:15.000000000 -0400
+++ kdelibs-4.4.1-new/kimgio/CMakeLists.txt 2010-03-06 12:39:26.000000000
-0500
@@ -96,7 +96,7 @@
add_definitions(${OPENEXR_DEFINITIONS})
set(kimg_exr_LIB_SRCS exr.cpp)
kde4_add_plugin(kimg_exr ${kimg_exr_LIB_SRCS})
- target_link_libraries(kimg_exr ${KDE4_KDECORE_LIBS} ${QT_QTGUI_LIBRARY}
${OPENEXR_LIBRARIES} )
+ target_link_libraries(kimg_exr ${KDE4_KDECORE_LIBS} ${QT_QTGUI_LIBRARY}
${OPENEXR_LIBRARIES} z )
install(TARGETS kimg_exr DESTINATION
${PLUGIN_INSTALL_DIR}/plugins/imageformats/ )
install( FILES exr.desktop DESTINATION
${SERVICES_INSTALL_DIR}/qimageioplugins/ )
diff -Nurd kdelibs-4.4.1/kinit/CMakeLists.txt
kdelibs-4.4.1-new/kinit/CMakeLists.txt
--- kdelibs-4.4.1/kinit/CMakeLists.txt 2009-12-17 11:33:40.000000000 -0500
+++ kdelibs-4.4.1-new/kinit/CMakeLists.txt 2010-03-06 12:39:26.000000000
-0500
@@ -36,13 +36,16 @@
set(kdeinit_LIBS kparts)
endif (WIN32)
-if (APPLE OR WIN32)
+if (Q_WS_MAC OR WIN32)
# this has to be GUI on OSX because it launches GUI apps and need a quartz
context
# and on Windows this makes kdeinit4 create separate console window
kde4_add_executable(kdeinit4 ${kdeinit_SRCS})
-else (APPLE OR WIN32)
+ set_target_properties(kdeinit4 PROPERTIES MACOSX_BUNDLE_INFO_PLIST
${CMAKE_CURRENT_SOURCE_DIR}/Info.plist.template)
+ set_target_properties(kdeinit4 PROPERTIES MACOSX_BUNDLE_GUI_IDENTIFIER
"org.kde.kdeinit4")
+ set_target_properties(kdeinit4 PROPERTIES MACOSX_BUNDLE_BUNDLE_NAME "KDE
Init")
+else (Q_WS_MAC OR WIN32)
kde4_add_executable(kdeinit4 NOGUI ${kdeinit_SRCS})
-endif (APPLE OR WIN32)
+endif (Q_WS_MAC OR WIN32)
target_link_libraries(kdeinit4 ${KDE4_KDECORE_LIBS} ${kdeinit_LIBS}
${KINIT_SOCKET_LIBRARY} )
if (Q_WS_X11)
@@ -51,6 +54,16 @@
install(TARGETS kdeinit4 ${INSTALL_TARGETS_DEFAULT_ARGS} )
+########### kdeinit4_helper ###############
+
+set(kdeinit4_helper_SRCS helper.cpp)
+
+kde4_add_executable(kdeinit4_helper NOGUI ${kdeinit4_helper_SRCS})
+
+target_link_libraries(kdeinit4_helper ${QT_QTCORE_LIBRARY})
+
+install(TARGETS kdeinit4_helper DESTINATION ${LIBEXEC_INSTALL_DIR} )
+
########### kwrapper4 ###############
if (WIN32)
set(kwrapper_SRCS kwrapper_win.cpp )
diff -Nurd kdelibs-4.4.1/kinit/Info.plist.template
kdelibs-4.4.1-new/kinit/Info.plist.template
--- kdelibs-4.4.1/kinit/Info.plist.template 1969-12-31 19:00:00.000000000
-0500
+++ kdelibs-4.4.1-new/kinit/Info.plist.template 2010-03-06 12:39:26.000000000
-0500
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN"
"http://www.apple.com/DTDs/PropertyList-1.0.dtd";>
+<plist version="1.0">
+<dict>
+ <key>CFBundleDevelopmentRegion</key>
+ <string>English</string>
+ <key>CFBundleExecutable</key>
+ <string>${MACOSX_BUNDLE_EXECUTABLE_NAME}</string>
+ <key>CFBundleGetInfoString</key>
+ <string>${MACOSX_BUNDLE_INFO_STRING}</string>
+ <key>CFBundleIconFile</key>
+ <string>${MACOSX_BUNDLE_ICON_FILE}</string>
+ <key>CFBundleIdentifier</key>
+ <string>${MACOSX_BUNDLE_GUI_IDENTIFIER}</string>
+ <key>CFBundleInfoDictionaryVersion</key>
+ <string>6.0</string>
+ <key>CFBundleLongVersionString</key>
+ <string>${MACOSX_BUNDLE_LONG_VERSION_STRING}</string>
+ <key>CFBundleName</key>
+ <string>${MACOSX_BUNDLE_BUNDLE_NAME}</string>
+ <key>CFBundlePackageType</key>
+ <string>APPL</string>
+ <key>CFBundleShortVersionString</key>
+ <string>${MACOSX_BUNDLE_SHORT_VERSION_STRING}</string>
+ <key>CFBundleVersion</key>
+ <string>${MACOSX_BUNDLE_BUNDLE_VERSION}</string>
+ <key>CSResourcesFileMapped</key>
+ <true/>
+ <key>LSRequiresCarbon</key>
+ <true/>
+ <key>LSUIElement</key>
+ <string>1</string>
+ <key>NSHumanReadableCopyright</key>
+ <string>${MACOSX_BUNDLE_COPYRIGHT}</string>
+</dict>
+</plist>
diff -Nurd kdelibs-4.4.1/kinit/helper.cpp kdelibs-4.4.1-new/kinit/helper.cpp
--- kdelibs-4.4.1/kinit/helper.cpp 1969-12-31 19:00:00.000000000 -0500
+++ kdelibs-4.4.1-new/kinit/helper.cpp 2010-03-06 12:39:26.000000000 -0500
@@ -0,0 +1,42 @@
+#include <stdio.h>
+#include <stdlib.h>
+
+#include <QFile>
+#include <QLibrary>
+
+typedef int (*handler) (int, char *[]);
+
+int main(int argc, char *argv[])
+{
+ if (argc < 2)
+ {
+ fprintf(stderr, "Too few arguments\n");
+ exit(1);
+ }
+
+ QString libpath = QFile::decodeName(argv[argc-1]);
+ QLibrary l(libpath);
+
+ if (!libpath.isEmpty() && (!l.load() || !l.isLoaded()))
+ {
+ QString ltdlError = l.errorString();
+ fprintf(stderr, "Could not open library %s: %s\n",
qPrintable(libpath), qPrintable(ltdlError) );
+ exit(1);
+ }
+
+ void * sym = l.resolve( "kdeinitmain");
+ if (!sym)
+ {
+ sym = l.resolve( "kdemain" );
+ if ( !sym )
+ {
+ QString ltdlError = l.errorString();
+ fprintf(stderr, "Could not find kdemain: %s\n",
qPrintable(ltdlError) );
+ exit(1);
+ }
+ }
+
+ handler func = (int (*)(int, char *[])) sym;
+ exit( func(argc - 1, argv)); /* Launch! */
+}
+
diff -Nurd kdelibs-4.4.1/kinit/kinit.cpp kdelibs-4.4.1-new/kinit/kinit.cpp
--- kdelibs-4.4.1/kinit/kinit.cpp 2010-01-31 14:28:05.000000000 -0500
+++ kdelibs-4.4.1-new/kinit/kinit.cpp 2010-03-06 12:39:26.000000000 -0500
@@ -72,7 +72,7 @@
#endif
#endif
-#ifdef Q_WS_MACX
+#if defined(Q_OS_DARWIN) || defined (Q_OS_MAC)
#include <kkernel_mac.h>
#endif
@@ -528,6 +528,14 @@
init_startup_info( startup_id, name, envc, envs );
#endif
+ // Don't run this inside the child process, it crashes on OS/X 10.6
+ const QByteArray docPath =
QFile::encodeName(KGlobalSettings::documentPath());
+ const QString helperpath =
s_instance->dirs()->findExe(QString::fromLatin1("kdeinit4_helper"));
+#ifdef Q_WS_MAC
+ const QString bundlepath =
s_instance->dirs()->findExe(QFile::decodeName(execpath));
+ const QString argvexe =
s_instance->dirs()->findExe(QString::fromLatin1(_name));
+#endif
+
d.errorMsg = 0;
d.fork = fork();
switch(d.fork) {
@@ -553,7 +561,6 @@
if (cwd && *cwd) {
(void)chdir(cwd);
} else {
- const QByteArray docPath =
QFile::encodeName(KGlobalSettings::documentPath());
(void)chdir(docPath.constData());
}
@@ -589,9 +596,9 @@
{
int r;
QByteArray procTitle;
- d.argv = (char **) malloc(sizeof(char *) * (argc+1));
+ d.argv = (char **) malloc(sizeof(char *) * (argc+2));
d.argv[0] = (char *) _name;
-#ifdef Q_WS_MAC
+#if defined(Q_OS_DARWIN) || defined (Q_OS_MAC)
QString argvexe =
s_instance->dirs()->findExe(QString::fromLatin1(d.argv[0]));
if (!argvexe.isEmpty()) {
QByteArray cstr = argvexe.toLocal8Bit();
@@ -668,7 +675,6 @@
QByteArray executable = execpath;
#ifdef Q_WS_MAC
- QString bundlepath =
s_instance->dirs()->findExe(QFile::decodeName(executable));
if (!bundlepath.isEmpty())
executable = QFile::encodeName(bundlepath);
#endif
@@ -682,25 +688,13 @@
exit(255);
}
- void * sym = l.resolve( "kdeinitmain");
- if (!sym )
- {
- sym = l.resolve( "kdemain" );
- if ( !sym )
- {
- QString ltdlError = l.errorString();
- fprintf(stderr, "Could not find kdemain: %s\n",
qPrintable(ltdlError) );
- QString errorMsg = i18n("Could not find 'kdemain' in '%1'.\n%2",
- libpath, ltdlError);
- exitWithErrorMsg(errorMsg);
- }
- }
-
- d.result = 0; // Success
+ d.result = 2; // Try execing
write(d.fd[1], &d.result, 1);
- close(d.fd[1]);
- d.func = (int (*)(int, char *[])) sym;
+ // We set the close on exec flag.
+ // Closing of d.fd[1] indicates that the execvp succeeded!
+ fcntl(d.fd[1], F_SETFD, FD_CLOEXEC);
+
if (d.debug_wait)
{
fprintf(stderr, "kdeinit4: Suspending process\n"
@@ -714,8 +708,18 @@
setup_tty( tty );
}
- exit( d.func(argc, d.argv)); /* Launch! */
+ QByteArray helperexe = QFile::encodeName(helperpath);
+ QByteArray libpathbytes = QFile::encodeName(libpath);
+ d.argv[argc] = libpathbytes.data();
+ d.argv[argc+1] = 0;
+ if (!helperexe.isEmpty())
+ execvp(helperexe, d.argv);
+
+ d.result = 1; // Error
+ write(d.fd[1], &d.result, 1);
+ close(d.fd[1]);
+ exit(255);
break;
}
default:
@@ -1625,12 +1629,10 @@
launch_klauncher = 0;
if (strcmp(safe_argv[i], "--no-kded") == 0)
launch_kded = 0;
-#ifdef Q_WS_MACX
// make it nofork to match KUniqueApplication, technically command-line
incompatible
if (strcmp(safe_argv[i], "--nofork") == 0)
-#else
+ do_fork = false;
if (strcmp(safe_argv[i], "--no-fork") == 0)
-#endif
do_fork = false;
if (strcmp(safe_argv[i], "--suicide") == 0)
d.suicide = true;
@@ -1650,7 +1652,7 @@
{
printf("Usage: kdeinit4 [options]\n");
// printf(" --no-dcop Do not start dcopserver\n");
-#ifdef Q_WS_MACX
+#if (defined Q_OS_DARWIN || defined_Q_OS_MAC)
printf(" --nofork Do not fork\n");
#else
printf(" --no-fork Do not fork\n");
@@ -1667,7 +1669,7 @@
cleanup_fds();
if (do_fork) {
-#ifdef Q_WS_MACX
+#if defined(Q_OS_DARWIN) || defined (Q_OS_MAC)
mac_fork_and_reexec_self();
#else
if (pipe(d.initpipe) != 0) {
diff -Nurd kdelibs-4.4.1/kinit/klauncher_main.cpp
kdelibs-4.4.1-new/kinit/klauncher_main.cpp
--- kdelibs-4.4.1/kinit/klauncher_main.cpp 2009-08-28 12:03:07.000000000
-0400
+++ kdelibs-4.4.1-new/kinit/klauncher_main.cpp 2010-03-06 12:39:26.000000000
-0500
@@ -48,6 +48,10 @@
}
#endif
+#if defined(Q_OS_DARWIN) || defined (Q_OS_MAC)
+#include <kkernel_mac.h>
+#endif
+
extern "C" KDE_EXPORT int kdemain( int argc, char**argv )
{
#ifndef Q_WS_WIN
@@ -61,6 +65,10 @@
}
#endif
+#if defined(Q_OS_DARWIN) || defined (Q_OS_MAC)
+ mac_initialize_dbus();
+#endif
+
KComponentData componentData("klauncher", "kdelibs4");
KGlobal::locale();
diff -Nurd kdelibs-4.4.1/kio/kfile/kfsprocess.cpp
kdelibs-4.4.1-new/kio/kfile/kfsprocess.cpp
--- kdelibs-4.4.1/kio/kfile/kfsprocess.cpp 2008-05-21 07:08:03.000000000
-0400
+++ kdelibs-4.4.1-new/kio/kfile/kfsprocess.cpp 2010-03-06 12:39:26.000000000
-0500
@@ -83,7 +83,7 @@
KfsProcessController::~KfsProcessController()
{
-#ifndef Q_OS_MAC
+#if (!defined (Q_OS_DARWIN) && !defined (Q_OS_MAC))
/* not sure why, but this is causing lockups */
close( m_fd[0] );
close( m_fd[1] );
diff -Nurd kdelibs-4.4.1/kio/kfile/kpropertiesdialog.cpp
kdelibs-4.4.1-new/kio/kfile/kpropertiesdialog.cpp
--- kdelibs-4.4.1/kio/kfile/kpropertiesdialog.cpp 2010-02-26
13:30:10.000000000 -0500
+++ kdelibs-4.4.1-new/kio/kfile/kpropertiesdialog.cpp 2010-03-06
12:39:26.000000000 -0500
@@ -1813,7 +1813,7 @@
#ifdef HAVE_GETGROUPLIST
// pick the groups to which the user belongs
int groupCount = 0;
-#ifdef Q_OS_MAC
+#if (defined(Q_OS_DARWIN) || defined(Q_OS_MAC))
QVarLengthArray<int> groups;
#else
QVarLengthArray<gid_t> groups;
diff -Nurd kdelibs-4.4.1/kpty/kptydevice.cpp
kdelibs-4.4.1-new/kpty/kptydevice.cpp
--- kdelibs-4.4.1/kpty/kptydevice.cpp 2009-03-27 10:47:33.000000000 -0400
+++ kdelibs-4.4.1-new/kpty/kptydevice.cpp 2010-03-06 12:39:26.000000000
-0500
@@ -42,7 +42,7 @@
# include <sys/time.h>
#endif
-#if defined(Q_OS_FREEBSD) || defined(Q_OS_MAC)
+#if defined(Q_OS_FREEBSD) || defined(Q_OS_DARWIN) || defined(Q_OS_MAC)
// "the other end's output queue size" - kinda braindead, huh?
# define PTY_BYTES_AVAILABLE TIOCOUTQ
#elif defined(TIOCINQ)
diff -Nurd kdelibs-4.4.1/kross/qts/CMakeLists.txt
kdelibs-4.4.1-new/kross/qts/CMakeLists.txt
--- kdelibs-4.4.1/kross/qts/CMakeLists.txt 2009-07-06 07:19:27.000000000
-0400
+++ kdelibs-4.4.1-new/kross/qts/CMakeLists.txt 2010-03-06 12:39:26.000000000
-0500
@@ -8,7 +8,7 @@
set_target_properties(krossqtsplugin PROPERTIES VERSION
${GENERIC_LIB_VERSION} SOVERSION ${GENERIC_LIB_SOVERSION})
endif (NOT CYGWIN)
-install(TARGETS krossqtsplugin DESTINATION
${PLUGIN_INSTALL_DIR}/plugins/script)
+install(TARGETS krossqtsplugin EXPORT kdelibsLibraryTargets
${INSTALL_TARGETS_DEFAULT_ARGS})
########### next target ###############
diff -Nurd kdelibs-4.4.1/kutils/kidletime/xscreensaverbasedpoller.cpp
kdelibs-4.4.1-new/kutils/kidletime/xscreensaverbasedpoller.cpp
--- kdelibs-4.4.1/kutils/kidletime/xscreensaverbasedpoller.cpp 2009-07-28
15:44:03.000000000 -0400
+++ kdelibs-4.4.1-new/kutils/kidletime/xscreensaverbasedpoller.cpp
2010-03-06 12:39:26.000000000 -0500
@@ -22,6 +22,7 @@
#include <QX11Info>
+#include <X11/Xlib.h>
#include <X11/extensions/scrnsaver.h>
#ifdef HAVE_XTEST
diff -Nurd kdelibs-4.4.1/solid/solid/managerbase.cpp
kdelibs-4.4.1-new/solid/solid/managerbase.cpp
--- kdelibs-4.4.1/solid/solid/managerbase.cpp 2009-03-10 08:26:04.000000000
-0400
+++ kdelibs-4.4.1-new/solid/solid/managerbase.cpp 2010-03-06
12:39:26.000000000 -0500
@@ -23,7 +23,8 @@
#include "backends/fakehw/fakemanager.h"
-#if defined (Q_OS_MAC)
+#if (defined (Q_OS_MAC) || defined(Q_OS_DARWIN))
+#include "backends/hal/halmanager.h"
#include "backends/iokit/iokitmanager.h"
#elif defined (Q_OS_UNIX)
#include "backends/hal/halmanager.h"
@@ -48,7 +49,7 @@
if (!solidFakeXml.isEmpty()) {
m_backend = new Solid::Backends::Fake::FakeManager(0, solidFakeXml);
} else {
-# if defined (Q_OS_MAC)
+# if (defined (Q_OS_MAC) || defined(Q_OS_DARWIN))
m_backend = new Solid::Backends::IOKit::IOKitManager(0);
# elif defined (Q_OS_UNIX)
m_backend = new Solid::Backends::Hal::HalManager(0);
------------------------------------------------------------------------------
All of the data generated in your IT infrastructure is seriously valuable.
Why? It contains a definitive record of application performance, security
threats, fraudulent activity, and more. Splunk takes this data and makes
sense of it. IT sense. And common sense.
http://p.sf.net/sfu/splunk-d2d-c2
_______________________________________________
Fink-users mailing list
[email protected]
List archive:
http://news.gmane.org/gmane.os.macosx.fink.user
Subscription management:
https://lists.sourceforge.net/lists/listinfo/fink-users
