[kdebase-workspace] fix/rebase ksplash-qml patch again, 3rd time's a charm, ya know
Rex Dieter
rdieter at fedoraproject.org
Thu Nov 17 18:38:03 UTC 2011
commit 21ebf63a838a0dd3cdc33c3d455f82af7ebd6e6c
Author: Rex Dieter <rdieter at fedoraproject.org>
Date: Thu Nov 17 12:38:09 2011 -0600
fix/rebase ksplash-qml patch again, 3rd time's a charm, ya know
...l.diff => kde-workspace-4.7.3-ksplash-qml.patch | 407 ++++++++------------
kdebase-workspace.spec | 3 +-
2 files changed, 161 insertions(+), 249 deletions(-)
---
diff --git a/ksplash-qml.diff b/kde-workspace-4.7.3-ksplash-qml.patch
similarity index 79%
rename from ksplash-qml.diff
rename to kde-workspace-4.7.3-ksplash-qml.patch
index c3fb7aa..0afebf5 100644
--- a/ksplash-qml.diff
+++ b/kde-workspace-4.7.3-ksplash-qml.patch
@@ -1,16 +1,14 @@
-diff --git a/ksplash/CMakeLists.txt b/ksplash/CMakeLists.txt
-index 765a90c..0d0934b 100644
---- a/ksplash/CMakeLists.txt
-+++ b/ksplash/CMakeLists.txt
+diff -up kde-workspace-4.7.3/ksplash/CMakeLists.txt.ksplash-qml kde-workspace-4.7.3/ksplash/CMakeLists.txt
+--- kde-workspace-4.7.3/ksplash/CMakeLists.txt.ksplash-qml 2011-05-20 15:32:07.000000000 -0500
++++ kde-workspace-4.7.3/ksplash/CMakeLists.txt 2011-11-17 11:50:41.327911185 -0600
@@ -2,3 +2,4 @@ add_subdirectory( ksplashx )
add_subdirectory( simple )
add_subdirectory( none )
add_subdirectory( kcm )
+add_subdirectory( ksplashqml )
-diff --git a/ksplash/kcm/installer.cpp b/ksplash/kcm/installer.cpp
-index cada800..db2450b 100644
---- a/ksplash/kcm/installer.cpp
-+++ b/ksplash/kcm/installer.cpp
+diff -up kde-workspace-4.7.3/ksplash/kcm/installer.cpp.ksplash-qml kde-workspace-4.7.3/ksplash/kcm/installer.cpp
+--- kde-workspace-4.7.3/ksplash/kcm/installer.cpp.ksplash-qml 2011-05-20 15:32:07.000000000 -0500
++++ kde-workspace-4.7.3/ksplash/kcm/installer.cpp 2011-11-17 11:50:41.327911185 -0600
@@ -184,7 +184,7 @@ SplashInstaller::~SplashInstaller()
int SplashInstaller::addTheme(const QString &path, const QString &name)
@@ -20,7 +18,7 @@ index cada800..db2450b 100644
QString tmp(i18n( name.toUtf8() ));
int i = mThemesList->count();
while((i > 0) && (mThemesList->item(i-1)->text() > tmp))
-@@ -434,7 +434,11 @@ void SplashInstaller::slotSetTheme(int id)
+@@ -434,7 +434,11 @@ void SplashInstaller::slotSetTheme(int i
infoTxt += "</qt>";
QString pluginName( cnf.readEntry( "Engine", "KSplashX" ).trimmed() );
@@ -41,10 +39,11 @@ index cada800..db2450b 100644
if( mEngineOfSelected == "None" )
return;
else if( mEngineOfSelected == "Simple" )
-@@ -554,6 +559,14 @@ void SplashInstaller::slotTest()
+@@ -553,6 +558,14 @@ void SplashInstaller::slotTest()
+ if (proc.execute())
KMessageBox::error(this,i18n("Failed to successfully test the splash screen."));
return;
- }
++ }
+ else if( mEngineOfSelected == "KSplashQML" )
+ {
+ KProcess proc;
@@ -52,16 +51,13 @@ index cada800..db2450b 100644
+ if (proc.execute())
+ KMessageBox::error(this,i18n("Failed to successfully test the splash screen."));
+ return;
-+ }
+ }
else // KSplashML engines
{
- KProcess proc;
-diff --git a/ksplash/ksplashqml/CMakeLists.txt b/ksplash/ksplashqml/CMakeLists.txt
-new file mode 100644
-index 0000000..a9a3866
---- /dev/null
-+++ b/ksplash/ksplashqml/CMakeLists.txt
-@@ -0,0 +1,17 @@
+diff -up kde-workspace-4.7.3/ksplash/ksplashqml/CMakeLists.txt.ksplash-qml kde-workspace-4.7.3/ksplash/ksplashqml/CMakeLists.txt
+--- kde-workspace-4.7.3/ksplash/ksplashqml/CMakeLists.txt.ksplash-qml 2011-11-17 11:50:41.328911173 -0600
++++ kde-workspace-4.7.3/ksplash/ksplashqml/CMakeLists.txt 2011-11-17 11:58:06.437346601 -0600
+@@ -0,0 +1,18 @@
+project(ksplashqml)
+
+set(ksplashqml_SRCS
@@ -74,16 +70,85 @@ index 0000000..a9a3866
+
+target_link_libraries(ksplashqml
+ ${X11_LIBRARIES}
++ ${QT_QTCORE_LIBRARY}
+ ${QT_QTDECLARATIVE_LIBRARY}
+ ${QT_QTGUI_LIBRARY}
+ )
+
+install(TARGETS ksplashqml ${INSTALL_TARGETS_DEFAULT_ARGS})
-diff --git a/ksplash/ksplashqml/SplashApp.cpp b/ksplash/ksplashqml/SplashApp.cpp
-new file mode 100644
-index 0000000..84a36ab
---- /dev/null
-+++ b/ksplash/ksplashqml/SplashApp.cpp
+diff -up kde-workspace-4.7.3/ksplash/ksplashqml/main.cpp.ksplash-qml kde-workspace-4.7.3/ksplash/ksplashqml/main.cpp
+--- kde-workspace-4.7.3/ksplash/ksplashqml/main.cpp.ksplash-qml 2011-11-17 11:50:41.329911160 -0600
++++ kde-workspace-4.7.3/ksplash/ksplashqml/main.cpp 2011-11-17 11:50:41.329911160 -0600
+@@ -0,0 +1,66 @@
++/*
++ * Copyright (C) 2011 Ivan Cukic <ivan.cukic(at)kde.org>
++ *
++ * This program is free software; you can redistribute it and/or modify
++ * it under the terms of the GNU General Public License version 2,
++ * or (at your option) any later version, as published by the Free
++ * Software Foundation
++ *
++ * This program is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
++ * GNU General Public License for more details
++ *
++ * You should have received a copy of the GNU General Public
++ * License along with this program; if not, write to the
++ * Free Software Foundation, Inc.,
++ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
++ */
++
++#include "SplashApp.h"
++
++#include <iostream>
++#include <X11/Xlib.h>
++
++int main(int argc, char **argv)
++{
++ bool test = false;
++ bool printPid = false;
++
++ for (int i = 1; i < argc; i++) {
++ if (strcmp("--test", argv[i]) == 0)
++ test = true;
++ else if (strcmp("--pid", argv[i]) == 0)
++ printPid = true;
++ }
++
++ // lets fork and all that...
++
++ if (!test) {
++ pid_t pid = fork();
++ if (pid < -1) {
++ return -1;
++ }
++
++ if (pid != 0) {
++ // this is the parent process, returning pid of the fork
++ if (printPid) {
++ std::cout << pid << std::endl;
++ }
++
++ return 0;
++ }
++
++ // close stdin,stdout,stderr, otherwise startkde will block
++ close(0);
++ close(1);
++ close(2);
++ }
++
++ Display * display = XOpenDisplay(NULL);
++
++ SplashApp app(display, argc, argv);
++
++ return app.exec();
++}
++
+diff -up kde-workspace-4.7.3/ksplash/ksplashqml/SplashApp.cpp.ksplash-qml kde-workspace-4.7.3/ksplash/ksplashqml/SplashApp.cpp
+--- kde-workspace-4.7.3/ksplash/ksplashqml/SplashApp.cpp.ksplash-qml 2011-11-17 11:50:41.328911173 -0600
++++ kde-workspace-4.7.3/ksplash/ksplashqml/SplashApp.cpp 2011-11-17 11:50:41.328911173 -0600
@@ -0,0 +1,116 @@
+/*
+ * Copyright (C) 2010 Ivan Cukic <ivan.cukic(at)kde.org>
@@ -201,11 +266,9 @@ index 0000000..84a36ab
+ m_window->setStage(stage);
+}
+
-diff --git a/ksplash/ksplashqml/SplashApp.h b/ksplash/ksplashqml/SplashApp.h
-new file mode 100644
-index 0000000..bc3fbdf
---- /dev/null
-+++ b/ksplash/ksplashqml/SplashApp.h
+diff -up kde-workspace-4.7.3/ksplash/ksplashqml/SplashApp.h.ksplash-qml kde-workspace-4.7.3/ksplash/ksplashqml/SplashApp.h
+--- kde-workspace-4.7.3/ksplash/ksplashqml/SplashApp.h.ksplash-qml 2011-11-17 11:50:41.328911173 -0600
++++ kde-workspace-4.7.3/ksplash/ksplashqml/SplashApp.h 2011-11-17 11:50:41.328911173 -0600
@@ -0,0 +1,55 @@
+/*
+ * Copyright (C) 2010 Ivan Cukic <ivan.cukic(at)kde.org>
@@ -262,11 +325,9 @@ index 0000000..bc3fbdf
+};
+
+#endif // SPLASH_APP_H_
-diff --git a/ksplash/ksplashqml/SplashWindow.cpp b/ksplash/ksplashqml/SplashWindow.cpp
-new file mode 100644
-index 0000000..94e6ded
---- /dev/null
-+++ b/ksplash/ksplashqml/SplashWindow.cpp
+diff -up kde-workspace-4.7.3/ksplash/ksplashqml/SplashWindow.cpp.ksplash-qml kde-workspace-4.7.3/ksplash/ksplashqml/SplashWindow.cpp
+--- kde-workspace-4.7.3/ksplash/ksplashqml/SplashWindow.cpp.ksplash-qml 2011-11-17 11:50:41.328911173 -0600
++++ kde-workspace-4.7.3/ksplash/ksplashqml/SplashWindow.cpp 2011-11-17 11:50:41.328911173 -0600
@@ -0,0 +1,83 @@
+/*
+ * Copyright (C) 2010 Ivan Cukic <ivan.cukic(at)kde.org>
@@ -351,11 +412,9 @@ index 0000000..94e6ded
+ close();
+ }
+}
-diff --git a/ksplash/ksplashqml/SplashWindow.h b/ksplash/ksplashqml/SplashWindow.h
-new file mode 100644
-index 0000000..9680c1e
---- /dev/null
-+++ b/ksplash/ksplashqml/SplashWindow.h
+diff -up kde-workspace-4.7.3/ksplash/ksplashqml/SplashWindow.h.ksplash-qml kde-workspace-4.7.3/ksplash/ksplashqml/SplashWindow.h
+--- kde-workspace-4.7.3/ksplash/ksplashqml/SplashWindow.h.ksplash-qml 2011-11-17 11:50:41.329911160 -0600
++++ kde-workspace-4.7.3/ksplash/ksplashqml/SplashWindow.h 2011-11-17 11:50:41.329911160 -0600
@@ -0,0 +1,46 @@
+/*
+ * Copyright (C) 2010 Ivan Cukic <ivan.cukic(at)kde.org>
@@ -403,11 +462,9 @@ index 0000000..9680c1e
+};
+
+#endif // SPLASH_WINDOW_H_
-diff --git a/ksplash/ksplashqml/SystemInfo.h b/ksplash/ksplashqml/SystemInfo.h
-new file mode 100644
-index 0000000..b2d5fda
---- /dev/null
-+++ b/ksplash/ksplashqml/SystemInfo.h
+diff -up kde-workspace-4.7.3/ksplash/ksplashqml/SystemInfo.h.ksplash-qml kde-workspace-4.7.3/ksplash/ksplashqml/SystemInfo.h
+--- kde-workspace-4.7.3/ksplash/ksplashqml/SystemInfo.h.ksplash-qml 2011-11-17 11:50:41.329911160 -0600
++++ kde-workspace-4.7.3/ksplash/ksplashqml/SystemInfo.h 2011-11-17 11:50:41.329911160 -0600
@@ -0,0 +1,60 @@
+/*
+ * Copyright (C) 2010 Ivan Cukic <ivan.cukic(at)kde.org>
@@ -469,91 +526,15 @@ index 0000000..b2d5fda
+#endif // SYSTEM_INFO_H_
+
+
-diff --git a/ksplash/ksplashqml/main.cpp b/ksplash/ksplashqml/main.cpp
-new file mode 100644
-index 0000000..ed409e2
---- /dev/null
-+++ b/ksplash/ksplashqml/main.cpp
-@@ -0,0 +1,66 @@
-+/*
-+ * Copyright (C) 2011 Ivan Cukic <ivan.cukic(at)kde.org>
-+ *
-+ * This program is free software; you can redistribute it and/or modify
-+ * it under the terms of the GNU General Public License version 2,
-+ * or (at your option) any later version, as published by the Free
-+ * Software Foundation
-+ *
-+ * This program is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-+ * GNU General Public License for more details
-+ *
-+ * You should have received a copy of the GNU General Public
-+ * License along with this program; if not, write to the
-+ * Free Software Foundation, Inc.,
-+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-+ */
-+
-+#include "SplashApp.h"
-+
-+#include <iostream>
-+#include <X11/Xlib.h>
-+
-+int main(int argc, char **argv)
-+{
-+ bool test = false;
-+ bool printPid = false;
-+
-+ for (int i = 1; i < argc; i++) {
-+ if (strcmp("--test", argv[i]) == 0)
-+ test = true;
-+ else if (strcmp("--pid", argv[i]) == 0)
-+ printPid = true;
-+ }
-+
-+ // lets fork and all that...
-+
-+ if (!test) {
-+ pid_t pid = fork();
-+ if (pid < -1) {
-+ return -1;
-+ }
-+
-+ if (pid != 0) {
-+ // this is the parent process, returning pid of the fork
-+ if (printPid) {
-+ std::cout << pid << std::endl;
-+ }
-+
-+ return 0;
-+ }
-+
-+ // close stdin,stdout,stderr, otherwise startkde will block
-+ close(0);
-+ close(1);
-+ close(2);
-+ }
-+
-+ Display * display = XOpenDisplay(NULL);
-+
-+ SplashApp app(display, argc, argv);
-+
-+ return app.exec();
-+}
-+
-diff --git a/ksplash/ksplashqml/themes/CMakeLists.txt b/ksplash/ksplashqml/themes/CMakeLists.txt
-new file mode 100644
-index 0000000..818070c
---- /dev/null
-+++ b/ksplash/ksplashqml/themes/CMakeLists.txt
+diff -up kde-workspace-4.7.3/ksplash/ksplashqml/themes/CMakeLists.txt.ksplash-qml kde-workspace-4.7.3/ksplash/ksplashqml/themes/CMakeLists.txt
+--- kde-workspace-4.7.3/ksplash/ksplashqml/themes/CMakeLists.txt.ksplash-qml 2011-11-17 11:50:41.329911160 -0600
++++ kde-workspace-4.7.3/ksplash/ksplashqml/themes/CMakeLists.txt 2011-11-17 11:50:41.329911160 -0600
@@ -0,0 +1,2 @@
+add_subdirectory(qmltest)
+add_subdirectory(qmldefault)
-diff --git a/ksplash/ksplashqml/themes/qmldefault/CMakeLists.txt b/ksplash/ksplashqml/themes/qmldefault/CMakeLists.txt
-new file mode 100644
-index 0000000..6f28f3b
---- /dev/null
-+++ b/ksplash/ksplashqml/themes/qmldefault/CMakeLists.txt
+diff -up kde-workspace-4.7.3/ksplash/ksplashqml/themes/qmldefault/CMakeLists.txt.ksplash-qml kde-workspace-4.7.3/ksplash/ksplashqml/themes/qmldefault/CMakeLists.txt
+--- kde-workspace-4.7.3/ksplash/ksplashqml/themes/qmldefault/CMakeLists.txt.ksplash-qml 2011-11-17 11:50:41.330911147 -0600
++++ kde-workspace-4.7.3/ksplash/ksplashqml/themes/qmldefault/CMakeLists.txt 2011-11-17 11:50:41.330911147 -0600
@@ -0,0 +1,7 @@
+install(FILES Preview.png Theme.rc main.qml DESTINATION ${DATA_INSTALL_DIR}/ksplash/Themes/qmldefault)
+
@@ -562,50 +543,9 @@ index 0000000..6f28f3b
+install(FILES images/kdemask.png DESTINATION ${DATA_INSTALL_DIR}/ksplash/Themes/qmldefault/images)
+install(FILES images/kdelogo.png DESTINATION ${DATA_INSTALL_DIR}/ksplash/Themes/qmldefault/images)
+install(FILES images/kdelogo-contrast.png DESTINATION ${DATA_INSTALL_DIR}/ksplash/Themes/qmldefault/images)
-diff --git a/ksplash/ksplashqml/themes/qmldefault/Preview.png b/ksplash/ksplashqml/themes/qmldefault/Preview.png
-new file mode 100644
-index 0000000..532adf7
-Binary files /dev/null and b/ksplash/ksplashqml/themes/qmldefault/Preview.png differ
-diff --git a/ksplash/ksplashqml/themes/qmldefault/Theme.rc b/ksplash/ksplashqml/themes/qmldefault/Theme.rc
-new file mode 100644
-index 0000000..4dc90f8
---- /dev/null
-+++ b/ksplash/ksplashqml/themes/qmldefault/Theme.rc
-@@ -0,0 +1,9 @@
-+[KSplash Theme: qmldefault]
-+Name = Minimalistic splash screen
-+Description = Animated KDE logo on a black background
-+Version = 1.0
-+Author = Ivan Cukic <ivan.cukic at kde.org>
-+Homepage = http://www.kde.org
-+
-+# Theme behaviour settings.
-+Engine = KSplashQML
-diff --git a/ksplash/ksplashqml/themes/qmldefault/images/kdegear.png b/ksplash/ksplashqml/themes/qmldefault/images/kdegear.png
-new file mode 100644
-index 0000000..66a50c2
-Binary files /dev/null and b/ksplash/ksplashqml/themes/qmldefault/images/kdegear.png differ
-diff --git a/ksplash/ksplashqml/themes/qmldefault/images/kdeletter.png b/ksplash/ksplashqml/themes/qmldefault/images/kdeletter.png
-new file mode 100644
-index 0000000..cabe17c
-Binary files /dev/null and b/ksplash/ksplashqml/themes/qmldefault/images/kdeletter.png differ
-diff --git a/ksplash/ksplashqml/themes/qmldefault/images/kdelogo-contrast.png b/ksplash/ksplashqml/themes/qmldefault/images/kdelogo-contrast.png
-new file mode 100644
-index 0000000..fe60715
-Binary files /dev/null and b/ksplash/ksplashqml/themes/qmldefault/images/kdelogo-contrast.png differ
-diff --git a/ksplash/ksplashqml/themes/qmldefault/images/kdelogo.png b/ksplash/ksplashqml/themes/qmldefault/images/kdelogo.png
-new file mode 100644
-index 0000000..d637b37
-Binary files /dev/null and b/ksplash/ksplashqml/themes/qmldefault/images/kdelogo.png differ
-diff --git a/ksplash/ksplashqml/themes/qmldefault/images/kdemask.png b/ksplash/ksplashqml/themes/qmldefault/images/kdemask.png
-new file mode 100644
-index 0000000..50319fc
-Binary files /dev/null and b/ksplash/ksplashqml/themes/qmldefault/images/kdemask.png differ
-diff --git a/ksplash/ksplashqml/themes/qmldefault/main.qml b/ksplash/ksplashqml/themes/qmldefault/main.qml
-new file mode 100644
-index 0000000..90a5494
---- /dev/null
-+++ b/ksplash/ksplashqml/themes/qmldefault/main.qml
+diff -up kde-workspace-4.7.3/ksplash/ksplashqml/themes/qmldefault/main.qml.ksplash-qml kde-workspace-4.7.3/ksplash/ksplashqml/themes/qmldefault/main.qml
+--- kde-workspace-4.7.3/ksplash/ksplashqml/themes/qmldefault/main.qml.ksplash-qml 2011-11-17 11:50:41.330911147 -0600
++++ kde-workspace-4.7.3/ksplash/ksplashqml/themes/qmldefault/main.qml 2011-11-17 11:50:41.330911147 -0600
@@ -0,0 +1,189 @@
+/* vim:set foldenable foldmethod=marker:
+ *
@@ -796,11 +736,22 @@ index 0000000..90a5494
+ /* }}} */
+}
+
-diff --git a/ksplash/ksplashqml/themes/qmltest/CMakeLists.txt b/ksplash/ksplashqml/themes/qmltest/CMakeLists.txt
-new file mode 100644
-index 0000000..9b2e59d
---- /dev/null
-+++ b/ksplash/ksplashqml/themes/qmltest/CMakeLists.txt
+diff -up kde-workspace-4.7.3/ksplash/ksplashqml/themes/qmldefault/Theme.rc.ksplash-qml kde-workspace-4.7.3/ksplash/ksplashqml/themes/qmldefault/Theme.rc
+--- kde-workspace-4.7.3/ksplash/ksplashqml/themes/qmldefault/Theme.rc.ksplash-qml 2011-11-17 11:50:41.330911147 -0600
++++ kde-workspace-4.7.3/ksplash/ksplashqml/themes/qmldefault/Theme.rc 2011-11-17 11:50:41.330911147 -0600
+@@ -0,0 +1,9 @@
++[KSplash Theme: qmldefault]
++Name = Minimalistic splash screen
++Description = Animated KDE logo on a black background
++Version = 1.0
++Author = Ivan Cukic <ivan.cukic at kde.org>
++Homepage = http://www.kde.org
++
++# Theme behaviour settings.
++Engine = KSplashQML
+diff -up kde-workspace-4.7.3/ksplash/ksplashqml/themes/qmltest/CMakeLists.txt.ksplash-qml kde-workspace-4.7.3/ksplash/ksplashqml/themes/qmltest/CMakeLists.txt
+--- kde-workspace-4.7.3/ksplash/ksplashqml/themes/qmltest/CMakeLists.txt.ksplash-qml 2011-11-17 11:50:41.330911147 -0600
++++ kde-workspace-4.7.3/ksplash/ksplashqml/themes/qmltest/CMakeLists.txt 2011-11-17 11:50:41.330911147 -0600
@@ -0,0 +1,9 @@
+install(FILES Preview.png Theme.rc main.qml DESTINATION ${DATA_INSTALL_DIR}/ksplash/Themes/qmltest)
+
@@ -811,58 +762,9 @@ index 0000000..9b2e59d
+install(FILES images/hardware.png DESTINATION ${DATA_INSTALL_DIR}/ksplash/Themes/qmltest/images)
+install(FILES images/kde.png DESTINATION ${DATA_INSTALL_DIR}/ksplash/Themes/qmltest/images)
+install(FILES images/plasma.png DESTINATION ${DATA_INSTALL_DIR}/ksplash/Themes/qmltest/images)
-diff --git a/ksplash/ksplashqml/themes/qmltest/Preview.png b/ksplash/ksplashqml/themes/qmltest/Preview.png
-new file mode 100644
-index 0000000..398c037
-Binary files /dev/null and b/ksplash/ksplashqml/themes/qmltest/Preview.png differ
-diff --git a/ksplash/ksplashqml/themes/qmltest/Theme.rc b/ksplash/ksplashqml/themes/qmltest/Theme.rc
-new file mode 100644
-index 0000000..8088c20
---- /dev/null
-+++ b/ksplash/ksplashqml/themes/qmltest/Theme.rc
-@@ -0,0 +1,9 @@
-+[KSplash Theme: QMLtest]
-+Name = Default Splash Screen
-+Description = Air and Horos Splash Screen
-+Version = 1.0
-+Author = Nuno Pinheiro <nuno at oxygen-icons.org>, Riccardo Iaconelli <riccardo at kde.org> and Marco Martin <notmart at gmail.com>
-+Homepage = http://www.kde.org
-+
-+# Theme behaviour settings.
-+Engine = KSplashQML
-diff --git a/ksplash/ksplashqml/themes/qmltest/images/background.jpg b/ksplash/ksplashqml/themes/qmltest/images/background.jpg
-new file mode 100644
-index 0000000..8d3027c
-Binary files /dev/null and b/ksplash/ksplashqml/themes/qmltest/images/background.jpg differ
-diff --git a/ksplash/ksplashqml/themes/qmltest/images/configuring.png b/ksplash/ksplashqml/themes/qmltest/images/configuring.png
-new file mode 100644
-index 0000000..9ea5cec
-Binary files /dev/null and b/ksplash/ksplashqml/themes/qmltest/images/configuring.png differ
-diff --git a/ksplash/ksplashqml/themes/qmltest/images/desktop.png b/ksplash/ksplashqml/themes/qmltest/images/desktop.png
-new file mode 100644
-index 0000000..98153f2
-Binary files /dev/null and b/ksplash/ksplashqml/themes/qmltest/images/desktop.png differ
-diff --git a/ksplash/ksplashqml/themes/qmltest/images/globe.png b/ksplash/ksplashqml/themes/qmltest/images/globe.png
-new file mode 100644
-index 0000000..193c46f
-Binary files /dev/null and b/ksplash/ksplashqml/themes/qmltest/images/globe.png differ
-diff --git a/ksplash/ksplashqml/themes/qmltest/images/hardware.png b/ksplash/ksplashqml/themes/qmltest/images/hardware.png
-new file mode 100644
-index 0000000..68351d1
-Binary files /dev/null and b/ksplash/ksplashqml/themes/qmltest/images/hardware.png differ
-diff --git a/ksplash/ksplashqml/themes/qmltest/images/kde.png b/ksplash/ksplashqml/themes/qmltest/images/kde.png
-new file mode 100644
-index 0000000..3efaaf8
-Binary files /dev/null and b/ksplash/ksplashqml/themes/qmltest/images/kde.png differ
-diff --git a/ksplash/ksplashqml/themes/qmltest/images/plasma.png b/ksplash/ksplashqml/themes/qmltest/images/plasma.png
-new file mode 100644
-index 0000000..facbd77
-Binary files /dev/null and b/ksplash/ksplashqml/themes/qmltest/images/plasma.png differ
-diff --git a/ksplash/ksplashqml/themes/qmltest/main.qml b/ksplash/ksplashqml/themes/qmltest/main.qml
-new file mode 100644
-index 0000000..e0b8a1b
---- /dev/null
-+++ b/ksplash/ksplashqml/themes/qmltest/main.qml
+diff -up kde-workspace-4.7.3/ksplash/ksplashqml/themes/qmltest/main.qml.ksplash-qml kde-workspace-4.7.3/ksplash/ksplashqml/themes/qmltest/main.qml
+--- kde-workspace-4.7.3/ksplash/ksplashqml/themes/qmltest/main.qml.ksplash-qml 2011-11-17 11:50:41.331911134 -0600
++++ kde-workspace-4.7.3/ksplash/ksplashqml/themes/qmltest/main.qml 2011-11-17 11:50:41.331911134 -0600
@@ -0,0 +1,164 @@
+/* vim:set foldenable foldmethod=marker:
+ *
@@ -1028,11 +930,23 @@ index 0000000..e0b8a1b
+ /* }}} */
+}
+
-diff --git a/kwin/composite.cpp b/kwin/composite.cpp
-index a8bb42e..323d589 100644
---- a/kwin/composite.cpp
-+++ b/kwin/composite.cpp
-@@ -836,7 +836,10 @@ bool Unmanaged::shouldUnredirect() const
+diff -up kde-workspace-4.7.3/ksplash/ksplashqml/themes/qmltest/Theme.rc.ksplash-qml kde-workspace-4.7.3/ksplash/ksplashqml/themes/qmltest/Theme.rc
+--- kde-workspace-4.7.3/ksplash/ksplashqml/themes/qmltest/Theme.rc.ksplash-qml 2011-11-17 11:50:41.331911134 -0600
++++ kde-workspace-4.7.3/ksplash/ksplashqml/themes/qmltest/Theme.rc 2011-11-17 11:50:41.331911134 -0600
+@@ -0,0 +1,9 @@
++[KSplash Theme: QMLtest]
++Name = Default Splash Screen
++Description = Air and Horos Splash Screen
++Version = 1.0
++Author = Nuno Pinheiro <nuno at oxygen-icons.org>, Riccardo Iaconelli <riccardo at kde.org> and Marco Martin <notmart at gmail.com>
++Homepage = http://www.kde.org
++
++# Theme behaviour settings.
++Engine = KSplashQML
+diff -up kde-workspace-4.7.3/kwin/composite.cpp.ksplash-qml kde-workspace-4.7.3/kwin/composite.cpp
+--- kde-workspace-4.7.3/kwin/composite.cpp.ksplash-qml 2011-07-19 16:33:58.000000000 -0500
++++ kde-workspace-4.7.3/kwin/composite.cpp 2011-11-17 11:50:41.331911134 -0600
+@@ -991,7 +991,10 @@ bool Unmanaged::shouldUnredirect() const
{
// the pixmap is needed for the login effect, a nicer solution would be the login effect increasing
// refcount for the window pixmap (which would prevent unredirect), avoiding this hack
@@ -1044,11 +958,10 @@ index a8bb42e..323d589 100644
return false;
// it must cover whole display or one xinerama screen, and be the topmost there
if (geometry() == workspace()->clientArea(FullArea, geometry().center(), workspace()->currentDesktop())
-diff --git a/kwin/effects/fade/fade.cpp b/kwin/effects/fade/fade.cpp
-index 17f39a8..1a54eb0 100644
---- a/kwin/effects/fade/fade.cpp
-+++ b/kwin/effects/fade/fade.cpp
-@@ -194,6 +194,7 @@ bool FadeEffect::isFadeWindow(EffectWindow* w)
+diff -up kde-workspace-4.7.3/kwin/effects/fade/fade.cpp.ksplash-qml kde-workspace-4.7.3/kwin/effects/fade/fade.cpp
+--- kde-workspace-4.7.3/kwin/effects/fade/fade.cpp.ksplash-qml 2011-05-20 15:32:07.000000000 -0500
++++ kde-workspace-4.7.3/kwin/effects/fade/fade.cpp 2011-11-17 11:50:41.332911121 -0600
+@@ -192,6 +192,7 @@ bool FadeEffect::isFadeWindow(EffectWind
e = w->data(WindowAddedGrabRole).value<void*>();
if (w->windowClass() == "ksplashx ksplashx"
|| w->windowClass() == "ksplashsimple ksplashsimple"
@@ -1056,11 +969,10 @@ index 17f39a8..1a54eb0 100644
|| (e && e != this)) {
// see login effect
return false;
-diff --git a/kwin/effects/login/login.cpp b/kwin/effects/login/login.cpp
-index 63d8479..a9da287 100644
---- a/kwin/effects/login/login.cpp
-+++ b/kwin/effects/login/login.cpp
-@@ -111,7 +111,8 @@ bool LoginEffect::isLoginSplash(EffectWindow* w)
+diff -up kde-workspace-4.7.3/kwin/effects/login/login.cpp.ksplash-qml kde-workspace-4.7.3/kwin/effects/login/login.cpp
+--- kde-workspace-4.7.3/kwin/effects/login/login.cpp.ksplash-qml 2011-05-20 15:32:07.000000000 -0500
++++ kde-workspace-4.7.3/kwin/effects/login/login.cpp 2011-11-17 11:50:41.332911121 -0600
+@@ -90,7 +90,8 @@ bool LoginEffect::isLoginSplash(EffectWi
// TODO there should be probably a better way (window type?)
// see also fade effect and composite.cpp
if (w->windowClass() == "ksplashx ksplashx"
@@ -1070,11 +982,10 @@ index 63d8479..a9da287 100644
return true;
}
return false;
-diff --git a/startkde.cmake b/startkde.cmake
-index 627dadb..1070785 100644
---- a/startkde.cmake
-+++ b/startkde.cmake
-@@ -151,6 +151,9 @@ if test -z "$dl"; then
+diff -up kde-workspace-4.7.3/startkde.cmake.ksplash-qml kde-workspace-4.7.3/startkde.cmake
+--- kde-workspace-4.7.3/startkde.cmake.ksplash-qml 2011-11-17 11:50:41.291911634 -0600
++++ kde-workspace-4.7.3/startkde.cmake 2011-11-17 11:50:41.333911109 -0600
+@@ -174,6 +174,9 @@ if test -z "$dl"; then
KSplashX)
ksplash_pid=`ksplashx "${ksplashrc_ksplash_theme}" --pid`
;;
@@ -1084,7 +995,7 @@ index 627dadb..1070785 100644
None)
;;
Simple)
-@@ -356,11 +359,11 @@ fi
+@@ -343,11 +346,11 @@ fi
# if KDEWM is not set, ksmserver will ensure kwin is started.
# kwrapper4 is used to reduce startup time and memory usage
# kwrapper4 does not return useful error codes such as the exit code of ksmserver.
diff --git a/kdebase-workspace.spec b/kdebase-workspace.spec
index e9e1b0b..ab58c98 100644
--- a/kdebase-workspace.spec
+++ b/kdebase-workspace.spec
@@ -90,7 +90,8 @@ Patch102: kde-workspace-4.7.3-kdebug277036.patch
# adapted version of fix-wetab-power-button-freeze.patch
Patch150: kde-workspace-4.7.3-fix-wetab-power-button-freeze.patch
Patch151: nepomuksearch-566052f0.diff
-Patch152: ksplash-qml.diff
+# adapted/fixed version of ksplash-qml.diff
+Patch152: kde-workspace-4.7.3-ksplash-qml.patch
# adapted version of wac-html-widgets.patch
Patch153: kde-workspace-4.7.3-wac-html-widgets.patch
Patch154: kwin-check-opengl.diff
More information about the scm-commits
mailing list