summaryrefslogtreecommitdiff
path: root/misc/kdeutils4/files
diff options
context:
space:
mode:
authorAlberto Villa <avilla@FreeBSD.org>2011-10-17 00:03:42 +0000
committerAlberto Villa <avilla@FreeBSD.org>2011-10-17 00:03:42 +0000
commita2d3b5a4bc5047210b788a128596ec34749ffa11 (patch)
treec3c20b47c3435ddcaf02b8570db6aab5b70011af /misc/kdeutils4/files
parent- Add dependency on security/pam_kde. (diff)
The KDE/FreeBSD team is pleased to announce KDE Software Compilation
4.7.2. The official release notes can be found at: http://kde.org/announcements/announce-4.7.2.php This release ships with many improvements. Read more about them here: http://FreeBSD.kde.org/news.php#itemKDESC472availableinports We'd like to say thanks to all testers and contributors, especially to lwhsu@ for his effort on hosting our test packages. PR: 156293 [1] 159219 [2] 160164 [3] Submitted by: Oleg Sidorkin <osidorkin@gmail.com> [1] Alvaro Castillo <gobledb@gmail.com> [2] dkeav04@gmail.com [3] Tested by: exp-run via pav
Notes
Notes: svn path=/head/; revision=283641
Diffstat (limited to 'misc/kdeutils4/files')
-rw-r--r--misc/kdeutils4/files/patch-ark-kerfuffle-cliiterface.cpp35
-rw-r--r--misc/kdeutils4/files/patch-kcalc-kcalc.ui99
2 files changed, 0 insertions, 134 deletions
diff --git a/misc/kdeutils4/files/patch-ark-kerfuffle-cliiterface.cpp b/misc/kdeutils4/files/patch-ark-kerfuffle-cliiterface.cpp
deleted file mode 100644
index f2298e0f4493..000000000000
--- a/misc/kdeutils4/files/patch-ark-kerfuffle-cliiterface.cpp
+++ /dev/null
@@ -1,35 +0,0 @@
-SVN commit 1240907 by rkcosta:
-
-cliinterface: Do not assume a process does not exist in runProcess().
-
-The Q_ASSERT(!m_process) in the beginning of runProcess() was wrong, as when
-one is adding files to an archive (or creating an archive) processFinished()
-calls list(), which in turn calls runProcess() as well, thus making the assert
-fail.
-
-The best thing to do is just wait for the existing process to finish before
-launching the new one.
-
-Backport of r1240907, in case the 4.6 ever gets packaged again.
-
-CCBUG: 277393
-
-http://websvn.kde.org/?view=revision&revision=1240908
--- ark/kerfuffle/cliinterface.cpp 2011/06/01 20:35:06 1234597
-+++ ark/kerfuffle/cliinterface.cpp 2011/07/11 03:23:39 1240908
-@@ -325,10 +325,13 @@
- return false;
- }
-
-- Q_ASSERT(!m_process);
--
- kDebug() << "Executing" << programPath << arguments;
-
-+ if (m_process) {
-+ m_process->waitForFinished();
-+ delete m_process;
-+ }
-+
- #ifdef Q_OS_WIN
- m_process = new KProcess();
- #else
diff --git a/misc/kdeutils4/files/patch-kcalc-kcalc.ui b/misc/kdeutils4/files/patch-kcalc-kcalc.ui
deleted file mode 100644
index b5f94af5bfec..000000000000
--- a/misc/kdeutils4/files/patch-kcalc-kcalc.ui
+++ /dev/null
@@ -1,99 +0,0 @@
-SVN commit 1240130 by teran:
-
-rolling back change made by r1235446, it broke keybindings entirely.
-
-BUG: 277020
-
-http://websvn.kde.org/?view=revision&revision=1240130
---- kcalc/kcalc.ui 2011/06/05 18:25:18 1235446
-+++ kcalc/kcalc.ui 2011/07/06 18:27:58 1240130
-@@ -616,7 +616,7 @@
- <string>7</string>
- </property>
- <property name="shortcut">
-- <string notr="true">7</string>
-+ <string>7</string>
- </property>
- </widget>
- </item>
-@@ -632,7 +632,7 @@
- <string>8</string>
- </property>
- <property name="shortcut">
-- <string notr="true">8</string>
-+ <string>8</string>
- </property>
- </widget>
- </item>
-@@ -648,7 +648,7 @@
- <string>9</string>
- </property>
- <property name="shortcut">
-- <string notr="true">9</string>
-+ <string>9</string>
- </property>
- </widget>
- </item>
-@@ -680,7 +680,7 @@
- <string>4</string>
- </property>
- <property name="shortcut">
-- <string notr="true">4</string>
-+ <string>4</string>
- </property>
- </widget>
- </item>
-@@ -696,7 +696,7 @@
- <string>5</string>
- </property>
- <property name="shortcut">
-- <string notr="true">5</string>
-+ <string>5</string>
- </property>
- </widget>
- </item>
-@@ -712,7 +712,7 @@
- <string>6</string>
- </property>
- <property name="shortcut">
-- <string notr="true">6</string>
-+ <string>6</string>
- </property>
- </widget>
- </item>
-@@ -728,7 +728,7 @@
- <string>1</string>
- </property>
- <property name="shortcut">
-- <string notr="true">1</string>
-+ <string>1</string>
- </property>
- </widget>
- </item>
-@@ -744,7 +744,7 @@
- <string>2</string>
- </property>
- <property name="shortcut">
-- <string notr="true">2</string>
-+ <string>2</string>
- </property>
- </widget>
- </item>
-@@ -760,7 +760,7 @@
- <string>3</string>
- </property>
- <property name="shortcut">
-- <string notr="true">3</string>
-+ <string>3</string>
- </property>
- </widget>
- </item>
-@@ -786,7 +786,7 @@
- <string>0</string>
- </property>
- <property name="shortcut">
-- <string notr="true">0</string>
-+ <string>0</string>
- </property>
- </widget>
- </item>