[26988] trunk/dports/kde/kdebase3
source_changes at macosforge.org
source_changes at macosforge.org
Sun Jul 15 07:26:32 PDT 2007
Revision: 26988
http://trac.macosforge.org/projects/macports/changeset/26988
Author: takanori at macports.org
Date: 2007-07-15 07:26:09 -0700 (Sun, 15 Jul 2007)
Log Message:
-----------
KDE 3.5.7.
Modified Paths:
--------------
trunk/dports/kde/kdebase3/Portfile
trunk/dports/kde/kdebase3/files/kdebase3-unified.patch
Modified: trunk/dports/kde/kdebase3/Portfile
===================================================================
--- trunk/dports/kde/kdebase3/Portfile 2007-07-15 14:25:52 UTC (rev 26987)
+++ trunk/dports/kde/kdebase3/Portfile 2007-07-15 14:26:09 UTC (rev 26988)
@@ -1,11 +1,11 @@
# $Id$
-#Synced with Fink, Version 3.5.6-1021
+#Synced with Fink, Version 3.5.7-1021
PortSystem 1.0
name kdebase3
-version 3.5.6
-set kdeadmin kde-admindir-429
+version 3.5.7
+set kdeadmin kde-admindir-790
categories kde
maintainers nomaintainer at macports.org
description Base KDE programs -- e.g. kicker (taskbar). \
@@ -13,16 +13,16 @@
long_description ${description}
platforms darwin
homepage http://www.kde.org/
-master_sites kde:stable/${version}/src/:kde356 \
+master_sites kde:stable/${version}/src/:kde357 \
http://ranger.users.finkproject.org/distfiles/:admin \
http://ranger.befunk.com/fink/:admin \
http://astrange.ithinksw.net/~astrange/ranger-fink/:admin \
http://www.southofheaven.net/befunk/:admin
-# opendarwin::kde356
+# opendarwin::kde357
# opendarwin::admin
use_bzip2 yes
distname kdebase-${version}
-distfiles ${distname}.tar.bz2:kde356 \
+distfiles ${distname}.tar.bz2:kde357 \
${kdeadmin}.tar.bz2:admin
depends_build port:autoconf \
port:unsermake
@@ -31,8 +31,8 @@
port:libusb
# port:openmotif
-checksums ${distname}.tar.bz2 md5 a53f589f58012e655a52220a6a151019 \
- ${kdeadmin}.tar.bz2 md5 73186bf0bdabf96c9f7d559de56d3772
+checksums ${distname}.tar.bz2 md5 b421e01b3ee712549ee967f58ed24de0 \
+ ${kdeadmin}.tar.bz2 md5 8a098eeb808331ddf5912f7a8a184dd5
extract.only ${distname}.tar.bz2
post-extract { system "cd ${worksrcpath} && bzcat -dc ${distpath}/${kdeadmin}.tar.bz2 | tar xf -" }
@@ -83,6 +83,8 @@
system "${prefix}/bin/fc-cache -fv ${prefix}/share/fonts"
}
+universal_variant no
+
variant with_doxygen {
depends_lib-append port:doxygen
post-patch { foreach f {CompileScript.sh InstallScript.sh} { reinplace "s|#apidox#||g" ${worksrcpath}/${f} }}
Modified: trunk/dports/kde/kdebase3/files/kdebase3-unified.patch
===================================================================
--- trunk/dports/kde/kdebase3/files/kdebase3-unified.patch 2007-07-15 14:25:52 UTC (rev 26987)
+++ trunk/dports/kde/kdebase3/files/kdebase3-unified.patch 2007-07-15 14:26:09 UTC (rev 26988)
@@ -1,6 +1,6 @@
---- kdebase-3.5.6/applnk/Makefile.am 2007-01-15 06:32:11.000000000 -0500
-+++ kdebase-3.5.6-new/applnk/Makefile.am 2007-02-10 09:29:57.000000000 -0500
+--- kdebase-3.5.7/applnk/Makefile.am 2007-01-15 06:32:11.000000000 -0500
++++ kdebase-3.5.7-new/applnk/Makefile.am 2007-05-19 23:08:26.000000000 -0400
@@ -3,7 +3,7 @@
xdg_menu_DATA = kde-settings.menu kde-information.menu kde-screensavers.menu
@@ -10,8 +10,8 @@
xdg_directory_DATA = \
kde-main.directory \
---- kdebase-3.5.6/doc/userguide/kde-for-admins.docbook 2006-07-22 04:15:40.000000000 -0400
-+++ kdebase-3.5.6-new/doc/userguide/kde-for-admins.docbook 2007-02-10 09:29:57.000000000 -0500
+--- kdebase-3.5.7/doc/userguide/kde-for-admins.docbook 2006-07-22 04:15:40.000000000 -0400
++++ kdebase-3.5.7-new/doc/userguide/kde-for-admins.docbook 2007-05-19 23:08:26.000000000 -0400
@@ -1669,7 +1669,7 @@
</para>
@@ -39,8 +39,8 @@
contains <filename>kde-essential.menu</filename> which includes some
essential menus that are normally not shown in the &kde; menu itself:
<itemizedlist>
---- kdebase-3.5.6/drkonqi/Makefile.am 2005-09-10 04:25:55.000000000 -0400
-+++ kdebase-3.5.6-new/drkonqi/Makefile.am 2007-02-10 09:29:57.000000000 -0500
+--- kdebase-3.5.7/drkonqi/Makefile.am 2005-09-10 04:25:55.000000000 -0400
++++ kdebase-3.5.7-new/drkonqi/Makefile.am 2007-05-19 23:08:26.000000000 -0400
@@ -8,15 +8,17 @@
EXTRA_DIST = LICENSE
@@ -63,8 +63,8 @@
check_PROGRAMS = crashtest
---- kdebase-3.5.6/drkonqi/main.cpp 2006-07-22 04:15:52.000000000 -0400
-+++ kdebase-3.5.6-new/drkonqi/main.cpp 2007-02-10 09:29:57.000000000 -0500
+--- kdebase-3.5.7/drkonqi/main.cpp 2006-07-22 04:15:52.000000000 -0400
++++ kdebase-3.5.7-new/drkonqi/main.cpp 2007-05-19 23:08:26.000000000 -0400
@@ -57,7 +57,7 @@
KCmdLineLastOption
};
@@ -74,8 +74,8 @@
{
// Drop privs.
setgid(getgid());
---- kdebase-3.5.6/kappfinder/Makefile.am 2005-09-10 04:25:41.000000000 -0400
-+++ kdebase-3.5.6-new/kappfinder/Makefile.am 2007-02-10 09:29:57.000000000 -0500
+--- kdebase-3.5.7/kappfinder/Makefile.am 2005-09-10 04:25:41.000000000 -0400
++++ kdebase-3.5.7-new/kappfinder/Makefile.am 2007-05-19 23:08:26.000000000 -0400
@@ -1,9 +1,17 @@
SUBDIRS = apps
@@ -98,8 +98,8 @@
noinst_PROGRAMS = kappfinder_install
kappfinder_install_SOURCES = main_install.cpp common.cpp
---- kdebase-3.5.6/kappfinder/main.cpp 2005-10-10 11:04:07.000000000 -0400
-+++ kdebase-3.5.6-new/kappfinder/main.cpp 2007-02-10 09:29:57.000000000 -0500
+--- kdebase-3.5.7/kappfinder/main.cpp 2005-10-10 11:04:07.000000000 -0400
++++ kdebase-3.5.7-new/kappfinder/main.cpp 2007-05-19 23:08:26.000000000 -0400
@@ -31,7 +31,7 @@
KCmdLineLastOption
};
@@ -109,8 +109,8 @@
{
KAboutData aboutData( "kappfinder", I18N_NOOP( "KAppfinder" ),
"1.0", description, KAboutData::License_GPL,
---- kdebase-3.5.6/kcontrol/filetypes/Makefile.am 2005-09-10 04:25:08.000000000 -0400
-+++ kdebase-3.5.6-new/kcontrol/filetypes/Makefile.am 2007-02-10 09:29:57.000000000 -0500
+--- kdebase-3.5.7/kcontrol/filetypes/Makefile.am 2005-09-10 04:25:08.000000000 -0400
++++ kdebase-3.5.7-new/kcontrol/filetypes/Makefile.am 2007-05-19 23:08:26.000000000 -0400
@@ -12,16 +12,18 @@
kservicelistwidget.h typeslistitem.h newtypedlg.h \
kserviceselectdlg.h
@@ -134,8 +134,8 @@
messages:
$(XGETTEXT) *.cpp -o $(podir)/filetypes.pot
---- kdebase-3.5.6/kcontrol/filetypes/keditfiletype.cpp 2005-10-10 11:03:47.000000000 -0400
-+++ kdebase-3.5.6-new/kcontrol/filetypes/keditfiletype.cpp 2007-02-10 09:29:57.000000000 -0500
+--- kdebase-3.5.7/kcontrol/filetypes/keditfiletype.cpp 2007-05-14 03:55:38.000000000 -0400
++++ kdebase-3.5.7-new/kcontrol/filetypes/keditfiletype.cpp 2007-05-19 23:08:26.000000000 -0400
@@ -108,7 +108,7 @@
KCmdLineLastOption
};
@@ -143,28 +143,28 @@
-int main(int argc, char ** argv)
+extern "C" KDE_EXPORT int kdemain(int argc, char ** argv)
{
- KServiceTypeProfile::setConfigurationMode();
KLocale::setMainCatalogue("filetypes");
---- kdebase-3.5.6/kcontrol/fonts/Makefile.am 2006-03-17 05:17:12.000000000 -0500
-+++ kdebase-3.5.6-new/kcontrol/fonts/Makefile.am 2007-02-10 09:29:57.000000000 -0500
+ KAboutData aboutData( "keditfiletype", I18N_NOOP("KEditFileType"), "1.0",
+--- kdebase-3.5.7/kcontrol/fonts/Makefile.am 2007-05-14 03:55:34.000000000 -0400
++++ kdebase-3.5.7-new/kcontrol/fonts/Makefile.am 2007-05-19 23:09:28.000000000 -0400
@@ -4,13 +4,13 @@
libkxftconfig_la_LIBADD = $(LIBFONTCONFIG_LIBS)
libkxftconfig_la_LDFLAGS = $(LIBFONTCONFIG_RPATH)
--AM_CPPFLAGS = $(all_includes) $(LIBFONTCONFIG_CFLAGS) -D_LARGEFILE64_SOURCE
-+AM_CPPFLAGS = $(LIBFONTCONFIG_CFLAGS) -D_LARGEFILE64_SOURCE $(all_includes)
+-AM_CPPFLAGS = $(all_includes) $(LIBFONTCONFIG_CFLAGS) $(FREETYPE2_CFLAGS) -D_LARGEFILE64_SOURCE
++AM_CPPFLAGS = $(LIBFONTCONFIG_CFLAGS) $(FREETYPE2_CFLAGS) -D_LARGEFILE64_SOURCE $(all_includes)
kde_module_LTLIBRARIES = kcm_fonts.la
kcm_fonts_la_SOURCES = fonts.cpp
- kcm_fonts_la_LDFLAGS = $(KDE_RPATH) $(LIBFONTCONFIG_RPATH) -module -avoid-version $(all_libraries) -no-undefined
+ kcm_fonts_la_LDFLAGS = $(KDE_RPATH) $(LIBFONTCONFIG_RPATH) $(FREETYPE2_LDFLAGS) -module -avoid-version $(all_libraries) -no-undefined
-kcm_fonts_la_LIBADD = libkxftconfig.la $(top_builddir)/kcontrol/krdb/libkrdb.la $(LIB_KDEUI) $(LIBFONTCONFIG_LIBS)
+kcm_fonts_la_LIBADD = $(LIBFONTCONFIG_LIBS) libkxftconfig.la $(top_builddir)/kcontrol/krdb/libkrdb.la $(LIB_KDEUI)
METASOURCES = AUTO
noinst_HEADERS = fonts.h kxftconfig.h
---- kdebase-3.5.6/kcontrol/fonts/configure.in.in 2005-09-10 04:25:04.000000000 -0400
-+++ kdebase-3.5.6-new/kcontrol/fonts/configure.in.in 2007-02-10 09:29:57.000000000 -0500
+--- kdebase-3.5.7/kcontrol/fonts/configure.in.in 2007-05-14 03:55:34.000000000 -0400
++++ kdebase-3.5.7-new/kcontrol/fonts/configure.in.in 2007-05-19 23:08:26.000000000 -0400
@@ -1,8 +1,6 @@
-KDE_FIND_PATH(fontconfig-config, FONTCONFIG_CONFIG, [${prefix}/bin ${exec_prefix}/bin /usr/bin /usr/local/bin /opt/local/bin], [
KDE_FIND_PATH(pkg-config, PKGCONFIG, [${prefix}/bin ${exec_prefix}/bin /usr/bin /usr/local/bin /opt/local/bin], [
@@ -174,8 +174,8 @@
if test -n "$PKGCONFIG"; then
vers=`$PKGCONFIG fontconfig --modversion 2>/dev/null | sed -e 's/libfontconfig //' | awk 'BEGIN { FS = "."; } { printf "%d", ($1 * 1000 + $2) * 1000 + $3;}'`
---- kdebase-3.5.6/kcontrol/kfontinst/configure.in.in 2006-01-19 12:00:50.000000000 -0500
-+++ kdebase-3.5.6-new/kcontrol/kfontinst/configure.in.in 2007-02-10 09:29:58.000000000 -0500
+--- kdebase-3.5.7/kcontrol/kfontinst/configure.in.in 2006-01-19 12:00:50.000000000 -0500
++++ kdebase-3.5.7-new/kcontrol/kfontinst/configure.in.in 2007-05-19 23:08:26.000000000 -0400
@@ -36,11 +36,9 @@
KFI_FOUND_FONTCONFIG=0
@@ -188,8 +188,8 @@
if test -n "$PKGCONFIG"; then
vers=`$PKGCONFIG fontconfig --modversion 2>/dev/null | sed -e 's/libfontconfig //' | awk 'BEGIN { FS = "."; } { printf "%d", ($1 * 1000 + $2) * 1000 + $3;}'`
---- kdebase-3.5.6/kcontrol/kfontinst/kcmfontinst/Makefile.am 2005-09-10 04:25:09.000000000 -0400
-+++ kdebase-3.5.6-new/kcontrol/kfontinst/kcmfontinst/Makefile.am 2007-02-10 09:29:58.000000000 -0500
+--- kdebase-3.5.7/kcontrol/kfontinst/kcmfontinst/Makefile.am 2005-09-10 04:25:09.000000000 -0400
++++ kdebase-3.5.7-new/kcontrol/kfontinst/kcmfontinst/Makefile.am 2007-05-19 23:08:26.000000000 -0400
@@ -4,10 +4,10 @@
endif
@@ -203,8 +203,8 @@
xdg_apps_DATA = kcmfontinst.desktop
---- kdebase-3.5.6/kcontrol/kfontinst/kfile-plugin/Makefile.am 2005-09-10 04:25:09.000000000 -0400
-+++ kdebase-3.5.6-new/kcontrol/kfontinst/kfile-plugin/Makefile.am 2007-02-10 09:29:58.000000000 -0500
+--- kdebase-3.5.7/kcontrol/kfontinst/kfile-plugin/Makefile.am 2005-09-10 04:25:09.000000000 -0400
++++ kdebase-3.5.7-new/kcontrol/kfontinst/kfile-plugin/Makefile.am 2007-05-19 23:08:26.000000000 -0400
@@ -1,13 +1,13 @@
kde_module_LTLIBRARIES = kfile_font.la
@@ -222,8 +222,8 @@
METASOURCES = AUTO
noinst_HEADERS = KFileFont.h
---- kdebase-3.5.6/kcontrol/kfontinst/kfontinst/Main.cpp 2005-10-10 11:03:47.000000000 -0400
-+++ kdebase-3.5.6-new/kcontrol/kfontinst/kfontinst/Main.cpp 2007-02-10 09:29:58.000000000 -0500
+--- kdebase-3.5.7/kcontrol/kfontinst/kfontinst/Main.cpp 2007-05-14 03:55:38.000000000 -0400
++++ kdebase-3.5.7-new/kcontrol/kfontinst/kfontinst/Main.cpp 2007-05-19 23:08:26.000000000 -0400
@@ -190,7 +190,7 @@
KFI::CXConfig::refreshPaths(true);
}
@@ -233,8 +233,8 @@
{
#ifdef HAVE_GETOPT_H
static struct option options[]=
---- kdebase-3.5.6/kcontrol/kfontinst/kfontinst/Makefile.am 2005-09-10 04:25:09.000000000 -0400
-+++ kdebase-3.5.6-new/kcontrol/kfontinst/kfontinst/Makefile.am 2007-02-10 09:29:58.000000000 -0500
+--- kdebase-3.5.7/kcontrol/kfontinst/kfontinst/Makefile.am 2007-05-14 03:55:38.000000000 -0400
++++ kdebase-3.5.7-new/kcontrol/kfontinst/kfontinst/Makefile.am 2007-05-19 23:10:19.000000000 -0400
@@ -1,5 +1,8 @@
-bin_PROGRAMS = kfontinst
-kfontinst_SOURCES = \
@@ -243,21 +243,21 @@
+kdeinit_LTLIBRARIES = kfontinst.la
+
+kfontinst_la_SOURCES = \
- CompressedFile.cpp \
Main.cpp \
- Encodings.cpp \
-@@ -15,6 +18,6 @@
+ FontEngine.cpp \
+ Fontmap.cpp \
+@@ -11,6 +14,6 @@
Fontmap.h \
XConfig.h
--kfontinst_LDADD = ../../fonts/libkxftconfig.la $(LIBFONTCONFIG_LIBS) $(LIBFREETYPE_LIBS) $(LIB_FONT_ENC) $(LIBZ) $(LIB_KIO) ../lib/libkfontinst.la
+-kfontinst_LDADD = ../../fonts/libkxftconfig.la $(LIBFONTCONFIG_LIBS) $(LIBFREETYPE_LIBS) $(LIBZ) $(LIB_KIO) ../lib/libkfontinst.la
-kfontinst_LDFLAGS = $(all_libraries) $(LIBFONTCONFIG_RPATH) $(LIBFREETYPE_RPATH) $(KDE_RPATH)
-AM_CPPFLAGS= -DOS_$(UNAME) -I$(srcdir)/../lib -I$(srcdir)/../../fonts $(all_includes) $(LIBFREETYPE_CFLAGS) $(LIBFONTCONFIG_CFLAGS)
-+kfontinst_la_LIBADD = $(LIBFONTCONFIG_LIBS) $(LIBFREETYPE_LIBS) $(LIB_FONT_ENC) ../../fonts/libkxftconfig.la $(LIBZ) $(LIB_KIO) ../lib/libkfontinst.la
-+kfontinst_la_LDFLAGS = $(LIBFONTCONFIG_RPATH) $(LIBFREETYPE_RPATH) $(all_libraries) $(KDE_PLUGIN) -module
++kfontinst_LDADD = $(LIBFONTCONFIG_LIBS) $(LIBFREETYPE_LIBS) ../../fonts/libkxftconfig.la $(LIBZ) $(LIB_KIO) ../lib/libkfontinst.la
++kfontinst_LDFLAGS = $(LIBFONTCONFIG_RPATH) $(LIBFREETYPE_RPATH) $(all_libraries) $(KDE_RPATH)
+AM_CPPFLAGS= -DOS_$(UNAME) -I$(srcdir)/../lib -I$(srcdir)/../../fonts $(LIBFREETYPE_CFLAGS) $(LIBFONTCONFIG_CFLAGS) $(all_includes)
---- kdebase-3.5.6/kcontrol/kfontinst/kio/Makefile.am 2005-09-10 04:25:09.000000000 -0400
-+++ kdebase-3.5.6-new/kcontrol/kfontinst/kio/Makefile.am 2007-02-10 09:29:58.000000000 -0500
+--- kdebase-3.5.7/kcontrol/kfontinst/kio/Makefile.am 2005-09-10 04:25:09.000000000 -0400
++++ kdebase-3.5.7-new/kcontrol/kfontinst/kio/Makefile.am 2007-05-19 23:08:26.000000000 -0400
@@ -2,9 +2,9 @@
kio_fonts_la_SOURCES = \
KioFonts.cpp
@@ -271,8 +271,8 @@
# The kxftconfig stuf really belongs to kdebase/kcontrol/fonts - here only so that can distribute this as an archive.
noinst_HEADERS = \
---- kdebase-3.5.6/kcontrol/kfontinst/lib/FcEngine.h 2005-09-10 04:25:09.000000000 -0400
-+++ kdebase-3.5.6-new/kcontrol/kfontinst/lib/FcEngine.h 2007-02-10 09:29:58.000000000 -0500
+--- kdebase-3.5.7/kcontrol/kfontinst/lib/FcEngine.h 2005-09-10 04:25:09.000000000 -0400
++++ kdebase-3.5.7-new/kcontrol/kfontinst/lib/FcEngine.h 2007-05-19 23:08:26.000000000 -0400
@@ -5,6 +5,8 @@
#include "config.h"
#endif
@@ -282,8 +282,8 @@
#include <qstring.h>
#include <qvaluevector.h>
#include <qfont.h>
---- kdebase-3.5.6/kcontrol/kfontinst/lib/Makefile.am 2005-09-10 04:25:09.000000000 -0400
-+++ kdebase-3.5.6-new/kcontrol/kfontinst/lib/Makefile.am 2007-02-10 09:29:58.000000000 -0500
+--- kdebase-3.5.7/kcontrol/kfontinst/lib/Makefile.am 2005-09-10 04:25:09.000000000 -0400
++++ kdebase-3.5.7-new/kcontrol/kfontinst/lib/Makefile.am 2007-05-19 23:08:26.000000000 -0400
@@ -9,6 +9,6 @@
FcEngine.h \
KfiConstants.h
@@ -294,8 +294,8 @@
+libkfontinst_la_LIBADD = $(LIBFONTCONFIG_LIBS) $(LIBFREETYPE_LIBS) $(LIB_KDECORE) $(LIB_KIO) $(LIBXFT_LIB)
+libkfontinst_la_LDFLAGS = $(LIBFONTCONFIG_RPATH) $(LIBFREETYPE_RPATH) $(all_libraries) $(KDE_RPATH) -no-undefined
+AM_CPPFLAGS= $(LIBFREETYPE_CFLAGS) $(LIBFONTCONFIG_CFLAGS) -D_LARGEFILE64_SOURCE $(all_includes)
---- kdebase-3.5.6/kcontrol/kfontinst/thumbnail/Makefile.am 2005-09-10 04:25:09.000000000 -0400
-+++ kdebase-3.5.6-new/kcontrol/kfontinst/thumbnail/Makefile.am 2007-02-10 09:29:58.000000000 -0500
+--- kdebase-3.5.7/kcontrol/kfontinst/thumbnail/Makefile.am 2005-09-10 04:25:09.000000000 -0400
++++ kdebase-3.5.7-new/kcontrol/kfontinst/thumbnail/Makefile.am 2007-05-19 23:08:26.000000000 -0400
@@ -2,7 +2,7 @@
fontthumbnail_la_SOURCES = FontThumbnail.cpp
@@ -311,8 +311,8 @@
-AM_CPPFLAGS= -I$(srcdir)/../lib -I$(srcdir)/../../fonts $(all_includes) $(LIBFREETYPE_CFLAGS)
+AM_CPPFLAGS= -I$(srcdir)/../lib -I$(srcdir)/../../fonts $(LIBFREETYPE_CFLAGS) $(all_includes)
---- kdebase-3.5.6/kcontrol/kfontinst/viewpart/FontViewerApp.cpp 2005-10-10 11:03:47.000000000 -0400
-+++ kdebase-3.5.6-new/kcontrol/kfontinst/viewpart/FontViewerApp.cpp 2007-02-10 09:29:58.000000000 -0500
+--- kdebase-3.5.7/kcontrol/kfontinst/viewpart/FontViewerApp.cpp 2005-10-10 11:03:47.000000000 -0400
++++ kdebase-3.5.7-new/kcontrol/kfontinst/viewpart/FontViewerApp.cpp 2007-05-19 23:08:26.000000000 -0400
@@ -116,7 +116,7 @@
KAboutData::License_GPL,
I18N_NOOP("(c) Craig Drummond, 2004"));
@@ -322,8 +322,8 @@
{
KCmdLineArgs::init(argc, argv, &aboutData);
KCmdLineArgs::addCmdLineOptions(options);
---- kdebase-3.5.6/kcontrol/kfontinst/viewpart/Makefile.am 2005-09-10 04:25:09.000000000 -0400
-+++ kdebase-3.5.6-new/kcontrol/kfontinst/viewpart/Makefile.am 2007-02-10 09:29:58.000000000 -0500
+--- kdebase-3.5.7/kcontrol/kfontinst/viewpart/Makefile.am 2005-09-10 04:25:09.000000000 -0400
++++ kdebase-3.5.7-new/kcontrol/kfontinst/viewpart/Makefile.am 2007-05-19 23:08:26.000000000 -0400
@@ -13,18 +13,21 @@
kde_services_DATA = kfontviewpart.desktop
@@ -351,8 +351,8 @@
+kfontview_la_SOURCES = FontViewerApp.cpp
---- kdebase-3.5.6/kdcop/Makefile.am 2005-09-10 04:25:53.000000000 -0400
-+++ kdebase-3.5.6-new/kdcop/Makefile.am 2007-02-10 09:29:58.000000000 -0500
+--- kdebase-3.5.7/kdcop/Makefile.am 2005-09-10 04:25:53.000000000 -0400
++++ kdebase-3.5.7-new/kdcop/Makefile.am 2007-05-19 23:08:26.000000000 -0400
@@ -7,10 +7,13 @@
INCLUDES = $(all_includes)
@@ -371,8 +371,8 @@
noinst_HEADERS = kdcopwindow.h
METASOURCES = AUTO
---- kdebase-3.5.6/kdcop/kdcop.cpp 2005-09-10 04:25:53.000000000 -0400
-+++ kdebase-3.5.6-new/kdcop/kdcop.cpp 2007-02-10 09:29:58.000000000 -0500
+--- kdebase-3.5.7/kdcop/kdcop.cpp 2005-09-10 04:25:53.000000000 -0400
++++ kdebase-3.5.7-new/kdcop/kdcop.cpp 2007-05-19 23:08:26.000000000 -0400
@@ -15,7 +15,7 @@
KCmdLineLastOption
};
@@ -382,8 +382,8 @@
{
KAboutData aboutData( "kdcop", I18N_NOOP("KDCOP"),
"0.1", I18N_NOOP( "A graphical DCOP browser/client" ),
---- kdebase-3.5.6/kdebugdialog/Makefile.am 2005-09-10 04:24:57.000000000 -0400
-+++ kdebase-3.5.6-new/kdebugdialog/Makefile.am 2007-02-10 09:29:58.000000000 -0500
+--- kdebase-3.5.7/kdebugdialog/Makefile.am 2005-09-10 04:24:57.000000000 -0400
++++ kdebase-3.5.7-new/kdebugdialog/Makefile.am 2007-05-19 23:08:26.000000000 -0400
@@ -4,12 +4,14 @@
####### Files
@@ -404,8 +404,8 @@
messages:
$(XGETTEXT) *.cpp -o $(podir)/kdebugdialog.pot
---- kdebase-3.5.6/kdebugdialog/main.cpp 2005-10-10 11:03:40.000000000 -0400
-+++ kdebase-3.5.6-new/kdebugdialog/main.cpp 2007-02-10 09:29:58.000000000 -0500
+--- kdebase-3.5.7/kdebugdialog/main.cpp 2005-10-10 11:03:40.000000000 -0400
++++ kdebase-3.5.7-new/kdebugdialog/main.cpp 2007-05-19 23:08:26.000000000 -0400
@@ -75,7 +75,7 @@
KCmdLineLastOption
};
@@ -415,8 +415,8 @@
{
KAboutData data( "kdebugdialog", I18N_NOOP( "KDebugDialog"),
"1.0", I18N_NOOP("A dialog box for setting preferences for debug output"),
---- kdebase-3.5.6/kdepasswd/Makefile.am 2005-09-10 04:24:59.000000000 -0400
-+++ kdebase-3.5.6-new/kdepasswd/Makefile.am 2007-02-10 09:29:58.000000000 -0500
+--- kdebase-3.5.7/kdepasswd/Makefile.am 2005-09-10 04:24:59.000000000 -0400
++++ kdebase-3.5.7-new/kdepasswd/Makefile.am 2007-05-19 23:08:26.000000000 -0400
@@ -1,10 +1,13 @@
SUBDIRS = kcm
@@ -435,8 +435,8 @@
METASOURCES = AUTO
AM_CPPFLAGS= -I$(top_srcdir)/libkonq $(all_includes)
---- kdebase-3.5.6/kdepasswd/kdepasswd.cpp 2005-09-10 04:24:59.000000000 -0400
-+++ kdebase-3.5.6-new/kdepasswd/kdepasswd.cpp 2007-02-10 09:29:59.000000000 -0500
+--- kdebase-3.5.7/kdepasswd/kdepasswd.cpp 2005-09-10 04:24:59.000000000 -0400
++++ kdebase-3.5.7-new/kdepasswd/kdepasswd.cpp 2007-05-19 23:08:26.000000000 -0400
@@ -26,7 +26,7 @@
};
@@ -446,8 +446,8 @@
{
KAboutData aboutData("kdepasswd", I18N_NOOP("KDE passwd"),
VERSION, I18N_NOOP("Changes a UNIX password."),
---- kdebase-3.5.6/kdeprint/kdeprintfax/Makefile.am 2005-09-10 04:25:38.000000000 -0400
-+++ kdebase-3.5.6-new/kdeprint/kdeprintfax/Makefile.am 2007-02-10 09:29:59.000000000 -0500
+--- kdebase-3.5.7/kdeprint/kdeprintfax/Makefile.am 2005-09-10 04:25:38.000000000 -0400
++++ kdebase-3.5.7-new/kdeprint/kdeprintfax/Makefile.am 2007-05-19 23:08:26.000000000 -0400
@@ -1,11 +1,14 @@
INCLUDES= $(all_includes)
@@ -468,8 +468,8 @@
xdg_apps_DATA = kdeprintfax.desktop
---- kdebase-3.5.6/kdeprint/kdeprintfax/main.cpp 2005-10-10 11:04:02.000000000 -0400
-+++ kdebase-3.5.6-new/kdeprint/kdeprintfax/main.cpp 2007-02-10 09:29:59.000000000 -0500
+--- kdebase-3.5.7/kdeprint/kdeprintfax/main.cpp 2005-10-10 11:04:02.000000000 -0400
++++ kdebase-3.5.7-new/kdeprint/kdeprintfax/main.cpp 2007-05-19 23:08:26.000000000 -0400
@@ -44,7 +44,7 @@
// INSERT YOUR COMMANDLINE OPTIONS HERE
};
@@ -479,8 +479,8 @@
{
KAboutData aboutData( "kdeprintfax", I18N_NOOP("KdeprintFax"),
---- kdebase-3.5.6/kdeprint/kprinter/printwrapper.cpp 2007-01-15 06:32:07.000000000 -0500
-+++ kdebase-3.5.6-new/kdeprint/kprinter/printwrapper.cpp 2007-02-10 09:29:59.000000000 -0500
+--- kdebase-3.5.7/kdeprint/kprinter/printwrapper.cpp 2007-01-15 06:32:07.000000000 -0500
++++ kdebase-3.5.7-new/kdeprint/kprinter/printwrapper.cpp 2007-05-19 23:08:26.000000000 -0400
@@ -137,10 +137,6 @@
{
KCmdLineArgs *args = KCmdLineArgs::parsedArgs();
@@ -503,8 +503,8 @@
# if defined(HAVE_SIGSET)
sigset(SIGHUP, signal_handler);
sigset(SIGINT, signal_handler);
---- kdebase-3.5.6/kdesktop/Makefile.am 2006-05-22 14:12:51.000000000 -0400
-+++ kdebase-3.5.6-new/kdesktop/Makefile.am 2007-02-10 09:29:59.000000000 -0500
+--- kdebase-3.5.7/kdesktop/Makefile.am 2006-05-22 14:12:51.000000000 -0400
++++ kdebase-3.5.7-new/kdesktop/Makefile.am 2007-05-19 23:08:26.000000000 -0400
@@ -8,9 +8,9 @@
####### Files
@@ -530,8 +530,8 @@
METASOURCES = AUTO
---- kdebase-3.5.6/kdesktop/kcheckrunning.cpp 2005-10-10 11:04:11.000000000 -0400
-+++ kdebase-3.5.6-new/kdesktop/kcheckrunning.cpp 2007-02-10 09:29:59.000000000 -0500
+--- kdebase-3.5.7/kdesktop/kcheckrunning.cpp 2005-10-10 11:04:11.000000000 -0400
++++ kdebase-3.5.7-new/kdesktop/kcheckrunning.cpp 2007-05-19 23:08:26.000000000 -0400
@@ -18,8 +18,9 @@
*/
@@ -543,8 +543,8 @@
{
Display* dpy = XOpenDisplay( NULL );
if( dpy == NULL )
---- kdebase-3.5.6/kdesktop/kwebdesktop/Makefile.am 2005-09-10 04:25:45.000000000 -0400
-+++ kdebase-3.5.6-new/kdesktop/kwebdesktop/Makefile.am 2007-02-10 09:29:59.000000000 -0500
+--- kdebase-3.5.7/kdesktop/kwebdesktop/Makefile.am 2005-09-10 04:25:45.000000000 -0400
++++ kdebase-3.5.7-new/kdesktop/kwebdesktop/Makefile.am 2007-05-19 23:08:26.000000000 -0400
@@ -2,12 +2,15 @@
INCLUDES= $(all_includes)
LDADD = $(LIB_KHTML)
@@ -564,8 +564,8 @@
kdesktop_kwebdesktop_data_DATA = kwebdesktop.desktop
kdesktop_kwebdesktop_datadir = $(kde_datadir)/kdesktop/programs
---- kdebase-3.5.6/kdesktop/kwebdesktop/kwebdesktop.cpp 2007-01-15 06:32:10.000000000 -0500
-+++ kdebase-3.5.6-new/kdesktop/kwebdesktop/kwebdesktop.cpp 2007-02-10 09:29:59.000000000 -0500
+--- kdebase-3.5.7/kdesktop/kwebdesktop/kwebdesktop.cpp 2007-01-15 06:32:10.000000000 -0500
++++ kdebase-3.5.7-new/kdesktop/kwebdesktop/kwebdesktop.cpp 2007-05-19 23:08:26.000000000 -0400
@@ -84,7 +84,7 @@
}
@@ -575,8 +575,8 @@
{
KAboutData data( "kwebdesktop", I18N_NOOP("KDE Web Desktop"),
VERSION,
---- kdebase-3.5.6/kdesktop/lock/Makefile.am 2005-09-10 04:25:41.000000000 -0400
-+++ kdebase-3.5.6-new/kdesktop/lock/Makefile.am 2007-02-10 09:29:59.000000000 -0500
+--- kdebase-3.5.7/kdesktop/lock/Makefile.am 2005-09-10 04:25:41.000000000 -0400
++++ kdebase-3.5.7-new/kdesktop/lock/Makefile.am 2007-05-19 23:08:26.000000000 -0400
@@ -1,14 +1,16 @@
## Makefile.am of kdebase/kdesktop/lock
@@ -598,8 +598,8 @@
noinst_HEADERS = lockprocess.h lockdlg.h autologout.h main.h
---- kdebase-3.5.6/kdesktop/lock/main.cc 2006-03-17 05:17:37.000000000 -0500
-+++ kdebase-3.5.6-new/kdesktop/lock/main.cc 2007-02-10 09:29:59.000000000 -0500
+--- kdebase-3.5.7/kdesktop/lock/main.cc 2006-03-17 05:17:37.000000000 -0500
++++ kdebase-3.5.7-new/kdesktop/lock/main.cc 2007-05-19 23:08:26.000000000 -0400
@@ -59,7 +59,7 @@
// -----------------------------------------------------------------------------
@@ -609,8 +609,8 @@
{
KLocale::setMainCatalogue("kdesktop");
---- kdebase-3.5.6/kdesu/kdesu/Makefile.am 2005-09-10 04:26:14.000000000 -0400
-+++ kdebase-3.5.6-new/kdesu/kdesu/Makefile.am 2007-02-10 09:29:59.000000000 -0500
+--- kdebase-3.5.7/kdesu/kdesu/Makefile.am 2005-09-10 04:26:14.000000000 -0400
++++ kdebase-3.5.7-new/kdesu/kdesu/Makefile.am 2007-05-19 23:08:26.000000000 -0400
@@ -3,11 +3,14 @@
INCLUDES= $(all_includes)
@@ -631,8 +631,8 @@
noinst_HEADERS = sudlg.h
## Messages
---- kdebase-3.5.6/kdesu/kdesu/kdesu.cpp 2006-05-22 14:13:07.000000000 -0400
-+++ kdebase-3.5.6-new/kdesu/kdesu/kdesu.cpp 2007-02-10 09:29:59.000000000 -0500
+--- kdebase-3.5.7/kdesu/kdesu/kdesu.cpp 2006-05-22 14:13:07.000000000 -0400
++++ kdebase-3.5.7-new/kdesu/kdesu/kdesu.cpp 2007-05-19 23:08:26.000000000 -0400
@@ -86,7 +86,7 @@
static int startApp();
@@ -642,8 +642,8 @@
{
// FIXME: this can be considered a poor man's solution, as it's not
// directly obvious to a gui user. :)
---- kdebase-3.5.6/kdesu/kdesud/Makefile.am 2005-09-10 04:26:13.000000000 -0400
-+++ kdebase-3.5.6-new/kdesu/kdesud/Makefile.am 2007-02-10 09:29:59.000000000 -0500
+--- kdebase-3.5.7/kdesu/kdesud/Makefile.am 2005-09-10 04:26:13.000000000 -0400
++++ kdebase-3.5.7-new/kdesu/kdesud/Makefile.am 2007-05-19 23:08:26.000000000 -0400
@@ -4,10 +4,13 @@
KDE_CXXFLAGS = $(KDE_USE_FPIE)
@@ -662,8 +662,8 @@
noinst_HEADERS = repo.h handler.h lexer.h secure.h
## kdesud needs to be suid or sgid something
---- kdebase-3.5.6/kdesu/kdesud/kdesud.cpp 2005-09-10 04:26:13.000000000 -0400
-+++ kdebase-3.5.6-new/kdesu/kdesud/kdesud.cpp 2007-02-10 09:29:59.000000000 -0500
+--- kdebase-3.5.7/kdesu/kdesud/kdesud.cpp 2007-05-14 03:55:53.000000000 -0400
++++ kdebase-3.5.7-new/kdesu/kdesud/kdesud.cpp 2007-05-19 23:08:26.000000000 -0400
@@ -246,7 +246,7 @@
* Main program
*/
@@ -673,8 +673,8 @@
{
KAboutData aboutData("kdesud", I18N_NOOP("KDE su daemon"),
Version, I18N_NOOP("Daemon used by kdesu"),
---- kdebase-3.5.6/kdialog/Makefile.am 2005-09-10 04:25:36.000000000 -0400
-+++ kdebase-3.5.6-new/kdialog/Makefile.am 2007-02-10 09:29:59.000000000 -0500
+--- kdebase-3.5.7/kdialog/Makefile.am 2005-09-10 04:25:36.000000000 -0400
++++ kdebase-3.5.7-new/kdialog/Makefile.am 2007-05-19 23:08:26.000000000 -0400
@@ -1,11 +1,13 @@
KDE_CXXFLAGS = -DQT_NO_CAST_ASCII -DQT_NO_ASCII_CAST
INCLUDES = $(all_includes)
@@ -693,8 +693,8 @@
METASOURCES = AUTO
---- kdebase-3.5.6/kdialog/kdialog.cpp 2006-05-22 14:12:42.000000000 -0400
-+++ kdebase-3.5.6-new/kdialog/kdialog.cpp 2007-02-10 09:29:59.000000000 -0500
+--- kdebase-3.5.7/kdialog/kdialog.cpp 2006-05-22 14:12:42.000000000 -0400
++++ kdebase-3.5.7-new/kdialog/kdialog.cpp 2007-05-19 23:08:26.000000000 -0400
@@ -660,7 +660,7 @@
}
@@ -704,8 +704,8 @@
{
KAboutData aboutData( "kdialog", I18N_NOOP("KDialog"),
"1.0", I18N_NOOP( "KDialog can be used to show nice dialog boxes from shell scripts" ),
---- kdebase-3.5.6/kdm/kfrontend/kdm_greet.c 2005-10-10 11:04:31.000000000 -0400
-+++ kdebase-3.5.6-new/kdm/kfrontend/kdm_greet.c 2007-02-10 09:29:59.000000000 -0500
+--- kdebase-3.5.7/kdm/kfrontend/kdm_greet.c 2005-10-10 11:04:31.000000000 -0400
++++ kdebase-3.5.7-new/kdm/kfrontend/kdm_greet.c 2007-05-19 23:08:26.000000000 -0400
@@ -44,8 +44,9 @@
# include <sched.h>
#endif
@@ -717,8 +717,8 @@
# include <X11/keysym.h>
#endif
---- kdebase-3.5.6/kfind/Makefile.am 2005-09-10 04:25:00.000000000 -0400
-+++ kdebase-3.5.6-new/kfind/Makefile.am 2007-02-10 09:29:59.000000000 -0500
+--- kdebase-3.5.7/kfind/Makefile.am 2005-09-10 04:25:00.000000000 -0400
++++ kdebase-3.5.7-new/kfind/Makefile.am 2007-05-19 23:08:26.000000000 -0400
@@ -28,9 +28,12 @@
#And this is for kfind
@@ -736,8 +736,8 @@
# the library search path.
-kfind_LDFLAGS = $(all_libraries) $(KDE_RPATH)
+kfind_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module
---- kdebase-3.5.6/kfind/main.cpp 2005-09-10 04:25:00.000000000 -0400
-+++ kdebase-3.5.6-new/kfind/main.cpp 2007-02-10 09:29:59.000000000 -0500
+--- kdebase-3.5.7/kfind/main.cpp 2005-09-10 04:25:00.000000000 -0400
++++ kdebase-3.5.7-new/kfind/main.cpp 2007-05-19 23:08:26.000000000 -0400
@@ -19,7 +19,7 @@
KCmdLineLastOption
};
@@ -747,8 +747,8 @@
{
KLocale::setMainCatalogue("kfindpart");
KAboutData aboutData( "kfind", I18N_NOOP("KFind"),
---- kdebase-3.5.6/khelpcenter/Makefile.am 2005-09-10 04:25:18.000000000 -0400
-+++ kdebase-3.5.6-new/khelpcenter/Makefile.am 2007-02-10 09:29:59.000000000 -0500
+--- kdebase-3.5.7/khelpcenter/Makefile.am 2005-09-10 04:25:18.000000000 -0400
++++ kdebase-3.5.7-new/khelpcenter/Makefile.am 2007-05-19 23:08:26.000000000 -0400
@@ -3,14 +3,14 @@
INCLUDES = $(all_includes)
METASOURCES = AUTO
@@ -769,8 +769,8 @@
khelpcenter_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN)
khelpcenter_la_LIBADD = $(LIB_KHTML)
---- kdebase-3.5.6/khelpcenter/htmlsearch/Makefile.am 2005-09-10 04:25:18.000000000 -0400
-+++ kdebase-3.5.6-new/khelpcenter/htmlsearch/Makefile.am 2007-02-10 09:29:59.000000000 -0500
+--- kdebase-3.5.7/khelpcenter/htmlsearch/Makefile.am 2005-09-10 04:25:18.000000000 -0400
++++ kdebase-3.5.7-new/khelpcenter/htmlsearch/Makefile.am 2007-05-19 23:08:26.000000000 -0400
@@ -21,14 +21,15 @@
xdg_apps_DATA = htmlsearch.desktop
@@ -791,8 +791,8 @@
xpm_DATA = unchecked.xpm checked.xpm
xpmdir = $(kde_datadir)/khelpcenter/pics
---- kdebase-3.5.6/khelpcenter/htmlsearch/index.cpp 2005-09-10 04:25:18.000000000 -0400
-+++ kdebase-3.5.6-new/khelpcenter/htmlsearch/index.cpp 2007-02-10 09:29:59.000000000 -0500
+--- kdebase-3.5.7/khelpcenter/htmlsearch/index.cpp 2005-09-10 04:25:18.000000000 -0400
++++ kdebase-3.5.7-new/khelpcenter/htmlsearch/index.cpp 2007-05-19 23:08:26.000000000 -0400
@@ -13,7 +13,7 @@
};
@@ -802,8 +802,8 @@
{
KAboutData aboutData( "khtmlindex", I18N_NOOP("KHtmlIndex"),
"",
---- kdebase-3.5.6/khelpcenter/khc_indexbuilder.cpp 2005-10-10 11:03:57.000000000 -0400
-+++ kdebase-3.5.6-new/khelpcenter/khc_indexbuilder.cpp 2007-02-10 09:29:59.000000000 -0500
+--- kdebase-3.5.7/khelpcenter/khc_indexbuilder.cpp 2005-10-10 11:03:57.000000000 -0400
++++ kdebase-3.5.7-new/khelpcenter/khc_indexbuilder.cpp 2007-05-19 23:08:26.000000000 -0400
@@ -163,7 +163,7 @@
KCmdLineLastOption
};
@@ -813,8 +813,8 @@
{
KAboutData aboutData( "khc_indexbuilder",
I18N_NOOP("KHelpCenter Index Builder"),
---- kdebase-3.5.6/kicker/extensions/kasbar/Makefile.am 2005-09-10 04:25:29.000000000 -0400
-+++ kdebase-3.5.6-new/kicker/extensions/kasbar/Makefile.am 2007-02-10 09:29:59.000000000 -0500
+--- kdebase-3.5.7/kicker/extensions/kasbar/Makefile.am 2005-09-10 04:25:29.000000000 -0400
++++ kdebase-3.5.7-new/kicker/extensions/kasbar/Makefile.am 2007-05-19 23:08:26.000000000 -0400
@@ -35,10 +35,12 @@
EXTRA_DIST = $(lnk_DATA)
@@ -832,8 +832,8 @@
$(LIB_QT) $(LIB_KDECORE) $(LIB_KDEUI)
---- kdebase-3.5.6/kicker/extensions/kasbar/kasbarapp.cpp 2005-10-10 11:03:59.000000000 -0400
-+++ kdebase-3.5.6-new/kicker/extensions/kasbar/kasbarapp.cpp 2007-02-10 09:29:59.000000000 -0500
+--- kdebase-3.5.7/kicker/extensions/kasbar/kasbarapp.cpp 2005-10-10 11:03:59.000000000 -0400
++++ kdebase-3.5.7-new/kicker/extensions/kasbar/kasbarapp.cpp 2007-05-19 23:08:26.000000000 -0400
@@ -73,7 +73,7 @@
KCmdLineLastOption
};
@@ -843,8 +843,8 @@
{
KCmdLineArgs::init( argc, argv, "kasbar", "KasBar", I18N_NOOP( "An alternative task manager" ), VERSION_STRING );
KCmdLineArgs::addCmdLineOptions( options );
---- kdebase-3.5.6/kioslave/info/kde-info2html.conf 2005-09-10 04:25:37.000000000 -0400
-+++ kdebase-3.5.6-new/kioslave/info/kde-info2html.conf 2007-02-10 09:29:59.000000000 -0500
+--- kdebase-3.5.7/kioslave/info/kde-info2html.conf 2005-09-10 04:25:37.000000000 -0400
++++ kdebase-3.5.7-new/kioslave/info/kde-info2html.conf 2007-05-19 23:08:26.000000000 -0400
@@ -25,6 +25,7 @@
#-- location of info files.
@@ -853,8 +853,8 @@
"/usr/share/info",
"/usr/info",
"/usr/lib/info",
---- kdebase-3.5.6/kioslave/ldap/configure.in.in 2005-10-10 11:04:01.000000000 -0400
-+++ kdebase-3.5.6-new/kioslave/ldap/configure.in.in 2007-02-10 09:29:59.000000000 -0500
+--- kdebase-3.5.7/kioslave/ldap/configure.in.in 2005-10-10 11:04:01.000000000 -0400
++++ kdebase-3.5.7-new/kioslave/ldap/configure.in.in 2007-05-19 23:08:26.000000000 -0400
@@ -38,10 +38,11 @@
case "$with_ldap" in
no) AC_MSG_RESULT(no) ;;
@@ -868,8 +868,8 @@
;;
FOUND)
AC_MSG_RESULT(incs=$ldap_incdir libs=$ldap_libdir)
---- kdebase-3.5.6/kioslave/man/kio_man.cpp 2005-10-10 11:04:01.000000000 -0400
-+++ kdebase-3.5.6-new/kioslave/man/kio_man.cpp 2007-02-10 09:29:59.000000000 -0500
+--- kdebase-3.5.7/kioslave/man/kio_man.cpp 2005-10-10 11:04:01.000000000 -0400
++++ kdebase-3.5.7-new/kioslave/man/kio_man.cpp 2007-05-19 23:08:26.000000000 -0400
@@ -50,7 +50,7 @@
MANProtocol *MANProtocol::_self = 0;
@@ -887,33 +887,16 @@
"/usr/X11/man",
"/usr/X11R6/man",
"/usr/man",
---- kdebase-3.5.6/kioslave/media/configure.in.in 2006-10-01 13:31:54.000000000 -0400
-+++ kdebase-3.5.6-new/kioslave/media/configure.in.in 2007-02-10 09:31:36.000000000 -0500
-@@ -179,3 +179,5 @@
+--- kdebase-3.5.7/kioslave/media/configure.in.in 2007-05-14 03:55:41.000000000 -0400
++++ kdebase-3.5.7-new/kioslave/media/configure.in.in 2007-05-19 23:08:26.000000000 -0400
+@@ -182,3 +182,5 @@
- AM_CONDITIONAL(include_media_linuxcdpolling, test "$LINUXCDPOLLING" = "yes")
- AM_CONDITIONAL(include_media_halbackend, test "$HALBACKEND" = yes)
-+
-+AC_CHECK_FUNCS(statvfs)
---- kdebase-3.5.6/kioslave/media/kfile-plugin/kfilemediaplugin.cpp 2007-01-15 06:31:31.000000000 -0500
-+++ kdebase-3.5.6-new/kioslave/media/kfile-plugin/kfilemediaplugin.cpp 2007-02-10 09:31:13.000000000 -0500
-@@ -29,7 +29,13 @@
- #include <qapplication.h>
- #include <qfile.h>
+ AC_CHECK_FUNCS(statvfs)
--#include <sys/statvfs.h>
-+#ifdef HAVE_STATVFS
-+# include <sys/statvfs.h>
-+#else
-+# include <sys/mount.h>
-+# define statvfs statfs
-+# define f_frsize f_bsize
-+#endif
-
- typedef KGenericFactory<KFileMediaPlugin> KFileMediaPluginFactory;
- K_EXPORT_COMPONENT_FACTORY(kfile_media, KFileMediaPluginFactory("kio_media"))
---- kdebase-3.5.6/kioslave/media/mounthelper/Makefile.am 2006-07-22 04:15:42.000000000 -0400
-+++ kdebase-3.5.6-new/kioslave/media/mounthelper/Makefile.am 2007-02-10 09:29:59.000000000 -0500
++AC_CHECK_FUNCS(statvfs)
++
+--- kdebase-3.5.7/kioslave/media/mounthelper/Makefile.am 2006-07-22 04:15:42.000000000 -0400
++++ kdebase-3.5.7-new/kioslave/media/mounthelper/Makefile.am 2007-05-19 23:08:29.000000000 -0400
@@ -1,12 +1,14 @@
-bin_PROGRAMS = kio_media_mounthelper
+bin_PROGRAMS =
@@ -933,9 +916,9 @@
METASOURCES = AUTO
---- kdebase-3.5.6/kioslave/media/mounthelper/kio_media_mounthelper.cpp 2007-01-15 06:31:31.000000000 -0500
-+++ kdebase-3.5.6-new/kioslave/media/mounthelper/kio_media_mounthelper.cpp 2007-02-10 09:29:59.000000000 -0500
-@@ -184,7 +184,7 @@
+--- kdebase-3.5.7/kioslave/media/mounthelper/kio_media_mounthelper.cpp 2007-05-14 03:55:40.000000000 -0400
++++ kdebase-3.5.7-new/kioslave/media/mounthelper/kio_media_mounthelper.cpp 2007-05-19 23:08:29.000000000 -0400
+@@ -188,7 +188,7 @@
};
@@ -944,8 +927,8 @@
{
KCmdLineArgs::init(argc, argv, "kio_media_mounthelper",
"kio_media_mounthelper", "kio_media_mounthelper",
---- kdebase-3.5.6/kioslave/nfs/mount_xdr.c 2005-09-10 04:25:37.000000000 -0400
-+++ kdebase-3.5.6-new/kioslave/nfs/mount_xdr.c 2007-02-10 09:29:59.000000000 -0500
+--- kdebase-3.5.7/kioslave/nfs/mount_xdr.c 2005-09-10 04:25:37.000000000 -0400
++++ kdebase-3.5.7-new/kioslave/nfs/mount_xdr.c 2007-05-19 23:08:29.000000000 -0400
@@ -43,6 +43,13 @@
/* from @(#)mount.x 1.3 91/03/11 TIRPC 1.0 */
@@ -960,8 +943,8 @@
bool_t
xdr_fhandle(XDR *xdrs, fhandle objp)
{
---- kdebase-3.5.6/kioslave/trash/Makefile.am 2005-09-10 04:25:37.000000000 -0400
-+++ kdebase-3.5.6-new/kioslave/trash/Makefile.am 2007-02-10 09:29:59.000000000 -0500
+--- kdebase-3.5.7/kioslave/trash/Makefile.am 2005-09-10 04:25:37.000000000 -0400
++++ kdebase-3.5.7-new/kioslave/trash/Makefile.am 2007-05-19 23:08:29.000000000 -0400
@@ -9,10 +9,13 @@
kio_trash_la_LIBADD = libtrashcommon.la $(LIB_KIO)
kio_trash_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) -no-undefined
@@ -980,8 +963,8 @@
kde_services_DATA = trash.protocol
---- kdebase-3.5.6/kioslave/trash/ktrash.cpp 2005-10-10 11:04:01.000000000 -0400
-+++ kdebase-3.5.6-new/kioslave/trash/ktrash.cpp 2007-02-10 09:29:59.000000000 -0500
+--- kdebase-3.5.7/kioslave/trash/ktrash.cpp 2005-10-10 11:04:01.000000000 -0400
++++ kdebase-3.5.7-new/kioslave/trash/ktrash.cpp 2007-05-19 23:08:29.000000000 -0400
@@ -35,7 +35,7 @@
KCmdLineLastOption
};
@@ -991,8 +974,8 @@
{
KApplication::disableAutoDcopRegistration();
KCmdLineArgs::init( argc, argv, "ktrash",
---- kdebase-3.5.6/knetattach/Makefile.am 2005-09-10 04:25:49.000000000 -0400
-+++ kdebase-3.5.6-new/knetattach/Makefile.am 2007-02-10 09:29:59.000000000 -0500
+--- kdebase-3.5.7/knetattach/Makefile.am 2005-09-10 04:25:49.000000000 -0400
++++ kdebase-3.5.7-new/knetattach/Makefile.am 2007-05-19 23:08:29.000000000 -0400
@@ -1,9 +1,12 @@
INCLUDES= $(all_includes)
@@ -1010,8 +993,8 @@
METASOURCES = AUTO
xdg_apps_DATA = knetattach.desktop
KDE_ICON = AUTO
---- kdebase-3.5.6/knetattach/main.cpp 2005-10-10 11:04:20.000000000 -0400
-+++ kdebase-3.5.6-new/knetattach/main.cpp 2007-02-10 09:29:59.000000000 -0500
+--- kdebase-3.5.7/knetattach/main.cpp 2005-10-10 11:04:20.000000000 -0400
++++ kdebase-3.5.7-new/knetattach/main.cpp 2007-05-19 23:08:29.000000000 -0400
@@ -25,7 +25,7 @@
#include "knetattach.h"
@@ -1021,8 +1004,8 @@
KAboutData about("knetattach", I18N_NOOP("KDE Network Wizard"), "1.0",
I18N_NOOP("KDE Network Wizard"),
KAboutData::License_GPL,
---- kdebase-3.5.6/konqueror/keditbookmarks/Makefile.am 2005-09-10 04:25:49.000000000 -0400
-+++ kdebase-3.5.6-new/konqueror/keditbookmarks/Makefile.am 2007-02-10 09:29:59.000000000 -0500
+--- kdebase-3.5.7/konqueror/keditbookmarks/Makefile.am 2005-09-10 04:25:49.000000000 -0400
++++ kdebase-3.5.7-new/konqueror/keditbookmarks/Makefile.am 2007-05-19 23:08:29.000000000 -0400
@@ -2,13 +2,13 @@
METASOURCES = AUTO
@@ -1042,8 +1025,8 @@
dcop_DCOPIDLNG = true
keditbookmarks_la_SOURCES = main.cpp listview.cpp toplevel.cpp actionsimpl.cpp commands.cpp importers.cpp dcop.skel dcop.cpp bookmarkiterator.cpp \
---- kdebase-3.5.6/konqueror/keditbookmarks/kbookmarkmerger.cpp 2005-09-10 04:25:49.000000000 -0400
-+++ kdebase-3.5.6-new/konqueror/keditbookmarks/kbookmarkmerger.cpp 2007-02-10 09:29:59.000000000 -0500
+--- kdebase-3.5.7/konqueror/keditbookmarks/kbookmarkmerger.cpp 2005-09-10 04:25:49.000000000 -0400
++++ kdebase-3.5.7-new/konqueror/keditbookmarks/kbookmarkmerger.cpp 2007-05-19 23:08:29.000000000 -0400
@@ -55,7 +55,7 @@
return XGetSelectionOwner( dpy, atom ) != None;
}
@@ -1053,8 +1036,8 @@
{
const bool kdeRunning = kdeIsRunning();
---- kdebase-3.5.6/kpager/Makefile.am 2005-09-10 04:25:36.000000000 -0400
-+++ kdebase-3.5.6-new/kpager/Makefile.am 2007-02-10 09:29:59.000000000 -0500
+--- kdebase-3.5.7/kpager/Makefile.am 2005-09-10 04:25:36.000000000 -0400
++++ kdebase-3.5.7-new/kpager/Makefile.am 2007-05-19 23:08:29.000000000 -0400
@@ -1,14 +1,16 @@
INCLUDES= $(all_includes)
@@ -1077,8 +1060,8 @@
KDE_ICON = kpager
---- kdebase-3.5.6/kpager/main.cpp 2005-10-10 11:04:00.000000000 -0400
-+++ kdebase-3.5.6-new/kpager/main.cpp 2007-02-10 09:29:59.000000000 -0500
+--- kdebase-3.5.7/kpager/main.cpp 2005-10-10 11:04:00.000000000 -0400
++++ kdebase-3.5.7-new/kpager/main.cpp 2007-05-19 23:08:29.000000000 -0400
@@ -62,7 +62,7 @@
};
@@ -1088,8 +1071,8 @@
{
KAboutData *aboutdata = new KAboutData("kpager", "KPager", "1.5",
I18N_NOOP("Desktop Overview"), KAboutData::License_GPL,
---- kdebase-3.5.6/kpersonalizer/Makefile.am 2005-09-10 04:25:00.000000000 -0400
-+++ kdebase-3.5.6-new/kpersonalizer/Makefile.am 2007-02-10 09:29:59.000000000 -0500
+--- kdebase-3.5.7/kpersonalizer/Makefile.am 2005-09-10 04:25:00.000000000 -0400
++++ kdebase-3.5.7-new/kpersonalizer/Makefile.am 2007-05-19 23:08:29.000000000 -0400
@@ -1,11 +1,14 @@
-bin_PROGRAMS = kpersonalizer
-kpersonalizer_SOURCES = stylepreview.ui krefinepage.cpp \
@@ -1117,8 +1100,8 @@
# Uncomment the following two lines if you add a ui.rc file for your application to make use of
More information about the macports-changes
mailing list