rpms
/
kdelibs
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Sync from devel: 

* Tue Feb 09 2010 Rex Dieter <rdieter@fedoraproject.org> - 6:4.4.0-4
- depend on version of phonon,strigi,soprano built against

* Tue Feb 09 2010 Rex Dieter <rdieter@fedoraproject.org> - 6:4.4.0-3
- respin

* Mon Feb 08 2010 Rex Dieter <rdieter@fedoraproject.org> - 6:4.4.0-2
- respin

* Fri Feb 05 2010 Than Ngo <than@redhat.com> - 6:4.4.0-1
- 4.4.0

* Tue Feb 02 2010 Rex Dieter <rdieter@fedoraproject.org> - 4.3.98-4
- -apidocs: build as normal noarch subpkg

* Tue Feb 02 2010 Rex Dieter <rdieter@fedoraproject.org> - 4.3.98-3
- respin no_rpath patch, add LIB_INSTALL_DIR rpath only if not in
  CMAKE_SYSTEM_LIBRARY_PATH.  added some status messages to help debug.

* Mon Feb 01 2010 Rex Dieter <rdieter@fedoraproject.org> - 4.3.98-2
- no_rpath patch, goodbye -DCMAKE_SKIP_RPATH:BOOL=ON, it's been fun

* Sun Jan 31 2010 Rex Dieter <rdieter@fedoraproject.org> - 4.3.98-1
- KDE 4.3.98 (4.4rc3)

* Wed Jan 27 2010 Rex Dieter <rdieter@fedoraproject.org> - 4.3.95-3
- patch for kde4-config --kde-version option (kde#224540)

* Tue Jan 26 2010 Rex Dieter <rdieter@fedoraproject.org> - 4.3.95-2
- -devel: Obsoletes: webkitkde-devel

* Wed Jan 20 2010 Lukas Tinkl <ltinkl@redhat.com> - 4.3.95-1
- KDE 4.3.95 (4.4rc2)

* Thu Jan 14 2010 Rex Dieter <rdieter@fedoraproject.org> - 4.3.90-6
- use %%_polkit_qt_policydir
- strigi_ver 0.7.1

* Mon Jan 11 2010 Jaroslav Reznik <jreznik@redhat.com> - 4.3.90-5
- hopefully correct kauth fix (old polkit cmake module is broken)

* Fri Jan 08 2010 Jaroslav Reznik <jreznik@redhat.com> - 4.3.90-4
- fix kauth polkit policies installation

* Thu Jan 07 2010 Rex Dieter <rdieter@fedoraproject.org> - 4.3.90-3
- bump min polkit-qt version(s)

* Wed Jan 06 2010 Rex Dieter <rdieter@fedoraproject.org> - 4.3.90-2
- -devel: Requires: shared-desktop-ontologies-devel

* Wed Jan 06 2010 Rex Dieter <rdieter@fedoraproject.org> - 4.3.90-1
- 4.3.90 (4.4rc1)
- drop openssl patch (no longer needed since bug #429846 fixed)

* Tue Jan 05 2010 Jaroslav Reznik <jreznik@redhat.com> - 4.3.85-7
- PolkitQt rebuild

* Sun Dec 27 2009 Rex Dieter <rdieter@fedoraproject.org> - 4.3.85-6
- Conflicts: kdebase-workspace(-libs,-devel) < 4.3.80

* Sat Dec 26 2009 Rex Dieter <rdieter@fedoraproject.org> - 4.3.85-5
- move kdecmake,makekdewidgets manpages to -devel (#549947)

* Sat Dec 19 2009 Rex Dieter <rdieter@fedoraproject.org> - 4.3.85-4
- tarball respin

* Fri Dec 18 2009 Rex Dieter <rdieter@fedoraproject.org> - 4.3.85-3
- -devel: Requires: attica-devel

* Fri Dec 18 2009 Rex Dieter <rdieter@fedoraproject.org> - 4.3.85-2
- plasma_scrollwidget patch

* Fri Dec 18 2009 Rex Dieter <rdieter@fedoraproject.org> - 4.3.85-1
- 4.3.85 (4.4 beta2)

* Wed Dec 16 2009 Jaroslav Reznik <jreznik@redhat.com> - 4.3.80-5
- Repositioning the KDE Brand (#547361)

* Wed Dec 09 2009 Rex Dieter <rdieter@fedoraproject.org> - 4.3.80-4
- BR: attica-devel shared-desktop-ontologies-devel
- phonon_ver 4.3.80
- soprano_ver 2.3.70

* Fri Dec 04 2009 Than Ngo <than@redhat.com> - 4.3.80-3
- respin

* Thu Dec 03 2009 Kevin Kofler <Kevin@tigcc.ticalc.org> - 4.3.80-2
- BR polkit-qt-devel
- fix the build of the KAuth PolkitQt-1 backend (upstream patch)

* Tue Dec 01 2009 Ben Boeckel <MathStuf@gmail.com> - 4.3.80-1
- KDE 4.4 beta1 (4.3.80)

* Wed Nov 25 2009 Rex Dieter <rdieter@fedoraproject.org> - 4.3.75-0.2.svn1048496
- -devel: Provides: kdelibs4-devel%{?_isa} ...
- Obsoletes: kdelibs-experimental(-devel) < 4.3.75

* Fri Nov 20 2009 Ben Boeckel <MathStuf@gmail.com> - 4.3.75-0.1.svn1048496
- Update to 4.3.75 snapshot

* Wed Nov 18 2009 Rex Dieter <rdieter@fedoraproject.org> - 4.3.3-6
- rebuild (for qt-4.6.0-rc1, f13+)
- fix/revert soprano_ver change in -5
This commit is contained in:
Kevin Kofler 2010-02-10 01:46:16 +00:00
parent 19c42cbb09
commit cb0bd4bae3
15 changed files with 400 additions and 1162 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.cvsignore
View File

@ -1 +1 @@
kdelibs-4.3.5.tar.bz2 kdelibs-4.4.0.tar.bz2

25
kdelibs-4.0.0-openssl.patch
View File

@ -1,25 +0,0 @@
diff -up kdelibs-4.0.0/kio/kssl/kopenssl.cpp.openssl kdelibs-4.0.0/kio/kssl/kopenssl.cpp
--- kdelibs-4.0.0/kio/kssl/kopenssl.cpp.openssl 2008-01-04 18:00:20.000000000 -0600
+++ kdelibs-4.0.0/kio/kssl/kopenssl.cpp 2008-01-23 06:58:32.000000000 -0600
@@ -357,6 +357,10 @@ KOpenSSLProxy::KOpenSSLProxy()
#ifdef SHLIB_VERSION_NUMBER
<< "libssl.so." SHLIB_VERSION_NUMBER
#endif
+ << "libssl.so.0.9.8g"
+ << "libssl.so.7"
+ << "libssl.so.0.9.8b"
+ << "libssl.so.6"
<< "libssl.so"
<< "libssl.so.0"
#endif
@@ -374,6 +378,10 @@ KOpenSSLProxy::KOpenSSLProxy()
#ifdef SHLIB_VERSION_NUMBER
<< "libcrypto.so." SHLIB_VERSION_NUMBER
#endif
+ << "libcrypto.so.0.9.8g"
+ << "libcrypto.so.7"
+ << "libcrypto.so.0.9.8b"
+ << "libcrypto.so.6"
<< "libcrypto.so"
<< "libcrypto.so.0"
#endif

12
kdelibs-4.0.2-install-all-css.patch
View File

@ -1,12 +0,0 @@
diff -ur kdelibs-4.0.2/doc/common/CMakeLists.txt kdelibs-4.0.2-install-all-css/doc/common/CMakeLists.txt
--- kdelibs-4.0.2/doc/common/CMakeLists.txt 2008-01-05 01:00:05.000000000 +0100
+++ kdelibs-4.0.2-install-all-css/doc/common/CMakeLists.txt 2008-03-06 05:18:11.000000000 +0100
@@ -7,6 +7,8 @@
xml.dcl
doxygen.css
tabs.css
+ kde.css flat.css print.css
+ Doxyfile.global
header.html
footer.html
mainheader.html

16
kdelibs-4.3.0-bookmarks.patch
View File

@ -1,16 +0,0 @@
diff -rU5 kdelibs-4.3.0/kio/bookmarks/kbookmark.cc kdelibs-4.3.0.bookmarks/kio/bookmarks/kbookmark.cc
--- kdelibs-4.3.0/kio/bookmarks/kbookmark.cc 2008-07-08 05:54:18.000000000 -0400
+++ kdelibs-4.3.0.bookmarks/kio/bookmarks/kbookmark.cc 2009-08-28 15:09:07.000000000 -0400
@@ -681,11 +681,11 @@
doc.setContent( payload );
QDomElement elem = doc.documentElement();
QDomNodeList children = elem.childNodes();
for ( int childno = 0; childno < children.count(); childno++)
{
- bookmarks.append( KBookmark( children.item(childno).cloneNode(true).toElement() ));
+ bookmarks.append( KBookmark( children.item(childno).toElement() ));
}
return bookmarks;
}
const KUrl::List urls = KUrl::List::fromMimeData( mimeData );
if ( !urls.isEmpty() )

156
kdelibs-4.3.3-adFilteredBy.patch
View File

@ -1,156 +0,0 @@
Index: khtml/khtml_settings.h
===================================================================
--- khtml/khtml_settings.h (revision 1027233)
+++ khtml/khtml_settings.h (revision 1027234)
@@ -186,7 +186,23 @@
bool isPluginsEnabled( const QString& hostname = QString() ) const;
// AdBlocK Filtering
+
+ /** tests whether @p url is filtered.
+ * @param url the URL to test.
+ * @return @c true if the URL is blacklisted and is not whitelisted.
+ */
bool isAdFiltered( const QString &url ) const;
+
+ /** identify the filter which matches @p url.
+ * @param url the URL to test.
+ * @param isWhiteListed if not @c NULL, set to @c true if the URL matched
+ * a whitelist filter; set to @c false if it matched a blacklist filter.
+ * @return the filter string that matched,
+ * or @c QString() if no filter matched.
+ * @since 4.4
+ */
+ QString adFilteredBy( const QString &url, bool *isWhiteListed = 0 ) const;
+
bool isAdFilterEnabled() const;
bool isHideAdsEnabled() const;
void addAdFilter( const QString &url );
Index: khtml/khtml_filter_p.h
===================================================================
--- khtml/khtml_filter_p.h (revision 1027233)
+++ khtml/khtml_filter_p.h (revision 1027234)
@@ -35,8 +35,9 @@
// add filter to matching set
void addString(const QString& pattern);
- // check if string match at least one string from matching set
- bool isMatched(const QString& str) const;
+ // check if string matches at least one string from matching set,
+ // optionally return the matching string or filter
+ bool isMatched(const QString& str, QString *by = 0) const;
// add filter to matching set with wildcards (*,?) in it
void addWildedString(const QString& prefix, const QRegExp& rx);
@@ -60,9 +61,10 @@
// Parses and registers a filter. This will also strip @@ for exclusion rules, skip comments, etc.
// The user does have to split black and white lists into separate sets, however
void addFilter(const QString& filter);
-
+
bool isUrlMatched(const QString& url);
-
+ QString urlMatchedBy(const QString& url);
+
void clear();
private:
Index: khtml/khtml_settings.cpp
===================================================================
--- khtml/khtml_settings.cpp (revision 1027233)
+++ khtml/khtml_settings.cpp (revision 1027234)
@@ -743,6 +743,27 @@
return false;
}
+QString KHTMLSettings::adFilteredBy( const QString &url, bool *isWhiteListed ) const
+{
+ QString m = d->adWhiteList.urlMatchedBy(url);
+ if (!m.isEmpty())
+ {
+ if (isWhiteListed != 0)
+ *isWhiteListed = true;
+ return (m);
+ }
+
+ m = d->adBlackList.urlMatchedBy(url);
+ if (!m.isEmpty())
+ {
+ if (isWhiteListed != 0)
+ *isWhiteListed = false;
+ return (m);
+ }
+
+ return (QString());
+}
+
void KHTMLSettings::addAdFilter( const QString &url )
{
KConfigGroup config = KSharedConfig::openConfig( "khtmlrc", KConfig::NoGlobals )->group( "Filter Settings" );
Index: khtml/khtml_filter.cpp
===================================================================
--- khtml/khtml_filter.cpp (revision 1027233)
+++ khtml/khtml_filter.cpp (revision 1027234)
@@ -133,6 +133,25 @@
return false;
}
+QString FilterSet::urlMatchedBy(const QString& url)
+{
+ QString by;
+
+ if (stringFiltersMatcher.isMatched(url, &by))
+ return by;
+
+ for (int c = 0; c < reFilters.size(); ++c)
+ {
+ if (url.contains(reFilters[c]))
+ {
+ by = reFilters[c].pattern();
+ break;
+ }
+ }
+
+ return by;
+}
+
void FilterSet::clear()
{
reFilters.clear();
@@ -196,12 +215,15 @@
}
}
-bool StringsMatcher::isMatched(const QString& str) const
+bool StringsMatcher::isMatched(const QString& str, QString *by) const
{
// check short strings first
for (int i = 0; i < shortStringFilters.size(); ++i) {
if (str.contains(shortStringFilters[i]))
+ {
+ if (by != 0) *by = shortStringFilters[i];
return true;
+ }
}
int len = str.length();
@@ -235,13 +257,19 @@
if (index >= 0) {
int flen = stringFilters[index].length();
if (k - flen + 1 >= 0 && stringFilters[index] == str.midRef(k - flen + 1 , flen))
+ {
+ if (by != 0) *by = stringFilters[index];
return true;
+ }
} else {
index = -index - 1;
int flen = rePrefixes[index].length();
if (k - 8 + flen < len && rePrefixes[index] == str.midRef(k - 7, flen) &&
str.indexOf(reFilters[index], k - 7 + flen) == k - 7 + flen)
+ {
+ if (by != 0) *by = rePrefixes[index]+reFilters[index].pattern();
return true;
+ }
}
}
}

21
kdelibs-4.3.5-kde-config_kde-version.patch
View File

