- rebase parallel_devel and kde149705 patch, I'm not sure about the slight modifications made to the latter, can someone verify it?
This commit is contained in:
parent
d33c7517bf
commit
7e7988986d
@ -1,39 +0,0 @@
|
||||
diff -up kdelibs-3.95.0/kutils/kdeglobals.kcfg.kde149705 kdelibs-3.95.0/kutils/kdeglobals.kcfg
|
||||
--- kdelibs-3.95.0/kutils/kdeglobals.kcfg.kde149705 2007-10-03 05:50:18.000000000 -0500
|
||||
+++ kdelibs-3.95.0/kutils/kdeglobals.kcfg 2007-11-04 15:08:14.000000000 -0600
|
||||
@@ -24,6 +24,10 @@
|
||||
<whatsthis>The name of the widget style, for example "keramik" or "plastik". Without quotes.</whatsthis>
|
||||
<default>keramik</default>
|
||||
</entry>
|
||||
+ <entry key="widgetStyle4" type="String" >
|
||||
+ <label>Widget style to use for KDE 4</label>
|
||||
+ <whatsthis>The name of the widget style, for example "oxygen". Without quotes. Defaults to widgetStyle.</whatsthis>
|
||||
+ </entry>
|
||||
<entry key="windowBackground" type="String" />
|
||||
<entry key="windowForeground" type="String" />
|
||||
<entry key="UseSystemBell" type="Bool" >
|
||||
diff -up kdelibs-3.95.0/kdeui/kernel/kglobalsettings.cpp.kde149705 kdelibs-3.95.0/kdeui/kernel/kglobalsettings.cpp
|
||||
--- kdelibs-3.95.0/kdeui/kernel/kglobalsettings.cpp.kde149705 2007-10-26 04:05:41.000000000 -0500
|
||||
+++ kdelibs-3.95.0/kdeui/kernel/kglobalsettings.cpp 2007-11-04 15:09:11.000000000 -0600
|
||||
@@ -835,7 +835,8 @@ void KGlobalSettings::Private::applyGUIS
|
||||
QString defaultStyle; // Mac, Windows: no change for style by default
|
||||
#endif
|
||||
KConfigGroup pConfig (KGlobal::config(), "General");
|
||||
- QString styleStr = pConfig.readEntry("widgetStyle", defaultStyle);
|
||||
+ QString styleStr = pConfig.readEntry("widgetStyle4", pConfig.readEntry("widgetStyle", defaultStyle));
|
||||
+
|
||||
|
||||
if (kde_overrideStyle.isEmpty()) {
|
||||
if (styleStr.isEmpty())
|
||||
diff -up kdelibs-3.95.0/kdeui/icons/kicontheme.cpp.kde149705 kdelibs-3.95.0/kdeui/icons/kicontheme.cpp
|
||||
--- kdelibs-3.95.0/kdeui/icons/kicontheme.cpp.kde149705 2007-10-25 04:34:48.000000000 -0500
|
||||
+++ kdelibs-3.95.0/kdeui/icons/kicontheme.cpp 2007-11-04 15:08:14.000000000 -0600
|
||||
@@ -515,7 +515,7 @@ QString KIconTheme::current()
|
||||
return *_theme;
|
||||
|
||||
KConfigGroup cg(KGlobal::config(), "Icons");
|
||||
- *_theme = cg.readEntry("Theme", defaultThemeName());
|
||||
+ *_theme = cg.readEntry("Theme4", cg.readEntry("Theme", defaultThemeName()));
|
||||
if ( *_theme == QLatin1String("hicolor") ) *_theme = defaultThemeName();
|
||||
/* if (_theme->isEmpty())
|
||||
{
|
38
kdelibs-4.1.82-kde149705.patch
Normal file
38
kdelibs-4.1.82-kde149705.patch
Normal file
@ -0,0 +1,38 @@
|
||||
diff -Naurw kdelibs-4.1.82/kdeui/icons/kicontheme.cpp kdelibs-4.1.82.kde149705/kdeui/icons/kicontheme.cpp
|
||||
--- kdelibs-4.1.82/kdeui/icons/kicontheme.cpp 2008-10-23 01:05:04.000000000 +0200
|
||||
+++ kdelibs-4.1.82.kde149705/kdeui/icons/kicontheme.cpp 2008-12-09 14:15:14.000000000 +0100
|
||||
@@ -516,7 +516,7 @@
|
||||
return *_theme;
|
||||
|
||||
KConfigGroup cg(KGlobal::config(), "Icons");
|
||||
- *_theme = cg.readEntry("Theme", defaultThemeName());
|
||||
+ *_theme = cg.readEntry("Theme4", cg.readEntry("Theme", defaultThemeName()));
|
||||
if ( *_theme == QLatin1String("hicolor") ) *_theme = defaultThemeName();
|
||||
/* if (_theme->isEmpty())
|
||||
{
|
||||
diff -Naurw kdelibs-4.1.82/kdeui/kernel/kglobalsettings.cpp kdelibs-4.1.82.kde149705/kdeui/kernel/kglobalsettings.cpp
|
||||
--- kdelibs-4.1.82/kdeui/kernel/kglobalsettings.cpp 2008-11-28 16:40:11.000000000 +0100
|
||||
+++ kdelibs-4.1.82.kde149705/kdeui/kernel/kglobalsettings.cpp 2008-12-09 14:17:51.000000000 +0100
|
||||
@@ -831,7 +831,7 @@
|
||||
if (kde_overrideStyle.isEmpty()) {
|
||||
const QString &defaultStyle = KStyle::defaultStyle();
|
||||
const KConfigGroup pConfig(KGlobal::config(), "General");
|
||||
- const QString &styleStr = pConfig.readEntry("widgetStyle", defaultStyle);
|
||||
+ const QString &styleStr = pConfig.readEntry("widgetStyle4", defaultStyle);
|
||||
|
||||
if (styleStr.isEmpty() ||
|
||||
// check whether we already use the correct style to return then
|
||||
diff -Naurw kdelibs-4.1.82/kutils/kdeglobals.kcfg kdelibs-4.1.82.kde149705/kutils/kdeglobals.kcfg
|
||||
--- kdelibs-4.1.82/kutils/kdeglobals.kcfg 2008-05-21 13:08:56.000000000 +0200
|
||||
+++ kdelibs-4.1.82.kde149705/kutils/kdeglobals.kcfg 2008-12-09 14:15:14.000000000 +0100
|
||||
@@ -24,6 +24,10 @@
|
||||
<whatsthis>The name of the widget style, for example "keramik" or "plastik". Without quotes.</whatsthis>
|
||||
<default>keramik</default>
|
||||
</entry>
|
||||
+ <entry key="widgetStyle4" type="String" >
|
||||
+ <label>Widget style to use for KDE 4</label>
|
||||
+ <whatsthis>The name of the widget style, for example "oxygen". Without quotes. Defaults to widgetStyle.</whatsthis>
|
||||
+ </entry>
|
||||
<entry key="windowBackground" type="String" />
|
||||
<entry key="windowForeground" type="String" />
|
||||
<entry key="UseSystemBell" type="Bool" >
|
@ -1,6 +1,6 @@
|
||||
diff -ur kdelibs-4.1.80/cmake/modules/FindKDE4Internal.cmake kdelibs-4.1.80-parallel_devel/cmake/modules/FindKDE4Internal.cmake
|
||||
--- kdelibs-4.1.80/cmake/modules/FindKDE4Internal.cmake 2008-11-19 11:19:49.000000000 +0100
|
||||
+++ kdelibs-4.1.80-parallel_devel/cmake/modules/FindKDE4Internal.cmake 2008-11-25 21:15:01.000000000 +0100
|
||||
diff -Naurw kdelibs-4.1.82/cmake/modules/FindKDE4Internal.cmake kdelibs-4.1.82.parallel_devel/cmake/modules/FindKDE4Internal.cmake
|
||||
--- kdelibs-4.1.82/cmake/modules/FindKDE4Internal.cmake 2008-12-09 14:11:55.000000000 +0100
|
||||
+++ kdelibs-4.1.82.parallel_devel/cmake/modules/FindKDE4Internal.cmake 2008-12-09 14:12:43.000000000 +0100
|
||||
@@ -15,10 +15,10 @@
|
||||
# The following variables are defined for the various tools required to
|
||||
# compile KDE software:
|
||||
@ -53,7 +53,7 @@ diff -ur kdelibs-4.1.80/cmake/modules/FindKDE4Internal.cmake kdelibs-4.1.80-para
|
||||
set( _KDE4_MEINPROC_EXECUTABLE_DEP meinproc4)
|
||||
|
||||
set(KDE4_INSTALLED_VERSION_OK TRUE)
|
||||
@@ -590,7 +590,7 @@
|
||||
@@ -542,7 +542,7 @@
|
||||
set(KDE4_PLASMA_LIBRARY plasma )
|
||||
set(KDE4_PLASMA_LIBS plasma )
|
||||
|
||||
@ -62,7 +62,7 @@ diff -ur kdelibs-4.1.80/cmake/modules/FindKDE4Internal.cmake kdelibs-4.1.80-para
|
||||
|
||||
# kpassworddialog.h is new with KDE4
|
||||
# KDE4_INCLUDE_INSTALL_DIR is defined by KDELibsDependencies.cmake
|
||||
@@ -598,14 +598,14 @@
|
||||
@@ -550,14 +550,14 @@
|
||||
|
||||
# at first look in LIBEXEC_INSTALL_DIR and no default paths,
|
||||
# if this didn't succeed, the second call makes cmake search again, but in the standard paths
|
||||
@ -79,9 +79,9 @@ diff -ur kdelibs-4.1.80/cmake/modules/FindKDE4Internal.cmake kdelibs-4.1.80-para
|
||||
+ find_program(KDE4_MAKEKDEWIDGETS_EXECUTABLE NAME makekdewidgets4 PATHS ${KDE4_BIN_INSTALL_DIR} NO_DEFAULT_PATH )
|
||||
+ find_program(KDE4_MAKEKDEWIDGETS_EXECUTABLE NAME makekdewidgets4 )
|
||||
|
||||
# allow searching cmake modules in all given kde install locations (KDEDIRS based)
|
||||
execute_process(COMMAND "${KDE4_KDECONFIG_EXECUTABLE}" --path data OUTPUT_VARIABLE _data_DIR ERROR_QUIET OUTPUT_STRIP_TRAILING_WHITESPACE)
|
||||
@@ -841,7 +841,8 @@
|
||||
mark_as_advanced(KDE4_KCFGC_EXECUTABLE KDE4_MEINPROC_EXECUTABLE KDE4_MAKEKDEWIDGETS_EXECUTABLE)
|
||||
|
||||
@@ -795,7 +795,8 @@
|
||||
set(CMAKE_SYSTEM_PROGRAM_PATH ${CMAKE_SYSTEM_PROGRAM_PATH}
|
||||
"${KDE4_BIN_INSTALL_DIR}" )
|
||||
|
||||
@ -91,7 +91,7 @@ diff -ur kdelibs-4.1.80/cmake/modules/FindKDE4Internal.cmake kdelibs-4.1.80-para
|
||||
"${KDE4_LIB_INSTALL_DIR}" )
|
||||
|
||||
# under Windows dlls may be also installed in bin/
|
||||
@@ -1231,9 +1232,9 @@
|
||||
@@ -1186,9 +1187,9 @@
|
||||
endif (NOT _kdeBootStrapping)
|
||||
|
||||
if(KDE4_KCFGC_EXECUTABLE)
|
||||
@ -103,9 +103,9 @@ diff -ur kdelibs-4.1.80/cmake/modules/FindKDE4Internal.cmake kdelibs-4.1.80-para
|
||||
endif(KDE4_KCFGC_EXECUTABLE)
|
||||
|
||||
if(AUTOMOC4_EXECUTABLE)
|
||||
diff -ur kdelibs-4.1.80/doc/api/doxygen-preprocess-kcfg.sh kdelibs-4.1.80-parallel_devel/doc/api/doxygen-preprocess-kcfg.sh
|
||||
--- kdelibs-4.1.80/doc/api/doxygen-preprocess-kcfg.sh 2008-05-21 13:07:26.000000000 +0200
|
||||
+++ kdelibs-4.1.80-parallel_devel/doc/api/doxygen-preprocess-kcfg.sh 2008-11-25 21:10:41.000000000 +0100
|
||||
diff -Naurw kdelibs-4.1.82/doc/api/doxygen-preprocess-kcfg.sh kdelibs-4.1.82.parallel_devel/doc/api/doxygen-preprocess-kcfg.sh
|
||||
--- kdelibs-4.1.82/doc/api/doxygen-preprocess-kcfg.sh 2008-05-21 13:07:26.000000000 +0200
|
||||
+++ kdelibs-4.1.82.parallel_devel/doc/api/doxygen-preprocess-kcfg.sh 2008-12-09 14:12:43.000000000 +0100
|
||||
@@ -2,9 +2,9 @@
|
||||
# Generates and cleans KConfigXT source code during a API dox build
|
||||
#
|
||||
@ -118,9 +118,9 @@ diff -ur kdelibs-4.1.80/doc/api/doxygen-preprocess-kcfg.sh kdelibs-4.1.80-parall
|
||||
exit 1;
|
||||
fi
|
||||
|
||||
diff -ur kdelibs-4.1.80/kdecore/kconfig_compiler/checkkcfg.pl kdelibs-4.1.80-parallel_devel/kdecore/kconfig_compiler/checkkcfg.pl
|
||||
--- kdelibs-4.1.80/kdecore/kconfig_compiler/checkkcfg.pl 2008-05-21 13:09:13.000000000 +0200
|
||||
+++ kdelibs-4.1.80-parallel_devel/kdecore/kconfig_compiler/checkkcfg.pl 2008-11-25 21:10:41.000000000 +0100
|
||||
diff -Naurw kdelibs-4.1.82/kdecore/kconfig_compiler/checkkcfg.pl kdelibs-4.1.82.parallel_devel/kdecore/kconfig_compiler/checkkcfg.pl
|
||||
--- kdelibs-4.1.82/kdecore/kconfig_compiler/checkkcfg.pl 2008-05-21 13:09:13.000000000 +0200
|
||||
+++ kdelibs-4.1.82.parallel_devel/kdecore/kconfig_compiler/checkkcfg.pl 2008-12-09 14:12:43.000000000 +0100
|
||||
@@ -15,12 +15,12 @@
|
||||
|
||||
$kcfgc = $file . "c";
|
||||
@ -136,9 +136,9 @@ diff -ur kdelibs-4.1.80/kdecore/kconfig_compiler/checkkcfg.pl kdelibs-4.1.80-par
|
||||
exit 1;
|
||||
}
|
||||
|
||||
diff -ur kdelibs-4.1.80/kdecore/kconfig_compiler/CMakeLists.txt kdelibs-4.1.80-parallel_devel/kdecore/kconfig_compiler/CMakeLists.txt
|
||||
--- kdelibs-4.1.80/kdecore/kconfig_compiler/CMakeLists.txt 2008-10-30 15:19:14.000000000 +0100
|
||||
+++ kdelibs-4.1.80-parallel_devel/kdecore/kconfig_compiler/CMakeLists.txt 2008-11-25 21:10:41.000000000 +0100
|
||||
diff -Naurw kdelibs-4.1.82/kdecore/kconfig_compiler/CMakeLists.txt kdelibs-4.1.82.parallel_devel/kdecore/kconfig_compiler/CMakeLists.txt
|
||||
--- kdelibs-4.1.82/kdecore/kconfig_compiler/CMakeLists.txt 2008-10-30 15:19:14.000000000 +0100
|
||||
+++ kdelibs-4.1.82.parallel_devel/kdecore/kconfig_compiler/CMakeLists.txt 2008-12-09 14:12:43.000000000 +0100
|
||||
@@ -8,11 +8,11 @@
|
||||
set(kconfig_compiler_SRCS kconfig_compiler.cpp)
|
||||
|
||||
@ -154,9 +154,9 @@ diff -ur kdelibs-4.1.80/kdecore/kconfig_compiler/CMakeLists.txt kdelibs-4.1.80-p
|
||||
|
||||
|
||||
########### install files ###############
|
||||
diff -ur kdelibs-4.1.80/kdeui/tests/kconfig_compiler/CMakeLists.txt kdelibs-4.1.80-parallel_devel/kdeui/tests/kconfig_compiler/CMakeLists.txt
|
||||
--- kdelibs-4.1.80/kdeui/tests/kconfig_compiler/CMakeLists.txt 2008-05-21 13:08:30.000000000 +0200
|
||||
+++ kdelibs-4.1.80-parallel_devel/kdeui/tests/kconfig_compiler/CMakeLists.txt 2008-11-25 21:10:41.000000000 +0100
|
||||
diff -Naurw kdelibs-4.1.82/kdeui/tests/kconfig_compiler/CMakeLists.txt kdelibs-4.1.82.parallel_devel/kdeui/tests/kconfig_compiler/CMakeLists.txt
|
||||
--- kdelibs-4.1.82/kdeui/tests/kconfig_compiler/CMakeLists.txt 2008-05-21 13:08:30.000000000 +0200
|
||||
+++ kdelibs-4.1.82.parallel_devel/kdeui/tests/kconfig_compiler/CMakeLists.txt 2008-12-09 14:12:43.000000000 +0100
|
||||
@@ -9,7 +9,7 @@
|
||||
add_custom_command(
|
||||
OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${_testName}.cpp ${CMAKE_CURRENT_BINARY_DIR}/${_testName}.h
|
||||
@ -166,9 +166,9 @@ diff -ur kdelibs-4.1.80/kdeui/tests/kconfig_compiler/CMakeLists.txt kdelibs-4.1.
|
||||
|
||||
# set_source_files_properties(${CMAKE_CURRENT_BINARY_DIR}/${_testName}.h PROPERTIES GENERATED TRUE)
|
||||
qt4_generate_moc(${CMAKE_CURRENT_BINARY_DIR}/${_testName}.h ${CMAKE_CURRENT_BINARY_DIR}/${_testName}.moc )
|
||||
diff -ur kdelibs-4.1.80/kdewidgets/CMakeLists.txt kdelibs-4.1.80-parallel_devel/kdewidgets/CMakeLists.txt
|
||||
--- kdelibs-4.1.80/kdewidgets/CMakeLists.txt 2008-11-12 17:38:22.000000000 +0100
|
||||
+++ kdelibs-4.1.80-parallel_devel/kdewidgets/CMakeLists.txt 2008-11-25 21:10:41.000000000 +0100
|
||||
diff -Naurw kdelibs-4.1.82/kdewidgets/CMakeLists.txt kdelibs-4.1.82.parallel_devel/kdewidgets/CMakeLists.txt
|
||||
--- kdelibs-4.1.82/kdewidgets/CMakeLists.txt 2008-11-12 17:38:22.000000000 +0100
|
||||
+++ kdelibs-4.1.82.parallel_devel/kdewidgets/CMakeLists.txt 2008-12-09 14:12:43.000000000 +0100
|
||||
@@ -14,22 +14,22 @@
|
||||
set(makekdewidgets_SRCS makekdewidgets.cpp )
|
||||
|
@ -1,6 +1,6 @@
|
||||
Summary: K Desktop Environment 4 - Libraries
|
||||
Version: 4.1.82
|
||||
Release: 1%{?dist}
|
||||
Release: 2%{?dist}
|
||||
|
||||
%if 0%{?fedora} > 8
|
||||
Name: kdelibs
|
||||
@ -46,9 +46,9 @@ Source1: kde4.sh
|
||||
Source2: kde4.csh
|
||||
|
||||
# make -devel packages parallel-installable
|
||||
Patch0: kdelibs-4.1.80-parallel_devel.patch
|
||||
Patch0: kdelibs-4.1.82-parallel_devel.patch
|
||||
# fix kde#149705
|
||||
Patch2: kdelibs-3.95.0-kde149705.patch
|
||||
Patch2: kdelibs-4.1.82-kde149705.patch
|
||||
# Hunspell support for K3Spell
|
||||
# http://fedoraproject.org/wiki/Releases/FeatureDictionary
|
||||
# http://bugs.kde.org/show_bug.cgi?id=154561
|
||||
@ -355,6 +355,9 @@ rm -rf %{buildroot}
|
||||
|
||||
|
||||
%changelog
|
||||
* Tue Dec 09 2008 Lorenzo Villani <lvillani@binaryhelix.net> - 6:4.1.82-2
|
||||
- rebase parallel devel patch and kde149705 patch
|
||||
|
||||
* Mon Dec 08 2008 Lorenzo Villani <lvillani@binaryhelix.net> - 6:4.1.82-1
|
||||
- 4.1.82
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user