diff options
author | Will Andrews <will@FreeBSD.org> | 2002-04-22 02:00:06 +0000 |
---|---|---|
committer | Will Andrews <will@FreeBSD.org> | 2002-04-22 02:00:06 +0000 |
commit | ad3b02c65e4632f2704a52af22bb9815bbf51178 (patch) | |
tree | 4cd57208b7f23ced9dc8d464d11547b2077b7adb /x11/kdelibs4/files | |
parent | Reclaim maintainership. (diff) |
Update to 3.0.
Notes
Notes:
svn path=/head/; revision=57969
Diffstat (limited to 'x11/kdelibs4/files')
-rw-r--r-- | x11/kdelibs4/files/kde.dist | 238 | ||||
-rw-r--r-- | x11/kdelibs4/files/kdelibs.sh | 2 | ||||
-rw-r--r-- | x11/kdelibs4/files/patch-arts::kde::kplayobjectfactory.cc | 29 | ||||
-rw-r--r-- | x11/kdelibs4/files/patch-configure | 20 | ||||
-rw-r--r-- | x11/kdelibs4/files/patch-kaclmanipulation.h | 15 | ||||
-rw-r--r-- | x11/kdelibs4/files/patch-kdeprint::imagetops | 25 | ||||
-rw-r--r-- | x11/kdelibs4/files/patch-kdesu::kdesu_pty.cpp | 18 | ||||
-rw-r--r-- | x11/kdelibs4/files/patch-kdesu::process.cpp | 39 | ||||
-rw-r--r-- | x11/kdelibs4/files/patch-kdoctools::Makefile.in | 14 | ||||
-rw-r--r-- | x11/kdelibs4/files/patch-kdoctools::xml2man.cpp | 13 | ||||
-rw-r--r-- | x11/kdelibs4/files/patch-kdoctools::xslt.cpp | 13 | ||||
-rw-r--r-- | x11/kdelibs4/files/patch-kio::job.cpp | 11 |
12 files changed, 21 insertions, 416 deletions
diff --git a/x11/kdelibs4/files/kde.dist b/x11/kdelibs4/files/kde.dist deleted file mode 100644 index 65ff97346b0e..000000000000 --- a/x11/kdelibs4/files/kde.dist +++ /dev/null @@ -1,238 +0,0 @@ -# $FreeBSD: /tmp/pcvs/ports/x11/kdelibs4/files/Attic/kde.dist,v 1.2 2000-03-25 19:42:56 imura Exp $ -# - -/set type=dir uname=root gname=wheel mode=0755 -. - share - applnk - Applications - .. - Development - .. - Games - .. - Graphics - .. - Internet - .. - Multimedia - .. - Network - .. - Settings - .. - System - .. - Utilities - .. - .. - apps - .. - config - .. - doc - HTML - cs - .. - da - .. - de - .. - el - .. - es - .. - fi - .. - fr - .. - hu - .. - ja - .. - it - .. - nl - .. - pl - .. - pt - .. - ru - .. - sv - .. - zh_CN.GB2312 - .. - .. - .. - icons - large - .. - mini - .. - .. - locale - br - LC_MESSAGES - .. - .. - ca - LC_MESSAGES - .. - .. - cs - LC_MESSAGES - .. - .. - da - LC_MESSAGES - .. - .. - de - LC_MESSAGES - .. - .. - el - LC_MESSAGES - .. - .. - en_UK - LC_MESSAGES - .. - .. - eo - LC_MESSAGES - .. - .. - es - LC_MESSAGES - .. - .. - et - LC_MESSAGES - .. - .. - fi - LC_MESSAGES - .. - .. - fr - LC_MESSAGES - .. - .. - he - LC_MESSAGES - .. - .. - hr - LC_MESSAGES - .. - .. - hs - LC_MESSAGES - .. - .. - hu - LC_MESSAGES - .. - .. - is - LC_MESSAGES - .. - .. - it - LC_MESSAGES - .. - .. - ja - LC_MESSAGES - .. - .. - ko - LC_MESSAGES - .. - .. - mk - LC_MESSAGES - .. - .. - nl - LC_MESSAGES - .. - .. - no - LC_MESSAGES - .. - .. - pl - LC_MESSAGES - .. - .. - pt - LC_MESSAGES - .. - .. - pt_BR - LC_MESSAGES - .. - .. - ro - LC_MESSAGES - .. - .. - ru - LC_MESSAGES - .. - .. - sk - LC_MESSAGES - .. - .. - sl - LC_MESSAGES - .. - .. - sv - LC_MESSAGES - .. - .. - th - LC_MESSAGES - .. - .. - tr - LC_MESSAGES - .. - .. - zh_CN.GB2312 - LC_MESSAGES - .. - .. - zh_TW.Big5 - LC_MESSAGES - .. - .. - .. - mimelnk - application - .. - audio - .. - image - .. - inode - .. - text - .. - video - .. - .. - sounds - .. - toolbar - .. - wallpapers - .. - .. -.. diff --git a/x11/kdelibs4/files/kdelibs.sh b/x11/kdelibs4/files/kdelibs.sh index 737bab123af7..24568777caf1 100644 --- a/x11/kdelibs4/files/kdelibs.sh +++ b/x11/kdelibs4/files/kdelibs.sh @@ -1,3 +1,3 @@ #!/bin/sh PREFIX=%%PREFIX%% -ldconfig -m $PREFIX/lib/kde2 +ldconfig -m $PREFIX/lib/kde3 diff --git a/x11/kdelibs4/files/patch-arts::kde::kplayobjectfactory.cc b/x11/kdelibs4/files/patch-arts::kde::kplayobjectfactory.cc deleted file mode 100644 index e6a77b3e34a2..000000000000 --- a/x11/kdelibs4/files/patch-arts::kde::kplayobjectfactory.cc +++ /dev/null @@ -1,29 +0,0 @@ -$FreeBSD$ - ---- arts/kde/kplayobjectfactory.cc.orig Sat May 19 13:07:41 2001 -+++ arts/kde/kplayobjectfactory.cc Fri Dec 7 10:54:40 2001 -@@ -20,6 +20,7 @@ - */ - - #include <kio/kmimetype.h> -+#include <qfile.h> - #include "kplayobject.h" - #include "artskde.h" - #include "kplayobjectfactory.h" -@@ -49,13 +50,13 @@ - if(mimetype == "application/octet-stream" && m_allowStreaming) - { - Arts::KIOInputStream instream; -- instream.openURL(url.prettyURL().latin1()); -+ instream.openURL(url.url().latin1()); - - // TODO: what else than hardcoding audio/x-mp3 ? - return new KPlayObject(m_server.createPlayObjectForStream(instream, string("audio/x-mp3"), createBUS), true); - } - else -- return new KPlayObject(m_server.createPlayObjectForURL(string(url.path().latin1()), string(mimetype.latin1()), createBUS), false); -+ return new KPlayObject(m_server.createPlayObjectForURL(string(QFile::encodeName(url.path())), string(mimetype.latin1()), createBUS), false); - } - else - return new KPlayObject(); - diff --git a/x11/kdelibs4/files/patch-configure b/x11/kdelibs4/files/patch-configure new file mode 100644 index 000000000000..088311a730e5 --- /dev/null +++ b/x11/kdelibs4/files/patch-configure @@ -0,0 +1,20 @@ +--- kdeprint/configure.in.in 2001/10/15 08:28:25 1.10 ++++ kdeprint/configure.in.in.new 2002/04/11 16:14:37 +@@ -5,7 +5,8 @@ kde_save_libs="$LIBS" + LIBS="$all_libraries $USER_LDFLAGS -lcups $LIBDL $LIBSOCKET" + CFLAGS="$CFLAGS $all_includes $USER_INCLUDES" + AC_MSG_CHECKING(CUPS version >= $1) +-ac_link='${CC} $CFLAGS -o conftest conftest.c $LIBS 1>&5' ++AC_LANG_SAVE ++AC_LANG_C + cat > conftest.c <<EOF + #include <cups/cups.h> + #include <stdio.h> +@@ -30,6 +31,7 @@ else + ac_have_new_cups="no" + fi + rm -f conftest* ++AC_LANG_RESTORE + CFLAGS="$kde_save_cflags" + LIBS="$kde_save_libs" + AC_MSG_RESULT("$ac_have_new_cups") diff --git a/x11/kdelibs4/files/patch-kaclmanipulation.h b/x11/kdelibs4/files/patch-kaclmanipulation.h deleted file mode 100644 index 27b11b58c52c..000000000000 --- a/x11/kdelibs4/files/patch-kaclmanipulation.h +++ /dev/null @@ -1,15 +0,0 @@ ---- kfile/acl_prop_page/kaclmanipulation.h Tue May 22 03:16:09 2001 -+++ kfile/acl_prop_page/kaclmanipulation.h.new Sun Mar 24 13:52:31 2002 -@@ -40,7 +40,6 @@ - - #ifndef KACLMANIP_H - #define KACLMANIP_H "$Id: kaclmanipulation.h,v 1.3 2001/05/22 08:16:09 garbanzo Exp $" --#endif - - #include <sys/types.h> - #include <sys/acl.h> -@@ -85,3 +84,4 @@ - }; - - }; -+#endif diff --git a/x11/kdelibs4/files/patch-kdeprint::imagetops b/x11/kdelibs4/files/patch-kdeprint::imagetops deleted file mode 100644 index 518e0b981e59..000000000000 --- a/x11/kdelibs4/files/patch-kdeprint::imagetops +++ /dev/null @@ -1,25 +0,0 @@ ---- kdeprint/filters/imagetops.orig Wed Nov 28 12:25:21 2001 -+++ kdeprint/filters/imagetops Wed Nov 28 12:29:50 2001 -@@ -27,11 +27,17 @@ - # check the file mime type, and set the command correspondingly - cmd= - magic=`file -bi $FILE` --if [[ $magic != image/* ]] ; then -- echo "Not an image" -- exit 1; --fi --case ${magic/image\//} in -+ -+case $magic in -+ image/*) -+ ;; -+ *) -+ echo "Not an image" -+ exit 1; -+ ;; -+esac -+ -+case ${magic##image\/} in - jpeg) - cmd="djpeg -pnm" - ;; diff --git a/x11/kdelibs4/files/patch-kdesu::kdesu_pty.cpp b/x11/kdelibs4/files/patch-kdesu::kdesu_pty.cpp deleted file mode 100644 index 74be807e3786..000000000000 --- a/x11/kdelibs4/files/patch-kdesu::kdesu_pty.cpp +++ /dev/null @@ -1,18 +0,0 @@ ---- kdesu/kdesu_pty.cpp.orig Wed Apr 11 12:48:56 2001 -+++ kdesu/kdesu_pty.cpp Thu Jan 10 18:35:17 2002 -@@ -101,13 +101,13 @@ - #elif defined(HAVE_OPENPTY) - // 2: BSD interface - // More prefered than the linux hacks -- char name[10]; -+ char name[30]; - int master_fd, slave_fd; - if (openpty(&master_fd, &slave_fd, name, 0L, 0L) != -1) { - ttyname = name; - name[5]='p'; - ptyname = name; -- //close(slave_fd); // We don't need this yet // Yes, we do. -+ close(slave_fd); // We don't need this yet // Yes, we do. - ptyfd = master_fd; - return ptyfd; - } diff --git a/x11/kdelibs4/files/patch-kdesu::process.cpp b/x11/kdelibs4/files/patch-kdesu::process.cpp deleted file mode 100644 index 610789408085..000000000000 --- a/x11/kdelibs4/files/patch-kdesu::process.cpp +++ /dev/null @@ -1,39 +0,0 @@ ---- kdesu/process.cpp.orig Sat Feb 17 21:03:18 2001 -+++ kdesu/process.cpp Fri Jan 11 21:23:41 2002 -@@ -120,13 +120,16 @@ - kdError(900) << k_lineinfo << "fcntl(F_GETFL): " << perror << "\n"; - return ret; - } -+ int oflags = flags; - if (block) - flags &= ~O_NONBLOCK; - else - flags |= O_NONBLOCK; -- if (fcntl(m_Fd, F_SETFL, flags) < 0) -+ -+ if ((flags != oflags) && (fcntl(m_Fd, F_SETFL, flags) < 0)) - { -- kdError(900) << k_lineinfo << "fcntl(F_SETFL): " << perror << "\n"; -+ // We get an error here when the child process has closed -+ // the file descriptor already. - return ret; - } - -@@ -231,12 +234,12 @@ - path = QFile::encodeName(file); - } - -- int i; -- const char * argp[32]; -- argp[0] = path; -- QCStringList::Iterator it; -- for (i=1, it=args.begin(); it!=args.end() && i<31; it++) -+ const char **argp = (const char **)malloc((args.count()+2)*sizeof(char *)); -+ int i = 0; -+ argp[i++] = path; -+ for (QCStringList::ConstIterator it=args.begin(); it!=args.end(); it++) - argp[i++] = *it; -+ - argp[i] = 0L; - - execv(path, (char * const *)argp); diff --git a/x11/kdelibs4/files/patch-kdoctools::Makefile.in b/x11/kdelibs4/files/patch-kdoctools::Makefile.in deleted file mode 100644 index 42e4165ac2a7..000000000000 --- a/x11/kdelibs4/files/patch-kdoctools::Makefile.in +++ /dev/null @@ -1,14 +0,0 @@ ---- kdoctools/Makefile.in Sun Aug 5 20:27:17 2001 -+++ kdoctools/Makefile.in.new Tue Aug 28 20:08:34 2001 -@@ -757,10 +757,7 @@ - - - xslt_pure.o: xslt.cpp -- -rm -f xslt_pure.cpp -- $(LN_S) $(srcdir)/xslt.cpp xslt_pure.cpp -- $(CXXCOMPILE) -DSIMPLE_XSLT -c xslt_pure.cpp -- -rm -f xslt_pure.cpp -+ $(CXXCOMPILE) -DSIMPLE_XSLT -c xslt.cpp -o xslt_pure.o - - messages: - $(XGETTEXT) *.cpp -o $(podir)/kdebase/kio_help.pot diff --git a/x11/kdelibs4/files/patch-kdoctools::xml2man.cpp b/x11/kdelibs4/files/patch-kdoctools::xml2man.cpp deleted file mode 100644 index 891dc9bcb853..000000000000 --- a/x11/kdelibs4/files/patch-kdoctools::xml2man.cpp +++ /dev/null @@ -1,13 +0,0 @@ ---- kdoctools/xml2man.cpp Sat Jul 28 23:55:05 2001 -+++ kdoctools/xml2man.cpp.new Wed Aug 29 18:10:54 2001 -@@ -63,9 +63,7 @@ - QString pat = args->arg( 0 ); - QFile xmlFile( pat ); - xmlFile.open(IO_ReadOnly); -- QCString contents; -- contents.assign(xmlFile.readAll()); -- contents.truncate(xmlFile.size()); -+ QCString contents(xmlFile.readAll(), xmlFile.size() + 1); - xmlFile.close(); - - contents.replace( QRegExp( "<!--[^-]*-->" ), "" ); diff --git a/x11/kdelibs4/files/patch-kdoctools::xslt.cpp b/x11/kdelibs4/files/patch-kdoctools::xslt.cpp deleted file mode 100644 index aa384e393527..000000000000 --- a/x11/kdelibs4/files/patch-kdoctools::xslt.cpp +++ /dev/null @@ -1,13 +0,0 @@ ---- kdoctools/xslt.cpp Mon Jul 30 17:11:20 2001 -+++ kdoctools/xslt.cpp.new Tue Aug 28 20:09:34 2001 -@@ -86,9 +86,7 @@ - INFO(i18n("Reading document")); - QFile xmlFile( pat ); - xmlFile.open(IO_ReadOnly); -- QCString contents; -- contents.assign(xmlFile.readAll()); -- contents.truncate(xmlFile.size()); -+ QCString contents(xmlFile.readAll(), xmlFile.size() + 1); - xmlFile.close(); - /* if (contents.left(5) != "<?xml") { - fprintf(stderr, "xmlizer\n"); diff --git a/x11/kdelibs4/files/patch-kio::job.cpp b/x11/kdelibs4/files/patch-kio::job.cpp deleted file mode 100644 index 113a0eb1a13e..000000000000 --- a/x11/kdelibs4/files/patch-kio::job.cpp +++ /dev/null @@ -1,11 +0,0 @@ ---- kio/job.cpp.20011019 Fri Oct 19 16:09:57 2001 -+++ kio/job.cpp Tue Oct 30 21:49:15 2001 -@@ -2472,7 +2472,7 @@ - // But for files coming from TAR, we want to preserve permissions -> we use default perms only if from remote - // The real fix would be KProtocolInfo::inputType(protocol) == T_FILESYSTEM, but we can't access ksycoca from here ! - bool remoteSource = !(*it).uSource.isLocalFile() && ((*it).uSource.protocol() != "tar"); // HACK -- mode_t permissions = ( remoteSource && (*it).uDest.isLocalFile() ) ? (mode_t)-1 : (*it).permissions; -+ int permissions = ( remoteSource && (*it).uDest.isLocalFile() ) ? -1 : (*it).permissions; - KIO::FileCopyJob * copyJob = KIO::file_copy( (*it).uSource, (*it).uDest, permissions, bOverwrite, false, false/*no GUI*/ ); - copyJob->setSourceSize( (*it).size ); - newjob = copyJob; |