@ -1,21 +0,0 @@
diff -up kdelibs-4.3.5/kdecore/kde-config.cpp.kde-config_kde-version kdelibs-4.3.5/kdecore/kde-config.cpp
--- kdelibs-4.3.5/kdecore/kde-config.cpp.kde-config_kde-version 2009-10-30 07:26:05.000000000 -0500
+++ kdelibs-4.3.5/kdecore/kde-config.cpp 2010-01-29 10:01:52.147714559 -0600
@@ -77,7 +77,7 @@ int main(int argc, char **argv)
options.add("exec-prefix", ki18n("Compiled in exec_prefix for KDE libraries"));
options.add("libsuffix", ki18n("Compiled in library path suffix"));
options.add("localprefix", ki18n("Prefix in $HOME used to write files"));
- options.add("version", ki18n("Compiled in version string for KDE libraries"));
+ options.add("kde-version", ki18n("Compiled in version string for KDE libraries"));
options.add("types", ki18n("Available KDE resource types"));
options.add("path type", ki18n("Search path for resource type"));
options.add("locate filename", ki18n("Find filename inside the resource type given to --path"));
@@ -122,7 +122,7 @@ int main(int argc, char **argv)
return 0;
}
- if (args->isSet("version"))
+ if (args->isSet("kde-version"))
{
printf("%s\n", KDE_VERSION_STRING);
return 0;

28
kdelibs-4.1.72-policykit-workaround.patch → kdelibs-4.3.80-policykit-workaround.patch
View File

@ -1,6 +1,6 @@
diff -Naur kdelibs-4.1.72.policykit/solid/solid/backends/hal/halstorageaccess.cpp kdelibs-4.1.72/solid/solid/backends/hal/halstorageaccess.cpp diff -ur kdelibs-4.3.80/solid/solid/backends/hal/halstorageaccess.cpp kdelibs-4.3.80-policykit-workaround/solid/solid/backends/hal/halstorageaccess.cpp
--- kdelibs-4.1.72.policykit/solid/solid/backends/hal/halstorageaccess.cpp 2008-11-04 18:13:11.000000000 +0100 --- kdelibs-4.3.80/solid/solid/backends/hal/halstorageaccess.cpp 2009-12-01 01:27:28.000000000 +0100
+++ kdelibs-4.1.72/solid/solid/backends/hal/halstorageaccess.cpp 2008-11-10 18:45:41.000000000 +0100 +++ kdelibs-4.3.80-policykit-workaround/solid/solid/backends/hal/halstorageaccess.cpp 2009-12-03 03:49:55.000000000 +0100
@@ -17,6 +17,8 @@ @@ -17,6 +17,8 @@
*/ */
@ -10,29 +10,29 @@ diff -Naur kdelibs-4.1.72.policykit/solid/solid/backends/hal/halstorageaccess.cp
#include "halstorageaccess.h" #include "halstorageaccess.h"
#include "halfstabhandling.h" #include "halfstabhandling.h"
@@ -172,11 +174,21 @@ @@ -177,11 +179,21 @@
{ {
// TODO: Better error reporting here // TODO: Better error reporting here
if (m_setupInProgress) { if (m_setupInProgress) {
+ if (error.name() == "org.freedesktop.Hal.Device.PermissionDeniedByPolicy") { + if (error.name() == "org.freedesktop.Hal.Device.PermissionDeniedByPolicy") {
+ if (callPrivilegedMount()) + if (callPrivilegedMount())
+ return; + return;
+ // if we fail to run kdesu, fall through and emit the original PermissionDeniedByPolicy error + // if we fail to run kdesu, fall through and emit the original PermissionDeniedByPolicy error
+ } + }
m_setupInProgress = false; m_setupInProgress = false;
emit setupDone(Solid::UnauthorizedOperation, emit setupDone(Solid::UnauthorizedOperation,
error.name()+": "+error.message(), QString(error.name()+": "+error.message()),
m_device->udi()); m_device->udi());
} else if (m_teardownInProgress) { } else if (m_teardownInProgress) {
+ if (error.name() == "org.freedesktop.Hal.Device.PermissionDeniedByPolicy") { + if (error.name() == "org.freedesktop.Hal.Device.PermissionDeniedByPolicy") {
+ if (callPrivilegedUnmount()) + if (callPrivilegedUnmount())
+ return; + return;
+ // if we fail to run kdesu, fall through and emit the original PermissionDeniedByPolicy error + // if we fail to run kdesu, fall through and emit the original PermissionDeniedByPolicy error
+ } + }
m_teardownInProgress = false; m_teardownInProgress = false;
emit teardownDone(Solid::UnauthorizedOperation, emit teardownDone(Solid::UnauthorizedOperation,
error.name()+": "+error.message(), QString(error.name()+": "+error.message()),
@@ -294,8 +306,9 @@ @@ -311,8 +323,9 @@
#else #else
QString uid="uid="; QString uid="uid=";
#endif #endif
@ -44,7 +44,7 @@ diff -Naur kdelibs-4.1.72.policykit/solid/solid/backends/hal/halstorageaccess.cp
} }
#ifdef Q_OS_FREEBSD #ifdef Q_OS_FREEBSD
@@ -333,6 +346,59 @@ @@ -354,6 +367,59 @@
SLOT(slotDBusError(const QDBusError &))); SLOT(slotDBusError(const QDBusError &)));
} }
@ -104,10 +104,10 @@ diff -Naur kdelibs-4.1.72.policykit/solid/solid/backends/hal/halstorageaccess.cp
bool StorageAccess::callHalVolumeUnmount() bool StorageAccess::callHalVolumeUnmount()
{ {
QDBusConnection c = QDBusConnection::systemBus(); QDBusConnection c = QDBusConnection::systemBus();
diff -Naur kdelibs-4.1.72.policykit/solid/solid/backends/hal/halstorageaccess.h kdelibs-4.1.72/solid/solid/backends/hal/halstorageaccess.h diff -ur kdelibs-4.3.80/solid/solid/backends/hal/halstorageaccess.h kdelibs-4.3.80-policykit-workaround/solid/solid/backends/hal/halstorageaccess.h
--- kdelibs-4.1.72.policykit/solid/solid/backends/hal/halstorageaccess.h 2008-05-21 13:07:38.000000000 +0200 --- kdelibs-4.3.80/solid/solid/backends/hal/halstorageaccess.h 2009-12-01 01:27:28.000000000 +0100
+++ kdelibs-4.1.72/solid/solid/backends/hal/halstorageaccess.h 2008-11-10 18:45:01.000000000 +0100 +++ kdelibs-4.3.80-policykit-workaround/solid/solid/backends/hal/halstorageaccess.h 2009-12-03 03:49:55.000000000 +0100
@@ -69,6 +69,9 @@ @@ -70,6 +70,9 @@
bool callSystemMount(); bool callSystemMount();
bool callSystemUnmount(); bool callSystemUnmount();

303
kdelibs-4.2.96-parallel_devel.patch → kdelibs-4.3.85-parallel_devel.patch
View File

@ -1,133 +1,6 @@
diff -up kdelibs-4.2.96/cmake/modules/FindKDE4Internal.cmake.parallel_devel kdelibs-4.2.96/cmake/modules/FindKDE4Internal.cmake diff -up kdelibs-4.3.85/kdecore/kconfig_compiler/checkkcfg.pl.parallel_devel kdelibs-4.3.85/kdecore/kconfig_compiler/checkkcfg.pl
--- kdelibs-4.2.96/cmake/modules/FindKDE4Internal.cmake.parallel_devel 2009-07-08 16:41:09.000000000 +0200 --- kdelibs-4.3.85/kdecore/kconfig_compiler/checkkcfg.pl.parallel_devel 2008-05-21 06:09:13.000000000 -0500
+++ kdelibs-4.2.96/cmake/modules/FindKDE4Internal.cmake 2009-07-13 16:32:48.000000000 +0200 +++ kdelibs-4.3.85/kdecore/kconfig_compiler/checkkcfg.pl 2009-12-18 08:39:50.000000000 -0600
@@ -15,10 +15,10 @@
# The following variables are defined for the various tools required to
# compile KDE software:
#
-# KDE4_KCFGC_EXECUTABLE - the kconfig_compiler executable
+# KDE4_KCFGC_EXECUTABLE - the kconfig_compiler4 executable
# KDE4_AUTOMOC_EXECUTABLE - the kde4automoc executable, deprecated, use AUTOMOC4_EXECUTABLE instead
# KDE4_MEINPROC_EXECUTABLE - the meinproc4 executable
-# KDE4_MAKEKDEWIDGETS_EXECUTABLE - the makekdewidgets executable
+# KDE4_MAKEKDEWIDGETS_EXECUTABLE - the makekdewidgets4 executable
#
# The following variables point to the location of the KDE libraries,
# but shouldn't be used directly:
@@ -129,7 +129,7 @@
# Use optional GENERATE_MOC to generate moc if you use signals in your kcfg files.
#
# KDE4_ADD_WIDGET_FILES (SRCS_VAR file1.widgets ... fileN.widgets)
-# Use this to add widget description files for the makekdewidgets code generator
+# Use this to add widget description files for the makekdewidgets4 code generator
# for Qt Designer plugins.
#
# KDE4_CREATE_FINAL_FILES (filename_CXX filename_C file1 ... fileN)
@@ -383,23 +383,23 @@ if (_kdeBootStrapping)
if (WIN32)
set(LIBRARY_OUTPUT_PATH ${EXECUTABLE_OUTPUT_PATH} )
# CMAKE_CFG_INTDIR is the output subdirectory created e.g. by XCode and MSVC
- set(KDE4_KCFGC_EXECUTABLE ${EXECUTABLE_OUTPUT_PATH}/${CMAKE_CFG_INTDIR}/kconfig_compiler )
+ set(KDE4_KCFGC_EXECUTABLE ${EXECUTABLE_OUTPUT_PATH}/${CMAKE_CFG_INTDIR}/kconfig_compiler4 )
set(KDE4_MEINPROC_EXECUTABLE ${EXECUTABLE_OUTPUT_PATH}/${CMAKE_CFG_INTDIR}/meinproc4 )
- set(KDE4_MAKEKDEWIDGETS_EXECUTABLE ${EXECUTABLE_OUTPUT_PATH}/${CMAKE_CFG_INTDIR}/makekdewidgets )
+ set(KDE4_MAKEKDEWIDGETS_EXECUTABLE ${EXECUTABLE_OUTPUT_PATH}/${CMAKE_CFG_INTDIR}/makekdewidgets4 )
else (WIN32)
set(LIBRARY_OUTPUT_PATH ${CMAKE_BINARY_DIR}/lib )
- set(KDE4_KCFGC_EXECUTABLE ${EXECUTABLE_OUTPUT_PATH}/${CMAKE_CFG_INTDIR}/kconfig_compiler.shell )
+ set(KDE4_KCFGC_EXECUTABLE ${EXECUTABLE_OUTPUT_PATH}/${CMAKE_CFG_INTDIR}/kconfig_compiler4.shell )
set(KDE4_MEINPROC_EXECUTABLE ${EXECUTABLE_OUTPUT_PATH}/${CMAKE_CFG_INTDIR}/meinproc4.shell )
- set(KDE4_MAKEKDEWIDGETS_EXECUTABLE ${EXECUTABLE_OUTPUT_PATH}/${CMAKE_CFG_INTDIR}/makekdewidgets.shell )
+ set(KDE4_MAKEKDEWIDGETS_EXECUTABLE ${EXECUTABLE_OUTPUT_PATH}/${CMAKE_CFG_INTDIR}/makekdewidgets4.shell )
endif (WIN32)
set(KDE4_LIB_DIR ${LIBRARY_OUTPUT_PATH}/${CMAKE_CFG_INTDIR})
# when building kdelibs, make the kcfg rules depend on the binaries...
- set( _KDE4_KCONFIG_COMPILER_DEP kconfig_compiler)
- set( _KDE4_MAKEKDEWIDGETS_DEP makekdewidgets)
+ set( _KDE4_KCONFIG_COMPILER_DEP kconfig_compiler4)
+ set( _KDE4_MAKEKDEWIDGETS_DEP makekdewidgets4)
set( _KDE4_MEINPROC_EXECUTABLE_DEP meinproc4)
set(KDE4_INSTALLED_VERSION_OK TRUE)
@@ -497,7 +497,8 @@ else (_kdeBootStrapping)
# KDE4_LIB_INSTALL_DIR and KDE4_INCLUDE_INSTALL_DIR are set in KDELibsDependencies.cmake,
# use them to set the KDE4_LIB_DIR and KDE4_INCLUDE_DIR "public interface" variables
- set(KDE4_LIB_DIR ${KDE4_LIB_INSTALL_DIR} )
+ set(KDE4_LIB_DIR ${KDE4_LIB_INSTALL_DIR}/kde4/devel )
+ link_directories("${KDE4_LIB_DIR}")
set(KDE4_INCLUDE_DIR ${KDE4_INCLUDE_INSTALL_DIR} )
@@ -510,12 +511,12 @@ else (_kdeBootStrapping)
# get the build CONFIGURATIONS which were exported in this file, and use just the first
# of them to get the location of the installed executables
- get_target_property(_importedConfigurations ${KDE4_TARGET_PREFIX}kconfig_compiler IMPORTED_CONFIGURATIONS )
+ get_target_property(_importedConfigurations ${KDE4_TARGET_PREFIX}kconfig_compiler4 IMPORTED_CONFIGURATIONS )
list(GET _importedConfigurations 0 _firstConfig)
- get_target_property(KDE4_KCFGC_EXECUTABLE ${KDE4_TARGET_PREFIX}kconfig_compiler LOCATION_${_firstConfig})
+ get_target_property(KDE4_KCFGC_EXECUTABLE ${KDE4_TARGET_PREFIX}kconfig_compiler4 LOCATION_${_firstConfig})
get_target_property(KDE4_MEINPROC_EXECUTABLE ${KDE4_TARGET_PREFIX}meinproc4 LOCATION_${_firstConfig})
- get_target_property(KDE4_MAKEKDEWIDGETS_EXECUTABLE ${KDE4_TARGET_PREFIX}makekdewidgets LOCATION_${_firstConfig})
+ get_target_property(KDE4_MAKEKDEWIDGETS_EXECUTABLE ${KDE4_TARGET_PREFIX}makekdewidgets4 LOCATION_${_firstConfig})
# 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)
@@ -782,7 +783,8 @@ set(CMAKE_SYSTEM_INCLUDE_PATH ${CMAKE_SY
set(CMAKE_SYSTEM_PROGRAM_PATH ${CMAKE_SYSTEM_PROGRAM_PATH}
"${KDE4_BIN_INSTALL_DIR}" )
-set(CMAKE_SYSTEM_LIBRARY_PATH ${CMAKE_SYSTEM_LIBRARY_PATH}
+set(CMAKE_SYSTEM_LIBRARY_PATH "${KDE4_LIB_INSTALL_DIR}/kde4/devel"
+ ${CMAKE_SYSTEM_LIBRARY_PATH}
"${KDE4_LIB_INSTALL_DIR}" )
# under Windows dlls may be also installed in bin/
@@ -1166,9 +1168,9 @@ macro (KDE4_PRINT_RESULTS)
endif (NOT _kdeBootStrapping)
if(KDE4_KCFGC_EXECUTABLE)
- message(STATUS "Found the KDE4 kconfig_compiler preprocessor: ${KDE4_KCFGC_EXECUTABLE}")
+ message(STATUS "Found the KDE4 kconfig_compiler4 preprocessor: ${KDE4_KCFGC_EXECUTABLE}")
else(KDE4_KCFGC_EXECUTABLE)
- message(STATUS "Didn't find the KDE4 kconfig_compiler preprocessor")
+ message(STATUS "Didn't find the KDE4 kconfig_compiler4 preprocessor")
endif(KDE4_KCFGC_EXECUTABLE)
if(AUTOMOC4_EXECUTABLE)
@@ -1187,7 +1189,7 @@ if (KDE4Internal_FIND_REQUIRED AND NOT K
endif (NOT KDE4_INSTALLED_VERSION_OK)
if (NOT KDE4_KCFGC_EXECUTABLE)
- message(FATAL_ERROR "ERROR: could not detect a usable kconfig_compiler")
+ message(FATAL_ERROR "ERROR: could not detect a usable kconfig_compiler4")
endif (NOT KDE4_KCFGC_EXECUTABLE)
message(FATAL_ERROR "ERROR: could NOT find everything required for compiling KDE 4 programs")
diff -up kdelibs-4.2.96/doc/api/doxygen-preprocess-kcfg.sh.parallel_devel kdelibs-4.2.96/doc/api/doxygen-preprocess-kcfg.sh
--- kdelibs-4.2.96/doc/api/doxygen-preprocess-kcfg.sh.parallel_devel 2008-05-21 13:07:26.000000000 +0200
+++ kdelibs-4.2.96/doc/api/doxygen-preprocess-kcfg.sh 2009-07-13 16:26:04.000000000 +0200
@@ -2,9 +2,9 @@
# Generates and cleans KConfigXT source code during a API dox build
#
-kcfg_compiler="`kde4-config --prefix`/bin/kconfig_compiler"
+kcfg_compiler="`kde4-config --prefix`/bin/kconfig_compiler4"
if test -z "$kcfg_compiler"; then
- echo "kconfig_compiler not found!"
+ echo "kconfig_compiler4 not found!"
exit 1;
fi
diff -up kdelibs-4.2.96/kdecore/kconfig_compiler/checkkcfg.pl.parallel_devel kdelibs-4.2.96/kdecore/kconfig_compiler/checkkcfg.pl
--- kdelibs-4.2.96/kdecore/kconfig_compiler/checkkcfg.pl.parallel_devel 2008-05-21 13:09:13.000000000 +0200
+++ kdelibs-4.2.96/kdecore/kconfig_compiler/checkkcfg.pl 2009-07-13 16:26:04.000000000 +0200
@@ -15,12 +15,12 @@ $file_cpp = "$filebase.cpp"; @@ -15,12 +15,12 @@ $file_cpp = "$filebase.cpp";
$kcfgc = $file . "c"; $kcfgc = $file . "c";
@ -143,15 +16,15 @@ diff -up kdelibs-4.2.96/kdecore/kconfig_compiler/checkkcfg.pl.parallel_devel kde
exit 1; exit 1;
} }
diff -up kdelibs-4.2.96/kdecore/kconfig_compiler/CMakeLists.txt.parallel_devel kdelibs-4.2.96/kdecore/kconfig_compiler/CMakeLists.txt diff -up kdelibs-4.3.85/kdecore/kconfig_compiler/CMakeLists.txt.parallel_devel kdelibs-4.3.85/kdecore/kconfig_compiler/CMakeLists.txt
--- kdelibs-4.2.96/kdecore/kconfig_compiler/CMakeLists.txt.parallel_devel 2009-01-06 18:27:49.000000000 +0100 --- kdelibs-4.3.85/kdecore/kconfig_compiler/CMakeLists.txt.parallel_devel 2009-10-26 04:15:46.000000000 -0500
+++ kdelibs-4.2.96/kdecore/kconfig_compiler/CMakeLists.txt 2009-07-13 16:26:04.000000000 +0200 +++ kdelibs-4.3.85/kdecore/kconfig_compiler/CMakeLists.txt 2009-12-18 08:39:50.000000000 -0600
@@ -8,13 +8,13 @@ add_subdirectory( example ) @@ -4,13 +4,13 @@
set(kconfig_compiler_SRCS kconfig_compiler.cpp) set(kconfig_compiler_SRCS kconfig_compiler.cpp)
-kde4_add_executable(kconfig_compiler NOGUI RUN_UNINSTALLED ${kconfig_compiler_SRCS}) -kde4_add_executable(kconfig_compiler NOGUI ${kconfig_compiler_SRCS})
+kde4_add_executable(kconfig_compiler4 NOGUI RUN_UNINSTALLED ${kconfig_compiler_SRCS}) +kde4_add_executable(kconfig_compiler4 NOGUI ${kconfig_compiler_SRCS})
-target_link_libraries(kconfig_compiler ${QT_QTCORE_LIBRARY} ${QT_QTXML_LIBRARY} ) -target_link_libraries(kconfig_compiler ${QT_QTCORE_LIBRARY} ${QT_QTXML_LIBRARY} )
+target_link_libraries(kconfig_compiler4 ${QT_QTCORE_LIBRARY} ${QT_QTXML_LIBRARY} ) +target_link_libraries(kconfig_compiler4 ${QT_QTCORE_LIBRARY} ${QT_QTXML_LIBRARY} )
@ -163,27 +36,126 @@ diff -up kdelibs-4.2.96/kdecore/kconfig_compiler/CMakeLists.txt.parallel_devel k
########### install files ############### ########### install files ###############
diff -up kdelibs-4.2.96/kdeui/tests/kconfig_compiler/CMakeLists.txt.parallel_devel kdelibs-4.2.96/kdeui/tests/kconfig_compiler/CMakeLists.txt diff -up kdelibs-4.3.85/cmake/modules/FindKDE4Internal.cmake.parallel_devel kdelibs-4.3.85/cmake/modules/FindKDE4Internal.cmake
--- kdelibs-4.2.96/kdeui/tests/kconfig_compiler/CMakeLists.txt.parallel_devel 2008-05-21 13:08:30.000000000 +0200 --- kdelibs-4.3.85/cmake/modules/FindKDE4Internal.cmake.parallel_devel 2009-12-17 10:33:38.000000000 -0600
+++ kdelibs-4.2.96/kdeui/tests/kconfig_compiler/CMakeLists.txt 2009-07-13 16:26:04.000000000 +0200 +++ kdelibs-4.3.85/cmake/modules/FindKDE4Internal.cmake 2009-12-18 08:39:50.000000000 -0600
@@ -9,7 +9,7 @@ macro(GEN_KCFG_TEST_SOURCE _testName _sr @@ -15,10 +15,10 @@
add_custom_command( # The following variables are defined for the various tools required to
OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${_testName}.cpp ${CMAKE_CURRENT_BINARY_DIR}/${_testName}.h # compile KDE software:
COMMAND ${KDE4_KCFGC_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/${_testName}.kcfg ${CMAKE_CURRENT_SOURCE_DIR}/${_testName}.kcfgc #
- DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/${_testName}.kcfg ${CMAKE_CURRENT_SOURCE_DIR}/${_testName}.kcfgc kconfig_compiler) -# KDE4_KCFGC_EXECUTABLE - the kconfig_compiler executable
+ DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/${_testName}.kcfg ${CMAKE_CURRENT_SOURCE_DIR}/${_testName}.kcfgc kconfig_compiler4) +# KDE4_KCFGC_EXECUTABLE - the kconfig_compiler4 executable
# KDE4_AUTOMOC_EXECUTABLE - the kde4automoc executable, deprecated, use AUTOMOC4_EXECUTABLE instead
# KDE4_MEINPROC_EXECUTABLE - the meinproc4 executable
-# KDE4_MAKEKDEWIDGETS_EXECUTABLE - the makekdewidgets executable
+# KDE4_MAKEKDEWIDGETS_EXECUTABLE - the makekdewidgets4 executable
#
# The following variables point to the location of the KDE libraries,
# but shouldn't be used directly:
@@ -138,7 +138,7 @@
# relative path to the file.
#
# KDE4_ADD_WIDGET_FILES (SRCS_VAR file1.widgets ... fileN.widgets)
-# Use this to add widget description files for the makekdewidgets code generator
+# Use this to add widget description files for the makekdewidgets4 code generator
# for Qt Designer plugins.
#
# KDE4_CREATE_FINAL_FILES (filename_CXX filename_C file1 ... fileN)
@@ -421,25 +421,25 @@ if (_kdeBootStrapping)
if (WIN32)
set(LIBRARY_OUTPUT_PATH ${EXECUTABLE_OUTPUT_PATH} )
# CMAKE_CFG_INTDIR is the output subdirectory created e.g. by XCode and MSVC
- set(KDE4_KCFGC_EXECUTABLE ${EXECUTABLE_OUTPUT_PATH}/${CMAKE_CFG_INTDIR}/kconfig_compiler )
+ set(KDE4_KCFGC_EXECUTABLE ${EXECUTABLE_OUTPUT_PATH}/${CMAKE_CFG_INTDIR}/kconfig_compiler4 )
# set_source_files_properties(${CMAKE_CURRENT_BINARY_DIR}/${_testName}.h PROPERTIES GENERATED TRUE) set(KDE4_MEINPROC_EXECUTABLE ${EXECUTABLE_OUTPUT_PATH}/${CMAKE_CFG_INTDIR}/meinproc4 )
qt4_generate_moc(${CMAKE_CURRENT_BINARY_DIR}/${_testName}.h ${CMAKE_CURRENT_BINARY_DIR}/${_testName}.moc ) set(KDE4_KAUTH_POLICY_GEN_EXECUTABLE ${EXECUTABLE_OUTPUT_PATH}/${CMAKE_CFG_INTDIR}/kauth-policy-gen )
diff -up kdelibs-4.2.96/kdewidgets/CMakeLists.txt.parallel_devel kdelibs-4.2.96/kdewidgets/CMakeLists.txt - set(KDE4_MAKEKDEWIDGETS_EXECUTABLE ${EXECUTABLE_OUTPUT_PATH}/${CMAKE_CFG_INTDIR}/makekdewidgets )
--- kdelibs-4.2.96/kdewidgets/CMakeLists.txt.parallel_devel 2009-01-06 18:27:44.000000000 +0100 + set(KDE4_MAKEKDEWIDGETS_EXECUTABLE ${EXECUTABLE_OUTPUT_PATH}/${CMAKE_CFG_INTDIR}/makekdewidgets4 )
+++ kdelibs-4.2.96/kdewidgets/CMakeLists.txt 2009-07-13 16:26:04.000000000 +0200 else (WIN32)
set(LIBRARY_OUTPUT_PATH ${CMAKE_BINARY_DIR}/lib )
- set(KDE4_KCFGC_EXECUTABLE ${EXECUTABLE_OUTPUT_PATH}/${CMAKE_CFG_INTDIR}/kconfig_compiler${CMAKE_EXECUTABLE_SUFFIX}.shell )
+ set(KDE4_KCFGC_EXECUTABLE ${EXECUTABLE_OUTPUT_PATH}/${CMAKE_CFG_INTDIR}/kconfig_compiler4${CMAKE_EXECUTABLE_SUFFIX}.shell )
set(KDE4_KAUTH_POLICY_GEN_EXECUTABLE ${EXECUTABLE_OUTPUT_PATH}/${CMAKE_CFG_INTDIR}/kauth-policy-gen${CMAKE_EXECUTABLE_SUFFIX}.shell )
set(KDE4_MEINPROC_EXECUTABLE ${EXECUTABLE_OUTPUT_PATH}/${CMAKE_CFG_INTDIR}/meinproc4${CMAKE_EXECUTABLE_SUFFIX}.shell )
- set(KDE4_MAKEKDEWIDGETS_EXECUTABLE ${EXECUTABLE_OUTPUT_PATH}/${CMAKE_CFG_INTDIR}/makekdewidgets${CMAKE_EXECUTABLE_SUFFIX}.shell )
+ set(KDE4_MAKEKDEWIDGETS_EXECUTABLE ${EXECUTABLE_OUTPUT_PATH}/${CMAKE_CFG_INTDIR}/makekdewidgets4${CMAKE_EXECUTABLE_SUFFIX}.shell )
endif (WIN32)
set(KDE4_LIB_DIR ${LIBRARY_OUTPUT_PATH}/${CMAKE_CFG_INTDIR})
# when building kdelibs, make the kcfg rules depend on the binaries...
- set( _KDE4_KCONFIG_COMPILER_DEP kconfig_compiler)
+ set( _KDE4_KCONFIG_COMPILER_DEP kconfig_compiler4)
set( _KDE4_KAUTH_POLICY_GEN_EXECUTABLE_DEP kauth-policy-gen)
- set( _KDE4_MAKEKDEWIDGETS_DEP makekdewidgets)
+ set( _KDE4_MAKEKDEWIDGETS_DEP makekdewidgets4)
set( _KDE4_MEINPROC_EXECUTABLE_DEP meinproc4)
set(KDE4_INSTALLED_VERSION_OK TRUE)
@@ -487,7 +487,8 @@ else (_kdeBootStrapping)
# KDE4_LIB_INSTALL_DIR and KDE4_INCLUDE_INSTALL_DIR are set in KDELibsDependencies.cmake,
# use them to set the KDE4_LIB_DIR and KDE4_INCLUDE_DIR "public interface" variables
- set(KDE4_LIB_DIR ${KDE4_LIB_INSTALL_DIR} )
+ set(KDE4_LIB_DIR ${KDE4_LIB_INSTALL_DIR}/kde4/devel )
+ link_directories("${KDE4_LIB_DIR}")
set(KDE4_INCLUDE_DIR ${KDE4_INCLUDE_INSTALL_DIR} )
@@ -503,10 +504,10 @@ else (_kdeBootStrapping)
get_target_property(_importedConfigurations ${KDE4_TARGET_PREFIX}kconfig_compiler IMPORTED_CONFIGURATIONS )
list(GET _importedConfigurations 0 _firstConfig)
- get_target_property(KDE4_KCFGC_EXECUTABLE ${KDE4_TARGET_PREFIX}kconfig_compiler LOCATION_${_firstConfig})
+ get_target_property(KDE4_KCFGC_EXECUTABLE ${KDE4_TARGET_PREFIX}kconfig_compiler4 LOCATION_${_firstConfig})
get_target_property(KDE4_MEINPROC_EXECUTABLE ${KDE4_TARGET_PREFIX}meinproc4 LOCATION_${_firstConfig})
get_target_property(KDE4_KAUTH_POLICY_GEN_EXECUTABLE ${KDE4_TARGET_PREFIX}kauth-policy-gen LOCATION_${_firstConfig})
- get_target_property(KDE4_MAKEKDEWIDGETS_EXECUTABLE ${KDE4_TARGET_PREFIX}makekdewidgets LOCATION_${_firstConfig})
+ get_target_property(KDE4_MAKEKDEWIDGETS_EXECUTABLE ${KDE4_TARGET_PREFIX}makekdewidgets4 LOCATION_${_firstConfig})
# 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)
@@ -830,7 +831,8 @@ set(CMAKE_SYSTEM_INCLUDE_PATH ${CMAKE_SY
set(CMAKE_SYSTEM_PROGRAM_PATH ${CMAKE_SYSTEM_PROGRAM_PATH}
"${KDE4_BIN_INSTALL_DIR}" )
-set(CMAKE_SYSTEM_LIBRARY_PATH ${CMAKE_SYSTEM_LIBRARY_PATH}
+set(CMAKE_SYSTEM_LIBRARY_PATH "${KDE4_LIB_INSTALL_DIR}/kde4/devel"
+ ${CMAKE_SYSTEM_LIBRARY_PATH}
"${KDE4_LIB_INSTALL_DIR}" )
# under Windows dlls may be also installed in bin/
@@ -1224,9 +1227,9 @@ macro (KDE4_PRINT_RESULTS)
endif (NOT _kdeBootStrapping)
if(KDE4_KCFGC_EXECUTABLE)
- message(STATUS "Found the KDE4 kconfig_compiler preprocessor: ${KDE4_KCFGC_EXECUTABLE}")
+ message(STATUS "Found the KDE4 kconfig_compiler4 preprocessor: ${KDE4_KCFGC_EXECUTABLE}")
else(KDE4_KCFGC_EXECUTABLE)
- message(STATUS "Didn't find the KDE4 kconfig_compiler preprocessor")
+ message(STATUS "Didn't find the KDE4 kconfig_compiler4 preprocessor")
endif(KDE4_KCFGC_EXECUTABLE)
if(AUTOMOC4_EXECUTABLE)
@@ -1245,7 +1248,7 @@ if (KDE4Internal_FIND_REQUIRED AND NOT K
endif (NOT KDE4_INSTALLED_VERSION_OK)
if (NOT KDE4_KCFGC_EXECUTABLE)
- message(FATAL_ERROR "ERROR: could not detect a usable kconfig_compiler")
+ message(FATAL_ERROR "ERROR: could not detect a usable kconfig_compiler4")
endif (NOT KDE4_KCFGC_EXECUTABLE)
message(FATAL_ERROR "ERROR: could NOT find everything required for compiling KDE 4 programs")
diff -up kdelibs-4.3.85/kdewidgets/CMakeLists.txt.parallel_devel kdelibs-4.3.85/kdewidgets/CMakeLists.txt
--- kdelibs-4.3.85/kdewidgets/CMakeLists.txt.parallel_devel 2009-09-23 14:23:44.000000000 -0500
+++ kdelibs-4.3.85/kdewidgets/CMakeLists.txt 2009-12-18 08:39:50.000000000 -0600
@@ -14,24 +14,24 @@ include_directories( @@ -14,24 +14,24 @@ include_directories(
set(makekdewidgets_SRCS makekdewidgets.cpp ) set(makekdewidgets_SRCS makekdewidgets.cpp )
-kde4_add_executable(makekdewidgets NOGUI RUN_UNINSTALLED ${makekdewidgets_SRCS}) -kde4_add_executable(makekdewidgets NOGUI ${makekdewidgets_SRCS})
+kde4_add_executable(makekdewidgets4 NOGUI RUN_UNINSTALLED ${makekdewidgets_SRCS}) +kde4_add_executable(makekdewidgets4 NOGUI ${makekdewidgets_SRCS})
-target_link_libraries(makekdewidgets ${KDE4_KDECORE_LIBS} ) -target_link_libraries(makekdewidgets ${KDE4_KDECORE_LIBS} )
+target_link_libraries(makekdewidgets4 ${KDE4_KDECORE_LIBS} ) +target_link_libraries(makekdewidgets4 ${KDE4_KDECORE_LIBS} )
@ -217,3 +189,30 @@ diff -up kdelibs-4.2.96/kdewidgets/CMakeLists.txt.parallel_devel kdelibs-4.2.96/
set(kde3supportwidgets_PART_SRCS set(kde3supportwidgets_PART_SRCS
classpreviews.cpp classpreviews.cpp
diff -up kdelibs-4.3.85/kdeui/tests/kconfig_compiler/CMakeLists.txt.parallel_devel kdelibs-4.3.85/kdeui/tests/kconfig_compiler/CMakeLists.txt
--- kdelibs-4.3.85/kdeui/tests/kconfig_compiler/CMakeLists.txt.parallel_devel 2009-08-12 05:00:20.000000000 -0500
+++ kdelibs-4.3.85/kdeui/tests/kconfig_compiler/CMakeLists.txt 2009-12-18 08:39:50.000000000 -0600
@@ -9,7 +9,7 @@ macro(GEN_KCFG_TEST_SOURCE _testName _sr
add_custom_command(
OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${_testName}.cpp ${CMAKE_CURRENT_BINARY_DIR}/${_testName}.h
COMMAND ${KDE4_KCFGC_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/${_testName}.kcfg ${CMAKE_CURRENT_SOURCE_DIR}/${_testName}.kcfgc
- DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/${_testName}.kcfg ${CMAKE_CURRENT_SOURCE_DIR}/${_testName}.kcfgc kconfig_compiler)
+ DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/${_testName}.kcfg ${CMAKE_CURRENT_SOURCE_DIR}/${_testName}.kcfgc kconfig_compiler4)
# 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 -up kdelibs-4.3.85/doc/api/doxygen-preprocess-kcfg.sh.parallel_devel kdelibs-4.3.85/doc/api/doxygen-preprocess-kcfg.sh
--- kdelibs-4.3.85/doc/api/doxygen-preprocess-kcfg.sh.parallel_devel 2008-05-21 06:07:26.000000000 -0500
+++ kdelibs-4.3.85/doc/api/doxygen-preprocess-kcfg.sh 2009-12-18 08:39:50.000000000 -0600
@@ -2,9 +2,9 @@
# Generates and cleans KConfigXT source code during a API dox build
#
-kcfg_compiler="`kde4-config --prefix`/bin/kconfig_compiler"
+kcfg_compiler="`kde4-config --prefix`/bin/kconfig_compiler4"
if test -z "$kcfg_compiler"; then
- echo "kconfig_compiler not found!"
+ echo "kconfig_compiler4 not found!"
exit 1;
fi

12
kdelibs-4.3.90-install_all_css.patch Normal file
View File

@ -0,0 +1,12 @@
diff -up kdelibs-4.3.90/doc/common/CMakeLists.txt.all-css kdelibs-4.3.90/doc/common/CMakeLists.txt
--- kdelibs-4.3.90/doc/common/CMakeLists.txt.all-css 2010-01-06 10:58:53.000000000 -0600
+++ kdelibs-4.3.90/doc/common/CMakeLists.txt 2010-01-06 13:33:35.920884922 -0600
@@ -8,6 +8,8 @@ install(FILES
kde-docs.css
doxygen.css
tabs.css
+ kde.css flat.css print.css
+ Doxyfile.global
header.html
footer.html
mainheader.html

25
kdelibs-4.3.98-no_rpath.patch Normal file
View File

@ -0,0 +1,25 @@
diff -up kdelibs-4.3.98/cmake/modules/FindKDE4Internal.cmake.no_rpath kdelibs-4.3.98/cmake/modules/FindKDE4Internal.cmake
--- kdelibs-4.3.98/cmake/modules/FindKDE4Internal.cmake.no_rpath 2010-02-02 08:56:04.117624211 -0600
+++ kdelibs-4.3.98/cmake/modules/FindKDE4Internal.cmake 2010-02-02 09:51:15.752373945 -0600
@@ -947,10 +947,19 @@ if (UNIX)
set(CMAKE_INSTALL_NAME_DIR ${LIB_INSTALL_DIR})
else (APPLE)
# add our LIB_INSTALL_DIR to the RPATH and use the RPATH figured out by cmake when compiling
- set(CMAKE_INSTALL_RPATH ${LIB_INSTALL_DIR} )
+ # set(CMAKE_INSTALL_RPATH ${LIB_INSTALL_DIR} )
+ message(STATUS "CMAKE_SYSTEM_LIBRARY_PATH: ${CMAKE_SYSTEM_LIBRARY_PATH}")
+ message(STATUS "LIB_INSTALL_DIR: ${LIB_INSTALL_DIR}")
+ list(FIND CMAKE_SYSTEM_LIBRARY_PATH ${LIB_INSTALL_DIR} _LIB_INSTALL_DIR_INDEX_IN_CMAKE_SYSTEM_LIBRARY_PATH)
+ message(STATUS "_LIB_INSTALL_DIR_INDEX_IN_CMAKE_SYSTEM_LIBRARY_PATH: ${_LIB_INSTALL_DIR_INDEX_IN_CMAKE_SYSTEM_LIBRARY_PATH}")
+ if(${_LIB_INSTALL_DIR_INDEX_IN_CMAKE_SYSTEM_LIBRARY_PATH} EQUAL -1)
+ message(STATUS "appending to CMAKE_INSTALL_RPATH: ${LIB_INSTALL_DIR}")
+ list(APPEND CMAKE_INSTALL_RPATH ${LIB_INSTALL_DIR})
+ endif(${_LIB_INSTALL_DIR_INDEX_IN_CMAKE_SYSTEM_LIBRARY_PATH} EQUAL -1)
+
set(CMAKE_SKIP_BUILD_RPATH FALSE)
set(CMAKE_BUILD_WITH_INSTALL_RPATH FALSE)
- set(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE)
+ set(CMAKE_INSTALL_RPATH_USE_LINK_PATH FALSE)
endif (APPLE)
endif (UNIX)

359
kdelibs-4.4-sonnet.patch
View File

@ -1,359 +0,0 @@
--- kdelibs/kdecore/sonnet/filter_p.h 2009/10/01 20:06:45 1030189
+++ kdelibs/kdecore/sonnet/filter_p.h 2009/11/29 23:10:00 1056377
@@ -22,6 +22,7 @@
#ifndef SONNET_FILTER_P_H
#define SONNET_FILTER_P_H
+#include <QtCore/QTextBoundaryFinder>
#include <QtCore/QString>
#include <kdecore_export.h>
@@ -89,7 +90,6 @@
void restart();
virtual Word nextWord() const;
- virtual Word previousWord() const;
virtual Word wordAtPosition( unsigned int pos ) const;
virtual void setCurrentPosition( int );
@@ -103,13 +103,12 @@
protected:
bool trySkipLinks() const;
bool ignore( const QString& word ) const;
- QChar skipToLetter( int &fromPosition ) const;
bool shouldBeSkipped( bool wordWasUppercase, bool wordWasRunTogether,
const QString& foundWord ) const;
protected:
- QString m_buffer;
- mutable int m_currentPosition;
+ QString m_buffer;
+ mutable QTextBoundaryFinder m_finder;
private:
class Private;
--- kdelibs/kdecore/sonnet/filter.cpp 2009/06/22 10:01:33 985167
+++ kdelibs/kdecore/sonnet/filter.cpp 2009/11/29 23:10:00 1056377
@@ -52,8 +52,7 @@
}
Filter::Filter()
- : m_currentPosition(0),
- d(new Private)
+ : d(new Private)
{
d->settings = 0;
}
@@ -75,13 +74,13 @@
void Filter::restart()
{
- m_currentPosition = 0;
+ m_finder.toStart();
}
void Filter::setBuffer( const QString& buffer )
{
- m_buffer = buffer;
- m_currentPosition = 0;
+ m_buffer = buffer;
+ m_finder = QTextBoundaryFinder(QTextBoundaryFinder::Word, m_buffer);
}
QString Filter::buffer() const
@@ -91,135 +90,110 @@
bool Filter::atEnd() const
{
- return m_currentPosition >= m_buffer.length();
+ return m_finder.position() >= m_buffer.length();
}
-Word Filter::nextWord() const
+static inline bool
+isSpaceOrPunct(const QString &str)
{
- QChar currentChar = skipToLetter( m_currentPosition );
-
- if ( m_currentPosition >= m_buffer.length() || currentChar.isNull() ) {
- return Filter::end();
- }
+ return (str.length() <= 1 && (str[0].isSpace() || str[0].isPunct()));
+}
- bool allUppercase = currentChar.category() & QChar::Letter_Uppercase;
- bool runTogether = false;
+static bool
+finderNextWord(QTextBoundaryFinder &finder, QString &word, int &bufferStart)
+{
+ QTextBoundaryFinder::BoundaryReasons boundary = finder.boundaryReasons();
+ int start = finder.position(), end = finder.position();
+ bool inWord = (boundary & QTextBoundaryFinder::StartWord) != 0;
- QString foundWord;
- int start = m_currentPosition;
+ while (finder.toNextBoundary() > 0) {
+ boundary = finder.boundaryReasons();
- // Loop through the chars of the word, until the current char is not a letter
- // anymore.
- // Include apostrophes in the word, but not when it is the first character,
- // as it might be used as 'quotes'.
- // This way, we'll pass contractions like "I've" to the spellchecker, and
- // only the word inside apostrophe-quotes, without the apostrophes.
- while ( currentChar.isLetter() ||
- ( currentChar == '\'' && start != m_currentPosition ) ) {
- if ( currentChar.category() & QChar::Letter_Lowercase )
- allUppercase = false;
-
- /* FIXME: this does not work for Hebrew for example
- //we consider run-together words as mixed-case words
- if ( !allUppercase &&
- currentChar.category() & QChar::Letter_Uppercase )
- runTogether = true;
- */
-
- foundWord += currentChar;
- //Test if currentPosition exists, otherwise go out
- if( (m_currentPosition + 1) >= m_buffer.length()) {
-
- // Remove apostrophes at the end of the word, it probably comes from
- // quoting with apostrophes.
- if ( foundWord.endsWith( '\'' ) )
- foundWord.chop( 1 );
-
- if ( shouldBeSkipped( allUppercase, runTogether, foundWord ) ) {
- ++m_currentPosition;
- return nextWord();
- }
- else {
- ++m_currentPosition;
- return Word( foundWord, start );
+ if ((boundary & QTextBoundaryFinder::EndWord) && inWord) {
+ end = finder.position();
+ QString str = finder.string().mid(start, end - start);
+ if (!isSpaceOrPunct(str)) {
+ word = str;
+ bufferStart = start;
+#if 0
+ qDebug()<< "Word at " << start<< " word = '"
+ << str << "', len = " << str.length();
+#endif
+ return true;
}
+ inWord = false;
+ }
+ if ((boundary & QTextBoundaryFinder::StartWord)) {
+ start = finder.position();
+ inWord = true;
}
- ++m_currentPosition;
- currentChar = m_buffer.at( m_currentPosition );
}
+ return false;
+}
- // Remove apostrophes at the end of the word, it probably comes from
- // quoting with apostrophes.
- if ( foundWord.endsWith( '\'' ) )
- foundWord.chop( 1 );
-
- if ( shouldBeSkipped( allUppercase, runTogether, foundWord ) )
- return nextWord();
- return Word( foundWord, start );
+static bool finderWordAt(QTextBoundaryFinder &finder,
+ int at,
+ QString &word, int &bufferStart)
+{
+ int oldPosition = finder.position();
+
+ finder.setPosition(at);
+ if (!finder.isAtBoundary() || (finder.boundaryReasons() & QTextBoundaryFinder::EndWord)) {
+ if (finder.toPreviousBoundary() <= 0) {
+ /* QTextBoundaryIterator doesn't consider start of the string
+ * a boundary so we need to rewind to the beginning to catch
+ * the first word */
+ if (at > 0 && finder.string().length() > 0) {
+ finder.toStart();
+ } else
+ return false;
+ }
+ }
+ bool ret = finderNextWord(finder, word, bufferStart);
+ finder.setPosition(oldPosition);
+ return ret;
}
-Word Filter::previousWord() const
+Word Filter::nextWord() const
{
- while ( !m_buffer.at( m_currentPosition ).isLetter() &&
- m_currentPosition != 0) {
- --m_currentPosition;
- }
+ QString foundWord;
+ int start;
+ bool allUppercase = false;
+ bool runTogether = false;
- if ( m_currentPosition == 0 ) {
+ if (!finderNextWord(m_finder, foundWord, start))
return Filter::end();
- }
-
- QString foundWord;
- int start = m_currentPosition;
- while ( m_buffer.at( start ).isLetter() ) {
- foundWord.prepend( m_buffer.at( m_currentPosition ) );
- --start;
- }
+ if ( shouldBeSkipped( allUppercase, runTogether, foundWord ) )
+ return nextWord();
return Word( foundWord, start );
}
Word Filter::wordAtPosition( unsigned int pos ) const
{
- if ( (int)pos > m_buffer.length() )
- return Filter::end();
-
- int currentPosition = pos - 1;
QString foundWord;
- while ( currentPosition >= 0 &&
- m_buffer.at( currentPosition ).isLetter() ) {
- foundWord.prepend( m_buffer.at( currentPosition ) );
- --currentPosition;
- }
-
- // currentPosition == 0 means the first char is not letter
- // currentPosition == -1 means we reached the beginning
- int start = (currentPosition < 0) ? 0 : ++currentPosition;
- currentPosition = pos ;
- if ( currentPosition < m_buffer.length() && m_buffer.at( currentPosition ).isLetter() ) {
- while ( m_buffer.at( currentPosition ).isLetter() ) {
- foundWord.append( m_buffer.at( currentPosition ) );
- ++currentPosition;
- }
- }
-
+ int start;
+ if (!finderWordAt(m_finder, pos, foundWord, start))
+ return Filter::end();
return Word( foundWord, start );
}
void Filter::setCurrentPosition( int i )
{
- m_currentPosition = i;
+ QString word;
+ int pos;
- //go back to the last word so that next word returns something
- //useful
- while ( m_buffer.at( m_currentPosition ).isLetter() && m_currentPosition > 0 )
- --m_currentPosition;
+ //to make sure we're at an reasonable word boundary
+ if (!finderWordAt(m_finder, i, word, pos)) {
+ return;
+ }
+ m_finder.setPosition(pos);
}
int Filter::currentPosition() const
{
- return m_currentPosition;
+ return m_finder.position();
}
void Filter::replace( const Word& w, const QString& newWord)
@@ -227,8 +201,10 @@
int oldLen = w.word.length();
//start spell checkin from the just correct word
- m_currentPosition = w.start;
m_buffer = m_buffer.replace( w.start, oldLen, newWord );
+ m_finder = QTextBoundaryFinder(QTextBoundaryFinder::Word,
+ m_buffer);
+ m_finder.setPosition(w.start);
}
QString Filter::context() const
@@ -236,12 +212,12 @@
int len = 60;
//we don't want the expression underneath casted to an unsigned int
//which would cause it to always evaluate to false
- int signedPosition = m_currentPosition;
+ int signedPosition = m_finder.position();
bool begin = (signedPosition - len/2)<=0;
QString buffer = m_buffer;
- Word word = wordAtPosition( m_currentPosition );
+ Word word = wordAtPosition( m_finder.position() );
buffer = buffer.replace( word.start, word.word.length(),
QString( "<b>%1</b>" ).arg( word.word ) );
@@ -251,7 +227,7 @@
.arg( buffer.mid( 0, len ) );
else
context = QString( "...%1..." )
- .arg( buffer.mid( m_currentPosition - 20, len ) );
+ .arg( buffer.mid( m_finder.position() - 20, len ) );
context.replace( '\n', ' ' );
@@ -260,24 +236,27 @@
bool Filter::trySkipLinks() const
{
- QChar currentChar = m_buffer.at( m_currentPosition );
+ QChar currentChar = m_buffer.at( m_finder.position() );
+ int currentPosition = m_finder.position();
int length = m_buffer.length();
//URL - if so skip
if ( currentChar == ':'
- && (m_currentPosition+1 < length)
- && (m_buffer.at( ++m_currentPosition ) == '/' || ( m_currentPosition + 1 ) >= length ) ) {
+ && (currentPosition+1 < length)
+ && (m_buffer.at( ++currentPosition ) == '/' || ( currentPosition + 1 ) >= length ) ) {
//in both cases url is considered finished at the first whitespace occurrence
//TODO hey, "http://en.wikipedia.org/wiki/Main Page" --Nick Shaforostoff
- while ( !m_buffer.at( m_currentPosition++ ).isSpace() && m_currentPosition < length )
+ while ( !m_buffer.at( currentPosition++ ).isSpace() && currentPosition < length )
;
+ m_finder.setPosition(currentPosition);
return true;
}
//Email - if so skip
if ( currentChar == '@') {
- while ( ++m_currentPosition < length && !m_buffer.at( m_currentPosition ).isSpace() )
+ while ( ++currentPosition < length && !m_buffer.at( currentPosition ).isSpace() )
;
+ m_finder.setPosition(currentPosition);
return true;
}
@@ -289,19 +268,6 @@
return d->settings && d->settings->ignore( word );
}
-QChar Filter::skipToLetter( int &fromPosition ) const
-{
- //if( m_buffer.isEmpty())
- if (fromPosition>=m_buffer.size())
- return QChar();
- QChar currentChar = m_buffer.at( fromPosition );
- while ( !currentChar.isLetter() &&
- (int)++fromPosition < m_buffer.length() ) {
- currentChar = m_buffer.at( fromPosition );
- }
- return currentChar;
-}
-
bool Filter::shouldBeSkipped( bool wordWasUppercase, bool wordWasRunTogether,
const QString& foundWord ) const
{

278
kdelibs.spec
View File

@ -1,10 +1,14 @@
%define phonon_ver 4.3.1
%define soprano_ver 2.3.1
%define strigi_ver 0.7.1
Summary: K Desktop Environment 4 - Libraries %define attica_ver 0.1.2
Version: 4.3.5 %define phonon_ver 4.3.80
Release: 2%{?dist} %define soprano_ver 2.3.70
%define strigi_ver 0.7.1
# to build/include apidocs or not
%define apidocs 1
Summary: KDE Libraries
Version: 4.4.0
Release: 4%{?dist}
Name: kdelibs Name: kdelibs
Epoch: 6 Epoch: 6
@ -16,15 +20,9 @@ Provides: kdelibs4 = %{version}-%{release}
License: LGPLv2+ License: LGPLv2+
URL: http://www.kde.org/ URL: http://www.kde.org/
Group: System Environment/Libraries Group: System Environment/Libraries
Source0: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/kdelibs-%{version}.tar.bz2 Source0: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/kdelibs-%{version}%{?alphatag}.tar.bz2
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
%ifarch noarch
%define apidocs 1
%else
%define rest 1
%endif
BuildRequires: kde4-macros(api) >= 2 BuildRequires: kde4-macros(api) >= 2
BuildRequires: kde-filesystem >= 4-23 BuildRequires: kde-filesystem >= 4-23
# used in kde.(sh|csh) # used in kde.(sh|csh)
@ -39,70 +37,76 @@ Requires: kde-settings
Requires: shared-mime-info Requires: shared-mime-info
Requires: kdelibs-common Requires: kdelibs-common
Requires: hunspell Requires: hunspell
Requires: phonon%{?_isa} >= %{phonon_ver} %global phonon_version %(pkg-config --modversion phonon 2>/dev/null || echo %{phonon_ver})
Requires: soprano%{?_isa} >= %{soprano_ver} Requires: phonon%{?_isa} >= %{phonon_version}
Requires: strigi-libs%{?_isa} >= %{strigi_ver} Requires: shared-desktop-ontologies
%global soprano_version %(pkg-config --modversion soprano 2>/dev/null || echo %{soprano_ver})
Requires: soprano%{?_isa} >= %{soprano_version}
%global strigi_version %(pkg-config --modversion libstreams 2>/dev/null || echo %{strigi_ver})
Requires: strigi-libs%{?_isa} >= %{strigi_version}
Source1: kde4.sh Source1: kde4.sh
Source2: kde4.csh Source2: kde4.csh
# make -devel packages parallel-installable # make -devel packages parallel-installable
Patch0: kdelibs-4.2.96-parallel_devel.patch Patch0: kdelibs-4.3.85-parallel_devel.patch
# fix kde#149705 # fix kde#149705
Patch2: kdelibs-4.2.85-kde149705.patch Patch2: kdelibs-4.2.85-kde149705.patch
## UPSTREAM ME
# Hunspell support for K3Spell # Hunspell support for K3Spell
# http://fedoraproject.org/wiki/Releases/FeatureDictionary # http://fedoraproject.org/wiki/Releases/FeatureDictionary
# http://bugs.kde.org/show_bug.cgi?id=154561 # http://bugs.kde.org/show_bug.cgi?id=154561
Patch5: kdelibs-4.0.0-k3spell-hunspell.patch Patch5: kdelibs-4.0.0-k3spell-hunspell.patch
# openssl's SHLIB_VERSION_NUMBER macro can't be used/trusted
Patch6: kdelibs-4.0.0-openssl.patch
# install all .css files and Doxyfile.global in kdelibs-common to build # install all .css files and Doxyfile.global in kdelibs-common to build
# kdepimlibs-apidocs against # kdepimlibs-apidocs against
Patch8: kdelibs-4.0.2-install-all-css.patch Patch8: kdelibs-4.3.90-install_all_css.patch
# add Fedora/V-R to KHTML UA string # add Fedora/V-R to KHTML UA string
Patch9: kdelibs-4.0.2-branding.patch Patch9: kdelibs-4.0.2-branding.patch
# don't cache kdeglobals paths because they change after profile directories # don't cache kdeglobals paths because they change after profile directories
# are loaded from kde4rc # are loaded from kde4rc
Patch10: kdelibs-4.1.72-no-cache-kdeglobals-paths.patch Patch10: kdelibs-4.1.72-no-cache-kdeglobals-paths.patch
# workaround for policykit # workaround for policykit
Patch11: kdelibs-4.1.72-policykit-workaround.patch Patch11: kdelibs-4.3.80-policykit-workaround.patch
# COMMENT ME PLEASE
Patch12: kdelibs-4.1.0-xdg-menu.patch Patch12: kdelibs-4.1.0-xdg-menu.patch
# patch KStandardDirs to use %{_libexecdir}/kde4 instead of %{_libdir}/kde4/libexec # patch KStandardDirs to use %{_libexecdir}/kde4 instead of %{_libdir}/kde4/libexec
Patch14: kdelibs-4.2.85-libexecdir.patch Patch14: kdelibs-4.2.85-libexecdir.patch
# kstandarddirs changes: search /etc/kde, find /usr/libexec/kde4 # kstandarddirs changes: search /etc/kde, find /usr/libexec/kde4
Patch18: kdelibs-4.1.72-kstandarddirs.patch Patch18: kdelibs-4.1.72-kstandarddirs.patch
# COMMENT ME PLEASE
Patch20: kdelibs-4.1.70-cmake.patch Patch20: kdelibs-4.1.70-cmake.patch
# patch to fix keditbookmarks crash (kde#160679) # disable drkonqi by default, RHEL prefers/wants abrt
Patch22: kdelibs-4.3.0-bookmarks.patch
Patch24: kdelibs-4.3.1-drkonq.patch Patch24: kdelibs-4.3.1-drkonq.patch
# use -fno-var-tracking-assignments on khtml/svg bits, use in a pinch on f12+ # use -fno-var-tracking-assignments on khtml/svg bits, use in a pinch on f12+
# workaound for low-mem systems (ppc64, x86_64) # workaound for low-mem systems (ppc64), tracking here (for now),
# https://bugzilla.redhat.com/show_bug.cgi?id=539697
Patch26: kdelibs-4.3.3-khtml_svg_no_var_tracking_assignments.patch Patch26: kdelibs-4.3.3-khtml_svg_no_var_tracking_assignments.patch
# die rpath die, since we're using standard paths, we can avoid
# this extra hassle (even though cmake is *supposed* to not add standard
# paths (like /usr/lib64) already! With this, we can drop
# -DCMAKE_SKIP_RPATH:BOOL=ON (finally)
Patch27: kdelibs-4.3.98-no_rpath.patch
# upstream # upstreamable
# kubuntu working to upstream this
Patch50: http://bazaar.launchpad.net/~kubuntu-members/kdelibs/ubuntu/download/head:/kubuntu_80_kaction_q-20091014221915-y11xctvidhr0ewmz-1/kubuntu_80_kaction_qt_keys.diff # 4.4 upstream
# 4.4 trunk
# http://websvn.kde.org/?view=revision&revision=1027234
# add adFilteredBy API required for konq-plugins-4.3.3 to build
Patch100: kdelibs-4.3.3-adFilteredBy.patch
# 4.4 trunk
# http://websvn.kde.org/?view=revision&revision=1056377
# sonnet was broken with indic, asian, arabic
Patch101: kdelibs-4.4-sonnet.patch
# 4.4/trunk
Patch102: kdelibs-4.3.5-kde-config_kde-version.patch
# security fix # security fix
## Not Upstreamed? why not ? -- Rex
Patch200: kdelibs-4.3.1-CVE-2009-2702.patch Patch200: kdelibs-4.3.1-CVE-2009-2702.patch
BuildRequires: qt4-devel >= 4.5.0 %if 0%{?fedora} && 0%{?fedora} < 13
Requires: qt4%{?_isa} >= %{_qt4_version} Conflicts: kdebase-workspace-libs < 4.3.80
%endif
BuildRequires: qt4-devel >= 4.6.0
%{?_qt4_version:Requires: qt4%{?_isa} >= %{_qt4_version}}
Requires: xdg-utils Requires: xdg-utils
Requires(post): /sbin/ldconfig Requires(post): /sbin/ldconfig
Requires(postun): /sbin/ldconfig Requires(postun): /sbin/ldconfig
BuildRequires: alsa-lib-devel BuildRequires: alsa-lib-devel
BuildRequires: attica-devel >= %{attica_ver}
BuildRequires: automoc4 >= 0.9.88 BuildRequires: automoc4 >= 0.9.88
BuildRequires: avahi-devel BuildRequires: avahi-devel
BuildRequires: bison flex BuildRequires: bison flex
@ -113,8 +117,6 @@ BuildRequires: enchant-devel
BuildRequires: gamin-devel BuildRequires: gamin-devel
BuildRequires: gettext-devel BuildRequires: gettext-devel
BuildRequires: giflib-devel BuildRequires: giflib-devel
# busted at least on x86_64
#BuildRequires: hspell-devel
BuildRequires: jasper-devel BuildRequires: jasper-devel
BuildRequires: krb5-devel BuildRequires: krb5-devel
BuildRequires: libacl-devel libattr-devel BuildRequires: libacl-devel libattr-devel
@ -127,6 +129,9 @@ BuildRequires: OpenEXR-devel
BuildRequires: openssl-devel BuildRequires: openssl-devel
BuildRequires: pcre-devel BuildRequires: pcre-devel
BuildRequires: phonon-devel >= %{phonon_ver} BuildRequires: phonon-devel >= %{phonon_ver}
BuildRequires: polkit-qt-devel
BuildRequires: qca2-devel
BuildRequires: shared-desktop-ontologies-devel
BuildRequires: shared-mime-info BuildRequires: shared-mime-info
BuildRequires: soprano-devel >= %{soprano_ver} BuildRequires: soprano-devel >= %{soprano_ver}
BuildRequires: strigi-devel >= %{strigi_ver} BuildRequires: strigi-devel >= %{strigi_ver}
@ -147,8 +152,11 @@ BuildRequires: qt4-doc
Provides: kross(javascript) = %{version}-%{release} Provides: kross(javascript) = %{version}-%{release}
Provides: kross(qtscript) = %{version}-%{release} Provides: kross(qtscript) = %{version}-%{release}
Provides: kdelibs-experimental = %{version}-%{release}
Obsoletes: kdelibs-experimental < 4.3.75
%description %description
Libraries for the K Desktop Environment 4. Libraries for KDE 4.
%package common %package common
Group: System Environment/Libraries Group: System Environment/Libraries
@ -160,21 +168,36 @@ This package includes the common files for the KDE 3 and KDE 4 libraries.
Group: Development/Libraries Group: Development/Libraries
Summary: Header files for compiling KDE 4 applications Summary: Header files for compiling KDE 4 applications
# stuff moved, help upgrade path # stuff moved, help upgrade path
%if 0%{?fedora} && 0%{?fedora} < 12
Conflicts: kdebase-runtime < 4.2.90 Conflicts: kdebase-runtime < 4.2.90
Conflicts: kdebase-workspace-devel < 4.2.90 %endif
%if 0%{?fedora} && 0%{?fedora} < 13
Conflicts: kdebase-workspace-devel < 4.3.80
%endif
Provides: plasma-devel = %{version}-%{release} Provides: plasma-devel = %{version}-%{release}
Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release} Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release}
Obsoletes: kdelibs4-devel < %{version}-%{release} Obsoletes: kdelibs4-devel < %{version}-%{release}
Provides: kdelibs4-devel = %{version}-%{release} Provides: kdelibs4-devel = %{version}-%{release}
Requires: cmake >= 2.6.2-3 %{?_isa:Provides: kdelibs4-devel%{?_isa} = %{version}-%{release}}
Obsoletes: kdelibs-experimental-devel < 4.3.75
Provides: kdelibs-experimental-devel = %{version}-%{release}
Obsoletes: webkitkde-devel < 0.0.3
Requires: attica-devel >= %{attica_ver}
Requires: automoc4 >= 0.9.88 Requires: automoc4 >= 0.9.88
Requires: qt4-devel Requires: cmake >= 2.6.2-3
Requires: openssl-devel Requires: openssl-devel
Requires: phonon-devel Requires: phonon-devel
# considered part of nepomuk-devel
Requires: shared-desktop-ontologies-devel
Requires: qt4-devel
# do we really still need all these below? -- Rex # do we really still need all these below? -- Rex
Requires: strigi-devel Requires: strigi-devel
Requires: bzip2-devel gamin-devel libacl-devel Requires: bzip2-devel gamin-devel libacl-devel
%{?x_deps:Requires: %{x_deps}} %{?x_deps:Requires: %{x_deps}}
Provides: kdelibs-experimental-devel = %{version}-%{release}
Obsoletes: kdelibs-experimental-devel < %{version}-%{release}
%description devel %description devel
This package includes the header files you will need to compile This package includes the header files you will need to compile
applications for KDE 4. applications for KDE 4.
@ -186,6 +209,7 @@ Summary: KDE 4 API documentation
# Requires: %{name} = %{?epoch:%{epoch}:}%{version} # Requires: %{name} = %{?epoch:%{epoch}:}%{version}
Requires: kde-filesystem Requires: kde-filesystem
Provides: kdelibs4-apidocs = %{version}-%{release} Provides: kdelibs4-apidocs = %{version}-%{release}
BuildArch: noarch
%description apidocs %description apidocs
This package includes the KDE 4 API documentation in HTML This package includes the KDE 4 API documentation in HTML
@ -193,36 +217,34 @@ format for easy browsing.
%prep %prep
%setup -q -n kdelibs-%{version} %setup -q -n kdelibs-%{version}%{?alphatag}
%patch0 -p1 -b .parallel_devel %patch0 -p1 -b .parallel_devel
%patch2 -p1 -b .kde149705 %patch2 -p1 -b .kde149705
%patch5 -p1 -b .k3spell-hunspell %patch5 -p1 -b .k3spell-hunspell
%patch8 -p1 -b .all-css %patch8 -p1 -b .install_all_css
%patch9 -p1 -b .branding %patch9 -p1 -b .branding
%patch11 -p1 -b .policykit %patch11 -p1 -b .policykit
%patch12 -p1 -b .Administration-menu %patch12 -p1 -b .Administration-menu
%patch14 -p1 -b .libexecdir %patch14 -p1 -b .libexecdir
%patch18 -p1 -b .kstandarddirs %patch18 -p1 -b .kstandarddirs
%patch20 -p1 -b .xxcmake %patch20 -p1 -b .xxcmake
%patch22 -p1 -b .bookmarks
%if 0%{?rhel} > 5 %if 0%{?rhel} > 5
%patch24 -p1 -b .drkonq %patch24 -p1 -b .drkonq
%endif %endif
%if 0%{?fedora} > 11 %if 0%{?fedora} > 11
%patch26 -p1 -b .khtml_svg_no_var_tracking_assignments %patch26 -p1 -b .khtml_svg_no_var_tracking_assignments
%endif %endif
%patch27 -p1 -b .no_rpath
# upstreamable patches
# upstream patches # upstream patches
%patch50 -p1 -b .kaction_qt_keys
# 4.4
%patch100 -p0 -b .adFilteredBy
%patch101 -p1 -b .sonnet
%patch102 -p1 -b .kde-config_kde-version
# security fix # security fix
%patch200 -p1 -b .CVE-2009-2702 %patch200 -p1 -b .CVE-2009-2702
%build %build
# add release version # add release version
@ -233,9 +255,7 @@ pushd %{_target_platform}
%{cmake_kde4} -DKDE_DISTRIBUTION_TEXT="%{version}-%{release} Fedora" .. %{cmake_kde4} -DKDE_DISTRIBUTION_TEXT="%{version}-%{release} Fedora" ..
popd popd
%if 0%{?rest}
make %{?_smp_mflags} -C %{_target_platform} make %{?_smp_mflags} -C %{_target_platform}
%endif
# build apidocs # build apidocs
%if 0%{?apidocs} %if 0%{?apidocs}
@ -247,7 +267,6 @@ doc/api/doxygen.sh .
%install %install
rm -rf %{buildroot} rm -rf %{buildroot}
%if 0%{?rest}
make install/fast DESTDIR=%{buildroot} -C %{_target_platform} make install/fast DESTDIR=%{buildroot} -C %{_target_platform}
# see also use-of/patching of XDG_MENU_PREFIX in kdebase/kde-settings # see also use-of/patching of XDG_MENU_PREFIX in kdebase/kde-settings
@ -257,16 +276,6 @@ mv %{buildroot}%{_kde4_sysconfdir}/xdg/menus/applications.menu \
# create/own, see http://bugzilla.redhat.com/483318 # create/own, see http://bugzilla.redhat.com/483318
mkdir -p %{buildroot}%{_kde4_libdir}/kconf_update_bin mkdir -p %{buildroot}%{_kde4_libdir}/kconf_update_bin
%if "%{name}" != "kdelibs"
# remove files which conflict with KDE 3
rm -f %{buildroot}%{_kde4_bindir}/checkXML %{buildroot}%{_kde4_bindir}/kjscmd \
%{buildroot}%{_kde4_bindir}/kunittestmodrunner
rm -f %{buildroot}%{_kde4_configdir}/kdebug.areas %{buildroot}%{_kde4_configdir}/kdebugrc \
%{buildroot}%{_kde4_configdir}/kdeprintrc %{buildroot}%{_kde4_configdir}/ui/ui_standards.rc
rm -f %{buildroot}%{_kde4_docdir}/HTML/en/common/*
rm -f %{buildroot}%{_kde4_sharedir}/locale/all_languages
%endif
# move devel symlinks # move devel symlinks
mkdir -p %{buildroot}%{_kde4_libdir}/kde4/devel mkdir -p %{buildroot}%{_kde4_libdir}/kde4/devel
pushd %{buildroot}%{_kde4_libdir} pushd %{buildroot}%{_kde4_libdir}
@ -297,11 +306,10 @@ bzip2 -9 %{buildroot}%{_kde4_docdir}/HTML/en/sonnet/index.cache
# install apidocs and generator script # install apidocs and generator script
install -p -D doc/api/doxygen.sh %{buildroot}%{_kde4_bindir}/kde4-doxygen.sh install -p -D doc/api/doxygen.sh %{buildroot}%{_kde4_bindir}/kde4-doxygen.sh
%endif
%if 0%{?apidocs} %if 0%{?apidocs}
mkdir -p %{buildroot}%{_kde4_docdir}/HTML/en mkdir -p %{buildroot}%{_kde4_docdir}/HTML/en
cp -prf kdelibs-%{version}-apidocs %{buildroot}%{_kde4_docdir}/HTML/en/kdelibs4-apidocs cp -prf kdelibs-%{version}%{?alphatag}-apidocs %{buildroot}%{_kde4_docdir}/HTML/en/kdelibs4-apidocs
%endif %endif
@ -328,7 +336,6 @@ gtk-update-icon-cache %{_kde4_iconsdir}/hicolor &> /dev/null || :
rm -rf %{buildroot} rm -rf %{buildroot}
%if 0%{?rest}
%files %files
%defattr(-,root,root,-) %defattr(-,root,root,-)
%doc AUTHORS README TODO %doc AUTHORS README TODO
@ -346,10 +353,13 @@ rm -rf %{buildroot}
%exclude %{_kde4_appsdir}/cmake/ %exclude %{_kde4_appsdir}/cmake/
%{_kde4_configdir}/* %{_kde4_configdir}/*
%{_datadir}/dbus-1/interfaces/* %{_datadir}/dbus-1/interfaces/*
%{_datadir}/dbus-1/system-services/*
%{_polkit_qt_policydir}/org.kde.kcontrol.kcmremotewidgets.policy
%{_sysconfdir}/dbus-1/system.d/*
%{_kde4_datadir}/mime/packages/kde.xml %{_kde4_datadir}/mime/packages/kde.xml
%{_kde4_sharedir}/kde4/services/* %{_kde4_sharedir}/kde4/services/*
%{_kde4_sharedir}/kde4/servicetypes/* %{_kde4_sharedir}/kde4/servicetypes/*
%{_kde4_iconsdir}/hicolor/*/actions/* %{_kde4_iconsdir}/hicolor/*/*/*
%{_kde4_docdir}/HTML/en/sonnet/ %{_kde4_docdir}/HTML/en/sonnet/
%{_kde4_docdir}/HTML/en/kioslave/ %{_kde4_docdir}/HTML/en/kioslave/
%{_kde4_libdir}/lib*.so.* %{_kde4_libdir}/lib*.so.*
@ -360,9 +370,19 @@ rm -rf %{buildroot}
%{_kde4_libexecdir}/* %{_kde4_libexecdir}/*
%{_kde4_libdir}/kde4/plugins/ %{_kde4_libdir}/kde4/plugins/
%{_kde4_sysconfdir}/xdg/menus/*.menu %{_kde4_sysconfdir}/xdg/menus/*.menu
%doc %{_mandir}/man*/* %{_mandir}/man1/checkXML.1*
# kdelibs-common comes from here for fedora >= 9 %{_mandir}/man1/kde4-config.1*
%if "%{name}" == "kdelibs" %{_mandir}/man1/kjs.1*
%{_mandir}/man1/kjscmd.1*
%{_mandir}/man1/kross.1*
%{_mandir}/man7/kdeoptions.7*
%{_mandir}/man7/qtoptions.7*
%{_mandir}/man8/kbuildsycoca4.8*
%{_mandir}/man8/kcookiejar4.8*
%{_mandir}/man8/kded4.8*
%{_mandir}/man8/kdeinit4.8*
%{_mandir}/man8/meinproc4.8*
# these are in kdelibs-common:
%exclude %{_kde4_configdir}/kdebug.areas %exclude %{_kde4_configdir}/kdebug.areas
%exclude %{_kde4_configdir}/kdebugrc %exclude %{_kde4_configdir}/kdebugrc
%exclude %{_kde4_configdir}/ui/ui_standards.rc %exclude %{_kde4_configdir}/ui/ui_standards.rc
@ -389,11 +409,12 @@ rm -rf %{buildroot}
%{_kde4_appsdir}/kdeui %{_kde4_appsdir}/kdeui
%{_kde4_docdir}/HTML/en/common/ %{_kde4_docdir}/HTML/en/common/
%{_kde4_datadir}/locale/all_languages/ %{_kde4_datadir}/locale/all_languages/
%endif
%files devel %files devel
%defattr(-,root,root,-) %defattr(-,root,root,-)
%doc KDE4PORTING.html %doc KDE4PORTING.html
%{_mandir}/man1/kdecmake.1*
%{_mandir}/man1/makekdewidgets.1*
%{_kde4_bindir}/kconfig_compiler4 %{_kde4_bindir}/kconfig_compiler4
%{_kde4_bindir}/makekdewidgets4 %{_kde4_bindir}/makekdewidgets4
%{_kde4_bindir}/kde4-doxygen.sh %{_kde4_bindir}/kde4-doxygen.sh
@ -401,7 +422,6 @@ rm -rf %{buildroot}
%{_kde4_appsdir}/kdewidgets/ %{_kde4_appsdir}/kdewidgets/
%{_kde4_includedir}/* %{_kde4_includedir}/*
%{_kde4_libdir}/kde4/devel/ %{_kde4_libdir}/kde4/devel/
%endif
%if 0%{?apidocs} %if 0%{?apidocs}
%files apidocs %files apidocs
@ -411,21 +431,109 @@ rm -rf %{buildroot}
%changelog %changelog
* Fri Jan 29 2010 Rex Dieter <rdieter@fedoraproject.org> - 4.3.5-2 * Tue Feb 09 2010 Rex Dieter <rdieter@fedoraproject.org> - 6:4.4.0-4
- depend on version of phonon,strigi,soprano built against
* Tue Feb 09 2010 Rex Dieter <rdieter@fedoraproject.org> - 6:4.4.0-3
- respin
* Mon Feb 08 2010 Rex Dieter <rdieter@fedoraproject.org> - 6:4.4.0-2
- respin
* Fri Feb 05 2010 Than Ngo <than@redhat.com> - 6:4.4.0-1
- 4.4.0
* Tue Feb 02 2010 Rex Dieter <rdieter@fedoraproject.org> - 4.3.98-4
- -apidocs: build as normal noarch subpkg
* Tue Feb 02 2010 Rex Dieter <rdieter@fedoraproject.org> - 4.3.98-3
- respin no_rpath patch, add LIB_INSTALL_DIR rpath only if not in
CMAKE_SYSTEM_LIBRARY_PATH. added some status messages to help debug.
* Mon Feb 01 2010 Rex Dieter <rdieter@fedoraproject.org> - 4.3.98-2
- no_rpath patch, goodbye -DCMAKE_SKIP_RPATH:BOOL=ON, it's been fun
* Sun Jan 31 2010 Rex Dieter <rdieter@fedoraproject.org> - 4.3.98-1
- KDE 4.3.98 (4.4rc3)
* Wed Jan 27 2010 Rex Dieter <rdieter@fedoraproject.org> - 4.3.95-3
- patch for kde4-config --kde-version option (kde#224540) - patch for kde4-config --kde-version option (kde#224540)
* Fri Jan 22 2010 Rex Dieter <rdieter@fedoraproject.org> - 4.3.5-1 * Tue Jan 26 2010 Rex Dieter <rdieter@fedoraproject.org> - 4.3.95-2
- 4.3.5 - -devel: Obsoletes: webkitkde-devel
* Fri Dec 18 2009 Than Ngo <than@redhat.com> - 4.3.4-3 * Wed Jan 20 2010 Lukas Tinkl <ltinkl@redhat.com> - 4.3.95-1
- fix bz#531211, backport sonnet patch, fix rendering issue in indic, asian, arabic - KDE 4.3.95 (4.4rc2)
languages
* Fri Dec 04 2009 Than Ngo <than@redhat.com> - 4.3.4-2 * Thu Jan 14 2010 Rex Dieter <rdieter@fedoraproject.org> - 4.3.90-6
- add workaound for low-mem systems - use %%_polkit_qt_policydir
- strigi_ver 0.7.1
* Tue Dec 01 2009 Than Ngo <than@redhat.com> - 4.3.4-1 * Mon Jan 11 2010 Jaroslav Reznik <jreznik@redhat.com> - 4.3.90-5
- 4.3.4 - hopefully correct kauth fix (old polkit cmake module is broken)
* Fri Jan 08 2010 Jaroslav Reznik <jreznik@redhat.com> - 4.3.90-4
- fix kauth polkit policies installation
* Thu Jan 07 2010 Rex Dieter <rdieter@fedoraproject.org> - 4.3.90-3
- bump min polkit-qt version(s)
* Wed Jan 06 2010 Rex Dieter <rdieter@fedoraproject.org> - 4.3.90-2
- -devel: Requires: shared-desktop-ontologies-devel
* Wed Jan 06 2010 Rex Dieter <rdieter@fedoraproject.org> - 4.3.90-1
- 4.3.90 (4.4rc1)
- drop openssl patch (no longer needed since bug #429846 fixed)
* Tue Jan 05 2010 Jaroslav Reznik <jreznik@redhat.com> - 4.3.85-7
- PolkitQt rebuild
* Sun Dec 27 2009 Rex Dieter <rdieter@fedoraproject.org> - 4.3.85-6
- Conflicts: kdebase-workspace(-libs,-devel) < 4.3.80
* Sat Dec 26 2009 Rex Dieter <rdieter@fedoraproject.org> - 4.3.85-5
- move kdecmake,makekdewidgets manpages to -devel (#549947)
* Sat Dec 19 2009 Rex Dieter <rdieter@fedoraproject.org> - 4.3.85-4
- tarball respin
* Fri Dec 18 2009 Rex Dieter <rdieter@fedoraproject.org> - 4.3.85-3
- -devel: Requires: attica-devel
* Fri Dec 18 2009 Rex Dieter <rdieter@fedoraproject.org> - 4.3.85-2
- plasma_scrollwidget patch
* Fri Dec 18 2009 Rex Dieter <rdieter@fedoraproject.org> - 4.3.85-1
- 4.3.85 (4.4 beta2)
* Wed Dec 16 2009 Jaroslav Reznik <jreznik@redhat.com> - 4.3.80-5
- Repositioning the KDE Brand (#547361)
* Wed Dec 09 2009 Rex Dieter <rdieter@fedoraproject.org> - 4.3.80-4
- BR: attica-devel shared-desktop-ontologies-devel
- phonon_ver 4.3.80
- soprano_ver 2.3.70
* Fri Dec 04 2009 Than Ngo <than@redhat.com> - 4.3.80-3
- respin
* Thu Dec 03 2009 Kevin Kofler <Kevin@tigcc.ticalc.org> - 4.3.80-2
- BR polkit-qt-devel
- fix the build of the KAuth PolkitQt-1 backend (upstream patch)
* Tue Dec 01 2009 Ben Boeckel <MathStuf@gmail.com> - 4.3.80-1
- KDE 4.4 beta1 (4.3.80)
* Wed Nov 25 2009 Rex Dieter <rdieter@fedoraproject.org> - 4.3.75-0.2.svn1048496
- -devel: Provides: kdelibs4-devel%{?_isa} ...
- Obsoletes: kdelibs-experimental(-devel) < 4.3.75
* Fri Nov 20 2009 Ben Boeckel <MathStuf@gmail.com> - 4.3.75-0.1.svn1048496
- Update to 4.3.75 snapshot
* Wed Nov 18 2009 Rex Dieter <rdieter@fedoraproject.org> - 4.3.3-6
- rebuild (for qt-4.6.0-rc1, f13+)
- fix/revert soprano_ver change in -5
* Mon Nov 16 2009 Than Ngo <than@redhat.com> - 4.3.3-5 * Mon Nov 16 2009 Than Ngo <than@redhat.com> - 4.3.3-5
- fix conditional - fix conditional

320
kubuntu_80_kaction_qt_keys.diff
View File

@ -1,320 +0,0 @@
#
# Ubuntu: https://bugs.launchpad.net/bugs/293213
# Description: Allow more Qt::Keys to be used as KAction shortcuts
#
--- kde4libs-4.3.2.orig/kdeui/util/kkeyserver_x11.cpp
+++ kde4libs-4.3.2/kdeui/util/kkeyserver_x11.cpp
@@ -198,50 +198,153 @@
{ '+', XK_KP_Add },
{ Qt::Key_Return, XK_KP_Enter }
-// the next lines are taken from XFree > 4.0 (X11/XF86keysyms.h), defining some special
+// the next lines are taken on 10/2009 from X.org (X11/XF86keysym.h), defining some special
// multimedia keys. They are included here as not every system has them.
-#define XF86XK_Standby 0x1008FF10
-#define XF86XK_AudioLowerVolume 0x1008FF11
-#define XF86XK_AudioMute 0x1008FF12
-#define XF86XK_AudioRaiseVolume 0x1008FF13
-#define XF86XK_AudioPlay 0x1008FF14
-#define XF86XK_AudioStop 0x1008FF15
-#define XF86XK_AudioPrev 0x1008FF16
-#define XF86XK_AudioNext 0x1008FF17
-#define XF86XK_HomePage 0x1008FF18
-#define XF86XK_Calculator 0x1008FF1D
-#define XF86XK_Mail 0x1008FF19
-#define XF86XK_Start 0x1008FF1A
-#define XF86XK_Search 0x1008FF1B
-#define XF86XK_AudioRecord 0x1008FF1C
-#define XF86XK_Back 0x1008FF26
-#define XF86XK_Forward 0x1008FF27
-#define XF86XK_Stop 0x1008FF28
-#define XF86XK_Refresh 0x1008FF29
-#define XF86XK_Favorites 0x1008FF30
-#define XF86XK_AudioPause 0x1008FF31
-#define XF86XK_AudioMedia 0x1008FF32
-#define XF86XK_MyComputer 0x1008FF33
-#define XF86XK_OpenURL 0x1008FF38
-#define XF86XK_Launch0 0x1008FF40
-#define XF86XK_Launch1 0x1008FF41
-#define XF86XK_Launch2 0x1008FF42
-#define XF86XK_Launch3 0x1008FF43
-#define XF86XK_Launch4 0x1008FF44
-#define XF86XK_Launch5 0x1008FF45
-#define XF86XK_Launch6 0x1008FF46
-#define XF86XK_Launch7 0x1008FF47
-#define XF86XK_Launch8 0x1008FF48
-#define XF86XK_Launch9 0x1008FF49
-#define XF86XK_LaunchA 0x1008FF4A
-#define XF86XK_LaunchB 0x1008FF4B
-#define XF86XK_LaunchC 0x1008FF4C
-#define XF86XK_LaunchD 0x1008FF4D
-#define XF86XK_LaunchE 0x1008FF4E
-#define XF86XK_LaunchF 0x1008FF4F
+#define XF86XK_MonBrightnessUp 0x1008FF02
+#define XF86XK_MonBrightnessDown 0x1008FF03
+#define XF86XK_KbdLightOnOff 0x1008FF04
+#define XF86XK_KbdBrightnessUp 0x1008FF05
+#define XF86XK_KbdBrightnessDown 0x1008FF06
+#define XF86XK_Standby 0x1008FF10
+#define XF86XK_AudioLowerVolume 0x1008FF11
+#define XF86XK_AudioMute 0x1008FF12
+#define XF86XK_AudioRaiseVolume 0x1008FF13
+#define XF86XK_AudioPlay 0x1008FF14
+#define XF86XK_AudioStop 0x1008FF15
+#define XF86XK_AudioPrev 0x1008FF16
+#define XF86XK_AudioNext 0x1008FF17
+#define XF86XK_HomePage 0x1008FF18
+#define XF86XK_Mail 0x1008FF19
+#define XF86XK_Start 0x1008FF1A
+#define XF86XK_Search 0x1008FF1B
+#define XF86XK_AudioRecord 0x1008FF1C
+#define XF86XK_Calculator 0x1008FF1D
+#define XF86XK_Memo 0x1008FF1E
+#define XF86XK_ToDoList 0x1008FF1F
+#define XF86XK_Calendar 0x1008FF20
+#define XF86XK_PowerDown 0x1008FF21
+#define XF86XK_ContrastAdjust 0x1008FF22
+#define XF86XK_Back 0x1008FF26
+#define XF86XK_Forward 0x1008FF27
+#define XF86XK_Stop 0x1008FF28
+#define XF86XK_Refresh 0x1008FF29
+#define XF86XK_PowerOff 0x1008FF2A
+#define XF86XK_WakeUp 0x1008FF2B
+#define XF86XK_Eject 0x1008FF2C
+#define XF86XK_ScreenSaver 0x1008FF2D
+#define XF86XK_WWW 0x1008FF2E
+#define XF86XK_Sleep 0x1008FF2F
+#define XF86XK_Favorites 0x1008FF30
+#define XF86XK_AudioPause 0x1008FF31
+#define XF86XK_AudioMedia 0x1008FF32
+#define XF86XK_MyComputer 0x1008FF33
+#define XF86XK_LightBulb 0x1008FF35
+#define XF86XK_Shop 0x1008FF36
+#define XF86XK_History 0x1008FF37
+#define XF86XK_OpenURL 0x1008FF38
+#define XF86XK_AddFavorite 0x1008FF39
+#define XF86XK_HotLinks 0x1008FF3A
+#define XF86XK_BrightnessAdjust 0x1008FF3B
+#define XF86XK_Finance 0x1008FF3C
+#define XF86XK_Community 0x1008FF3D
+#define XF86XK_AudioRewind 0x1008FF3E
+#define XF86XK_BackForward 0x1008FF3F
+#define XF86XK_Launch0 0x1008FF40
+#define XF86XK_Launch1 0x1008FF41
+#define XF86XK_Launch2 0x1008FF42
+#define XF86XK_Launch3 0x1008FF43
+#define XF86XK_Launch4 0x1008FF44
+#define XF86XK_Launch5 0x1008FF45
+#define XF86XK_Launch6 0x1008FF46
+#define XF86XK_Launch7 0x1008FF47
+#define XF86XK_Launch8 0x1008FF48
+#define XF86XK_Launch9 0x1008FF49
+#define XF86XK_LaunchA 0x1008FF4A
+#define XF86XK_LaunchB 0x1008FF4B
+#define XF86XK_LaunchC 0x1008FF4C
+#define XF86XK_LaunchD 0x1008FF4D
+#define XF86XK_LaunchE 0x1008FF4E
+#define XF86XK_LaunchF 0x1008FF4F
+#define XF86XK_ApplicationLeft 0x1008FF50
+#define XF86XK_ApplicationRight 0x1008FF51
+#define XF86XK_Book 0x1008FF52
+#define XF86XK_CD 0x1008FF53
+#define XF86XK_Calculater 0x1008FF54
+#define XF86XK_Clear 0x1008FF55
+#define XF86XK_ClearGrab 0x1008FE21
+#define XF86XK_Close 0x1008FF56
+#define XF86XK_Copy 0x1008FF57
+#define XF86XK_Cut 0x1008FF58
+#define XF86XK_Display 0x1008FF59
+#define XF86XK_DOS 0x1008FF5A
+#define XF86XK_Documents 0x1008FF5B
+#define XF86XK_Excel 0x1008FF5C
+#define XF86XK_Explorer 0x1008FF5D
+#define XF86XK_Game 0x1008FF5E
+#define XF86XK_Go 0x1008FF5F
+#define XF86XK_iTouch 0x1008FF60
+#define XF86XK_LogOff 0x1008FF61
+#define XF86XK_Market 0x1008FF62
+#define XF86XK_Meeting 0x1008FF63
+#define XF86XK_MenuKB 0x1008FF65
+#define XF86XK_MenuPB 0x1008FF66
+#define XF86XK_MySites 0x1008FF67
+#define XF86XK_News 0x1008FF69
+#define XF86XK_OfficeHome 0x1008FF6A
+#define XF86XK_Option 0x1008FF6C
+#define XF86XK_Paste 0x1008FF6D
+#define XF86XK_Phone 0x1008FF6E
+#define XF86XK_Reply 0x1008FF72
+#define XF86XK_Reload 0x1008FF73
+#define XF86XK_RotateWindows 0x1008FF74
+#define XF86XK_RotationPB 0x1008FF75
+#define XF86XK_RotationKB 0x1008FF76
+#define XF86XK_Save 0x1008FF77
+#define XF86XK_Send 0x1008FF7B
+#define XF86XK_Spell 0x1008FF7C
+#define XF86XK_SplitScreen 0x1008FF7D
+#define XF86XK_Support 0x1008FF7E
+#define XF86XK_TaskPane 0x1008FF7F
+#define XF86XK_Terminal 0x1008FF80
+#define XF86XK_Tools 0x1008FF81
+#define XF86XK_Travel 0x1008FF82
+#define XF86XK_Video 0x1008FF87
+#define XF86XK_Word 0x1008FF89
+#define XF86XK_Xfer 0x1008FF8A
+#define XF86XK_ZoomIn 0x1008FF8B
+#define XF86XK_ZoomOut 0x1008FF8C
+#define XF86XK_Away 0x1008FF8D
+#define XF86XK_Messenger 0x1008FF8E
+#define XF86XK_WebCam 0x1008FF8F
+#define XF86XK_MailForward 0x1008FF90
+#define XF86XK_Pictures 0x1008FF91
+#define XF86XK_Music 0x1008FF92
+#define XF86XK_Battery 0x1008FF93
+#define XF86XK_Bluetooth 0x1008FF94
+#define XF86XK_WLAN 0x1008FF95
+#define XF86XK_UWB 0x1008FF96
+#define XF86XK_AudioForward 0x1008FF97
+#define XF86XK_AudioRepeat 0x1008FF98
+#define XF86XK_AudioRandomPlay 0x1008FF99
+#define XF86XK_Subtitle 0x1008FF9A
+#define XF86XK_AudioCycleTrack 0x1008FF9B
+#define XF86XK_Time 0x1008FF9F
+#define XF86XK_Select 0x1008FFA0
+#define XF86XK_View 0x1008FFA1
+#define XF86XK_TopMenu 0x1008FFA2
+#define XF86XK_Suspend 0x1008FFA7
+#define XF86XK_Hibernate 0x1008FFA8
// end of XF86keysyms.h
,
- { Qt::Key_Standby, XF86XK_Standby },
+ { Qt::Key_Back, XF86XK_Back },
+ { Qt::Key_Forward, XF86XK_Forward },
+ { Qt::Key_Stop, XF86XK_Stop },
+ { Qt::Key_Refresh, XF86XK_Refresh },
+ { Qt::Key_Favorites, XF86XK_Favorites },
+ { Qt::Key_LaunchMedia, XF86XK_AudioMedia },
+ { Qt::Key_OpenUrl, XF86XK_OpenURL },
+ { Qt::Key_HomePage, XF86XK_HomePage },
+ { Qt::Key_Search, XF86XK_Search },
{ Qt::Key_VolumeDown, XF86XK_AudioLowerVolume },
{ Qt::Key_VolumeMute, XF86XK_AudioMute },
{ Qt::Key_VolumeUp, XF86XK_AudioRaiseVolume },
@@ -249,19 +352,107 @@
{ Qt::Key_MediaStop, XF86XK_AudioStop },
{ Qt::Key_MediaPrevious, XF86XK_AudioPrev },
{ Qt::Key_MediaNext, XF86XK_AudioNext },
- { Qt::Key_HomePage, XF86XK_HomePage },
- { Qt::Key_LaunchMail, XF86XK_Mail },
- { Qt::Key_Search, XF86XK_Search },
{ Qt::Key_MediaRecord, XF86XK_AudioRecord },
- { Qt::Key_LaunchMedia, XF86XK_AudioMedia },
- { Qt::Key_Launch1, XF86XK_Calculator },
- { Qt::Key_Back, XF86XK_Back },
- { Qt::Key_Forward, XF86XK_Forward },
- { Qt::Key_Stop, XF86XK_Stop },
- { Qt::Key_Refresh, XF86XK_Refresh },
- { Qt::Key_Favorites, XF86XK_Favorites },
+ { Qt::Key_LaunchMail, XF86XK_Mail },
{ Qt::Key_Launch0, XF86XK_MyComputer },
- { Qt::Key_OpenUrl, XF86XK_OpenURL },
+ { Qt::Key_Calculator, XF86XK_Calculator },
+ { Qt::Key_Memo, XF86XK_Memo },
+ { Qt::Key_ToDoList, XF86XK_ToDoList },
+ { Qt::Key_Calendar, XF86XK_Calendar },
+ { Qt::Key_PowerDown, XF86XK_PowerDown },
+ { Qt::Key_ContrastAdjust, XF86XK_ContrastAdjust },
+ { Qt::Key_Standby, XF86XK_Standby },
+ { Qt::Key_MonBrightnessUp, XF86XK_MonBrightnessUp },
+ { Qt::Key_MonBrightnessDown, XF86XK_MonBrightnessDown },
+ { Qt::Key_KeyboardLightOnOff, XF86XK_KbdLightOnOff },
+ { Qt::Key_KeyboardBrightnessUp, XF86XK_KbdBrightnessUp },
+ { Qt::Key_KeyboardBrightnessDown, XF86XK_KbdBrightnessDown },
+ { Qt::Key_PowerOff, XF86XK_PowerOff },
+ { Qt::Key_WakeUp, XF86XK_WakeUp },
+ { Qt::Key_Eject, XF86XK_Eject },
+ { Qt::Key_ScreenSaver, XF86XK_ScreenSaver },
+ { Qt::Key_WWW, XF86XK_WWW },
+ { Qt::Key_Sleep, XF86XK_Sleep },
+ { Qt::Key_LightBulb, XF86XK_LightBulb },
+ { Qt::Key_Shop, XF86XK_Shop },
+ { Qt::Key_History, XF86XK_History },
+ { Qt::Key_AddFavorite, XF86XK_AddFavorite },
+ { Qt::Key_HotLinks, XF86XK_HotLinks },
+ { Qt::Key_BrightnessAdjust, XF86XK_BrightnessAdjust },
+ { Qt::Key_Finance, XF86XK_Finance },
+ { Qt::Key_Community, XF86XK_Community },
+ { Qt::Key_AudioRewind, XF86XK_AudioRewind },
+ { Qt::Key_BackForward, XF86XK_BackForward },
+ { Qt::Key_ApplicationLeft, XF86XK_ApplicationLeft },
+ { Qt::Key_ApplicationRight, XF86XK_ApplicationRight },
+ { Qt::Key_Book, XF86XK_Book },
+ { Qt::Key_CD, XF86XK_CD },
+ { Qt::Key_Calculator, XF86XK_Calculater },
+ { Qt::Key_Clear, XF86XK_Clear },
+ { Qt::Key_ClearGrab, XF86XK_ClearGrab },
+ { Qt::Key_Close, XF86XK_Close },
+ { Qt::Key_Copy, XF86XK_Copy },
+ { Qt::Key_Cut, XF86XK_Cut },
+ { Qt::Key_Display, XF86XK_Display },
+ { Qt::Key_DOS, XF86XK_DOS },
+ { Qt::Key_Documents, XF86XK_Documents },
+ { Qt::Key_Excel, XF86XK_Excel },
+ { Qt::Key_Explorer, XF86XK_Explorer },
+ { Qt::Key_Game, XF86XK_Game },
+ { Qt::Key_Go, XF86XK_Go },
+ { Qt::Key_iTouch, XF86XK_iTouch },
+ { Qt::Key_LogOff, XF86XK_LogOff },
+ { Qt::Key_Market, XF86XK_Market },
+ { Qt::Key_Meeting, XF86XK_Meeting },
+ { Qt::Key_MenuKB, XF86XK_MenuKB },
+ { Qt::Key_MenuPB, XF86XK_MenuPB },
+ { Qt::Key_MySites, XF86XK_MySites },
+ { Qt::Key_News, XF86XK_News },
+ { Qt::Key_OfficeHome, XF86XK_OfficeHome },
+ { Qt::Key_Option, XF86XK_Option },
+ { Qt::Key_Paste, XF86XK_Paste },
+ { Qt::Key_Phone, XF86XK_Phone },
+ { Qt::Key_Reply, XF86XK_Reply },
+ { Qt::Key_Reload, XF86XK_Reload },
+ { Qt::Key_RotateWindows, XF86XK_RotateWindows },
+ { Qt::Key_RotationPB, XF86XK_RotationPB },
+ { Qt::Key_RotationKB, XF86XK_RotationKB },
+ { Qt::Key_Save, XF86XK_Save },
+ { Qt::Key_Send, XF86XK_Send },
+ { Qt::Key_Spell, XF86XK_Spell },
+ { Qt::Key_SplitScreen, XF86XK_SplitScreen },
+ { Qt::Key_Support, XF86XK_Support },
+ { Qt::Key_TaskPane, XF86XK_TaskPane },
+ { Qt::Key_Terminal, XF86XK_Terminal },
+ { Qt::Key_Tools, XF86XK_Tools },
+ { Qt::Key_Travel, XF86XK_Travel },
+ { Qt::Key_Video, XF86XK_Video },
+ { Qt::Key_Word, XF86XK_Word },
+ { Qt::Key_Xfer, XF86XK_Xfer },
+ { Qt::Key_ZoomIn, XF86XK_ZoomIn },
+ { Qt::Key_ZoomOut, XF86XK_ZoomOut },
+ { Qt::Key_Away, XF86XK_Away },
+ { Qt::Key_Messenger, XF86XK_Messenger },
+ { Qt::Key_WebCam, XF86XK_WebCam },
+ { Qt::Key_MailForward, XF86XK_MailForward },
+ { Qt::Key_Pictures, XF86XK_Pictures },
+ { Qt::Key_Music, XF86XK_Music },
+ { Qt::Key_Battery, XF86XK_Battery },
+ { Qt::Key_Bluetooth, XF86XK_Bluetooth },
+ { Qt::Key_WLAN, XF86XK_WLAN },
+ { Qt::Key_UWB, XF86XK_UWB },
+ { Qt::Key_AudioForward, XF86XK_AudioForward },
+ { Qt::Key_AudioRepeat, XF86XK_AudioRepeat },
+ { Qt::Key_AudioRandomPlay, XF86XK_AudioRandomPlay },
+ { Qt::Key_Subtitle, XF86XK_Subtitle },
+ { Qt::Key_AudioCycleTrack, XF86XK_AudioCycleTrack },
+ { Qt::Key_Time, XF86XK_Time },
+ { Qt::Key_Select, XF86XK_Select },
+ { Qt::Key_View, XF86XK_View },
+ { Qt::Key_TopMenu, XF86XK_TopMenu },
+ { Qt::Key_Bluetooth, XF86XK_Bluetooth },
+ { Qt::Key_Suspend, XF86XK_Suspend },
+ { Qt::Key_Hibernate, XF86XK_Hibernate },
{ Qt::Key_Launch2, XF86XK_Launch0 },
{ Qt::Key_Launch3, XF86XK_Launch1 },
{ Qt::Key_Launch4, XF86XK_Launch2 },

3
macros.kdelibs Normal file
View File

@ -0,0 +1,3 @@
%_kde4_version @@VERSION@@

2
sources
View File

@ -1 +1 @@
8db761475eb6f03f634c388f1c05b329 kdelibs-4.3.5.tar.bz2 957bca85de744a9ddd316fd85e882b40 kdelibs-4.4.0.tar.bz2