[20195] trunk/dports/kde/kdesdk3
source_changes at macosforge.org
source_changes at macosforge.org
Fri Oct 27 11:23:40 PDT 2006
Revision: 20195
http://trac.macosforge.org/projects/macports/changeset/20195
Author: takanori at macports.org
Date: 2006-10-27 11:23:39 -0700 (Fri, 27 Oct 2006)
Log Message:
-----------
Version 3.5.4.
Modified Paths:
--------------
trunk/dports/kde/kdesdk3/Portfile
trunk/dports/kde/kdesdk3/files/CompileScript.sh
trunk/dports/kde/kdesdk3/files/InstallScript.sh
trunk/dports/kde/kdesdk3/files/kdesdk3.patch
Modified: trunk/dports/kde/kdesdk3/Portfile
===================================================================
--- trunk/dports/kde/kdesdk3/Portfile 2006-10-27 18:23:30 UTC (rev 20194)
+++ trunk/dports/kde/kdesdk3/Portfile 2006-10-27 18:23:39 UTC (rev 20195)
@@ -1,58 +1,55 @@
# $Id$
-#Synced with Fink, Version 3.5.1-1023
+#Synced with Fink, Version 3.5.4-1021
PortSystem 1.0
name kdesdk3
-version 3.5.1
-revision 2
-set kdeadmin kde-admindir-3.5.1
+version 3.5.4
+set kdeadmin kde-admindir-252
categories kde
maintainers ben at macports.org takanori at macports.org
description KDE SDK. \
NB No KDE sound support. \
No SVN support.
+long_description ${description}
platforms darwin
-master_sites opendarwin::kde351 \
+homepage http://www.kde.org/
+master_sites opendarwin::kde354 \
opendarwin::admin
# kde:stable/${version}/src
# http://ranger.befunk.com/fink/:admin
-extract.suffix .tar.bz2
use_bzip2 yes
distname kdesdk-${version}
-distfiles ${distname}.tar.bz2:kde351 \
+distfiles ${distname}.tar.bz2:kde354 \
${kdeadmin}.tar.bz2:admin
depends_build port:autoconf \
- port:automake
-depends_lib port:kdebase3 \
- port:kdepim3 \
- port:db4
+ port:unsermake
+depends_lib port:db4 \
+ port:kdebase3 \
+ port:kdepim3
+# port:subversion
-checksums ${distname}.tar.bz2 md5 93199b8bf5793681fdb2e5cbcfcfbd93 \
- ${kdeadmin}.tar.bz2 md5 b6115a7310f8e8533af91be02e225d0e
+checksums ${distname}.tar.bz2 md5 2150e6a4ce5e42886a4afc6c0198c30c \
+ ${kdeadmin}.tar.bz2 md5 54a89925e71bd32f759c81b312ad0b9e
-extract.only ${distname}.tar.bz2
-post-extract { system "cd ${worksrcpath} && bzcat -dc ${distpath}/${kdeadmin}.tar.bz2 | tar xf -" }
+extract.only ${distname}.tar.bz2
+post-extract { system "cd ${worksrcpath} && bzcat -dc ${distpath}/${kdeadmin}.tar.bz2 | tar xf -" }
patchfiles kdesdk3.patch
patch {
cd ${worksrcpath}
foreach file $patchfiles {
- system "sed -e 's, at FINKPREFIX@,${prefix},g' ${portpath}/${filesdir}/${file} | patch -p1"
+ system "sed -e 's, at FINKPREFIX@,${prefix},g' ${filespath}/${file} | patch -p1"
}
+ system "perl -pi -e 's,-O2,-Os,g; s,doc/HTML,doc/kde,g; s,/usr/share/doc/packages/qt3/html,${prefix}/share/doc/qt3/html,g;' admin/*"
}
-post-patch {
- reinplace "s|lib/freetype219/||g" ${worksrcpath}/environment-helper.sh
- reinplace "s|include/qt|include/qt3|g" ${worksrcpath}/environment-helper.sh
+post-patch {
+ reinplace "s|/lib/freetype219||g" ${worksrcpath}/environment-helper.sh
reinplace "s|--with-ssl-dir=/usr|--with-ssl-dir=\$PREFIX|g" ${worksrcpath}/environment-helper.sh
- reinplace "s|2.5\\*|2.\[56\]\\*|g" ${worksrcpath}/admin/cvs.sh
- foreach file [glob ${worksrcpath}/admin/*] {
- reinplace "s|-O2|-Os|g" $file
- reinplace "s|doc/HTML|doc/kde|g" $file
- reinplace "s|/usr/share/doc/packages/qt3/html|${prefix}/share/doc/qt3/html|g" $file
- }
+ reinplace "s|HOME=/tmp|HOME=${workpath}|g" ${worksrcpath}/environment-helper.sh
+ reinplace "s|/tmp/buildlog|${workpath}/buildlog|g" ${worksrcpath}/build-helper.sh
foreach file {CompileScript.sh InstallScript.sh} {
- file copy ${portpath}/${filesdir}/${file} ${worksrcpath}
+ file copy ${filespath}/${file} ${worksrcpath}
reinplace "s|%p|${prefix}|g" ${worksrcpath}/${file}
reinplace "s|%N|${name}|g" ${worksrcpath}/${file}
reinplace "s|%v|${version}|g" ${worksrcpath}/${file}
@@ -62,19 +59,16 @@
reinplace "s|%i|${destroot}${prefix}|g" ${worksrcpath}/${file}
file attributes ${worksrcpath}/${file} -permissions 0755
}
+ reinplace "s|doc/HTML|doc/kde|g" ${worksrcpath}/scripts/kdedoc
}
-configure.args --with-db-name=db-4.3 --with-distribution='DarwinPorts/Mac OS X' --without-subversion --without-arts
+configure.args --with-db-name=db-4.3 --with-db-include-dir=${prefix}/include/db4 --with-distribution='MacPorts/Mac OS X' --without-subversion --without-arts
configure {}
build { system "cd ${worksrcpath} && ./CompileScript.sh" }
destroot { system "cd ${worksrcpath} && ./InstallScript.sh" }
-post-destroot {
+post-destroot {
xinstall -m 755 -d ${destroot}${prefix}/share/doc/${name}
xinstall -m 644 -W ${worksrcpath} COPYING README ${destroot}${prefix}/share/doc/${name}
}
-
-platform darwin 6 {
- depends_lib-append lib:libdl:dlcompat
-}
Modified: trunk/dports/kde/kdesdk3/files/CompileScript.sh
===================================================================
--- trunk/dports/kde/kdesdk3/files/CompileScript.sh 2006-10-27 18:23:30 UTC (rev 20194)
+++ trunk/dports/kde/kdesdk3/files/CompileScript.sh 2006-10-27 18:23:39 UTC (rev 20195)
@@ -1,19 +1,8 @@
#!/bin/sh -e
- export HOME=/tmp
- export PREFIX="%p"
- #fink
- #export LEX="%p/lib/flex/bin/flex"
- #darwinports
- export LEX="%p/bin/flex"
+ export PREFIX="%p" USE_UNSERMAKE=1
. ./environment-helper.sh
- export lt_cv_sys_max_cmd_len=65536
-#darwinports
- export UNSERMAKE="no"
-
- export CC=gcc CXX=g++
-
./build-helper.sh cvs %N %v %r make -f admin/Makefile.common cvs
./build-helper.sh configure %N %v %r ./configure %c $CONFIGURE_PARAMS
@@ -22,6 +11,6 @@
find . -name \*.ll -exec touch {} \;
#fink
- #./build-helper.sh make %N %v %r make all LIB_DBIV=-ldb-4.2 all_libraries="$ALL_LIBRARIES"
+ #./build-helper.sh make %N %v %r unsermake $UNSERMAKEFLAGS LIB_DBIV=-ldb-4.2
#darwinports
- ./build-helper.sh make %N %v %r make all LIB_DBIV=-ldb-4.3 all_libraries="$ALL_LIBRARIES"
+ ./build-helper.sh make %N %v %r unsermake $UNSERMAKEFLAGS LIB_DBIV=-ldb-4.3
Modified: trunk/dports/kde/kdesdk3/files/InstallScript.sh
===================================================================
--- trunk/dports/kde/kdesdk3/files/InstallScript.sh 2006-10-27 18:23:30 UTC (rev 20194)
+++ trunk/dports/kde/kdesdk3/files/InstallScript.sh 2006-10-27 18:23:39 UTC (rev 20195)
@@ -1,13 +1,10 @@
#!/bin/sh -e
- export PREFIX="%p"
+ export PREFIX="%p" USE_UNSERMAKE=1
. ./environment-helper.sh
-#darwinports
- export UNSERMAKE="no"
+ ./build-helper.sh install %N %v %r unsermake -p -j1 install DESTDIR=%d
- ./build-helper.sh install %N %v %r make -j1 install DESTDIR=%d
-
mkdir -p %i/share/doc/installed-packages
touch %i/share/doc/installed-packages/%N
touch %i/share/doc/installed-packages/%N-base
Modified: trunk/dports/kde/kdesdk3/files/kdesdk3.patch
===================================================================
--- trunk/dports/kde/kdesdk3/files/kdesdk3.patch 2006-10-27 18:23:30 UTC (rev 20194)
+++ trunk/dports/kde/kdesdk3/files/kdesdk3.patch 2006-10-27 18:23:39 UTC (rev 20195)
@@ -1,5 +1,6 @@
---- kdesdk-3.5.0/kapptemplate/kapp/app-Makefile.am 2005-09-10 04:20:59.000000000 -0400
-+++ kdesdk-3.5.0-new/kapptemplate/kapp/app-Makefile.am 2005-12-11 00:47:09.000000000 -0500
+
+--- kdesdk-3.5.4/kapptemplate/kapp/app-Makefile.am 2005-09-10 04:20:59.000000000 -0400
++++ kdesdk-3.5.4-new/kapptemplate/kapp/app-Makefile.am 2006-08-01 14:55:54.000000000 -0400
@@ -8,28 +8,30 @@
# this is the program that gets installed. it's name is used for all
@@ -38,8 +39,8 @@
# let automoc handle all of the meta source files (moc)
METASOURCES = AUTO
---- kdesdk-3.5.0/kapptemplate/kapp/app_client.cpp 2005-09-10 04:20:59.000000000 -0400
-+++ kdesdk-3.5.0-new/kapptemplate/kapp/app_client.cpp 2005-12-11 00:47:09.000000000 -0500
+--- kdesdk-3.5.4/kapptemplate/kapp/app_client.cpp 2005-09-10 04:20:59.000000000 -0400
++++ kdesdk-3.5.4-new/kapptemplate/kapp/app_client.cpp 2006-08-01 14:55:54.000000000 -0400
@@ -5,7 +5,7 @@
#include <qdatastream.h>
#include <qstring.h>
@@ -49,8 +50,8 @@
{
KApplication app(argc, argv, "${APP_NAME_LC}_client", false);
---- kdesdk-3.5.0/kapptemplate/kapp/main.cpp 2005-09-10 04:20:59.000000000 -0400
-+++ kdesdk-3.5.0-new/kapptemplate/kapp/main.cpp 2005-12-11 00:47:09.000000000 -0500
+--- kdesdk-3.5.4/kapptemplate/kapp/main.cpp 2005-09-10 04:20:59.000000000 -0400
++++ kdesdk-3.5.4-new/kapptemplate/kapp/main.cpp 2006-08-01 14:55:54.000000000 -0400
@@ -18,7 +18,7 @@
KCmdLineLastOption
};
@@ -60,8 +61,8 @@
{
KAboutData about("${APP_NAME_LC}", I18N_NOOP("${APP_NAME}"), version, description, KAboutData::License_GPL, "(C) 2004 ${AUTHOR}", 0, 0, "${EMAIL}");
about.addAuthor( "${AUTHOR}", 0, "${EMAIL}" );
---- kdesdk-3.5.0/kapptemplate/kpartapp/main.cpp 2005-09-10 04:20:59.000000000 -0400
-+++ kdesdk-3.5.0-new/kapptemplate/kpartapp/main.cpp 2005-12-11 00:47:09.000000000 -0500
+--- kdesdk-3.5.4/kapptemplate/kpartapp/main.cpp 2005-09-10 04:20:59.000000000 -0400
++++ kdesdk-3.5.4-new/kapptemplate/kpartapp/main.cpp 2006-08-01 14:55:54.000000000 -0400
@@ -17,7 +17,7 @@
KCmdLineLastOption
};
@@ -71,8 +72,8 @@
{
KAboutData about("${APP_NAME_LC}", I18N_NOOP("${APP_NAME}"), version, description, KAboutData::License_GPL, "(C) 2004 ${AUTHOR}", 0, 0, "${EMAIL}");
about.addAuthor( "${AUTHOR}", 0, "${EMAIL}" );
---- kdesdk-3.5.0/kbabel/catalogmanager/Makefile.am 2005-10-10 10:58:16.000000000 -0400
-+++ kdesdk-3.5.0-new/kbabel/catalogmanager/Makefile.am 2005-12-11 00:47:09.000000000 -0500
+--- kdesdk-3.5.4/kbabel/catalogmanager/Makefile.am 2005-10-10 10:58:16.000000000 -0400
++++ kdesdk-3.5.4-new/kbabel/catalogmanager/Makefile.am 2006-08-01 14:55:54.000000000 -0400
@@ -7,7 +7,11 @@
# this is the program that gets installed. Its name is used for all
# of the other Makefile.am variables
@@ -101,8 +102,8 @@
# these are the headers for your project
noinst_HEADERS = catalogmanageriface.h catalogmanager.h \
---- kdesdk-3.5.0/kbabel/catalogmanager/main.cpp 2005-10-10 10:58:16.000000000 -0400
-+++ kdesdk-3.5.0-new/kbabel/catalogmanager/main.cpp 2005-12-11 00:47:09.000000000 -0500
+--- kdesdk-3.5.4/kbabel/catalogmanager/main.cpp 2006-07-22 04:11:51.000000000 -0400
++++ kdesdk-3.5.4-new/kbabel/catalogmanager/main.cpp 2006-08-01 14:55:54.000000000 -0400
@@ -178,7 +178,7 @@
};
@@ -112,8 +113,8 @@
{
KLocale::setMainCatalogue("kbabel");
KAboutData about("catalogmanager",I18N_NOOP("KBabel - Catalog Manager"),VERSION,
---- kdesdk-3.5.0/kbabel/commonui/Makefile.am 2005-09-10 04:20:53.000000000 -0400
-+++ kdesdk-3.5.0-new/kbabel/commonui/Makefile.am 2005-12-11 00:47:09.000000000 -0500
+--- kdesdk-3.5.4/kbabel/commonui/Makefile.am 2005-09-10 04:20:53.000000000 -0400
++++ kdesdk-3.5.4-new/kbabel/commonui/Makefile.am 2006-08-01 14:55:54.000000000 -0400
@@ -2,7 +2,7 @@
# this is the program that gets installed. it's name is used for all
@@ -123,8 +124,8 @@
# set the include path for X, qt and KDE. Put local paths before all_includes.
INCLUDES = -I$(srcdir)/../common -I../common -I$(srcdir)/../kbabeldict -I../kbabeldict $(all_includes)
---- kdesdk-3.5.0/kbabel/kbabel/Makefile.am 2005-10-10 10:58:10.000000000 -0400
-+++ kdesdk-3.5.0-new/kbabel/kbabel/Makefile.am 2005-12-11 00:47:09.000000000 -0500
+--- kdesdk-3.5.4/kbabel/kbabel/Makefile.am 2005-10-10 10:58:10.000000000 -0400
++++ kdesdk-3.5.4-new/kbabel/kbabel/Makefile.am 2006-08-01 14:55:54.000000000 -0400
@@ -5,7 +5,9 @@
# this is the program that gets installed. it's name is used for all
# of the other Makefile.am variables
@@ -151,9 +152,9 @@
# these are the headers for your project
noinst_HEADERS = kbabel.h kbabelview.h \
---- kdesdk-3.5.0/kbabel/kbabel/main.cpp 2005-10-10 10:58:10.000000000 -0400
-+++ kdesdk-3.5.0-new/kbabel/kbabel/main.cpp 2005-12-11 00:47:09.000000000 -0500
-@@ -503,7 +503,7 @@
+--- kdesdk-3.5.4/kbabel/kbabel/main.cpp 2006-07-22 04:11:50.000000000 -0400
++++ kdesdk-3.5.4-new/kbabel/kbabel/main.cpp 2006-08-01 14:55:54.000000000 -0400
+@@ -506,7 +506,7 @@
};
@@ -162,8 +163,8 @@
{
KAboutData about("kbabel",I18N_NOOP("KBabel"),VERSION,
I18N_NOOP("An advanced PO file editor"),KAboutData::License_GPL,
---- kdesdk-3.5.0/kbabel/kbabeldict/Makefile.am 2005-09-10 04:20:53.000000000 -0400
-+++ kdesdk-3.5.0-new/kbabel/kbabeldict/Makefile.am 2005-12-11 00:47:09.000000000 -0500
+--- kdesdk-3.5.4/kbabel/kbabeldict/Makefile.am 2005-09-10 04:20:53.000000000 -0400
++++ kdesdk-3.5.4-new/kbabel/kbabeldict/Makefile.am 2006-08-01 14:55:54.000000000 -0400
@@ -6,17 +6,15 @@
pkgincludedir = $(includedir)/kbabel
@@ -200,8 +201,8 @@
# these are the headers for your project
noinst_HEADERS = kbabeldict.h kbabeldictview.h kbabelsplash.h aboutmoduledlg.h
---- kdesdk-3.5.0/kbabel/kbabeldict/main.cpp 2005-09-10 04:20:53.000000000 -0400
-+++ kdesdk-3.5.0-new/kbabel/kbabeldict/main.cpp 2005-12-11 00:47:09.000000000 -0500
+--- kdesdk-3.5.4/kbabel/kbabeldict/main.cpp 2006-07-22 04:11:50.000000000 -0400
++++ kdesdk-3.5.4-new/kbabel/kbabeldict/main.cpp 2006-08-01 14:55:54.000000000 -0400
@@ -107,7 +107,7 @@
};
@@ -211,8 +212,8 @@
{
KLocale::setMainCatalogue("kbabel");
---- kdesdk-3.5.0/kbugbuster/Makefile.am 2005-09-10 04:21:11.000000000 -0400
-+++ kdesdk-3.5.0-new/kbugbuster/Makefile.am 2005-12-11 00:47:09.000000000 -0500
+--- kdesdk-3.5.4/kbugbuster/Makefile.am 2005-09-10 04:21:11.000000000 -0400
++++ kdesdk-3.5.4-new/kbugbuster/Makefile.am 2006-08-01 14:55:54.000000000 -0400
@@ -6,12 +6,14 @@
SUBDIRS = backend gui pics $(KRESOURCES_SUBDIR)
@@ -232,8 +233,8 @@
xdg_apps_DATA = kbugbuster.desktop
---- kdesdk-3.5.0/kbugbuster/configure.in.in 2005-09-10 04:21:11.000000000 -0400
-+++ kdesdk-3.5.0-new/kbugbuster/configure.in.in 2005-12-11 00:47:09.000000000 -0500
+--- kdesdk-3.5.4/kbugbuster/configure.in.in 2005-09-10 04:21:11.000000000 -0400
++++ kdesdk-3.5.4-new/kbugbuster/configure.in.in 2006-08-01 14:55:54.000000000 -0400
@@ -2,6 +2,7 @@
KDE_CHECK_HEADER(libkcal/resourcecalendar.h,HAVE_KCAL=1,
AC_MSG_WARN([Unable to find libkcal. The Bugzilla todo list \
@@ -242,8 +243,8 @@
AM_CONDITIONAL(include_kcalresource, test "$HAVE_KCAL" = 1)
])
---- kdesdk-3.5.0/kbugbuster/main.cpp 2005-09-10 04:21:11.000000000 -0400
-+++ kdesdk-3.5.0-new/kbugbuster/main.cpp 2005-12-11 00:47:09.000000000 -0500
+--- kdesdk-3.5.4/kbugbuster/main.cpp 2005-09-10 04:21:11.000000000 -0400
++++ kdesdk-3.5.4-new/kbugbuster/main.cpp 2006-08-01 14:55:54.000000000 -0400
@@ -42,7 +42,7 @@
KCmdLineLastOption
};
@@ -253,8 +254,8 @@
{
KAboutData aboutData( "kbugbuster", I18N_NOOP( "KBugBuster" ),
VERSION, description, KAboutData::License_GPL,
---- kdesdk-3.5.0/kcachegrind/kcachegrind/Makefile.am 2005-09-10 04:21:07.000000000 -0400
-+++ kdesdk-3.5.0-new/kcachegrind/kcachegrind/Makefile.am 2005-12-11 00:47:09.000000000 -0500
+--- kdesdk-3.5.4/kcachegrind/kcachegrind/Makefile.am 2005-09-10 04:21:07.000000000 -0400
++++ kdesdk-3.5.4-new/kcachegrind/kcachegrind/Makefile.am 2006-08-01 14:55:54.000000000 -0400
@@ -1,6 +1,8 @@
-bin_PROGRAMS = kcachegrind
+kdeinit_LTLIBRARIES = kcachegrind.la
@@ -289,8 +290,8 @@
rcdir = $(kde_datadir)/kcachegrind
rc_DATA = kcachegrindui.rc
---- kdesdk-3.5.0/kcachegrind/kcachegrind/main.cpp 2005-09-10 04:21:07.000000000 -0400
-+++ kdesdk-3.5.0-new/kcachegrind/kcachegrind/main.cpp 2005-12-11 00:47:09.000000000 -0500
+--- kdesdk-3.5.4/kcachegrind/kcachegrind/main.cpp 2005-09-10 04:21:07.000000000 -0400
++++ kdesdk-3.5.4-new/kcachegrind/kcachegrind/main.cpp 2006-08-01 14:55:54.000000000 -0400
@@ -40,7 +40,7 @@
KCmdLineLastOption // End of options.
};
@@ -300,8 +301,8 @@
{
KAboutData aboutData("kcachegrind",
I18N_NOOP("KCachegrind"),
---- kdesdk-3.5.0/kcachegrind/kcachegrind/sourceitem.h 2005-09-10 04:21:07.000000000 -0400
-+++ kdesdk-3.5.0-new/kcachegrind/kcachegrind/sourceitem.h 2005-12-11 00:47:09.000000000 -0500
+--- kdesdk-3.5.4/kcachegrind/kcachegrind/sourceitem.h 2005-09-10 04:21:07.000000000 -0400
++++ kdesdk-3.5.4-new/kcachegrind/kcachegrind/sourceitem.h 2006-08-01 14:55:54.000000000 -0400
@@ -25,6 +25,7 @@
#include <qlistview.h>
@@ -310,16 +311,16 @@
class SourceView;
---- kdesdk-3.5.0/kioslave/svn/configure.in.in 2005-10-10 10:58:25.000000000 -0400
-+++ kdesdk-3.5.0-new/kioslave/svn/configure.in.in 2005-12-11 00:47:09.000000000 -0500
+--- kdesdk-3.5.4/kioslave/svn/configure.in.in 2005-10-10 10:58:25.000000000 -0400
++++ kdesdk-3.5.4-new/kioslave/svn/configure.in.in 2006-08-01 14:55:54.000000000 -0400
@@ -155,3 +155,5 @@
AC_SUBST(SVN_CPPFLAGS)
AC_SUBST(SVNLD)
AM_CONDITIONAL(include_kioslave_svn, test -n "$SVN_SUBDIR")
+
+export DO_NOT_COMPILE="$DO_NOT_COMPILE kioslave"
---- kdesdk-3.5.0/kmtrace/Makefile.am 2005-09-10 04:20:58.000000000 -0400
-+++ kdesdk-3.5.0-new/kmtrace/Makefile.am 2005-12-11 00:47:09.000000000 -0500
+--- kdesdk-3.5.4/kmtrace/Makefile.am 2005-09-10 04:20:58.000000000 -0400
++++ kdesdk-3.5.4-new/kmtrace/Makefile.am 2006-08-01 14:55:54.000000000 -0400
@@ -21,15 +21,16 @@
LDADD = $(LIB_KDECORE) -liberty
INCLUDES = $(all_includes)
@@ -344,8 +345,8 @@
bin_SCRIPTS = kminspector
---- kdesdk-3.5.0/kmtrace/demangle.cpp 2005-09-10 04:20:58.000000000 -0400
-+++ kdesdk-3.5.0-new/kmtrace/demangle.cpp 2005-12-11 00:47:09.000000000 -0500
+--- kdesdk-3.5.4/kmtrace/demangle.cpp 2005-09-10 04:20:58.000000000 -0400
++++ kdesdk-3.5.4-new/kmtrace/demangle.cpp 2006-08-01 14:55:54.000000000 -0400
@@ -36,7 +36,7 @@
}
@@ -355,8 +356,8 @@
{
char buf[1024];
---- kdesdk-3.5.0/kmtrace/kmtrace.cpp 2005-10-10 10:58:21.000000000 -0400
-+++ kdesdk-3.5.0-new/kmtrace/kmtrace.cpp 2005-12-11 00:47:09.000000000 -0500
+--- kdesdk-3.5.4/kmtrace/kmtrace.cpp 2005-10-10 10:58:21.000000000 -0400
++++ kdesdk-3.5.4-new/kmtrace/kmtrace.cpp 2006-08-01 14:55:54.000000000 -0400
@@ -576,7 +576,7 @@
KCmdLineLastOption
};
@@ -366,8 +367,8 @@
{
KInstance instance("kmtrace");
---- kdesdk-3.5.0/kmtrace/match.cpp 2005-09-10 04:20:58.000000000 -0400
-+++ kdesdk-3.5.0-new/kmtrace/match.cpp 2005-12-11 00:47:09.000000000 -0500
+--- kdesdk-3.5.4/kmtrace/match.cpp 2005-09-10 04:20:58.000000000 -0400
++++ kdesdk-3.5.4-new/kmtrace/match.cpp 2006-08-01 14:55:54.000000000 -0400
@@ -13,7 +13,7 @@
#include <kstandarddirs.h>
#include <kcmdlineargs.h>
@@ -377,8 +378,8 @@
{
char buf[1024];
if (argc != 3)
---- kdesdk-3.5.0/kompare/Makefile.am 2005-09-10 04:21:05.000000000 -0400
-+++ kdesdk-3.5.0-new/kompare/Makefile.am 2005-12-11 00:47:09.000000000 -0500
+--- kdesdk-3.5.4/kompare/Makefile.am 2005-09-10 04:21:05.000000000 -0400
++++ kdesdk-3.5.4-new/kompare/Makefile.am 2006-08-01 14:55:54.000000000 -0400
@@ -22,12 +22,14 @@
#########################################################################
# this is the program that gets installed. it's name is used for all
@@ -398,8 +399,8 @@
$(top_builddir)/kompare/interfaces/libkompareinterface.la \
$(top_builddir)/kompare/libdialogpages/libdialogpages.la \
-lktexteditor
---- kdesdk-3.5.0/kompare/main.cpp 2005-09-10 04:21:05.000000000 -0400
-+++ kdesdk-3.5.0-new/kompare/main.cpp 2005-12-11 00:47:09.000000000 -0500
+--- kdesdk-3.5.4/kompare/main.cpp 2005-09-10 04:21:05.000000000 -0400
++++ kdesdk-3.5.4-new/kompare/main.cpp 2006-08-01 14:55:55.000000000 -0400
@@ -47,7 +47,7 @@
KCmdLineLastOption
};
@@ -409,8 +410,8 @@
{
KAboutData aboutData( "kompare", I18N_NOOP("Kompare"), version, description,
KAboutData::License_GPL,
---- kdesdk-3.5.0/kspy/main.cpp 2005-09-10 04:20:58.000000000 -0400
-+++ kdesdk-3.5.0-new/kspy/main.cpp 2005-12-11 00:47:09.000000000 -0500
+--- kdesdk-3.5.4/kspy/main.cpp 2005-09-10 04:20:58.000000000 -0400
++++ kdesdk-3.5.4-new/kspy/main.cpp 2006-08-01 14:55:55.000000000 -0400
@@ -32,7 +32,7 @@
// INSERT YOUR COMMANDLINE OPTIONS HERE
};
@@ -420,8 +421,8 @@
{
KAboutData aboutData( "spy", I18N_NOOP("Spy"),
---- kdesdk-3.5.0/kstartperf/Makefile.am 2005-09-10 04:20:58.000000000 -0400
-+++ kdesdk-3.5.0-new/kstartperf/Makefile.am 2005-12-11 00:47:09.000000000 -0500
+--- kdesdk-3.5.4/kstartperf/Makefile.am 2005-09-10 04:20:58.000000000 -0400
++++ kdesdk-3.5.4-new/kstartperf/Makefile.am 2006-08-01 14:55:55.000000000 -0400
@@ -5,10 +5,11 @@
# libkstartperf_la_LIBADD = ../libltdl/libltdlc.la
libkstartperf_la_SOURCES = libkstartperf.c
@@ -438,8 +439,8 @@
messages:
$(XGETTEXT) $(kstartperf_SOURCES) -o $(podir)/kstartperf.pot
---- kdesdk-3.5.0/kstartperf/kstartperf.cpp 2005-09-10 04:20:58.000000000 -0400
-+++ kdesdk-3.5.0-new/kstartperf/kstartperf.cpp 2005-12-11 00:47:09.000000000 -0500
+--- kdesdk-3.5.4/kstartperf/kstartperf.cpp 2005-09-10 04:20:58.000000000 -0400
++++ kdesdk-3.5.4-new/kstartperf/kstartperf.cpp 2006-08-01 14:55:55.000000000 -0400
@@ -69,7 +69,7 @@
}
@@ -449,8 +450,8 @@
{
KAboutData aboutData("kstartperf", I18N_NOOP("KStartPerf"),
"1.0", I18N_NOOP("Measures start up time of a KDE application"),
---- kdesdk-3.5.0/kuiviewer/Makefile.am 2005-09-10 04:21:10.000000000 -0400
-+++ kdesdk-3.5.0-new/kuiviewer/Makefile.am 2005-12-11 00:47:09.000000000 -0500
+--- kdesdk-3.5.4/kuiviewer/Makefile.am 2005-09-10 04:21:10.000000000 -0400
++++ kdesdk-3.5.4-new/kuiviewer/Makefile.am 2006-08-01 14:55:55.000000000 -0400
@@ -21,12 +21,14 @@
#########################################################################
# this is the program that gets installed. it's name is used for all
@@ -470,8 +471,8 @@
xdg_apps_DATA =kuiviewer.desktop
---- kdesdk-3.5.0/kuiviewer/main.cpp 2005-09-10 04:21:10.000000000 -0400
-+++ kdesdk-3.5.0-new/kuiviewer/main.cpp 2005-12-11 00:47:09.000000000 -0500
+--- kdesdk-3.5.4/kuiviewer/main.cpp 2005-09-10 04:21:10.000000000 -0400
++++ kdesdk-3.5.4-new/kuiviewer/main.cpp 2006-08-01 14:55:55.000000000 -0400
@@ -38,7 +38,7 @@
KCmdLineLastOption
};
@@ -481,8 +482,8 @@
{
KAboutData about("kuiviewer", I18N_NOOP("KUIViewer"), "0.1",
I18N_NOOP("Displays Designer's UI files"),
---- kdesdk-3.5.0/poxml/Makefile.am 2005-09-10 04:21:06.000000000 -0400
-+++ kdesdk-3.5.0-new/poxml/Makefile.am 2005-12-11 00:47:09.000000000 -0500
+--- kdesdk-3.5.4/poxml/Makefile.am 2005-09-10 04:21:06.000000000 -0400
++++ kdesdk-3.5.4-new/poxml/Makefile.am 2006-08-01 14:55:55.000000000 -0400
@@ -1,30 +1,31 @@
-
-bin_PROGRAMS = split2po xml2pot po2xml swappo transxx
@@ -536,8 +537,8 @@
parser:
cd $(srcdir) && java antlr.Tool gettext.g
---- kdesdk-3.5.1/poxml/po2xml.cpp.orig 2006-02-28 07:35:55.000000000 -0500
-+++ kdesdk-3.5.1/poxml/po2xml.cpp 2006-02-28 07:35:47.000000000 -0500
+--- kdesdk-3.5.4/poxml/po2xml.cpp 2005-09-10 04:21:06.000000000 -0400
++++ kdesdk-3.5.4-new/poxml/po2xml.cpp 2006-08-01 14:55:55.000000000 -0400
@@ -12,6 +12,8 @@
#include "antlr/AST.hpp"
#include "antlr/CommonAST.hpp"
@@ -556,8 +557,8 @@
{
if (argc != 3) {
qWarning("usage: %s english-XML translated-PO", argv[0]);
---- kdesdk-3.5.1/poxml/split.cpp.orig 2006-02-28 07:32:04.000000000 -0500
-+++ kdesdk-3.5.1/poxml/split.cpp 2006-02-28 07:31:08.000000000 -0500
+--- kdesdk-3.5.4/poxml/split.cpp 2005-11-19 05:24:05.000000000 -0500
++++ kdesdk-3.5.4-new/poxml/split.cpp 2006-08-01 14:55:55.000000000 -0400
@@ -1,10 +1,11 @@
#include "parser.h"
#include <stdlib.h>
@@ -571,8 +572,8 @@
{
bool report_mismatches = qstrcmp(getenv("REPORT_MISMATCHES"), "no");
---- kdesdk-3.5.1/poxml/swappo.cpp.orig 2006-02-28 07:37:37.000000000 -0500
-+++ kdesdk-3.5.1/poxml/swappo.cpp 2006-02-28 07:37:32.000000000 -0500
+--- kdesdk-3.5.4/poxml/swappo.cpp 2005-09-10 04:21:06.000000000 -0400
++++ kdesdk-3.5.4-new/poxml/swappo.cpp 2006-08-01 14:55:55.000000000 -0400
@@ -3,8 +3,9 @@
#include "GettextParser.hpp"
#include <fstream>
@@ -584,8 +585,8 @@
{
if ( argc != 2 ) {
qWarning( "usage: %s pofile", argv[0] );
---- kdesdk-3.5.1/poxml/transxx.cpp.orig 2006-02-28 07:39:31.000000000 -0500
-+++ kdesdk-3.5.1/poxml/transxx.cpp 2006-02-28 07:39:26.000000000 -0500
+--- kdesdk-3.5.4/poxml/transxx.cpp 2005-10-10 10:58:21.000000000 -0400
++++ kdesdk-3.5.4-new/poxml/transxx.cpp 2006-08-01 14:55:55.000000000 -0400
@@ -8,7 +8,9 @@
#include <qdatetime.h>
#include <qfileinfo.h>
@@ -597,8 +598,8 @@
{
if ( argc != 2 && argc != 4 ) {
qWarning( "usage: %s [--text translation] potfile", argv[0] );
---- kdesdk-3.5.1/poxml/xml2pot.cpp.orig 2006-02-28 07:33:39.000000000 -0500
-+++ kdesdk-3.5.1/poxml/xml2pot.cpp 2006-02-28 07:33:47.000000000 -0500
+--- kdesdk-3.5.4/poxml/xml2pot.cpp 2005-09-10 04:21:06.000000000 -0400
++++ kdesdk-3.5.4-new/poxml/xml2pot.cpp 2006-08-01 14:55:55.000000000 -0400
@@ -3,10 +3,11 @@
#include <iostream>
#include <qfileinfo.h>
@@ -612,8 +613,8 @@
{
if (argc != 2) {
qWarning("usage: %s english-XML", argv[0]);
---- kdesdk-3.5.0/umbrello/umbrello/Makefile.am 2005-11-08 17:28:41.000000000 -0500
-+++ kdesdk-3.5.0-new/umbrello/umbrello/Makefile.am 2005-12-11 00:47:33.000000000 -0500
+--- kdesdk-3.5.4/umbrello/umbrello/Makefile.am 2006-07-22 04:12:01.000000000 -0400
++++ kdesdk-3.5.4-new/umbrello/umbrello/Makefile.am 2006-08-01 14:56:33.000000000 -0400
@@ -1,7 +1,9 @@
-bin_PROGRAMS = umbrello
+bin_PROGRAMS =
@@ -626,17 +627,17 @@
+umbrello_la_SOURCES = activitywidget.cpp \
actor.cpp \
actorwidget.cpp \
- adaimport.cpp \
-@@ -105,7 +107,7 @@
+ aligntoolbar.cpp \
+@@ -113,7 +115,7 @@
worktoolbar.cpp
- #umbrello_LDADD = ./refactoring/librefactoring.la ./classparser/libclassparser.la ./clipboard/libclipboard.la ./dialogs/libdialogs.la ./codegenerators/libcodegenerator.la $(AUTOLAYOUT_LIBS) $(LIB_KDEPRINT) $(LIB_KIO)
--umbrello_LDADD = ./refactoring/librefactoring.la ./classparser/libclassparser.la ./clipboard/libclipboard.la ./dialogs/libdialogs.la ./codegenerators/libcodegenerator.la $(LIB_KDEPRINT) $(LIB_KIO)
-+umbrello_la_LIBADD = ./refactoring/librefactoring.la ./classparser/libclassparser.la ./clipboard/libclipboard.la ./dialogs/libdialogs.la ./codegenerators/libcodegenerator.la $(LIB_KDEPRINT) $(LIB_KIO)
+ #umbrello_LDADD = ./refactoring/librefactoring.la ./codeimport/libcodeimport.la ./codeimport/kdevcppparser/libkdevcppparser.la ./clipboard/libclipboard.la ./dialogs/libdialogs.la ./codegenerators/libcodegenerator.la $(AUTOLAYOUT_LIBS) $(LIB_KDEPRINT) $(LIB_KIO)
+-umbrello_LDADD = ./refactoring/librefactoring.la ./codeimport/libcodeimport.la ./codeimport/kdevcppparser/libkdevcppparser.la ./clipboard/libclipboard.la ./dialogs/libdialogs.la ./codegenerators/libcodegenerator.la $(LIB_KDEPRINT) $(LIB_KIO)
++umbrello_la_LIBADD = ./refactoring/librefactoring.la ./codeimport/libcodeimport.la ./codeimport/kdevcppparser/libkdevcppparser.la ./clipboard/libclipboard.la ./dialogs/libdialogs.la ./codegenerators/libcodegenerator.la $(LIB_KDEPRINT) $(LIB_KIO)
## See section "dnl Not GPL compatible" in ../configure.in.in
- # SUBDIRS = $(AUTOLAYOUT_DIR) classparser dialogs clipboard pics codegenerators headings refactoring
-@@ -126,7 +128,7 @@
+ # SUBDIRS = $(AUTOLAYOUT_DIR) codeimport dialogs clipboard pics codegenerators headings refactoring
+@@ -134,7 +136,7 @@
METASOURCES = AUTO
@@ -645,162 +646,14 @@
messages: rc.cpp
$(PREPARETIPS) > tips.cpp
---- kdesdk-3.5.0/umbrello/umbrello/classparser/Makefile.am 2005-09-10 04:20:56.000000000 -0400
-+++ kdesdk-3.5.0-new/umbrello/umbrello/classparser/Makefile.am 2005-12-11 00:47:09.000000000 -0500
-@@ -1,4 +1,4 @@
--INCLUDES = -I../dialogs $(all_includes)
-+INCLUDES = -I../dialogs -I at FINKPREFIX@/lib/flex/include $(all_includes)
+--- kdesdk-3.5.4/umbrello/umbrello/main.cpp 2006-07-22 04:12:01.000000000 -0400
++++ kdesdk-3.5.4-new/umbrello/umbrello/main.cpp 2006-08-01 14:55:56.000000000 -0400
+@@ -81,7 +81,7 @@
+ */
+ void exportAllViews(KCmdLineArgs *args, const QCStringList &exportOpt);
- noinst_LTLIBRARIES = libclassparser.la
- libclassparser_la_SOURCES = ast.cpp driver.cpp errors.cpp lexer.cpp lookup.cpp parser.cpp tree_parser.cpp urlutil.cpp ast_utils.cpp cpptree2uml.cpp
---- kdesdk-3.5.0/umbrello/umbrello/main.cpp 2005-09-10 04:20:57.000000000 -0400
-+++ kdesdk-3.5.0-new/umbrello/umbrello/main.cpp 2005-12-11 00:47:09.000000000 -0500
-@@ -42,7 +42,7 @@
- KCmdLineLastOption
- };
-
-int main(int argc, char *argv[]) {
+extern "C" KDE_EXPORT int kdemain(int argc, char *argv[]) {
KAboutData aboutData( "umbrello", I18N_NOOP("Umbrello UML Modeller"),
UMBRELLO_VERSION, description, KAboutData::License_GPL,
- I18N_NOOP("(c) 2001 Paul Hensgen, (c) 2002-2005 Umbrello UML Modeller Authors"), 0,
---- kdesdk/kbabel/kbabeldict/dictionarymenu.h (revision 514661)
-+++ kdesdk/kbabel/kbabeldict/dictionarymenu.h (working copy)
-@@ -37,12 +37,13 @@
- #include <qobject.h>
- #include <qstringlist.h>
- #include <qguardedptr.h>
-+#include <kdemacros.h>
-
- class QSignalMapper;
- class KPopupMenu;
- class KActionCollection;
-
--class DictionaryMenu : public QObject
-+class KDE_EXPORT DictionaryMenu : public QObject
- {
- Q_OBJECT
-
---- kdesdk/kbabel/kbabeldict/kbabeldictbox.h (revision 514661)
-+++ kdesdk/kbabel/kbabeldict/kbabeldictbox.h (working copy)
-@@ -60,7 +60,7 @@
- };
-
-
--class KBabelDictBox : public QWidget, virtual public KBabelDictIFace
-+class KDE_EXPORT KBabelDictBox : public QWidget, virtual public KBabelDictIFace
- {
- Q_OBJECT
-
---- kdesdk/kbabel/kbabeldict/dictchooser.h (revision 514661)
-+++ kdesdk/kbabel/kbabeldict/dictchooser.h (working copy)
-@@ -47,7 +47,7 @@
- class QListBoxItem;
-
-
--class DictChooser : public QWidget
-+class KDE_EXPORT DictChooser : public QWidget
- {
- Q_OBJECT
-
---- kdesdk/kbabel/commonui/finddialog.h (revision 514661)
-+++ kdesdk/kbabel/commonui/finddialog.h (working copy)
-@@ -44,7 +44,7 @@
-
- #include "findoptions.h"
-
--class FindDialog : public KDialogBase
-+class KDE_EXPORT FindDialog : public KDialogBase
- {
- Q_OBJECT
- public:
-@@ -119,7 +119,7 @@
- bool _replaceDlg;
- };
-
--class ReplaceDialog : public KDialogBase
-+class KDE_EXPORT ReplaceDialog : public KDialogBase
- {
- Q_OBJECT
- public:
---- kdesdk/kbabel/commonui/projectprefwidgets.h (revision 514661)
-+++ kdesdk/kbabel/commonui/projectprefwidgets.h (working copy)
-@@ -62,7 +62,7 @@
-
- struct ModuleInfo;
-
--class SavePreferences : public KTabCtl
-+class KDE_EXPORT SavePreferences : public KTabCtl
- {
- Q_OBJECT
- public:
---- kdesdk/kbabel/commonui/toolaction.h (revision 514661)
-+++ kdesdk/kbabel/commonui/toolaction.h (working copy)
-@@ -39,7 +39,7 @@
- class KShortcut;
- class KActionCollection;
-
--class ToolAction : public KAction
-+class KDE_EXPORT ToolAction : public KAction
- {
- Q_OBJECT
- public:
---- kdesdk/kbabel/commonui/projectpref.h (revision 514661)
-+++ kdesdk/kbabel/commonui/projectpref.h (working copy)
-@@ -55,7 +55,7 @@
-
- namespace KBabel {
-
--class ProjectDialog : public KConfigDialog
-+class KDE_EXPORT ProjectDialog : public KConfigDialog
- {
- Q_OBJECT
- public:
---- kdesdk/kbabel/commonui/roughtransdlg.h (revision 514661)
-+++ kdesdk/kbabel/commonui/roughtransdlg.h (working copy)
-@@ -50,7 +50,7 @@
- class QRadioButton;
- class QVBox;
-
--class RoughTransDlg : public KDialogBase
-+class KDE_EXPORT RoughTransDlg : public KDialogBase
- {
- Q_OBJECT
-
---- kdesdk/kbabel/commonui/context.h (revision 514661)
-+++ kdesdk/kbabel/commonui/context.h (working copy)
-@@ -74,7 +74,7 @@
- * @note It requires a KPart implementing KTextEditor interface with selections.
- * @author Stanislav Visnovsky <visnovsky at kde.org>
- */
--class SourceContext : public QWidget
-+class KDE_EXPORT SourceContext : public QWidget
- {
- Q_OBJECT
- public:
---- kdesdk/kbabel/commonui/projectwizard.h (revision 514661)
-+++ kdesdk/kbabel/commonui/projectwizard.h (working copy)
-@@ -45,7 +45,7 @@
-
- namespace KBabel {
-
--class ProjectWizard : public KWizard
-+class KDE_EXPORT ProjectWizard : public KWizard
- {
- Q_OBJECT
- public:
---- kdesdk/kbabel/commonui/toolselectionwidget.h (revision 514661)
-+++ kdesdk/kbabel/commonui/toolselectionwidget.h (working copy)
-@@ -33,10 +33,11 @@
- #define TOOLSELECTIONWIDGET_H
-
- #include "kactionselector.h"
-+#include <kdemacros.h>
-
- class KDataToolInfo;
-
--class ToolSelectionWidget : public KActionSelector
-+class KDE_EXPORT ToolSelectionWidget : public KActionSelector
- {
- Q_OBJECT
- public:
+ I18N_NOOP("(c) 2001 Paul Hensgen, (c) 2002-2006 Umbrello UML Modeller Authors"), 0,
-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.macosforge.org/pipermail/macports-changes/attachments/20061027/2ec9ece8/attachment.html
More information about the macports-changes
mailing list