Ticket #10933: kde354_1.patch
File kde354_1.patch, 131.2 KB (added by takanori@…, 18 years ago) |
---|
-
kde/Portfile
2 2 3 3 PortSystem 1.0 4 4 name kde 5 version 3.5. 15 version 3.5.4 6 6 categories kde 7 7 maintainers ben@macports.org takanori@macports.org 8 8 description KDE Desktop bundle -
kdeaccessibility3/files/InstallScript.sh
1 1 #!/bin/sh -e 2 2 3 export PREFIX="%p" 3 export PREFIX="%p" USE_UNSERMAKE=1 4 4 . ./environment-helper.sh 5 6 ./build-helper.sh install %N %v %r unsermake -p -j1 install DESTDIR=%d 5 7 6 #darwinports7 export UNSERMAKE="no"8 9 ./build-helper.sh install %N %v %r make -j1 install DESTDIR=%d10 11 8 mkdir -p %i/share/doc/installed-packages 12 9 touch %i/share/doc/installed-packages/%N 13 10 touch %i/share/doc/installed-packages/%N-base 14 11 15 rm -rf %i/share/doc/kde/en/kmouth 12 rm -rf %i/share/doc/kde/en/kmouth %i/share/man/man1/kmouth* 16 13 install -d -m 755 %i/share/config 17 cat <<EOF #!/bin/sh -e 18 END > %i/share/config/kttsdrc 14 cat <<END > %i/share/config/kttsdrc 19 15 [FreeTTS] 20 16 FreeTTSJarPath=%p/share/java/freetts/freetts.jar 21 17 -
kdeaccessibility3/files/CompileScript.sh
1 1 #!/bin/sh -e 2 2 3 export HOME=/tmp 4 export PREFIX="%p" 3 export PREFIX="%p" USE_UNSERMAKE=1 5 4 . ./environment-helper.sh 6 export lt_cv_sys_max_cmd_len=655365 export ac_cv_path_freetts_bindir="%p/share/java/freetts" 7 6 8 #darwinports9 export UNSERMAKE="no"10 11 7 export DO_NOT_COMPILE="kmouth" 12 8 13 export CC=gcc CXX=g++14 15 9 ./build-helper.sh cvs %N %v %r make -f admin/Makefile.common cvs 16 10 ./build-helper.sh configure %N %v %r ./configure %c $CONFIGURE_PARAMS 17 ./build-helper.sh make %N %v %r make all all_libraries="$ALL_LIBRARIES"11 ./build-helper.sh make %N %v %r unsermake $UNSERMAKEFLAGS -
kdeaccessibility3/Portfile
1 1 # $Id$ 2 2 3 #Synced with Fink, Version 3.5. 1-10233 #Synced with Fink, Version 3.5.4-1021 4 4 5 5 PortSystem 1.0 6 6 name kdeaccessibility3 7 version 3.5.1 8 revision 1 9 set kdeadmin kde-admindir-3.5.1 7 version 3.5.4 8 set kdeadmin kde-admindir-252 10 9 categories kde 11 10 maintainers ben@macports.org takanori@macports.org 12 11 description KDE accessibility tools. \ 13 12 NB No KDE sound support. 14 13 platforms darwin 15 master_sites opendarwin::kde35 1\14 master_sites opendarwin::kde354 \ 16 15 opendarwin::admin 17 16 # kde:stable/${version}/src 18 17 # http://ranger.befunk.com/fink/:admin 19 extract.suffix .tar.bz220 18 use_bzip2 yes 21 19 distname kdeaccessibility-${version} 22 distfiles ${distname}.tar.bz2:kde35 1\20 distfiles ${distname}.tar.bz2:kde354 \ 23 21 ${kdeadmin}.tar.bz2:admin 24 22 depends_build port:autoconf \ 25 port: automake23 port:unsermake 26 24 depends_lib port:kdebase3 25 # port:freetts 26 # port:gstreamer 27 27 28 checksums ${distname}.tar.bz2 md5 cc0773103053a6800b3d35e6021b6719\29 ${kdeadmin}.tar.bz2 md5 b6115a7310f8e8533af91be02e225d0e28 checksums ${distname}.tar.bz2 md5 bc64350a56a585e4d2c88fe3fc8b24f8 \ 29 ${kdeadmin}.tar.bz2 md5 54a89925e71bd32f759c81b312ad0b9e 30 30 31 extract.only 32 post-extract 31 extract.only ${distname}.tar.bz2 32 post-extract { system "cd ${worksrcpath} && bzcat -dc ${distpath}/${kdeadmin}.tar.bz2 | tar xf -" } 33 33 34 34 patchfiles 35 35 patch { 36 36 cd ${worksrcpath} 37 37 foreach file $patchfiles { 38 system "sed -e 's,@FINKPREFIX@,${prefix},g' ${ portpath}/${filesdir}/${file} | patch -p1"38 system "sed -e 's,@FINKPREFIX@,${prefix},g' ${filespath}/${file} | patch -p1" 39 39 } 40 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/*" 40 41 } 41 post-patch { 42 reinplace "s|lib/freetype219/||g" ${worksrcpath}/environment-helper.sh 43 reinplace "s|include/qt|include/qt3|g" ${worksrcpath}/environment-helper.sh 42 post-patch { 43 reinplace "s|/lib/freetype219||g" ${worksrcpath}/environment-helper.sh 44 44 reinplace "s|--with-ssl-dir=/usr|--with-ssl-dir=\$PREFIX|g" ${worksrcpath}/environment-helper.sh 45 reinplace "s|2.5\\*|2.\[56\]\\*|g" ${worksrcpath}/admin/cvs.sh46 foreach file [glob ${worksrcpath}/admin/*] {47 reinplace "s|-O2|-Os|g" $file48 reinplace "s|doc/HTML|doc/kde|g" $file49 reinplace "s|/usr/share/doc/packages/qt3/html|${prefix}/share/doc/qt3/html|g" $file50 }51 45 foreach file {CompileScript.sh InstallScript.sh} { 52 file copy ${ portpath}/${filesdir}/${file} ${worksrcpath}46 file copy ${filespath}/${file} ${worksrcpath} 53 47 reinplace "s|%p|${prefix}|g" ${worksrcpath}/${file} 54 48 reinplace "s|%N|${name}|g" ${worksrcpath}/${file} 55 49 reinplace "s|%v|${version}|g" ${worksrcpath}/${file} … … 61 55 } 62 56 } 63 57 64 configure.args --enable-kttsd-gstreamer --with-distribution=' DarwinPorts/Mac OS X' --without-arts58 configure.args --enable-kttsd-gstreamer --with-distribution='MacPorts/Mac OS X' --without-arts 65 59 66 60 configure {} 67 61 build { system "cd ${worksrcpath} && ./CompileScript.sh" } 68 62 destroot { system "cd ${worksrcpath} && ./InstallScript.sh" } 69 63 70 post-destroot 64 post-destroot { 71 65 xinstall -m 755 -d ${destroot}${prefix}/share/doc/${name} 72 66 xinstall -m 644 -W ${worksrcpath} COPYING INSTALL ${destroot}${prefix}/share/doc/${name} 73 67 } 74 75 platform darwin 6 {76 depends_lib-append lib:libdl:dlcompat77 } -
kdeaddons3/files/InstallScript.sh
1 1 #!/bin/sh -e 2 2 3 export HOME=/tmp PREFIX="%p" QTDOCDIR="%p/share/doc/qt3/html"3 export PREFIX="%p" USE_UNSERMAKE=1 4 4 . ./environment-helper.sh 5 5 6 #darwinports 7 export UNSERMAKE="no" 6 ./build-helper.sh install %N %v %r unsermake -p -j1 install DESTDIR=%d 8 7 9 ./build-helper.sh install %N %v %r make -j1 install DESTDIR=%d10 11 8 mkdir -p %i/share/doc/installed-packages 12 9 touch %i/share/doc/installed-packages/%N 13 10 touch %i/share/doc/installed-packages/%N-base -
kdeaddons3/files/CompileScript.sh
1 1 #!/bin/sh -e 2 2 3 export HOME=/tmp PREFIX="%p" QTDOCDIR="%p/share/doc/qt3/html"3 export PREFIX="%p" USE_UNSERMAKE=1 4 4 . ./environment-helper.sh 5 export lt_cv_sys_max_cmd_len=655366 5 7 #darwinports8 export UNSERMAKE="no"9 10 6 export CC=gcc CXX=g++ 11 7 12 8 ./build-helper.sh cvs %N %v %r make -f admin/Makefile.common cvs 13 9 ./build-helper.sh configure %N %v %r ./configure %c $CONFIGURE_PARAMS 14 ./build-helper.sh make %N %v %r make all all_libraries="$ALL_LIBRARIES"10 ./build-helper.sh make %N %v %r unsermake $UNSERMAKEFLAGS -
kdeaddons3/Portfile
1 1 # $Id$ 2 2 3 #Synced with Fink, Version 3.5. 1-10233 #Synced with Fink, Version 3.5.4-1021 4 4 5 5 PortSystem 1.0 6 6 name kdeaddons3 7 version 3.5.1 8 revision 2 9 set kdeadmin kde-admindir-3.5.1 7 version 3.5.4 8 set kdeadmin kde-admindir-252 10 9 categories kde 11 10 maintainers ben@macports.org takanori@macports.org 12 11 description KDE addons. \ 13 12 NB No KDE sound support. 14 13 platforms darwin 15 master_sites opendarwin::kde35 1\14 master_sites opendarwin::kde354 \ 16 15 opendarwin::admin 17 16 # kde:stable/${version}/src 18 17 # http://ranger.befunk.com/fink/:admin 19 extract.suffix .tar.bz220 18 use_bzip2 yes 21 19 distname kdeaddons-${version} 22 distfiles ${distname}.tar.bz2:kde35 1\20 distfiles ${distname}.tar.bz2:kde354 \ 23 21 ${kdeadmin}.tar.bz2:admin 24 22 depends_build port:autoconf \ 25 port:automake 26 depends_lib port:kdebase3 \ 23 port:unsermake 24 depends_lib port:doxygen \ 25 port:kdebase3 \ 27 26 port:kdegames3 \ 28 port:libsdl \ 29 port:doxygen 27 port:kdepim3 28 # port:gtk1 29 # port:libsdl 30 30 31 checksums ${distname}.tar.bz2 md5 cbd2a6f65ae7338736d93b72bfdf5ae3\32 ${kdeadmin}.tar.bz2 md5 b6115a7310f8e8533af91be02e225d0e31 checksums ${distname}.tar.bz2 md5 840d18fbcadec9f94bb70563876b4dcd \ 32 ${kdeadmin}.tar.bz2 md5 54a89925e71bd32f759c81b312ad0b9e 33 33 34 extract.only 35 post-extract 34 extract.only ${distname}.tar.bz2 35 post-extract { system "cd ${worksrcpath} && bzcat -dc ${distpath}/${kdeadmin}.tar.bz2 | tar xf -" } 36 36 37 37 patchfiles kdeaddons3.patch 38 38 patch { 39 39 cd ${worksrcpath} 40 40 foreach file $patchfiles { 41 system "sed -e 's,@FINKPREFIX@,${prefix},g' ${ portpath}/${filesdir}/${file} | patch -p1"41 system "sed -e 's,@FINKPREFIX@,${prefix},g' ${filespath}/${file} | patch -p1" 42 42 } 43 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/*" 43 44 } 44 post-patch { 45 reinplace "s|lib/freetype219/||g" ${worksrcpath}/environment-helper.sh 46 reinplace "s|include/qt|include/qt3|g" ${worksrcpath}/environment-helper.sh 45 post-patch { 46 reinplace "s|/lib/freetype219||g" ${worksrcpath}/environment-helper.sh 47 47 reinplace "s|--with-ssl-dir=/usr|--with-ssl-dir=\$PREFIX|g" ${worksrcpath}/environment-helper.sh 48 reinplace "s|2.5\\*|2.\[56\]\\*|g" ${worksrcpath}/admin/cvs.sh49 foreach file [glob ${worksrcpath}/admin/*] {50 reinplace "s|-O2|-Os|g" $file51 reinplace "s|doc/HTML|doc/kde|g" $file52 reinplace "s|/usr/share/doc/packages/qt3/html|${prefix}/share/doc/qt3/html|g" $file53 }54 48 foreach file {CompileScript.sh InstallScript.sh} { 55 file copy ${ portpath}/${filesdir}/${file} ${worksrcpath}49 file copy ${filespath}/${file} ${worksrcpath} 56 50 reinplace "s|%p|${prefix}|g" ${worksrcpath}/${file} 57 51 reinplace "s|%N|${name}|g" ${worksrcpath}/${file} 58 52 reinplace "s|%v|${version}|g" ${worksrcpath}/${file} … … 64 58 } 65 59 } 66 60 67 configure.args --with-sdl-prefix=${prefix} --disable-sdltest --with-distribution=' DarwinPorts/Mac OS X' --without-arts61 configure.args --with-sdl-prefix=${prefix} --disable-sdltest --with-distribution='MacPorts/Mac OS X' --without-arts 68 62 69 63 configure {} 70 64 build { system "cd ${worksrcpath} && ./CompileScript.sh" } 71 65 destroot { system "cd ${worksrcpath} && ./InstallScript.sh" } 72 66 73 post-destroot 67 post-destroot { 74 68 xinstall -m 755 -d ${destroot}${prefix}/share/doc/${name} 75 69 xinstall -m 644 -W ${worksrcpath} README ${destroot}${prefix}/share/doc/${name} 76 70 } 77 78 platform darwin 6 {79 depends_lib-append lib:libdl:dlcompat80 } -
kdeartwork3/files/InstallScript.sh
1 1 #!/bin/sh -e 2 2 3 export PREFIX="%p" 3 export PREFIX="%p" USE_UNSERMAKE=1 4 4 . ./environment-helper.sh 5 5 6 #darwinports 7 export UNSERMAKE="no" 6 ./build-helper.sh install %N %v %r unsermake -p -j1 install DESTDIR=%d 8 7 9 ./build-helper.sh install %N %v %r make -j1 install DESTDIR=%d10 11 8 mkdir -p %i/share/doc/installed-packages 12 9 touch %i/share/doc/installed-packages/%N 13 10 touch %i/share/doc/installed-packages/%N-base -
kdeartwork3/files/CompileScript.sh
1 1 #!/bin/sh -e 2 2 3 export HOME=/tmp 4 export PREFIX="%p" 3 export PREFIX="%p" USE_UNSERMAKE=1 5 4 . ./environment-helper.sh 6 export lt_cv_sys_max_cmd_len=655367 5 8 #darwinports9 export UNSERMAKE="no"10 11 export CC=gcc CXX=g++12 13 6 ./build-helper.sh cvs %N %v %r make -f admin/Makefile.common cvs 14 7 ./build-helper.sh configure %N %v %r ./configure %c $CONFIGURE_PARAMS 15 ./build-helper.sh make %N %v %r make all all_libraries="$ALL_LIBRARIES"8 ./build-helper.sh make %N %v %r unsermake $UNSERMAKEFLAGS -
kdeartwork3/files/kdeartwork3.patch
1 diff -uNr kdeartwork-3.5.0/kscreensaver/kdesavers/rotation.h kdeartwork-3.5.0-new/kscreensaver/kdesavers/rotation.h2 --- kdeartwork-3.5.0/kscreensaver/kdesavers/rotation.h Mon Oct 10 10:53:54 20053 +++ kdeartwork-3.5.0-new/kscreensaver/kdesavers/rotation.h Sat Jan 14 13:08:14 20064 @@ -41,10 +41,10 @@5 * @param t Time in seconds, integration variable6 * @param dt Initial time increment in seconds for integration, auto adjusted7 * later to guarantee precision8 - * @param _A Moment of inertia along 1. figure axis9 - * @param _B Moment of inertia along 2. figure axis10 - * @param _C Moment of inertia along 3. figure axis11 - * @param _y Vector of 12 elements containing the initial rotation vector12 + * @param fooA Moment of inertia along 1. figure axis13 + * @param fooB Moment of inertia along 2. figure axis14 + * @param fooC Moment of inertia along 3. figure axis15 + * @param fooy Vector of 12 elements containing the initial rotation vector16 * omega (elements 0 to 2), and the initial rotating systems coordinate17 * vectors e1, e2, e3 (elements 3 to 5, 6 to 8, and 9 to 11).18 * @param eps Relative precision per integration step, see19 @@ -52,10 +52,10 @@20 EulerOdeSolver(21 const double &t,22 const double &dt,23 - const double &_A,24 - const double &_B,25 - const double &_C,26 - std::valarray<double> &_y,27 + const double &fooA,28 + const double &fooB,29 + const double &fooC,30 + std::valarray<double> &fooy,31 const double &eps);32 33 protected: -
kdeartwork3/Portfile
1 1 # $Id$ 2 2 3 #Synced with Fink, Version 3.5. 1-10233 #Synced with Fink, Version 3.5.4-1021 4 4 5 5 PortSystem 1.0 6 6 name kdeartwork3 7 version 3.5.1 8 revision 1 9 set kdeadmin kde-admindir-3.5.1 7 version 3.5.4 8 set kdeadmin kde-admindir-252 10 9 categories kde 11 10 maintainers ben@macports.org takanori@macports.org 12 11 description KDE additional artwork. \ 13 12 NB No KDE sound support. 14 13 platforms darwin 15 master_sites opendarwin::kde35 1\14 master_sites opendarwin::kde354 \ 16 15 opendarwin::admin 17 16 # kde:stable/${version}/src 18 17 # http://ranger.befunk.com/fink/:admin 19 extract.suffix .tar.bz220 18 use_bzip2 yes 21 19 distname kdeartwork-${version} 22 distfiles ${distname}.tar.bz2:kde35 1\20 distfiles ${distname}.tar.bz2:kde354 \ 23 21 ${kdeadmin}.tar.bz2:admin 24 22 depends_build port:autoconf \ 25 port: automake23 port:unsermake 26 24 depends_lib port:kdebase3 25 # port:xscreensaver 27 26 28 checksums ${distname}.tar.bz2 md5 8053bb1a1b2a5844b29f5f96328b1d96\29 ${kdeadmin}.tar.bz2 md5 b6115a7310f8e8533af91be02e225d0e27 checksums ${distname}.tar.bz2 md5 c7ff9048b9b68c976de08ed418598e40 \ 28 ${kdeadmin}.tar.bz2 md5 54a89925e71bd32f759c81b312ad0b9e 30 29 31 extract.only 32 post-extract 30 extract.only ${distname}.tar.bz2 31 post-extract { system "cd ${worksrcpath} && bzcat -dc ${distpath}/${kdeadmin}.tar.bz2 | tar xf -" } 33 32 34 patchfiles kdeartwork3.patch33 patchfiles 35 34 patch { 36 35 cd ${worksrcpath} 37 36 foreach file $patchfiles { 38 system "sed -e 's,@FINKPREFIX@,${prefix},g' ${ portpath}/${filesdir}/${file} | patch -p1"37 system "sed -e 's,@FINKPREFIX@,${prefix},g' ${filespath}/${file} | patch -p1" 39 38 } 39 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/*" 40 40 } 41 post-patch { 42 reinplace "s|lib/freetype219/||g" ${worksrcpath}/environment-helper.sh 43 reinplace "s|include/qt|include/qt3|g" ${worksrcpath}/environment-helper.sh 41 post-patch { 42 reinplace "s|/lib/freetype219||g" ${worksrcpath}/environment-helper.sh 44 43 reinplace "s|--with-ssl-dir=/usr|--with-ssl-dir=\$PREFIX|g" ${worksrcpath}/environment-helper.sh 45 reinplace "s|2.5\\*|2.\[56\]\\*|g" ${worksrcpath}/admin/cvs.sh46 foreach file [glob ${worksrcpath}/admin/*] {47 reinplace "s|-O2|-Os|g" $file48 reinplace "s|doc/HTML|doc/kde|g" $file49 reinplace "s|/usr/share/doc/packages/qt3/html|${prefix}/share/doc/qt3/html|g" $file50 }51 44 foreach file {CompileScript.sh InstallScript.sh} { 52 file copy ${ portpath}/${filesdir}/${file} ${worksrcpath}45 file copy ${filespath}/${file} ${worksrcpath} 53 46 reinplace "s|%p|${prefix}|g" ${worksrcpath}/${file} 54 47 reinplace "s|%N|${name}|g" ${worksrcpath}/${file} 55 48 reinplace "s|%v|${version}|g" ${worksrcpath}/${file} … … 61 54 } 62 55 } 63 56 64 configure.args --with-distribution=' DarwinPorts/Mac OS X' --without-arts57 configure.args --with-distribution='MacPorts/Mac OS X' --without-arts 65 58 66 59 configure {} 67 60 build { system "cd ${worksrcpath} && ./CompileScript.sh" } 68 61 destroot { system "cd ${worksrcpath} && ./InstallScript.sh" } 69 62 70 post-destroot 63 post-destroot { 71 64 xinstall -m 755 -d ${destroot}${prefix}/share/doc/${name} 72 65 xinstall -m 644 -W ${worksrcpath} README ${destroot}${prefix}/share/doc/${name} 73 66 74 67 #these icons are provided by kdesdk3 75 file delete ${destroot}${prefix}/share/icons/Locolor/16x16/apps/kbabel.png 76 file delete ${destroot}${prefix}/share/icons/Locolor/16x16/apps/ktimemon.png 77 file delete ${destroot}${prefix}/share/icons/Locolor/32x32/apps/kbabel.png 78 file delete ${destroot}${prefix}/share/icons/Locolor/32x32/apps/ktimemon.png 68 file delete ${destroot}${prefix}/share/icons/Locolor/16x16/apps/kbabel.png 69 file delete ${destroot}${prefix}/share/icons/Locolor/32x32/apps/kbabel.png 79 70 71 #these icons are provided by kdeaddons3 72 file delete ${destroot}${prefix}/share/icons/Locolor/16x16/apps/ktimemon.png 73 file delete ${destroot}${prefix}/share/icons/Locolor/32x32/apps/ktimemon.png 74 80 75 #rename "Locolor" to "locolor" 81 76 file rename ${destroot}${prefix}/share/icons/Locolor ${destroot}${prefix}/share/icons/locolor.tmp 82 77 file rename ${destroot}${prefix}/share/icons/locolor.tmp ${destroot}${prefix}/share/icons/locolor 83 84 78 } 85 86 platform darwin 6 {87 depends_lib-append lib:libdl:dlcompat88 } -
kdebase3/files/kdebase3-unified.patch
1 --- kdebase-3.5.0/drkonqi/Makefile.am 2005-09-10 04:25:55.000000000 -0400 2 +++ kdebase-3.5.0-new/drkonqi/Makefile.am 2005-11-13 08:25:50.000000000 -0500 1 2 --- kdebase-3.5.4/applnk/Makefile.am 2005-09-10 04:25:45.000000000 -0400 3 +++ kdebase-3.5.4-new/applnk/Makefile.am 2006-08-03 12:16:55.000000000 -0400 4 @@ -3,7 +3,7 @@ 5 xdg_menu_DATA = kde-settings.menu kde-information.menu kde-screensavers.menu 6 7 xdg_mergedmenu_DATA = kde-essential.menu 8 -xdg_mergedmenudir = $(xdg_menudir)/applications-merged 9 +xdg_mergedmenudir = $(xdg_menudir)/kde-applications-merged 10 11 xdg_directory_DATA = \ 12 kde-main.directory \ 13 --- kdebase-3.5.4/doc/userguide/kde-for-admins.docbook 2006-07-22 04:15:40.000000000 -0400 14 +++ kdebase-3.5.4-new/doc/userguide/kde-for-admins.docbook 2006-08-03 12:16:55.000000000 -0400 15 @@ -1669,7 +1669,7 @@ 16 </para> 17 18 <informalexample> 19 -<para>Example from <filename>applications.menu</filename>: 20 +<para>Example from <filename>kde-applications.menu</filename>: 21 <programlisting> 22 <markup> 23 <Menu> 24 @@ -1743,7 +1743,7 @@ 25 information, see <ulink url="http://www.freedesktop.org/Standards/basedir-spec">http://www.freedesktop.org/Standards/basedir-spec</ulink></para> 26 27 <informalexample> 28 -<para>Example from <filename>applications.menu</filename>: 29 +<para>Example from <filename>kde-applications.menu</filename>: 30 <programlisting> 31 <markup> 32 <Menu> 33 @@ -1795,7 +1795,7 @@ 34 <title>Essential Menus</title> 35 36 <para><filename 37 -class="directory">$<envar>KDEDIR</envar>/etc/xdg/menus/applications-merged/</filename> 38 +class="directory">$<envar>KDEDIR</envar>/etc/xdg/menus/kde-applications-merged/</filename> 39 contains <filename>kde-essential.menu</filename> which includes some 40 essential menus that are normally not shown in the &kde; menu itself: 41 <itemizedlist> 42 --- kdebase-3.5.4/drkonqi/Makefile.am 2005-09-10 04:25:55.000000000 -0400 43 +++ kdebase-3.5.4-new/drkonqi/Makefile.am 2006-08-03 12:16:55.000000000 -0400 3 44 @@ -8,15 +8,17 @@ 4 45 5 46 EXTRA_DIST = LICENSE … … 22 63 23 64 24 65 check_PROGRAMS = crashtest 25 --- kdebase-3.5. 0/drkonqi/main.cpp 2005-09-10 04:25:55.000000000 -040026 +++ kdebase-3.5. 0-new/drkonqi/main.cpp 2005-11-13 08:25:50.000000000 -050066 --- kdebase-3.5.4/drkonqi/main.cpp 2006-07-22 04:15:52.000000000 -0400 67 +++ kdebase-3.5.4-new/drkonqi/main.cpp 2006-08-03 12:16:55.000000000 -0400 27 68 @@ -57,7 +57,7 @@ 28 69 KCmdLineLastOption 29 70 }; … … 33 74 { 34 75 // Drop privs. 35 76 setgid(getgid()); 36 --- kdebase-3.5. 0/kappfinder/Makefile.am 2005-09-10 04:25:41.000000000 -040037 +++ kdebase-3.5. 0-new/kappfinder/Makefile.am 2005-11-13 08:25:50.000000000 -050077 --- kdebase-3.5.4/kappfinder/Makefile.am 2005-09-10 04:25:41.000000000 -0400 78 +++ kdebase-3.5.4-new/kappfinder/Makefile.am 2006-08-03 12:16:56.000000000 -0400 38 79 @@ -1,9 +1,17 @@ 39 80 SUBDIRS = apps 40 81 … … 57 98 58 99 noinst_PROGRAMS = kappfinder_install 59 100 kappfinder_install_SOURCES = main_install.cpp common.cpp 60 --- kdebase-3.5. 0/kappfinder/main.cpp 2005-10-10 11:04:07.000000000 -040061 +++ kdebase-3.5. 0-new/kappfinder/main.cpp 2005-11-13 08:25:50.000000000 -0500101 --- kdebase-3.5.4/kappfinder/main.cpp 2005-10-10 11:04:07.000000000 -0400 102 +++ kdebase-3.5.4-new/kappfinder/main.cpp 2006-08-03 12:16:56.000000000 -0400 62 103 @@ -31,7 +31,7 @@ 63 104 KCmdLineLastOption 64 105 }; … … 68 109 { 69 110 KAboutData aboutData( "kappfinder", I18N_NOOP( "KAppfinder" ), 70 111 "1.0", description, KAboutData::License_GPL, 71 --- kdebase-3.5. 0/kcontrol/filetypes/Makefile.am 2005-09-10 04:25:08.000000000 -040072 +++ kdebase-3.5. 0-new/kcontrol/filetypes/Makefile.am 2005-11-13 08:25:50.000000000 -0500112 --- kdebase-3.5.4/kcontrol/filetypes/Makefile.am 2005-09-10 04:25:08.000000000 -0400 113 +++ kdebase-3.5.4-new/kcontrol/filetypes/Makefile.am 2006-08-03 12:16:56.000000000 -0400 73 114 @@ -12,16 +12,18 @@ 74 115 kservicelistwidget.h typeslistitem.h newtypedlg.h \ 75 116 kserviceselectdlg.h … … 93 134 94 135 messages: 95 136 $(XGETTEXT) *.cpp -o $(podir)/filetypes.pot 96 --- kdebase-3.5. 0/kcontrol/filetypes/keditfiletype.cpp 2005-10-10 11:03:47.000000000 -040097 +++ kdebase-3.5. 0-new/kcontrol/filetypes/keditfiletype.cpp 2005-11-13 08:25:51.000000000 -0500137 --- kdebase-3.5.4/kcontrol/filetypes/keditfiletype.cpp 2005-10-10 11:03:47.000000000 -0400 138 +++ kdebase-3.5.4-new/kcontrol/filetypes/keditfiletype.cpp 2006-08-03 12:16:56.000000000 -0400 98 139 @@ -108,7 +108,7 @@ 99 140 KCmdLineLastOption 100 141 }; … … 104 145 { 105 146 KServiceTypeProfile::setConfigurationMode(); 106 147 KLocale::setMainCatalogue("filetypes"); 107 --- kdebase-3.5.0/kdcop/Makefile.am 2005-09-10 04:25:53.000000000 -0400 108 +++ kdebase-3.5.0-new/kdcop/Makefile.am 2005-11-13 08:25:51.000000000 -0500 148 --- kdebase-3.5.4/kcontrol/fonts/Makefile.am 2006-03-17 05:17:12.000000000 -0500 149 +++ kdebase-3.5.4-new/kcontrol/fonts/Makefile.am 2006-08-03 12:16:56.000000000 -0400 150 @@ -4,13 +4,13 @@ 151 libkxftconfig_la_LIBADD = $(LIBFONTCONFIG_LIBS) 152 libkxftconfig_la_LDFLAGS = $(LIBFONTCONFIG_RPATH) 153 154 -AM_CPPFLAGS = $(all_includes) $(LIBFONTCONFIG_CFLAGS) -D_LARGEFILE64_SOURCE 155 +AM_CPPFLAGS = $(LIBFONTCONFIG_CFLAGS) -D_LARGEFILE64_SOURCE $(all_includes) 156 157 kde_module_LTLIBRARIES = kcm_fonts.la 158 159 kcm_fonts_la_SOURCES = fonts.cpp 160 kcm_fonts_la_LDFLAGS = $(KDE_RPATH) $(LIBFONTCONFIG_RPATH) -module -avoid-version $(all_libraries) -no-undefined 161 -kcm_fonts_la_LIBADD = libkxftconfig.la $(top_builddir)/kcontrol/krdb/libkrdb.la $(LIB_KDEUI) $(LIBFONTCONFIG_LIBS) 162 +kcm_fonts_la_LIBADD = $(LIBFONTCONFIG_LIBS) libkxftconfig.la $(top_builddir)/kcontrol/krdb/libkrdb.la $(LIB_KDEUI) 163 METASOURCES = AUTO 164 165 noinst_HEADERS = fonts.h kxftconfig.h 166 --- kdebase-3.5.4/kcontrol/fonts/configure.in.in 2005-09-10 04:25:04.000000000 -0400 167 +++ kdebase-3.5.4-new/kcontrol/fonts/configure.in.in 2006-08-03 12:16:56.000000000 -0400 168 @@ -1,8 +1,6 @@ 169 -KDE_FIND_PATH(fontconfig-config, FONTCONFIG_CONFIG, [${prefix}/bin ${exec_prefix}/bin /usr/bin /usr/local/bin /opt/local/bin], [ 170 KDE_FIND_PATH(pkg-config, PKGCONFIG, [${prefix}/bin ${exec_prefix}/bin /usr/bin /usr/local/bin /opt/local/bin], [ 171 AC_MSG_WARN([Could not find neither pkg-config nor fontconfig-config, check http://www.fontconfig.org/ ]) 172 ]) 173 -]) 174 175 if test -n "$PKGCONFIG"; then 176 vers=`$PKGCONFIG fontconfig --modversion 2>/dev/null | sed -e 's/libfontconfig //' | awk 'BEGIN { FS = "."; } { printf "%d", ($1 * 1000 + $2) * 1000 + $3;}'` 177 --- kdebase-3.5.4/kcontrol/kfontinst/configure.in.in 2006-01-19 12:00:50.000000000 -0500 178 +++ kdebase-3.5.4-new/kcontrol/kfontinst/configure.in.in 2006-08-03 12:16:56.000000000 -0400 179 @@ -36,11 +36,9 @@ 180 181 KFI_FOUND_FONTCONFIG=0 182 # check for fontconfig... 183 - KDE_FIND_PATH(fontconfig-config, FONTCONFIG_CONFIG, [${prefix}/bin ${exec_prefix}/bin /usr/bin /usr/local/bin /opt/local/bin], [ 184 KDE_FIND_PATH(pkg-config, PKGCONFIG, [${prefix}/bin ${exec_prefix}/bin /usr/bin /usr/local/bin /opt/local/bin], [ 185 AC_MSG_WARN([Could not find neither pkg-config nor fontconfig-config, check http://www.fontconfig.org/ ]) 186 ]) 187 - ]) 188 189 if test -n "$PKGCONFIG"; then 190 vers=`$PKGCONFIG fontconfig --modversion 2>/dev/null | sed -e 's/libfontconfig //' | awk 'BEGIN { FS = "."; } { printf "%d", ($1 * 1000 + $2) * 1000 + $3;}'` 191 --- kdebase-3.5.4/kcontrol/kfontinst/kcmfontinst/Makefile.am 2005-09-10 04:25:09.000000000 -0400 192 +++ kdebase-3.5.4-new/kcontrol/kfontinst/kcmfontinst/Makefile.am 2006-08-03 12:16:56.000000000 -0400 193 @@ -4,10 +4,10 @@ 194 endif 195 196 kde_module_LTLIBRARIES = kcm_fontinst.la 197 -kcm_fontinst_la_LIBADD = $(LIB_KIO) $(FONTINST_PRINT_LIB) $(LIBFREETYPE_LIBS) $(LIBFONTCONFIG_LIBS) ../lib/libkfontinst.la 198 +kcm_fontinst_la_LIBADD = $(LIBFREETYPE_LIBS) $(LIBFONTCONFIG_LIBS) $(LIB_KIO) $(FONTINST_PRINT_LIB) ../lib/libkfontinst.la 199 METASOURCES = AUTO 200 kcm_fontinst_la_LDFLAGS = $(KDE_PLUGIN) $(all_libraries) $(KDE_RPATH) -module -avoid-version -no-undefined 201 -AM_CPPFLAGS = -I$(srcdir)/../lib $(FONTINST_PRINT_INC) -I$(srcdir)/../../fonts $(all_includes) $(LIBFREETYPE_CFLAGS) $(LIBFONTCONFIG_CFLAGS) 202 +AM_CPPFLAGS = -I$(srcdir)/../lib $(FONTINST_PRINT_INC) -I$(srcdir)/../../fonts $(LIBFREETYPE_CFLAGS) $(LIBFONTCONFIG_CFLAGS) $(all_includes) 203 204 xdg_apps_DATA = kcmfontinst.desktop 205 206 --- kdebase-3.5.4/kcontrol/kfontinst/kfile-plugin/Makefile.am 2005-09-10 04:25:09.000000000 -0400 207 +++ kdebase-3.5.4-new/kcontrol/kfontinst/kfile-plugin/Makefile.am 2006-08-03 12:16:56.000000000 -0400 208 @@ -1,13 +1,13 @@ 209 kde_module_LTLIBRARIES = kfile_font.la 210 211 kfile_font_la_SOURCES = KFileFont.cpp 212 -kfile_font_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIBFREETYPE_RPATH) -module $(KDE_PLUGIN) 213 -kfile_font_la_LIBADD = $(LIB_KIO) $(LIBFREETYPE_LIBS) ../lib/libkfontinst.la 214 +kfile_font_la_LDFLAGS = $(LIBFREETYPE_RPATH) $(all_libraries) $(KDE_RPATH) -module $(KDE_PLUGIN) 215 +kfile_font_la_LIBADD = $(LIBFREETYPE_LIBS) $(LIB_KIO) ../lib/libkfontinst.la 216 217 kdelnkdir = $(kde_servicesdir) 218 kde_services_DATA = kfile_font.desktop 219 220 -AM_CPPFLAGS = -I$(srcdir)/../lib -I$(srcdir)/../../fonts $(all_includes) $(LIBFREETYPE_CFLAGS) 221 +AM_CPPFLAGS = -I$(srcdir)/../lib -I$(srcdir)/../../fonts $(LIBFREETYPE_CFLAGS) $(all_includes) 222 223 METASOURCES = AUTO 224 noinst_HEADERS = KFileFont.h 225 --- kdebase-3.5.4/kcontrol/kfontinst/kfontinst/Main.cpp 2005-10-10 11:03:47.000000000 -0400 226 +++ kdebase-3.5.4-new/kcontrol/kfontinst/kfontinst/Main.cpp 2006-08-03 12:16:56.000000000 -0400 227 @@ -190,7 +190,7 @@ 228 KFI::CXConfig::refreshPaths(true); 229 } 230 231 -int main(int argc, char *argv[]) 232 +extern "C" KDE_EXPORT int kdemain(int argc, char *argv[]) 233 { 234 #ifdef HAVE_GETOPT_H 235 static struct option options[]= 236 --- kdebase-3.5.4/kcontrol/kfontinst/kfontinst/Makefile.am 2005-09-10 04:25:09.000000000 -0400 237 +++ kdebase-3.5.4-new/kcontrol/kfontinst/kfontinst/Makefile.am 2006-08-03 12:16:56.000000000 -0400 238 @@ -1,5 +1,8 @@ 239 -bin_PROGRAMS = kfontinst 240 -kfontinst_SOURCES = \ 241 +bin_PROGRAMS = 242 +lib_LTLIBRARIES = 243 +kdeinit_LTLIBRARIES = kfontinst.la 244 + 245 +kfontinst_la_SOURCES = \ 246 CompressedFile.cpp \ 247 Main.cpp \ 248 Encodings.cpp \ 249 @@ -15,6 +18,6 @@ 250 Fontmap.h \ 251 XConfig.h 252 253 -kfontinst_LDADD = ../../fonts/libkxftconfig.la $(LIBFONTCONFIG_LIBS) $(LIBFREETYPE_LIBS) $(LIB_FONT_ENC) $(LIBZ) $(LIB_KIO) ../lib/libkfontinst.la 254 -kfontinst_LDFLAGS = $(all_libraries) $(LIBFONTCONFIG_RPATH) $(LIBFREETYPE_RPATH) $(KDE_RPATH) 255 -AM_CPPFLAGS= -DOS_$(UNAME) -I$(srcdir)/../lib -I$(srcdir)/../../fonts $(all_includes) $(LIBFREETYPE_CFLAGS) $(LIBFONTCONFIG_CFLAGS) 256 +kfontinst_la_LIBADD = $(LIBFONTCONFIG_LIBS) $(LIBFREETYPE_LIBS) $(LIB_FONT_ENC) ../../fonts/libkxftconfig.la $(LIBZ) $(LIB_KIO) ../lib/libkfontinst.la 257 +kfontinst_la_LDFLAGS = $(LIBFONTCONFIG_RPATH) $(LIBFREETYPE_RPATH) $(all_libraries) $(KDE_PLUGIN) -module 258 +AM_CPPFLAGS= -DOS_$(UNAME) -I$(srcdir)/../lib -I$(srcdir)/../../fonts $(LIBFREETYPE_CFLAGS) $(LIBFONTCONFIG_CFLAGS) $(all_includes) 259 --- kdebase-3.5.4/kcontrol/kfontinst/kio/Makefile.am 2005-09-10 04:25:09.000000000 -0400 260 +++ kdebase-3.5.4-new/kcontrol/kfontinst/kio/Makefile.am 2006-08-03 12:16:56.000000000 -0400 261 @@ -2,9 +2,9 @@ 262 kio_fonts_la_SOURCES = \ 263 KioFonts.cpp 264 265 -kio_fonts_la_LIBADD = ../../fonts/libkxftconfig.la $(LIBFONTCONFIG_LIBS) $(LIBFREETYPE_LIBS) $(LIB_KIO) -lkdesu ../lib/libkfontinst.la 266 -kio_fonts_la_LDFLAGS = $(KDE_PLUGIN) $(all_libraries) $(KDE_RPATH) $(LIBFONTCONFIG_RPATH) $(LIBFREETYPE_RPATH) -module -avoid-version -no-undefined 267 -AM_CPPFLAGS= -I$(srcdir)/../lib -I$(srcdir)/../../fonts $(all_includes) $(LIBFREETYPE_CFLAGS) $(LIBFONTCONFIG_CFLAGS) -D_LARGEFILE64_SOURCE 268 +kio_fonts_la_LIBADD = $(LIBFONTCONFIG_LIBS) $(LIBFREETYPE_LIBS) ../../fonts/libkxftconfig.la $(LIB_KIO) -lkdesu ../lib/libkfontinst.la 269 +kio_fonts_la_LDFLAGS = $(LIBFONTCONFIG_RPATH) $(LIBFREETYPE_RPATH) $(KDE_PLUGIN) $(all_libraries) $(KDE_RPATH) -module -avoid-version -no-undefined 270 +AM_CPPFLAGS= -I$(srcdir)/../lib -I$(srcdir)/../../fonts $(LIBFREETYPE_CFLAGS) $(LIBFONTCONFIG_CFLAGS) -D_LARGEFILE64_SOURCE $(all_includes) 271 272 # The kxftconfig stuf really belongs to kdebase/kcontrol/fonts - here only so that can distribute this as an archive. 273 noinst_HEADERS = \ 274 --- kdebase-3.5.4/kcontrol/kfontinst/lib/FcEngine.h 2005-09-10 04:25:09.000000000 -0400 275 +++ kdebase-3.5.4-new/kcontrol/kfontinst/lib/FcEngine.h 2006-08-03 12:16:56.000000000 -0400 276 @@ -5,6 +5,8 @@ 277 #include "config.h" 278 #endif 279 280 +#define KFI_FC_NO_WIDTHS 1 281 + 282 #include <qstring.h> 283 #include <qvaluevector.h> 284 #include <qfont.h> 285 --- kdebase-3.5.4/kcontrol/kfontinst/lib/Makefile.am 2005-09-10 04:25:09.000000000 -0400 286 +++ kdebase-3.5.4-new/kcontrol/kfontinst/lib/Makefile.am 2006-08-03 12:16:56.000000000 -0400 287 @@ -9,6 +9,6 @@ 288 FcEngine.h \ 289 KfiConstants.h 290 291 -libkfontinst_la_LIBADD = $(LIB_KDECORE) $(LIBFONTCONFIG_LIBS) $(LIBFREETYPE_LIBS) $(LIB_KIO) $(LIBXFT_LIB) 292 -libkfontinst_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIBFONTCONFIG_RPATH) $(LIBFREETYPE_RPATH) -no-undefined 293 -AM_CPPFLAGS= $(all_includes) $(LIBFREETYPE_CFLAGS) $(LIBFONTCONFIG_CFLAGS) -D_LARGEFILE64_SOURCE 294 +libkfontinst_la_LIBADD = $(LIBFONTCONFIG_LIBS) $(LIBFREETYPE_LIBS) $(LIB_KDECORE) $(LIB_KIO) $(LIBXFT_LIB) 295 +libkfontinst_la_LDFLAGS = $(LIBFONTCONFIG_RPATH) $(LIBFREETYPE_RPATH) $(all_libraries) $(KDE_RPATH) -no-undefined 296 +AM_CPPFLAGS= $(LIBFREETYPE_CFLAGS) $(LIBFONTCONFIG_CFLAGS) -D_LARGEFILE64_SOURCE $(all_includes) 297 --- kdebase-3.5.4/kcontrol/kfontinst/thumbnail/Makefile.am 2005-09-10 04:25:09.000000000 -0400 298 +++ kdebase-3.5.4-new/kcontrol/kfontinst/thumbnail/Makefile.am 2006-08-03 12:16:56.000000000 -0400 299 @@ -2,7 +2,7 @@ 300 301 fontthumbnail_la_SOURCES = FontThumbnail.cpp 302 fontthumbnail_la_LIBADD = $(LIBFREETYPE_LIBS) $(LIB_KDECORE) $(LIB_KIO) ../lib/libkfontinst.la 303 -fontthumbnail_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIBFREETYPE_RPATH) -module $(KDE_PLUGIN) 304 +fontthumbnail_la_LDFLAGS = $(KDE_RPATH) $(LIBFREETYPE_RPATH) -module $(KDE_PLUGIN) $(all_libraries) 305 METASOURCES = AUTO 306 307 noinst_HEADERS = FontThumbnail.h 308 @@ -11,4 +11,4 @@ 309 310 kde_services_DATA = fontthumbnail.desktop 311 312 -AM_CPPFLAGS= -I$(srcdir)/../lib -I$(srcdir)/../../fonts $(all_includes) $(LIBFREETYPE_CFLAGS) 313 +AM_CPPFLAGS= -I$(srcdir)/../lib -I$(srcdir)/../../fonts $(LIBFREETYPE_CFLAGS) $(all_includes) 314 --- kdebase-3.5.4/kcontrol/kfontinst/viewpart/FontViewerApp.cpp 2005-10-10 11:03:47.000000000 -0400 315 +++ kdebase-3.5.4-new/kcontrol/kfontinst/viewpart/FontViewerApp.cpp 2006-08-03 12:16:56.000000000 -0400 316 @@ -116,7 +116,7 @@ 317 KAboutData::License_GPL, 318 I18N_NOOP("(c) Craig Drummond, 2004")); 319 320 -int main(int argc, char **argv) 321 +extern "C" KDE_EXPORT int kdemain(int argc, char **argv) 322 { 323 KCmdLineArgs::init(argc, argv, &aboutData); 324 KCmdLineArgs::addCmdLineOptions(options); 325 --- kdebase-3.5.4/kcontrol/kfontinst/viewpart/Makefile.am 2005-09-10 04:25:09.000000000 -0400 326 +++ kdebase-3.5.4-new/kcontrol/kfontinst/viewpart/Makefile.am 2006-08-03 12:16:56.000000000 -0400 327 @@ -13,18 +13,21 @@ 328 329 kde_services_DATA = kfontviewpart.desktop 330 331 -AM_CPPFLAGS = -I$(srcdir)/../lib -I$(srcdir)/../../fonts $(all_includes) $(LIBFREETYPE_CFLAGS) $(LIBFONTCONFIG_CFLAGS) 332 +AM_CPPFLAGS = -I$(srcdir)/../lib -I$(srcdir)/../../fonts $(LIBFREETYPE_CFLAGS) $(LIBFONTCONFIG_CFLAGS) $(all_includes) 333 METASOURCES = AUTO 334 335 -kfontview_LDADD = $(LIB_KPARTS) 336 -kfontview_LDFLAGS = $(all_libraries) $(KDE_RPATH) 337 +kfontview_la_LIBADD = $(LIB_KPARTS) 338 +kfontview_la_LDFLAGS = $(KDE_PLUGIN) -module $(all_libraries) 339 + 340 +bin_PROGRAMS = 341 +lib_LTLIBRARIES = 342 +kdeinit_LTLIBRARIES = kfontview.la 343 344 -bin_PROGRAMS = kfontview 345 xdg_apps_DATA = kfontview.desktop 346 347 appdata_DATA = kfontviewpart.rc kfontviewui.rc 348 appdatadir = $(kde_datadir)/kfontview 349 350 -kfontview_SOURCES = FontViewerApp.cpp 351 +kfontview_la_SOURCES = FontViewerApp.cpp 352 353 354 --- kdebase-3.5.4/kdcop/Makefile.am 2005-09-10 04:25:53.000000000 -0400 355 +++ kdebase-3.5.4-new/kdcop/Makefile.am 2006-08-03 12:16:56.000000000 -0400 109 356 @@ -7,10 +7,13 @@ 110 357 111 358 INCLUDES = $(all_includes) … … 124 371 125 372 noinst_HEADERS = kdcopwindow.h 126 373 METASOURCES = AUTO 127 --- kdebase-3.5. 0/kdcop/kdcop.cpp 2005-09-10 04:25:53.000000000 -0400128 +++ kdebase-3.5. 0-new/kdcop/kdcop.cpp 2005-11-13 08:25:51.000000000 -0500374 --- kdebase-3.5.4/kdcop/kdcop.cpp 2005-09-10 04:25:53.000000000 -0400 375 +++ kdebase-3.5.4-new/kdcop/kdcop.cpp 2006-08-03 12:16:56.000000000 -0400 129 376 @@ -15,7 +15,7 @@ 130 377 KCmdLineLastOption 131 378 }; … … 135 382 { 136 383 KAboutData aboutData( "kdcop", I18N_NOOP("KDCOP"), 137 384 "0.1", I18N_NOOP( "A graphical DCOP browser/client" ), 138 --- kdebase-3.5. 0/kdebugdialog/Makefile.am 2005-09-10 04:24:57.000000000 -0400139 +++ kdebase-3.5. 0-new/kdebugdialog/Makefile.am 2005-11-13 08:25:51.000000000 -0500385 --- kdebase-3.5.4/kdebugdialog/Makefile.am 2005-09-10 04:24:57.000000000 -0400 386 +++ kdebase-3.5.4-new/kdebugdialog/Makefile.am 2006-08-03 12:16:56.000000000 -0400 140 387 @@ -4,12 +4,14 @@ 141 388 142 389 ####### Files … … 157 404 158 405 messages: 159 406 $(XGETTEXT) *.cpp -o $(podir)/kdebugdialog.pot 160 --- kdebase-3.5. 0/kdebugdialog/main.cpp 2005-10-10 11:03:40.000000000 -0400161 +++ kdebase-3.5. 0-new/kdebugdialog/main.cpp 2005-11-13 08:25:51.000000000 -0500407 --- kdebase-3.5.4/kdebugdialog/main.cpp 2005-10-10 11:03:40.000000000 -0400 408 +++ kdebase-3.5.4-new/kdebugdialog/main.cpp 2006-08-03 12:16:56.000000000 -0400 162 409 @@ -75,7 +75,7 @@ 163 410 KCmdLineLastOption 164 411 }; … … 168 415 { 169 416 KAboutData data( "kdebugdialog", I18N_NOOP( "KDebugDialog"), 170 417 "1.0", I18N_NOOP("A dialog box for setting preferences for debug output"), 171 --- kdebase-3.5. 0/kdepasswd/Makefile.am 2005-09-10 04:24:59.000000000 -0400172 +++ kdebase-3.5. 0-new/kdepasswd/Makefile.am 2005-11-13 08:25:51.000000000 -0500418 --- kdebase-3.5.4/kdepasswd/Makefile.am 2005-09-10 04:24:59.000000000 -0400 419 +++ kdebase-3.5.4-new/kdepasswd/Makefile.am 2006-08-03 12:16:56.000000000 -0400 173 420 @@ -1,10 +1,13 @@ 174 421 175 422 SUBDIRS = kcm … … 188 435 189 436 METASOURCES = AUTO 190 437 AM_CPPFLAGS= -I$(top_srcdir)/libkonq $(all_includes) 191 --- kdebase-3.5. 0/kdepasswd/kdepasswd.cpp 2005-09-10 04:24:59.000000000 -0400192 +++ kdebase-3.5. 0-new/kdepasswd/kdepasswd.cpp 2005-11-13 08:25:51.000000000 -0500438 --- kdebase-3.5.4/kdepasswd/kdepasswd.cpp 2005-09-10 04:24:59.000000000 -0400 439 +++ kdebase-3.5.4-new/kdepasswd/kdepasswd.cpp 2006-08-03 12:16:56.000000000 -0400 193 440 @@ -26,7 +26,7 @@ 194 441 }; 195 442 … … 199 446 { 200 447 KAboutData aboutData("kdepasswd", I18N_NOOP("KDE passwd"), 201 448 VERSION, I18N_NOOP("Changes a UNIX password."), 202 --- kdebase-3.5. 0/kdeprint/kdeprintfax/Makefile.am 2005-09-10 04:25:38.000000000 -0400203 +++ kdebase-3.5. 0-new/kdeprint/kdeprintfax/Makefile.am 2005-11-13 08:25:51.000000000 -0500449 --- kdebase-3.5.4/kdeprint/kdeprintfax/Makefile.am 2005-09-10 04:25:38.000000000 -0400 450 +++ kdebase-3.5.4-new/kdeprint/kdeprintfax/Makefile.am 2006-08-03 12:16:56.000000000 -0400 204 451 @@ -1,11 +1,14 @@ 205 452 INCLUDES= $(all_includes) 206 453 … … 221 468 222 469 xdg_apps_DATA = kdeprintfax.desktop 223 470 224 --- kdebase-3.5. 0/kdeprint/kdeprintfax/main.cpp 2005-10-10 11:04:02.000000000 -0400225 +++ kdebase-3.5. 0-new/kdeprint/kdeprintfax/main.cpp 2005-11-13 08:25:51.000000000 -0500471 --- kdebase-3.5.4/kdeprint/kdeprintfax/main.cpp 2005-10-10 11:04:02.000000000 -0400 472 +++ kdebase-3.5.4-new/kdeprint/kdeprintfax/main.cpp 2006-08-03 12:16:56.000000000 -0400 226 473 @@ -44,7 +44,7 @@ 227 474 // INSERT YOUR COMMANDLINE OPTIONS HERE 228 475 }; … … 232 479 { 233 480 234 481 KAboutData aboutData( "kdeprintfax", I18N_NOOP("KdeprintFax"), 235 --- kdebase-3.5. 0/kdeprint/kprinter/printwrapper.cpp 2005-10-10 11:04:05.000000000 -0400236 +++ kdebase-3.5. 0-new/kdeprint/kprinter/printwrapper.cpp 2005-11-13 08:25:51.000000000 -0500482 --- kdebase-3.5.4/kdeprint/kprinter/printwrapper.cpp 2005-10-10 11:04:05.000000000 -0400 483 +++ kdebase-3.5.4-new/kdeprint/kprinter/printwrapper.cpp 2006-08-03 12:16:56.000000000 -0400 237 484 @@ -137,10 +137,6 @@ 238 485 { 239 486 KCmdLineArgs *args = KCmdLineArgs::parsedArgs(); … … 256 503 # if defined(HAVE_SIGSET) 257 504 sigset(SIGHUP, signal_handler); 258 505 sigset(SIGINT, signal_handler); 259 --- kdebase-3.5. 0/kdesktop/Makefile.am 2005-09-10 04:25:45.000000000 -0400260 +++ kdebase-3.5. 0-new/kdesktop/Makefile.am 2005-11-13 08:29:01.000000000 -0500506 --- kdebase-3.5.4/kdesktop/Makefile.am 2006-05-22 14:12:51.000000000 -0400 507 +++ kdebase-3.5.4-new/kdesktop/Makefile.am 2006-08-03 12:16:56.000000000 -0400 261 508 @@ -8,9 +8,9 @@ 262 509 263 510 ####### Files … … 283 530 284 531 METASOURCES = AUTO 285 532 286 --- kdebase-3.5.0/kdesktop/init.h 2005-10-10 11:04:11.000000000 -0400 287 +++ kdebase-3.5.0-new/kdesktop/init.h 2005-11-13 08:25:51.000000000 -0500 288 @@ -27,4 +27,18 @@ 289 */ 290 void testLocalInstallation(); 291 292 +typedef struct fileinfobuf { 293 + u_int32_t info_length; 294 + union { 295 + struct { 296 + u_int32_t type; 297 + u_int32_t creator; 298 + u_int16_t fdFlags; 299 + u_int16_t location; 300 + u_int32_t padding[4]; 301 + } finder; 302 + off_t rsrcForkSize; 303 + } data; 304 +} fileinfobuf; 305 + 306 #endif 307 --- kdebase-3.5.1/kdesktop/kcheckrunning.cpp.orig 2006-02-27 14:36:42.000000000 -0500 308 +++ kdebase-3.5.1/kdesktop/kcheckrunning.cpp 2006-02-27 14:37:11.000000000 -0500 533 --- kdebase-3.5.4/kdesktop/kcheckrunning.cpp 2005-10-10 11:04:11.000000000 -0400 534 +++ kdebase-3.5.4-new/kdesktop/kcheckrunning.cpp 2006-08-03 12:16:56.000000000 -0400 309 535 @@ -18,8 +18,9 @@ 310 536 */ 311 537 … … 317 543 { 318 544 Display* dpy = XOpenDisplay( NULL ); 319 545 if( dpy == NULL ) 320 --- kdebase-3.5. 0/kdesktop/kwebdesktop/Makefile.am 2005-09-10 04:25:45.000000000 -0400321 +++ kdebase-3.5. 0-new/kdesktop/kwebdesktop/Makefile.am 2005-11-13 08:25:52.000000000 -0500546 --- kdebase-3.5.4/kdesktop/kwebdesktop/Makefile.am 2005-09-10 04:25:45.000000000 -0400 547 +++ kdebase-3.5.4-new/kdesktop/kwebdesktop/Makefile.am 2006-08-03 12:16:56.000000000 -0400 322 548 @@ -2,12 +2,15 @@ 323 549 INCLUDES= $(all_includes) 324 550 LDADD = $(LIB_KHTML) … … 338 564 339 565 kdesktop_kwebdesktop_data_DATA = kwebdesktop.desktop 340 566 kdesktop_kwebdesktop_datadir = $(kde_datadir)/kdesktop/programs 341 --- kdebase-3.5. 0/kdesktop/kwebdesktop/kwebdesktop.cpp 2005-10-10 11:04:07.000000000 -0400342 +++ kdebase-3.5. 0-new/kdesktop/kwebdesktop/kwebdesktop.cpp 2005-11-13 08:25:52.000000000 -0500567 --- kdebase-3.5.4/kdesktop/kwebdesktop/kwebdesktop.cpp 2006-05-22 14:12:50.000000000 -0400 568 +++ kdebase-3.5.4-new/kdesktop/kwebdesktop/kwebdesktop.cpp 2006-08-03 12:16:56.000000000 -0400 343 569 @@ -84,7 +84,7 @@ 344 570 } 345 571 … … 349 575 { 350 576 KAboutData data( "kwebdesktop", I18N_NOOP("KDE Web Desktop"), 351 577 VERSION, 352 --- kdebase-3.5. 0/kdesktop/lock/Makefile.am 2005-09-10 04:25:41.000000000 -0400353 +++ kdebase-3.5. 0-new/kdesktop/lock/Makefile.am 2005-11-13 08:25:53.000000000 -0500578 --- kdebase-3.5.4/kdesktop/lock/Makefile.am 2005-09-10 04:25:41.000000000 -0400 579 +++ kdebase-3.5.4-new/kdesktop/lock/Makefile.am 2006-08-03 12:16:56.000000000 -0400 354 580 @@ -1,14 +1,16 @@ 355 581 ## Makefile.am of kdebase/kdesktop/lock 356 582 … … 372 598 373 599 noinst_HEADERS = lockprocess.h lockdlg.h autologout.h main.h 374 600 375 --- kdebase-3.5. 0/kdesktop/lock/main.cc 2005-10-10 11:04:07.000000000 -0400376 +++ kdebase-3.5. 0-new/kdesktop/lock/main.cc 2005-11-13 08:25:52.000000000 -0500377 @@ -5 8,7 +58,7 @@601 --- kdebase-3.5.4/kdesktop/lock/main.cc 2006-03-17 05:17:37.000000000 -0500 602 +++ kdebase-3.5.4-new/kdesktop/lock/main.cc 2006-08-03 12:16:56.000000000 -0400 603 @@ -59,7 +59,7 @@ 378 604 379 605 // ----------------------------------------------------------------------------- 380 606 … … 383 609 { 384 610 KLocale::setMainCatalogue("kdesktop"); 385 611 386 --- kdebase-3.5. 0/kdesu/kdesu/Makefile.am 2005-09-10 04:26:14.000000000 -0400387 +++ kdebase-3.5. 0-new/kdesu/kdesu/Makefile.am 2005-11-13 08:25:52.000000000 -0500612 --- kdebase-3.5.4/kdesu/kdesu/Makefile.am 2005-09-10 04:26:14.000000000 -0400 613 +++ kdebase-3.5.4-new/kdesu/kdesu/Makefile.am 2006-08-03 12:16:56.000000000 -0400 388 614 @@ -3,11 +3,14 @@ 389 615 INCLUDES= $(all_includes) 390 616 … … 405 631 noinst_HEADERS = sudlg.h 406 632 407 633 ## Messages 408 --- kdebase-3.5. 0/kdesu/kdesu/kdesu.cpp 2005-11-08 17:37:00.000000000 -0500409 +++ kdebase-3.5. 0-new/kdesu/kdesu/kdesu.cpp 2005-11-13 08:25:52.000000000 -0500410 @@ -8 5,7 +85,7 @@634 --- kdebase-3.5.4/kdesu/kdesu/kdesu.cpp 2006-05-22 14:13:07.000000000 -0400 635 +++ kdebase-3.5.4-new/kdesu/kdesu/kdesu.cpp 2006-08-03 12:16:56.000000000 -0400 636 @@ -86,7 +86,7 @@ 411 637 412 638 static int startApp(); 413 639 … … 416 642 { 417 643 // FIXME: this can be considered a poor man's solution, as it's not 418 644 // directly obvious to a gui user. :) 419 --- kdebase-3.5. 0/kdesu/kdesud/Makefile.am 2005-09-10 04:26:13.000000000 -0400420 +++ kdebase-3.5. 0-new/kdesu/kdesud/Makefile.am 2005-11-13 08:30:17.000000000 -0500645 --- kdebase-3.5.4/kdesu/kdesud/Makefile.am 2005-09-10 04:26:13.000000000 -0400 646 +++ kdebase-3.5.4-new/kdesu/kdesud/Makefile.am 2006-08-03 12:16:56.000000000 -0400 421 647 @@ -4,10 +4,13 @@ 422 648 423 649 KDE_CXXFLAGS = $(KDE_USE_FPIE) … … 436 662 noinst_HEADERS = repo.h handler.h lexer.h secure.h 437 663 438 664 ## kdesud needs to be suid or sgid something 439 --- kdebase-3.5. 0/kdesu/kdesud/kdesud.cpp 2005-09-10 04:26:13.000000000 -0400440 +++ kdebase-3.5. 0-new/kdesu/kdesud/kdesud.cpp 2005-11-13 08:25:52.000000000 -0500665 --- kdebase-3.5.4/kdesu/kdesud/kdesud.cpp 2005-09-10 04:26:13.000000000 -0400 666 +++ kdebase-3.5.4-new/kdesu/kdesud/kdesud.cpp 2006-08-03 12:16:56.000000000 -0400 441 667 @@ -246,7 +246,7 @@ 442 668 * Main program 443 669 */ … … 447 673 { 448 674 KAboutData aboutData("kdesud", I18N_NOOP("KDE su daemon"), 449 675 Version, I18N_NOOP("Daemon used by kdesu"), 450 --- kdebase-3.5. 0/kdialog/Makefile.am 2005-09-10 04:25:36.000000000 -0400451 +++ kdebase-3.5. 0-new/kdialog/Makefile.am 2005-11-13 08:25:52.000000000 -0500676 --- kdebase-3.5.4/kdialog/Makefile.am 2005-09-10 04:25:36.000000000 -0400 677 +++ kdebase-3.5.4-new/kdialog/Makefile.am 2006-08-03 12:16:56.000000000 -0400 452 678 @@ -1,11 +1,13 @@ 453 679 KDE_CXXFLAGS = -DQT_NO_CAST_ASCII -DQT_NO_ASCII_CAST 454 680 INCLUDES = $(all_includes) … … 467 693 468 694 METASOURCES = AUTO 469 695 470 --- kdebase-3.5. 0/kdialog/kdialog.cpp 2005-10-10 11:04:00.000000000 -0400471 +++ kdebase-3.5. 0-new/kdialog/kdialog.cpp 2005-11-13 08:25:52.000000000 -0500472 @@ -66 1,7 +661,7 @@696 --- kdebase-3.5.4/kdialog/kdialog.cpp 2006-05-22 14:12:42.000000000 -0400 697 +++ kdebase-3.5.4-new/kdialog/kdialog.cpp 2006-08-03 12:16:56.000000000 -0400 698 @@ -660,7 +660,7 @@ 473 699 } 474 700 475 701 … … 478 704 { 479 705 KAboutData aboutData( "kdialog", I18N_NOOP("KDialog"), 480 706 "1.0", I18N_NOOP( "KDialog can be used to show nice dialog boxes from shell scripts" ), 481 --- kdebase-3.5.0/kfind/Makefile.am 2005-09-10 04:25:00.000000000 -0400 482 +++ kdebase-3.5.0-new/kfind/Makefile.am 2005-11-13 08:25:52.000000000 -0500 707 --- kdebase-3.5.4/kdm/kfrontend/kdm_greet.c 2005-10-10 11:04:31.000000000 -0400 708 +++ kdebase-3.5.4-new/kdm/kfrontend/kdm_greet.c 2006-08-03 12:17:53.000000000 -0400 709 @@ -44,8 +44,9 @@ 710 # include <sched.h> 711 #endif 712 713 +#include <X11/Xlib.h> 714 + 715 #if defined(HAVE_XTEST) || defined(HAVE_XKB) 716 -# include <X11/Xlib.h> 717 # include <X11/keysym.h> 718 #endif 719 720 --- kdebase-3.5.4/kfind/Makefile.am 2005-09-10 04:25:00.000000000 -0400 721 +++ kdebase-3.5.4-new/kfind/Makefile.am 2006-08-03 12:16:56.000000000 -0400 483 722 @@ -28,9 +28,12 @@ 484 723 485 724 #And this is for kfind … … 497 736 # the library search path. 498 737 -kfind_LDFLAGS = $(all_libraries) $(KDE_RPATH) 499 738 +kfind_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module 500 --- kdebase-3.5. 0/kfind/main.cpp 2005-09-10 04:25:00.000000000 -0400501 +++ kdebase-3.5. 0-new/kfind/main.cpp 2005-11-13 08:25:52.000000000 -0500739 --- kdebase-3.5.4/kfind/main.cpp 2005-09-10 04:25:00.000000000 -0400 740 +++ kdebase-3.5.4-new/kfind/main.cpp 2006-08-03 12:16:56.000000000 -0400 502 741 @@ -19,7 +19,7 @@ 503 742 KCmdLineLastOption 504 743 }; … … 508 747 { 509 748 KLocale::setMainCatalogue("kfindpart"); 510 749 KAboutData aboutData( "kfind", I18N_NOOP("KFind"), 511 --- kdebase-3.5. 0/khelpcenter/Makefile.am 2005-09-10 04:25:18.000000000 -0400512 +++ kdebase-3.5. 0-new/khelpcenter/Makefile.am 2005-11-13 08:25:52.000000000 -0500750 --- kdebase-3.5.4/khelpcenter/Makefile.am 2005-09-10 04:25:18.000000000 -0400 751 +++ kdebase-3.5.4-new/khelpcenter/Makefile.am 2006-08-03 12:16:56.000000000 -0400 513 752 @@ -3,14 +3,14 @@ 514 753 INCLUDES = $(all_includes) 515 754 METASOURCES = AUTO … … 530 769 531 770 khelpcenter_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) 532 771 khelpcenter_la_LIBADD = $(LIB_KHTML) 533 --- kdebase-3.5. 0/khelpcenter/htmlsearch/Makefile.am 2005-09-10 04:25:18.000000000 -0400534 +++ kdebase-3.5. 0-new/khelpcenter/htmlsearch/Makefile.am 2005-11-13 08:25:52.000000000 -0500772 --- kdebase-3.5.4/khelpcenter/htmlsearch/Makefile.am 2005-09-10 04:25:18.000000000 -0400 773 +++ kdebase-3.5.4-new/khelpcenter/htmlsearch/Makefile.am 2006-08-03 12:16:56.000000000 -0400 535 774 @@ -21,14 +21,15 @@ 536 775 537 776 xdg_apps_DATA = htmlsearch.desktop … … 552 791 553 792 xpm_DATA = unchecked.xpm checked.xpm 554 793 xpmdir = $(kde_datadir)/khelpcenter/pics 555 --- kdebase-3.5. 0/khelpcenter/htmlsearch/index.cpp 2005-09-10 04:25:18.000000000 -0400556 +++ kdebase-3.5. 0-new/khelpcenter/htmlsearch/index.cpp 2005-11-13 08:25:52.000000000 -0500794 --- kdebase-3.5.4/khelpcenter/htmlsearch/index.cpp 2005-09-10 04:25:18.000000000 -0400 795 +++ kdebase-3.5.4-new/khelpcenter/htmlsearch/index.cpp 2006-08-03 12:16:56.000000000 -0400 557 796 @@ -13,7 +13,7 @@ 558 797 }; 559 798 … … 563 802 { 564 803 KAboutData aboutData( "khtmlindex", I18N_NOOP("KHtmlIndex"), 565 804 "", 566 --- kdebase-3.5. 0/khelpcenter/khc_indexbuilder.cpp 2005-10-10 11:03:57.000000000 -0400567 +++ kdebase-3.5. 0-new/khelpcenter/khc_indexbuilder.cpp 2005-11-13 08:25:52.000000000 -0500805 --- kdebase-3.5.4/khelpcenter/khc_indexbuilder.cpp 2005-10-10 11:03:57.000000000 -0400 806 +++ kdebase-3.5.4-new/khelpcenter/khc_indexbuilder.cpp 2006-08-03 12:16:56.000000000 -0400 568 807 @@ -163,7 +163,7 @@ 569 808 KCmdLineLastOption 570 809 }; … … 574 813 { 575 814 KAboutData aboutData( "khc_indexbuilder", 576 815 I18N_NOOP("KHelpCenter Index Builder"), 577 --- kdebase-3.5. 0/kicker/extensions/kasbar/Makefile.am 2005-09-10 04:25:29.000000000 -0400578 +++ kdebase-3.5. 0-new/kicker/extensions/kasbar/Makefile.am 2005-11-13 08:25:52.000000000 -0500816 --- kdebase-3.5.4/kicker/extensions/kasbar/Makefile.am 2005-09-10 04:25:29.000000000 -0400 817 +++ kdebase-3.5.4-new/kicker/extensions/kasbar/Makefile.am 2006-08-03 12:16:56.000000000 -0400 579 818 @@ -35,10 +35,12 @@ 580 819 581 820 EXTRA_DIST = $(lnk_DATA) … … 593 832 $(LIB_QT) $(LIB_KDECORE) $(LIB_KDEUI) 594 833 595 834 596 --- kdebase-3.5. 0/kicker/extensions/kasbar/kasbarapp.cpp 2005-10-10 11:03:59.000000000 -0400597 +++ kdebase-3.5. 0-new/kicker/extensions/kasbar/kasbarapp.cpp 2005-11-13 08:25:52.000000000 -0500835 --- kdebase-3.5.4/kicker/extensions/kasbar/kasbarapp.cpp 2005-10-10 11:03:59.000000000 -0400 836 +++ kdebase-3.5.4-new/kicker/extensions/kasbar/kasbarapp.cpp 2006-08-03 12:16:57.000000000 -0400 598 837 @@ -73,7 +73,7 @@ 599 838 KCmdLineLastOption 600 839 }; … … 604 843 { 605 844 KCmdLineArgs::init( argc, argv, "kasbar", "KasBar", I18N_NOOP( "An alternative task manager" ), VERSION_STRING ); 606 845 KCmdLineArgs::addCmdLineOptions( options ); 607 --- kdebase-3.5. 0/kioslave/info/kde-info2html.conf 2005-09-10 04:25:37.000000000 -0400608 +++ kdebase-3.5. 0-new/kioslave/info/kde-info2html.conf 2005-11-13 08:25:52.000000000 -0500846 --- kdebase-3.5.4/kioslave/info/kde-info2html.conf 2005-09-10 04:25:37.000000000 -0400 847 +++ kdebase-3.5.4-new/kioslave/info/kde-info2html.conf 2006-08-03 12:16:57.000000000 -0400 609 848 @@ -25,6 +25,7 @@ 610 849 611 850 #-- location of info files. … … 614 853 "/usr/share/info", 615 854 "/usr/info", 616 855 "/usr/lib/info", 617 --- kdebase-3.5.0/kioslave/media/mounthelper/Makefile.am 2005-09-10 04:25:36.000000000 -0400 618 +++ kdebase-3.5.0-new/kioslave/media/mounthelper/Makefile.am 2005-11-13 08:31:13.000000000 -0500 856 --- kdebase-3.5.4/kioslave/ldap/configure.in.in 2005-10-10 11:04:01.000000000 -0400 857 +++ kdebase-3.5.4-new/kioslave/ldap/configure.in.in 2006-08-03 12:16:57.000000000 -0400 858 @@ -38,10 +38,11 @@ 859 case "$with_ldap" in 860 no) AC_MSG_RESULT(no) ;; 861 framework) 862 - LDAP_LIBS="-Xlinker -framework -Xlinker LDAP" 863 + LDAP_LIBS="-Wl,-framework,LDAP" 864 AC_DEFINE_UNQUOTED(HAVE_LIBLDAP, 1, [Define if you have LDAP libraries]) 865 LDAP_SUBDIR="ldap" 866 AC_MSG_RESULT(Apple framework) 867 + with_ldap=FOUND 868 ;; 869 FOUND) 870 AC_MSG_RESULT(incs=$ldap_incdir libs=$ldap_libdir) 871 --- kdebase-3.5.4/kioslave/man/kio_man.cpp 2005-10-10 11:04:01.000000000 -0400 872 +++ kdebase-3.5.4-new/kioslave/man/kio_man.cpp 2006-08-03 12:16:57.000000000 -0400 873 @@ -50,7 +50,7 @@ 874 875 MANProtocol *MANProtocol::_self = 0; 876 877 -#define SGML2ROFF_DIRS "/usr/lib/sgml" 878 +#define SGML2ROFF_DIRS "@FINKPREFIX@/share/sgml" 879 880 /* 881 * Drop trailing ".section[.gz]" from name 882 @@ -883,6 +883,7 @@ 883 884 // Default paths 885 static const char *manpaths[] = { 886 + "@FINKPREFIX@/share/man", 887 "/usr/X11/man", 888 "/usr/X11R6/man", 889 "/usr/man", 890 --- kdebase-3.5.4/kioslave/media/mounthelper/Makefile.am 2006-07-22 04:15:42.000000000 -0400 891 +++ kdebase-3.5.4-new/kioslave/media/mounthelper/Makefile.am 2006-08-03 12:16:57.000000000 -0400 619 892 @@ -1,12 +1,14 @@ 620 893 -bin_PROGRAMS = kio_media_mounthelper 621 +bin_PROGRAMS = 894 +bin_PROGRAMS = 622 895 +lib_LTLIBRARIES = 623 896 +kdeinit_LTLIBRARIES = kio_media_mounthelper.la 624 897 … … 629 902 +kio_media_mounthelper_la_SOURCES = kio_media_mounthelper.cpp 630 903 631 904 -kio_media_mounthelper_LDFLAGS = $(KDE_RPATH) $(all_libraries) 632 -kio_media_mounthelper_LDADD = $(LIB_KIO) ../libmediacommon/libmediacommon.la633 +kio_media_mounthelper_la_LDFLAGS = $(KDE_RPATH) $(all_libraries) -module634 +kio_media_mounthelper_la_LIBADD = $(LIB_KIO) ../libmediacommon/libmediacommon.la905 -kio_media_mounthelper_LDADD = ../libmediacommon/libmediacommon.la $(LIB_KIO) 906 +kio_media_mounthelper_la_LDFLAGS = $(KDE_RPATH) $(all_libraries) $(KDE_PLUGIN) 907 +kio_media_mounthelper_la_LIBADD = ../libmediacommon/libmediacommon.la $(LIB_KIO) 635 908 636 909 METASOURCES = AUTO 637 910 638 --- kdebase-3.5. 0/kioslave/media/mounthelper/kio_media_mounthelper.cpp 2005-10-10 11:04:00.000000000 -0400639 +++ kdebase-3.5. 0-new/kioslave/media/mounthelper/kio_media_mounthelper.cpp 2005-11-13 08:25:53.000000000 -0500640 @@ -19 1,7 +191,7 @@911 --- kdebase-3.5.4/kioslave/media/mounthelper/kio_media_mounthelper.cpp 2006-07-22 04:15:42.000000000 -0400 912 +++ kdebase-3.5.4-new/kioslave/media/mounthelper/kio_media_mounthelper.cpp 2006-08-03 12:16:57.000000000 -0400 913 @@ -192,7 +192,7 @@ 641 914 }; 642 915 643 916 … … 646 919 { 647 920 KCmdLineArgs::init(argc, argv, "kio_media_mounthelper", 648 921 "kio_media_mounthelper", "kio_media_mounthelper", 649 --- kdebase-3.5.0/kioslave/trash/Makefile.am 2005-09-10 04:25:37.000000000 -0400 650 +++ kdebase-3.5.0-new/kioslave/trash/Makefile.am 2005-11-13 08:25:53.000000000 -0500 922 --- kdebase-3.5.4/kioslave/nfs/mount_xdr.c 2005-09-10 04:25:37.000000000 -0400 923 +++ kdebase-3.5.4-new/kioslave/nfs/mount_xdr.c 2006-08-03 12:16:57.000000000 -0400 924 @@ -43,6 +43,13 @@ 925 926 /* from @(#)mount.x 1.3 91/03/11 TIRPC 1.0 */ 927 928 +#if defined(__APPLE__) && !defined(IXDR_GET_INT32) 929 +#define IXDR_GET_INT32(buf) ((int32_t)ntohl((u_int32_t)*(buf)++)) 930 +#define IXDR_PUT_INT32(buf, v) (*(buf)++ =(int32_t)htonl((u_int32_t)v)) 931 +#define IXDR_GET_U_INT32(buf) ((u_int32_t)IXDR_GET_INT32(buf)) 932 +#define IXDR_PUT_U_INT32(buf, v) IXDR_PUT_INT32((buf), ((int32_t)(v))) 933 +#endif 934 + 935 bool_t 936 xdr_fhandle(XDR *xdrs, fhandle objp) 937 { 938 --- kdebase-3.5.4/kioslave/trash/Makefile.am 2005-09-10 04:25:37.000000000 -0400 939 +++ kdebase-3.5.4-new/kioslave/trash/Makefile.am 2006-08-03 12:16:57.000000000 -0400 651 940 @@ -9,10 +9,13 @@ 652 941 kio_trash_la_LIBADD = libtrashcommon.la $(LIB_KIO) 653 942 kio_trash_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) -no-undefined … … 666 955 667 956 kde_services_DATA = trash.protocol 668 957 669 --- kdebase-3.5. 0/kioslave/trash/ktrash.cpp 2005-10-10 11:04:01.000000000 -0400670 +++ kdebase-3.5. 0-new/kioslave/trash/ktrash.cpp 2005-11-13 08:25:53.000000000 -0500958 --- kdebase-3.5.4/kioslave/trash/ktrash.cpp 2005-10-10 11:04:01.000000000 -0400 959 +++ kdebase-3.5.4-new/kioslave/trash/ktrash.cpp 2006-08-03 12:16:57.000000000 -0400 671 960 @@ -35,7 +35,7 @@ 672 961 KCmdLineLastOption 673 962 }; … … 677 966 { 678 967 KApplication::disableAutoDcopRegistration(); 679 968 KCmdLineArgs::init( argc, argv, "ktrash", 680 --- kdebase-3.5. 0/knetattach/Makefile.am 2005-09-10 04:25:49.000000000 -0400681 +++ kdebase-3.5. 0-new/knetattach/Makefile.am 2005-11-13 08:25:53.000000000 -0500969 --- kdebase-3.5.4/knetattach/Makefile.am 2005-09-10 04:25:49.000000000 -0400 970 +++ kdebase-3.5.4-new/knetattach/Makefile.am 2006-08-03 12:16:57.000000000 -0400 682 971 @@ -1,9 +1,12 @@ 683 972 INCLUDES= $(all_includes) 684 973 … … 696 985 METASOURCES = AUTO 697 986 xdg_apps_DATA = knetattach.desktop 698 987 KDE_ICON = AUTO 699 --- kdebase-3.5. 0/knetattach/main.cpp 2005-10-10 11:04:20.000000000 -0400700 +++ kdebase-3.5. 0-new/knetattach/main.cpp 2005-11-13 08:25:53.000000000 -0500988 --- kdebase-3.5.4/knetattach/main.cpp 2005-10-10 11:04:20.000000000 -0400 989 +++ kdebase-3.5.4-new/knetattach/main.cpp 2006-08-03 12:16:57.000000000 -0400 701 990 @@ -25,7 +25,7 @@ 702 991 703 992 #include "knetattach.h" … … 707 996 KAboutData about("knetattach", I18N_NOOP("KDE Network Wizard"), "1.0", 708 997 I18N_NOOP("KDE Network Wizard"), 709 998 KAboutData::License_GPL, 710 --- kdebase-3.5. 0/konqueror/keditbookmarks/Makefile.am 2005-09-10 04:25:49.000000000 -0400711 +++ kdebase-3.5. 0-new/konqueror/keditbookmarks/Makefile.am 2005-11-13 08:25:53.000000000 -0500999 --- kdebase-3.5.4/konqueror/keditbookmarks/Makefile.am 2005-09-10 04:25:49.000000000 -0400 1000 +++ kdebase-3.5.4-new/konqueror/keditbookmarks/Makefile.am 2006-08-03 12:16:57.000000000 -0400 712 1001 @@ -2,13 +2,13 @@ 713 1002 714 1003 METASOURCES = AUTO … … 728 1017 729 1018 dcop_DCOPIDLNG = true 730 1019 keditbookmarks_la_SOURCES = main.cpp listview.cpp toplevel.cpp actionsimpl.cpp commands.cpp importers.cpp dcop.skel dcop.cpp bookmarkiterator.cpp \ 731 --- kdebase-3.5. 0/konqueror/keditbookmarks/kbookmarkmerger.cpp 2005-09-10 04:25:49.000000000 -0400732 +++ kdebase-3.5. 0-new/konqueror/keditbookmarks/kbookmarkmerger.cpp 2005-11-13 08:25:53.000000000 -05001020 --- kdebase-3.5.4/konqueror/keditbookmarks/kbookmarkmerger.cpp 2005-09-10 04:25:49.000000000 -0400 1021 +++ kdebase-3.5.4-new/konqueror/keditbookmarks/kbookmarkmerger.cpp 2006-08-03 12:16:57.000000000 -0400 733 1022 @@ -55,7 +55,7 @@ 734 1023 return XGetSelectionOwner( dpy, atom ) != None; 735 1024 } … … 739 1028 { 740 1029 const bool kdeRunning = kdeIsRunning(); 741 1030 742 --- kdebase-3.5. 0/kpager/Makefile.am 2005-09-10 04:25:36.000000000 -0400743 +++ kdebase-3.5. 0-new/kpager/Makefile.am 2005-11-13 08:25:53.000000000 -05001031 --- kdebase-3.5.4/kpager/Makefile.am 2005-09-10 04:25:36.000000000 -0400 1032 +++ kdebase-3.5.4-new/kpager/Makefile.am 2006-08-03 12:16:57.000000000 -0400 744 1033 @@ -1,14 +1,16 @@ 745 1034 INCLUDES= $(all_includes) 746 1035 … … 763 1052 764 1053 KDE_ICON = kpager 765 1054 766 --- kdebase-3.5. 0/kpager/main.cpp 2005-10-10 11:04:00.000000000 -0400767 +++ kdebase-3.5. 0-new/kpager/main.cpp 2005-11-13 08:25:53.000000000 -05001055 --- kdebase-3.5.4/kpager/main.cpp 2005-10-10 11:04:00.000000000 -0400 1056 +++ kdebase-3.5.4-new/kpager/main.cpp 2006-08-03 12:16:57.000000000 -0400 768 1057 @@ -62,7 +62,7 @@ 769 1058 770 1059 }; … … 774 1063 { 775 1064 KAboutData *aboutdata = new KAboutData("kpager", "KPager", "1.5", 776 1065 I18N_NOOP("Desktop Overview"), KAboutData::License_GPL, 777 --- kdebase-3.5. 0/kpersonalizer/Makefile.am 2005-09-10 04:25:00.000000000 -0400778 +++ kdebase-3.5. 0-new/kpersonalizer/Makefile.am 2005-11-13 08:25:53.000000000 -05001066 --- kdebase-3.5.4/kpersonalizer/Makefile.am 2005-09-10 04:25:00.000000000 -0400 1067 +++ kdebase-3.5.4-new/kpersonalizer/Makefile.am 2006-08-03 12:16:57.000000000 -0400 779 1068 @@ -1,11 +1,14 @@ 780 1069 -bin_PROGRAMS = kpersonalizer 781 1070 -kpersonalizer_SOURCES = stylepreview.ui krefinepage.cpp \ … … 803 1092 804 1093 # Uncomment the following two lines if you add a ui.rc file for your application to make use of 805 1094 # KDE´s XML GUI builing 806 --- kdebase-3.5. 0/kpersonalizer/main.cpp 2005-09-10 04:25:00.000000000 -0400807 +++ kdebase-3.5. 0-new/kpersonalizer/main.cpp 2005-11-13 08:25:53.000000000 -05001095 --- kdebase-3.5.4/kpersonalizer/main.cpp 2005-09-10 04:25:00.000000000 -0400 1096 +++ kdebase-3.5.4-new/kpersonalizer/main.cpp 2006-08-03 12:16:57.000000000 -0400 808 1097 @@ -33,7 +33,7 @@ 809 1098 KCmdLineLastOption 810 1099 }; … … 814 1103 { 815 1104 KAboutData aboutData( "kpersonalizer", I18N_NOOP("KPersonalizer"), 816 1105 VERSION, description, KAboutData::License_GPL, 817 --- kdebase-3.5. 0/kreadconfig/Makefile.am 2005-09-10 04:25:36.000000000 -0400818 +++ kdebase-3.5. 0-new/kreadconfig/Makefile.am 2005-11-13 08:25:53.000000000 -05001106 --- kdebase-3.5.4/kreadconfig/Makefile.am 2005-09-10 04:25:36.000000000 -0400 1107 +++ kdebase-3.5.4-new/kreadconfig/Makefile.am 2006-08-03 12:16:57.000000000 -0400 819 1108 @@ -1,12 +1,17 @@ 820 1109 AM_CPPFLAGS = -DQT_NO_CAST_ASCII 821 1110 … … 839 1128 840 1129 messages: 841 1130 $(XGETTEXT) $(kreadconfig_SOURCES) -o $(podir)/kreadconfig.pot 842 --- kdebase-3.5. 0/kreadconfig/kreadconfig.cpp 2005-09-10 04:25:36.000000000 -0400843 +++ kdebase-3.5. 0-new/kreadconfig/kreadconfig.cpp 2005-11-13 08:25:53.000000000 -05001131 --- kdebase-3.5.4/kreadconfig/kreadconfig.cpp 2005-09-10 04:25:36.000000000 -0400 1132 +++ kdebase-3.5.4-new/kreadconfig/kreadconfig.cpp 2006-08-03 12:16:57.000000000 -0400 844 1133 @@ -41,7 +41,7 @@ 845 1134 { "type <type>", I18N_NOOP("Type of variable"), 0 }, 846 1135 KCmdLineLastOption … … 850 1139 { 851 1140 KAboutData aboutData("kreadconfig", I18N_NOOP("KReadConfig"), 852 1141 "1.0.1", 853 --- kdebase-3.5. 0/kreadconfig/kwriteconfig.cpp 2005-09-10 04:25:36.000000000 -0400854 +++ kdebase-3.5. 0-new/kreadconfig/kwriteconfig.cpp 2005-11-13 08:25:53.000000000 -05001142 --- kdebase-3.5.4/kreadconfig/kwriteconfig.cpp 2005-09-10 04:25:36.000000000 -0400 1143 +++ kdebase-3.5.4-new/kreadconfig/kwriteconfig.cpp 2006-08-03 12:16:57.000000000 -0400 855 1144 @@ -23,7 +23,7 @@ 856 1145 { "+value", I18N_NOOP( "The value to write. Mandatory, on a shell use '' for empty" ), 0 }, 857 1146 KCmdLineLastOption … … 861 1150 { 862 1151 KAboutData aboutData("kwriteconfig", I18N_NOOP("KWriteConfig"), 863 1152 "1.0.0", 864 --- kdebase-3.5. 0/ksplashml/Makefile.am 2005-09-10 04:25:51.000000000 -0400865 +++ kdebase-3.5. 0-new/ksplashml/Makefile.am 2005-11-13 08:25:53.000000000 -05001153 --- kdebase-3.5.4/ksplashml/Makefile.am 2005-09-10 04:25:51.000000000 -0400 1154 +++ kdebase-3.5.4-new/ksplashml/Makefile.am 2006-08-03 12:16:57.000000000 -0400 866 1155 @@ -4,10 +4,13 @@ 867 1156 868 1157 METASOURCES=AUTO … … 881 1170 882 1171 noinst_HEADERS = ksplashiface.h wndmain.h 883 1172 884 --- kdebase-3.5. 0/ksplashml/main.cpp 2005-09-10 04:25:51.000000000 -0400885 +++ kdebase-3.5. 0-new/ksplashml/main.cpp 2005-11-13 08:25:53.000000000 -05001173 --- kdebase-3.5.4/ksplashml/main.cpp 2005-09-10 04:25:51.000000000 -0400 1174 +++ kdebase-3.5.4-new/ksplashml/main.cpp 2006-08-03 12:16:57.000000000 -0400 886 1175 @@ -37,7 +37,7 @@ 887 1176 KCmdLineLastOption 888 1177 }; … … 892 1181 { 893 1182 KAboutData about( 894 1183 "ksplash", 895 --- kdebase-3.5. 0/ksplashml/themeengine/simple/Makefile.am 2005-09-10 04:25:50.000000000 -0400896 +++ kdebase-3.5. 0-new/ksplashml/themeengine/simple/Makefile.am 2005-11-13 08:25:53.000000000 -05001184 --- kdebase-3.5.4/ksplashml/themeengine/simple/Makefile.am 2005-09-10 04:25:50.000000000 -0400 1185 +++ kdebase-3.5.4-new/ksplashml/themeengine/simple/Makefile.am 2006-08-03 12:16:57.000000000 -0400 897 1186 @@ -1,7 +1,10 @@ 898 1187 899 1188 INCLUDES = $(all_includes) … … 909 1198 +ksplashsimple_la_SOURCES = main.cpp 910 1199 +ksplashsimple_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module 911 1200 +ksplashsimple_la_LIBADD = $(LIB_XINERAMA) $(LIB_X11) 912 --- kdebase-3.5. 1/ksplashml/themeengine/simple/main.cpp.orig 2006-02-27 10:56:40.000000000 -0500913 +++ kdebase-3.5. 1/ksplashml/themeengine/simple/main.cpp 2006-02-27 10:56:55.000000000 -05001201 --- kdebase-3.5.4/ksplashml/themeengine/simple/main.cpp 2006-05-22 14:13:00.000000000 -0400 1202 +++ kdebase-3.5.4-new/ksplashml/themeengine/simple/main.cpp 2006-08-03 12:16:57.000000000 -0400 914 1203 @@ -31,10 +31,11 @@ 915 1204 # endif 916 1205 #endif … … 924 1213 { 925 1214 if( fork() != 0 ) 926 1215 return 0; 927 --- kdebase-3.5. 0/kstart/Makefile.am 2005-09-10 04:25:55.000000000 -0400928 +++ kdebase-3.5. 0-new/kstart/Makefile.am 2005-11-13 08:25:53.000000000 -05001216 --- kdebase-3.5.4/kstart/Makefile.am 2005-09-10 04:25:55.000000000 -0400 1217 +++ kdebase-3.5.4-new/kstart/Makefile.am 2006-08-03 12:16:57.000000000 -0400 929 1218 @@ -6,10 +6,13 @@ 930 1219 931 1220 ####### Files … … 944 1233 METASOURCES = kstart.moc 945 1234 946 1235 noinst_HEADERS = kstart.h version.h 947 --- kdebase-3.5. 0/kstart/kstart.cpp 2005-09-10 04:25:55.000000000 -0400948 +++ kdebase-3.5. 0-new/kstart/kstart.cpp 2005-11-13 08:25:53.000000000 -05001236 --- kdebase-3.5.4/kstart/kstart.cpp 2005-09-10 04:25:55.000000000 -0400 1237 +++ kdebase-3.5.4-new/kstart/kstart.cpp 2006-08-03 12:16:57.000000000 -0400 949 1238 @@ -283,7 +283,7 @@ 950 1239 KCmdLineLastOption 951 1240 }; … … 955 1244 { 956 1245 // David, 05/03/2000 957 1246 KAboutData aboutData( "kstart", I18N_NOOP("KStart"), KSTART_VERSION, 958 --- kdebase-3.5. 0/ksysguard/gui/Makefile.am 2005-09-10 04:26:15.000000000 -0400959 +++ kdebase-3.5. 0-new/ksysguard/gui/Makefile.am 2005-11-13 08:32:24.000000000 -05001247 --- kdebase-3.5.4/ksysguard/gui/Makefile.am 2005-09-10 04:26:15.000000000 -0400 1248 +++ kdebase-3.5.4-new/ksysguard/gui/Makefile.am 2006-08-03 12:16:57.000000000 -0400 960 1249 @@ -18,21 +18,23 @@ 961 1250 962 1251 ####### This part is very ksysguard specific … … 985 1274 986 1275 kpm_SOURCES = kpm.c 987 1276 988 --- kdebase-3.5. 0/ksysguard/gui/ksysguard.cc 2005-10-10 11:04:32.000000000 -0400989 +++ kdebase-3.5. 0-new/ksysguard/gui/ksysguard.cc 2005-11-13 08:25:53.000000000 -05001277 --- kdebase-3.5.4/ksysguard/gui/ksysguard.cc 2006-03-17 05:17:48.000000000 -0500 1278 +++ kdebase-3.5.4-new/ksysguard/gui/ksysguard.cc 2006-08-03 12:16:57.000000000 -0400 990 1279 @@ -520,7 +520,7 @@ 991 1280 /* 992 1281 * Once upon a time... … … 996 1285 { 997 1286 // initpipe is used to keep the parent process around till the child 998 1287 // has registered with dcop. 999 --- kdebase-3.5. 0/ksystraycmd/Makefile.am 2005-09-10 04:26:16.000000000 -04001000 +++ kdebase-3.5. 0-new/ksystraycmd/Makefile.am 2005-11-13 08:25:53.000000000 -05001288 --- kdebase-3.5.4/ksystraycmd/Makefile.am 2005-09-10 04:26:16.000000000 -0400 1289 +++ kdebase-3.5.4-new/ksystraycmd/Makefile.am 2006-08-03 12:16:57.000000000 -0400 1001 1290 @@ -1,16 +1,19 @@ 1002 1291 ####### Fiddle here 1003 1292 … … 1022 1311 1023 1312 messages: 1024 1313 $(XGETTEXT) $(ksystraycmd_SOURCES) -o $(podir)/ksystraycmd.pot 1025 --- kdebase-3.5. 0/ksystraycmd/main.cpp 2005-09-10 04:26:16.000000000 -04001026 +++ kdebase-3.5. 0-new/ksystraycmd/main.cpp 2005-11-13 08:25:53.000000000 -05001314 --- kdebase-3.5.4/ksystraycmd/main.cpp 2006-01-19 12:03:19.000000000 -0500 1315 +++ kdebase-3.5.4-new/ksystraycmd/main.cpp 2006-08-03 12:16:57.000000000 -0400 1027 1316 @@ -45,7 +45,7 @@ 1028 1317 KCmdLineLastOption 1029 1318 }; … … 1033 1322 { 1034 1323 KAboutData aboutData( "ksystraycmd", I18N_NOOP( "KSysTrayCmd" ), 1035 1324 "KSysTrayCmd 0.1", 1036 --- kdebase-3.5. 0/ktip/Makefile.am 2005-09-10 04:25:55.000000000 -04001037 +++ kdebase-3.5. 0-new/ktip/Makefile.am 2005-11-13 08:25:53.000000000 -05001325 --- kdebase-3.5.4/ktip/Makefile.am 2005-09-10 04:25:55.000000000 -0400 1326 +++ kdebase-3.5.4-new/ktip/Makefile.am 2006-08-03 12:16:57.000000000 -0400 1038 1327 @@ -2,10 +2,13 @@ 1039 1328 1040 1329 SUBDIRS = pics … … 1053 1342 1054 1343 METASOURCES = AUTO 1055 1344 KDE_ICON = AUTO 1056 --- kdebase-3.5. 0/ktip/ktipwindow.cpp 2005-10-10 11:04:21.000000000 -04001057 +++ kdebase-3.5. 0-new/ktip/ktipwindow.cpp 2005-11-13 08:25:53.000000000 -05001345 --- kdebase-3.5.4/ktip/ktipwindow.cpp 2005-10-10 11:04:21.000000000 -0400 1346 +++ kdebase-3.5.4-new/ktip/ktipwindow.cpp 2006-08-03 12:16:57.000000000 -0400 1058 1347 @@ -31,7 +31,7 @@ 1059 1348 1060 1349 static const char description[] = I18N_NOOP("Useful tips"); … … 1064 1353 { 1065 1354 KAboutData aboutData("ktip", I18N_NOOP("KTip"), 1066 1355 "0.3", description, KAboutData::License_GPL, 1067 --- kdebase-3.5. 0/kwin/clients/kwmtheme/cli_installer/Makefile.am 2005-09-10 04:25:55.000000000 -04001068 +++ kdebase-3.5. 0-new/kwin/clients/kwmtheme/cli_installer/Makefile.am 2005-11-13 08:25:53.000000000 -05001356 --- kdebase-3.5.4/kwin/clients/kwmtheme/cli_installer/Makefile.am 2005-09-10 04:25:55.000000000 -0400 1357 +++ kdebase-3.5.4-new/kwin/clients/kwmtheme/cli_installer/Makefile.am 2006-08-03 12:16:57.000000000 -0400 1069 1358 @@ -4,15 +4,17 @@ 1070 1359 1071 1360 ####### This part is very kwmtheme specific … … 1088 1377 -kwmtheme_LDADD = $(LIB_KDECORE) 1089 1378 +kwmtheme_la_LIBADD = $(LIB_KDECORE) 1090 1379 1091 --- kdebase-3.5. 0/kwin/clients/kwmtheme/cli_installer/main.cpp 2005-09-10 04:25:55.000000000 -04001092 +++ kdebase-3.5. 0-new/kwin/clients/kwmtheme/cli_installer/main.cpp 2005-11-13 08:25:53.000000000 -05001380 --- kdebase-3.5.4/kwin/clients/kwmtheme/cli_installer/main.cpp 2005-09-10 04:25:55.000000000 -0400 1381 +++ kdebase-3.5.4-new/kwin/clients/kwmtheme/cli_installer/main.cpp 2006-08-03 12:16:57.000000000 -0400 1093 1382 @@ -37,7 +37,7 @@ 1094 1383 copyOutput.close(); 1095 1384 } … … 1099 1388 { 1100 1389 KCmdLineArgs::init(argc, argv, "kwmtheme", description, "0.1"); 1101 1390 KCmdLineArgs::addCmdLineOptions( options ); 1102 --- kdebase-3.5. 0/kwin/killer/Makefile.am 2005-09-10 04:25:55.000000000 -04001103 +++ kdebase-3.5. 0-new/kwin/killer/Makefile.am 2005-11-13 08:25:53.000000000 -05001391 --- kdebase-3.5.4/kwin/killer/Makefile.am 2005-09-10 04:25:55.000000000 -0400 1392 +++ kdebase-3.5.4-new/kwin/killer/Makefile.am 2006-08-03 12:16:57.000000000 -0400 1104 1393 @@ -1,9 +1,11 @@ 1105 1394 INCLUDES = $(all_includes) 1106 1395 … … 1117 1406 +kwin_killer_helper_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module 1118 1407 1119 1408 METASOURCES = AUTO 1120 --- kdebase-3.5. 0/kwin/killer/killer.cpp 2005-09-10 04:25:55.000000000 -04001121 +++ kdebase-3.5. 0-new/kwin/killer/killer.cpp 2005-11-13 08:25:53.000000000 -05001409 --- kdebase-3.5.4/kwin/killer/killer.cpp 2005-09-10 04:25:55.000000000 -0400 1410 +++ kdebase-3.5.4-new/kwin/killer/killer.cpp 2006-08-03 12:16:57.000000000 -0400 1122 1411 @@ -43,7 +43,7 @@ 1123 1412 KCmdLineLastOption 1124 1413 }; … … 1128 1417 { 1129 1418 KLocale::setMainCatalogue( "kwin" ); // the messages are in kwin's .po file 1130 1419 KCmdLineArgs::init( argc, argv, "kwin_killer_helper", I18N_NOOP( "KWin" ), 1131 --- kdebase-3.5. 0/libkonq/Makefile.am 2005-10-10 11:04:21.000000000 -04001132 +++ kdebase-3.5. 0-new/libkonq/Makefile.am 2005-11-13 08:25:53.000000000 -05001420 --- kdebase-3.5.4/libkonq/Makefile.am 2005-10-10 11:04:21.000000000 -0400 1421 +++ kdebase-3.5.4-new/libkonq/Makefile.am 2006-08-03 12:16:57.000000000 -0400 1133 1422 @@ -21,7 +21,7 @@ 1134 1423 1135 1424 lib_LTLIBRARIES = libkonq.la … … 1139 1428 1140 1429 libkonq_la_SOURCES = konq_popupmenu.cc knewmenu.cc \ 1141 1430 konq_xmlguiclient.cc\ 1142 --- kdebase-3.5. 0/nsplugins/Makefile.am 2005-09-10 04:25:39.000000000 -04001143 +++ kdebase-3.5. 0-new/nsplugins/Makefile.am 2005-11-13 08:25:53.000000000 -05001431 --- kdebase-3.5.4/nsplugins/Makefile.am 2005-09-10 04:25:39.000000000 -0400 1432 +++ kdebase-3.5.4-new/nsplugins/Makefile.am 2006-08-03 12:16:57.000000000 -0400 1144 1433 @@ -13,10 +13,13 @@ 1145 1434 libnsplugin_la_LDFLAGS = $(all_libraries) -avoid-version -module $(KDE_PLUGIN) -no-undefined 1146 1435 libnsplugin_la_LIBADD = -lkparts … … 1159 1448 1160 1449 kcm_nsplugins_la_SOURCES = kcm_nsplugins.cpp 1161 1450 kcm_nsplugins_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined 1162 --- kdebase-3.5. 0/nsplugins/pluginscan.cpp 2005-10-10 11:04:05.000000000 -04001163 +++ kdebase-3.5. 0-new/nsplugins/pluginscan.cpp 2005-11-13 08:25:53.000000000 -05001164 @@ -5 47,7 +547,7 @@1451 --- kdebase-3.5.4/nsplugins/pluginscan.cpp 2006-05-22 14:12:46.000000000 -0400 1452 +++ kdebase-3.5.4-new/nsplugins/pluginscan.cpp 2006-08-03 12:16:57.000000000 -0400 1453 @@ -559,7 +559,7 @@ 1165 1454 }; 1166 1455 1167 1456 … … 1170 1459 { 1171 1460 KAboutData aboutData( "nspluginscan", I18N_NOOP("nspluginscan"), 1172 1461 "0.3", "nspluginscan", KAboutData::License_GPL, 1173 --- kdebase-3.5. 0/nsplugins/viewer/Makefile.am 2005-09-10 04:25:39.000000000 -04001174 +++ kdebase-3.5. 0-new/nsplugins/viewer/Makefile.am 2005-11-13 08:25:53.000000000 -05001462 --- kdebase-3.5.4/nsplugins/viewer/Makefile.am 2005-09-10 04:25:39.000000000 -0400 1463 +++ kdebase-3.5.4-new/nsplugins/viewer/Makefile.am 2006-08-03 12:16:57.000000000 -0400 1175 1464 @@ -1,12 +1,14 @@ 1176 1465 INCLUDES = -I$(top_srcdir)/nsplugins -I$(top_builddir)/nsplugins $(all_includes) 1177 1466 METASOURCES = AUTO … … 1191 1480 1192 1481 NSPluginCallbackIface_DIR = $(srcdir)/.. 1193 1482 1194 --- kdebase-3.5.0/startkde 2005-11-08 17:37:01.000000000 -0500 1195 +++ kdebase-3.5.0-new/startkde 2005-11-13 08:33:35.000000000 -0500 1483 --- kdebase-3.5.4/nsplugins/viewer/viewer.cpp 2006-01-19 12:01:49.000000000 -0500 1484 +++ kdebase-3.5.4-new/nsplugins/viewer/viewer.cpp 2006-08-03 12:16:57.000000000 -0400 1485 @@ -22,6 +22,9 @@ 1486 1487 */ 1488 1489 +#if defined(__APPLE__) && !defined(RLIMIT_AS) && defined(RLIMIT_RSS) 1490 +#define RLIMIT_AS RLIMIT_RSS 1491 +#endif 1492 1493 #include <config.h> 1494 1495 @@ -213,7 +216,7 @@ 1496 #endif 1497 1498 1499 -int main(int argc, char** argv) 1500 +extern "C" KDE_EXPORT int kdemain(int argc, char** argv) 1501 { 1502 // nspluginviewer is a helper app, it shouldn't do session management at all 1503 setenv( "SESSION_MANAGER", "", 1 ); 1504 --- kdebase-3.5.4/startkde 2006-07-23 10:23:24.000000000 -0400 1505 +++ kdebase-3.5.4-new/startkde 2006-08-03 12:16:57.000000000 -0400 1196 1506 @@ -3,6 +3,11 @@ 1197 # DEFAULT KDE STARTUP SCRIPT ( KDE-3.5 )1507 # DEFAULT KDE STARTUP SCRIPT ( KDE-3.5.4 ) 1198 1508 # 1199 1509 1200 1510 +source "@FINKPREFIX@/bin/init.sh" … … 1205 1515 # When the X server dies we get a HUP signal from xinit. We must ignore it 1206 1516 # because we still need to do some cleanup. 1207 1517 trap 'echo GOT SIGHUP' HUP 1208 @@ -25 7,20 +262,23 @@1518 @@ -254,20 +259,23 @@ 1209 1519 1210 1520 echo 'startkde: Starting up...' 1>&2 1211 1521 … … 1243 1553 1244 1554 # the splashscreen and progress indicator 1245 1555 case "$ksplashrc_ksplash_theme" in 1246 @@ -31 6,7 +324,29 @@1556 @@ -314,7 +322,29 @@ 1247 1557 # We only check for 255 which means that the ksmserver process could not be 1248 1558 # started, any problems thereafter, e.g. ksmserver failing to initialize, 1249 1559 # will remain undetected. … … 1274 1584 kwrapper ksmserver $KDEWM 1275 1585 if test $? -eq 255; then 1276 1586 # Startup error 1277 --- kdebase-3.5.0/kioslave/man/kio_man.cpp 2005-10-10 11:04:01.000000000 -0400 1278 +++ kdebase-3.5.0-new/kioslave/man/kio_man.cpp 2005-11-16 11:25:22.000000000 -0500 1279 @@ -50,7 +50,7 @@ 1587 ------------------------------------------------------------------------ 1588 r570840 | mueller | 2006-08-07 22:26:20 +0200 (Mon, 07 Aug 2006) | 3 lines 1589 Changed paths: 1590 M /branches/KDE/3.5/kdebase/kicker/taskbar/taskbar.cpp 1591 1592 fix stupid typo 1593 BUG: 128552 1594 1595 ------------------------------------------------------------------------ 1596 Index: kicker/taskbar/taskbar.cpp 1597 =================================================================== 1598 --- kdeb/kicker/taskbar/taskbar.cpp (revision 570839) 1599 +++ kdeb/kicker/taskbar/taskbar.cpp (revision 570840) 1600 @@ -177,14 +177,14 @@ QSize TaskBar::sizeHint( KPanelExtension 1280 1601 1281 MANProtocol *MANProtocol::_self = 0; 1602 if (containerCount() == 0) 1603 { 1604 - actualMax = maxSize.height(); 1605 + actualMax = minButtonHeight; 1606 } 1282 1607 1283 -#define SGML2ROFF_DIRS "/usr/lib/sgml" 1284 +#define SGML2ROFF_DIRS "@FINKPREFIX@/share/sgml" 1285 1286 /* 1287 * Drop trailing ".section[.gz]" from name 1288 @@ -883,6 +883,7 @@ 1289 1290 // Default paths 1291 static const char *manpaths[] = { 1292 + "@FINKPREFIX@/share/man", 1293 "/usr/X11/man", 1294 "/usr/X11R6/man", 1295 "/usr/man", 1296 --- kdebase-3.5.0/kioslave/ldap/configure.in.in 2005-10-10 11:04:01.000000000 -0400 1297 +++ kdebase-3.5.0-new/kioslave/ldap/configure.in.in 2005-11-16 13:59:13.000000000 -0500 1298 @@ -42,6 +42,7 @@ 1299 AC_DEFINE_UNQUOTED(HAVE_LIBLDAP, 1, [Define if you have LDAP libraries]) 1300 LDAP_SUBDIR="ldap" 1301 AC_MSG_RESULT(Apple framework) 1302 + with_ldap=FOUND 1303 ;; 1304 FOUND) 1305 AC_MSG_RESULT(incs=$ldap_incdir libs=$ldap_libdir) 1306 --- kdebase-3.5.0/nsplugins/viewer/viewer.cpp Mon Oct 10 11:04:05 2005 1307 +++ kdebase-3.5.0-new/nsplugins/viewer/viewer.cpp Wed Dec 7 21:54:25 2005 1308 @@ -54,6 +54,9 @@ 1309 #include "qxteventloop.h" 1310 #endif 1311 1312 +#if defined(__APPLE__) && !defined(RLIMIT_AS) && defined(RLIMIT_RSS) 1313 +#define RLIMIT_AS RLIMIT_RSS 1314 +#endif 1315 1316 1317 /** 1318 @@ -206,7 +209,7 @@ 1319 #endif 1320 1321 1322 -int main(int argc, char** argv) 1323 +extern "C" KDE_EXPORT int kdemain(int argc, char** argv) 1324 { 1325 // nspluginviewer is a helper app, it shouldn't do session management at all 1326 setenv( "SESSION_MANAGER", "", 1 ); 1327 --- kdebase-3.5.0/kioslave/nfs/mount.h Sat Sep 10 04:25:37 2005 1328 +++ kdebase-3.5.0-new/kioslave/nfs/mount.h Thu Dec 8 10:09:04 2005 1329 @@ -8,6 +8,22 @@ 1330 1331 #include <rpc/rpc.h> 1332 1333 +#if !defined(IXDR_GET_INT32) 1334 +#define IXDR_GET_INT32(buf) ((int32_t)ntohl((u_int32_t)*(buf)++)) 1335 +#endif 1336 + 1337 +#if !defined(IXDR_PUT_INT32) 1338 +#define IXDR_PUT_INT32(buf, v) (*(buf)++ =(int32_t)htonl((u_int32_t)v)) 1339 +#endif 1340 + 1341 +#if !defined(IXDR_GET_U_INT32) && defined(IXDR_GET_INT32) 1342 +#define IXDR_GET_U_INT32(buf) ((u_int32_t)IXDR_GET_INT32(buf)) 1343 +#endif 1344 + 1345 +#if !defined(IXDR_PUT_U_INT32) && defined(IXDR_PUT_INT32) 1346 +#define IXDR_PUT_U_INT32(buf, v) IXDR_PUT_INT32((buf), ((int32_t)(v))) 1347 +#endif 1348 + 1349 /* 1350 * Sun RPC is a product of Sun Microsystems, Inc. and is provided for 1351 * unrestricted use provided that this legend is included on all tape 1352 --- kdebase-3.5.0/applnk/Makefile.am Sat Sep 10 04:25:45 2005 1353 +++ kdebase-3.5.0-patched/applnk/Makefile.am Mon Dec 12 14:42:14 2005 1354 @@ -3,7 +3,7 @@ 1355 xdg_menu_DATA = kde-settings.menu kde-information.menu kde-screensavers.menu 1356 1357 xdg_mergedmenu_DATA = kde-essential.menu 1358 -xdg_mergedmenudir = $(xdg_menudir)/applications-merged 1359 +xdg_mergedmenudir = $(xdg_menudir)/kde-applications-merged 1360 1361 xdg_directory_DATA = \ 1362 kde-main.directory \ 1363 --- kdebase-3.5.0/doc/userguide/kde-for-admins.docbook Tue Nov 8 17:36:17 2005 1364 +++ kdebase-3.5.0-patched/doc/userguide/kde-for-admins.docbook Mon Dec 12 14:42:42 2005 1365 @@ -1650,7 +1650,7 @@ 1366 </para> 1367 1368 <informalexample> 1369 -<para>Example from <filename>applications.menu</filename>: 1370 +<para>Example from <filename>kde-applications.menu</filename>: 1371 <programlisting> 1372 <markup> 1373 <Menu> 1374 @@ -1724,7 +1724,7 @@ 1375 information, see <ulink url="http://www.freedesktop.org/Standards/basedir-spec">http://www.freedesktop.org/Standards/basedir-spec</ulink></para> 1376 1377 <informalexample> 1378 -<para>Example from <filename>applications.menu</filename>: 1379 +<para>Example from <filename>kde-applications.menu</filename>: 1380 <programlisting> 1381 <markup> 1382 <Menu> 1383 @@ -1776,7 +1776,7 @@ 1384 <title>Essential Menus</title> 1385 1386 <para><filename 1387 -class="directory">$<envar>KDEDIR</envar>/etc/xdg/menus/applications-merged/</filename> 1388 +class="directory">$<envar>KDEDIR</envar>/etc/xdg/menus/kde-applications-merged/</filename> 1389 contains <filename>kde-essential.menu</filename> which includes some 1390 essential menus that are normally not shown in the &kde; menu itself: 1391 <itemizedlist> 1392 --- kdebase-3.5.0/kcontrol/fonts/Makefile.am Sat Sep 10 04:25:04 2005 1393 +++ kdebase-3.5.0-patched/kcontrol/fonts/Makefile.am Mon Dec 12 21:08:01 2005 1394 @@ -4,13 +4,13 @@ 1395 libkxftconfig_la_LIBADD = $(LIBFONTCONFIG_LIBS) 1396 libkxftconfig_la_LDFLAGS = $(LIBFONTCONFIG_RPATH) 1397 1398 -AM_CPPFLAGS = $(all_includes) $(LIBFONTCONFIG_CFLAGS) -D_LARGEFILE64_SOURCE 1399 +AM_CPPFLAGS = $(LIBFONTCONFIG_CFLAGS) -D_LARGEFILE64_SOURCE $(all_includes) 1400 1401 kde_module_LTLIBRARIES = kcm_fonts.la 1402 1403 kcm_fonts_la_SOURCES = fonts.cpp 1404 kcm_fonts_la_LDFLAGS = $(KDE_RPATH) $(LIBFONTCONFIG_RPATH) -module -avoid-version $(all_libraries) -no-undefined 1405 -kcm_fonts_la_LIBADD = libkxftconfig.la $(top_builddir)/kcontrol/krdb/libkrdb.la $(LIB_KDEUI) $(LIBFONTCONFIG_LIBS) 1406 +kcm_fonts_la_LIBADD = $(LIBFONTCONFIG_LIBS) libkxftconfig.la $(top_builddir)/kcontrol/krdb/libkrdb.la $(LIB_KDEUI) 1407 METASOURCES = AUTO 1408 1409 noinst_HEADERS = fonts.h kxftconfig.h 1410 --- kdebase-3.5.0/kcontrol/fonts/configure.in.in Sat Sep 10 04:25:04 2005 1411 +++ kdebase-3.5.0-patched/kcontrol/fonts/configure.in.in Mon Dec 12 17:51:56 2005 1412 @@ -1,8 +1,6 @@ 1413 -KDE_FIND_PATH(fontconfig-config, FONTCONFIG_CONFIG, [${prefix}/bin ${exec_prefix}/bin /usr/bin /usr/local/bin /opt/local/bin], [ 1414 KDE_FIND_PATH(pkg-config, PKGCONFIG, [${prefix}/bin ${exec_prefix}/bin /usr/bin /usr/local/bin /opt/local/bin], [ 1415 AC_MSG_WARN([Could not find neither pkg-config nor fontconfig-config, check http://www.fontconfig.org/ ]) 1416 ]) 1417 -]) 1418 1419 if test -n "$PKGCONFIG"; then 1420 vers=`$PKGCONFIG fontconfig --modversion 2>/dev/null | sed -e 's/libfontconfig //' | awk 'BEGIN { FS = "."; } { printf "%d", ($1 * 1000 + $2) * 1000 + $3;}'` 1421 --- kdebase-3.5.0/kcontrol/kfontinst/configure.in.in Sat Sep 10 04:25:09 2005 1422 +++ kdebase-3.5.0-patched/kcontrol/kfontinst/configure.in.in Mon Dec 12 17:52:09 2005 1423 @@ -36,11 +36,9 @@ 1424 1425 KFI_FOUND_FONTCONFIG=0 1426 # check for fontconfig... 1427 - KDE_FIND_PATH(fontconfig-config, FONTCONFIG_CONFIG, [${prefix}/bin ${exec_prefix}/bin /usr/bin /usr/local/bin /opt/local/bin], [ 1428 KDE_FIND_PATH(pkg-config, PKGCONFIG, [${prefix}/bin ${exec_prefix}/bin /usr/bin /usr/local/bin /opt/local/bin], [ 1429 AC_MSG_WARN([Could not find neither pkg-config nor fontconfig-config, check http://www.fontconfig.org/ ]) 1430 ]) 1431 - ]) 1432 1433 if test -n "$PKGCONFIG"; then 1434 vers=`$PKGCONFIG fontconfig --modversion 2>/dev/null | sed -e 's/libfontconfig //' | awk 'BEGIN { FS = "."; } { printf "%d", ($1 * 1000 + $2) * 1000 + $3;}'` 1435 --- kdebase-3.5.0/kcontrol/kfontinst/kcmfontinst/Makefile.am Sat Sep 10 04:25:09 2005 1436 +++ kdebase-3.5.0-patched/kcontrol/kfontinst/kcmfontinst/Makefile.am Mon Dec 12 21:03:23 2005 1437 @@ -4,10 +4,10 @@ 1438 endif 1439 1440 kde_module_LTLIBRARIES = kcm_fontinst.la 1441 -kcm_fontinst_la_LIBADD = $(LIB_KIO) $(FONTINST_PRINT_LIB) $(LIBFREETYPE_LIBS) $(LIBFONTCONFIG_LIBS) ../lib/libkfontinst.la 1442 +kcm_fontinst_la_LIBADD = $(LIBFREETYPE_LIBS) $(LIBFONTCONFIG_LIBS) $(LIB_KIO) $(FONTINST_PRINT_LIB) ../lib/libkfontinst.la 1443 METASOURCES = AUTO 1444 kcm_fontinst_la_LDFLAGS = $(KDE_PLUGIN) $(all_libraries) $(KDE_RPATH) -module -avoid-version -no-undefined 1445 -AM_CPPFLAGS = -I$(srcdir)/../lib $(FONTINST_PRINT_INC) -I$(srcdir)/../../fonts $(all_includes) $(LIBFREETYPE_CFLAGS) $(LIBFONTCONFIG_CFLAGS) 1446 +AM_CPPFLAGS = -I$(srcdir)/../lib $(FONTINST_PRINT_INC) -I$(srcdir)/../../fonts $(LIBFREETYPE_CFLAGS) $(LIBFONTCONFIG_CFLAGS) $(all_includes) 1447 1448 xdg_apps_DATA = kcmfontinst.desktop 1449 1450 --- kdebase-3.5.0/kcontrol/kfontinst/kfile-plugin/Makefile.am Sat Sep 10 04:25:09 2005 1451 +++ kdebase-3.5.0-patched/kcontrol/kfontinst/kfile-plugin/Makefile.am Mon Dec 12 21:03:53 2005 1452 @@ -1,13 +1,13 @@ 1453 kde_module_LTLIBRARIES = kfile_font.la 1454 1455 kfile_font_la_SOURCES = KFileFont.cpp 1456 -kfile_font_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIBFREETYPE_RPATH) -module $(KDE_PLUGIN) 1457 -kfile_font_la_LIBADD = $(LIB_KIO) $(LIBFREETYPE_LIBS) ../lib/libkfontinst.la 1458 +kfile_font_la_LDFLAGS = $(LIBFREETYPE_RPATH) $(all_libraries) $(KDE_RPATH) -module $(KDE_PLUGIN) 1459 +kfile_font_la_LIBADD = $(LIBFREETYPE_LIBS) $(LIB_KIO) ../lib/libkfontinst.la 1460 1461 kdelnkdir = $(kde_servicesdir) 1462 kde_services_DATA = kfile_font.desktop 1463 1464 -AM_CPPFLAGS = -I$(srcdir)/../lib -I$(srcdir)/../../fonts $(all_includes) $(LIBFREETYPE_CFLAGS) 1465 +AM_CPPFLAGS = -I$(srcdir)/../lib -I$(srcdir)/../../fonts $(LIBFREETYPE_CFLAGS) $(all_includes) 1466 1467 METASOURCES = AUTO 1468 noinst_HEADERS = KFileFont.h 1469 --- kdebase-3.5.0/kcontrol/kfontinst/kfontinst/Makefile.am Sat Sep 10 04:25:09 2005 1470 +++ kdebase-3.5.0-patched/kcontrol/kfontinst/kfontinst/Makefile.am Mon Dec 12 21:04:33 2005 1471 @@ -1,5 +1,8 @@ 1472 -bin_PROGRAMS = kfontinst 1473 -kfontinst_SOURCES = \ 1474 +bin_PROGRAMS = 1475 +lib_LTLIBRARIES = 1476 +kdeinit_LTLIBRARIES = kfontinst.la 1477 + 1478 +kfontinst_la_SOURCES = \ 1479 CompressedFile.cpp \ 1480 Main.cpp \ 1481 Encodings.cpp \ 1482 @@ -15,6 +18,6 @@ 1483 Fontmap.h \ 1484 XConfig.h 1485 1486 -kfontinst_LDADD = ../../fonts/libkxftconfig.la $(LIBFONTCONFIG_LIBS) $(LIBFREETYPE_LIBS) $(LIB_FONT_ENC) $(LIBZ) $(LIB_KIO) ../lib/libkfontinst.la 1487 -kfontinst_LDFLAGS = $(all_libraries) $(LIBFONTCONFIG_RPATH) $(LIBFREETYPE_RPATH) $(KDE_RPATH) 1488 -AM_CPPFLAGS= -DOS_$(UNAME) -I$(srcdir)/../lib -I$(srcdir)/../../fonts $(all_includes) $(LIBFREETYPE_CFLAGS) $(LIBFONTCONFIG_CFLAGS) 1489 +kfontinst_la_LIBADD = $(LIBFONTCONFIG_LIBS) $(LIBFREETYPE_LIBS) $(LIB_FONT_ENC) ../../fonts/libkxftconfig.la $(LIBZ) $(LIB_KIO) ../lib/libkfontinst.la 1490 +kfontinst_la_LDFLAGS = $(LIBFONTCONFIG_RPATH) $(LIBFREETYPE_RPATH) $(all_libraries) $(KDE_PLUGIN) -module 1491 +AM_CPPFLAGS= -DOS_$(UNAME) -I$(srcdir)/../lib -I$(srcdir)/../../fonts $(LIBFREETYPE_CFLAGS) $(LIBFONTCONFIG_CFLAGS) $(all_includes) 1492 --- kdebase-3.5.0/kcontrol/kfontinst/kio/Makefile.am Sat Sep 10 04:25:09 2005 1493 +++ kdebase-3.5.0-patched/kcontrol/kfontinst/kio/Makefile.am Mon Dec 12 21:05:15 2005 1494 @@ -2,9 +2,9 @@ 1495 kio_fonts_la_SOURCES = \ 1496 KioFonts.cpp 1497 1498 -kio_fonts_la_LIBADD = ../../fonts/libkxftconfig.la $(LIBFONTCONFIG_LIBS) $(LIBFREETYPE_LIBS) $(LIB_KIO) -lkdesu ../lib/libkfontinst.la 1499 -kio_fonts_la_LDFLAGS = $(KDE_PLUGIN) $(all_libraries) $(KDE_RPATH) $(LIBFONTCONFIG_RPATH) $(LIBFREETYPE_RPATH) -module -avoid-version -no-undefined 1500 -AM_CPPFLAGS= -I$(srcdir)/../lib -I$(srcdir)/../../fonts $(all_includes) $(LIBFREETYPE_CFLAGS) $(LIBFONTCONFIG_CFLAGS) -D_LARGEFILE64_SOURCE 1501 +kio_fonts_la_LIBADD = $(LIBFONTCONFIG_LIBS) $(LIBFREETYPE_LIBS) ../../fonts/libkxftconfig.la $(LIB_KIO) -lkdesu ../lib/libkfontinst.la 1502 +kio_fonts_la_LDFLAGS = $(LIBFONTCONFIG_RPATH) $(LIBFREETYPE_RPATH) $(KDE_PLUGIN) $(all_libraries) $(KDE_RPATH) -module -avoid-version -no-undefined 1503 +AM_CPPFLAGS= -I$(srcdir)/../lib -I$(srcdir)/../../fonts $(LIBFREETYPE_CFLAGS) $(LIBFONTCONFIG_CFLAGS) -D_LARGEFILE64_SOURCE $(all_includes) 1504 1505 # The kxftconfig stuf really belongs to kdebase/kcontrol/fonts - here only so that can distribute this as an archive. 1506 noinst_HEADERS = \ 1507 --- kdebase-3.5.0/kcontrol/kfontinst/lib/Makefile.am Sat Sep 10 04:25:09 2005 1508 +++ kdebase-3.5.0-patched/kcontrol/kfontinst/lib/Makefile.am Mon Dec 12 21:06:00 2005 1509 @@ -9,6 +9,6 @@ 1510 FcEngine.h \ 1511 KfiConstants.h 1512 1513 -libkfontinst_la_LIBADD = $(LIB_KDECORE) $(LIBFONTCONFIG_LIBS) $(LIBFREETYPE_LIBS) $(LIB_KIO) $(LIBXFT_LIB) 1514 -libkfontinst_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIBFONTCONFIG_RPATH) $(LIBFREETYPE_RPATH) -no-undefined 1515 -AM_CPPFLAGS= $(all_includes) $(LIBFREETYPE_CFLAGS) $(LIBFONTCONFIG_CFLAGS) -D_LARGEFILE64_SOURCE 1516 +libkfontinst_la_LIBADD = $(LIBFONTCONFIG_LIBS) $(LIBFREETYPE_LIBS) $(LIB_KDECORE) $(LIB_KIO) $(LIBXFT_LIB) 1517 +libkfontinst_la_LDFLAGS = $(LIBFONTCONFIG_RPATH) $(LIBFREETYPE_RPATH) $(all_libraries) $(KDE_RPATH) -no-undefined 1518 +AM_CPPFLAGS= $(LIBFREETYPE_CFLAGS) $(LIBFONTCONFIG_CFLAGS) -D_LARGEFILE64_SOURCE $(all_includes) 1519 --- kdebase-3.5.0/kcontrol/kfontinst/thumbnail/Makefile.am Sat Sep 10 04:25:09 2005 1520 +++ kdebase-3.5.0-patched/kcontrol/kfontinst/thumbnail/Makefile.am Mon Dec 12 21:06:21 2005 1521 @@ -2,7 +2,7 @@ 1522 1523 fontthumbnail_la_SOURCES = FontThumbnail.cpp 1524 fontthumbnail_la_LIBADD = $(LIBFREETYPE_LIBS) $(LIB_KDECORE) $(LIB_KIO) ../lib/libkfontinst.la 1525 -fontthumbnail_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIBFREETYPE_RPATH) -module $(KDE_PLUGIN) 1526 +fontthumbnail_la_LDFLAGS = $(KDE_RPATH) $(LIBFREETYPE_RPATH) -module $(KDE_PLUGIN) $(all_libraries) 1527 METASOURCES = AUTO 1528 1529 noinst_HEADERS = FontThumbnail.h 1530 @@ -11,4 +11,4 @@ 1531 1532 kde_services_DATA = fontthumbnail.desktop 1533 1534 -AM_CPPFLAGS= -I$(srcdir)/../lib -I$(srcdir)/../../fonts $(all_includes) $(LIBFREETYPE_CFLAGS) 1535 +AM_CPPFLAGS= -I$(srcdir)/../lib -I$(srcdir)/../../fonts $(LIBFREETYPE_CFLAGS) $(all_includes) 1536 --- kdebase-3.5.0/kcontrol/kfontinst/viewpart/Makefile.am Sat Sep 10 04:25:09 2005 1537 +++ kdebase-3.5.0-patched/kcontrol/kfontinst/viewpart/Makefile.am Mon Dec 12 21:06:44 2005 1538 @@ -13,18 +13,21 @@ 1539 1540 kde_services_DATA = kfontviewpart.desktop 1541 1542 -AM_CPPFLAGS = -I$(srcdir)/../lib -I$(srcdir)/../../fonts $(all_includes) $(LIBFREETYPE_CFLAGS) $(LIBFONTCONFIG_CFLAGS) 1543 +AM_CPPFLAGS = -I$(srcdir)/../lib -I$(srcdir)/../../fonts $(LIBFREETYPE_CFLAGS) $(LIBFONTCONFIG_CFLAGS) $(all_includes) 1544 METASOURCES = AUTO 1545 1546 -kfontview_LDADD = $(LIB_KPARTS) 1547 -kfontview_LDFLAGS = $(all_libraries) $(KDE_RPATH) 1548 +kfontview_la_LIBADD = $(LIB_KPARTS) 1549 +kfontview_la_LDFLAGS = $(KDE_PLUGIN) -module $(all_libraries) 1550 + 1551 +bin_PROGRAMS = 1552 +lib_LTLIBRARIES = 1553 +kdeinit_LTLIBRARIES = kfontview.la 1554 1555 -bin_PROGRAMS = kfontview 1556 xdg_apps_DATA = kfontview.desktop 1557 1558 appdata_DATA = kfontviewpart.rc kfontviewui.rc 1559 appdatadir = $(kde_datadir)/kfontview 1560 1561 -kfontview_SOURCES = FontViewerApp.cpp 1562 +kfontview_la_SOURCES = FontViewerApp.cpp 1563 1564 1565 --- kdebase-3.5.1/kcontrol/kfontinst/viewpart/FontViewerApp.cpp.orig 2006-01-25 20:53:38.000000000 -0500 1566 +++ kdebase-3.5.1/kcontrol/kfontinst/viewpart/FontViewerApp.cpp 2006-01-25 20:52:35.000000000 -0500 1567 @@ -116,7 +116,7 @@ 1568 KAboutData::License_GPL, 1569 I18N_NOOP("(c) Craig Drummond, 2004")); 1570 1571 -int main(int argc, char **argv) 1572 +extern "C" KDE_EXPORT int kdemain(int argc, char **argv) 1573 { 1574 KCmdLineArgs::init(argc, argv, &aboutData); 1575 KCmdLineArgs::addCmdLineOptions(options); 1576 --- kdebase-3.5.1/kcontrol/kfontinst/lib/FcEngine.h.orig 2006-01-25 23:03:27.000000000 -0500 1577 +++ kdebase-3.5.1/kcontrol/kfontinst/lib/FcEngine.h 2006-01-25 23:01:15.000000000 -0500 1578 @@ -5,6 +5,8 @@ 1579 #include "config.h" 1580 #endif 1581 1582 +#define KFI_FC_NO_WIDTHS 1 1583 + 1584 #include <qstring.h> 1585 #include <qvaluevector.h> 1586 #include <qfont.h> 1587 --- kdebase-3.5.1/kcontrol/kfontinst/kfontinst/Main.cpp.orig 2006-01-25 23:04:25.000000000 -0500 1588 +++ kdebase-3.5.1/kcontrol/kfontinst/kfontinst/Main.cpp 2006-01-25 23:03:41.000000000 -0500 1589 @@ -190,7 +190,7 @@ 1590 KFI::CXConfig::refreshPaths(true); 1591 } 1592 1593 -int main(int argc, char *argv[]) 1594 +extern "C" KDE_EXPORT int kdemain(int argc, char *argv[]) 1595 { 1596 #ifdef HAVE_GETOPT_H 1597 static struct option options[]= 1598 --- kdebase-3.5.1/kxkb/rules.cpp.orig 2006-02-03 09:56:15.000000000 -0500 1599 +++ kdebase-3.5.1/kxkb/rules.cpp 2006-02-03 09:56:40.000000000 -0500 1600 @@ -300,7 +300,7 @@ 1601 */ 1602 const QString KeyRules::getLayout(const QString &layvar) const 1603 { 1604 - static const char* LAYOUT_PATTERN = "[a-z0-9_-]*"; 1605 + static const char* LAYOUT_PATTERN = "[a-zA-Z0-9_-]*"; 1606 QString varLine = layvar.stripWhiteSpace(); 1607 QRegExp rx(LAYOUT_PATTERN); 1608 int pos = rx.search(varLine, 0); 1609 @@ -318,7 +318,7 @@ 1610 */ 1611 const QString KeyRules::getVariant(const QString &layvar) const 1612 { 1613 - static const char* VARIANT_PATTERN = "\\([a-z0-9_-]*\\)"; 1614 + static const char* VARIANT_PATTERN = "\\([a-zA-Z0-9_-]*\\)"; 1615 QString varLine = layvar.stripWhiteSpace(); 1616 QRegExp rx(VARIANT_PATTERN); 1617 int pos = rx.search(varLine, 0); 1618 --- kdebase-3.5.1/kdesktop/krootwm.cc 2005-10-10 11:04:11.000000000 -0400 1619 +++ kdebase-3.5.1-new/kdesktop/krootwm.cc 2006-02-28 21:07:46.000000000 -0500 1620 @@ -52,6 +52,7 @@ 1621 #include <kuser.h> 1622 #include <qfile.h> 1623 1624 +#include <kprocess.h> 1625 #include "krootwm.h" 1626 #include "kdiconview.h" 1627 #include "desktop.h" 1628 @@ -82,6 +83,9 @@ 1629 m_configDialog = 0; 1630 1631 1632 + new KAction(i18n("Konsole..." ), "openterm", 0, this, SLOT( slotOpenTerminal() ), 1633 + m_actionCollection, "open_terminal" ); 1634 + 1635 // Creates the new menu 1636 menuBar = 0; // no menubar yet 1637 menuNew = 0; 1638 @@ -135,6 +139,7 @@ 1639 { 1640 new KAction(i18n("Run Command..."), "run", 0, m_pDesktop, SLOT( slotExecuteCommand() ), m_actionCollection, "exec" ); 1641 } 1642 + 1643 if (!KGlobal::config()->isImmutable()) 1644 { 1645 new KAction(i18n("Configure Desktop..."), "configure", 0, this, SLOT( slotConfigureDesktop() ), 1646 @@ -378,6 +383,13 @@ 1647 desktopMenu->disconnect( this ); 1648 bool needSeparator = false; 1649 1650 + action = m_actionCollection->action("open_terminal"); 1651 + if (action) 1652 + { 1653 + action->plug( desktopMenu ); 1654 + needSeparator = true; 1655 + } 1656 + 1657 if (menuNew) 1608 if (actualMax > maxSize.height()) 1609 { 1610 return maxSize; 1611 } 1612 - return QSize( maxSize.width(), maxSize.height() ); 1613 + return QSize( maxSize.width(), actualMax ); 1614 } 1615 else 1658 1616 { 1659 menuNew->plug( desktopMenu );1660 @@ -724,6 +736,13 @@1661 return args;1662 }1663 1664 +void KRootWm::slotOpenTerminal()1665 +{1666 + KProcess proc;1667 + proc << locate("exe", "konsole");1668 + proc.start(KProcess::DontCare);1669 +}1670 +1671 void KRootWm::slotConfigureDesktop() {1672 if (!m_configDialog)1673 {1674 --- kdebase-3.5.1/kdesktop/krootwm.h 2005-10-10 11:04:11.000000000 -04001675 +++ kdebase-3.5.1-new/kdesktop/krootwm.h 2006-02-28 21:07:46.000000000 -05001676 @@ -119,6 +119,7 @@1677 void slotSessionActivated( int );1678 void slotNewSession();1679 void slotLockNNewSession();1680 + void slotOpenTerminal();1681 1682 private:1683 KDesktop* m_pDesktop;1684 --- kdebase-3.5.1/konsole/konsole/TEWidget.cpp 2005-09-10 04:26:08.000000000 -04001685 +++ kdebase-3.5.1-new/konsole/konsole/TEWidget.cpp 2006-02-28 21:06:55.000000000 -05001686 @@ -393,6 +393,8 @@1687 qApp->installEventFilter( this ); //FIXME: see below1688 KCursor::setAutoHideCursor( this, true );1689 1690 + setInputMethodEnabled( true );1691 +1692 // Init DnD ////////////////////////////////////////////////////////////////1693 setAcceptDrops(true); // attempt1694 dragInfo.state = diNone;1695 --- kdebase-3.5.1/konsole/konsole/TEmuVt102.cpp 2005-09-10 04:26:07.000000000 -04001696 +++ kdebase-3.5.1-new/konsole/konsole/TEmuVt102.cpp 2006-02-28 21:06:23.000000000 -05001697 @@ -952,7 +952,10 @@1698 scr->setHistCursor(scr->getHistLines());1699 1700 if (cmd==CMD_send) {1701 - if ((ev->state() & AltButton) && !metaspecified ) sendString("\033");1702 + if ( (ev->state() & AltButton) &&1703 + !metaspecified &&1704 + !(len && txt[0]==27) )1705 + sendString("\033");1706 emit sndBlock(txt,len);1707 return;1708 }1709 --- kdebase-3.5.1/kwin/events.cpp 2006-01-19 12:01:07.000000000 -05001710 +++ kdebase-3.5.1-new/kwin/events.cpp 2006-02-28 21:09:11.000000000 -05001711 @@ -323,17 +323,7 @@1712 return ( e->xunmap.event != e->xunmap.window ); // hide wm typical event from Qt1713 }1714 case MapNotify:1715 - {1716 -#if KDE_IS_VERSION( 3, 9, 90 )1717 -#warning Consider dumping this workaround.1718 -#endif1719 - // See bug #100177, especially comments #6 and #14. This workaround shouldn't be1720 - // necessary when X.org with that fix becomes available and it's an unnecessary1721 - // X roundtrip for an experimental unstable feature.1722 - if( addSystemTrayWin( e->xmap.window ))1723 - return true;1724 return ( e->xmap.event != e->xmap.window ); // hide wm typical event from Qt1725 - }1726 case ReparentNotify:1727 {1728 //do not confuse Qt with these events. After all, _we_ are the -
kdebase3/files/InstallScript.sh
1 1 #!/bin/sh -e 2 2 3 export HOME=/tmp PREFIX="%p" QTDOCDIR="%p/share/doc/qt3/html"3 export PREFIX="%p" USE_UNSERMAKE=1 4 4 . ./environment-helper.sh 5 5 6 #darwinports 7 export UNSERMAKE="no" 8 9 ./build-helper.sh install %N %v %r make -j1 install DESTDIR=%d 6 ./build-helper.sh install %N %v %r unsermake -p -j1 install DESTDIR=%d 10 7 #apidox#./build-helper.sh install-apidox %N %v %r make -j1 install-apidox install-apidox-recurse DESTDIR=%d 11 8 12 9 mkdir -p %i/share/doc/installed-packages … … 24 21 install -c -m 444 /etc/pam.d/login %i/etc/pam.d/kdm 25 22 install -c -m 444 /etc/pam.d/login %i/etc/pam.d/kcheckpass 26 23 install -c -m 444 /etc/pam.d/login %i/etc/pam.d/kscreensaver 27 rm -rf %i/share/fonts || true28 24 rm -rf %i/share/icons/crystalsvg/scalable/apps/artsbuilder.* 29 25 26 install -d -m 755 "%d`%p/bin/xfontpath basedir`" 30 27 #fink 31 # ./build-helper.sh konsole-install %N %v %r make -C konsole/fonts install fontdir=`%p/bin/xfontpath basedir`/konsole DESTDIR=%d32 # darwinports33 ./build-helper.sh konsole-install %N %v %r make -C konsole/fonts install fontdir=%p/share/fonts/konsole DESTDIR=%d28 # mv "%i/share/apps/konsole/fonts" "%d`%p/bin/xfontpath basedir`/konsole" 29 #macports 30 mv "%i/share/apps/konsole/fonts" "%d%p/share/fonts/konsole" -
kdebase3/files/CompileScript.sh
1 1 #!/bin/sh -e 2 2 3 export HOME=/tmp PREFIX="%p" QTDOCDIR="%p/share/doc/qt3/html" 3 if [ `id -un` != "root" ]; then 4 echo "you must be root to build this package, it creates setuid binaries!" 5 exit 1 6 fi 7 8 export PREFIX="%p" USE_UNSERMAKE=1 4 9 . ./environment-helper.sh 5 export lt_cv_sys_max_cmd_len=655366 10 7 #darwinports 8 export UNSERMAKE="no" 11 perl -pi -e 's,FONTINST_SUBDIR="kfontinst",FONTINST_SUBDIR="",' kcontrol/kfontinst/configure.in.in 9 12 10 export CC=gcc CXX=g++11 12 export PKG_CONFIG_PATH="%p/lib/fontconfig2/lib/pkgconfig:%p/lib/freetype219/lib/pkgconfig:$PKG_CONFIG_PATH"13 14 case $SW_VERSION in15 10.[0123])16 perl -pi -e 's,FONTINST_SUBDIR="kfontinst",FONTINST_SUBDIR="",' kcontrol/kfontinst/configure.in.in17 ;;18 esac19 20 13 ./build-helper.sh cvs %N %v %r make -f admin/Makefile.common cvs 21 14 ./build-helper.sh configure %N %v %r ./configure %c $CONFIGURE_PARAMS 22 ./build-helper.sh make %N %v %r make all all_libraries="$ALL_LIBRARIES"KDM_FLAGS="-UHAVE_UTMPX -DBSD_UTMP=1"15 ./build-helper.sh make %N %v %r unsermake $UNSERMAKEFLAGS KDM_FLAGS="-UHAVE_UTMPX -DBSD_UTMP=1" 23 16 #apidox#./build-helper.sh apidox %N %v %r make apidox -
kdebase3/Portfile
1 1 # $Id$ 2 2 3 #Synced with Fink, Version 3.5. 1-10243 #Synced with Fink, Version 3.5.4-1022 4 4 5 5 PortSystem 1.0 6 6 name kdebase3 7 version 3.5.1 8 revision 3 9 set kdeadmin kde-admindir-3.5.1 7 version 3.5.4 8 set kdeadmin kde-admindir-252 10 9 categories kde 11 10 maintainers ben@macports.org takanori@macports.org 12 11 description Base KDE programs -- e.g. kicker (taskbar). \ 13 12 NB No KDE sound support. 14 13 platforms darwin 15 master_sites opendarwin::kde351 \ 16 kde:security_patches/:security \ 14 master_sites opendarwin::kde354 \ 17 15 opendarwin::admin 18 16 # kde:stable/${version}/src 19 17 # http://ranger.befunk.com/fink/:admin 20 extract.suffix .tar.bz221 18 use_bzip2 yes 22 19 distname kdebase-${version} 23 distfiles ${distname}.tar.bz2:kde351 \ 24 post-3.5.0-kdebase-kdm.diff:security \ 25 ${kdeadmin}.tar.bz2:admin 20 distfiles ${distname}.tar.bz2:kde354 \ 21 ${kdeadmin}.tar.bz2:admin 26 22 depends_build port:autoconf \ 27 port: automake23 port:unsermake 28 24 depends_lib port:cyrus-sasl2 \ 29 25 port:kdelibs3 \ 30 26 port:libusb 27 # port:openmotif 31 28 32 checksums ${distname}.tar.bz2 md5 484c7b3895ce4f95173f4789571eb1cc \ 33 post-3.5.0-kdebase-kdm.diff md5 9daecff07d57dabba35da247e752916a \ 34 ${kdeadmin}.tar.bz2 md5 b6115a7310f8e8533af91be02e225d0e 29 checksums ${distname}.tar.bz2 md5 882a9729c08b197caef2c8712c980d9c \ 30 ${kdeadmin}.tar.bz2 md5 54a89925e71bd32f759c81b312ad0b9e 35 31 36 extract.only ${distname}.tar.bz2 37 post-extract { 38 system "cd ${worksrcpath} && cat ${distpath}/post-3.5.0-kdebase-kdm.diff | patch -p0" 39 system "cd ${worksrcpath} && bzcat -dc ${distpath}/${kdeadmin}.tar.bz2 | tar xf -" 40 } 32 extract.only ${distname}.tar.bz2 33 post-extract { system "cd ${worksrcpath} && bzcat -dc ${distpath}/${kdeadmin}.tar.bz2 | tar xf -" } 41 34 42 35 patchfiles kdebase3-unified.patch 43 36 patch { 44 37 cd ${worksrcpath} 45 38 foreach file $patchfiles { 46 system "sed -e 's,@FINKPREFIX@,${prefix},g' ${ portpath}/${filesdir}/${file} | patch -p1"39 system "sed -e 's,@FINKPREFIX@,${prefix},g' ${filespath}/${file} | patch -p1" 47 40 } 41 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/*" 42 system "perl -pi -e 's/-Xlinker -framework -Xlinker (\\S*)/-Wl,-framework,\$1/g; s/-framework (\\S*)/-Wl,-framework,\$1/g;' configure" 48 43 } 49 post-patch { 50 reinplace "s|lib/freetype219/||g" ${worksrcpath}/environment-helper.sh 51 reinplace "s|include/qt|include/qt3|g" ${worksrcpath}/environment-helper.sh 44 post-patch { 45 reinplace "s|/lib/freetype219||g" ${worksrcpath}/environment-helper.sh 52 46 reinplace "s|--with-ssl-dir=/usr|--with-ssl-dir=\$PREFIX|g" ${worksrcpath}/environment-helper.sh 53 reinplace "s|2.5\\*|2.\[56\]\\*|g" ${worksrcpath}/admin/cvs.sh54 foreach file [glob ${worksrcpath}/admin/*] {55 reinplace "s|-O2|-Os|g" $file56 reinplace "s|doc/HTML|doc/kde|g" $file57 reinplace "s|/usr/share/doc/packages/qt3/html|${prefix}/share/doc/qt3/html|g" $file58 }59 47 foreach file {CompileScript.sh InstallScript.sh} { 60 file copy ${ portpath}/${filesdir}/${file} ${worksrcpath}48 file copy ${filespath}/${file} ${worksrcpath} 61 49 reinplace "s|%p|${prefix}|g" ${worksrcpath}/${file} 62 50 reinplace "s|%N|${name}|g" ${worksrcpath}/${file} 63 51 reinplace "s|%v|${version}|g" ${worksrcpath}/${file} … … 67 55 reinplace "s|%i|${destroot}${prefix}|g" ${worksrcpath}/${file} 68 56 file attributes ${worksrcpath}/${file} -permissions 0755 69 57 } 70 # init.sh is not provided by DarwinPorts 71 reinplace "s|source \"${prefix}/bin/init.sh\"|#source \"${prefix}/bin/init.sh\"|g" ${worksrcpath}/startkde 58 reinplace "s|doc/HTML|doc/kde|g" ${worksrcpath}/khelpcenter/searchhandlers/khc_docbookdig.pl.in 59 reinplace "s|doc/HTML|doc/kde|g" ${worksrcpath}/doc/userguide/kde-for-admins.docbook 60 # init.sh doesn't exist in MacPorts 61 reinplace "s|\\(source \"${prefix}/bin/init.sh\"\\)|#\\1|g" ${worksrcpath}/startkde 72 62 } 73 63 74 configure.args --without-nfs --with-ldap=framework --with-distribution=' DarwinPorts/Mac OS X' --without-arts64 configure.args --without-nfs --with-ldap=framework --with-distribution='MacPorts/Mac OS X' --without-arts 75 65 76 66 configure {} 77 67 build { system "cd ${worksrcpath} && ./CompileScript.sh" } 78 68 destroot { system "cd ${worksrcpath} && ./InstallScript.sh" } 79 69 80 post-destroot 70 post-destroot { 81 71 xinstall -m 755 -d ${destroot}${prefix}/share/doc/${name} 82 72 xinstall -m 644 -W ${worksrcpath} AUTHORS COPYING INSTALL README README.pam ${destroot}${prefix}/share/doc/${name} 83 73 } 84 74 85 platform darwin 6 { 86 depends_lib-append lib:libdl:dlcompat 75 variant apidox { 76 depends_lib-append port:doxygen 77 post-patch { foreach f {CompileScript.sh InstallScript.sh} { reinplace "s|#apidox#||g" ${worksrcpath}/${f} }} 87 78 } 88 89 variant apidox {90 depends_lib-append port:doxygen91 post-patch { foreach f {CompileScript.sh InstallScript.sh} { reinplace "s|#apidox#||g" ${worksrcpath}/${f} }}92 } -
kdeedu3/files/kdeedu3.patch
1 --- kdeedu-3.5.0/kalzium/src/Makefile.am 2005-09-10 10:24:07.000000000 -0400 2 +++ kdeedu-3.5.0-new/kalzium/src/Makefile.am 2005-11-18 08:01:23.000000000 -0500 1 2 --- kdeedu-3.5.3/kalzium/src/Makefile.am 2005-09-10 10:24:07.000000000 -0400 3 +++ kdeedu-3.5.3-new/kalzium/src/Makefile.am 2006-05-25 00:23:08.000000000 -0400 3 4 @@ -1,8 +1,11 @@ 4 5 # set the include path for X, qt and KDE 5 6 INCLUDES= -I$(srcdir)/../../libkdeedu/kdeeduplot -I$(srcdir)/../../libkdeedu/kdeeduui $(all_includes) … … 32 33 33 34 #this RegExp-monster grep for <name origin=foo">bar</name> and puts the i18n() around foo and bar 34 35 messages-old: rc.cpp 35 --- kdeedu-3.5. 0/kalzium/src/main.cpp 2005-10-10 10:55:44.000000000 -040036 +++ kdeedu-3.5. 0-new/kalzium/src/main.cpp 2005-11-18 07:58:58.000000000 -050036 --- kdeedu-3.5.3/kalzium/src/main.cpp 2006-05-22 14:03:43.000000000 -0400 37 +++ kdeedu-3.5.3-new/kalzium/src/main.cpp 2006-05-25 00:23:08.000000000 -0400 37 38 @@ -43,7 +43,7 @@ 38 39 }; 39 40 #endif … … 43 44 { 44 45 #ifdef HAVE_FACILE 45 46 caml_startup(argv); 46 --- kdeedu-3.5. 0/kbruch/src/Makefile.am 2005-09-10 04:18:00.000000000 -040047 +++ kdeedu-3.5. 0-new/kbruch/src/Makefile.am 2005-11-18 07:58:58.000000000 -050047 --- kdeedu-3.5.3/kbruch/src/Makefile.am 2005-09-10 04:18:00.000000000 -0400 48 +++ kdeedu-3.5.3-new/kbruch/src/Makefile.am 2006-05-25 00:23:08.000000000 -0400 48 49 @@ -1,10 +1,14 @@ 49 50 -bin_PROGRAMS = kbruch 50 51 … … 65 66 66 67 EXTRA_DIST = kbruch.cpp kbruch.h kbruch.desktop hi32-app-kbruch.png hi16-app-kbruch.png lo32-app-kbruch.png lo16-app-kbruch.png mainqtwidget.cpp mainqtwidget.h primenumber.cpp primenumber.h statisticsview.cpp statisticsview.h exercisebase.cpp exercisebase.h taskview.cpp taskview.h ratio.cpp ratio.h task.cpp task.h taskwidget.cpp taskwidget.h fractionbasewidget.cpp fractionbasewidget.h resultwidget.cpp resultwidget.h exercisecompare.cpp exercisecompare.h ratiowidget.cpp ratiowidget.h rationalwidget.cpp rationalwidget.h exerciseconvert.cpp exerciseconvert.h exercisefactorize.cpp exercisefactorize.h factorizedwidget.cpp factorizedwidget.h kbruch.rc taskvieweroptionsbase.ui 67 68 68 --- kdeedu-3.5. 0/kbruch/src/kbruch.cpp 2005-09-10 04:18:00.000000000 -040069 +++ kdeedu-3.5. 0-new/kbruch/src/kbruch.cpp 2005-11-18 07:58:58.000000000 -050069 --- kdeedu-3.5.3/kbruch/src/kbruch.cpp 2006-01-19 11:35:32.000000000 -0500 70 +++ kdeedu-3.5.3-new/kbruch/src/kbruch.cpp 2006-05-25 00:23:08.000000000 -0400 70 71 @@ -28,7 +28,7 @@ 71 72 #include <kaboutdata.h> 72 73 … … 76 77 { 77 78 // init random generator 78 79 srand(time(NULL)); 79 --- kdeedu-3.5. 0/keduca/keduca/Makefile.am 2005-09-10 04:17:25.000000000 -040080 +++ kdeedu-3.5. 0-new/keduca/keduca/Makefile.am 2005-11-18 07:58:58.000000000 -050080 --- kdeedu-3.5.3/keduca/keduca/Makefile.am 2005-09-10 04:17:25.000000000 -0400 81 +++ kdeedu-3.5.3-new/keduca/keduca/Makefile.am 2006-05-25 00:23:08.000000000 -0400 81 82 @@ -1,11 +1,13 @@ 82 83 # set the include path for X, qt and KDE 83 84 -INCLUDES= -I../libkeduca $(all_includes) … … 97 98 98 99 # Convenience library 99 100 #noinst_LTLIBRARIES = libkeduca_common.la 100 --- kdeedu-3.5. 0/keduca/keduca/main.cpp 2005-09-10 04:17:25.000000000 -0400101 +++ kdeedu-3.5. 0-new/keduca/keduca/main.cpp 2005-11-18 07:58:58.000000000 -0500101 --- kdeedu-3.5.3/keduca/keduca/main.cpp 2005-09-10 04:17:25.000000000 -0400 102 +++ kdeedu-3.5.3-new/keduca/keduca/main.cpp 2006-05-25 00:23:08.000000000 -0400 102 103 @@ -31,7 +31,7 @@ 103 104 KCmdLineLastOption 104 105 }; … … 108 109 { 109 110 KAboutData aboutData( "keduca", I18N_NOOP("KEduca"), 110 111 version, description, KAboutData::License_GPL, 111 --- kdeedu-3.5. 0/keduca/keducabuilder/Makefile.am 2005-09-10 04:17:25.000000000 -0400112 +++ kdeedu-3.5. 0-new/keduca/keducabuilder/Makefile.am 2005-11-18 07:58:58.000000000 -0500112 --- kdeedu-3.5.3/keduca/keducabuilder/Makefile.am 2005-09-10 04:17:25.000000000 -0400 113 +++ kdeedu-3.5.3-new/keduca/keducabuilder/Makefile.am 2006-05-25 00:23:08.000000000 -0400 113 114 @@ -1,6 +1,10 @@ 114 115 -bin_PROGRAMS = keducabuilder 115 116 -keducabuilder_SOURCES = kcontroladdeditbase.ui keducaeditorstartdialogbase.ui keducaeditorstartdialog.cpp ktagcombobox.cpp klangcombo.cpp kcontrolheader.cpp keducabuilder.cpp kcontroladdedit.cpp main.cpp … … 139 140 140 141 # Uncomment the following two lines if you add a ui.rc file for your application to make use of 141 142 # KDE´s XML GUI builing 142 --- kdeedu-3.5. 0/keduca/keducabuilder/main.cpp 2005-09-10 04:17:25.000000000 -0400143 +++ kdeedu-3.5. 0-new/keduca/keducabuilder/main.cpp 2005-11-18 07:58:58.000000000 -0500143 --- kdeedu-3.5.3/keduca/keducabuilder/main.cpp 2005-09-10 04:17:25.000000000 -0400 144 +++ kdeedu-3.5.3-new/keduca/keducabuilder/main.cpp 2006-05-25 00:23:08.000000000 -0400 144 145 @@ -32,7 +32,7 @@ 145 146 KCmdLineLastOption 146 147 }; … … 150 151 { 151 152 KAboutData aboutData( "keduca", I18N_NOOP("KEducaBuilder"), 152 153 version, description, KAboutData::License_GPL, 153 --- kdeedu-3.5. 0/khangman/khangman/Makefile.am 2005-09-10 04:16:50.000000000 -0400154 +++ kdeedu-3.5. 0-new/khangman/khangman/Makefile.am 2005-11-18 08:02:27.000000000 -0500154 --- kdeedu-3.5.3/khangman/khangman/Makefile.am 2005-09-10 04:16:50.000000000 -0400 155 +++ kdeedu-3.5.3-new/khangman/khangman/Makefile.am 2006-05-25 00:23:08.000000000 -0400 155 156 @@ -1,7 +1,11 @@ 156 157 ####### kdevelop will overwrite this part!!! (begin)########## 157 158 -bin_PROGRAMS = khangman … … 176 177 177 178 rc_DATA = khangmanui.rc 178 179 rcdir = $(kde_datadir)/khangman 179 --- kdeedu-3.5. 0/khangman/khangman/main.cpp 2005-10-10 10:55:19.000000000 -0400180 +++ kdeedu-3.5. 0-new/khangman/khangman/main.cpp 2005-11-18 07:58:58.000000000 -0500180 --- kdeedu-3.5.3/khangman/khangman/main.cpp 2005-10-10 10:55:19.000000000 -0400 181 +++ kdeedu-3.5.3-new/khangman/khangman/main.cpp 2006-05-25 00:23:08.000000000 -0400 181 182 @@ -39,7 +39,7 @@ 182 183 KCmdLineLastOption 183 184 }; … … 187 188 { 188 189 KAboutData aboutData( "khangman", I18N_NOOP("KHangMan"), 189 190 KHM_VERSION, description, KAboutData::License_GPL, 190 --- kdeedu-3.5. 0/kig/kig/Makefile.am 2005-09-10 04:17:20.000000000 -0400191 +++ kdeedu-3.5. 0-new/kig/kig/Makefile.am 2005-11-18 07:58:58.000000000 -0500191 --- kdeedu-3.5.3/kig/kig/Makefile.am 2005-09-10 04:17:20.000000000 -0400 192 +++ kdeedu-3.5.3-new/kig/kig/Makefile.am 2006-05-25 00:23:08.000000000 -0400 192 193 @@ -19,12 +19,14 @@ 193 194 ######################################################################### 194 195 # this is the program that gets installed. it's name is used for all … … 208 209 209 210 # this is where the desktop file will go 210 211 xdg_apps_DATA = kig.desktop 211 --- kdeedu-3.5. 0/kig/kig/main.cpp 2005-10-10 10:55:35.000000000 -0400212 +++ kdeedu-3.5. 0-new/kig/kig/main.cpp 2005-11-18 07:58:58.000000000 -0500212 --- kdeedu-3.5.3/kig/kig/main.cpp 2005-10-10 10:55:35.000000000 -0400 213 +++ kdeedu-3.5.3-new/kig/kig/main.cpp 2006-05-25 00:23:08.000000000 -0400 213 214 @@ -101,7 +101,7 @@ 214 215 return (*converterfunction)( file, outfile ); 215 216 } … … 219 220 { 220 221 KAboutData *about = kigAboutData( "kig", I18N_NOOP("Kig") ); 221 222 222 --- kdeedu-3.5. 0/kiten/Makefile.am 2005-09-10 04:17:15.000000000 -0400223 +++ kdeedu-3.5. 0-new/kiten/Makefile.am 2005-11-18 07:58:58.000000000 -0500223 --- kdeedu-3.5.3/kiten/Makefile.am 2005-09-10 04:17:15.000000000 -0400 224 +++ kdeedu-3.5.3-new/kiten/Makefile.am 2006-05-25 00:23:08.000000000 -0400 224 225 @@ -2,15 +2,16 @@ 225 226 226 227 SUBDIRS = pics … … 242 243 243 244 libkiten_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) -no-undefined -version-info 1:0:0 244 245 libkiten_la_LIBADD = $(LIB_KDEUI) $(LIB_KDEPRINT) 245 --- kdeedu-3.5. 0/kiten/main.cpp 2005-10-10 10:55:32.000000000 -0400246 +++ kdeedu-3.5. 0-new/kiten/main.cpp 2005-11-18 07:58:58.000000000 -0500246 --- kdeedu-3.5.3/kiten/main.cpp 2005-10-10 10:55:32.000000000 -0400 247 +++ kdeedu-3.5.3-new/kiten/main.cpp 2006-05-25 00:23:08.000000000 -0400 247 248 @@ -37,7 +37,7 @@ 248 249 // INSERT YOUR COMMANDLINE OPTIONS HERE 249 250 }; … … 253 254 { 254 255 qInstallMsgHandler(noMessageOutput); 255 256 KAboutData aboutData( "kiten", I18N_NOOP("Kiten"), 256 --- kdeedu-3.5. 0/klatin/klatin/Makefile.am 2005-09-10 04:17:24.000000000 -0400257 +++ kdeedu-3.5. 0-new/klatin/klatin/Makefile.am 2005-11-18 07:58:58.000000000 -0500257 --- kdeedu-3.5.3/klatin/klatin/Makefile.am 2005-09-10 04:17:24.000000000 -0400 258 +++ kdeedu-3.5.3-new/klatin/klatin/Makefile.am 2006-05-25 00:23:08.000000000 -0400 258 259 @@ -6,19 +6,21 @@ 259 260 260 261 # this is the program that gets installed. it's name is used for all … … 281 282 klatinchoose.ui settings.kcfgc klatingrammarwidget.ui klatinvocabwidget.ui klatinverbswidget.ui \ 282 283 klatinresultsdialog.ui klatinsettings_vocabpage.ui 283 284 284 --- kdeedu-3.5. 0/klatin/klatin/main.cpp 2005-09-10 04:17:24.000000000 -0400285 +++ kdeedu-3.5. 0-new/klatin/klatin/main.cpp 2005-11-18 07:58:58.000000000 -0500285 --- kdeedu-3.5.3/klatin/klatin/main.cpp 2005-09-10 04:17:24.000000000 -0400 286 +++ kdeedu-3.5.3-new/klatin/klatin/main.cpp 2006-05-25 00:23:08.000000000 -0400 286 287 @@ -29,7 +29,7 @@ 287 288 KCmdLineLastOption 288 289 }; … … 292 293 { 293 294 294 295 KAboutData aboutData( "klatin", I18N_NOOP("KLatin"), 295 --- kdeedu-3.5. 0/klettres/klettres/Makefile.am 2005-09-10 04:16:56.000000000 -0400296 +++ kdeedu-3.5. 0-new/klettres/klettres/Makefile.am 2005-11-18 08:03:30.000000000 -0500296 --- kdeedu-3.5.3/klettres/klettres/Makefile.am 2005-09-10 04:16:56.000000000 -0400 297 +++ kdeedu-3.5.3-new/klettres/klettres/Makefile.am 2006-05-25 00:23:08.000000000 -0400 297 298 @@ -1,10 +1,13 @@ 298 299 ####### kdevelop will overwrite this part!!! (begin)########## 299 300 -bin_PROGRAMS = klettres … … 320 321 321 322 messages: rc.cpp 322 323 $(XGETTEXT) *.cpp -o $(podir)/klettres.pot; 323 --- kdeedu-3.5. 0/klettres/klettres/main.cpp 2005-10-10 10:55:20.000000000 -0400324 +++ kdeedu-3.5. 0-new/klettres/klettres/main.cpp 2005-11-18 07:58:58.000000000 -0500324 --- kdeedu-3.5.3/klettres/klettres/main.cpp 2006-03-17 05:10:09.000000000 -0500 325 +++ kdeedu-3.5.3-new/klettres/klettres/main.cpp 2006-05-25 00:23:08.000000000 -0400 325 326 @@ -43,7 +43,7 @@ 326 327 KCmdLineLastOption 327 328 }; … … 330 331 +extern "C" KDE_EXPORT int kdemain(int argc, char **argv) 331 332 { 332 333 KAboutData about("klettres", I18N_NOOP("KLettres"), KLETTRES_VERSION, description, 333 KAboutData::License_GPL, "(C) 2001-200 5Anne-Marie Mahfouf",0, "http://edu.kde.org/klettres", "submit@bugs.kde.org");334 --- kdeedu-3.5. 0/kmplot/kmplot/Makefile.am 2005-09-10 04:17:09.000000000 -0400335 +++ kdeedu-3.5. 0-new/kmplot/kmplot/Makefile.am 2005-11-18 07:59:04.000000000 -0500334 KAboutData::License_GPL, "(C) 2001-2006 Anne-Marie Mahfouf",0, "http://edu.kde.org/klettres", "submit@bugs.kde.org"); 335 --- kdeedu-3.5.3/kmplot/kmplot/Makefile.am 2005-09-10 04:17:09.000000000 -0400 336 +++ kdeedu-3.5.3-new/kmplot/kmplot/Makefile.am 2006-05-25 00:23:08.000000000 -0400 336 337 @@ -21,12 +21,14 @@ 337 338 ######################################################################### 338 339 # this is the program that gets installed. it's name is used for all … … 352 353 353 354 # this is where the desktop file will go 354 355 appmimedir = $(kde_mimedir)/application 355 --- kdeedu-3.5. 0/kmplot/kmplot/main.cpp 2005-10-10 10:55:30.000000000 -0400356 +++ kdeedu-3.5. 0-new/kmplot/kmplot/main.cpp 2005-11-18 07:59:04.000000000 -0500356 --- kdeedu-3.5.3/kmplot/kmplot/main.cpp 2005-10-10 10:55:30.000000000 -0400 357 +++ kdeedu-3.5.3-new/kmplot/kmplot/main.cpp 2006-05-25 00:23:08.000000000 -0400 357 358 @@ -50,7 +50,7 @@ 358 359 }; 359 360 … … 363 364 { 364 365 KAboutData aboutData( 365 366 "kmplot", 366 --- kdeedu-3.5. 0/kpercentage/kpercentage/Makefile.am 2005-09-10 04:16:51.000000000 -0400367 +++ kdeedu-3.5. 0-new/kpercentage/kpercentage/Makefile.am 2005-11-18 07:59:04.000000000 -0500367 --- kdeedu-3.5.3/kpercentage/kpercentage/Makefile.am 2005-09-10 04:16:51.000000000 -0400 368 +++ kdeedu-3.5.3-new/kpercentage/kpercentage/Makefile.am 2006-05-25 00:23:08.000000000 -0400 368 369 @@ -1,6 +1,10 @@ 369 370 -bin_PROGRAMS = kpercentage 370 371 -kpercentage_SOURCES = kanimation.cpp kanswer.cpp kpercentmain.cpp kpercentage.cpp ksplashscreen.cpp main.cpp … … 388 389 389 390 390 391 stringstocpp: 391 --- kdeedu-3.5. 0/kpercentage/kpercentage/main.cpp 2005-09-10 04:16:51.000000000 -0400392 +++ kdeedu-3.5. 0-new/kpercentage/kpercentage/main.cpp 2005-11-18 07:59:04.000000000 -0500392 --- kdeedu-3.5.3/kpercentage/kpercentage/main.cpp 2005-09-10 04:16:51.000000000 -0400 393 +++ kdeedu-3.5.3-new/kpercentage/kpercentage/main.cpp 2006-05-25 00:23:08.000000000 -0400 393 394 @@ -34,7 +34,7 @@ 394 395 KCmdLineLastOption 395 396 }; … … 399 400 { 400 401 KAboutData aboutData 401 402 ( 402 --- kdeedu-3.5. 0/kstars/kstars/Makefile.am 2005-09-10 04:17:55.000000000 -0400403 +++ kdeedu-3.5. 0-new/kstars/kstars/Makefile.am 2005-11-18 08:04:21.000000000 -0500403 --- kdeedu-3.5.3/kstars/kstars/Makefile.am 2005-09-10 04:17:55.000000000 -0400 404 +++ kdeedu-3.5.3-new/kstars/kstars/Makefile.am 2006-05-25 00:23:08.000000000 -0400 404 405 @@ -1,6 +1,8 @@ 405 406 -bin_PROGRAMS = kstars 406 407 +bin_PROGRAMS = … … 437 438 438 439 # Uncomment the following two lines if you add a ui.rc file for your application to make use of 439 440 # KDE 440 --- kdeedu-3.5.0/kstars/kstars/indi/fli_ccd.c 2005-10-10 10:55:39.000000000 -0400 441 +++ kdeedu-3.5.0-new/kstars/kstars/indi/fli_ccd.c 2005-11-18 07:59:04.000000000 -0500 441 --- kdeedu-3.5.3/kstars/kstars/indi/apmount.cpp 2005-10-10 10:55:39.000000000 -0400 442 +++ kdeedu-3.5.3-new/kstars/kstars/indi/apmount.cpp 2006-05-25 00:23:08.000000000 -0400 443 @@ -39,8 +39,9 @@ 444 */ 445 446 447 -#if !(TIMEZONE_IS_INT) 448 -static int daylight = 0; 449 +/* FIXME: hack!, make a real test for extern int daylight on darwin */ 450 +#if !(TIMEZONE_IS_INT) || defined(__APPLE__) 451 +int daylight = 0; 452 #endif 453 454 static inline double timezoneOffset() 455 --- kdeedu-3.5.3/kstars/kstars/indi/fli_ccd.c 2005-10-10 10:55:39.000000000 -0400 456 +++ kdeedu-3.5.3-new/kstars/kstars/indi/fli_ccd.c 2006-05-25 00:23:08.000000000 -0400 442 457 @@ -19,6 +19,7 @@ 443 458 444 459 #endif … … 447 462 #include <stdio.h> 448 463 #include <stdlib.h> 449 464 #include <string.h> 450 --- kdeedu-3.5. 0/kstars/kstars/indi/lx200generic.cpp 2005-10-10 10:55:39.000000000 -0400451 +++ kdeedu-3.5. 0-new/kstars/kstars/indi/lx200generic.cpp 2005-11-18 07:59:04.000000000 -0500465 --- kdeedu-3.5.3/kstars/kstars/indi/lx200generic.cpp 2005-10-10 10:55:39.000000000 -0400 466 +++ kdeedu-3.5.3-new/kstars/kstars/indi/lx200generic.cpp 2006-05-25 00:23:08.000000000 -0400 452 467 @@ -41,7 +41,7 @@ 453 468 454 469 … … 458 473 #endif 459 474 460 475 static inline double timezoneOffset() 461 --- kdeedu-3.5.0/kstars/kstars/main.cpp 2005-11-08 17:24:02.000000000 -0500 462 +++ kdeedu-3.5.0-new/kstars/kstars/main.cpp 2005-11-18 07:59:04.000000000 -0500 476 --- kdeedu-3.5.3/kstars/kstars/indi/webcam/Makefile.am 2005-09-10 04:17:35.000000000 -0400 477 +++ kdeedu-3.5.3-new/kstars/kstars/indi/webcam/Makefile.am 2006-05-25 00:23:08.000000000 -0400 478 @@ -1,7 +1,7 @@ 479 if HAVE_V4L2 480 libwebcam_linux = libwebcam_v4l2_linux.la 481 else 482 - libwebcam_linux = libwebcam_v4l1_linux.la 483 + libwebcam_linux = 484 endif 485 486 noinst_LTLIBRARIES = libwebcam.la $(libwebcam_linux) 487 --- kdeedu-3.5.3/kstars/kstars/main.cpp 2005-11-19 05:33:39.000000000 -0500 488 +++ kdeedu-3.5.3-new/kstars/kstars/main.cpp 2006-05-25 00:23:08.000000000 -0400 463 489 @@ -49,7 +49,7 @@ 464 490 KCmdLineLastOption 465 491 }; … … 469 495 { 470 496 KAboutData aboutData( "kstars", I18N_NOOP("KStars"), 471 497 KSTARS_VERSION, description, KAboutData::License_GPL, 472 --- kdeedu-3.5. 0/ktouch/src/Makefile.am 2005-09-10 04:17:27.000000000 -0400473 +++ kdeedu-3.5. 0-new/ktouch/src/Makefile.am 2005-11-18 08:05:16.000000000 -0500474 @@ - 42,7 +42,7 @@475 ktouchutils.h498 --- kdeedu-3.5.3/ktouch/src/Makefile.am 2006-05-22 14:03:38.000000000 -0400 499 +++ kdeedu-3.5.3-new/ktouch/src/Makefile.am 2006-05-25 00:23:58.000000000 -0400 500 @@ -26,7 +26,7 @@ 501 ktouchstatistics.h ktouchstatus.h ktouchtrainer.h ktouchutils.h ktouchcoloreditor.h 476 502 477 503 # let automoc handle all of the meta source files (moc) 478 504 -ktouch_METASOURCES = AUTO … … 480 506 481 507 messages: rc.cpp 482 508 $(XGETTEXT) *.cpp -o $(podir)/ktouch.pot 483 @@ - 53,10 +53,12 @@509 @@ -37,10 +37,12 @@ 484 510 ######################################################################### 485 511 # this is the program that gets installed. it's name is used for all 486 512 # of the other Makefile.am variables … … 490 516 +kdeinit_LTLIBRARIES = ktouch.la 491 517 492 518 # the application source, library search path, and link libraries 493 -ktouch_SOURCES = \494 +ktouch_la_SOURCES = \495 ktouchc hartwidget.cpp \496 ktouch colorscheme.cpp \497 ktouch .cpp\498 @@ - 90,11 +92,11 @@499 prefs.kcfgc519 -ktouch_SOURCES = ktouchchartwidget.cpp ktouchcoloreditor_dlg.ui \ 520 +ktouch_la_SOURCES = ktouchchartwidget.cpp ktouchcoloreditor_dlg.ui \ 521 ktouchcolorscheme.cpp ktouch.cpp ktouchdefaults.cpp ktouchkeyboardwidget.cpp \ 522 ktouchkeyconnector.cpp ktouchkey.cpp ktouchkeys.cpp ktouchlecture.cpp ktouchlectureeditor.cpp \ 523 ktouchlectureeditor_dlg.ui ktouchleveldata.cpp ktouchopenrequest.cpp ktouchopenrequest_dlg.ui \ 524 @@ -50,11 +52,11 @@ 525 ktouchutils.cpp main.cpp prefs.kcfgc ktouchcoloreditor.cpp 500 526 501 527 # the library search path. 502 528 -ktouch_LDFLAGS = $(KDE_RPATH) $(all_libraries) … … 509 535 510 536 rcdir = $(kde_datadir)/ktouch 511 537 rc_DATA = ktouchui.rc 512 --- kdeedu-3.5. 0/ktouch/src/main.cpp 2005-09-10 04:17:27.000000000 -0400513 +++ kdeedu-3.5. 0-new/ktouch/src/main.cpp 2005-11-18 07:59:04.000000000 -0500538 --- kdeedu-3.5.3/ktouch/src/main.cpp 2006-05-22 14:03:38.000000000 -0400 539 +++ kdeedu-3.5.3-new/ktouch/src/main.cpp 2006-05-25 00:23:08.000000000 -0400 514 540 @@ -26,7 +26,7 @@ 515 541 KCmdLineLastOption 516 542 }; … … 520 546 { 521 547 KAboutData about("ktouch", 522 548 I18N_NOOP("KTouch"), 523 --- kdeedu-3.5. 0/kturtle/src/Makefile.am 2005-09-10 04:16:51.000000000 -0400524 +++ kdeedu-3.5. 0-new/kturtle/src/Makefile.am 2005-11-18 07:59:04.000000000 -0500549 --- kdeedu-3.5.3/kturtle/src/Makefile.am 2005-09-10 04:16:51.000000000 -0400 550 +++ kdeedu-3.5.3-new/kturtle/src/Makefile.am 2006-05-25 00:23:08.000000000 -0400 525 551 @@ -6,20 +6,22 @@ 526 552 # added from kjots 527 553 AM_LDFLAGS = $(all_libraries) $(KDE_RPATH) … … 550 576 551 577 # these are the headers for your project 552 578 noinst_HEADERS = kturtle.h canvas.h dialogs.cpp value.h lexer.h parser.h executer.h treenode.h token.h translate.h 553 --- kdeedu-3.5. 0/kturtle/src/main.cpp 2005-10-10 10:55:19.000000000 -0400554 +++ kdeedu-3.5. 0-new/kturtle/src/main.cpp 2005-11-18 07:59:05.000000000 -0500579 --- kdeedu-3.5.3/kturtle/src/main.cpp 2005-10-10 10:55:19.000000000 -0400 580 +++ kdeedu-3.5.3-new/kturtle/src/main.cpp 2006-05-25 00:23:08.000000000 -0400 555 581 @@ -43,7 +43,7 @@ 556 582 }; 557 583 … … 561 587 { 562 588 KAboutData about("kturtle", I18N_NOOP("KTurtle"), version, description, KAboutData::License_GPL, copyright, 0, website); 563 589 about.addAuthor("Cies Breijs", 564 --- kdeedu-3.5. 0/kverbos/kverbos/Makefile.am 2005-09-10 04:17:22.000000000 -0400565 +++ kdeedu-3.5. 0-new/kverbos/kverbos/Makefile.am 2005-11-18 07:59:05.000000000 -0500590 --- kdeedu-3.5.3/kverbos/kverbos/Makefile.am 2005-09-10 04:17:22.000000000 -0400 591 +++ kdeedu-3.5.3-new/kverbos/kverbos/Makefile.am 2006-05-25 00:23:08.000000000 -0400 566 592 @@ -1,8 +1,11 @@ 567 593 SUBDIRS = icons data 568 594 … … 587 613 588 614 rcdir = $(kde_datadir)/kverbos 589 615 rc_DATA = kverbosui.rc 590 --- kdeedu-3.5. 0/kverbos/kverbos/main.cpp 2005-09-10 04:17:22.000000000 -0400591 +++ kdeedu-3.5. 0-new/kverbos/kverbos/main.cpp 2005-11-18 07:59:05.000000000 -0500616 --- kdeedu-3.5.3/kverbos/kverbos/main.cpp 2005-09-10 04:17:22.000000000 -0400 617 +++ kdeedu-3.5.3-new/kverbos/kverbos/main.cpp 2006-05-25 00:23:08.000000000 -0400 592 618 @@ -32,7 +32,7 @@ 593 619 594 620 … … 598 624 { 599 625 600 626 KAboutData aboutData( "kverbos", I18N_NOOP("KVerbos"), 601 --- kdeedu-3.5. 0/kwordquiz/src/Makefile.am 2005-09-10 04:16:57.000000000 -0400602 +++ kdeedu-3.5. 0-new/kwordquiz/src/Makefile.am 2005-11-18 08:05:43.000000000 -0500627 --- kdeedu-3.5.3/kwordquiz/src/Makefile.am 2005-09-10 04:16:57.000000000 -0400 628 +++ kdeedu-3.5.3-new/kwordquiz/src/Makefile.am 2006-05-25 00:23:08.000000000 -0400 603 629 @@ -1,9 +1,11 @@ 604 630 ####### kdevelop will overwrite this part!!! (begin)########## 605 631 -bin_PROGRAMS = kwordquiz … … 632 658 633 659 rcdir = $(kde_datadir)/kwordquiz 634 660 rc_DATA = kwordquizui.rc eventsrc 635 --- kdeedu-3.5. 0/kwordquiz/src/main.cpp 2005-10-10 10:55:21.000000000 -0400636 +++ kdeedu-3.5. 0-new/kwordquiz/src/main.cpp 2005-11-18 07:59:05.000000000 -0500661 --- kdeedu-3.5.3/kwordquiz/src/main.cpp 2005-10-10 10:55:21.000000000 -0400 662 +++ kdeedu-3.5.3-new/kwordquiz/src/main.cpp 2006-05-25 00:23:08.000000000 -0400 637 663 @@ -33,7 +33,7 @@ 638 664 { 0, 0, 0 } 639 665 }; … … 643 669 { 644 670 KAboutData aboutData("kwordquiz", 645 671 I18N_NOOP("KWordQuiz"), 646 --- kdeedu-3.5.0/kstars/kstars/indi/webcam/Makefile.am 2005-09-10 04:17:35.000000000 -0400647 +++ kdeedu-3.5.0-new/kstars/kstars/indi/webcam/Makefile.am 2005-11-18 15:07:17.000000000 -0500648 @@ -1,7 +1,7 @@649 if HAVE_V4L2650 libwebcam_linux = libwebcam_v4l2_linux.la651 else652 - libwebcam_linux = libwebcam_v4l1_linux.la653 + libwebcam_linux =654 endif655 656 noinst_LTLIBRARIES = libwebcam.la $(libwebcam_linux)657 --- kdeedu-3.5.1/kstars/kstars/indi/apmount.cpp 2005-10-10 10:55:39.000000000 -0400658 +++ kdeedu-3.5.1-new/kstars/kstars/indi/apmount.cpp 2006-02-01 21:27:56.000000000 -0500659 @@ -39,8 +39,9 @@660 */661 662 663 -#if !(TIMEZONE_IS_INT)664 -static int daylight = 0;665 +/* FIXME: hack!, make a real test for extern int daylight on darwin */666 +#if !(TIMEZONE_IS_INT) || defined(__APPLE__)667 +int daylight = 0;668 #endif669 -
kdeedu3/files/InstallScript.sh
1 1 #!/bin/sh -e 2 2 3 export PREFIX="%p" 3 export PREFIX="%p" USE_UNSERMAKE=1 4 4 . ./environment-helper.sh 5 5 6 #darwinports 7 export UNSERMAKE="no" 6 ./build-helper.sh install %N %v %r unsermake -p -j1 install DESTDIR=%d 8 7 9 ./build-helper.sh install %N %v %r make -j1 install DESTDIR=%d10 11 8 mkdir -p %i/share/doc/installed-packages 12 9 touch %i/share/doc/installed-packages/%N 13 10 touch %i/share/doc/installed-packages/%N-base -
kdeedu3/files/CompileScript.sh
1 1 #!/bin/sh -e 2 2 3 export HOME=/tmp 4 export PREFIX="%p" 3 export PREFIX="%p" USE_UNSERMAKE=1 5 4 . ./environment-helper.sh 6 5 export LDFLAGS="-L%p/lib/python2.4/config" 7 export lt_cv_sys_max_cmd_len=655368 6 9 #darwinports10 export UNSERMAKE="no"11 12 export CC=gcc CXX=g++13 14 7 ./build-helper.sh cvs %N %v %r make -f admin/Makefile.common cvs 15 8 ./build-helper.sh configure %N %v %r ./configure %c $CONFIGURE_PARAMS 16 ./build-helper.sh make %N %v %r make all all_libraries="$ALL_LIBRARIES"9 ./build-helper.sh make %N %v %r unsermake $UNSERMAKEFLAGS kvoctrain/kvoctrain/common-dialogs/prefs.h all -
kdeedu3/Portfile
1 1 # $Id$ 2 2 3 #Synced with Fink, Version 3.5. 1-10233 #Synced with Fink, Version 3.5.4-1021 4 4 5 5 PortSystem 1.0 6 6 name kdeedu3 7 version 3.5.1 8 revision 1 9 set kdeadmin kde-admindir-3.5.1 7 version 3.5.4 8 set kdeadmin kde-admindir-252 10 9 categories kde 11 10 maintainers ben@macports.org takanori@macports.org 12 11 description KDE educational games and software. \ 13 12 NB No KDE sound support. 14 13 platforms darwin 15 master_sites opendarwin::kde35 1\14 master_sites opendarwin::kde354 \ 16 15 opendarwin::admin 17 16 # kde:stable/${version}/src 18 17 # http://ranger.befunk.com/fink/:admin 19 extract.suffix .tar.bz220 18 use_bzip2 yes 21 19 distname kdeedu-${version} 22 distfiles ${distname}.tar.bz2:kde35 1\20 distfiles ${distname}.tar.bz2:kde354 \ 23 21 ${kdeadmin}.tar.bz2:admin 24 22 depends_build port:autoconf \ 25 port: automake23 port:unsermake 26 24 depends_lib port:kdebase3 27 25 28 checksums ${distname}.tar.bz2 md5 fe31b9a2ec4e299531c6b7beeab09534\29 ${kdeadmin}.tar.bz2 md5 b6115a7310f8e8533af91be02e225d0e26 checksums ${distname}.tar.bz2 md5 81dfdea2ed6eaaa440ee868a69b8fc7e \ 27 ${kdeadmin}.tar.bz2 md5 54a89925e71bd32f759c81b312ad0b9e 30 28 31 extract.only 32 post-extract 29 extract.only ${distname}.tar.bz2 30 post-extract { system "cd ${worksrcpath} && bzcat -dc ${distpath}/${kdeadmin}.tar.bz2 | tar xf -" } 33 31 34 32 patchfiles kdeedu3.patch 35 33 patch { 36 34 cd ${worksrcpath} 37 35 foreach file $patchfiles { 38 system "sed -e 's,@FINKPREFIX@,${prefix},g' ${ portpath}/${filesdir}/${file} | patch -p1"36 system "sed -e 's,@FINKPREFIX@,${prefix},g' ${filespath}/${file} | patch -p1" 39 37 } 38 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/*" 40 39 } 41 post-patch { 42 reinplace "s|lib/freetype219/||g" ${worksrcpath}/environment-helper.sh 43 reinplace "s|include/qt|include/qt3|g" ${worksrcpath}/environment-helper.sh 40 post-patch { 41 reinplace "s|/lib/freetype219||g" ${worksrcpath}/environment-helper.sh 44 42 reinplace "s|--with-ssl-dir=/usr|--with-ssl-dir=\$PREFIX|g" ${worksrcpath}/environment-helper.sh 45 reinplace "s|2.5\\*|2.\[56\]\\*|g" ${worksrcpath}/admin/cvs.sh46 foreach file [glob ${worksrcpath}/admin/*] {47 reinplace "s|-O2|-Os|g" $file48 reinplace "s|doc/HTML|doc/kde|g" $file49 reinplace "s|/usr/share/doc/packages/qt3/html|${prefix}/share/doc/qt3/html|g" $file50 }51 43 foreach file {CompileScript.sh InstallScript.sh} { 52 file copy ${ portpath}/${filesdir}/${file} ${worksrcpath}44 file copy ${filespath}/${file} ${worksrcpath} 53 45 reinplace "s|%p|${prefix}|g" ${worksrcpath}/${file} 54 46 reinplace "s|%N|${name}|g" ${worksrcpath}/${file} 55 47 reinplace "s|%v|${version}|g" ${worksrcpath}/${file} … … 61 53 } 62 54 } 63 55 64 configure.args --disable-kig-python-scripting --with-distribution=' DarwinPorts/Mac OS X' --without-arts56 configure.args --disable-kig-python-scripting --with-distribution='MacPorts/Mac OS X' --without-arts 65 57 66 58 configure {} 67 59 build { system "cd ${worksrcpath} && ./CompileScript.sh" } 68 60 destroot { system "cd ${worksrcpath} && ./InstallScript.sh" } 69 61 70 post-destroot 62 post-destroot { 71 63 xinstall -m 755 -d ${destroot}${prefix}/share/doc/${name} 72 64 xinstall -m 644 -W ${worksrcpath} COPYING INSTALL README ${destroot}${prefix}/share/doc/${name} 73 65 } 74 75 platform darwin 6 {76 depends_lib-append lib:libdl:dlcompat77 } -
kdegames3/files/InstallScript.sh
1 1 #!/bin/sh -e 2 2 3 export PREFIX="%p" 3 export PREFIX="%p" USE_UNSERMAKE=1 4 4 . ./environment-helper.sh 5 5 6 #unsermake 7 export UNSERMAKE="no" 6 ./build-helper.sh install %N %v %r unsermake -p -j1 install DESTDIR=%d 8 7 9 ./build-helper.sh install %N %v %r make -j1 install DESTDIR=%d10 11 8 mkdir -p %i/share/doc/installed-packages 12 9 touch %i/share/doc/installed-packages/%N 13 10 touch %i/share/doc/installed-packages/%N-base -
kdegames3/files/CompileScript.sh
1 1 #!/bin/sh -e 2 2 3 3 export HOME=/tmp 4 export PREFIX="%p" 4 export PREFIX="%p" USE_UNSERMAKE=1 5 5 . ./environment-helper.sh 6 export lt_cv_sys_max_cmd_len=655367 6 8 #darwinports9 export UNSERMAKE="no"10 11 export CC=gcc CXX=g++12 13 7 ./build-helper.sh cvs %N %v %r make -f admin/Makefile.common cvs 14 8 ./build-helper.sh configure %N %v %r ./configure %c $CONFIGURE_PARAMS 15 ./build-helper.sh make %N %v %r make all all_libraries="$ALL_LIBRARIES"9 ./build-helper.sh make %N %v %r unsermake $UNSERMAKEFLAGS -
kdegames3/Portfile
1 1 # $Id$ 2 2 3 #Synced with Fink, Version 3.5. 1-10233 #Synced with Fink, Version 3.5.4-1021 4 4 5 5 PortSystem 1.0 6 6 name kdegames3 7 version 3.5.1 8 revision 1 9 set kdeadmin kde-admindir-3.5.1 7 version 3.5.4 8 set kdeadmin kde-admindir-252 10 9 categories kde 11 10 maintainers ben@macports.org takanori@macports.org 12 11 description KDE games. \ 13 12 NB No KDE sound support. 14 13 platforms darwin 15 master_sites opendarwin::kde35 1\14 master_sites opendarwin::kde354 \ 16 15 opendarwin::admin 17 16 # kde:stable/${version}/src 18 17 # http://ranger.befunk.com/fink/:admin 19 extract.suffix .tar.bz220 18 use_bzip2 yes 21 19 distname kdegames-${version} 22 distfiles ${distname}.tar.bz2:kde35 1\20 distfiles ${distname}.tar.bz2:kde354 \ 23 21 ${kdeadmin}.tar.bz2:admin 24 22 depends_build port:autoconf \ 25 port: automake23 port:unsermake 26 24 depends_lib port:kdebase3 25 # port:libcapsinetwork 26 # port:libmath++ 27 27 28 checksums ${distname}.tar.bz2 md5 15a4bb4e193e19be7decd4f147a31396\29 ${kdeadmin}.tar.bz2 md5 b6115a7310f8e8533af91be02e225d0e28 checksums ${distname}.tar.bz2 md5 60bb42c51c2e86a826188da457ed21d0 \ 29 ${kdeadmin}.tar.bz2 md5 54a89925e71bd32f759c81b312ad0b9e 30 30 31 extract.only 32 post-extract 31 extract.only ${distname}.tar.bz2 32 post-extract { system "cd ${worksrcpath} && bzcat -dc ${distpath}/${kdeadmin}.tar.bz2 | tar xf -" } 33 33 34 34 patchfiles 35 35 patch { 36 36 cd ${worksrcpath} 37 37 foreach file $patchfiles { 38 system "sed -e 's,@FINKPREFIX@,${prefix},g' ${ portpath}/${filesdir}/${file} | patch -p1"38 system "sed -e 's,@FINKPREFIX@,${prefix},g' ${filespath}/${file} | patch -p1" 39 39 } 40 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/*" 40 41 } 41 post-patch { 42 reinplace "s|lib/freetype219/||g" ${worksrcpath}/environment-helper.sh 43 reinplace "s|include/qt|include/qt3|g" ${worksrcpath}/environment-helper.sh 42 post-patch { 43 reinplace "s|/lib/freetype219||g" ${worksrcpath}/environment-helper.sh 44 44 reinplace "s|--with-ssl-dir=/usr|--with-ssl-dir=\$PREFIX|g" ${worksrcpath}/environment-helper.sh 45 reinplace "s|2.5\\*|2.\[56\]\\*|g" ${worksrcpath}/admin/cvs.sh46 foreach file [glob ${worksrcpath}/admin/*] {47 reinplace "s|-O2|-Os|g" $file48 reinplace "s|doc/HTML|doc/kde|g" $file49 reinplace "s|/usr/share/doc/packages/qt3/html|${prefix}/share/doc/qt3/html|g" $file50 }51 45 foreach file {CompileScript.sh InstallScript.sh} { 52 file copy ${ portpath}/${filesdir}/${file} ${worksrcpath}46 file copy ${filespath}/${file} ${worksrcpath} 53 47 reinplace "s|%p|${prefix}|g" ${worksrcpath}/${file} 54 48 reinplace "s|%N|${name}|g" ${worksrcpath}/${file} 55 49 reinplace "s|%v|${version}|g" ${worksrcpath}/${file} … … 61 55 } 62 56 } 63 57 64 configure.args --with-distribution=' DarwinPorts/Mac OS X' --without-arts58 configure.args --with-distribution='MacPorts/Mac OS X' --without-arts 65 59 66 60 configure {} 67 61 build { system "cd ${worksrcpath} && ./CompileScript.sh" } 68 62 destroot { system "cd ${worksrcpath} && ./InstallScript.sh" } 69 63 70 post-destroot 64 post-destroot { 71 65 xinstall -m 755 -d ${destroot}${prefix}/share/doc/${name} 72 66 xinstall -m 644 -W ${worksrcpath} COPYING INSTALL README ${destroot}${prefix}/share/doc/${name} 73 67 } 74 75 platform darwin 6 {76 depends_lib-append lib:libdl:dlcompat77 }