Update of /cvsroot/fink/experimental/rangerrick/common/crypto/finkinfo
In directory
sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13885/common/crypto/finkinfo
Modified Files:
kdebase3-ssl.info kdebase3-ssl.patch
Log Message:
put the trash back
Index: kdebase3-ssl.info
===================================================================
RCS file:
/cvsroot/fink/experimental/rangerrick/common/crypto/finkinfo/kdebase3-ssl.info,v
retrieving revision 1.90
retrieving revision 1.91
diff -u -d -r1.90 -r1.91
--- kdebase3-ssl.info 21 Apr 2005 22:26:44 -0000 1.90
+++ kdebase3-ssl.info 27 Apr 2005 16:50:00 -0000 1.91
@@ -1,6 +1,6 @@
Package: kdebase3-ssl
Version: 3.4.0
-Revision: 4
+Revision: 5
Description: KDE - base system (with SSL)
License: GPL/LGPL
Maintainer: Benjamin Reed <[EMAIL PROTECTED]>
Index: kdebase3-ssl.patch
===================================================================
RCS file:
/cvsroot/fink/experimental/rangerrick/common/crypto/finkinfo/kdebase3-ssl.patch,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -d -r1.39 -r1.40
--- kdebase3-ssl.patch 21 Apr 2005 22:26:44 -0000 1.39
+++ kdebase3-ssl.patch 27 Apr 2005 16:50:01 -0000 1.40
@@ -372,67 +372,6 @@
METASOURCES = AUTO
---- kdebase-3.4.0/kdesktop/init.cc Thu Feb 3 18:18:56 2005
-+++ kdebase-3.4.0-new/kdesktop/init.cc Mon Mar 21 19:32:57 2005
-@@ -42,6 +42,9 @@
- #include <errno.h>
- #include <ksimpleconfig.h>
-
-+#include <sys/attr.h>
-+#include <sys/paths.h>
-+
- // for multihead
- extern int kdesktop_screen_number;
-
-@@ -210,21 +213,33 @@
- const QString trashDesktopPath = desktopPath + "/trash.desktop";
- const bool trashDesktopExists = QFile::exists( trashDesktopPath );
- const bool installNewTrashi18n = newRelease && trashDesktopExists; // not
if deleted by user
-- if ( emptyDesktop || firstTimeWithNewTrash || installNewTrashi18n ) {
-- QString oldIcon, oldEmptyIcon;
-- if ( trashDesktopExists ) {
-- KDesktopFile trashDesktop( trashDesktopPath, true );
-- oldIcon = trashDesktop.readIcon();
-- oldEmptyIcon = trashDesktop.readEntry( "EmptyIcon" );
-- }
-- copyFile( locate( "data", "kdesktop/directory.trash" ),
trashDesktopPath );
-- if ( trashDesktopExists ) {
-- KDesktopFile trashDesktop( trashDesktopPath );
-- trashDesktop.writeEntry( "Icon", oldIcon );
-- trashDesktop.writeEntry( "EmptyIcon", oldEmptyIcon );
-- trashDesktop.sync();
-- }
-- }
-+// if ( emptyDesktop || firstTimeWithNewTrash || installNewTrashi18n ) {
-+// QString oldIcon, oldEmptyIcon;
-+// if ( trashDesktopExists ) {
-+// KDesktopFile trashDesktop( trashDesktopPath, true );
-+// oldIcon = trashDesktop.readIcon();
-+// oldEmptyIcon = trashDesktop.readEntry( "EmptyIcon" );
-+// }
-+// copyFile( locate( "data", "kdesktop/directory.trash" ),
trashDesktopPath );
-+// if ( trashDesktopExists ) {
-+// KDesktopFile trashDesktop( trashDesktopPath );
-+// trashDesktop.writeEntry( "Icon", oldIcon );
-+// trashDesktop.writeEntry( "EmptyIcon", oldEmptyIcon );
-+// trashDesktop.sync();
-+// }
-+// fileinfobuf finfo;
-+// struct attrlist alist;
-+// int result = getattrlist(trashDesktopPath, &alist, &finfo,
sizeof(fileinfobuf), 0);
-+// if (result != 0) {
-+// kdDebug() << "couldn't get attribute list for " <<
trashDesktopPath << endl;
-+// } else {
-+// finfo.data.finder.fdFlags |= kFinfoIsInvisible;
-+// result = setattrlist(trashDesktopPath, &alist, &finfo.data,
sizeof(finfo.data), 0);
-+// if (result != 0) {
-+// kdDebug() << "couldn't set attribute list for " <<
trashDesktopPath << endl;
-+// }
-+// }
-+// }
-
- if ( firstTimeWithNewTrash ) { // migrate pre-kde-3.4 trash contents
- QByteArray packedArgs;
--- kdebase-3.4.0/kdesktop/init.h Sun Oct 31 17:53:12 1999
+++ kdebase-3.4.0-new/kdesktop/init.h Mon Mar 21 19:32:57 2005
@@ -27,4 +27,18 @@
-------------------------------------------------------
SF.Net email is sponsored by: Tell us your software development plans!
Take this survey and enter to win a one-year sub to SourceForge.net
Plus IDC's 2005 look-ahead and a copy of this survey
Click here to start! http://www.idcswdc.com/cgi-bin/survey?id=105hix
_______________________________________________
Fink-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/fink-commits
