From ab69db3c08fdb4db2b5233e2f71f92bde42de8f3 Mon Sep 17 00:00:00 2001 From: Alan Eldridge Date: Thu, 18 Jul 2002 11:16:37 +0000 Subject: [PATCH] Fixed obnoxious bug where a new ~/Desktop dir would be created with read-only files (including a RO .directory), which prevented certain changes, like moving icons around, from persisting to next session. They used system("cp file1 file2") to create the new dirs. PORTREVISION was bumped on this one, since it is a significant fix, and it does affect installation of files (in the user's $HOME). PR: 39980 --- x11/kde4-baseapps/Makefile | 1 + .../files/patch-kdesktop-init.cc | 22 +++++++++++++++++++ x11/kde4-runtime/Makefile | 1 + x11/kde4-runtime/files/patch-kdesktop-init.cc | 22 +++++++++++++++++++ x11/kde4-workspace/Makefile | 1 + .../files/patch-kdesktop-init.cc | 22 +++++++++++++++++++ x11/kdebase3/Makefile | 1 + x11/kdebase3/files/patch-kdesktop-init.cc | 22 +++++++++++++++++++ x11/kdebase4-runtime/Makefile | 1 + .../files/patch-kdesktop-init.cc | 22 +++++++++++++++++++ x11/kdebase4-workspace/Makefile | 1 + .../files/patch-kdesktop-init.cc | 22 +++++++++++++++++++ x11/kdebase4/Makefile | 1 + x11/kdebase4/files/patch-kdesktop-init.cc | 22 +++++++++++++++++++ 14 files changed, 161 insertions(+) create mode 100644 x11/kde4-baseapps/files/patch-kdesktop-init.cc create mode 100644 x11/kde4-runtime/files/patch-kdesktop-init.cc create mode 100644 x11/kde4-workspace/files/patch-kdesktop-init.cc create mode 100644 x11/kdebase3/files/patch-kdesktop-init.cc create mode 100644 x11/kdebase4-runtime/files/patch-kdesktop-init.cc create mode 100644 x11/kdebase4-workspace/files/patch-kdesktop-init.cc create mode 100644 x11/kdebase4/files/patch-kdesktop-init.cc diff --git a/x11/kde4-baseapps/Makefile b/x11/kde4-baseapps/Makefile index 90854ebb4d7b..ade5079ca105 100644 --- a/x11/kde4-baseapps/Makefile +++ b/x11/kde4-baseapps/Makefile @@ -7,6 +7,7 @@ PORTNAME= kdebase PORTVERSION= ${KDE_VERSION} +PORTREVISION= 1 CATEGORIES?= x11 kde MASTER_SITES= ${MASTER_SITE_KDE} MASTER_SITE_SUBDIR= stable/${PORTVERSION}/src diff --git a/x11/kde4-baseapps/files/patch-kdesktop-init.cc b/x11/kde4-baseapps/files/patch-kdesktop-init.cc new file mode 100644 index 000000000000..f7fe48544866 --- /dev/null +++ b/x11/kde4-baseapps/files/patch-kdesktop-init.cc @@ -0,0 +1,22 @@ +--- kdesktop/init.cc.orig Fri Oct 12 15:11:13 2001 ++++ kdesktop/init.cc Thu Jul 18 06:48:59 2002 +@@ -80,6 +80,9 @@ + QFile::encodeName(locate("data", QString("kdesktop/") + fileName)).data(), + QFile::encodeName(dir).data() ); + system( cmd ); ++ cmd.sprintf( "chmod 644 %s/.directory", ++ QFile::encodeName(dir).data() ); ++ system( cmd ); + } + } + +@@ -106,6 +109,9 @@ + cmd += "' '"; + cmd += QFile::encodeName(desktopPath + desk.readName()); + cmd += "'"; ++ system( cmd ); ++ cmd.sprintf("chmod 644 '%s'", ++ QFile::encodeName(desktopPath + desk.readName()).data()); + system( cmd ); + } + } diff --git a/x11/kde4-runtime/Makefile b/x11/kde4-runtime/Makefile index 90854ebb4d7b..ade5079ca105 100644 --- a/x11/kde4-runtime/Makefile +++ b/x11/kde4-runtime/Makefile @@ -7,6 +7,7 @@ PORTNAME= kdebase PORTVERSION= ${KDE_VERSION} +PORTREVISION= 1 CATEGORIES?= x11 kde MASTER_SITES= ${MASTER_SITE_KDE} MASTER_SITE_SUBDIR= stable/${PORTVERSION}/src diff --git a/x11/kde4-runtime/files/patch-kdesktop-init.cc b/x11/kde4-runtime/files/patch-kdesktop-init.cc new file mode 100644 index 000000000000..f7fe48544866 --- /dev/null +++ b/x11/kde4-runtime/files/patch-kdesktop-init.cc @@ -0,0 +1,22 @@ +--- kdesktop/init.cc.orig Fri Oct 12 15:11:13 2001 ++++ kdesktop/init.cc Thu Jul 18 06:48:59 2002 +@@ -80,6 +80,9 @@ + QFile::encodeName(locate("data", QString("kdesktop/") + fileName)).data(), + QFile::encodeName(dir).data() ); + system( cmd ); ++ cmd.sprintf( "chmod 644 %s/.directory", ++ QFile::encodeName(dir).data() ); ++ system( cmd ); + } + } + +@@ -106,6 +109,9 @@ + cmd += "' '"; + cmd += QFile::encodeName(desktopPath + desk.readName()); + cmd += "'"; ++ system( cmd ); ++ cmd.sprintf("chmod 644 '%s'", ++ QFile::encodeName(desktopPath + desk.readName()).data()); + system( cmd ); + } + } diff --git a/x11/kde4-workspace/Makefile b/x11/kde4-workspace/Makefile index 90854ebb4d7b..ade5079ca105 100644 --- a/x11/kde4-workspace/Makefile +++ b/x11/kde4-workspace/Makefile @@ -7,6 +7,7 @@ PORTNAME= kdebase PORTVERSION= ${KDE_VERSION} +PORTREVISION= 1 CATEGORIES?= x11 kde MASTER_SITES= ${MASTER_SITE_KDE} MASTER_SITE_SUBDIR= stable/${PORTVERSION}/src diff --git a/x11/kde4-workspace/files/patch-kdesktop-init.cc b/x11/kde4-workspace/files/patch-kdesktop-init.cc new file mode 100644 index 000000000000..f7fe48544866 --- /dev/null +++ b/x11/kde4-workspace/files/patch-kdesktop-init.cc @@ -0,0 +1,22 @@ +--- kdesktop/init.cc.orig Fri Oct 12 15:11:13 2001 ++++ kdesktop/init.cc Thu Jul 18 06:48:59 2002 +@@ -80,6 +80,9 @@ + QFile::encodeName(locate("data", QString("kdesktop/") + fileName)).data(), + QFile::encodeName(dir).data() ); + system( cmd ); ++ cmd.sprintf( "chmod 644 %s/.directory", ++ QFile::encodeName(dir).data() ); ++ system( cmd ); + } + } + +@@ -106,6 +109,9 @@ + cmd += "' '"; + cmd += QFile::encodeName(desktopPath + desk.readName()); + cmd += "'"; ++ system( cmd ); ++ cmd.sprintf("chmod 644 '%s'", ++ QFile::encodeName(desktopPath + desk.readName()).data()); + system( cmd ); + } + } diff --git a/x11/kdebase3/Makefile b/x11/kdebase3/Makefile index 90854ebb4d7b..ade5079ca105 100644 --- a/x11/kdebase3/Makefile +++ b/x11/kdebase3/Makefile @@ -7,6 +7,7 @@ PORTNAME= kdebase PORTVERSION= ${KDE_VERSION} +PORTREVISION= 1 CATEGORIES?= x11 kde MASTER_SITES= ${MASTER_SITE_KDE} MASTER_SITE_SUBDIR= stable/${PORTVERSION}/src diff --git a/x11/kdebase3/files/patch-kdesktop-init.cc b/x11/kdebase3/files/patch-kdesktop-init.cc new file mode 100644 index 000000000000..f7fe48544866 --- /dev/null +++ b/x11/kdebase3/files/patch-kdesktop-init.cc @@ -0,0 +1,22 @@ +--- kdesktop/init.cc.orig Fri Oct 12 15:11:13 2001 ++++ kdesktop/init.cc Thu Jul 18 06:48:59 2002 +@@ -80,6 +80,9 @@ + QFile::encodeName(locate("data", QString("kdesktop/") + fileName)).data(), + QFile::encodeName(dir).data() ); + system( cmd ); ++ cmd.sprintf( "chmod 644 %s/.directory", ++ QFile::encodeName(dir).data() ); ++ system( cmd ); + } + } + +@@ -106,6 +109,9 @@ + cmd += "' '"; + cmd += QFile::encodeName(desktopPath + desk.readName()); + cmd += "'"; ++ system( cmd ); ++ cmd.sprintf("chmod 644 '%s'", ++ QFile::encodeName(desktopPath + desk.readName()).data()); + system( cmd ); + } + } diff --git a/x11/kdebase4-runtime/Makefile b/x11/kdebase4-runtime/Makefile index 90854ebb4d7b..ade5079ca105 100644 --- a/x11/kdebase4-runtime/Makefile +++ b/x11/kdebase4-runtime/Makefile @@ -7,6 +7,7 @@ PORTNAME= kdebase PORTVERSION= ${KDE_VERSION} +PORTREVISION= 1 CATEGORIES?= x11 kde MASTER_SITES= ${MASTER_SITE_KDE} MASTER_SITE_SUBDIR= stable/${PORTVERSION}/src diff --git a/x11/kdebase4-runtime/files/patch-kdesktop-init.cc b/x11/kdebase4-runtime/files/patch-kdesktop-init.cc new file mode 100644 index 000000000000..f7fe48544866 --- /dev/null +++ b/x11/kdebase4-runtime/files/patch-kdesktop-init.cc @@ -0,0 +1,22 @@ +--- kdesktop/init.cc.orig Fri Oct 12 15:11:13 2001 ++++ kdesktop/init.cc Thu Jul 18 06:48:59 2002 +@@ -80,6 +80,9 @@ + QFile::encodeName(locate("data", QString("kdesktop/") + fileName)).data(), + QFile::encodeName(dir).data() ); + system( cmd ); ++ cmd.sprintf( "chmod 644 %s/.directory", ++ QFile::encodeName(dir).data() ); ++ system( cmd ); + } + } + +@@ -106,6 +109,9 @@ + cmd += "' '"; + cmd += QFile::encodeName(desktopPath + desk.readName()); + cmd += "'"; ++ system( cmd ); ++ cmd.sprintf("chmod 644 '%s'", ++ QFile::encodeName(desktopPath + desk.readName()).data()); + system( cmd ); + } + } diff --git a/x11/kdebase4-workspace/Makefile b/x11/kdebase4-workspace/Makefile index 90854ebb4d7b..ade5079ca105 100644 --- a/x11/kdebase4-workspace/Makefile +++ b/x11/kdebase4-workspace/Makefile @@ -7,6 +7,7 @@ PORTNAME= kdebase PORTVERSION= ${KDE_VERSION} +PORTREVISION= 1 CATEGORIES?= x11 kde MASTER_SITES= ${MASTER_SITE_KDE} MASTER_SITE_SUBDIR= stable/${PORTVERSION}/src diff --git a/x11/kdebase4-workspace/files/patch-kdesktop-init.cc b/x11/kdebase4-workspace/files/patch-kdesktop-init.cc new file mode 100644 index 000000000000..f7fe48544866 --- /dev/null +++ b/x11/kdebase4-workspace/files/patch-kdesktop-init.cc @@ -0,0 +1,22 @@ +--- kdesktop/init.cc.orig Fri Oct 12 15:11:13 2001 ++++ kdesktop/init.cc Thu Jul 18 06:48:59 2002 +@@ -80,6 +80,9 @@ + QFile::encodeName(locate("data", QString("kdesktop/") + fileName)).data(), + QFile::encodeName(dir).data() ); + system( cmd ); ++ cmd.sprintf( "chmod 644 %s/.directory", ++ QFile::encodeName(dir).data() ); ++ system( cmd ); + } + } + +@@ -106,6 +109,9 @@ + cmd += "' '"; + cmd += QFile::encodeName(desktopPath + desk.readName()); + cmd += "'"; ++ system( cmd ); ++ cmd.sprintf("chmod 644 '%s'", ++ QFile::encodeName(desktopPath + desk.readName()).data()); + system( cmd ); + } + } diff --git a/x11/kdebase4/Makefile b/x11/kdebase4/Makefile index 90854ebb4d7b..ade5079ca105 100644 --- a/x11/kdebase4/Makefile +++ b/x11/kdebase4/Makefile @@ -7,6 +7,7 @@ PORTNAME= kdebase PORTVERSION= ${KDE_VERSION} +PORTREVISION= 1 CATEGORIES?= x11 kde MASTER_SITES= ${MASTER_SITE_KDE} MASTER_SITE_SUBDIR= stable/${PORTVERSION}/src diff --git a/x11/kdebase4/files/patch-kdesktop-init.cc b/x11/kdebase4/files/patch-kdesktop-init.cc new file mode 100644 index 000000000000..f7fe48544866 --- /dev/null +++ b/x11/kdebase4/files/patch-kdesktop-init.cc @@ -0,0 +1,22 @@ +--- kdesktop/init.cc.orig Fri Oct 12 15:11:13 2001 ++++ kdesktop/init.cc Thu Jul 18 06:48:59 2002 +@@ -80,6 +80,9 @@ + QFile::encodeName(locate("data", QString("kdesktop/") + fileName)).data(), + QFile::encodeName(dir).data() ); + system( cmd ); ++ cmd.sprintf( "chmod 644 %s/.directory", ++ QFile::encodeName(dir).data() ); ++ system( cmd ); + } + } + +@@ -106,6 +109,9 @@ + cmd += "' '"; + cmd += QFile::encodeName(desktopPath + desk.readName()); + cmd += "'"; ++ system( cmd ); ++ cmd.sprintf("chmod 644 '%s'", ++ QFile::encodeName(desktopPath + desk.readName()).data()); + system( cmd ); + } + }