[Midnightbsd-cvs] mports: x11/kdelibs3: Update to 3.5.8
laffer1 at midnightbsd.org
laffer1 at midnightbsd.org
Sat Dec 29 17:09:17 EST 2007
Log Message:
-----------
Update to 3.5.8
Modified Files:
--------------
mports/x11/kdelibs3:
Makefile (r1.4 -> r1.5)
distinfo (r1.1 -> r1.2)
pkg-descr (r1.1 -> r1.2)
pkg-plist (r1.1 -> r1.2)
Added Files:
-----------
mports/x11/kdelibs3/files:
patch-CVE-2006-4811 (r1.1)
patch-kdecore-kstartupinfo.cpp (r1.1)
patch-kdeprint_cups_cupsdconf2 (r1.1)
patch-kdeui-kactionclasses.cpp (r1.1)
patch-kinit-start_kdeinit_wrapper.c (r1.1)
patch-kioslave_http-http.cc (r1.1)
Removed Files:
-------------
mports/x11/kdelibs3/files:
kdelibs.sh
patch-configure
patch-cups-1.2.x-sockets
patch-kcmshell-Makefile.in
patch-kdeprint_cups_kmcupsmanager.cpp
patch-mimetypes_application-Makefile.in
-------------- next part --------------
Index: pkg-descr
===================================================================
RCS file: /home/cvs/mports/x11/kdelibs3/pkg-descr,v
retrieving revision 1.1
retrieving revision 1.2
diff -L x11/kdelibs3/pkg-descr -L x11/kdelibs3/pkg-descr -u -r1.1 -r1.2
--- x11/kdelibs3/pkg-descr
+++ x11/kdelibs3/pkg-descr
@@ -1,5 +1,3 @@
This is the base set of libraries needed by KDE programs.
WWW: http://www.kde.org/
-
---AlanE <kde at freebsd.org>
Index: pkg-plist
===================================================================
RCS file: /home/cvs/mports/x11/kdelibs3/pkg-plist,v
retrieving revision 1.1
retrieving revision 1.2
diff -L x11/kdelibs3/pkg-plist -L x11/kdelibs3/pkg-plist -u -r1.1 -r1.2
--- x11/kdelibs3/pkg-plist
+++ x11/kdelibs3/pkg-plist
@@ -59,7 +59,8 @@
bin/makekdewidgets
bin/meinproc
bin/preparetips
-etc/rc.d/kdelibs.sh
+bin/start_kdeinit
+bin/start_kdeinit_wrapper
etc/xdg/menus/kde-applications.menu
include/arts/artskde.h
include/arts/kartsdispatcher.h
@@ -144,7 +145,6 @@
include/kabc/resourcedir.h
include/kabc/resourcefile.h
include/kabc/resourceldapkio.h
-include/kabc/resourcenet.h
include/kabc/resourceselectdialog.h
include/kabc/secrecy.h
include/kabc/sortmode.h
@@ -642,6 +642,7 @@
include/kstringvalidator.h
include/kstyle.h
include/ksvgiconengine.h
+include/kswitchlanguagedialog.h
include/ksycoca.h
include/ksycocaentry.h
include/ksycocatype.h
@@ -771,9 +772,6 @@
lib/kde3/kabc_ldapkio.a
lib/kde3/kabc_ldapkio.la
lib/kde3/kabc_ldapkio.so
-lib/kde3/kabc_net.a
-lib/kde3/kabc_net.la
-lib/kde3/kabc_net.so
lib/kde3/kabcformat_binary.a
lib/kde3/kabcformat_binary.la
lib/kde3/kabcformat_binary.so
@@ -1008,10 +1006,6 @@
lib/libkabc_ldapkio.la
lib/libkabc_ldapkio.so
lib/libkabc_ldapkio.so.1
-lib/libkabc_net.a
-lib/libkabc_net.la
-lib/libkabc_net.so
-lib/libkabc_net.so.1
lib/libkatepartinterfaces.a
lib/libkatepartinterfaces.la
lib/libkatepartinterfaces.so
@@ -1203,6 +1197,7 @@
share/apps/katepart/scripts/script-indent-c-newline.js
share/apps/katepart/scripts/sort.js
share/apps/katepart/syntax/abc.xml
+share/apps/katepart/syntax/actionscript.xml
share/apps/katepart/syntax/ada.xml
share/apps/katepart/syntax/ahdl.xml
share/apps/katepart/syntax/alert.xml
@@ -1347,6 +1342,8 @@
share/apps/kdeprint/filters/enscript.xml
share/apps/kdeprint/filters/imagetops.desktop
share/apps/kdeprint/filters/imagetops.xml
+share/apps/kdeprint/filters/pdf2ps.desktop
+share/apps/kdeprint/filters/pdf2ps.xml
share/apps/kdeprint/filters/pdfwrite.desktop
share/apps/kdeprint/filters/pdfwrite.xml
share/apps/kdeprint/filters/poster.desktop
@@ -1645,6 +1642,7 @@
share/apps/ksgmltools2/customization/de/entities/underBSDLicense.docbook
share/apps/ksgmltools2/customization/de/entities/underFDL.docbook
share/apps/ksgmltools2/customization/de/entities/underGPL.docbook
+share/apps/ksgmltools2/customization/de/entities/underLGPL.docbook
share/apps/ksgmltools2/customization/de/entities/underX11License.docbook
share/apps/ksgmltools2/customization/de/entities/update-doc.docbook
share/apps/ksgmltools2/customization/de/lang.entities
@@ -1791,6 +1789,7 @@
share/apps/ksgmltools2/customization/fr/entities/underBSDLicense.docbook
share/apps/ksgmltools2/customization/fr/entities/underFDL.docbook
share/apps/ksgmltools2/customization/fr/entities/underGPL.docbook
+share/apps/ksgmltools2/customization/fr/entities/underLGPL.docbook
share/apps/ksgmltools2/customization/fr/entities/underX11License.docbook
share/apps/ksgmltools2/customization/fr/entities/update-doc.docbook
share/apps/ksgmltools2/customization/fr/lang.entities
@@ -5076,7 +5075,6 @@
share/icons/crystalsvg/scalable/mimetypes/wordprocessing.svgz
share/icons/crystalsvg/scalable/mimetypes/zip.svgz
share/icons/default.kde
-share/icons/hicolor/index.theme
share/locale/all_languages
share/mimelnk/all/all.desktop
share/mimelnk/all/allfiles.desktop
@@ -5255,6 +5253,7 @@
share/mimelnk/application/x-x509-ca-cert.desktop
share/mimelnk/application/x-xliff.desktop
share/mimelnk/application/x-zerosize.desktop
+share/mimelnk/application/x-zip-compressed.desktop
share/mimelnk/application/x-zip.desktop
share/mimelnk/application/x-zoo.desktop
share/mimelnk/application/xhtml+xml.desktop
@@ -5282,6 +5281,7 @@
share/mimelnk/audio/x-ms-wma.desktop
share/mimelnk/audio/x-musepack.desktop
share/mimelnk/audio/x-oggflac.desktop
+share/mimelnk/audio/x-pn-realaudio-plugin.desktop
share/mimelnk/audio/x-pn-realaudio.desktop
share/mimelnk/audio/x-scpls.desktop
share/mimelnk/audio/x-speex.desktop
@@ -5438,7 +5438,6 @@
share/services/kresources/kabc/dir.desktop
share/services/kresources/kabc/file.desktop
share/services/kresources/kabc/ldapkio.desktop
-share/services/kresources/kabc/net.desktop
share/services/kresources/kabc_manager.desktop
share/services/kspell_aspell.desktop
share/services/kspell_ispell.desktop
Index: Makefile
===================================================================
RCS file: /home/cvs/mports/x11/kdelibs3/Makefile,v
retrieving revision 1.4
retrieving revision 1.5
diff -L x11/kdelibs3/Makefile -L x11/kdelibs3/Makefile -u -r1.4 -r1.5
--- x11/kdelibs3/Makefile
+++ x11/kdelibs3/Makefile
@@ -9,8 +9,8 @@
PORTNAME= kdelibs
PORTVERSION= ${KDE_VERSION}
-PORTREVISION= 2
-CATEGORIES= x11 kde
+PORTREVISION= 0
+CATEGORIES= x11 kde ipv6
MASTER_SITES= ${MASTER_SITE_KDE}
MASTER_SITE_SUBDIR= stable/${PORTVERSION:S/.0//}/src
PKGNAMESUFFIX?= # empty
@@ -18,9 +18,11 @@
MAINTAINER= ports at MidnightBSD.org
COMMENT= Base set of libraries needed by KDE programs
+LICENSE= agg
DEPENDS= ${PORTSDIR}/misc/kdehier
-BUILD_DEPENDS= mkfontdir:${X_CLIENTS_PORT}
+BUILD_DEPENDS= mkfontdir:${X_CLIENTS_PORT} \
+ ${LOCALBASE}/share/icons/hicolor/index.theme:${PORTSDIR}/misc/hicolor-icon-theme
LIB_DEPENDS= IlmImf:${PORTSDIR}/graphics/OpenEXR \
art_lgpl_2.5:${PORTSDIR}/graphics/libart_lgpl \
artsc.0:${PORTSDIR}/audio/arts \
@@ -35,7 +37,8 @@
xslt.2:${PORTSDIR}/textproc/libxslt
RUN_DEPENDS= iceauth:${X_CLIENTS_PORT} \
${FONTSCALE}:${X_FONTS_TTF_PORT} \
- ${FONTENCOD}:${X_FONTS_ENCODINGS_PORT}
+ ${FONTENCOD}:${X_FONTS_ENCODINGS_PORT} \
+ ${LOCALBASE}/share/icons/hicolor/index.theme:${PORTSDIR}/misc/hicolor-icon-theme
CONFLICTS+= kdeadmin-3.[0-3].* kdeadmin-3.4.[0-1]* kdeartwork-3.[2-3]* kdebase-3.[0-4]* kdepim-3.2*
.if defined(WITHOUT_CUPS) || defined(KDE_WITHOUT_CUPS)
@@ -56,8 +59,7 @@
USE_QT_VER= 3
PREFIX= ${KDE_PREFIX}
-INSTALLS_SHLIB= yes
-LDCONFIG_DIRS+= %%PREFIX%%/lib %%PREFIX%%/lib/kde3
+USE_LDCONFIG= ${PREFIX}/lib/kde3
USE_AUTOTOOLS= libtool:15
CONFIGURE_TARGET=# empty
@@ -67,6 +69,7 @@
--build=${MACHINE_ARCH}-portbld-freebsd6.0 \
--x-libraries=${X11BASE}/lib --x-includes=${X11BASE}/include \
--with-libthai=yes \
+ --with-lua=no \
--with-ssl-dir=${OPENSSLBASE}
CONFIGURE_ENV+= libltdl_cv_shlibext=".so"
@@ -81,6 +84,9 @@
LIB_DEPENDS+= bz2.1:${PORTSDIR}/archivers/bzip2
.endif # !exists(/usr/bin/bzip2)
+BUILD_DEPENDS+= mkfontdir:${PORTSDIR}/x11-fonts/mkfontdir
+RUN_DEPENDS+= iceauth:${PORTSDIR}/x11/iceauth
+
pre-configure:
${REINPLACE_CMD} "s,%%LOCALBASE%%,${LOCALBASE},g" ${WRKSRC}/kdeprint/cups/kmcupsmanager.cpp
${REINPLACE_CMD} -e "s,ac_cups_share_test=.*,ac_cups_share_test=\`\$$kde_cups_config --datadir\`,g" \
@@ -88,6 +94,14 @@
${REINPLACE_CMD} -e "s,applications.menu,kde-applications.menu,g" \
${WRKSRC}/kded/Makefile.in ${WRKSRC}/kded/kbuildsycoca.cpp
${MV} ${WRKSRC}/kded/applications.menu ${WRKSRC}/kded/kde-applications.menu
+ ${REINPLACE_CMD} -e "s,hicolor,,g" ${WRKSRC}/pics/Makefile.in
+ ${REINPLACE_CMD} -e "s,/etc/exports,/nonexistent,g" \
+ -e "s,/etc/samba/,${LOCALBASE}/etc/,g" \
+ -e "s,/etc/security/,${LOCALBASE}/etc/,g" \
+ -e "s,'fileshare','network',g" \
+ ${WRKSRC}/kio/misc/fileshareset
+ ${REINPLACE_CMD} -e "s,LIB_QT),LIB_QT) $$\(LIBPTHREAD\) $$\(USE_THREADS\),g" \
+ ${WRKSRC}/dcop/dcopidl/Makefile.in ${WRKSRC}/dcop/dcopidl2cpp/Makefile.in
post-configure:
${TOUCH} ${WRKSRC}/dcop/dcop-path.h.in
@@ -101,12 +115,4 @@
${MKDIR} -p ${PREFIX}/share/cups/model
.endif
-
-post-install:
- ${MKDIR} ${PREFIX}/etc/rc.d
- ${SED} -e 's,%%PREFIX%%,${TRUE_PREFIX},g' ${FILESDIR}/kdelibs.sh \
- > ${PREFIX}/etc/rc.d/kdelibs.sh
- ${CHMOD} ${BINMODE} ${PREFIX}/etc/rc.d/kdelibs.sh
- ${CHOWN} ${BINOWN}:${BINGRP} ${PREFIX}/etc/rc.d/kdelibs.sh
-
.include <bsd.port.post.mk>
Index: distinfo
===================================================================
RCS file: /home/cvs/mports/x11/kdelibs3/distinfo,v
retrieving revision 1.1
retrieving revision 1.2
diff -L x11/kdelibs3/distinfo -L x11/kdelibs3/distinfo -u -r1.1 -r1.2
--- x11/kdelibs3/distinfo
+++ x11/kdelibs3/distinfo
@@ -1,3 +1,3 @@
-MD5 (KDE/kdelibs-3.5.4.tar.bz2) = 979d056ca0e21c12caed270126e60e3e
-SHA256 (KDE/kdelibs-3.5.4.tar.bz2) = 9458d94d842855b4f0ea30520dc9ed0988563564bc72c8a86a5c40d57ab6887e
-SIZE (KDE/kdelibs-3.5.4.tar.bz2) = 15450025
+MD5 (KDE/kdelibs-3.5.8.tar.bz2) = acaa37e79e840d10dca326277a20863c
+SHA256 (KDE/kdelibs-3.5.8.tar.bz2) = 779f563fdf0385b973f2238f04d82b5729aefe1c949e4d29482b6bb170aa3fe6
+SIZE (KDE/kdelibs-3.5.8.tar.bz2) = 15557343
--- x11/kdelibs3/files/patch-kdeprint_cups_kmcupsmanager.cpp
+++ /dev/null
@@ -1,33 +0,0 @@
---- kdeprint/cups/kmcupsmanager.cpp.orig Wed Jan 26 11:58:07 2005
-+++ kdeprint/cups/kmcupsmanager.cpp Wed Jan 26 12:09:45 2005
-@@ -100,10 +100,10 @@
- {
- QString d = cupsInstallDir();
- if (d.isEmpty())
-- d = "/usr";
-+ d = "%%LOCALBASE%%";
- d.append("/share/cups/model");
- // raw foomatic support
-- d.append(":/usr/share/foomatic/db/source");
-+ d.append(":%%LOCALBASE%%/share/foomatic/db/source");
- return d;
- }
-
-@@ -553,7 +553,7 @@
- {
- QStringList comps = QStringList::split('/', drname, false);
- QString tmpFile = locateLocal("tmp", "foomatic_" + kapp->randomString(8));
-- QString PATH = getenv("PATH") + QString::fromLatin1(":/usr/sbin:/usr/local/sbin:/opt/sbin:/opt/local/sbin");
-+ QString PATH = getenv("PATH") + QString::fromLatin1(":%%LOCALBASE%%/bin:/usr/sbin:/usr/local/sbin:/opt/sbin:/opt/local/sbin");
- QString exe = KStandardDirs::findExe("foomatic-datafile", PATH);
- if (exe.isEmpty())
- {
-@@ -844,7 +844,7 @@
- {
- QString path = cupsInstallDir();
- if (path.isEmpty())
-- path = "/usr/share/cups";
-+ path = "%%LOCALBASE%%/share/cups";
- else
- path += "/share/cups";
- CupsAddSmb::exportDest(m_currentprinter->printerName(), path);
--- /dev/null
+++ x11/kdelibs3/files/patch-kioslave_http-http.cc
@@ -0,0 +1,39 @@
+--- kioslave/http/http.cc 2007/09/26 17:08:43 717341
++++ kioslave/http/http.cc 2007/10/17 04:11:51 726097
+@@ -3409,10 +3409,6 @@
+
+ } while (!m_bEOF && (len || noHeader) && (headerSize < maxHeaderSize) && (gets(buffer, sizeof(buffer)-1)));
+
+- // Send the current response before processing starts or it
+- // might never get sent...
+- forwardHttpResponseHeader();
+-
+ // Now process the HTTP/1.1 upgrade
+ QStringList::Iterator opt = upgradeOffers.begin();
+ for( ; opt != upgradeOffers.end(); ++opt) {
+@@ -3818,6 +3814,10 @@
+ mimeType( m_strMimeType );
+ }
+
++ // Do not move send response header before any redirection as it seems
++ // to screw up some sites. See BR# 150904.
++ forwardHttpResponseHeader();
++
+ if (m_request.method == HTTP_HEAD)
+ return true;
+
+@@ -3830,10 +3830,10 @@
+ // Check...
+ createCacheEntry(m_strMimeType, expireDate); // Create a cache entry
+ if (!m_request.fcache)
+- {
+- m_request.bCachedWrite = false; // Error creating cache entry.
+- kdDebug(7113) << "(" << m_pid << ") Error creating cache entry for " << m_request.url.url()<<"!\n";
+- }
++ {
++ m_request.bCachedWrite = false; // Error creating cache entry.
++ kdDebug(7113) << "(" << m_pid << ") Error creating cache entry for " << m_request.url.url()<<"!\n";
++ }
+ m_request.expireDate = expireDate;
+ m_maxCacheSize = config()->readNumEntry("MaxCacheSize", DEFAULT_MAX_CACHE_SIZE) / 2;
+ }
--- /dev/null
+++ x11/kdelibs3/files/patch-kdecore-kstartupinfo.cpp
@@ -0,0 +1,42 @@
+--- kdecore/kstartupinfo.cpp 2007/10/08 11:32:36 722993
++++ kdecore/kstartupinfo.cpp 2007/10/12 12:13:00 724472
+@@ -545,7 +545,7 @@
+
+ void KStartupInfo::setNewStartupId( QWidget* window, const QCString& startup_id )
+ {
+- long activate = true;
++ bool activate = true;
+ kapp->setStartupId( startup_id );
+ if( window != NULL )
+ {
+@@ -937,7 +937,7 @@
+ #ifdef Q_WS_X11
+ extern Time qt_x_user_time;
+ #else
+- long qt_x_user_time = 0;
++ unsigned long qt_x_user_time = 0;
+ #endif
+ QCString id = QString( "%1;%2;%3;%4_TIME%5" ).arg( hostname ).arg( tm.tv_sec )
+ .arg( tm.tv_usec ).arg( getpid()).arg( qt_x_user_time ).utf8();
+@@ -1078,7 +1078,9 @@
+ if( pos >= 0 )
+ {
+ bool ok;
+- long time = d->id.mid( pos + 5 ).toLong( &ok );
++ unsigned long time = d->id.mid( pos + 5 ).toULong( &ok );
++ if( !ok && d->id[ pos + 5 ] == '-' ) // try if it's as a negative signed number perhaps
++ time = d->id.mid( pos + 5 ).toLong( &ok );
+ if( ok )
+ return time;
+ }
+@@ -1093,7 +1095,9 @@
+ if( pos2 >= 0 )
+ {
+ bool ok;
+- long time = d->id.mid( pos2 + 1, pos1 - pos2 - 1 ).toLong( &ok );
++ unsigned long time = d->id.mid( pos2 + 1, pos1 - pos2 - 1 ).toULong( &ok );
++ if( !ok && d->id[ pos + 5 ] == '-' ) // try if it's as a negative signed number perhaps
++ time = d->id.mid( pos2 + 1, pos1 - pos2 - 1 ).toLong( &ok );
+ if( ok )
+ return time;
+ }
--- x11/kdelibs3/files/patch-mimetypes_application-Makefile.in
+++ /dev/null
@@ -1,20 +0,0 @@
---- mimetypes/application/Makefile.in.orig Tue Aug 15 18:56:01 2006
-+++ mimetypes/application/Makefile.in Tue Aug 15 18:56:32 2006
-@@ -525,7 +525,7 @@
- vnd.sun.xml.impress.template.desktop vnd.sun.xml.draw.template.desktop \
- vnd.stardivision.chart.desktop vnd.stardivision.draw.desktop \
- vnd.stardivision.math.desktop vnd.stardivision.writer-global.desktop vnd.sun.xml.writer.master.desktop \
-- x-xliff.desktop x-7z.desktop xml.desktop x-webarchive.desktop x-mimearchive.desktop \
-+ x-xliff.desktop xml.desktop x-webarchive.desktop x-mimearchive.desktop \
- xsd.desktop relaxng.desktop \
- vnd.oasis.opendocument.graphics-template.desktop \
- vnd.oasis.opendocument.graphics.desktop \
-@@ -757,7 +757,7 @@
- .NOEXPORT:
-
- #>+ 2
--KDE_DIST=x-karbon.desktop vnd.rn-realmedia.desktop x-tbz.desktop x-gnumeric.desktop x-ruby.desktop pdf.desktop x-kontour.desktop x-compress.desktop x-sharedlib.desktop x-zip-compressed.desktop msexcel.desktop x-tgif.desktop x-x509-ca-cert.desktop java.desktop x-font-bdf.desktop x-javascript.desktop x-font-ttc.desktop pkcs7-signature.desktop x-abiword.desktop vnd.sun.xml.impress.desktop x-kugar.desktop pkcs7-mime.desktop vnd.sun.xml.impress.template.desktop vnd.stardivision.impress.desktop x-kspread.desktop ogg.desktop x-troff-man.desktop x-dvi.desktop x-arj.desktop Makefile.in x-lha.desktop x-bzip.desktop x-archive.desktop x-debian-package.desktop x-kformula.desktop uninstall.desktop x-kde-wallet.desktop x-rpm.desktop pgp.desktop msword.desktop x-sqlite2.desktop x-mswrite.desktop x-java.desktop x-executable-script.desktop x-afm.desktop x-pkcs12.desktop x-gzip.desktop vnd.sun.xml.base.desktop mathml+xml.desktop x-font-snf.desktop x-msdos-program.desktop x-kcsrc.desktop smil.desktop x-kivio.desktop x-applixword.desktop x-pw.desktop pgp-keys.desktop x-font-ttf.desktop vnd.mozilla.xul+xml.desktop x-egon.desktop x-rar.desktop x-object.desktop x-executable.desktop x-shockwave-flash.desktop x-trash.desktop x-perl-module.desktop x-perl.desktop x-kchart.desktop xml-dtd.desktop x-cue.desktop x-python.desktop x-font-ghostscript.desktop x-lyx.desktop vnd.ms-powerpoint.desktop vnd.sun.xml.calc.desktop x-bzip2.desktop illustrator.desktop chm.desktop vnd.sun.xml.calc.template.desktop vnd.sun.xml.draw.template.desktop x-kword.desktop vnd.stardivision.math.desktop x-java-jnlp-file.desktop x-core.desktop x-zoo.desktop pkcs10.desktop x-designer.desktop mspowerpoint.desktop x-troff.desktop x-kpresenter.desktop x-krita.desktop vnd.palm.desktop postscript.desktop vnd.sun.xml.writer.desktop vnd.stardivision.chart.desktop x-desktop.desktop x-cpio.desktop x-sqlite3.desktop x-ace.desktop x-quattropro.desktop x-applixspread.desktop x-tex-gf.desktop x-7z.desktop x-xliff.desktop x-java-applet.desktop pgp-encrypted.desktop x-tar.de!
sktop x-
arc.desktop x-font-otf.desktop x-webarchive.desktop vnd.ms-excel.desktop x-applixgraphics.desktop vnd.stardivision.writer-global.desktop x-zip.desktop x-msmetafile.desktop fits.desktop vnd.sun.xml.draw.desktop x-ogg.desktop xsd.desktop x-dbase.desktop x-awk.desktop vnd.sun.xml.writer.master.desktop x-ica.desktop x-kudesigner.desktop x-gzdvi.desktop x-bz2dvi.desktop wordperfect.desktop x-python-bytecode.desktop x-msaccess.desktop x-tgz.desktop x-font-pcf.desktop x-zerosize.desktop x-gettext.desktop x-iso.desktop x-mimearchive.desktop mbox.desktop vnd.stardivision.draw.desktop x-cda.desktop x-bittorrent.desktop x-mplayer2.desktop xml.desktop x-jar.desktop x-rar-compressed.desktop x-magicpoint.desktop octet-stream.desktop x-siag.desktop x-font-type1.desktop x-tarz.desktop vnd.stardivision.writer.desktop sieve.desktop vnd.sun.xml.writer.template.desktop x-tex-pk.desktop x-php.desktop x-gzpostscript.desktop x-pak.desktop x-vnd.kde.kugar.mixed.desktop x-lzop.desktop x-amipro.desktop x-vnd.kde.kplato.desktop x-vnd.kde.kexi.desktop x-hancomword.desktop x-deb.desktop x-shellscript.desktop xhtml+xml.desktop pgp-signature.desktop x-tzo.desktop vnd.ms-word.desktop x-kpovmodeler.desktop relaxng.desktop x-graphite.desktop vnd.stardivision.calc.desktop vnd.ms-asf.desktop Makefile.am x-linguist.desktop x-font-speedo.desktop
-+KDE_DIST=x-karbon.desktop vnd.rn-realmedia.desktop x-tbz.desktop x-gnumeric.desktop x-ruby.desktop pdf.desktop x-kontour.desktop x-compress.desktop x-sharedlib.desktop x-zip-compressed.desktop msexcel.desktop x-tgif.desktop x-x509-ca-cert.desktop java.desktop x-font-bdf.desktop x-javascript.desktop x-font-ttc.desktop pkcs7-signature.desktop x-abiword.desktop vnd.sun.xml.impress.desktop x-kugar.desktop pkcs7-mime.desktop vnd.sun.xml.impress.template.desktop vnd.stardivision.impress.desktop x-kspread.desktop ogg.desktop x-troff-man.desktop x-dvi.desktop x-arj.desktop Makefile.in x-lha.desktop x-bzip.desktop x-archive.desktop x-debian-package.desktop x-kformula.desktop uninstall.desktop x-kde-wallet.desktop x-rpm.desktop pgp.desktop msword.desktop x-sqlite2.desktop x-mswrite.desktop x-java.desktop x-executable-script.desktop x-afm.desktop x-pkcs12.desktop x-gzip.desktop vnd.sun.xml.base.desktop mathml+xml.desktop x-font-snf.desktop x-msdos-program.desktop x-kcsrc.desktop smil.desktop x-kivio.desktop x-applixword.desktop x-pw.desktop pgp-keys.desktop x-font-ttf.desktop vnd.mozilla.xul+xml.desktop x-egon.desktop x-rar.desktop x-object.desktop x-executable.desktop x-shockwave-flash.desktop x-trash.desktop x-perl-module.desktop x-perl.desktop x-kchart.desktop xml-dtd.desktop x-cue.desktop x-python.desktop x-font-ghostscript.desktop x-lyx.desktop vnd.ms-powerpoint.desktop vnd.sun.xml.calc.desktop x-bzip2.desktop illustrator.desktop chm.desktop vnd.sun.xml.calc.template.desktop vnd.sun.xml.draw.template.desktop x-kword.desktop vnd.stardivision.math.desktop x-java-jnlp-file.desktop x-core.desktop x-zoo.desktop pkcs10.desktop x-designer.desktop mspowerpoint.desktop x-troff.desktop x-kpresenter.desktop x-krita.desktop vnd.palm.desktop postscript.desktop vnd.sun.xml.writer.desktop vnd.stardivision.chart.desktop x-desktop.desktop x-cpio.desktop x-sqlite3.desktop x-ace.desktop x-quattropro.desktop x-applixspread.desktop x-tex-gf.desktop x-xliff.desktop x-java-applet.desktop pgp-encrypted.desktop x-tar.desktop x-arc.d!
esktop x
-font-otf.desktop x-webarchive.desktop vnd.ms-excel.desktop x-applixgraphics.desktop vnd.stardivision.writer-global.desktop x-zip.desktop x-msmetafile.desktop fits.desktop vnd.sun.xml.draw.desktop x-ogg.desktop xsd.desktop x-dbase.desktop x-awk.desktop vnd.sun.xml.writer.master.desktop x-ica.desktop x-kudesigner.desktop x-gzdvi.desktop x-bz2dvi.desktop wordperfect.desktop x-python-bytecode.desktop x-msaccess.desktop x-tgz.desktop x-font-pcf.desktop x-zerosize.desktop x-gettext.desktop x-iso.desktop x-mimearchive.desktop mbox.desktop vnd.stardivision.draw.desktop x-cda.desktop x-bittorrent.desktop x-mplayer2.desktop xml.desktop x-jar.desktop x-rar-compressed.desktop x-magicpoint.desktop octet-stream.desktop x-siag.desktop x-font-type1.desktop x-tarz.desktop vnd.stardivision.writer.desktop sieve.desktop vnd.sun.xml.writer.template.desktop x-tex-pk.desktop x-php.desktop x-gzpostscript.desktop x-pak.desktop x-vnd.kde.kugar.mixed.desktop x-lzop.desktop x-amipro.desktop x-vnd.kde.kplato.desktop x-vnd.kde.kexi.desktop x-hancomword.desktop x-deb.desktop x-shellscript.desktop xhtml+xml.desktop pgp-signature.desktop x-tzo.desktop vnd.ms-word.desktop x-kpovmodeler.desktop relaxng.desktop x-graphite.desktop vnd.stardivision.calc.desktop vnd.ms-asf.desktop Makefile.am x-linguist.desktop x-font-speedo.desktop
-
- #>+ 2
- docs-am:
--- /dev/null
+++ x11/kdelibs3/files/patch-CVE-2006-4811
@@ -0,0 +1,14 @@
+Index: khtml/rendering/render_image.cpp
+===================================================================
+--- khtml/rendering/render_image.cpp (revision 594232)
++++ khtml/rendering/render_image.cpp (working copy)
+@@ -294,7 +294,8 @@ void RenderImage::paint(PaintInfo& paint
+ if ( (cWidth != intrinsicWidth() || cHeight != intrinsicHeight()) &&
+ pix.width() > 0 && pix.height() > 0 && i->valid_rect().isValid())
+ {
+- if (resizeCache.isNull() && cWidth && cHeight && intrinsicWidth() && intrinsicHeight())
++ if (resizeCache.isNull() && cWidth > 0 && cHeight > 0 && intrinsicWidth() && intrinsicHeight()
++ && cWidth < 4096 && cHeight < 4096)
+ {
+ QRect scaledrect(i->valid_rect());
+ // kdDebug(6040) << "time elapsed: " << dt->elapsed() << endl;
--- /dev/null
+++ x11/kdelibs3/files/patch-kdeprint_cups_cupsdconf2
@@ -0,0 +1,65 @@
+--- kdeprint/cups/cupsdconf2/cupsddialog.cpp Tue Sep 11 09:26:39 2007
++++ kdeprint/cups/cupsdconf2/cupsddialog.cpp Tue Sep 11 14:38:28 2007
+@@ -44,6 +44,7 @@
+ #include <kio/passdlg.h>
+ #include <kguiitem.h>
+ #include <kprocess.h>
++#include <qprocess.h>
+
+ #include <signal.h>
+ #include <cups/cups.h>
+@@ -69,24 +70,38 @@
+
+ int getServerPid()
+ {
+- QDir dir("/proc",QString::null,QDir::Name,QDir::Dirs);
+- for (uint i=0;i<dir.count();i++)
+- {
+- if (dir[i] == "." || dir[i] == ".." || dir[i] == "self") continue;
+- QFile f("/proc/" + dir[i] + "/cmdline");
+- if (f.exists() && f.open(IO_ReadOnly))
++ // /proc doesn't work the same in FreeBSD. The simplest way to get cupsd's pid is via pgrep.
++ #if defined(__FreeBSD__)
++ QProcess *proc = new QProcess();
++ proc->addArgument("pgrep");
++ proc->addArgument("cupsd");
++ proc->start();
++ while (proc->isRunning()); //Wait for process to exit
++ QString pidString = proc->readLineStdout();
++ bool ok;
++ int pid = pidString.toInt(&ok);
++ if (ok) return pid;
++ return (-1);
++ #else
++ QDir dir("/proc",QString::null,QDir::Name,QDir::Dirs);
++ for (uint i=0;i<dir.count();i++)
+ {
+- QTextStream t(&f);
+- QString line;
+- t >> line;
+- f.close();
+- if (line.right(5) == "cupsd" ||
+- line.right(6).left(5) == "cupsd") // second condition for 2.4.x kernels
+- // which add a null byte at the end
+- return dir[i].toInt();
++ if (dir[i] == "." || dir[i] == ".." || dir[i] == "self") continue;
++ QFile f("/proc/" + dir[i] + "/cmdline");
++ if (f.exists() && f.open(IO_ReadOnly))
++ {
++ QTextStream t(&f);
++ QString line;
++ t >> line;
++ f.close();
++ if (line.right(5) == "cupsd" ||
++ line.right(6).left(5) == "cupsd") // second condition for 2.4.x kernels
++ // which add a null byte at the end
++ return dir[i].toInt();
++ }
+ }
+- }
+- return (-1);
++ return (-1);
++ #endif
+ }
+
+ const char* getPassword(const char*)
--- x11/kdelibs3/files/kdelibs.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh
-PREFIX=%%PREFIX%%
-ldconfig -m $PREFIX/lib/kde3
--- /dev/null
+++ x11/kdelibs3/files/patch-kinit-start_kdeinit_wrapper.c
@@ -0,0 +1,11 @@
+--- kinit/start_kdeinit_wrapper.c.orig 2007-10-29 22:49:04.000000000 +0100
++++ kinit/start_kdeinit_wrapper.c 2007-10-29 22:49:21.000000000 +0100
+@@ -85,7 +85,7 @@
+ if(argc == 0)
+ return 1;
+ argv[0] = "start_kdeinit";
+- execv("start_kdeinit",argv);
++ execvp("start_kdeinit",argv);
+ perror("start_kdeinit");
+ return 1;
+ }
--- x11/kdelibs3/files/patch-cups-1.2.x-sockets
+++ /dev/null
@@ -1,251 +0,0 @@
---- kdeprint/cups/Makefile.in Tue Sep 26 17:18:13 2006
-+++ kdeprint/cups/Makefile.in Tue Sep 26 17:19:12 2006
-@@ -110,7 +110,7 @@
- make_driver_db_cups_DEPENDENCIES = ../libdriverparse.a \
- $(top_builddir)/kdecore/libkdefakes.la $(am__DEPENDENCIES_1) \
- $(am__DEPENDENCIES_1)
--DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs
-+DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) -I$(top_builddir)/dcop -I$(top_builddir)/kdecore -I$(top_builddir)/kdecore/network -I$(top_builddir)/kio/kssl -I$(top_builddir)/kjs
- depcomp = $(SHELL) $(top_srcdir)/admin/depcomp
- am__depfiles_maybe = depfiles
- COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
---- kdeprint/cups/cupsinfos.cpp 2005/09/29 09:47:40 465272
-+++ kdeprint/cups/cupsinfos.cpp 2006/09/20 15:33:24 586778
-@@ -69,6 +69,13 @@
- {
- }
-
-+QString CupsInfos::hostaddr() const
-+{
-+ if (host_[0] != '/')
-+ return host_ + ":" + port_;
-+ return host_;
-+}
-+
- void CupsInfos::setHost(const QString& s)
- {
- host_ = s;
---- kdeprint/cups/kmcupsmanager.cpp 2005/11/28 03:56:46 483752
-+++ kdeprint/cups/kmcupsmanager.cpp 2006/09/20 15:38:41 586782
-@@ -45,12 +45,14 @@
- #include <klocale.h>
- #include <kconfig.h>
- #include <kstandarddirs.h>
-+#include <ksocketbase.h>
- #include <klibloader.h>
- #include <kmessagebox.h>
- #include <kaction.h>
- #include <kdialogbase.h>
- #include <kextendedsocket.h>
- #include <kprocess.h>
-+#include <kbufferedsocket.h>
- #include <kfilterdev.h>
- #include <cups/cups.h>
- #include <cups/ppd.h>
-@@ -88,7 +90,7 @@
-
- KMCupsManager::~KMCupsManager()
- {
-- //delete m_socket;
-+ delete m_socket;
- }
-
- QString KMCupsManager::driverDbCreationProgram()
-@@ -135,7 +137,8 @@
- {
- req.setOperation(CUPS_ADD_CLASS);
- QStringList members = p->members(), uris;
-- QString s = QString::fromLocal8Bit("ipp://%1:%2/printers/").arg(CupsInfos::self()->host()).arg(CupsInfos::self()->port());
-+ QString s;
-+ s = QString::fromLocal8Bit("ipp://%1/printers/").arg(CupsInfos::self()->hostaddr());
- for (QStringList::ConstIterator it=members.begin(); it!=members.end(); ++it)
- uris.append(s+(*it));
- req.addURI(IPP_TAG_PRINTER,"member-uris",uris);
-@@ -907,25 +910,23 @@
-
- QString KMCupsManager::stateInformation()
- {
-- return QString("%1: %2:%3")
-+ return QString("%1: %2")
- .arg(i18n("Server"))
-- .arg(CupsInfos::self()->host())
-- .arg(CupsInfos::self()->port());
-+ .arg(CupsInfos::self()->hostaddr());
- }
-
- void KMCupsManager::checkUpdatePossibleInternal()
- {
- kdDebug(500) << "Checking for update possible" << endl;
- delete m_socket;
-- /*m_socket = new KExtendedSocket( CupsInfos::self()->host(), CupsInfos::self()->port() );
-- connect( m_socket, SIGNAL( connectionSuccess() ), SLOT( slotConnectionSuccess() ) );
-- connect( m_socket, SIGNAL( connectionFailed( int ) ), SLOT( slotConnectionFailed( int ) ) );
-- m_socket->setTimeout( 1 );*/
-- m_socket = new QSocket( this );
-- connect( m_socket, SIGNAL( connected() ), SLOT( slotConnectionSuccess() ) );
-- connect( m_socket, SIGNAL( error( int ) ), SLOT( slotConnectionFailed( int ) ) );
-- trials = 5;
-- QTimer::singleShot( 1, this, SLOT( slotAsyncConnect() ) );
-+ m_socket = new KNetwork::KBufferedSocket;
-+ m_socket->setTimeout( 1 );
-+ connect( m_socket, SIGNAL( connected(const KResolverEntry&) ),
-+ SLOT( slotConnectionSuccess() ) );
-+ connect( m_socket, SIGNAL( gotError( int ) ), SLOT( slotConnectionFailed( int ) ) );
-+
-+ trials = 5;
-+ QTimer::singleShot( 1, this, SLOT( slotAsyncConnect() ) );
- }
-
- void KMCupsManager::slotConnectionSuccess()
-@@ -959,7 +960,10 @@
- {
- kdDebug(500) << "Starting async connect" << endl;
- //m_socket->startAsyncConnect();
-- m_socket->connectToHost( CupsInfos::self()->host(), CupsInfos::self()->port() );
-+ if (CupsInfos::self()->host().startsWith("/"))
-+ m_socket->connect( QString(), CupsInfos::self()->host());
-+ else
-+ m_socket->connectToHost( CupsInfos::self()->host(), CupsInfos::self()->port() );
- }
-
- void KMCupsManager::slotConnectionFailed( int errcode )
-@@ -975,9 +979,25 @@
- return;
- }
-
-- setErrorMsg( i18n( "Connection to CUPS server failed. Check that the CUPS server is correctly installed and running. "
-- "Error: %1." ).arg( errcode == QSocket::ErrConnectionRefused ? i18n( "connection refused" ) : i18n( "host not found" ) ) );
-- setUpdatePossible( false );
-+ QString einfo;
-+
-+ switch (errcode) {
-+ case KNetwork::KSocketBase::ConnectionRefused:
-+ case KNetwork::KSocketBase::ConnectionTimedOut:
-+ einfo = i18n("connection refused") + QString(" (%1)").arg(errcode);
-+ break;
-+ case KNetwork::KSocketBase::LookupFailure:
-+ einfo = i18n("host not found") + QString(" (%1)").arg(errcode);
-+ break;
-+ case KNetwork::KSocketBase::WouldBlock:
-+ default:
-+ einfo = i18n("read failed (%1)").arg(errcode);
-+ break;
-+ }
-+
-+ setErrorMsg( i18n( "Connection to CUPS server failed. Check that the CUPS server is correctly installed and running. "
-+ "Error: %2: %1." ).arg( einfo, CupsInfos::self()->host()));
-+ setUpdatePossible( false );
- }
-
- void KMCupsManager::hostPingSlot() {
-@@ -1014,7 +1034,7 @@
- if (use && !p->uri().isEmpty())
- uri = p->uri().prettyURL();
- else
-- uri = QString("ipp://%1:%2/%4/%3").arg(CupsInfos::self()->host()).arg(CupsInfos::self()->port()).arg(p->printerName()).arg((p->isClass(false) ? "classes" : "printers"));
-+ uri = QString("ipp://%1/%3/%2").arg(CupsInfos::self()->hostaddr()).arg(p->printerName()).arg((p->isClass(false) ? "classes" : "printers"));
- return uri;
- }
-
---- kdeprint/cups/kmcupsuimanager.cpp 2005/09/29 09:47:40 465272
-+++ kdeprint/cups/kmcupsuimanager.cpp 2006/09/20 15:38:41 586782
-@@ -135,7 +135,7 @@
- QString uri;
-
- req.setOperation(CUPS_GET_DEVICES);
-- uri = QString::fromLocal8Bit("ipp://%1:%2/printers/").arg(CupsInfos::self()->host()).arg(CupsInfos::self()->port());
-+ uri = QString::fromLocal8Bit("ipp://%1/printers/").arg(CupsInfos::self()->hostaddr());
- req.addURI(IPP_TAG_OPERATION,"printer-uri",uri);
-
- if (req.doRequest("/"))
---- kdeprint/cups/cupsinfos.h 2005/09/29 09:47:40 465272
-+++ kdeprint/cups/cupsinfos.h 2006/09/20 15:33:24 586778
-@@ -32,6 +32,7 @@
- ~CupsInfos();
-
- const QString& host() const;
-+ QString hostaddr() const;
- int port() const;
- const QString& login() const;
- const QString& password() const;
---- kdeprint/cups/kmcupsmanager.h 2005/09/29 09:47:40 465272
-+++ kdeprint/cups/kmcupsmanager.h 2006/09/20 15:38:41 586782
-@@ -25,7 +25,10 @@
- class IppRequest;
- class KLibrary;
- class KExtendedSocket;
--class QSocket;
-+
-+namespace KNetwork {
-+ class KStreamSocket;
-+}
-
- class KMCupsManager : public KMManager
- {
-@@ -95,7 +98,7 @@
- private:
- KLibrary *m_cupsdconf;
- KMPrinter *m_currentprinter;
-- QSocket *m_socket;
-+ KNetwork::KStreamSocket *m_socket;
- bool m_hostSuccess;
- bool m_lookupDone;
- };
---- kdeprint/cups/cupsdconf2/cups-util.c 2005/11/30 19:59:17 484443
-+++ kdeprint/cups/cupsdconf2/cups-util.c 2006/09/20 15:22:50 586776
-@@ -14,7 +14,7 @@
- static int cups_local_auth(http_t *http);
-
- const char * /* O - Filename for PPD file */
--cupsGetConf()
-+cupsGetConf(void)
- {
- int fd; /* PPD file */
- int bytes; /* Number of bytes read */
-@@ -142,7 +142,11 @@
- */
-
- snprintf(plain, sizeof(plain), "%s:%s", cupsUser(), pwdstring);
-- httpEncode64(encode, plain);
-+#if CUPS_VERSION_MAJOR == 1 && CUPS_VERSION_MINOR >= 2
-+ httpEncode64_2(encode, sizeof(encode), plain, sizeof(plain));
-+#else
-+ httpEncode64(encode, plain);
-+#endif
- snprintf(authstring, sizeof(authstring), "Basic %s", encode);
- }
- else
-@@ -364,7 +368,11 @@
- */
-
- snprintf(plain, sizeof(plain), "%s:%s", cupsUser(), pwdstring);
-- httpEncode64(encode, plain);
-+#if CUPS_VERSION_MAJOR == 1 && CUPS_VERSION_MINOR >= 2
-+ httpEncode64_2(encode, sizeof(encode), plain, sizeof(plain));
-+#else
-+ httpEncode64(encode, plain);
-+#endif
- snprintf(authstring, sizeof(authstring), "Basic %s", encode);
- }
- else
-@@ -443,8 +451,7 @@
- the struct has changed in newer versions - PiggZ (adam at piggz.co.uk)
- */
- #if CUPS_VERSION_MAJOR == 1 && CUPS_VERSION_MINOR >= 2
-- if (ntohl(*(int*)&http->_hostaddr.sin_addr) != 0x7f000001 &&
-- strcasecmp(http->hostname, "localhost") != 0)
-+ if (!httpAddrLocalhost(http))
- #else
- if (ntohl(*(int*)&http->hostaddr.sin_addr) != 0x7f000001 &&
- strcasecmp(http->hostname, "localhost") != 0)
---- kdeprint/cups/cupsdconf2/cups-util.h 2005/09/29 09:47:40 465272
-+++ kdeprint/cups/cupsdconf2/cups-util.h 2006/09/20 15:22:50 586776
-@@ -20,7 +20,7 @@
- #ifndef CUPS_UTIL_H
- #define CUPS_UTIL_H
-
--const char* cupsGetConf();
-+const char* cupsGetConf(void);
- int cupsPutConf(const char *filename);
-
- #endif
--- x11/kdelibs3/files/patch-configure
+++ /dev/null
@@ -1,702 +0,0 @@
---- configure.orig Tue May 23 23:15:11 2006
-+++ configure Sat May 27 14:25:02 2006
-@@ -21855,10 +21855,10 @@
-
-
- # This can be used to rebuild libtool when needed
--LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
-+LIBTOOL_DEPS=" /usr/local/share/libtool/ltmain.sh"
-
- # Always use our own libtool.
--LIBTOOL='$(SHELL) $(top_builddir)/libtool --silent'
-+LIBTOOL='$(SHELL) /usr/local/bin/libtool --silent'
-
- # Prevent multiple expansion
-
-@@ -42536,521 +42536,6 @@
-
-
-
-- HAVE_LUA=""
--
--
--# Check whether --with-lua-dir or --without-lua-dir was given.
--if test "${with_lua_dir+set}" = set; then
-- withval="$with_lua_dir"
--
-- LUA="$withval"
-- LUA_INCLUDES=-I"$withval"/include
-- LUA_LIBS="-L$withval/lib"
--fi;
--
--
--# Check whether --with-lua-includes or --without-lua-includes was given.
--if test "${with_lua_includes+set}" = set; then
-- withval="$with_lua_includes"
-- LUA_INCLUDES="-I$withval"
--fi;
--
--
--# Check whether --with-lua-libraries or --without-lua-libraries was given.
--if test "${with_lua_libraries+set}" = set; then
-- withval="$with_lua_libraries"
--
-- LUA_LIBS="-L$withval"
--fi;
--
--
-- if ! test "x$LUA" = "x"; then
-- echo "$as_me:$LINENO: result: using Lua from $LUA" >&5
--echo "${ECHO_T}using Lua from $LUA" >&6
-- fi
-- if ! test "x$LUA_LIBS" = "x"; then
-- echo "$as_me:$LINENO: result: using Lua libraries in $LUA_LIBS" >&5
--echo "${ECHO_T}using Lua libraries in $LUA_LIBS" >&6
-- fi
-- if ! test "x$LUA_INCLUDES" = "x"; then
-- echo "$as_me:$LINENO: result: using Lua includes in $LUA_INCLUDES" >&5
--echo "${ECHO_T}using Lua includes in $LUA_INCLUDES" >&6
-- fi
--
-- ac_save_CFLAGS="$CFLAGS"
-- ac_save_CPPFLAGS="$CPPFLAGS"
-- ac_save_LDFLAGS="$LDFLAGS"
-- CFLAGS="$LUA_INCLUDES $CFLAGS"
-- CPPFLAGS="$LUA_INCLUDES $CPPFLAGS"
-- LDFLAGS="$LUA_LIBS $LDFLAGS"
--
-- LUAH_FOUND=""
-- if test "${ac_cv_header_lua_h+set}" = set; then
-- echo "$as_me:$LINENO: checking for lua.h" >&5
--echo $ECHO_N "checking for lua.h... $ECHO_C" >&6
--if test "${ac_cv_header_lua_h+set}" = set; then
-- echo $ECHO_N "(cached) $ECHO_C" >&6
--fi
--echo "$as_me:$LINENO: result: $ac_cv_header_lua_h" >&5
--echo "${ECHO_T}$ac_cv_header_lua_h" >&6
--else
-- # Is the header compilable?
--echo "$as_me:$LINENO: checking lua.h usability" >&5
--echo $ECHO_N "checking lua.h usability... $ECHO_C" >&6
--cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h. */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h. */
--$ac_includes_default
--#include <lua.h>
--_ACEOF
--rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-- (eval $ac_compile) 2>conftest.er1
-- ac_status=$?
-- grep -v '^ *+' conftest.er1 >conftest.err
-- rm -f conftest.er1
-- cat conftest.err >&5
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest.$ac_objext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-- ac_header_compiler=yes
--else
-- echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
--ac_header_compiler=no
--fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
--echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
--echo "${ECHO_T}$ac_header_compiler" >&6
--
--# Is the header present?
--echo "$as_me:$LINENO: checking lua.h presence" >&5
--echo $ECHO_N "checking lua.h presence... $ECHO_C" >&6
--cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h. */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h. */
--#include <lua.h>
--_ACEOF
--if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
-- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-- ac_status=$?
-- grep -v '^ *+' conftest.er1 >conftest.err
-- rm -f conftest.er1
-- cat conftest.err >&5
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } >/dev/null; then
-- if test -s conftest.err; then
-- ac_cpp_err=$ac_c_preproc_warn_flag
-- ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
-- else
-- ac_cpp_err=
-- fi
--else
-- ac_cpp_err=yes
--fi
--if test -z "$ac_cpp_err"; then
-- ac_header_preproc=yes
--else
-- echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
-- ac_header_preproc=no
--fi
--rm -f conftest.err conftest.$ac_ext
--echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
--echo "${ECHO_T}$ac_header_preproc" >&6
--
--# So? What about this header?
--case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-- yes:no: )
-- { echo "$as_me:$LINENO: WARNING: lua.h: accepted by the compiler, rejected by the preprocessor!" >&5
--echo "$as_me: WARNING: lua.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
-- { echo "$as_me:$LINENO: WARNING: lua.h: proceeding with the compiler's result" >&5
--echo "$as_me: WARNING: lua.h: proceeding with the compiler's result" >&2;}
-- ac_header_preproc=yes
-- ;;
-- no:yes:* )
-- { echo "$as_me:$LINENO: WARNING: lua.h: present but cannot be compiled" >&5
--echo "$as_me: WARNING: lua.h: present but cannot be compiled" >&2;}
-- { echo "$as_me:$LINENO: WARNING: lua.h: check for missing prerequisite headers?" >&5
--echo "$as_me: WARNING: lua.h: check for missing prerequisite headers?" >&2;}
-- { echo "$as_me:$LINENO: WARNING: lua.h: see the Autoconf documentation" >&5
--echo "$as_me: WARNING: lua.h: see the Autoconf documentation" >&2;}
-- { echo "$as_me:$LINENO: WARNING: lua.h: section \"Present But Cannot Be Compiled\"" >&5
--echo "$as_me: WARNING: lua.h: section \"Present But Cannot Be Compiled\"" >&2;}
-- { echo "$as_me:$LINENO: WARNING: lua.h: proceeding with the preprocessor's result" >&5
--echo "$as_me: WARNING: lua.h: proceeding with the preprocessor's result" >&2;}
-- { echo "$as_me:$LINENO: WARNING: lua.h: in the future, the compiler will take precedence" >&5
--echo "$as_me: WARNING: lua.h: in the future, the compiler will take precedence" >&2;}
-- (
-- cat <<\_ASBOX
--## ------------------------------------------ ##
--## Report this to the AC_PACKAGE_NAME lists. ##
--## ------------------------------------------ ##
--_ASBOX
-- ) |
-- sed "s/^/$as_me: WARNING: /" >&2
-- ;;
--esac
--echo "$as_me:$LINENO: checking for lua.h" >&5
--echo $ECHO_N "checking for lua.h... $ECHO_C" >&6
--if test "${ac_cv_header_lua_h+set}" = set; then
-- echo $ECHO_N "(cached) $ECHO_C" >&6
--else
-- ac_cv_header_lua_h=$ac_header_preproc
--fi
--echo "$as_me:$LINENO: result: $ac_cv_header_lua_h" >&5
--echo "${ECHO_T}$ac_cv_header_lua_h" >&6
--
--fi
--if test $ac_cv_header_lua_h = yes; then
-- LUAH_FOUND="true"
--else
-- echo "$as_me:$LINENO: result: lua.h was not found or was not usable, Lua 5.0 headers are required !" >&5
--echo "${ECHO_T}lua.h was not found or was not usable, Lua 5.0 headers are required !" >&6
--
--fi
--
--
-- LUALIBH_FOUND=""
-- if test "${ac_cv_header_lualib_h+set}" = set; then
-- echo "$as_me:$LINENO: checking for lualib.h" >&5
--echo $ECHO_N "checking for lualib.h... $ECHO_C" >&6
--if test "${ac_cv_header_lualib_h+set}" = set; then
-- echo $ECHO_N "(cached) $ECHO_C" >&6
--fi
--echo "$as_me:$LINENO: result: $ac_cv_header_lualib_h" >&5
--echo "${ECHO_T}$ac_cv_header_lualib_h" >&6
--else
-- # Is the header compilable?
--echo "$as_me:$LINENO: checking lualib.h usability" >&5
--echo $ECHO_N "checking lualib.h usability... $ECHO_C" >&6
--cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h. */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h. */
--$ac_includes_default
--#include <lualib.h>
--_ACEOF
--rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-- (eval $ac_compile) 2>conftest.er1
-- ac_status=$?
-- grep -v '^ *+' conftest.er1 >conftest.err
-- rm -f conftest.er1
-- cat conftest.err >&5
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest.$ac_objext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-- ac_header_compiler=yes
--else
-- echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
--ac_header_compiler=no
--fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
--echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
--echo "${ECHO_T}$ac_header_compiler" >&6
--
--# Is the header present?
--echo "$as_me:$LINENO: checking lualib.h presence" >&5
--echo $ECHO_N "checking lualib.h presence... $ECHO_C" >&6
--cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h. */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h. */
--#include <lualib.h>
--_ACEOF
--if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
-- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-- ac_status=$?
-- grep -v '^ *+' conftest.er1 >conftest.err
-- rm -f conftest.er1
-- cat conftest.err >&5
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } >/dev/null; then
-- if test -s conftest.err; then
-- ac_cpp_err=$ac_c_preproc_warn_flag
-- ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
-- else
-- ac_cpp_err=
-- fi
--else
-- ac_cpp_err=yes
--fi
--if test -z "$ac_cpp_err"; then
-- ac_header_preproc=yes
--else
-- echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
-- ac_header_preproc=no
--fi
--rm -f conftest.err conftest.$ac_ext
--echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
--echo "${ECHO_T}$ac_header_preproc" >&6
--
--# So? What about this header?
--case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-- yes:no: )
-- { echo "$as_me:$LINENO: WARNING: lualib.h: accepted by the compiler, rejected by the preprocessor!" >&5
--echo "$as_me: WARNING: lualib.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
-- { echo "$as_me:$LINENO: WARNING: lualib.h: proceeding with the compiler's result" >&5
--echo "$as_me: WARNING: lualib.h: proceeding with the compiler's result" >&2;}
-- ac_header_preproc=yes
-- ;;
-- no:yes:* )
-- { echo "$as_me:$LINENO: WARNING: lualib.h: present but cannot be compiled" >&5
--echo "$as_me: WARNING: lualib.h: present but cannot be compiled" >&2;}
-- { echo "$as_me:$LINENO: WARNING: lualib.h: check for missing prerequisite headers?" >&5
--echo "$as_me: WARNING: lualib.h: check for missing prerequisite headers?" >&2;}
-- { echo "$as_me:$LINENO: WARNING: lualib.h: see the Autoconf documentation" >&5
--echo "$as_me: WARNING: lualib.h: see the Autoconf documentation" >&2;}
-- { echo "$as_me:$LINENO: WARNING: lualib.h: section \"Present But Cannot Be Compiled\"" >&5
--echo "$as_me: WARNING: lualib.h: section \"Present But Cannot Be Compiled\"" >&2;}
-- { echo "$as_me:$LINENO: WARNING: lualib.h: proceeding with the preprocessor's result" >&5
--echo "$as_me: WARNING: lualib.h: proceeding with the preprocessor's result" >&2;}
-- { echo "$as_me:$LINENO: WARNING: lualib.h: in the future, the compiler will take precedence" >&5
--echo "$as_me: WARNING: lualib.h: in the future, the compiler will take precedence" >&2;}
-- (
-- cat <<\_ASBOX
--## ------------------------------------------ ##
--## Report this to the AC_PACKAGE_NAME lists. ##
--## ------------------------------------------ ##
--_ASBOX
-- ) |
-- sed "s/^/$as_me: WARNING: /" >&2
-- ;;
--esac
--echo "$as_me:$LINENO: checking for lualib.h" >&5
--echo $ECHO_N "checking for lualib.h... $ECHO_C" >&6
--if test "${ac_cv_header_lualib_h+set}" = set; then
-- echo $ECHO_N "(cached) $ECHO_C" >&6
--else
-- ac_cv_header_lualib_h=$ac_header_preproc
--fi
--echo "$as_me:$LINENO: result: $ac_cv_header_lualib_h" >&5
--echo "${ECHO_T}$ac_cv_header_lualib_h" >&6
--
--fi
--if test $ac_cv_header_lualib_h = yes; then
-- LUALIBH_FOUND="true"
--else
-- echo "$as_me:$LINENO: result: lualib.h was not found or was not usable, Lua 5.0 headers are required !" >&5
--echo "${ECHO_T}lualib.h was not found or was not usable, Lua 5.0 headers are required !" >&6
--
--fi
--
--
--
--
-- if test -z "$LUALIBH_FOUND" -o -z "$LUAH_FOUND"; then
-- LUA_LIBS=""
-- else
-- echo "$as_me:$LINENO: checking for lua_version in -llua50" >&5
--echo $ECHO_N "checking for lua_version in -llua50... $ECHO_C" >&6
--if test "${ac_cv_lib_lua50_lua_version+set}" = set; then
-- echo $ECHO_N "(cached) $ECHO_C" >&6
--else
-- ac_check_lib_save_LIBS=$LIBS
--LIBS="-llua50 $LIBS"
--cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h. */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h. */
--
--/* Override any gcc2 internal prototype to avoid an error. */
--#ifdef __cplusplus
--extern "C"
--#endif
--/* We use char because int might match the return type of a gcc2
-- builtin and then its argument prototype would still apply. */
--char lua_version ();
--int
--main ()
--{
--lua_version ();
-- ;
-- return 0;
--}
--_ACEOF
--rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-- (eval $ac_link) 2>conftest.er1
-- ac_status=$?
-- grep -v '^ *+' conftest.er1 >conftest.err
-- rm -f conftest.er1
-- cat conftest.err >&5
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest$ac_exeext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-- ac_cv_lib_lua50_lua_version=yes
--else
-- echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
--ac_cv_lib_lua50_lua_version=no
--fi
--rm -f conftest.err conftest.$ac_objext \
-- conftest$ac_exeext conftest.$ac_ext
--LIBS=$ac_check_lib_save_LIBS
--fi
--echo "$as_me:$LINENO: result: $ac_cv_lib_lua50_lua_version" >&5
--echo "${ECHO_T}$ac_cv_lib_lua50_lua_version" >&6
--if test $ac_cv_lib_lua50_lua_version = yes; then
-- LUA_LIBS="$LUA_LIBS -llua50 -llualib50"
--else
-- echo "$as_me:$LINENO: checking for lua_version in -llua" >&5
--echo $ECHO_N "checking for lua_version in -llua... $ECHO_C" >&6
--if test "${ac_cv_lib_lua_lua_version+set}" = set; then
-- echo $ECHO_N "(cached) $ECHO_C" >&6
--else
-- ac_check_lib_save_LIBS=$LIBS
--LIBS="-llua $LIBS"
--cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h. */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h. */
--
--/* Override any gcc2 internal prototype to avoid an error. */
--#ifdef __cplusplus
--extern "C"
--#endif
--/* We use char because int might match the return type of a gcc2
-- builtin and then its argument prototype would still apply. */
--char lua_version ();
--int
--main ()
--{
--lua_version ();
-- ;
-- return 0;
--}
--_ACEOF
--rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-- (eval $ac_link) 2>conftest.er1
-- ac_status=$?
-- grep -v '^ *+' conftest.er1 >conftest.err
-- rm -f conftest.er1
-- cat conftest.err >&5
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_c_werror_flag"
-- || test ! -s conftest.err'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest$ac_exeext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-- ac_cv_lib_lua_lua_version=yes
--else
-- echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
--ac_cv_lib_lua_lua_version=no
--fi
--rm -f conftest.err conftest.$ac_objext \
-- conftest$ac_exeext conftest.$ac_ext
--LIBS=$ac_check_lib_save_LIBS
--fi
--echo "$as_me:$LINENO: result: $ac_cv_lib_lua_lua_version" >&5
--echo "${ECHO_T}$ac_cv_lib_lua_lua_version" >&6
--if test $ac_cv_lib_lua_lua_version = yes; then
-- LUA_LIBS="$LUA_LIBS -llua -llualib"
--else
-- LUA_LIBS=""
-- echo "$as_me:$LINENO: result: Lua 5.0 libraries were not found !" >&5
--echo "${ECHO_T}Lua 5.0 libraries were not found !" >&6
--
--fi
--
--
--fi
--
-- fi
-- CFLAGS="$ac_save_CFLAGS"
-- CPPFLAGS="$ac_save_CPPFLAGS"
-- LDFLAGS="$ac_save_LDFLAGS"
--
--
-- if test -z "$LUA_LIBS"; then
-- LUA=""
-- LUA_INCLUDES=""
-- LUA_LIBS=""
-- else
--
--cat >>confdefs.h <<_ACEOF
--#define HAVE_LUA 1
--_ACEOF
--
-- HAVE_LUA="yes"
-- fi
--
--
--
--
--
--
--
- cat >>confdefs.h <<_ACEOF
- #define __KDE_EXECPREFIX "$exec_prefix"
- _ACEOF
-@@ -46439,7 +45924,7 @@
-
- echo "$as_me:$LINENO: checking installation of PS driver needed" >&5
- echo $ECHO_N "checking installation of PS driver needed... $ECHO_C" >&6
--ac_cups_share_test="/usr/share/cups /usr/local/share/cups /opt/share/cups /opt/local/share/cups"
-+ac_cups_share_test=`$kde_cups_config --datadir`
- cups_modeldir=""
- for d in $ac_cups_share_test; do
- if test -d $d && test -d $d/model; then
-@@ -48102,155 +47587,6 @@
- ac_link='rm -rf SunWS_cache; ${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
-
-
--
--for ac_header in valgrind/memcheck.h
--do
--as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
--if eval "test \"\${$as_ac_Header+set}\" = set"; then
-- echo "$as_me:$LINENO: checking for $ac_header" >&5
--echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
--if eval "test \"\${$as_ac_Header+set}\" = set"; then
-- echo $ECHO_N "(cached) $ECHO_C" >&6
--fi
--echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
--echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
--else
-- # Is the header compilable?
--echo "$as_me:$LINENO: checking $ac_header usability" >&5
--echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6
--cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h. */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h. */
--$ac_includes_default
--#include <$ac_header>
--_ACEOF
--rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-- (eval $ac_compile) 2>conftest.er1
-- ac_status=$?
-- grep -v '^ *+' conftest.er1 >conftest.err
-- rm -f conftest.er1
-- cat conftest.err >&5
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } &&
-- { ac_try='test -z "$ac_cxx_werror_flag"
-- || test ! -s conftest.err'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; } &&
-- { ac_try='test -s conftest.$ac_objext'
-- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-- (eval $ac_try) 2>&5
-- ac_status=$?
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); }; }; then
-- ac_header_compiler=yes
--else
-- echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
--ac_header_compiler=no
--fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
--echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
--echo "${ECHO_T}$ac_header_compiler" >&6
--
--# Is the header present?
--echo "$as_me:$LINENO: checking $ac_header presence" >&5
--echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6
--cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h. */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h. */
--#include <$ac_header>
--_ACEOF
--if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
-- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-- ac_status=$?
-- grep -v '^ *+' conftest.er1 >conftest.err
-- rm -f conftest.er1
-- cat conftest.err >&5
-- echo "$as_me:$LINENO: \$? = $ac_status" >&5
-- (exit $ac_status); } >/dev/null; then
-- if test -s conftest.err; then
-- ac_cpp_err=$ac_cxx_preproc_warn_flag
-- ac_cpp_err=$ac_cpp_err$ac_cxx_werror_flag
-- else
-- ac_cpp_err=
-- fi
--else
-- ac_cpp_err=yes
--fi
--if test -z "$ac_cpp_err"; then
-- ac_header_preproc=yes
--else
-- echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
-- ac_header_preproc=no
--fi
--rm -f conftest.err conftest.$ac_ext
--echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
--echo "${ECHO_T}$ac_header_preproc" >&6
--
--# So? What about this header?
--case $ac_header_compiler:$ac_header_preproc:$ac_cxx_preproc_warn_flag in
-- yes:no: )
-- { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
--echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
-- { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
--echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
-- ac_header_preproc=yes
-- ;;
-- no:yes:* )
-- { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
--echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
-- { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5
--echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;}
-- { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
--echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
-- { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5
--echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;}
-- { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
--echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
-- { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
--echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
-- (
-- cat <<\_ASBOX
--## ------------------------------------------ ##
--## Report this to the AC_PACKAGE_NAME lists. ##
--## ------------------------------------------ ##
--_ASBOX
-- ) |
-- sed "s/^/$as_me: WARNING: /" >&2
-- ;;
--esac
--echo "$as_me:$LINENO: checking for $ac_header" >&5
--echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
--if eval "test \"\${$as_ac_Header+set}\" = set"; then
-- echo $ECHO_N "(cached) $ECHO_C" >&6
--else
-- eval "$as_ac_Header=\$ac_header_preproc"
--fi
--echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
--echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
--
--fi
--if test `eval echo '${'$as_ac_Header'}'` = yes; then
-- cat >>confdefs.h <<_ACEOF
--#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
--_ACEOF
--
--fi
--
--done
-
- CPPFLAGS=$kde_safe_cppflags
- ac_ext=c
--- /dev/null
+++ x11/kdelibs3/files/patch-kdeui-kactionclasses.cpp
@@ -0,0 +1,13 @@
+--- kdeui/kactionclasses.cpp 2007/10/08 11:32:36 722993
++++ kdeui/kactionclasses.cpp 2007/10/20 20:49:01 727528
+@@ -667,8 +667,8 @@
+ KToolBar* bar = static_cast<KToolBar*>( widget );
+ int id_ = KAction::getToolButtonID();
+ bar->insertCombo( comboItems(), id_, isEditable(),
+- SIGNAL( activated( int ) ), this,
+- SLOT( slotActivated( int ) ), isEnabled(),
++ SIGNAL( activated( const QString & ) ), this,
++ SLOT( slotActivated( const QString & ) ), isEnabled(),
+ toolTip(), -1, index );
+
+ QComboBox *cb = bar->getCombo( id_ );
--- x11/kdelibs3/files/patch-kcmshell-Makefile.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- kcmshell/Makefile.in.orig Thu Sep 14 05:45:09 2006
-+++ kcmshell/Makefile.in Thu Sep 14 05:45:54 2006
-@@ -1033,7 +1033,7 @@
- echo 'extern "C" int kdemain(int argc, char* argv[]);' >> kcmshell_dummy.cpp; \
- echo 'extern "C" KDE_EXPORT int kdeinitmain(int argc, char* argv[]) { return kdemain(argc,argv); }' >> kcmshell_dummy.cpp
- kcmshell_LDFLAGS = $(KDE_RPATH) -no-undefined $(all_libraries)
--kcmshell_LDADD = libkdeinit_kcmshell.la
-+kcmshell_LDADD = libkdeinit_kcmshell.la -lintl
- kcmshell_DEPENDENCIES = libkdeinit_kcmshell.la
-
- #>+ 5
More information about the Midnightbsd-cvs
mailing list