the Fink project is an effort to port
popular Unix programs to Mac OS X
Info3: <<
Package: kdelibs3-unified
Version: 3.5.9
Revision: 3
Distribution: 10.4, 10.5
Architecture: i386, powerpc
Description: KDE - essential libraries
License: GPL/LGPL
Maintainer: Benjamin Reed
Depends: <<
%N-shlibs (>= %v-%r),
aspell,
default-icon-theme (>= 0.5-2),
libart2-shlibs (>= 2.3.19-1),
libjpeg-shlibs,
libpng3-shlibs (>= 1.2.8-1),
pcre-shlibs,
qt3-shlibs (>= 3.3.8-1021)
<<
BuildDepends: <<
arts-dev (>= 1.5.9-1),
aspell-dev,
audiofile (>= 0.2.6-11),
autoconf (>= 2.60-1),
bzip2-dev,
cctools-single-module,
cups-dev,
dbus-dev (>= 1.0-1),
dbus-qt3-dev,
esound,
expat1,
fink (>= 0.28),
flex-devel,
# fontconfig2-dev (>= 2.4.1-1),
freetype219 (>= 2.2.1-5),
libgettext3-dev,
gettext-tools,
glib2-dev (>= 2.12.0-1),
libart2 (>= 2.3.19-1),
libdatrie,
libiconv-dev,
libidn (>= 0.5.1-1),
libjpeg,
libogg,
libpng3 (>= 1.2.8-1),
libthai-dev,
libtiff,
libvorbis0,
libxml2,
libxslt,
libmad,
openexr-dev,
openslp-ssl-dev | openslp-dev,
pcre,
pcre-bin,
pkgconfig (>= 0.21-1),
qt3 (>= 3.3.8-1021),
qt3-doc,
unsermake (>= 0.4-0.20060316.1),
xdg-base,
x11-dev,
xmkmf
<<
Replaces: <<
conectiva-crystal,
kbabel (<< 3.1.90-1),
kdeartwork3,
kdebase3,
kdebase3-ssl,
kdebase3-unified (<< 3.5.0-1),
kdelibs3,
kdelibs3-ssl,
kdelibs3-dev,
kdelibs3-ssl-dev,
kdelibs3-unified-dev,
kdepim3 (<< %v-1),
kdepim3-common (<< %v-1),
kdevelop (<< 3.3.0-1),
kde-extra-themes (<< 3.4.0-1),
kde-icons-crystal,
keramik,
koffice-common,
korganizer (<< 3.2.91-1),
ktts (<< 3.5.0-1)
<<
Recommends: mplayer
GCC: 4.0
CustomMirror: <<
Primary: http://ranger.users.finkproject.org/distfiles
eur-NL: http://ranger.users.finkproject.org/distfiles
nam-US: http://ranger.befunk.com/fink
nam-US: http://astrange.ithinksw.net/~astrange/ranger-fink
nam-CA: http://www.southofheaven.net/befunk
<<
Source: mirror:kde:stable/%v/src/kdelibs-%v.tar.bz2
Source-MD5: 55e5f00874933d1a7ba7c95e369a205e
Source2: mirror:custom:kde-admindir/kde-admindir-1182.tar.bz2
Source2-MD5: b37c9ce91682d7972da7770d6bc085fb
Source2ExtractDir: kdelibs-%v
SourceDirectory: kdelibs-%v
PatchFile: %n.patch
PatchFile-MD5: c52b8015137e596dd6830d404b203c34
PatchScript: <<
sed -e 's,@FINKPREFIX@,%p,g' %{PatchFile} | patch -p1
perl -pi -e 's,-O2,-Os,g; s,doc/HTML,doc/kde,g; s,/usr/share/doc/packages/qt3/html,%p/share/doc/qt3/html,g;' admin/*
# fix x11 detection: make sure to use darwin's shared-lib extension!
perl -pi -e 's/in a so sl/in a so sl dylib/' admin/acinclude.m4.in
<<
NoSetCPPFLAGS: true
NoSetLDFLAGS: true
ConfigureParams: --without-lua --enable-cups --with-ldap=framework --with-gssapi=framework --with-distribution='Fink/Mac OS X'
CompileScript: <<
#!/bin/sh -ev
export PREFIX="%p" USE_UNSERMAKE=1
. ./environment-helper.sh
case $SW_VERSION in
6*|7*)
export CPPFLAGS="$CPPFLAGS -DHAVE_SYS_EXEC_H=1"
;;
esac
export CPPFLAGS="-I/usr/include/gssapi $CPPFLAGS"
./build-helper.sh cvs %N %v %r make -f admin/Makefile.common cvs
./build-helper.sh configure %N %v %r ./configure %c $CONFIGURE_PARAMS
perl -pi -e 's/-Xlinker -framework -Xlinker /-Wl,-framework,/g' Makefile
perl -pi -e 's/-framework /-Wl,-framework,/g' Makefile
perl -pi -e 's/-weak_framework /-Wl,-weak_framework,/g' Makefile
./build-helper.sh make %N %v %r unsermake $UNSERMAKEFLAGS
<<
InstallScript: <<
#!/bin/sh -ev
export PREFIX="%p" USE_UNSERMAKE=1
. ./environment-helper.sh
./build-helper.sh install %N %v %r unsermake -p -j1 install DESTDIR=%d
cat <
#!/bin/sh
if [ \`id -un\` != 'root' ]; then
echo "you must run this script as root!"
echo ""
exit 1
fi
ENV="env KDEDIR= KDEDIRS= HOME=/tmp XDG_CACHE_HOME=/tmp/kb/cache XDG_CONFIG_HOME=/tmp/kb/config XDG_DATA_HOME=/tmp/kb/share HISTFILE=/tmp/kb/.bash_history USER=root LOGNAME=root"
\$ENV %p/bin/update-mime-database %p/share/mime
\$ENV %p/bin/kbuildsycoca --global --noincremental --nosignal
END
chmod 755 %i/bin/kde-update-caches.sh
rm -rf %i/share/icons/hicolor/index.theme
install -c -m 644 darwin/* %i/share/config
mkdir -p %i/share/doc/installed-packages
touch %i/share/doc/installed-packages/%N
touch %i/share/doc/installed-packages/kdelibs3
touch %i/share/doc/installed-packages/kdelibs3-shlibs
touch %i/share/doc/installed-packages/kdelibs3-dev
touch %i/share/doc/installed-packages/kdelibs3-ssl
touch %i/share/doc/installed-packages/kdelibs3-ssl-shlibs
touch %i/share/doc/installed-packages/kdelibs3-ssl-dev
<<
Shlibs: <<
!%p/lib/libkdeinit_cupsdconf.dylib
!%p/lib/libkdeinit_dcopserver.dylib
!%p/lib/libkdeinit_kaddprinterwizard.dylib
!%p/lib/libkdeinit_kbuildsycoca.dylib
!%p/lib/libkdeinit_kcmshell.dylib
!%p/lib/libkdeinit_kconf_update.dylib
!%p/lib/libkdeinit_kcookiejar.dylib
!%p/lib/libkdeinit_kded.dylib
!%p/lib/libkdeinit_kio_http_cache_cleaner.dylib
!%p/lib/libkdeinit_kio_uiserver.dylib
!%p/lib/libkdeinit_klauncher.dylib
<<
DocFiles: COPYING COPYING.LIB INSTALL
RuntimeVars: KDEDIR: %p
SplitOff: <<
Package: %N-shlibs
Description: KDE - essential shared libraries
Depends: <<
arts-shlibs (>= 1.5.9-1),
aspell-shlibs,
audiofile-shlibs (>= 0.2.6-11),
bzip2-shlibs,
dbus-shlibs (>= 1.0-1),
dbus-qt3-shlibs,
esound-shlibs,
expat1-shlibs,
freetype219-shlibs (>= 2.2.1-5),
glib2-shlibs (>= 2.12.0-1),
libart2-shlibs (>= 2.3.19-1),
libgettext3-shlibs,
libiconv,
libidn-shlibs (>= 0.5.1-1),
libjpeg-shlibs,
libmad-shlibs,
libogg-shlibs,
libpng3-shlibs (>= 1.2.8-1),
libthai-shlibs,
libtiff-shlibs,
libvorbis0-shlibs,
libxml2-shlibs (>= 2.6.27-1),
libxslt-shlibs (>= 1.0.27-1),
macosx (>= 10.4.3-1),
openslp-ssl-shlibs | openslp-shlibs,
pcre-shlibs,
qt3-shlibs (>= 3.3.8-1021),
xdg-base,
x11-shlibs
<<
Replaces: <<
kdelibs3-dev,
kdelibs3-ssl-dev,
kdelibs3,
kdelibs3-ssl,
kdelibs3-shlibs,
kdelibs3-ssl-shlibs,
kdepim3-common (<< 3.3.1-1),
kde-extra-themes (<< 3.4.0-1),
%N (<< %v-%r)
<<
Recommends: %N (>= %v-%r)
Files: <<
lib/kde3/kabc*.so
lib/kde3/kbzip2filter.so
lib/kde3/kcm_*.so
lib/kde3/kded_*.so
lib/kde3/kdeprint*.so
lib/kde3/kfile*.so
lib/kde3/kgzipfilter.so
lib/kde3/khtml*part.so
lib/kde3/kimg*.so
lib/kde3/kio_file.so
lib/kde3/kio_ftp.so
lib/kde3/kio_*help.so
lib/kde3/kio_http.so
lib/kde3/kio_meta*.so
lib/kde3/kjava*.so
lib/kde3/knotify*.so
lib/kde3/kspell*.so
lib/kde3/kstyle*.so
lib/kde3/ktexteditor*.so
lib/kde3/libkdeprint*.so
lib/kde3/lib*part.so
lib/kde3/plugins/designer/*.so
lib/kde3/plugins/styles/*.so
lib/kde3/*shellscript*.so
lib/libDCOP.*.dylib
lib/libartskde.*.dylib
lib/libkabc.*.dylib
lib/libkabc_dir.*.dylib
lib/libkabc_file.*.dylib
lib/libkabc_ldapkio.*.dylib
lib/libkatepartinterfaces.*.dylib
lib/libkdecore.*.dylib
lib/libkdefakes.*.dylib
lib/libkdefx.*.dylib
lib/libkdeprint.*.dylib
lib/libkdeprint_management.*.dylib
lib/libkdesasl.*.dylib
lib/libkdesu.*.dylib
lib/libkdeui.*.dylib
lib/libkdnssd.*.dylib
lib/libkhtml.*.dylib
lib/libkimproxy.*.dylib
lib/libkio.*.dylib
lib/libkjava.*.dylib
lib/libkjs.*.dylib
lib/libkmdi.*.dylib
lib/libkmdi2.*.dylib
lib/libkmediaplayer.*.dylib
lib/libkmid.*.dylib
lib/libknewstuff.*.dylib
lib/libkntlm.*.dylib
lib/libkparts.*.dylib
lib/libkresources.*.dylib
lib/libkscreensaver.*.dylib
lib/libkscript.*.dylib
lib/libkspell.*.dylib
lib/libkspell2.*.dylib
lib/libktexteditor.*.dylib
lib/libkunittest.*.dylib
lib/libkutils.*.dylib
lib/libkwalletbackend.*.dylib
lib/libkwalletclient.*.dylib
lib/libvcard.*.dylib
<<
Shlibs: <<
%p/lib/libDCOP.4.dylib 7.0.0 %N-shlibs (>= 3.4.0-1)
%p/lib/libartskde.1.dylib 4.0.0 %N-shlibs (>= 3.4.0-1)
%p/lib/libkabc.1.dylib 4.0.0 %N-shlibs (>= 3.4.0-1)
%p/lib/libkabc_dir.1.dylib 2.0.0 %N-shlibs (>= 3.4.0-1)
%p/lib/libkabc_file.1.dylib 2.0.0 %N-shlibs (>= 3.4.0-1)
%p/lib/libkabc_ldapkio.1.dylib 2.0.0 %N-shlibs (>= 3.4.0-1)
%p/lib/libkatepartinterfaces.0.dylib 1.0.0 %N-shlibs (>= 3.4.0-1)
%p/lib/libkdecore.4.dylib 7.0.0 %N-shlibs (>= 3.4.0-1)
%p/lib/libkdefakes.4.dylib 7.0.0 %N-shlibs (>= 3.4.0-1)
%p/lib/libkdefx.4.dylib 7.0.0 %N-shlibs (>= 3.4.0-1)
%p/lib/libkdeprint.4.dylib 7.0.0 %N-shlibs (>= 3.4.0-1)
%p/lib/libkdeprint_management.4.dylib 7.0.0 %N-shlibs (>= 3.4.0-1)
%p/lib/libkdesasl.1.dylib 4.0.0 %N-shlibs (>= 3.4.0-1)
%p/lib/libkdesu.4.dylib 7.0.0 %N-shlibs (>= 3.4.0-1)
%p/lib/libkdeui.4.dylib 7.0.0 %N-shlibs (>= 3.4.0-1)
%p/lib/libkdnssd.1.dylib 2.0.0 %N-shlibs (>= 3.4.0-1)
%p/lib/libkhtml.4.dylib 7.0.0 %N-shlibs (>= 3.4.0-1)
%p/lib/libkimproxy.0.dylib 1.0.0 %N-shlibs (>= 3.4.0-1)
%p/lib/libkio.4.dylib 7.0.0 %N-shlibs (>= 3.4.0-1)
%p/lib/libkjava.1.dylib 2.0.0 %N-shlibs (>= 3.4.0-1)
%p/lib/libkjs.1.dylib 4.0.0 %N-shlibs (>= 3.4.0-1)
%p/lib/libkmdi.1.dylib 2.0.0 %N-shlibs (>= 3.4.0-1)
%p/lib/libkmdi2.1.dylib 2.0.0 %N-shlibs (>= 3.4.0-1)
%p/lib/libkmediaplayer.0.dylib 1.0.0 %N-shlibs (>= 3.4.0-1)
%p/lib/libkmid.0.dylib 1.0.0 %N-shlibs (>= 3.4.0-1)
%p/lib/libknewstuff.1.dylib 2.0.0 %N-shlibs (>= 3.4.0-1)
%p/lib/libkntlm.0.dylib 1.0.0 %N-shlibs (>= 3.4.0-1)
%p/lib/libkparts.2.dylib 4.0.0 %N-shlibs (>= 3.4.0-1)
%p/lib/libkresources.1.dylib 4.0.0 %N-shlibs (>= 3.4.0-1)
%p/lib/libkscreensaver.4.dylib 7.0.0 %N-shlibs (>= 3.4.0-1)
%p/lib/libkscript.0.dylib 1.0.0 %N-shlibs (>= 3.4.0-1)
%p/lib/libkspell.4.dylib 7.0.0 %N-shlibs (>= 3.4.0-1)
%p/lib/libkspell2.1.dylib 2.0.0 %N-shlibs (>= 3.4.0-1)
%p/lib/libktexteditor.0.dylib 1.0.0 %N-shlibs (>= 3.4.0-1)
%p/lib/libkutils.1.dylib 4.0.0 %N-shlibs (>= 3.4.0-1)
%p/lib/libkunittest.1.dylib 2.0.0 %N-shlibs (>= 3.5.0-1)
%p/lib/libkwalletbackend.1.dylib 2.0.0 %N-shlibs (>= 3.4.0-1)
%p/lib/libkwalletclient.1.dylib 2.0.0 %N-shlibs (>= 3.4.0-1)
%p/lib/libvcard.0.dylib 1.0.0 %N-shlibs (>= 3.4.0-1)
<<
DescUsage: <<
---[ Installation ]---------------------------------------------------
To install all of the official KDE packages, install "bundle-kde" or
"bundle-kde-ssl" (depending on whether crypotgraphic laws permit
downloading strong cryptography). Unless you have a specific reason
not to, "bundle-kde-ssl" is suggested.
---[ Configuration ]--------------------------------------------------
To use KDE as your windowing system in XDarwin, create a file called
".xinitrc" in your home directory, containing the following line:
/sw/bin/startkde >/tmp/kde.log 2>&1
See http://fink.sourceforge.net/doc/x11/run-xfree86.php#xinitrc
for more information on the xinitrc files and how they work.
If you want to use Apple's X11 instead of the KDE window manager,
put the following line before the startkde line in .xinitrc:
export KDEWM=quartz-wm
If you want to disable quartz-wm even for clipboard synchronization
(proxying), put the following line before the startkde line in
.xinitrc:
export DISABLE_PROXY=1
---[ Startup ]--------------------------------------------------------
Once you have created an ~/.xinitrc file, you should be able to start
KDE by clicking on the "XDarwin" icon in your Applications folder.
NOTE: By default, X11 on Mac OS X runs in "rootless" mode, generally.
If you run KDE in rootless mode, it will take over your desktop with
a window that covers everything up. You can remove this by disabling
desktop icons in the KDE control center. Open the control center
(either from the "K" menu bar, or by typing "kcontrol" in an xterm)
then expand the "Desktop" list, click "Behavior", and uncheck the
"Show icons on desktop" checkbox.
---[ Removal ]--------------------------------------------------------
To remove all of the official KDE packages, you can remove the KDE
libraries and anything that depends on them by running, in a terminal:
sudo apt-get remove kdelibs3-universal-shlibs
To remove an individual KDE package collection (like kdenetwork3 or
kdesdk3) you can generally remove [package]-base. For example, to
remove all of the kdenetwork3 packages, run:
sudo apt-get remove kdenetwork3-base
<<
<<
SplitOff2: <<
Package: %N-dev
Description: KDE - essential development libraries and headers
Depends: <<
%N-shlibs (>= %v-%r),
%N (>= %v-%r)
<<
Replaces: <<
kdelibs3-ssl,
kdelibs3-ssl-dev,
kdelibs3,
kdelibs3-dev,
kde-icons-crystal,
keramik,
kdeartwork3 (<< %v-1),
kdebase3-dev,
kdebase3-ssl-dev,
kdepim3-dev (<< 3.4.0-1),
kdepim3-common (<< 3.4.0-1),
%N (<< %v-%r)
<<
Recommends: <<
arts-dev (>= 1.5.8-1021),
audiofile,
cups-dev,
doxygen,
esound,
fink (>= 0.26.0-1),
flex-devel,
libart2,
libjpeg,
libogg,
libpng3 (>= 1.2.8-1),
libtiff,
libvorbis0,
libxml2,
libxslt,
libmad,
openslp-ssl-dev | openslp-dev,
pcre,
pcre-bin,
qt3 (>= 3.3.8-1021),
qt3-doc
<<
BuildDependsOnly: true
Files: <<
bin/dcopidl*
bin/meinproc
include
lib/*.la
lib/*.a
lib/libDCOP.dylib
lib/libartskde.dylib
lib/libkabc*.dylib
lib/libkate*.dylib
lib/libkdecore.dylib
lib/libkdefakes.dylib
lib/libkdefx.dylib
lib/libkdeprint.dylib
lib/libkdeprint_management.dylib
lib/libkdesasl.dylib
lib/libkdesu.dylib
lib/libkdeui.dylib
lib/libkdnssd.dylib
lib/libkhtml.dylib
lib/libkimproxy.dylib
lib/libkio.dylib
lib/libkjava.dylib
lib/libkjs.dylib
lib/libkmdi.dylib
lib/libkmdi2.dylib
lib/libkmediaplayer.dylib
lib/libkmid.dylib
lib/libknewstuff.dylib
lib/libkntlm.dylib
lib/libkparts.dylib
lib/libkresources.dylib
lib/libkscreensaver.dylib
lib/libkscript.dylib
lib/libkspell.dylib
lib/libkspell2.dylib
lib/libktexteditor.dylib
lib/libkutils.dylib
lib/libkunittest.dylib
lib/libvcard.dylib
lib/libkwallet*.dylib
share/apps/dcopidlng
<<
DescUsage: <<
---[ Installation ]---------------------------------------------------
To install all of the official KDE packages, install "bundle-kde" or
"bundle-kde-ssl" (depending on whether crypotgraphic laws permit
downloading strong cryptography). Unless you have a specific reason
not to, "bundle-kde-ssl" is suggested.
---[ Configuration ]--------------------------------------------------
To use KDE as your windowing system in XDarwin, create a file called
".xinitrc" in your home directory, containing the following line:
/sw/bin/startkde >/tmp/kde.log 2>&1
See http://fink.sourceforge.net/doc/x11/run-xfree86.php#xinitrc
for more information on the xinitrc files and how they work.
If you want to use Apple's X11 instead of the KDE window manager,
put the following line before the startkde line in .xinitrc:
export KDEWM=quartz-wm
If you want to disable quartz-wm even for clipboard synchronization
(proxying), put the following line before the startkde line in
.xinitrc:
export DISABLE_PROXY=1
---[ Startup ]--------------------------------------------------------
Once you have created an ~/.xinitrc file, you should be able to start
KDE by clicking on the "XDarwin" icon in your Applications folder.
NOTE: By default, X11 on Mac OS X runs in "rootless" mode, generally.
If you run KDE in rootless mode, it will take over your desktop with
a window that covers everything up. You can remove this by disabling
desktop icons in the KDE control center. Open the control center
(either from the "K" menu bar, or by typing "kcontrol" in an xterm)
then expand the "Desktop" list, click "Behavior", and uncheck the
"Show icons on desktop" checkbox.
---[ Removal ]--------------------------------------------------------
To remove all of the official KDE packages, you can remove the KDE
libraries and anything that depends on them by running, in a terminal:
sudo apt-get remove kdelibs3-universal-shlibs
To remove an individual KDE package collection (like kdenetwork3 or
kdesdk3) you can generally remove [package]-base. For example, to
remove all of the kdenetwork3 packages, run:
sudo apt-get remove kdenetwork3-base
<<
<<
SplitOff3: <<
Package: kdelibs3
Depends: <<
%N (= %v-%r),
fink (>= 0.26.0-1),
fink-obsolete-packages
<<
Files: share/doc/installed-packages/%n
DescUsage: <<
---[ Installation ]---------------------------------------------------
To install all of the official KDE packages, install "bundle-kde" or
"bundle-kde-ssl" (depending on whether crypotgraphic laws permit
downloading strong cryptography). Unless you have a specific reason
not to, "bundle-kde-ssl" is suggested.
---[ Configuration ]--------------------------------------------------
To use KDE as your windowing system in XDarwin, create a file called
".xinitrc" in your home directory, containing the following line:
/sw/bin/startkde >/tmp/kde.log 2>&1
See http://fink.sourceforge.net/doc/x11/run-xfree86.php#xinitrc
for more information on the xinitrc files and how they work.
If you want to use Apple's X11 instead of the KDE window manager,
put the following line before the startkde line in .xinitrc:
export KDEWM=quartz-wm
If you want to disable quartz-wm even for clipboard synchronization
(proxying), put the following line before the startkde line in
.xinitrc:
export DISABLE_PROXY=1
---[ Startup ]--------------------------------------------------------
Once you have created an ~/.xinitrc file, you should be able to start
KDE by clicking on the "XDarwin" icon in your Applications folder.
NOTE: By default, X11 on Mac OS X runs in "rootless" mode, generally.
If you run KDE in rootless mode, it will take over your desktop with
a window that covers everything up. You can remove this by disabling
desktop icons in the KDE control center. Open the control center
(either from the "K" menu bar, or by typing "kcontrol" in an xterm)
then expand the "Desktop" list, click "Behavior", and uncheck the
"Show icons on desktop" checkbox.
---[ Removal ]--------------------------------------------------------
To remove all of the official KDE packages, you can remove the KDE
libraries and anything that depends on them by running, in a terminal:
sudo apt-get remove kdelibs3-universal-shlibs
To remove an individual KDE package collection (like kdenetwork3 or
kdesdk3) you can generally remove [package]-base. For example, to
remove all of the kdenetwork3 packages, run:
sudo apt-get remove kdenetwork3-base
<<
<<
SplitOff4: <<
Package: kdelibs3-dev
Depends: <<
%N-dev (= %v-%r),
fink (>= 0.26.0-1),
fink-obsolete-packages
<<
BuildDependsOnly: true
Files: share/doc/installed-packages/%n
DescUsage: <<
---[ Installation ]---------------------------------------------------
To install all of the official KDE packages, install "bundle-kde" or
"bundle-kde-ssl" (depending on whether crypotgraphic laws permit
downloading strong cryptography). Unless you have a specific reason
not to, "bundle-kde-ssl" is suggested.
---[ Configuration ]--------------------------------------------------
To use KDE as your windowing system in XDarwin, create a file called
".xinitrc" in your home directory, containing the following line:
/sw/bin/startkde >/tmp/kde.log 2>&1
See http://fink.sourceforge.net/doc/x11/run-xfree86.php#xinitrc
for more information on the xinitrc files and how they work.
If you want to use Apple's X11 instead of the KDE window manager,
put the following line before the startkde line in .xinitrc:
export KDEWM=quartz-wm
If you want to disable quartz-wm even for clipboard synchronization
(proxying), put the following line before the startkde line in
.xinitrc:
export DISABLE_PROXY=1
---[ Startup ]--------------------------------------------------------
Once you have created an ~/.xinitrc file, you should be able to start
KDE by clicking on the "XDarwin" icon in your Applications folder.
NOTE: By default, X11 on Mac OS X runs in "rootless" mode, generally.
If you run KDE in rootless mode, it will take over your desktop with
a window that covers everything up. You can remove this by disabling
desktop icons in the KDE control center. Open the control center
(either from the "K" menu bar, or by typing "kcontrol" in an xterm)
then expand the "Desktop" list, click "Behavior", and uncheck the
"Show icons on desktop" checkbox.
---[ Removal ]--------------------------------------------------------
To remove all of the official KDE packages, you can remove the KDE
libraries and anything that depends on them by running, in a terminal:
sudo apt-get remove kdelibs3-universal-shlibs
To remove an individual KDE package collection (like kdenetwork3 or
kdesdk3) you can generally remove [package]-base. For example, to
remove all of the kdenetwork3 packages, run:
sudo apt-get remove kdenetwork3-base
<<
<<
SplitOff5: <<
Package: kdelibs3-shlibs
Depends: <<
%N-shlibs (= %v-%r),
fink (>= 0.26.0-1),
fink-obsolete-packages
<<
Files: share/doc/installed-packages/%n
DescUsage: <<
---[ Installation ]---------------------------------------------------
To install all of the official KDE packages, install "bundle-kde" or
"bundle-kde-ssl" (depending on whether crypotgraphic laws permit
downloading strong cryptography). Unless you have a specific reason
not to, "bundle-kde-ssl" is suggested.
---[ Configuration ]--------------------------------------------------
To use KDE as your windowing system in XDarwin, create a file called
".xinitrc" in your home directory, containing the following line:
/sw/bin/startkde >/tmp/kde.log 2>&1
See http://fink.sourceforge.net/doc/x11/run-xfree86.php#xinitrc
for more information on the xinitrc files and how they work.
If you want to use Apple's X11 instead of the KDE window manager,
put the following line before the startkde line in .xinitrc:
export KDEWM=quartz-wm
If you want to disable quartz-wm even for clipboard synchronization
(proxying), put the following line before the startkde line in
.xinitrc:
export DISABLE_PROXY=1
---[ Startup ]--------------------------------------------------------
Once you have created an ~/.xinitrc file, you should be able to start
KDE by clicking on the "XDarwin" icon in your Applications folder.
NOTE: By default, X11 on Mac OS X runs in "rootless" mode, generally.
If you run KDE in rootless mode, it will take over your desktop with
a window that covers everything up. You can remove this by disabling
desktop icons in the KDE control center. Open the control center
(either from the "K" menu bar, or by typing "kcontrol" in an xterm)
then expand the "Desktop" list, click "Behavior", and uncheck the
"Show icons on desktop" checkbox.
---[ Removal ]--------------------------------------------------------
To remove all of the official KDE packages, you can remove the KDE
libraries and anything that depends on them by running, in a terminal:
sudo apt-get remove kdelibs3-universal-shlibs
To remove an individual KDE package collection (like kdenetwork3 or
kdesdk3) you can generally remove [package]-base. For example, to
remove all of the kdenetwork3 packages, run:
sudo apt-get remove kdenetwork3-base
<<
<<
SplitOff6: <<
Package: kdelibs3-ssl
Depends: <<
%N (= %v-%r),
fink (>= 0.26.0-1),
fink-obsolete-packages
<<
Files: share/doc/installed-packages/%n
DescUsage: <<
---[ Installation ]---------------------------------------------------
To install all of the official KDE packages, install "bundle-kde" or
"bundle-kde-ssl" (depending on whether crypotgraphic laws permit
downloading strong cryptography). Unless you have a specific reason
not to, "bundle-kde-ssl" is suggested.
---[ Configuration ]--------------------------------------------------
To use KDE as your windowing system in XDarwin, create a file called
".xinitrc" in your home directory, containing the following line:
/sw/bin/startkde >/tmp/kde.log 2>&1
See http://fink.sourceforge.net/doc/x11/run-xfree86.php#xinitrc
for more information on the xinitrc files and how they work.
If you want to use Apple's X11 instead of the KDE window manager,
put the following line before the startkde line in .xinitrc:
export KDEWM=quartz-wm
If you want to disable quartz-wm even for clipboard synchronization
(proxying), put the following line before the startkde line in
.xinitrc:
export DISABLE_PROXY=1
---[ Startup ]--------------------------------------------------------
Once you have created an ~/.xinitrc file, you should be able to start
KDE by clicking on the "XDarwin" icon in your Applications folder.
NOTE: By default, X11 on Mac OS X runs in "rootless" mode, generally.
If you run KDE in rootless mode, it will take over your desktop with
a window that covers everything up. You can remove this by disabling
desktop icons in the KDE control center. Open the control center
(either from the "K" menu bar, or by typing "kcontrol" in an xterm)
then expand the "Desktop" list, click "Behavior", and uncheck the
"Show icons on desktop" checkbox.
---[ Removal ]--------------------------------------------------------
To remove all of the official KDE packages, you can remove the KDE
libraries and anything that depends on them by running, in a terminal:
sudo apt-get remove kdelibs3-universal-shlibs
To remove an individual KDE package collection (like kdenetwork3 or
kdesdk3) you can generally remove [package]-base. For example, to
remove all of the kdenetwork3 packages, run:
sudo apt-get remove kdenetwork3-base
<<
<<
SplitOff7: <<
Package: kdelibs3-ssl-dev
Depends: <<
%N-dev (= %v-%r),
fink (>= 0.26.0-1),
fink-obsolete-packages
<<
BuildDependsOnly: true
Files: share/doc/installed-packages/%n
DescUsage: <<
---[ Installation ]---------------------------------------------------
To install all of the official KDE packages, install "bundle-kde" or
"bundle-kde-ssl" (depending on whether crypotgraphic laws permit
downloading strong cryptography). Unless you have a specific reason
not to, "bundle-kde-ssl" is suggested.
---[ Configuration ]--------------------------------------------------
To use KDE as your windowing system in XDarwin, create a file called
".xinitrc" in your home directory, containing the following line:
/sw/bin/startkde >/tmp/kde.log 2>&1
See http://fink.sourceforge.net/doc/x11/run-xfree86.php#xinitrc
for more information on the xinitrc files and how they work.
If you want to use Apple's X11 instead of the KDE window manager,
put the following line before the startkde line in .xinitrc:
export KDEWM=quartz-wm
If you want to disable quartz-wm even for clipboard synchronization
(proxying), put the following line before the startkde line in
.xinitrc:
export DISABLE_PROXY=1
---[ Startup ]--------------------------------------------------------
Once you have created an ~/.xinitrc file, you should be able to start
KDE by clicking on the "XDarwin" icon in your Applications folder.
NOTE: By default, X11 on Mac OS X runs in "rootless" mode, generally.
If you run KDE in rootless mode, it will take over your desktop with
a window that covers everything up. You can remove this by disabling
desktop icons in the KDE control center. Open the control center
(either from the "K" menu bar, or by typing "kcontrol" in an xterm)
then expand the "Desktop" list, click "Behavior", and uncheck the
"Show icons on desktop" checkbox.
---[ Removal ]--------------------------------------------------------
To remove all of the official KDE packages, you can remove the KDE
libraries and anything that depends on them by running, in a terminal:
sudo apt-get remove kdelibs3-universal-shlibs
To remove an individual KDE package collection (like kdenetwork3 or
kdesdk3) you can generally remove [package]-base. For example, to
remove all of the kdenetwork3 packages, run:
sudo apt-get remove kdenetwork3-base
<<
<<
SplitOff8: <<
Package: kdelibs3-ssl-shlibs
Depends: <<
%N-shlibs (= %v-%r),
fink (>= 0.26.0-1),
fink-obsolete-packages
<<
Files: share/doc/installed-packages/%n
DescUsage: <<
---[ Installation ]---------------------------------------------------
To install all of the official KDE packages, install "bundle-kde" or
"bundle-kde-ssl" (depending on whether crypotgraphic laws permit
downloading strong cryptography). Unless you have a specific reason
not to, "bundle-kde-ssl" is suggested.
---[ Configuration ]--------------------------------------------------
To use KDE as your windowing system in XDarwin, create a file called
".xinitrc" in your home directory, containing the following line:
/sw/bin/startkde >/tmp/kde.log 2>&1
See http://fink.sourceforge.net/doc/x11/run-xfree86.php#xinitrc
for more information on the xinitrc files and how they work.
If you want to use Apple's X11 instead of the KDE window manager,
put the following line before the startkde line in .xinitrc:
export KDEWM=quartz-wm
If you want to disable quartz-wm even for clipboard synchronization
(proxying), put the following line before the startkde line in
.xinitrc:
export DISABLE_PROXY=1
---[ Startup ]--------------------------------------------------------
Once you have created an ~/.xinitrc file, you should be able to start
KDE by clicking on the "XDarwin" icon in your Applications folder.
NOTE: By default, X11 on Mac OS X runs in "rootless" mode, generally.
If you run KDE in rootless mode, it will take over your desktop with
a window that covers everything up. You can remove this by disabling
desktop icons in the KDE control center. Open the control center
(either from the "K" menu bar, or by typing "kcontrol" in an xterm)
then expand the "Desktop" list, click "Behavior", and uncheck the
"Show icons on desktop" checkbox.
---[ Removal ]--------------------------------------------------------
To remove all of the official KDE packages, you can remove the KDE
libraries and anything that depends on them by running, in a terminal:
sudo apt-get remove kdelibs3-universal-shlibs
To remove an individual KDE package collection (like kdenetwork3 or
kdesdk3) you can generally remove [package]-base. For example, to
remove all of the kdenetwork3 packages, run:
sudo apt-get remove kdenetwork3-base
<<
<<
PostInstScript: <<
chmod u+s %p/bin/kgrantpty %p/bin/kpac_dhcp_helper %p/bin/fileshareset
if [ -e "%p/etc/xdg/menus/applications.menu" ] && [ ! -L "%p/etc/xdg/menus/applications.menu" ]; then
mv "%p/etc/xdg/menus/applications.menu" "%p/etc/xdg/menus/applications.menu.bak"
fi
update-alternatives --install "%p/etc/xdg/menus/applications.menu" "applications.menu" "%p/etc/xdg/menus/kde-applications.menu" 10
%p/bin/kde-update-caches.sh >/dev/null 2>&1 || :
<<
PostRmScript: <<
if [ -e "%p/etc/xdg/menus/applications.menu" ] && [ ! -L "%p/etc/xdg/menus/applications.menu" ]; then
mv "%p/etc/xdg/menus/applications.menu" "%p/etc/xdg/menus/applications.menu.bak"
fi
update-alternatives --remove "applications.menu" "%p/etc/xdg/menus/kde-applications.menu"
<<
DescDetail: <<
Libraries for the K Desktop Environment.
KDE Libraries included: kdecore (KDE core library), kdeui (user interface),
kfm (file manager), khtmlw (HTML widget), kio (Input/Output, networking),
kspell (spelling checker), jscript (javascript), kab (addressbook), and
kimgio (image manipulation).
<<
DescUsage: <<
---[ Installation ]---------------------------------------------------
To install all of the official KDE packages, install "bundle-kde" or
"bundle-kde-ssl" (depending on whether crypotgraphic laws permit
downloading strong cryptography). Unless you have a specific reason
not to, "bundle-kde-ssl" is suggested.
---[ Configuration ]--------------------------------------------------
To use KDE as your windowing system in XDarwin, create a file called
".xinitrc" in your home directory, containing the following line:
/sw/bin/startkde >/tmp/kde.log 2>&1
See http://fink.sourceforge.net/doc/x11/run-xfree86.php#xinitrc
for more information on the xinitrc files and how they work.
If you want to use Apple's X11 instead of the KDE window manager,
put the following line before the startkde line in .xinitrc:
export KDEWM=quartz-wm
If you want to disable quartz-wm even for clipboard synchronization
(proxying), put the following line before the startkde line in
.xinitrc:
export DISABLE_PROXY=1
---[ Startup ]--------------------------------------------------------
Once you have created an ~/.xinitrc file, you should be able to start
KDE by clicking on the "XDarwin" icon in your Applications folder.
NOTE: By default, X11 on Mac OS X runs in "rootless" mode, generally.
If you run KDE in rootless mode, it will take over your desktop with
a window that covers everything up. You can remove this by disabling
desktop icons in the KDE control center. Open the control center
(either from the "K" menu bar, or by typing "kcontrol" in an xterm)
then expand the "Desktop" list, click "Behavior", and uncheck the
"Show icons on desktop" checkbox.
---[ Removal ]--------------------------------------------------------
To remove all of the official KDE packages, you can remove the KDE
libraries and anything that depends on them by running, in a terminal:
sudo apt-get remove kdelibs3-universal-shlibs
To remove an individual KDE package collection (like kdenetwork3 or
kdesdk3) you can generally remove [package]-base. For example, to
remove all of the kdenetwork3 packages, run:
sudo apt-get remove kdenetwork3-base
<<
<<
diff -Nurd kdelibs-3.5.9/darwin/kcmartsrc kdelibs-3.5.9-new/darwin/kcmartsrc
--- kdelibs-3.5.9/darwin/kcmartsrc 1969-12-31 19:00:00.000000000 -0500
+++ kdelibs-3.5.9-new/darwin/kcmartsrc 2008-02-13 21:00:34.000000000 -0500
@@ -0,0 +1,9 @@
+[Arts]
+Arguments=\s-F 10 -S 4096 -a esd -d -b 16 -s 60 -m artsmessage -c drkonqi -l 3 -f
+Bits=16
+FullDuplex=true
+AudioIO=esd
+NetworkTransparent=true
+StartRealtime=false
+StartServer=false
+SuspendTime=60
diff -Nurd kdelibs-3.5.9/darwin/kdeglobals kdelibs-3.5.9-new/darwin/kdeglobals
--- kdelibs-3.5.9/darwin/kdeglobals 1969-12-31 19:00:00.000000000 -0500
+++ kdelibs-3.5.9-new/darwin/kdeglobals 2008-02-13 21:00:34.000000000 -0500
@@ -0,0 +1,129 @@
+[$Version]
+update_info=kaccel.upd:kde3.3/r1,kded.upd:kde3.0,klippershortcuts.upd:04112002,kwin.upd:kde3.2Xinerama,socks.upd:kde3.0/r1
+
+[General]
+XftHintStyle=hintmedium
+XftSubPixel=
+fixed=Monaco CY,11,-1,5,50,0,0,0,0,0
+font=Baghdad,12,-1,5,50,0,0,0,0,0
+menuFont=Baghdad,12,-1,5,50,0,0,0,0,0
+taskbarFont=Baghdad,11,-1,5,50,0,0,0,0,0
+toolBarFont=Baghdad,10,-1,5,50,0,0,0,0,0
+
+[Global Shortcuts]
+Activate Window Demanding Attention=default(Alt+Ctrl+A)
+Defaults timestamp=Mar 1 200514:10:32
+Desktop Screenshot=default(Ctrl+Print)
+Enable/Disable Clipboard Actions=default(Alt+Ctrl+X)
+Halt without Confirmation=default(Alt+Ctrl+Shift+PageDown)
+Kill Window=default(Alt+Ctrl+Escape)
+Lock Session=default(Alt+Ctrl+L)
+Log Out=default(Alt+Ctrl+Delete)
+Log Out Without Confirmation=default(Alt+Ctrl+Shift+Delete)
+Manually Invoke Action on Current Clipboard=default(Alt+Ctrl+R)
+Mouse Emulation=default(Alt+F12)
+Next Taskbar Entry=none
+Popup Launch Menu=default(Alt+F1)
+Previous Taskbar Entry=none
+Reboot without Confirmation=default(Alt+Ctrl+Shift+PageUp)
+Run Command=default(Alt+F2)
+Setup Window Shortcut=none
+Show Klipper Popup-Menu=default(Alt+Ctrl+V)
+Show Taskmanager=default(Ctrl+Escape)
+Show Window List=default(Alt+F5)
+Switch One Desktop Down=none
+Switch One Desktop Up=none
+Switch One Desktop to the Left=none
+Switch One Desktop to the Right=none
+Switch User=default(Alt+Ctrl+Insert)
+Switch to Desktop 1=default(Ctrl+F1)
+Switch to Desktop 10=default(Ctrl+F10)
+Switch to Desktop 11=default(Ctrl+F11)
+Switch to Desktop 12=default(Ctrl+F12)
+Switch to Desktop 13=default(Ctrl+Shift+F1)
+Switch to Desktop 14=default(Ctrl+Shift+F2)
+Switch to Desktop 15=default(Ctrl+Shift+F3)
+Switch to Desktop 16=default(Ctrl+Shift+F4)
+Switch to Desktop 17=default(Ctrl+Shift+F5)
+Switch to Desktop 18=default(Ctrl+Shift+F6)
+Switch to Desktop 19=default(Ctrl+Shift+F7)
+Switch to Desktop 2=default(Ctrl+F2)
+Switch to Desktop 20=default(Ctrl+Shift+F8)
+Switch to Desktop 3=default(Ctrl+F3)
+Switch to Desktop 4=default(Ctrl+F4)
+Switch to Desktop 5=default(Ctrl+F5)
+Switch to Desktop 6=default(Ctrl+F6)
+Switch to Desktop 7=default(Ctrl+F7)
+Switch to Desktop 8=default(Ctrl+F8)
+Switch to Desktop 9=default(Ctrl+F9)
+Switch to Next Desktop=none
+Switch to Next Keyboard Layout=default(Alt+Ctrl+K)
+Switch to Previous Desktop=none
+Toggle Showing Desktop=default(Alt+Ctrl+D)
+Toggle Window Raise/Lower=none
+Walk Through Desktop List=default(Ctrl+Tab)
+Walk Through Desktop List (Reverse)=default(Ctrl+Shift+Tab)
+Walk Through Desktops=none
+Walk Through Desktops (Reverse)=none
+Walk Through Windows=default(Alt+Tab)
+Walk Through Windows (Reverse)=default(Alt+Shift+Tab)
+Window Above Other Windows=none
+Window Below Other Windows=none
+Window Close=default(Alt+F4)
+Window Fullscreen=none
+Window Grow Horizontal=none
+Window Grow Vertical=none
+Window Lower=none
+Window Maximize=none
+Window Maximize Horizontal=none
+Window Maximize Vertical=none
+Window Minimize=none
+Window Move=none
+Window No Border=none
+Window On All Desktops=none
+Window One Desktop Down=none
+Window One Desktop Up=none
+Window One Desktop to the Left=none
+Window One Desktop to the Right=none
+Window Operations Menu=default(Alt+F3)
+Window Pack Down=none
+Window Pack Left=none
+Window Pack Right=none
+Window Pack Up=none
+Window Raise=none
+Window Resize=none
+Window Screenshot=default(Alt+Print)
+Window Shade=none
+Window Shrink Horizontal=none
+Window Shrink Vertical=none
+Window to Desktop 1=none
+Window to Desktop 10=none
+Window to Desktop 11=none
+Window to Desktop 12=none
+Window to Desktop 13=none
+Window to Desktop 14=none
+Window to Desktop 15=none
+Window to Desktop 16=none
+Window to Desktop 17=none
+Window to Desktop 18=none
+Window to Desktop 19=none
+Window to Desktop 2=none
+Window to Desktop 20=none
+Window to Desktop 3=none
+Window to Desktop 4=none
+Window to Desktop 5=none
+Window to Desktop 6=none
+Window to Desktop 7=none
+Window to Desktop 8=none
+Window to Desktop 9=none
+Window to Next Desktop=none
+Window to Previous Desktop=none
+
+[KDE]
+ShowDeleteCommand=false
+
+[Paths]
+Trash=$HOME/Desktop/.Trash/
+
+[WM]
+activeFont=Baghdad,12,-1,5,50,0,0,0,0,0
diff -Nurd kdelibs-3.5.9/darwin/knotifyrc kdelibs-3.5.9-new/darwin/knotifyrc
--- kdelibs-3.5.9/darwin/knotifyrc 1969-12-31 19:00:00.000000000 -0500
+++ kdelibs-3.5.9-new/darwin/knotifyrc 2008-02-13 21:00:34.000000000 -0500
@@ -0,0 +1,5 @@
+[Misc]
+External player=@FINKPREFIX@/bin/mplayer
+LastConfiguredApp=knotify
+Use external player=false
+Volume=100
diff -Nurd kdelibs-3.5.9/darwin/konsolerc kdelibs-3.5.9-new/darwin/konsolerc
--- kdelibs-3.5.9/darwin/konsolerc 1969-12-31 19:00:00.000000000 -0500
+++ kdelibs-3.5.9-new/darwin/konsolerc 2008-02-13 21:00:34.000000000 -0500
@@ -0,0 +1,19 @@
+[Desktop Entry]
+ActiveSession=0
+AutoResizeTabs=false
+DefaultSession=shell.desktop
+DynamicTabHide=false
+Fullscreen=false
+Height 832=510
+TabViewMode=0
+Width 1280=927
+bellmode=0
+class=konsole-mainwindow#1
+defaultfont=Monaco CY,12,-1,5,50,0,0,0,0,0
+font=8
+history=1000
+historyenabled=true
+keytab=default
+schema=Linux.schema
+scrollbar=2
+tabbar=2
diff -Nurd kdelibs-3.5.9/dcop/dcopc.c kdelibs-3.5.9-new/dcop/dcopc.c
--- kdelibs-3.5.9/dcop/dcopc.c 2006-05-22 14:14:21.000000000 -0400
+++ kdelibs-3.5.9-new/dcop/dcopc.c 2008-02-13 21:00:34.000000000 -0500
@@ -674,6 +674,9 @@
while((i = strchr(displayName, ':')) != NULL)
*i = '_';
+ while((i = strchr(displayName, '/')) != NULL)
+ *i = '_';
+
dcopServer = getenv("DCOPSERVER");
if (NULL == dcopServer) {
diff -Nurd kdelibs-3.5.9/dcop/dcopclient.cpp kdelibs-3.5.9-new/dcop/dcopclient.cpp
--- kdelibs-3.5.9/dcop/dcopclient.cpp 2007-10-08 05:52:08.000000000 -0400
+++ kdelibs-3.5.9-new/dcop/dcopclient.cpp 2008-02-13 21:00:34.000000000 -0500
@@ -270,6 +270,8 @@
{
while( (i = disp.find(KPATH_SEPARATOR)) >= 0)
disp[i] = '_';
+ while( (i = disp.find('/')) >= 0)
+ disp[i] = '_';
}
fName += "/.DCOPserver_";
diff -Nurd kdelibs-3.5.9/dcop/dcopserver_shutdown.c kdelibs-3.5.9-new/dcop/dcopserver_shutdown.c
--- kdelibs-3.5.9/dcop/dcopserver_shutdown.c 2005-10-10 11:06:13.000000000 -0400
+++ kdelibs-3.5.9-new/dcop/dcopserver_shutdown.c 2008-02-13 21:00:34.000000000 -0500
@@ -118,6 +118,8 @@
strncat(dcop_file_old,display, n);
while((i = strchr(display, ':')))
*i = '_';
+ while((i = strchr(display, '/')))
+ *i = '_';
strncat(dcop_file, display, n);
free(display);
diff -Nurd kdelibs-3.5.9/kdecore/Makefile.am kdelibs-3.5.9-new/kdecore/Makefile.am
--- kdelibs-3.5.9/kdecore/Makefile.am 2006-10-01 13:33:38.000000000 -0400
+++ kdelibs-3.5.9-new/kdecore/Makefile.am 2008-02-13 21:00:34.000000000 -0500
@@ -24,7 +24,7 @@
if include_SVGICONS
SVGICONS=svgicons
-SVGICON_LIB=svgicons/libkdesvgicons.la
+SVGICON_LIB=svgicons/libkdesvgicons.la $(LIBZ)
endif
SUBDIRS = malloc network $(SVGICONS) . kconfig_compiler tests
@@ -116,7 +116,7 @@
kqiodevicegzip_p.cpp ktimezones.cpp
libkdecore_la_LDFLAGS = $(QT_LDFLAGS) $(KDE_RPATH) $(KDE_MT_LDFLAGS) $(X_LDFLAGS) $(USER_LDFLAGS) -version-info 6:0:2 -no-undefined
-libkdecore_la_LIBADD = malloc/libklmalloc.la network/libkdecorenetwork.la $(SVGICON_LIB) ../dcop/libDCOP.la ../libltdl/libltdlc.la $(LIB_XEXT) $(LIBRESOLV) $(LIBUTIL) $(LIBART_LIBS) $(LIB_IDN) ../kdefx/libkdefx.la
+libkdecore_la_LIBADD = malloc/libklmalloc.la network/libkdecorenetwork.la $(SVGICON_LIB) ../dcop/libDCOP.la ../libltdl/libltdlc.la $(LIB_XEXT) $(LIBRESOLV) $(LIBUTIL) $(LIBART_LIBS) $(LIB_IDN) ../kdefx/libkdefx.la $(LIBZ)
libkdecore_la_NMCHECK = $(srcdir)/libkdecore.nmcheck
libkdecore_la_NMCHECKWEAK = $(srcdir)/libkdecore_weak.nmcheck $(srcdir)/libqt-mt_weak.nmcheck \
$(top_srcdir)/dcop/libDCOP_weak.nmcheck $(top_srcdir)/kdecore/standard_weak.nmcheck
diff -Nurd kdelibs-3.5.9/kdecore/kglobalsettings.cpp kdelibs-3.5.9-new/kdecore/kglobalsettings.cpp
--- kdelibs-3.5.9/kdecore/kglobalsettings.cpp 2005-10-10 11:06:03.000000000 -0400
+++ kdelibs-3.5.9-new/kdecore/kglobalsettings.cpp 2008-02-13 21:00:34.000000000 -0500
@@ -491,7 +491,7 @@
s_desktopPath->append('/');
// Trash Path - TODO remove in KDE4 (kio_trash can't use it for interoperability reasons)
- *s_trashPath = *s_desktopPath + i18n("Trash") + "/";
+ *s_trashPath = *s_desktopPath + "." + i18n("Trash") + "/";
*s_trashPath = g.readPathEntry( "Trash" , *s_trashPath);
*s_trashPath = QDir::cleanDirPath( *s_trashPath );
if ( !s_trashPath->endsWith("/") )
diff -Nurd kdelibs-3.5.9/kdecore/ksocks.cpp kdelibs-3.5.9-new/kdecore/ksocks.cpp
--- kdelibs-3.5.9/kdecore/ksocks.cpp 2005-10-10 11:06:03.000000000 -0400
+++ kdelibs-3.5.9-new/kdecore/ksocks.cpp 2008-02-13 21:00:34.000000000 -0500
@@ -480,7 +480,7 @@
ksocklen_t addrlen) {
if (_useSocks && F_connect)
return (*F_connect)(sockfd, serv_addr, addrlen);
- else return ::connect(sockfd, (sockaddr*) serv_addr, (socklen_t)addrlen);
+ else return ::connect(sockfd, (sockaddr*) serv_addr, (ksocklen_t)addrlen);
}
@@ -503,7 +503,7 @@
if (_useSocks && F_recvfrom) {
return (*F_recvfrom)(s, buf, len, flags, from, fromlen);
} else {
- socklen_t casted_len = (socklen_t) *fromlen;
+ kde_socklen_t casted_len = (kde_socklen_t) *fromlen;
int rc = ::recvfrom(s, (char*) buf, len, flags, from, &casted_len);
*fromlen = casted_len;
return rc;
@@ -515,7 +515,7 @@
const sockaddr *to, ksocklen_t tolen) {
if (_useSocks && F_sendto)
return (*F_sendto)(s, msg, len, flags, to, tolen);
- else return ::sendto(s, (char*) msg, len, flags, to, (socklen_t)tolen);
+ else return ::sendto(s, (char*) msg, len, flags, to, (ksocklen_t)tolen);
}
@@ -537,7 +537,7 @@
if (_useSocks && F_getsockname) {
return (*F_getsockname)(s, name, namelen);
} else {
- socklen_t casted_len = *namelen;
+ kde_socklen_t casted_len = *namelen;
int rc = ::getsockname(s, name, &casted_len);
*namelen = casted_len;
return rc;
@@ -549,7 +549,7 @@
if (_useSocks && F_getpeername) {
return (*F_getpeername)(s, name, namelen);
} else {
- socklen_t casted_len = *namelen;
+ kde_socklen_t casted_len = *namelen;
int rc = ::getpeername(s, name, &casted_len);
*namelen = casted_len;
return rc;
@@ -561,7 +561,7 @@
if (_useSocks && F_accept) {
return (*F_accept)(s, addr, addrlen);
} else {
- socklen_t casted_len = *addrlen;
+ kde_socklen_t casted_len = *addrlen;
int rc = ::accept(s, addr, &casted_len);
*addrlen = casted_len;
return rc;
@@ -587,13 +587,13 @@
int KSocks::bind (int sockfd, const sockaddr *my_addr, ksocklen_t addrlen) {
if (_useSocks && F_bind)
return (*F_bind)(sockfd, my_addr, addrlen);
- else return ::bind(sockfd, my_addr, (socklen_t)addrlen);
+ else return ::bind(sockfd, my_addr, (ksocklen_t)addrlen);
}
int KSocks::bind (int sockfd, sockaddr *my_addr, ksocklen_t addrlen) {
if (_useSocks && F_bind)
return (*F_bind)(sockfd, my_addr, addrlen);
- else return ::bind(sockfd, my_addr, (socklen_t)addrlen);
+ else return ::bind(sockfd, my_addr, (ksocklen_t)addrlen);
}
diff -Nurd kdelibs-3.5.9/kdecore/kstandarddirs.cpp kdelibs-3.5.9-new/kdecore/kstandarddirs.cpp
--- kdelibs-3.5.9/kdecore/kstandarddirs.cpp 2008-02-13 04:41:08.000000000 -0500
+++ kdelibs-3.5.9-new/kdecore/kstandarddirs.cpp 2008-02-13 21:00:34.000000000 -0500
@@ -1021,7 +1021,7 @@
if (!strcmp(type, "data"))
return "share/apps/";
if (!strcmp(type, "html"))
- return "share/doc/HTML/";
+ return "share/doc/kde/";
if (!strcmp(type, "icon"))
return "share/icons/";
if (!strcmp(type, "config"))
diff -Nurd kdelibs-3.5.9/kdecore/kuniqueapplication.cpp kdelibs-3.5.9-new/kdecore/kuniqueapplication.cpp
--- kdelibs-3.5.9/kdecore/kuniqueapplication.cpp 2005-11-08 17:39:22.000000000 -0500
+++ kdelibs-3.5.9-new/kdecore/kuniqueapplication.cpp 2008-02-13 21:00:34.000000000 -0500
@@ -59,6 +59,10 @@
# endif
#endif
+#ifdef __APPLE__
+#include
+#endif
+
bool KUniqueApplication::s_nofork = false;
bool KUniqueApplication::s_multipleInstances = false;
bool KUniqueApplication::s_uniqueTestDone = false;
@@ -123,7 +127,7 @@
startKdeinit();
if(dcopClient()->registerAs(appName, false).isEmpty()) {
kdError() << "KUniqueApplication: Can't setup DCOP communication." << endl;
- ::exit(255);
+ ::_exit(255);
}
}
#endif
@@ -131,19 +135,52 @@
// We'll call newInstance in the constructor. Do nothing here.
return true;
}
+
+#ifdef Q_OS_DARWIN
+ else {
+ // we need to reexec ourselves because of stupid OSX crap crappity crap
+ int argc = *_NSGetArgc();
+ char ** argv = *_NSGetArgv();
+ char * newargv[argc+2];
+
+ for (int i = 0; i < argc; i++) {
+ newargv[i] = argv[i];
+ }
+ newargv[argc] = "--nofork";
+ newargv[argc+1] = NULL;
+
+ int fork_result = fork();
+ switch(fork_result) {
+ case -1:
+ kdError() << "KUniqueAPplication: Mac OS X workaround fork() failed!" << endl;
+ ::_exit(255);
+ break;
+ case 0:
+ // Child
+ execvp(argv[0], newargv);
+ break;
+ default:
+ // Parent
+ _exit(0);
+ break;
+ }
+ }
+#endif
+
DCOPClient *dc;
int fd[2];
signed char result;
if (0 > pipe(fd))
{
kdError() << "KUniqueApplication: pipe() failed!" << endl;
- ::exit(255);
+ ::_exit(255);
}
+
int fork_result = fork();
switch(fork_result) {
case -1:
kdError() << "KUniqueApplication: fork() failed!" << endl;
- ::exit(255);
+ ::_exit(255);
break;
case 0:
// Child
@@ -161,7 +198,7 @@
kdError() << "KUniqueApplication: Can't determine DISPLAY. Aborting." << endl;
result = -1; // Error
::write(fd[1], &result, 1);
- ::exit(255);
+ ::_exit(255);
}
// Try to launch kdeinit.
@@ -173,7 +210,7 @@
result = -1;
delete dc; // Clean up DCOP commmunication
::write(fd[1], &result, 1);
- ::exit(255);
+ ::_exit(255);
}
}
if (regName != appName)
@@ -247,25 +284,25 @@
if (n == 0)
{
kdError() << "KUniqueApplication: Pipe closed unexpectedly." << endl;
- ::exit(255);
+ ::_exit(255);
}
if (errno != EINTR)
{
kdError() << "KUniqueApplication: Error reading from pipe." << endl;
- ::exit(255);
+ ::_exit(255);
}
}
::close(fd[0]);
if (result != 0)
- ::exit(result); // Error occurred in child.
+ ::_exit(result); // Error occurred in child.
dc = new DCOPClient();
if (!dc->attach())
{
kdError() << "KUniqueApplication: Parent process can't attach to DCOP." << endl;
delete dc; // Clean up DCOP commmunication
- ::exit(255);
+ ::_exit(255);
}
if (!dc->isApplicationRegistered(appName)) {
kdError() << "KUniqueApplication: Registering failed!" << endl;
@@ -294,20 +331,20 @@
{
kdError() << "Communication problem with " << KCmdLineArgs::about->appName() << ", it probably crashed." << endl;
delete dc; // Clean up DCOP commmunication
- ::exit(255);
+ ::_exit(255);
}
dc->setPriorityCall(false);
if (replyType != "int")
{
kdError() << "KUniqueApplication: DCOP communication error!" << endl;
delete dc; // Clean up DCOP commmunication
- ::exit(255);
+ ::_exit(255);
}
QDataStream rs(reply, IO_ReadOnly);
int exitCode;
rs >> exitCode;
delete dc; // Clean up DCOP commmunication
- ::exit(exitCode);
+ ::_exit(exitCode);
break;
}
return false; // make insure++ happy
@@ -361,7 +398,7 @@
}
if( !start())
// Already running
- ::exit( 0 );
+ ::_exit( 0 );
return inst;
}
diff -Nurd kdelibs-3.5.9/kdecore/network/ksocketdevice.cpp kdelibs-3.5.9-new/kdecore/network/ksocketdevice.cpp
--- kdelibs-3.5.9/kdecore/network/ksocketdevice.cpp 2007-01-15 06:34:17.000000000 -0500
+++ kdelibs-3.5.9-new/kdecore/network/ksocketdevice.cpp 2008-02-13 21:00:34.000000000 -0500
@@ -316,7 +316,7 @@
}
struct sockaddr sa;
- socklen_t len = sizeof(sa);
+ kde_socklen_t len = sizeof(sa);
int newfd = kde_accept(m_sockfd, &sa, &len);
if (newfd == -1)
{
@@ -390,7 +390,7 @@
static int do_read_common(int sockfd, char *data, Q_ULONG maxlen, KSocketAddress* from, ssize_t &retval, bool peek = false)
{
- socklen_t len;
+ kde_socklen_t len;
if (from)
{
from->setLength(len = 128); // arbitrary length
@@ -535,7 +535,7 @@
if (d->local.family() != AF_UNSPEC)
return d->local;
- socklen_t len;
+ kde_socklen_t len;
KSocketAddress localAddress;
localAddress.setLength(len = 32); // arbitrary value
if (kde_getsockname(m_sockfd, localAddress.address(), &len) == -1)
@@ -571,7 +571,7 @@
if (d->peer.family() != AF_UNSPEC)
return d->peer;
- socklen_t len;
+ kde_socklen_t len;
KSocketAddress peerAddress;
peerAddress.setLength(len = 32); // arbitrary value
if (kde_getpeername(m_sockfd, peerAddress.address(), &len) == -1)
diff -Nurd kdelibs-3.5.9/kdecore/network/syssocket.h kdelibs-3.5.9-new/kdecore/network/syssocket.h
--- kdelibs-3.5.9/kdecore/network/syssocket.h 2005-09-10 04:27:10.000000000 -0400
+++ kdelibs-3.5.9-new/kdecore/network/syssocket.h 2008-02-13 21:00:34.000000000 -0500
@@ -53,7 +53,7 @@
}
// bind
- inline int kde_bind(int fd, const struct sockaddr* sa, socklen_t len)
+ inline int kde_bind(int fd, const struct sockaddr* sa, kde_socklen_t len)
{
return ::bind(fd, sa, len);
}
@@ -65,25 +65,25 @@
}
// connect
- inline int kde_connect(int fd, const struct sockaddr* sa, socklen_t len)
+ inline int kde_connect(int fd, const struct sockaddr* sa, kde_socklen_t len)
{
return ::connect(fd, (struct sockaddr*)sa, len);
}
// accept
- inline int kde_accept(int fd, struct sockaddr* sa, socklen_t* len)
+ inline int kde_accept(int fd, struct sockaddr* sa, kde_socklen_t* len)
{
return ::accept(fd, sa, len);
}
// getpeername
- inline int kde_getpeername(int fd, struct sockaddr* sa, socklen_t* len)
+ inline int kde_getpeername(int fd, struct sockaddr* sa, kde_socklen_t* len)
{
return ::getpeername(fd, sa, len);
}
// getsockname
- inline int kde_getsockname(int fd, struct sockaddr* sa, socklen_t* len)
+ inline int kde_getsockname(int fd, struct sockaddr* sa, kde_socklen_t* len)
{
return ::getsockname(fd, sa, len);
}
diff -Nurd kdelibs-3.5.9/kded/Makefile.am kdelibs-3.5.9-new/kded/Makefile.am
--- kdelibs-3.5.9/kded/Makefile.am 2005-10-10 11:06:29.000000000 -0400
+++ kdelibs-3.5.9-new/kded/Makefile.am 2008-02-13 21:00:34.000000000 -0500
@@ -58,7 +58,10 @@
servicetype_DATA = kdedmodule.desktop
servicetypedir = $(kde_servicetypesdir)
-xdg_menu_DATA = applications.menu
+kde-applications.menu: applications.menu
+ cat applications.menu > kde-applications.menu
+
+xdg_menu_DATA = kde-applications.menu
update_DATA = kded.upd
updatedir = $(kde_datadir)/kconf_update
diff -Nurd kdelibs-3.5.9/kded/kbuildsycoca.cpp kdelibs-3.5.9-new/kded/kbuildsycoca.cpp
--- kdelibs-3.5.9/kded/kbuildsycoca.cpp 2007-05-14 03:52:43.000000000 -0400
+++ kdelibs-3.5.9-new/kded/kbuildsycoca.cpp 2008-02-13 21:00:34.000000000 -0500
@@ -379,7 +379,11 @@
connect(g_vfolder, SIGNAL(newService(const QString &, KService **)),
this, SLOT(slotCreateEntry(const QString &, KService **)));
- VFolderMenu::SubMenu *kdeMenu = g_vfolder->parseMenu("applications.menu", true);
+ VFolderMenu::SubMenu *kdeMenu;
+ if ( QFile::exists( "@FINKPREFIX@/etc/xdg/menus/kde-applications.menu" ) )
+ kdeMenu = g_vfolder->parseMenu("kde-applications.menu", true);
+ else
+ kdeMenu = g_vfolder->parseMenu("applications.menu", true);
KServiceGroup *entry = g_bsgf->addNew("/", kdeMenu->directoryFile, 0, false);
entry->setLayoutInfo(kdeMenu->layoutList);
diff -Nurd kdelibs-3.5.9/kdeprint/configure.in.in kdelibs-3.5.9-new/kdeprint/configure.in.in
--- kdelibs-3.5.9/kdeprint/configure.in.in 2005-09-10 04:27:43.000000000 -0400
+++ kdelibs-3.5.9-new/kdeprint/configure.in.in 2008-02-13 21:00:34.000000000 -0500
@@ -80,7 +80,7 @@
dnl check if CUPS is at least 1.1.20
ac_have_new_cups="no"
- AC_CHECK_CUPS_VERSION(1.0120)
+ AC_CHECK_CUPS_VERSION(1.0121)
if test "$ac_have_new_cups" = "yes"; then
AC_DEFINE(HAVE_CUPS_NO_PWD_CACHE, 1, CUPS doesn't have password caching)
fi
diff -Nurd kdelibs-3.5.9/kdeprint/cups/Makefile.am kdelibs-3.5.9-new/kdeprint/cups/Makefile.am
--- kdelibs-3.5.9/kdeprint/cups/Makefile.am 2006-10-02 06:46:55.000000000 -0400
+++ kdelibs-3.5.9-new/kdeprint/cups/Makefile.am 2008-02-13 21:00:34.000000000 -0500
@@ -14,8 +14,8 @@
imagepreview.cpp imageposition.cpp kpimagepage.cpp \
kptextpage.cpp kphpgl2page.cpp cupsaddsmb2.cpp kmwother.cpp ippreportdlg.cpp \
kptagspage.cpp
-kdeprint_cups_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined
-kdeprint_cups_la_LIBADD = $(top_builddir)/kdeprint/management/libkdeprint_management.la $(LIB_KIO) $(LIB_CUPS) $(top_builddir)/kdecore/libkdefakes.la
+kdeprint_cups_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined $(LIB_CUPS)
+kdeprint_cups_la_LIBADD = $(top_builddir)/kdeprint/management/libkdeprint_management.la $(LIB_KIO) $(top_builddir)/kdecore/libkdefakes.la
kdeprint_cups_la_METASOURCES = AUTO
noinst_HEADERS = cupsinfos.h ipprequest.h kmcupsjobmanager.h kmcupsmanager.h kmcupsuimanager.h \
diff -Nurd kdelibs-3.5.9/kdeprint/cups/cupsdconf2/Makefile.am kdelibs-3.5.9-new/kdeprint/cups/cupsdconf2/Makefile.am
--- kdelibs-3.5.9/kdeprint/cups/cupsdconf2/Makefile.am 2005-09-10 04:27:41.000000000 -0400
+++ kdelibs-3.5.9-new/kdeprint/cups/cupsdconf2/Makefile.am 2008-02-13 21:00:34.000000000 -0500
@@ -14,8 +14,8 @@
locationdialog.cpp addressdialog.cpp cups-util.c \
qdirmultilineedit.cpp sizewidget.cpp main.cpp
cupsdconf_la_METASOURCES = AUTO
-cupsdconf_la_LDFLAGS = -avoid-version -module $(all_libraries) $(KDE_RPATH)
-cupsdconf_la_LIBADD = $(LIB_KIO) $(LIB_CUPS)
+cupsdconf_la_LDFLAGS = -avoid-version -module $(all_libraries) $(KDE_RPATH) $(LIB_CUPS)
+cupsdconf_la_LIBADD = $(LIB_KIO)
noinst_HEADERS = cupsdconf.h cupsdpage.h cupsddialog.h cupsdcomment.h cupsdsplash.h \
cupsdserverpage.h cupsdlogpage.h cupsdjobspage.h cupsdfilterpage.h \
diff -Nurd kdelibs-3.5.9/kdeui/Makefile.am kdelibs-3.5.9-new/kdeui/Makefile.am
--- kdelibs-3.5.9/kdeui/Makefile.am 2007-10-08 05:52:12.000000000 -0400
+++ kdelibs-3.5.9-new/kdeui/Makefile.am 2008-02-13 21:00:34.000000000 -0500
@@ -27,10 +27,10 @@
AM_LDFLAGS = $(LDFLAGS_AS_NEEDED) $(LDFLAGS_NEW_DTAGS)
lib_LTLIBRARIES = libkdeui.la libkspell.la
-libkdeui_la_LDFLAGS = $(KDE_MT_LDFLAGS) -no-undefined -version-info 6:0:2
+libkdeui_la_LDFLAGS = $(KDE_MT_LDFLAGS) $(all_libraries) -no-undefined -version-info 6:0:2
libkdeui_la_LIBADD = ../kdecore/libkdecore.la
-libkspell_la_LDFLAGS = $(KDE_MT_LDFLAGS) -version-info 6:0:2 -no-undefined
+libkspell_la_LDFLAGS = $(KDE_MT_LDFLAGS) $(all_libraries) -version-info 6:0:2 -no-undefined
libkspell_la_LIBADD = libkdeui.la
libkspell_la_SOURCES = dummy.cpp
diff -Nurd kdelibs-3.5.9/kimgio/Makefile.am kdelibs-3.5.9-new/kimgio/Makefile.am
--- kdelibs-3.5.9/kimgio/Makefile.am 2005-09-10 04:26:42.000000000 -0400
+++ kdelibs-3.5.9-new/kimgio/Makefile.am 2008-02-13 21:00:34.000000000 -0500
@@ -21,7 +21,7 @@
kimg_pcx.la kimg_tga.la kimg_rgb.la kimg_xcf.la kimg_dds.la $(KIMGIO_EXR_MODULES) \
kimg_psd.la kimg_hdr.la
-KIMGIO_PLUGIN = -avoid-version -export-symbols-regex 'kimgio_.*_(read|write)'
+KIMGIO_PLUGIN = -avoid-version
kimg_tiff_la_SOURCES = tiffr.cpp
kimg_tiff_la_LDFLAGS = -module $(KIMGIO_PLUGIN) -no-undefined $(all_libraries)
diff -Nurd kdelibs-3.5.9/kinit/Makefile.am kdelibs-3.5.9-new/kinit/Makefile.am
--- kdelibs-3.5.9/kinit/Makefile.am 2007-10-08 05:52:03.000000000 -0400
+++ kdelibs-3.5.9-new/kinit/Makefile.am 2008-02-13 21:00:34.000000000 -0500
@@ -15,7 +15,7 @@
# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
# Boston, MA 02110-1301, USA.
-INCLUDES = -I$(srcdir)/../libltdl/ $(all_includes) $(KDEINIT_XFT_INCLUDES)
+INCLUDES = -I$(srcdir)/../libltdl/ $(KDEINIT_XFT_INCLUDES) $(all_includes)
SUBDIRS = . tests
diff -Nurd kdelibs-3.5.9/kinit/kinit.cpp kdelibs-3.5.9-new/kinit/kinit.cpp
--- kdelibs-3.5.9/kinit/kinit.cpp 2007-10-08 05:52:03.000000000 -0400
+++ kdelibs-3.5.9-new/kinit/kinit.cpp 2008-02-13 21:00:34.000000000 -0500
@@ -593,6 +593,11 @@
if ( getenv("KDE_IS_PRELINKED") && !execpath.isEmpty() && !launcher)
libpath.truncate(0);
+#ifdef Q_OS_DARWIN
+ if (!execpath.isEmpty())
+ libpath.truncate(0);
+#endif
+
if ( !libpath.isEmpty() )
{
d.handle = lt_dlopen( QFile::encodeName(libpath) );
diff -Nurd kdelibs-3.5.9/kinit/start_kdeinit_wrapper.c kdelibs-3.5.9-new/kinit/start_kdeinit_wrapper.c
--- kdelibs-3.5.9/kinit/start_kdeinit_wrapper.c 2008-02-13 04:41:06.000000000 -0500
+++ kdelibs-3.5.9-new/kinit/start_kdeinit_wrapper.c 2008-02-13 21:01:39.000000000 -0500
@@ -50,9 +50,9 @@
close( 0 ); /* stdin */
dup2( pipes[ 0 ], 0 );
close( pipes[ 0 ] );
- argv[ 0 ] = (char*)"start_kdeinit";
- execvp("start_kdeinit", argv);
- perror("start_kdeinit");
+ argv[ 0 ] = (char*)"@FINKPREFIX@/bin/start_kdeinit";
+ execvp("@FINKPREFIX@/bin/start_kdeinit", argv);
+ perror("@FINKPREFIX@/bin/start_kdeinit");
return 1;
case 0: { /* child, pass env and exit */
extern char** environ;
@@ -84,9 +84,9 @@
{
if(argc == 0)
return 1;
- argv[0] = "start_kdeinit";
- execvp("start_kdeinit",argv);
- perror("start_kdeinit");
+ argv[0] = "@FINKPREFIX@/bin/start_kdeinit";
+ execvp("@FINKPREFIX@/bin/start_kdeinit",argv);
+ perror("@FINKPREFIX@/bin/start_kdeinit");
return 1;
}
#endif
diff -Nurd kdelibs-3.5.9/kio/kssl/kopenssl.cc kdelibs-3.5.9-new/kio/kssl/kopenssl.cc
--- kdelibs-3.5.9/kio/kssl/kopenssl.cc 2006-07-22 04:16:39.000000000 -0400
+++ kdelibs-3.5.9-new/kio/kssl/kopenssl.cc 2008-02-13 21:00:34.000000000 -0500
@@ -323,6 +323,7 @@
#elif defined(_AIX)
<< "libssl.a(libssl.so.0)"
#elif defined(__APPLE__)
+ << "libssl.0.9.7.dylib"
<< "libssl.dylib"
<< "libssl.0.9.dylib"
#else
@@ -340,6 +341,7 @@
#elif defined(_AIX)
<< "libcrypto.a(libcrypto.so.0)"
#elif defined(__APPLE__)
+ << "libcrypto.0.9.7.dylib"
<< "libcrypto.dylib"
<< "libcrypto.0.9.dylib"
#else
diff -Nurd kdelibs-3.5.9/kio/misc/kpac/Makefile.am kdelibs-3.5.9-new/kio/misc/kpac/Makefile.am
--- kdelibs-3.5.9/kio/misc/kpac/Makefile.am 2005-09-10 04:26:47.000000000 -0400
+++ kdelibs-3.5.9-new/kio/misc/kpac/Makefile.am 2008-02-13 21:00:34.000000000 -0500
@@ -10,7 +10,7 @@
kded_proxyscout_la_SOURCES = proxyscout.skel proxyscout.cpp script.cpp \
downloader.cpp discovery.cpp
kded_proxyscout_la_LDFLAGS = $(all_libraries) -module -avoid-version
-kded_proxyscout_la_LIBADD = $(LIB_KIO) $(top_builddir)/kjs/libkjs.la $(LIB_KDED)
+kded_proxyscout_la_LIBADD = $(LIB_KIO) $(top_builddir)/kjs/libkjs.la $(LIB_KDED) $(LIBRESOLV)
kpac_dhcp_helper_SOURCES = kpac_dhcp_helper.c
kpac_dhcp_helper_CFLAGS = $(KDE_USE_FPIE)
Info3: <<
Package: kdelibs3-unified
Version: 3.5.10
Revision: 10
Description: KDE - essential libraries
License: GPL/LGPL
Maintainer: Benjamin Reed
Depends: <<
%N-shlibs (>= %v-%r),
aspell,
default-icon-theme (>= 0.5-2),
libart2-shlibs (>= 2.3.20-1),
libjpeg8-shlibs,
libpng14-shlibs (>= 1.4.1-2),
pcre-shlibs,
qt3-shlibs (>= 3.3.8-2000)
<<
BuildDepends: <<
arts-dev (>= 1.5.10-10),
aspell-dev,
audiofile (>= 0.2.6-11),
autoconf (>= 2.63-1),
automake1.11,
bzip2-dev,
cctools-single-module,
cups-dev,
dbus-dev (>= 1.2.12-1),
dbus-qt3-dev,
esound,
expat1,
fink (>= 0.29.7-1),
fink-package-precedence (>= 0.7-1),
flex-devel,
# fontconfig2-dev (>= 2.4.1-1),
freetype219 (>= 2.3.12-1),
libgettext8-dev,
gettext-tools,
glib2-dev (>= 2.22.0-1),
libart2 (>= 2.3.20-1),
libdatrie,
libiconv-dev,
libidn (>= 0.5.1-1),
libjpeg8,
libogg,
libpng14 (>= 1.4.1-2),
libthai-dev,
libtiff,
libvorbis0,
libxml2,
libxslt,
libmad,
openexr-dev,
openslp-ssl-dev | openslp-dev,
pcre,
pcre-bin,
pkgconfig (>= 0.23-1),
qt3 (>= 3.3.8-2000),
qt3-doc,
xdg-base,
x11-dev,
xft2-dev (>= 2.1.14-3),
xmkmf
<<
BuildConflicts: unsermake
Replaces: <<
conectiva-crystal,
kbabel (<< 3.1.90-1),
kdeartwork3,
kdebase3,
kdebase3-ssl,
kdebase3-unified (<< 3.5.0-1),
kdelibs3,
kdelibs3-ssl,
kdelibs3-dev,
kdelibs3-ssl-dev,
kdelibs3-unified-dev,
kdepim3 (<< %v-1),
kdepim3-common (<< %v-1),
kdevelop (<< 3.3.0-1),
kde-extra-themes (<< 3.4.0-1),
kde-icons-crystal,
keramik,
koffice-common,
korganizer (<< 3.2.91-1),
ktts (<< 3.5.0-1)
<<
Recommends: mplayer
GCC: 4.0
CustomMirror: <<
Primary: http://ranger.users.finkproject.org/distfiles
eur-NL: http://ranger.users.finkproject.org/distfiles
nam-US: http://ranger.befunk.com/fink
nam-US: http://astrange.ithinksw.net/~astrange/ranger-fink
nam-CA: http://www.southofheaven.net/befunk
<<
Source: mirror:kde:stable/%v/src/kdelibs-%v.tar.bz2
Source-MD5: 43cd55ed15f63b5738d620ef9f9fd568
Source2: mirror:custom:kde-admindir/kde-admindir-29cde0f.tar.bz2
Source2-MD5: 40e5462e2d292c468358f8d001594519
Source2ExtractDir: kdelibs-%v
SourceDirectory: kdelibs-%v
PatchScript: <<
sed -e 's,@FINKPREFIX@,%p,g' %{PatchFile} | patch -p1
perl -pi -e 's,-O2,-Os,g; s,doc/HTML,doc/kde,g; s,/usr/share/doc/packages/qt3/html,%p/share/doc/qt3/html,g;' admin/*
<<
PatchFile: kdelibs3-unified.patch
PatchFile-MD5: 579331cd945286f96134da2b1dfc40c4
NoSetCPPFLAGS: true
NoSetLDFLAGS: true
UseMaxBuildJobs: true
ConfigureParams: --without-lua --enable-cups --with-ldap=framework --with-gssapi=framework --with-distribution='Fink/Mac OS X'
CompileScript: <<
#!/bin/sh -ev
export PREFIX="%p" USE_UNSERMAKE=0
. ./environment-helper.sh
case $SW_VERSION in
6*|7*)
export CPPFLAGS="$CPPFLAGS -DHAVE_SYS_EXEC_H=1"
;;
esac
export CPPFLAGS="-I/usr/include/gssapi $CPPFLAGS"
./build-helper.sh cvs %N %v %r make -f admin/Makefile.common cvs
./build-helper.sh configure %N %v %r ./configure %c $CONFIGURE_PARAMS
perl -pi -e 's/-Xlinker -framework -Xlinker /-Wl,-framework,/g' Makefile
perl -pi -e 's/-framework /-Wl,-framework,/g' Makefile
perl -pi -e 's/-weak_framework /-Wl,-weak_framework,/g' Makefile
./build-helper.sh make %N %v %r make
fink-package-precedence --prohibit-bdep %N-dev .
<<
InstallScript: <<
#!/bin/sh -ev
export PREFIX="%p" USE_UNSERMAKE=0
. ./environment-helper.sh
./build-helper.sh install %N %v %r make -p -j1 install DESTDIR=%d
cat <
#!/bin/sh
if [ \`id -un\` != 'root' ]; then
echo "you must run this script as root!"
echo ""
exit 1
fi
ENV="env KDEDIR= KDEDIRS= HOME=/tmp XDG_CACHE_HOME=/tmp/kb/cache XDG_CONFIG_HOME=/tmp/kb/config XDG_DATA_HOME=/tmp/kb/share HISTFILE=/tmp/kb/.bash_history USER=root LOGNAME=root"
\$ENV %p/bin/update-mime-database %p/share/mime
\$ENV %p/bin/kbuildsycoca --global --noincremental --nosignal
END
chmod 755 %i/bin/kde-update-caches.sh
rm -rf %i/share/icons/hicolor/index.theme
install -c -m 644 darwin/* %i/share/config
mkdir -p %i/share/doc/installed-packages
touch %i/share/doc/installed-packages/%N
touch %i/share/doc/installed-packages/kdelibs3
touch %i/share/doc/installed-packages/kdelibs3-shlibs
touch %i/share/doc/installed-packages/kdelibs3-dev
touch %i/share/doc/installed-packages/kdelibs3-ssl
touch %i/share/doc/installed-packages/kdelibs3-ssl-shlibs
touch %i/share/doc/installed-packages/kdelibs3-ssl-dev
<<
DocFiles: COPYING COPYING.LIB INSTALL
RuntimeVars: KDEDIR: %p
SplitOff: <<
Package: %N-shlibs
Description: KDE - essential shared libraries
Depends: <<
arts-shlibs (>= 1.5.10-10),
aspell-shlibs,
audiofile-shlibs (>= 0.2.6-11),
bzip2-shlibs,
dbus-shlibs (>= 1.2.12-1),
dbus-qt3-shlibs,
esound-shlibs,
expat1-shlibs,
freetype219-shlibs (>= 2.3.12-1),
glib2-shlibs (>= 2.22.0-1),
libart2-shlibs (>= 2.3.20-1),
libgettext8-shlibs,
libiconv,
libidn-shlibs (>= 0.5.1-1),
libjpeg8-shlibs,
libmad-shlibs,
libogg-shlibs,
libpng14-shlibs (>= 1.4.1-2),
libthai-shlibs,
libtiff-shlibs,
libvorbis0-shlibs,
libxml2-shlibs (>= 2.6.32-1),
libxslt-shlibs (>= 1.0.27-1),
macosx (>= 10.4.3-1),
openslp-ssl-shlibs | openslp-shlibs,
pcre-shlibs,
qt3-shlibs (>= 3.3.8-2000),
xdg-base,
x11-shlibs,
xft2-shlibs (>= 2.1.14-3)
<<
Replaces: <<
kdelibs3-dev,
kdelibs3-ssl-dev,
kdelibs3,
kdelibs3-ssl,
kdelibs3-shlibs,
kdelibs3-ssl-shlibs,
kdepim3-common (<< 3.3.1-1),
kde-extra-themes (<< 3.4.0-1),
%N (<< %v-%r)
<<
Recommends: %N (>= %v-%r)
Files: <<
lib/kde3/kabc*.so
lib/kde3/kbzip2filter.so
lib/kde3/kcm_*.so
lib/kde3/kded_*.so
lib/kde3/kdeprint*.so
lib/kde3/kfile*.so
lib/kde3/kgzipfilter.so
lib/kde3/khtml*part.so
lib/kde3/kimg*.so
lib/kde3/kio_file.so
lib/kde3/kio_ftp.so
lib/kde3/kio_*help.so
lib/kde3/kio_http.so
lib/kde3/kio_meta*.so
lib/kde3/kjava*.so
lib/kde3/knotify*.so
lib/kde3/kspell*.so
lib/kde3/kstyle*.so
lib/kde3/ktexteditor*.so
lib/kde3/libkdeprint*.so
lib/kde3/lib*part.so
lib/kde3/plugins/designer/*.so
lib/kde3/plugins/styles/*.so
lib/kde3/*shellscript*.so
lib/libDCOP.*.dylib
lib/libartskde.*.dylib
lib/libkabc.*.dylib
lib/libkabc_dir.*.dylib
lib/libkabc_file.*.dylib
lib/libkabc_ldapkio.*.dylib
lib/libkatepartinterfaces.*.dylib
lib/libkdecore.*.dylib
lib/libkdefakes.*.dylib
lib/libkdefx.*.dylib
lib/libkdeprint.*.dylib
lib/libkdeprint_management.*.dylib
lib/libkdesasl.*.dylib
lib/libkdesu.*.dylib
lib/libkdeui.*.dylib
lib/libkdnssd.*.dylib
lib/libkhtml.*.dylib
lib/libkimproxy.*.dylib
lib/libkio.*.dylib
lib/libkjava.*.dylib
lib/libkjs.*.dylib
lib/libkmdi.*.dylib
lib/libkmdi2.*.dylib
lib/libkmediaplayer.*.dylib
lib/libkmid.*.dylib
lib/libknewstuff.*.dylib
lib/libkntlm.*.dylib
lib/libkparts.*.dylib
lib/libkresources.*.dylib
lib/libkscreensaver.*.dylib
lib/libkscript.*.dylib
lib/libkspell.*.dylib
lib/libkspell2.*.dylib
lib/libktexteditor.*.dylib
lib/libkunittest.*.dylib
lib/libkutils.*.dylib
lib/libkwalletbackend.*.dylib
lib/libkwalletclient.*.dylib
lib/libvcard.*.dylib
<<
Shlibs: <<
%p/lib/libDCOP.4.dylib 7.0.0 %N-shlibs (>= 3.4.0-1)
%p/lib/libartskde.1.dylib 4.0.0 %N-shlibs (>= 3.4.0-1)
%p/lib/libkabc.1.dylib 4.0.0 %N-shlibs (>= 3.4.0-1)
%p/lib/libkabc_dir.1.dylib 2.0.0 %N-shlibs (>= 3.4.0-1)
%p/lib/libkabc_file.1.dylib 2.0.0 %N-shlibs (>= 3.4.0-1)
%p/lib/libkabc_ldapkio.1.dylib 2.0.0 %N-shlibs (>= 3.4.0-1)
%p/lib/libkatepartinterfaces.0.dylib 1.0.0 %N-shlibs (>= 3.4.0-1)
%p/lib/libkdecore.4.dylib 7.0.0 %N-shlibs (>= 3.4.0-1)
%p/lib/libkdefakes.4.dylib 7.0.0 %N-shlibs (>= 3.4.0-1)
%p/lib/libkdefx.4.dylib 7.0.0 %N-shlibs (>= 3.4.0-1)
%p/lib/libkdeprint.4.dylib 7.0.0 %N-shlibs (>= 3.4.0-1)
%p/lib/libkdeprint_management.4.dylib 7.0.0 %N-shlibs (>= 3.4.0-1)
%p/lib/libkdesasl.1.dylib 4.0.0 %N-shlibs (>= 3.4.0-1)
%p/lib/libkdesu.4.dylib 7.0.0 %N-shlibs (>= 3.4.0-1)
%p/lib/libkdeui.4.dylib 7.0.0 %N-shlibs (>= 3.4.0-1)
%p/lib/libkdnssd.1.dylib 2.0.0 %N-shlibs (>= 3.4.0-1)
%p/lib/libkhtml.4.dylib 7.0.0 %N-shlibs (>= 3.4.0-1)
%p/lib/libkimproxy.0.dylib 1.0.0 %N-shlibs (>= 3.4.0-1)
%p/lib/libkio.4.dylib 7.0.0 %N-shlibs (>= 3.4.0-1)
%p/lib/libkjava.1.dylib 2.0.0 %N-shlibs (>= 3.4.0-1)
%p/lib/libkjs.1.dylib 4.0.0 %N-shlibs (>= 3.4.0-1)
%p/lib/libkmdi.1.dylib 2.0.0 %N-shlibs (>= 3.4.0-1)
%p/lib/libkmdi2.1.dylib 2.0.0 %N-shlibs (>= 3.4.0-1)
%p/lib/libkmediaplayer.0.dylib 1.0.0 %N-shlibs (>= 3.4.0-1)
%p/lib/libkmid.0.dylib 1.0.0 %N-shlibs (>= 3.4.0-1)
%p/lib/libknewstuff.1.dylib 2.0.0 %N-shlibs (>= 3.4.0-1)
%p/lib/libkntlm.0.dylib 1.0.0 %N-shlibs (>= 3.4.0-1)
%p/lib/libkparts.2.dylib 4.0.0 %N-shlibs (>= 3.4.0-1)
%p/lib/libkresources.1.dylib 4.0.0 %N-shlibs (>= 3.4.0-1)
%p/lib/libkscreensaver.4.dylib 7.0.0 %N-shlibs (>= 3.4.0-1)
%p/lib/libkscript.0.dylib 1.0.0 %N-shlibs (>= 3.4.0-1)
%p/lib/libkspell.4.dylib 7.0.0 %N-shlibs (>= 3.4.0-1)
%p/lib/libkspell2.1.dylib 2.0.0 %N-shlibs (>= 3.4.0-1)
%p/lib/libktexteditor.0.dylib 1.0.0 %N-shlibs (>= 3.4.0-1)
%p/lib/libkutils.1.dylib 4.0.0 %N-shlibs (>= 3.4.0-1)
%p/lib/libkunittest.1.dylib 2.0.0 %N-shlibs (>= 3.5.0-1)
%p/lib/libkwalletbackend.1.dylib 2.0.0 %N-shlibs (>= 3.4.0-1)
%p/lib/libkwalletclient.1.dylib 2.0.0 %N-shlibs (>= 3.4.0-1)
%p/lib/libvcard.0.dylib 1.0.0 %N-shlibs (>= 3.4.0-1)
<<
DescUsage: <<
---[ Installation ]---------------------------------------------------
To install all of the official KDE packages, install "bundle-kde" or
"bundle-kde-ssl" (depending on whether crypotgraphic laws permit
downloading strong cryptography). Unless you have a specific reason
not to, "bundle-kde-ssl" is suggested.
---[ Configuration ]--------------------------------------------------
To use KDE as your windowing system in XDarwin, create a file called
".xinitrc" in your home directory, containing the following line:
/sw/bin/startkde >/tmp/kde.log 2>&1
See http://fink.sourceforge.net/doc/x11/run-xfree86.php#xinitrc
for more information on the xinitrc files and how they work.
If you want to use Apple's X11 instead of the KDE window manager,
put the following line before the startkde line in .xinitrc:
export KDEWM=quartz-wm
If you want to disable quartz-wm even for clipboard synchronization
(proxying), put the following line before the startkde line in
.xinitrc:
export DISABLE_PROXY=1
---[ Startup ]--------------------------------------------------------
Once you have created an ~/.xinitrc file, you should be able to start
KDE by clicking on the "XDarwin" icon in your Applications folder.
NOTE: By default, X11 on Mac OS X runs in "rootless" mode, generally.
If you run KDE in rootless mode, it will take over your desktop with
a window that covers everything up. You can remove this by disabling
desktop icons in the KDE control center. Open the control center
(either from the "K" menu bar, or by typing "kcontrol" in an xterm)
then expand the "Desktop" list, click "Behavior", and uncheck the
"Show icons on desktop" checkbox.
---[ Removal ]--------------------------------------------------------
To remove all of the official KDE packages, you can remove the KDE
libraries and anything that depends on them by running, in a terminal:
sudo apt-get remove kdelibs3-unified-shlibs
To remove an individual KDE package collection (like kdenetwork3 or
kdesdk3) you can generally remove [package]-base. For example, to
remove all of the kdenetwork3 packages, run:
sudo apt-get remove kdenetwork3-base
<<
<<
SplitOff2: <<
Package: %N-dev
Description: KDE - essential development libraries and headers
Depends: <<
%N-shlibs (>= %v-%r),
%N (>= %v-%r)
<<
Replaces: <<
kdelibs3-ssl,
kdelibs3-ssl-dev,
kdelibs3,
kdelibs3-dev,
kde-icons-crystal,
keramik,
kdeartwork3 (<< %v-1),
kdebase3-dev,
kdebase3-ssl-dev,
kdepim3-dev (<< 3.4.0-1),
kdepim3-common (<< 3.4.0-1),
%N (<< %v-%r)
<<
Recommends: <<
arts-dev (>= 1.5.10-10),
audiofile,
cups-dev,
doxygen,
esound,
fink (>= 0.29.7-1),
flex-devel,
libart2,
libjpeg8,
libogg,
libpng14 (>= 1.4.1-2),
libtiff,
libvorbis0,
libxml2,
libxslt,
libmad,
openslp-ssl-dev | openslp-dev,
pcre,
pcre-bin,
qt3 (>= 3.3.8-2000),
qt3-doc
<<
BuildDependsOnly: true
Files: <<
bin/dcopidl*
bin/meinproc
include
lib/*.la
lib/*.a
lib/libDCOP.dylib
lib/libartskde.dylib
lib/libkabc*.dylib
lib/libkate*.dylib
lib/libkdecore.dylib
lib/libkdefakes.dylib
lib/libkdefx.dylib
lib/libkdeprint.dylib
lib/libkdeprint_management.dylib
lib/libkdesasl.dylib
lib/libkdesu.dylib
lib/libkdeui.dylib
lib/libkdnssd.dylib
lib/libkhtml.dylib
lib/libkimproxy.dylib
lib/libkio.dylib
lib/libkjava.dylib
lib/libkjs.dylib
lib/libkmdi.dylib
lib/libkmdi2.dylib
lib/libkmediaplayer.dylib
lib/libkmid.dylib
lib/libknewstuff.dylib
lib/libkntlm.dylib
lib/libkparts.dylib
lib/libkresources.dylib
lib/libkscreensaver.dylib
lib/libkscript.dylib
lib/libkspell.dylib
lib/libkspell2.dylib
lib/libktexteditor.dylib
lib/libkutils.dylib
lib/libkunittest.dylib
lib/libvcard.dylib
lib/libkwallet*.dylib
share/apps/dcopidlng
<<
DescUsage: <<
---[ Installation ]---------------------------------------------------
To install all of the official KDE packages, install "bundle-kde" or
"bundle-kde-ssl" (depending on whether crypotgraphic laws permit
downloading strong cryptography). Unless you have a specific reason
not to, "bundle-kde-ssl" is suggested.
---[ Configuration ]--------------------------------------------------
To use KDE as your windowing system in XDarwin, create a file called
".xinitrc" in your home directory, containing the following line:
/sw/bin/startkde >/tmp/kde.log 2>&1
See http://fink.sourceforge.net/doc/x11/run-xfree86.php#xinitrc
for more information on the xinitrc files and how they work.
If you want to use Apple's X11 instead of the KDE window manager,
put the following line before the startkde line in .xinitrc:
export KDEWM=quartz-wm
If you want to disable quartz-wm even for clipboard synchronization
(proxying), put the following line before the startkde line in
.xinitrc:
export DISABLE_PROXY=1
---[ Startup ]--------------------------------------------------------
Once you have created an ~/.xinitrc file, you should be able to start
KDE by clicking on the "XDarwin" icon in your Applications folder.
NOTE: By default, X11 on Mac OS X runs in "rootless" mode, generally.
If you run KDE in rootless mode, it will take over your desktop with
a window that covers everything up. You can remove this by disabling
desktop icons in the KDE control center. Open the control center
(either from the "K" menu bar, or by typing "kcontrol" in an xterm)
then expand the "Desktop" list, click "Behavior", and uncheck the
"Show icons on desktop" checkbox.
---[ Removal ]--------------------------------------------------------
To remove all of the official KDE packages, you can remove the KDE
libraries and anything that depends on them by running, in a terminal:
sudo apt-get remove kdelibs3-unified-shlibs
To remove an individual KDE package collection (like kdenetwork3 or
kdesdk3) you can generally remove [package]-base. For example, to
remove all of the kdenetwork3 packages, run:
sudo apt-get remove kdenetwork3-base
<<
<<
SplitOff3: <<
Package: kdelibs3
Depends: <<
%N (= %v-%r),
fink (>= 0.29.7-1),
fink-obsolete-packages
<<
Files: share/doc/installed-packages/%n
DescUsage: <<
---[ Installation ]---------------------------------------------------
To install all of the official KDE packages, install "bundle-kde" or
"bundle-kde-ssl" (depending on whether crypotgraphic laws permit
downloading strong cryptography). Unless you have a specific reason
not to, "bundle-kde-ssl" is suggested.
---[ Configuration ]--------------------------------------------------
To use KDE as your windowing system in XDarwin, create a file called
".xinitrc" in your home directory, containing the following line:
/sw/bin/startkde >/tmp/kde.log 2>&1
See http://fink.sourceforge.net/doc/x11/run-xfree86.php#xinitrc
for more information on the xinitrc files and how they work.
If you want to use Apple's X11 instead of the KDE window manager,
put the following line before the startkde line in .xinitrc:
export KDEWM=quartz-wm
If you want to disable quartz-wm even for clipboard synchronization
(proxying), put the following line before the startkde line in
.xinitrc:
export DISABLE_PROXY=1
---[ Startup ]--------------------------------------------------------
Once you have created an ~/.xinitrc file, you should be able to start
KDE by clicking on the "XDarwin" icon in your Applications folder.
NOTE: By default, X11 on Mac OS X runs in "rootless" mode, generally.
If you run KDE in rootless mode, it will take over your desktop with
a window that covers everything up. You can remove this by disabling
desktop icons in the KDE control center. Open the control center
(either from the "K" menu bar, or by typing "kcontrol" in an xterm)
then expand the "Desktop" list, click "Behavior", and uncheck the
"Show icons on desktop" checkbox.
---[ Removal ]--------------------------------------------------------
To remove all of the official KDE packages, you can remove the KDE
libraries and anything that depends on them by running, in a terminal:
sudo apt-get remove kdelibs3-unified-shlibs
To remove an individual KDE package collection (like kdenetwork3 or
kdesdk3) you can generally remove [package]-base. For example, to
remove all of the kdenetwork3 packages, run:
sudo apt-get remove kdenetwork3-base
<<
<<
SplitOff4: <<
Package: kdelibs3-dev
Depends: <<
%N-dev (= %v-%r),
fink (>= 0.29.7-1),
fink-obsolete-packages
<<
BuildDependsOnly: true
Files: share/doc/installed-packages/%n
DescUsage: <<
---[ Installation ]---------------------------------------------------
To install all of the official KDE packages, install "bundle-kde" or
"bundle-kde-ssl" (depending on whether crypotgraphic laws permit
downloading strong cryptography). Unless you have a specific reason
not to, "bundle-kde-ssl" is suggested.
---[ Configuration ]--------------------------------------------------
To use KDE as your windowing system in XDarwin, create a file called
".xinitrc" in your home directory, containing the following line:
/sw/bin/startkde >/tmp/kde.log 2>&1
See http://fink.sourceforge.net/doc/x11/run-xfree86.php#xinitrc
for more information on the xinitrc files and how they work.
If you want to use Apple's X11 instead of the KDE window manager,
put the following line before the startkde line in .xinitrc:
export KDEWM=quartz-wm
If you want to disable quartz-wm even for clipboard synchronization
(proxying), put the following line before the startkde line in
.xinitrc:
export DISABLE_PROXY=1
---[ Startup ]--------------------------------------------------------
Once you have created an ~/.xinitrc file, you should be able to start
KDE by clicking on the "XDarwin" icon in your Applications folder.
NOTE: By default, X11 on Mac OS X runs in "rootless" mode, generally.
If you run KDE in rootless mode, it will take over your desktop with
a window that covers everything up. You can remove this by disabling
desktop icons in the KDE control center. Open the control center
(either from the "K" menu bar, or by typing "kcontrol" in an xterm)
then expand the "Desktop" list, click "Behavior", and uncheck the
"Show icons on desktop" checkbox.
---[ Removal ]--------------------------------------------------------
To remove all of the official KDE packages, you can remove the KDE
libraries and anything that depends on them by running, in a terminal:
sudo apt-get remove kdelibs3-unified-shlibs
To remove an individual KDE package collection (like kdenetwork3 or
kdesdk3) you can generally remove [package]-base. For example, to
remove all of the kdenetwork3 packages, run:
sudo apt-get remove kdenetwork3-base
<<
<<
SplitOff5: <<
Package: kdelibs3-shlibs
Depends: <<
%N-shlibs (= %v-%r),
fink (>= 0.29.7-1),
fink-obsolete-packages
<<
Files: share/doc/installed-packages/%n
DescUsage: <<
---[ Installation ]---------------------------------------------------
To install all of the official KDE packages, install "bundle-kde" or
"bundle-kde-ssl" (depending on whether crypotgraphic laws permit
downloading strong cryptography). Unless you have a specific reason
not to, "bundle-kde-ssl" is suggested.
---[ Configuration ]--------------------------------------------------
To use KDE as your windowing system in XDarwin, create a file called
".xinitrc" in your home directory, containing the following line:
/sw/bin/startkde >/tmp/kde.log 2>&1
See http://fink.sourceforge.net/doc/x11/run-xfree86.php#xinitrc
for more information on the xinitrc files and how they work.
If you want to use Apple's X11 instead of the KDE window manager,
put the following line before the startkde line in .xinitrc:
export KDEWM=quartz-wm
If you want to disable quartz-wm even for clipboard synchronization
(proxying), put the following line before the startkde line in
.xinitrc:
export DISABLE_PROXY=1
---[ Startup ]--------------------------------------------------------
Once you have created an ~/.xinitrc file, you should be able to start
KDE by clicking on the "XDarwin" icon in your Applications folder.
NOTE: By default, X11 on Mac OS X runs in "rootless" mode, generally.
If you run KDE in rootless mode, it will take over your desktop with
a window that covers everything up. You can remove this by disabling
desktop icons in the KDE control center. Open the control center
(either from the "K" menu bar, or by typing "kcontrol" in an xterm)
then expand the "Desktop" list, click "Behavior", and uncheck the
"Show icons on desktop" checkbox.
---[ Removal ]--------------------------------------------------------
To remove all of the official KDE packages, you can remove the KDE
libraries and anything that depends on them by running, in a terminal:
sudo apt-get remove kdelibs3-unified-shlibs
To remove an individual KDE package collection (like kdenetwork3 or
kdesdk3) you can generally remove [package]-base. For example, to
remove all of the kdenetwork3 packages, run:
sudo apt-get remove kdenetwork3-base
<<
<<
SplitOff6: <<
Package: kdelibs3-ssl
Depends: <<
%N (= %v-%r),
fink (>= 0.29.7-1),
fink-obsolete-packages
<<
Files: share/doc/installed-packages/%n
DescUsage: <<
---[ Installation ]---------------------------------------------------
To install all of the official KDE packages, install "bundle-kde" or
"bundle-kde-ssl" (depending on whether crypotgraphic laws permit
downloading strong cryptography). Unless you have a specific reason
not to, "bundle-kde-ssl" is suggested.
---[ Configuration ]--------------------------------------------------
To use KDE as your windowing system in XDarwin, create a file called
".xinitrc" in your home directory, containing the following line:
/sw/bin/startkde >/tmp/kde.log 2>&1
See http://fink.sourceforge.net/doc/x11/run-xfree86.php#xinitrc
for more information on the xinitrc files and how they work.
If you want to use Apple's X11 instead of the KDE window manager,
put the following line before the startkde line in .xinitrc:
export KDEWM=quartz-wm
If you want to disable quartz-wm even for clipboard synchronization
(proxying), put the following line before the startkde line in
.xinitrc:
export DISABLE_PROXY=1
---[ Startup ]--------------------------------------------------------
Once you have created an ~/.xinitrc file, you should be able to start
KDE by clicking on the "XDarwin" icon in your Applications folder.
NOTE: By default, X11 on Mac OS X runs in "rootless" mode, generally.
If you run KDE in rootless mode, it will take over your desktop with
a window that covers everything up. You can remove this by disabling
desktop icons in the KDE control center. Open the control center
(either from the "K" menu bar, or by typing "kcontrol" in an xterm)
then expand the "Desktop" list, click "Behavior", and uncheck the
"Show icons on desktop" checkbox.
---[ Removal ]--------------------------------------------------------
To remove all of the official KDE packages, you can remove the KDE
libraries and anything that depends on them by running, in a terminal:
sudo apt-get remove kdelibs3-unified-shlibs
To remove an individual KDE package collection (like kdenetwork3 or
kdesdk3) you can generally remove [package]-base. For example, to
remove all of the kdenetwork3 packages, run:
sudo apt-get remove kdenetwork3-base
<<
<<
SplitOff7: <<
Package: kdelibs3-ssl-dev
Depends: <<
%N-dev (= %v-%r),
fink (>= 0.29.7-1),
fink-obsolete-packages
<<
BuildDependsOnly: true
Files: share/doc/installed-packages/%n
DescUsage: <<
---[ Installation ]---------------------------------------------------
To install all of the official KDE packages, install "bundle-kde" or
"bundle-kde-ssl" (depending on whether crypotgraphic laws permit
downloading strong cryptography). Unless you have a specific reason
not to, "bundle-kde-ssl" is suggested.
---[ Configuration ]--------------------------------------------------
To use KDE as your windowing system in XDarwin, create a file called
".xinitrc" in your home directory, containing the following line:
/sw/bin/startkde >/tmp/kde.log 2>&1
See http://fink.sourceforge.net/doc/x11/run-xfree86.php#xinitrc
for more information on the xinitrc files and how they work.
If you want to use Apple's X11 instead of the KDE window manager,
put the following line before the startkde line in .xinitrc:
export KDEWM=quartz-wm
If you want to disable quartz-wm even for clipboard synchronization
(proxying), put the following line before the startkde line in
.xinitrc:
export DISABLE_PROXY=1
---[ Startup ]--------------------------------------------------------
Once you have created an ~/.xinitrc file, you should be able to start
KDE by clicking on the "XDarwin" icon in your Applications folder.
NOTE: By default, X11 on Mac OS X runs in "rootless" mode, generally.
If you run KDE in rootless mode, it will take over your desktop with
a window that covers everything up. You can remove this by disabling
desktop icons in the KDE control center. Open the control center
(either from the "K" menu bar, or by typing "kcontrol" in an xterm)
then expand the "Desktop" list, click "Behavior", and uncheck the
"Show icons on desktop" checkbox.
---[ Removal ]--------------------------------------------------------
To remove all of the official KDE packages, you can remove the KDE
libraries and anything that depends on them by running, in a terminal:
sudo apt-get remove kdelibs3-unified-shlibs
To remove an individual KDE package collection (like kdenetwork3 or
kdesdk3) you can generally remove [package]-base. For example, to
remove all of the kdenetwork3 packages, run:
sudo apt-get remove kdenetwork3-base
<<
<<
SplitOff8: <<
Package: kdelibs3-ssl-shlibs
Depends: <<
%N-shlibs (= %v-%r),
fink (>= 0.29.7-1),
fink-obsolete-packages
<<
Files: share/doc/installed-packages/%n
DescUsage: <<
---[ Installation ]---------------------------------------------------
To install all of the official KDE packages, install "bundle-kde" or
"bundle-kde-ssl" (depending on whether crypotgraphic laws permit
downloading strong cryptography). Unless you have a specific reason
not to, "bundle-kde-ssl" is suggested.
---[ Configuration ]--------------------------------------------------
To use KDE as your windowing system in XDarwin, create a file called
".xinitrc" in your home directory, containing the following line:
/sw/bin/startkde >/tmp/kde.log 2>&1
See http://fink.sourceforge.net/doc/x11/run-xfree86.php#xinitrc
for more information on the xinitrc files and how they work.
If you want to use Apple's X11 instead of the KDE window manager,
put the following line before the startkde line in .xinitrc:
export KDEWM=quartz-wm
If you want to disable quartz-wm even for clipboard synchronization
(proxying), put the following line before the startkde line in
.xinitrc:
export DISABLE_PROXY=1
---[ Startup ]--------------------------------------------------------
Once you have created an ~/.xinitrc file, you should be able to start
KDE by clicking on the "XDarwin" icon in your Applications folder.
NOTE: By default, X11 on Mac OS X runs in "rootless" mode, generally.
If you run KDE in rootless mode, it will take over your desktop with
a window that covers everything up. You can remove this by disabling
desktop icons in the KDE control center. Open the control center
(either from the "K" menu bar, or by typing "kcontrol" in an xterm)
then expand the "Desktop" list, click "Behavior", and uncheck the
"Show icons on desktop" checkbox.
---[ Removal ]--------------------------------------------------------
To remove all of the official KDE packages, you can remove the KDE
libraries and anything that depends on them by running, in a terminal:
sudo apt-get remove kdelibs3-unified-shlibs
To remove an individual KDE package collection (like kdenetwork3 or
kdesdk3) you can generally remove [package]-base. For example, to
remove all of the kdenetwork3 packages, run:
sudo apt-get remove kdenetwork3-base
<<
<<
Shlibs: <<
!%p/lib/libkdeinit_cupsdconf.dylib
!%p/lib/libkdeinit_dcopserver.dylib
!%p/lib/libkdeinit_kaddprinterwizard.dylib
!%p/lib/libkdeinit_kbuildsycoca.dylib
!%p/lib/libkdeinit_kcmshell.dylib
!%p/lib/libkdeinit_kconf_update.dylib
!%p/lib/libkdeinit_kcookiejar.dylib
!%p/lib/libkdeinit_kded.dylib
!%p/lib/libkdeinit_kio_http_cache_cleaner.dylib
!%p/lib/libkdeinit_kio_uiserver.dylib
!%p/lib/libkdeinit_klauncher.dylib
<<
PostInstScript: <<
chmod u+s %p/bin/kgrantpty %p/bin/kpac_dhcp_helper %p/bin/fileshareset
if [ -e "%p/etc/xdg/menus/applications.menu" ] && [ ! -L "%p/etc/xdg/menus/applications.menu" ]; then
mv "%p/etc/xdg/menus/applications.menu" "%p/etc/xdg/menus/applications.menu.bak"
fi
update-alternatives --install "%p/etc/xdg/menus/applications.menu" "applications.menu" "%p/etc/xdg/menus/kde-applications.menu" 10
%p/bin/kde-update-caches.sh >/dev/null 2>&1 || :
<<
PostRmScript: <<
if [ -e "%p/etc/xdg/menus/applications.menu" ] && [ ! -L "%p/etc/xdg/menus/applications.menu" ]; then
mv "%p/etc/xdg/menus/applications.menu" "%p/etc/xdg/menus/applications.menu.bak"
fi
update-alternatives --remove "applications.menu" "%p/etc/xdg/menus/kde-applications.menu"
<<
DescUsage: <<
---[ Installation ]---------------------------------------------------
To install all of the official KDE packages, install "bundle-kde" or
"bundle-kde-ssl" (depending on whether crypotgraphic laws permit
downloading strong cryptography). Unless you have a specific reason
not to, "bundle-kde-ssl" is suggested.
---[ Configuration ]--------------------------------------------------
To use KDE as your windowing system in XDarwin, create a file called
".xinitrc" in your home directory, containing the following line:
/sw/bin/startkde >/tmp/kde.log 2>&1
See http://fink.sourceforge.net/doc/x11/run-xfree86.php#xinitrc
for more information on the xinitrc files and how they work.
If you want to use Apple's X11 instead of the KDE window manager,
put the following line before the startkde line in .xinitrc:
export KDEWM=quartz-wm
If you want to disable quartz-wm even for clipboard synchronization
(proxying), put the following line before the startkde line in
.xinitrc:
export DISABLE_PROXY=1
---[ Startup ]--------------------------------------------------------
Once you have created an ~/.xinitrc file, you should be able to start
KDE by clicking on the "XDarwin" icon in your Applications folder.
NOTE: By default, X11 on Mac OS X runs in "rootless" mode, generally.
If you run KDE in rootless mode, it will take over your desktop with
a window that covers everything up. You can remove this by disabling
desktop icons in the KDE control center. Open the control center
(either from the "K" menu bar, or by typing "kcontrol" in an xterm)
then expand the "Desktop" list, click "Behavior", and uncheck the
"Show icons on desktop" checkbox.
---[ Removal ]--------------------------------------------------------
To remove all of the official KDE packages, you can remove the KDE
libraries and anything that depends on them by running, in a terminal:
sudo apt-get remove kdelibs3-unified-shlibs
To remove an individual KDE package collection (like kdenetwork3 or
kdesdk3) you can generally remove [package]-base. For example, to
remove all of the kdenetwork3 packages, run:
sudo apt-get remove kdenetwork3-base
<<
<<
diff -Nurd kdelibs-3.5.10/arts/kde/Makefile.am kdelibs-3.5.10-new/arts/kde/Makefile.am
--- kdelibs-3.5.10/arts/kde/Makefile.am 2005-09-10 04:26:36.000000000 -0400
+++ kdelibs-3.5.10-new/arts/kde/Makefile.am 2010-05-12 10:53:57.000000000 -0400
@@ -8,7 +8,7 @@
kartsserver.cpp kdatarequest_impl.cpp kaudioconverter.cc \
kvideowidget.cpp kplayobjectcreator.cc \
kaudiomanagerplay.cpp
-libartskde_la_LIBADD = $(LIB_KIO) -lqtmcop -lsoundserver_idl
+libartskde_la_LIBADD = $(LIB_KIO) -lartsflow -lartsflow_idl -lmcop -lqtmcop -lsoundserver_idl -lkmedia2 -lkmedia2_idl
libartskde_la_LDFLAGS = $(all_libraries) -no-undefined -version-info 3:0:2
libartskde_la_METASOURCES = AUTO
libartskde_la_COMPILE_FIRST = artskde.h
diff -Nurd kdelibs-3.5.10/darwin/kcmartsrc kdelibs-3.5.10-new/darwin/kcmartsrc
--- kdelibs-3.5.10/darwin/kcmartsrc 1969-12-31 19:00:00.000000000 -0500
+++ kdelibs-3.5.10-new/darwin/kcmartsrc 2010-05-12 10:53:57.000000000 -0400
@@ -0,0 +1,9 @@
+[Arts]
+Arguments=\s-F 10 -S 4096 -a esd -d -b 16 -s 60 -m artsmessage -c drkonqi -l 3 -f
+Bits=16
+FullDuplex=true
+AudioIO=esd
+NetworkTransparent=true
+StartRealtime=false
+StartServer=false
+SuspendTime=60
diff -Nurd kdelibs-3.5.10/darwin/kdeglobals kdelibs-3.5.10-new/darwin/kdeglobals
--- kdelibs-3.5.10/darwin/kdeglobals 1969-12-31 19:00:00.000000000 -0500
+++ kdelibs-3.5.10-new/darwin/kdeglobals 2010-05-12 10:53:57.000000000 -0400
@@ -0,0 +1,129 @@
+[$Version]
+update_info=kaccel.upd:kde3.3/r1,kded.upd:kde3.0,klippershortcuts.upd:04112002,kwin.upd:kde3.2Xinerama,socks.upd:kde3.0/r1
+
+[General]
+XftHintStyle=hintmedium
+XftSubPixel=
+fixed=Monaco CY,11,-1,5,50,0,0,0,0,0
+font=Baghdad,12,-1,5,50,0,0,0,0,0
+menuFont=Baghdad,12,-1,5,50,0,0,0,0,0
+taskbarFont=Baghdad,11,-1,5,50,0,0,0,0,0
+toolBarFont=Baghdad,10,-1,5,50,0,0,0,0,0
+
+[Global Shortcuts]
+Activate Window Demanding Attention=default(Alt+Ctrl+A)
+Defaults timestamp=Mar 1 200514:10:32
+Desktop Screenshot=default(Ctrl+Print)
+Enable/Disable Clipboard Actions=default(Alt+Ctrl+X)
+Halt without Confirmation=default(Alt+Ctrl+Shift+PageDown)
+Kill Window=default(Alt+Ctrl+Escape)
+Lock Session=default(Alt+Ctrl+L)
+Log Out=default(Alt+Ctrl+Delete)
+Log Out Without Confirmation=default(Alt+Ctrl+Shift+Delete)
+Manually Invoke Action on Current Clipboard=default(Alt+Ctrl+R)
+Mouse Emulation=default(Alt+F12)
+Next Taskbar Entry=none
+Popup Launch Menu=default(Alt+F1)
+Previous Taskbar Entry=none
+Reboot without Confirmation=default(Alt+Ctrl+Shift+PageUp)
+Run Command=default(Alt+F2)
+Setup Window Shortcut=none
+Show Klipper Popup-Menu=default(Alt+Ctrl+V)
+Show Taskmanager=default(Ctrl+Escape)
+Show Window List=default(Alt+F5)
+Switch One Desktop Down=none
+Switch One Desktop Up=none
+Switch One Desktop to the Left=none
+Switch One Desktop to the Right=none
+Switch User=default(Alt+Ctrl+Insert)
+Switch to Desktop 1=default(Ctrl+F1)
+Switch to Desktop 10=default(Ctrl+F10)
+Switch to Desktop 11=default(Ctrl+F11)
+Switch to Desktop 12=default(Ctrl+F12)
+Switch to Desktop 13=default(Ctrl+Shift+F1)
+Switch to Desktop 14=default(Ctrl+Shift+F2)
+Switch to Desktop 15=default(Ctrl+Shift+F3)
+Switch to Desktop 16=default(Ctrl+Shift+F4)
+Switch to Desktop 17=default(Ctrl+Shift+F5)
+Switch to Desktop 18=default(Ctrl+Shift+F6)
+Switch to Desktop 19=default(Ctrl+Shift+F7)
+Switch to Desktop 2=default(Ctrl+F2)
+Switch to Desktop 20=default(Ctrl+Shift+F8)
+Switch to Desktop 3=default(Ctrl+F3)
+Switch to Desktop 4=default(Ctrl+F4)
+Switch to Desktop 5=default(Ctrl+F5)
+Switch to Desktop 6=default(Ctrl+F6)
+Switch to Desktop 7=default(Ctrl+F7)
+Switch to Desktop 8=default(Ctrl+F8)
+Switch to Desktop 9=default(Ctrl+F9)
+Switch to Next Desktop=none
+Switch to Next Keyboard Layout=default(Alt+Ctrl+K)
+Switch to Previous Desktop=none
+Toggle Showing Desktop=default(Alt+Ctrl+D)
+Toggle Window Raise/Lower=none
+Walk Through Desktop List=default(Ctrl+Tab)
+Walk Through Desktop List (Reverse)=default(Ctrl+Shift+Tab)
+Walk Through Desktops=none
+Walk Through Desktops (Reverse)=none
+Walk Through Windows=default(Alt+Tab)
+Walk Through Windows (Reverse)=default(Alt+Shift+Tab)
+Window Above Other Windows=none
+Window Below Other Windows=none
+Window Close=default(Alt+F4)
+Window Fullscreen=none
+Window Grow Horizontal=none
+Window Grow Vertical=none
+Window Lower=none
+Window Maximize=none
+Window Maximize Horizontal=none
+Window Maximize Vertical=none
+Window Minimize=none
+Window Move=none
+Window No Border=none
+Window On All Desktops=none
+Window One Desktop Down=none
+Window One Desktop Up=none
+Window One Desktop to the Left=none
+Window One Desktop to the Right=none
+Window Operations Menu=default(Alt+F3)
+Window Pack Down=none
+Window Pack Left=none
+Window Pack Right=none
+Window Pack Up=none
+Window Raise=none
+Window Resize=none
+Window Screenshot=default(Alt+Print)
+Window Shade=none
+Window Shrink Horizontal=none
+Window Shrink Vertical=none
+Window to Desktop 1=none
+Window to Desktop 10=none
+Window to Desktop 11=none
+Window to Desktop 12=none
+Window to Desktop 13=none
+Window to Desktop 14=none
+Window to Desktop 15=none
+Window to Desktop 16=none
+Window to Desktop 17=none
+Window to Desktop 18=none
+Window to Desktop 19=none
+Window to Desktop 2=none
+Window to Desktop 20=none
+Window to Desktop 3=none
+Window to Desktop 4=none
+Window to Desktop 5=none
+Window to Desktop 6=none
+Window to Desktop 7=none
+Window to Desktop 8=none
+Window to Desktop 9=none
+Window to Next Desktop=none
+Window to Previous Desktop=none
+
+[KDE]
+ShowDeleteCommand=false
+
+[Paths]
+Trash=$HOME/Desktop/.Trash/
+
+[WM]
+activeFont=Baghdad,12,-1,5,50,0,0,0,0,0
diff -Nurd kdelibs-3.5.10/darwin/knotifyrc kdelibs-3.5.10-new/darwin/knotifyrc
--- kdelibs-3.5.10/darwin/knotifyrc 1969-12-31 19:00:00.000000000 -0500
+++ kdelibs-3.5.10-new/darwin/knotifyrc 2010-05-12 10:53:57.000000000 -0400
@@ -0,0 +1,5 @@
+[Misc]
+External player=@FINKPREFIX@/bin/mplayer
+LastConfiguredApp=knotify
+Use external player=false
+Volume=100
diff -Nurd kdelibs-3.5.10/darwin/konsolerc kdelibs-3.5.10-new/darwin/konsolerc
--- kdelibs-3.5.10/darwin/konsolerc 1969-12-31 19:00:00.000000000 -0500
+++ kdelibs-3.5.10-new/darwin/konsolerc 2010-05-12 10:53:57.000000000 -0400
@@ -0,0 +1,19 @@
+[Desktop Entry]
+ActiveSession=0
+AutoResizeTabs=false
+DefaultSession=shell.desktop
+DynamicTabHide=false
+Fullscreen=false
+Height 832=510
+TabViewMode=0
+Width 1280=927
+bellmode=0
+class=konsole-mainwindow#1
+defaultfont=Monaco CY,12,-1,5,50,0,0,0,0,0
+font=8
+history=1000
+historyenabled=true
+keytab=default
+schema=Linux.schema
+scrollbar=2
+tabbar=2
diff -Nurd kdelibs-3.5.10/dcop/dcopc.c kdelibs-3.5.10-new/dcop/dcopc.c
--- kdelibs-3.5.10/dcop/dcopc.c 2006-05-22 14:14:21.000000000 -0400
+++ kdelibs-3.5.10-new/dcop/dcopc.c 2010-05-12 10:53:57.000000000 -0400
@@ -674,6 +674,9 @@
while((i = strchr(displayName, ':')) != NULL)
*i = '_';
+ while((i = strchr(displayName, '/')) != NULL)
+ *i = '_';
+
dcopServer = getenv("DCOPSERVER");
if (NULL == dcopServer) {
diff -Nurd kdelibs-3.5.10/dcop/dcopclient.cpp kdelibs-3.5.10-new/dcop/dcopclient.cpp
--- kdelibs-3.5.10/dcop/dcopclient.cpp 2007-10-08 05:52:08.000000000 -0400
+++ kdelibs-3.5.10-new/dcop/dcopclient.cpp 2010-05-12 10:53:57.000000000 -0400
@@ -270,6 +270,8 @@
{
while( (i = disp.find(KPATH_SEPARATOR)) >= 0)
disp[i] = '_';
+ while( (i = disp.find('/')) >= 0)
+ disp[i] = '_';
}
fName += "/.DCOPserver_";
diff -Nurd kdelibs-3.5.10/dcop/dcopserver_shutdown.c kdelibs-3.5.10-new/dcop/dcopserver_shutdown.c
--- kdelibs-3.5.10/dcop/dcopserver_shutdown.c 2005-10-10 11:06:13.000000000 -0400
+++ kdelibs-3.5.10-new/dcop/dcopserver_shutdown.c 2010-05-12 10:53:57.000000000 -0400
@@ -118,6 +118,8 @@
strncat(dcop_file_old,display, n);
while((i = strchr(display, ':')))
*i = '_';
+ while((i = strchr(display, '/')))
+ *i = '_';
strncat(dcop_file, display, n);
free(display);
diff -Nurd kdelibs-3.5.10/kdecore/Makefile.am kdelibs-3.5.10-new/kdecore/Makefile.am
--- kdelibs-3.5.10/kdecore/Makefile.am 2006-10-01 13:33:38.000000000 -0400
+++ kdelibs-3.5.10-new/kdecore/Makefile.am 2010-05-12 10:53:57.000000000 -0400
@@ -24,7 +24,7 @@
if include_SVGICONS
SVGICONS=svgicons
-SVGICON_LIB=svgicons/libkdesvgicons.la
+SVGICON_LIB=svgicons/libkdesvgicons.la $(LIBZ)
endif
SUBDIRS = malloc network $(SVGICONS) . kconfig_compiler tests
@@ -116,7 +116,7 @@
kqiodevicegzip_p.cpp ktimezones.cpp
libkdecore_la_LDFLAGS = $(QT_LDFLAGS) $(KDE_RPATH) $(KDE_MT_LDFLAGS) $(X_LDFLAGS) $(USER_LDFLAGS) -version-info 6:0:2 -no-undefined
-libkdecore_la_LIBADD = malloc/libklmalloc.la network/libkdecorenetwork.la $(SVGICON_LIB) ../dcop/libDCOP.la ../libltdl/libltdlc.la $(LIB_XEXT) $(LIBRESOLV) $(LIBUTIL) $(LIBART_LIBS) $(LIB_IDN) ../kdefx/libkdefx.la
+libkdecore_la_LIBADD = malloc/libklmalloc.la network/libkdecorenetwork.la $(SVGICON_LIB) ../dcop/libDCOP.la ../libltdl/libltdlc.la $(LIB_XEXT) $(LIBRESOLV) $(LIBUTIL) $(LIBART_LIBS) $(LIB_IDN) ../kdefx/libkdefx.la $(LIBZ)
libkdecore_la_NMCHECK = $(srcdir)/libkdecore.nmcheck
libkdecore_la_NMCHECKWEAK = $(srcdir)/libkdecore_weak.nmcheck $(srcdir)/libqt-mt_weak.nmcheck \
$(top_srcdir)/dcop/libDCOP_weak.nmcheck $(top_srcdir)/kdecore/standard_weak.nmcheck
diff -Nurd kdelibs-3.5.10/kdecore/kglobalsettings.cpp kdelibs-3.5.10-new/kdecore/kglobalsettings.cpp
--- kdelibs-3.5.10/kdecore/kglobalsettings.cpp 2005-10-10 11:06:03.000000000 -0400
+++ kdelibs-3.5.10-new/kdecore/kglobalsettings.cpp 2010-05-12 10:53:57.000000000 -0400
@@ -491,7 +491,7 @@
s_desktopPath->append('/');
// Trash Path - TODO remove in KDE4 (kio_trash can't use it for interoperability reasons)
- *s_trashPath = *s_desktopPath + i18n("Trash") + "/";
+ *s_trashPath = *s_desktopPath + "." + i18n("Trash") + "/";
*s_trashPath = g.readPathEntry( "Trash" , *s_trashPath);
*s_trashPath = QDir::cleanDirPath( *s_trashPath );
if ( !s_trashPath->endsWith("/") )
diff -Nurd kdelibs-3.5.10/kdecore/ksocks.cpp kdelibs-3.5.10-new/kdecore/ksocks.cpp
--- kdelibs-3.5.10/kdecore/ksocks.cpp 2005-10-10 11:06:03.000000000 -0400
+++ kdelibs-3.5.10-new/kdecore/ksocks.cpp 2010-05-12 10:53:57.000000000 -0400
@@ -480,7 +480,7 @@
ksocklen_t addrlen) {
if (_useSocks && F_connect)
return (*F_connect)(sockfd, serv_addr, addrlen);
- else return ::connect(sockfd, (sockaddr*) serv_addr, (socklen_t)addrlen);
+ else return ::connect(sockfd, (sockaddr*) serv_addr, (ksocklen_t)addrlen);
}
@@ -503,7 +503,7 @@
if (_useSocks && F_recvfrom) {
return (*F_recvfrom)(s, buf, len, flags, from, fromlen);
} else {
- socklen_t casted_len = (socklen_t) *fromlen;
+ kde_socklen_t casted_len = (kde_socklen_t) *fromlen;
int rc = ::recvfrom(s, (char*) buf, len, flags, from, &casted_len);
*fromlen = casted_len;
return rc;
@@ -515,7 +515,7 @@
const sockaddr *to, ksocklen_t tolen) {
if (_useSocks && F_sendto)
return (*F_sendto)(s, msg, len, flags, to, tolen);
- else return ::sendto(s, (char*) msg, len, flags, to, (socklen_t)tolen);
+ else return ::sendto(s, (char*) msg, len, flags, to, (ksocklen_t)tolen);
}
@@ -537,7 +537,7 @@
if (_useSocks && F_getsockname) {
return (*F_getsockname)(s, name, namelen);
} else {
- socklen_t casted_len = *namelen;
+ kde_socklen_t casted_len = *namelen;
int rc = ::getsockname(s, name, &casted_len);
*namelen = casted_len;
return rc;
@@ -549,7 +549,7 @@
if (_useSocks && F_getpeername) {
return (*F_getpeername)(s, name, namelen);
} else {
- socklen_t casted_len = *namelen;
+ kde_socklen_t casted_len = *namelen;
int rc = ::getpeername(s, name, &casted_len);
*namelen = casted_len;
return rc;
@@ -561,7 +561,7 @@
if (_useSocks && F_accept) {
return (*F_accept)(s, addr, addrlen);
} else {
- socklen_t casted_len = *addrlen;
+ kde_socklen_t casted_len = *addrlen;
int rc = ::accept(s, addr, &casted_len);
*addrlen = casted_len;
return rc;
@@ -587,13 +587,13 @@
int KSocks::bind (int sockfd, const sockaddr *my_addr, ksocklen_t addrlen) {
if (_useSocks && F_bind)
return (*F_bind)(sockfd, my_addr, addrlen);
- else return ::bind(sockfd, my_addr, (socklen_t)addrlen);
+ else return ::bind(sockfd, my_addr, (ksocklen_t)addrlen);
}
int KSocks::bind (int sockfd, sockaddr *my_addr, ksocklen_t addrlen) {
if (_useSocks && F_bind)
return (*F_bind)(sockfd, my_addr, addrlen);
- else return ::bind(sockfd, my_addr, (socklen_t)addrlen);
+ else return ::bind(sockfd, my_addr, (ksocklen_t)addrlen);
}
diff -Nurd kdelibs-3.5.10/kdecore/kstandarddirs.cpp kdelibs-3.5.10-new/kdecore/kstandarddirs.cpp
--- kdelibs-3.5.10/kdecore/kstandarddirs.cpp 2008-02-13 04:41:08.000000000 -0500
+++ kdelibs-3.5.10-new/kdecore/kstandarddirs.cpp 2010-05-12 10:53:57.000000000 -0400
@@ -1021,7 +1021,7 @@
if (!strcmp(type, "data"))
return "share/apps/";
if (!strcmp(type, "html"))
- return "share/doc/HTML/";
+ return "share/doc/kde/";
if (!strcmp(type, "icon"))
return "share/icons/";
if (!strcmp(type, "config"))
diff -Nurd kdelibs-3.5.10/kdecore/kuniqueapplication.cpp kdelibs-3.5.10-new/kdecore/kuniqueapplication.cpp
--- kdelibs-3.5.10/kdecore/kuniqueapplication.cpp 2005-11-08 17:39:22.000000000 -0500
+++ kdelibs-3.5.10-new/kdecore/kuniqueapplication.cpp 2010-05-12 10:53:57.000000000 -0400
@@ -59,6 +59,10 @@
# endif
#endif
+#ifdef __APPLE__
+#include
+#endif
+
bool KUniqueApplication::s_nofork = false;
bool KUniqueApplication::s_multipleInstances = false;
bool KUniqueApplication::s_uniqueTestDone = false;
@@ -123,7 +127,7 @@
startKdeinit();
if(dcopClient()->registerAs(appName, false).isEmpty()) {
kdError() << "KUniqueApplication: Can't setup DCOP communication." << endl;
- ::exit(255);
+ ::_exit(255);
}
}
#endif
@@ -131,19 +135,52 @@
// We'll call newInstance in the constructor. Do nothing here.
return true;
}
+
+#ifdef Q_OS_DARWIN
+ else {
+ // we need to reexec ourselves because of stupid OSX crap crappity crap
+ int argc = *_NSGetArgc();
+ char ** argv = *_NSGetArgv();
+ char * newargv[argc+2];
+
+ for (int i = 0; i < argc; i++) {
+ newargv[i] = argv[i];
+ }
+ newargv[argc] = "--nofork";
+ newargv[argc+1] = NULL;
+
+ int fork_result = fork();
+ switch(fork_result) {
+ case -1:
+ kdError() << "KUniqueAPplication: Mac OS X workaround fork() failed!" << endl;
+ ::_exit(255);
+ break;
+ case 0:
+ // Child
+ execvp(argv[0], newargv);
+ break;
+ default:
+ // Parent
+ _exit(0);
+ break;
+ }
+ }
+#endif
+
DCOPClient *dc;
int fd[2];
signed char result;
if (0 > pipe(fd))
{
kdError() << "KUniqueApplication: pipe() failed!" << endl;
- ::exit(255);
+ ::_exit(255);
}
+
int fork_result = fork();
switch(fork_result) {
case -1:
kdError() << "KUniqueApplication: fork() failed!" << endl;
- ::exit(255);
+ ::_exit(255);
break;
case 0:
// Child
@@ -161,7 +198,7 @@
kdError() << "KUniqueApplication: Can't determine DISPLAY. Aborting." << endl;
result = -1; // Error
::write(fd[1], &result, 1);
- ::exit(255);
+ ::_exit(255);
}
// Try to launch kdeinit.
@@ -173,7 +210,7 @@
result = -1;
delete dc; // Clean up DCOP commmunication
::write(fd[1], &result, 1);
- ::exit(255);
+ ::_exit(255);
}
}
if (regName != appName)
@@ -247,25 +284,25 @@
if (n == 0)
{
kdError() << "KUniqueApplication: Pipe closed unexpectedly." << endl;
- ::exit(255);
+ ::_exit(255);
}
if (errno != EINTR)
{
kdError() << "KUniqueApplication: Error reading from pipe." << endl;
- ::exit(255);
+ ::_exit(255);
}
}
::close(fd[0]);
if (result != 0)
- ::exit(result); // Error occurred in child.
+ ::_exit(result); // Error occurred in child.
dc = new DCOPClient();
if (!dc->attach())
{
kdError() << "KUniqueApplication: Parent process can't attach to DCOP." << endl;
delete dc; // Clean up DCOP commmunication
- ::exit(255);
+ ::_exit(255);
}
if (!dc->isApplicationRegistered(appName)) {
kdError() << "KUniqueApplication: Registering failed!" << endl;
@@ -294,20 +331,20 @@
{
kdError() << "Communication problem with " << KCmdLineArgs::about->appName() << ", it probably crashed." << endl;
delete dc; // Clean up DCOP commmunication
- ::exit(255);
+ ::_exit(255);
}
dc->setPriorityCall(false);
if (replyType != "int")
{
kdError() << "KUniqueApplication: DCOP communication error!" << endl;
delete dc; // Clean up DCOP commmunication
- ::exit(255);
+ ::_exit(255);
}
QDataStream rs(reply, IO_ReadOnly);
int exitCode;
rs >> exitCode;
delete dc; // Clean up DCOP commmunication
- ::exit(exitCode);
+ ::_exit(exitCode);
break;
}
return false; // make insure++ happy
@@ -361,7 +398,7 @@
}
if( !start())
// Already running
- ::exit( 0 );
+ ::_exit( 0 );
return inst;
}
diff -Nurd kdelibs-3.5.10/kdecore/network/ksocketdevice.cpp kdelibs-3.5.10-new/kdecore/network/ksocketdevice.cpp
--- kdelibs-3.5.10/kdecore/network/ksocketdevice.cpp 2007-01-15 06:34:17.000000000 -0500
+++ kdelibs-3.5.10-new/kdecore/network/ksocketdevice.cpp 2010-05-12 10:53:57.000000000 -0400
@@ -316,7 +316,7 @@
}
struct sockaddr sa;
- socklen_t len = sizeof(sa);
+ kde_socklen_t len = sizeof(sa);
int newfd = kde_accept(m_sockfd, &sa, &len);
if (newfd == -1)
{
@@ -390,7 +390,7 @@
static int do_read_common(int sockfd, char *data, Q_ULONG maxlen, KSocketAddress* from, ssize_t &retval, bool peek = false)
{
- socklen_t len;
+ kde_socklen_t len;
if (from)
{
from->setLength(len = 128); // arbitrary length
@@ -535,7 +535,7 @@
if (d->local.family() != AF_UNSPEC)
return d->local;
- socklen_t len;
+ kde_socklen_t len;
KSocketAddress localAddress;
localAddress.setLength(len = 32); // arbitrary value
if (kde_getsockname(m_sockfd, localAddress.address(), &len) == -1)
@@ -571,7 +571,7 @@
if (d->peer.family() != AF_UNSPEC)
return d->peer;
- socklen_t len;
+ kde_socklen_t len;
KSocketAddress peerAddress;
peerAddress.setLength(len = 32); // arbitrary value
if (kde_getpeername(m_sockfd, peerAddress.address(), &len) == -1)
diff -Nurd kdelibs-3.5.10/kdecore/network/syssocket.h kdelibs-3.5.10-new/kdecore/network/syssocket.h
--- kdelibs-3.5.10/kdecore/network/syssocket.h 2005-09-10 04:27:10.000000000 -0400
+++ kdelibs-3.5.10-new/kdecore/network/syssocket.h 2010-05-12 10:53:57.000000000 -0400
@@ -53,7 +53,7 @@
}
// bind
- inline int kde_bind(int fd, const struct sockaddr* sa, socklen_t len)
+ inline int kde_bind(int fd, const struct sockaddr* sa, kde_socklen_t len)
{
return ::bind(fd, sa, len);
}
@@ -65,25 +65,25 @@
}
// connect
- inline int kde_connect(int fd, const struct sockaddr* sa, socklen_t len)
+ inline int kde_connect(int fd, const struct sockaddr* sa, kde_socklen_t len)
{
return ::connect(fd, (struct sockaddr*)sa, len);
}
// accept
- inline int kde_accept(int fd, struct sockaddr* sa, socklen_t* len)
+ inline int kde_accept(int fd, struct sockaddr* sa, kde_socklen_t* len)
{
return ::accept(fd, sa, len);
}
// getpeername
- inline int kde_getpeername(int fd, struct sockaddr* sa, socklen_t* len)
+ inline int kde_getpeername(int fd, struct sockaddr* sa, kde_socklen_t* len)
{
return ::getpeername(fd, sa, len);
}
// getsockname
- inline int kde_getsockname(int fd, struct sockaddr* sa, socklen_t* len)
+ inline int kde_getsockname(int fd, struct sockaddr* sa, kde_socklen_t* len)
{
return ::getsockname(fd, sa, len);
}
diff -Nurd kdelibs-3.5.10/kded/Makefile.am kdelibs-3.5.10-new/kded/Makefile.am
--- kdelibs-3.5.10/kded/Makefile.am 2005-10-10 11:06:29.000000000 -0400
+++ kdelibs-3.5.10-new/kded/Makefile.am 2010-05-12 10:53:57.000000000 -0400
@@ -58,7 +58,10 @@
servicetype_DATA = kdedmodule.desktop
servicetypedir = $(kde_servicetypesdir)
-xdg_menu_DATA = applications.menu
+kde-applications.menu: applications.menu
+ cat applications.menu > kde-applications.menu
+
+xdg_menu_DATA = kde-applications.menu
update_DATA = kded.upd
updatedir = $(kde_datadir)/kconf_update
diff -Nurd kdelibs-3.5.10/kded/kbuildsycoca.cpp kdelibs-3.5.10-new/kded/kbuildsycoca.cpp
--- kdelibs-3.5.10/kded/kbuildsycoca.cpp 2007-05-14 03:52:43.000000000 -0400
+++ kdelibs-3.5.10-new/kded/kbuildsycoca.cpp 2010-05-12 10:53:57.000000000 -0400
@@ -379,7 +379,11 @@
connect(g_vfolder, SIGNAL(newService(const QString &, KService **)),
this, SLOT(slotCreateEntry(const QString &, KService **)));
- VFolderMenu::SubMenu *kdeMenu = g_vfolder->parseMenu("applications.menu", true);
+ VFolderMenu::SubMenu *kdeMenu;
+ if ( QFile::exists( "@FINKPREFIX@/etc/xdg/menus/kde-applications.menu" ) )
+ kdeMenu = g_vfolder->parseMenu("kde-applications.menu", true);
+ else
+ kdeMenu = g_vfolder->parseMenu("applications.menu", true);
KServiceGroup *entry = g_bsgf->addNew("/", kdeMenu->directoryFile, 0, false);
entry->setLayoutInfo(kdeMenu->layoutList);
diff -Nurd kdelibs-3.5.10/kdeprint/configure.in.in kdelibs-3.5.10-new/kdeprint/configure.in.in
--- kdelibs-3.5.10/kdeprint/configure.in.in 2005-09-10 04:27:43.000000000 -0400
+++ kdelibs-3.5.10-new/kdeprint/configure.in.in 2010-05-12 10:53:57.000000000 -0400
@@ -80,7 +80,7 @@
dnl check if CUPS is at least 1.1.20
ac_have_new_cups="no"
- AC_CHECK_CUPS_VERSION(1.0120)
+ AC_CHECK_CUPS_VERSION(1.0121)
if test "$ac_have_new_cups" = "yes"; then
AC_DEFINE(HAVE_CUPS_NO_PWD_CACHE, 1, CUPS doesn't have password caching)
fi
diff -Nurd kdelibs-3.5.10/kdeprint/cups/Makefile.am kdelibs-3.5.10-new/kdeprint/cups/Makefile.am
--- kdelibs-3.5.10/kdeprint/cups/Makefile.am 2006-10-02 06:46:55.000000000 -0400
+++ kdelibs-3.5.10-new/kdeprint/cups/Makefile.am 2010-05-12 10:53:57.000000000 -0400
@@ -14,8 +14,8 @@
imagepreview.cpp imageposition.cpp kpimagepage.cpp \
kptextpage.cpp kphpgl2page.cpp cupsaddsmb2.cpp kmwother.cpp ippreportdlg.cpp \
kptagspage.cpp
-kdeprint_cups_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined
-kdeprint_cups_la_LIBADD = $(top_builddir)/kdeprint/management/libkdeprint_management.la $(LIB_KIO) $(LIB_CUPS) $(top_builddir)/kdecore/libkdefakes.la
+kdeprint_cups_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined $(LIB_CUPS)
+kdeprint_cups_la_LIBADD = $(top_builddir)/kdeprint/management/libkdeprint_management.la $(LIB_KIO) $(top_builddir)/kdecore/libkdefakes.la
kdeprint_cups_la_METASOURCES = AUTO
noinst_HEADERS = cupsinfos.h ipprequest.h kmcupsjobmanager.h kmcupsmanager.h kmcupsuimanager.h \
diff -Nurd kdelibs-3.5.10/kdeprint/cups/cupsdconf2/Makefile.am kdelibs-3.5.10-new/kdeprint/cups/cupsdconf2/Makefile.am
--- kdelibs-3.5.10/kdeprint/cups/cupsdconf2/Makefile.am 2005-09-10 04:27:41.000000000 -0400
+++ kdelibs-3.5.10-new/kdeprint/cups/cupsdconf2/Makefile.am 2010-05-12 10:53:57.000000000 -0400
@@ -14,8 +14,8 @@
locationdialog.cpp addressdialog.cpp cups-util.c \
qdirmultilineedit.cpp sizewidget.cpp main.cpp
cupsdconf_la_METASOURCES = AUTO
-cupsdconf_la_LDFLAGS = -avoid-version -module $(all_libraries) $(KDE_RPATH)
-cupsdconf_la_LIBADD = $(LIB_KIO) $(LIB_CUPS)
+cupsdconf_la_LDFLAGS = -avoid-version -module $(all_libraries) $(KDE_RPATH) $(LIB_CUPS)
+cupsdconf_la_LIBADD = $(LIB_KIO) -lcups
noinst_HEADERS = cupsdconf.h cupsdpage.h cupsddialog.h cupsdcomment.h cupsdsplash.h \
cupsdserverpage.h cupsdlogpage.h cupsdjobspage.h cupsdfilterpage.h \
diff -Nurd kdelibs-3.5.10/kdeui/Makefile.am kdelibs-3.5.10-new/kdeui/Makefile.am
--- kdelibs-3.5.10/kdeui/Makefile.am 2008-08-20 07:49:41.000000000 -0400
+++ kdelibs-3.5.10-new/kdeui/Makefile.am 2010-05-12 10:53:57.000000000 -0400
@@ -27,10 +27,10 @@
AM_LDFLAGS = $(LDFLAGS_AS_NEEDED) $(LDFLAGS_NEW_DTAGS)
lib_LTLIBRARIES = libkdeui.la libkspell.la
-libkdeui_la_LDFLAGS = $(KDE_MT_LDFLAGS) -no-undefined -version-info 6:0:2
+libkdeui_la_LDFLAGS = $(KDE_MT_LDFLAGS) $(all_libraries) -no-undefined -version-info 6:0:2
libkdeui_la_LIBADD = ../kdecore/libkdecore.la
-libkspell_la_LDFLAGS = $(KDE_MT_LDFLAGS) -version-info 6:0:2 -no-undefined
+libkspell_la_LDFLAGS = $(KDE_MT_LDFLAGS) $(all_libraries) -version-info 6:0:2 -no-undefined
libkspell_la_LIBADD = libkdeui.la
libkspell_la_SOURCES = dummy.cpp
diff -Nurd kdelibs-3.5.10/kimgio/Makefile.am kdelibs-3.5.10-new/kimgio/Makefile.am
--- kdelibs-3.5.10/kimgio/Makefile.am 2005-09-10 04:26:42.000000000 -0400
+++ kdelibs-3.5.10-new/kimgio/Makefile.am 2010-05-12 10:53:57.000000000 -0400
@@ -21,7 +21,7 @@
kimg_pcx.la kimg_tga.la kimg_rgb.la kimg_xcf.la kimg_dds.la $(KIMGIO_EXR_MODULES) \
kimg_psd.la kimg_hdr.la
-KIMGIO_PLUGIN = -avoid-version -export-symbols-regex 'kimgio_.*_(read|write)'
+KIMGIO_PLUGIN = -avoid-version
kimg_tiff_la_SOURCES = tiffr.cpp
kimg_tiff_la_LDFLAGS = -module $(KIMGIO_PLUGIN) -no-undefined $(all_libraries)
diff -Nurd kdelibs-3.5.10/kinit/Makefile.am kdelibs-3.5.10-new/kinit/Makefile.am
--- kdelibs-3.5.10/kinit/Makefile.am 2007-10-08 05:52:03.000000000 -0400
+++ kdelibs-3.5.10-new/kinit/Makefile.am 2010-05-12 11:09:22.000000000 -0400
@@ -15,7 +15,7 @@
# the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
# Boston, MA 02110-1301, USA.
-INCLUDES = -I$(srcdir)/../libltdl/ $(all_includes) $(KDEINIT_XFT_INCLUDES)
+INCLUDES = -I$(srcdir)/../libltdl/ -I$(top_srcdir)/kdecore -I$(top_srcdir)/kdeui -I$(top_srcdir)/kio -I$(top_srcdir)/kio/kio $(KDEINIT_XFT_INCLUDES) $(all_includes)
SUBDIRS = . tests
diff -Nurd kdelibs-3.5.10/kinit/configure.in.in kdelibs-3.5.10-new/kinit/configure.in.in
--- kdelibs-3.5.10/kinit/configure.in.in 2007-01-15 06:33:56.000000000 -0500
+++ kdelibs-3.5.10-new/kinit/configure.in.in 2010-05-12 10:55:38.000000000 -0400
@@ -25,11 +25,11 @@
fi
fi
-KDE_FIND_PATH(freetype-config, KDEINIT_FREETYPE_CONFIG, [${prefix}/bin ${exec_prefix}/bin /usr/bin /usr/local/bin /opt/local/bin])
-if test -n "$KDEINIT_FREETYPE_CONFIG"; then
- KDEINIT_XFT_INCLUDES="`$KDEINIT_FREETYPE_CONFIG --cflags` $FONTCONFIG_CFLAGS"
+KDE_FIND_PATH(xft-config, KDEINIT_XFT_CONFIG, [${prefix}/bin ${exec_prefix}/bin /usr/bin /usr/local/bin /opt/local/bin])
+if test -n "$KDEINIT_XFT_CONFIG"; then
+ KDEINIT_XFT_INCLUDES="`$KDEINIT_XFT_CONFIG --cflags`"
kdeinit_cppflags=$CPPFLAGS
- CPPFLAGS="$CPPFLAGS $KDEINIT_XFT_INCLUDES $FONTCONFIG_CFLAGS"
+ CPPFLAGS="$CPPFLAGS $KDEINIT_XFT_INCLUDES"
KDE_CHECK_HEADER(X11/Xft/Xft.h,[],[KDEINIT_USE_XFT=])
CPPFLAGS=$kdeinit_cppflags
else
diff -Nurd kdelibs-3.5.10/kinit/kinit.cpp kdelibs-3.5.10-new/kinit/kinit.cpp
--- kdelibs-3.5.10/kinit/kinit.cpp 2007-10-08 05:52:03.000000000 -0400
+++ kdelibs-3.5.10-new/kinit/kinit.cpp 2010-05-12 10:53:57.000000000 -0400
@@ -593,6 +593,11 @@
if ( getenv("KDE_IS_PRELINKED") && !execpath.isEmpty() && !launcher)
libpath.truncate(0);
+#ifdef Q_OS_DARWIN
+ if (!execpath.isEmpty())
+ libpath.truncate(0);
+#endif
+
if ( !libpath.isEmpty() )
{
d.handle = lt_dlopen( QFile::encodeName(libpath) );
diff -Nurd kdelibs-3.5.10/kinit/start_kdeinit_wrapper.c kdelibs-3.5.10-new/kinit/start_kdeinit_wrapper.c
--- kdelibs-3.5.10/kinit/start_kdeinit_wrapper.c 2008-02-13 04:41:06.000000000 -0500
+++ kdelibs-3.5.10-new/kinit/start_kdeinit_wrapper.c 2010-05-12 10:53:57.000000000 -0400
@@ -50,9 +50,9 @@
close( 0 ); /* stdin */
dup2( pipes[ 0 ], 0 );
close( pipes[ 0 ] );
- argv[ 0 ] = (char*)"start_kdeinit";
- execvp("start_kdeinit", argv);
- perror("start_kdeinit");
+ argv[ 0 ] = (char*)"@FINKPREFIX@/bin/start_kdeinit";
+ execvp("@FINKPREFIX@/bin/start_kdeinit", argv);
+ perror("@FINKPREFIX@/bin/start_kdeinit");
return 1;
case 0: { /* child, pass env and exit */
extern char** environ;
@@ -84,9 +84,9 @@
{
if(argc == 0)
return 1;
- argv[0] = "start_kdeinit";
- execvp("start_kdeinit",argv);
- perror("start_kdeinit");
+ argv[0] = "@FINKPREFIX@/bin/start_kdeinit";
+ execvp("@FINKPREFIX@/bin/start_kdeinit",argv);
+ perror("@FINKPREFIX@/bin/start_kdeinit");
return 1;
}
#endif
diff -Nurd kdelibs-3.5.10/kio/kssl/kopenssl.cc kdelibs-3.5.10-new/kio/kssl/kopenssl.cc
--- kdelibs-3.5.10/kio/kssl/kopenssl.cc 2006-07-22 04:16:39.000000000 -0400
+++ kdelibs-3.5.10-new/kio/kssl/kopenssl.cc 2010-05-12 10:53:57.000000000 -0400
@@ -323,6 +323,7 @@
#elif defined(_AIX)
<< "libssl.a(libssl.so.0)"
#elif defined(__APPLE__)
+ << "libssl.0.9.7.dylib"
<< "libssl.dylib"
<< "libssl.0.9.dylib"
#else
@@ -340,6 +341,7 @@
#elif defined(_AIX)
<< "libcrypto.a(libcrypto.so.0)"
#elif defined(__APPLE__)
+ << "libcrypto.0.9.7.dylib"
<< "libcrypto.dylib"
<< "libcrypto.0.9.dylib"
#else
diff -Nurd kdelibs-3.5.10/kio/misc/kpac/Makefile.am kdelibs-3.5.10-new/kio/misc/kpac/Makefile.am
--- kdelibs-3.5.10/kio/misc/kpac/Makefile.am 2005-09-10 04:26:47.000000000 -0400
+++ kdelibs-3.5.10-new/kio/misc/kpac/Makefile.am 2010-05-12 10:53:57.000000000 -0400
@@ -10,7 +10,7 @@
kded_proxyscout_la_SOURCES = proxyscout.skel proxyscout.cpp script.cpp \
downloader.cpp discovery.cpp
kded_proxyscout_la_LDFLAGS = $(all_libraries) -module -avoid-version
-kded_proxyscout_la_LIBADD = $(LIB_KIO) $(top_builddir)/kjs/libkjs.la $(LIB_KDED)
+kded_proxyscout_la_LIBADD = $(LIB_KIO) $(top_builddir)/kjs/libkjs.la $(LIB_KDED) $(LIBRESOLV)
kpac_dhcp_helper_SOURCES = kpac_dhcp_helper.c
kpac_dhcp_helper_CFLAGS = $(KDE_USE_FPIE)
diff -Nurd kdelibs-3.5.10/kio/misc/kpac/configure.in.in kdelibs-3.5.10-new/kio/misc/kpac/configure.in.in
--- kdelibs-3.5.10/kio/misc/kpac/configure.in.in 2005-09-10 04:26:47.000000000 -0400
+++ kdelibs-3.5.10-new/kio/misc/kpac/configure.in.in 2010-05-12 10:53:57.000000000 -0400
@@ -23,4 +23,4 @@
AC_DEFINE(HAVE_SHORTSETGROUPS,1,[if setgroups() takes short *as second arg])
fi
-AC_CHECK_HEADERS(arpa/nameser8_compat.h sys/param.h)
+AC_CHECK_HEADERS(arpa/nameser8_compat.h arpa/nameser_compat.h sys/param.h)
diff -Nurd kdelibs-3.5.10/kio/misc/kpac/discovery.cpp kdelibs-3.5.10-new/kio/misc/kpac/discovery.cpp
--- kdelibs-3.5.10/kio/misc/kpac/discovery.cpp 2005-10-10 11:05:43.000000000 -0400
+++ kdelibs-3.5.10-new/kio/misc/kpac/discovery.cpp 2010-05-12 10:53:57.000000000 -0400
@@ -29,9 +29,15 @@
#include
#endif
#include
+
+#ifdef HAVE_ARPA_NAMESER_COMPAT_H
+#include
+#else
#ifdef HAVE_ARPA_NAMESER8_COMPAT_H
#include
#endif
+#endif
+
#ifdef HAVE_SYS_PARAM_H
// Basically, the BSDs need this before resolv.h
#include