* Fri May 21 2010 Jaroslav Reznik <jreznik@redhat.com> - 6:4.4.80-1
- 4.5 Beta 1 (4.4.80)
This commit is contained in:
Jaroslav Reznik
parent
e0de32fa3f
commit
1d1778983c
|
|
@ -1 +1 @@
|
|||
kdelibs-4.4.3.tar.bz2
|
||||
kdelibs-4.4.80.tar.bz2
|
||||
|
|
|
|||
|
|
@ -1,305 +0,0 @@
|
|||
diff -ur kdelibs-4.0.0/kde3support/kdeui/k3sconfig.cpp kdelibs-4.0.0-k3spell-hunspell/kde3support/kdeui/k3sconfig.cpp
|
||||
--- kdelibs-4.0.0/kde3support/kdeui/k3sconfig.cpp 2008-01-05 00:59:41.000000000 +0100
|
||||
+++ kdelibs-4.0.0-k3spell-hunspell/kde3support/kdeui/k3sconfig.cpp 2008-01-19 16:47:04.000000000 +0100
|
||||
@@ -1,6 +1,7 @@
|
||||
/* This file is part of the KDE libraries
|
||||
Copyright (C) 1997 David Sweet <dsweet@kde.org>
|
||||
Copyright (C) 2000-2001 Wolfram Diestel <wolfram@steloj.de>
|
||||
+ Copyright (C) 2007-2008 Kevin Kofler <Kevin@tigcc.ticalc.org>
|
||||
|
||||
This library is free software; you can redistribute it and/or
|
||||
modify it under the terms of the GNU Library General Public
|
||||
@@ -167,6 +168,7 @@
|
||||
clientcombo->addItem( i18nc("@item:inlistbox Spell checker", "<application>Aspell</application>") );
|
||||
clientcombo->addItem( i18nc("@item:inlistbox Spell checker", "<application>Hspell</application>") );
|
||||
clientcombo->addItem( i18nc("@item:inlistbox Spell checker", "<application>Zemberek</application>") );
|
||||
+ clientcombo->addItem( i18nc("@item:inlistbox Spell checker", "<application>Hunspell</application>") );
|
||||
connect( clientcombo, SIGNAL (activated(int)), this,
|
||||
SLOT (sChangeClient(int)) );
|
||||
glay->addWidget( clientcombo, 5, 1, 1, 2 );
|
||||
@@ -261,8 +263,10 @@
|
||||
dictcombo->addItem( i18nc("@item Spelling dictionary", "Turkish") );
|
||||
sChangeEncoding( KS_E_UTF8 );
|
||||
}
|
||||
- else
|
||||
+ else if ( iclient == KS_CLIENT_ASPELL )
|
||||
getAvailDictsAspell();
|
||||
+ else
|
||||
+ getAvailDictsHunspell();
|
||||
}
|
||||
emit configChanged();
|
||||
}
|
||||
@@ -420,8 +424,10 @@
|
||||
langfnames.append("");
|
||||
dictcombo->addItem( i18nc("@item Spelling dictionary", "Turkish") );
|
||||
}
|
||||
- else
|
||||
+ else if ( iclient == KS_CLIENT_ASPELL )
|
||||
getAvailDictsAspell();
|
||||
+ else
|
||||
+ getAvailDictsHunspell();
|
||||
|
||||
// select the used dictionary in the list
|
||||
int whichelement=-1;
|
||||
@@ -606,6 +612,63 @@
|
||||
}
|
||||
}
|
||||
|
||||
+void K3SpellConfig::getAvailDictsHunspell () {
|
||||
+
|
||||
+ langfnames.clear();
|
||||
+ dictcombo->clear();
|
||||
+ langfnames.append(""); // Default
|
||||
+ dictcombo->addItem( i18nc("@item Spelling dictionary",
|
||||
+ "<application>Hunspell</application> Default") );
|
||||
+
|
||||
+ // dictionary path
|
||||
+ QFileInfo dir ("/usr/share/myspell");
|
||||
+ if (!dir.exists() || !dir.isDir())
|
||||
+ dir.setFile ("/usr/share/hunspell");
|
||||
+ if (!dir.exists() || !dir.isDir()) return;
|
||||
+
|
||||
+ kDebug(750) << "K3SpellConfig::getAvailDictsHunspell "
|
||||
+ << dir.filePath() << " " << dir.path() << endl;
|
||||
+
|
||||
+ const QDir thedir (dir.filePath(),"*.dic");
|
||||
+ const QStringList entryList = thedir.entryList();
|
||||
+
|
||||
+ kDebug(750) << "K3SpellConfig" << thedir.path() << "\n";
|
||||
+ kDebug(750) << "entryList().count()="
|
||||
+ << entryList.count() << endl;
|
||||
+
|
||||
+ QStringList::const_iterator entryListItr = entryList.constBegin();
|
||||
+ const QStringList::const_iterator entryListEnd = entryList.constEnd();
|
||||
+
|
||||
+ for ( ; entryListItr != entryListEnd; ++entryListItr)
|
||||
+ {
|
||||
+ QString fname, lname, hname;
|
||||
+ fname = *entryListItr;
|
||||
+
|
||||
+ // remove .dic
|
||||
+ if (fname.endsWith(".dic")) fname.remove (fname.length()-4,4);
|
||||
+
|
||||
+ if (interpret (fname, lname, hname) && langfnames.first().isEmpty())
|
||||
+ { // This one is the KDE default language
|
||||
+ // so place it first in the lists (overwrite "Default")
|
||||
+
|
||||
+ langfnames.removeFirst();
|
||||
+ langfnames.prepend ( fname );
|
||||
+
|
||||
+ hname=i18nc("@item Spelling dictionary: %1 dictionary name, %2 file name",
|
||||
+ "Default - %1 [%2]", hname, fname);
|
||||
+
|
||||
+ dictcombo->setItemText (0,hname);
|
||||
+ }
|
||||
+ else
|
||||
+ {
|
||||
+ langfnames.append (fname);
|
||||
+ hname=hname+" ["+fname+']';
|
||||
+
|
||||
+ dictcombo->addItem (hname);
|
||||
+ }
|
||||
+ }
|
||||
+}
|
||||
+
|
||||
void
|
||||
K3SpellConfig::fillDicts( QComboBox* box, QStringList* dictionaries )
|
||||
{
|
||||
@@ -685,8 +748,7 @@
|
||||
box->addItem( i18nc("@item Spelling dictionary", "Turkish") );
|
||||
langfnames.append("");
|
||||
sChangeEncoding( KS_E_UTF8 );
|
||||
- }
|
||||
- else {
|
||||
+ } else if ( iclient == KS_CLIENT_ASPELL ) {
|
||||
box->clear();
|
||||
langfnames.append(""); // Default
|
||||
box->addItem (i18nc("@item Spelling dictionary",
|
||||
@@ -766,6 +828,59 @@
|
||||
}
|
||||
}
|
||||
}
|
||||
+ } else {
|
||||
+ box->clear();
|
||||
+ langfnames.append(""); // Default
|
||||
+ box->addItem( i18nc("@item Spelling dictionary",
|
||||
+ "<application>Hunspell</application> Default") );
|
||||
+
|
||||
+ // dictionary path
|
||||
+ QFileInfo dir ("/usr/share/myspell");
|
||||
+ if (!dir.exists() || !dir.isDir())
|
||||
+ dir.setFile ("/usr/share/hunspell");
|
||||
+ if (!dir.exists() || !dir.isDir()) return;
|
||||
+
|
||||
+ kDebug(750) << "K3SpellConfig::getAvailDictsHunspell "
|
||||
+ << dir.filePath() << " " << dir.path() << endl;
|
||||
+
|
||||
+ const QDir thedir (dir.filePath(),"*.dic");
|
||||
+ const QStringList entryList = thedir.entryList();
|
||||
+
|
||||
+ kDebug(750) << "K3SpellConfig" << thedir.path() << "\n";
|
||||
+ kDebug(750) << "entryList().count()="
|
||||
+ << entryList.count() << endl;
|
||||
+
|
||||
+ QStringList::const_iterator entryListItr = entryList.constBegin();
|
||||
+ const QStringList::const_iterator entryListEnd = entryList.constEnd();
|
||||
+
|
||||
+ for ( ; entryListItr != entryListEnd; ++entryListItr)
|
||||
+ {
|
||||
+ QString fname, lname, hname;
|
||||
+ fname = *entryListItr;
|
||||
+
|
||||
+ // remove .dic
|
||||
+ if (fname.endsWith(".dic")) fname.remove (fname.length()-4,4);
|
||||
+
|
||||
+ if (interpret (fname, lname, hname) && langfnames.first().isEmpty())
|
||||
+ { // This one is the KDE default language
|
||||
+ // so place it first in the lists (overwrite "Default")
|
||||
+
|
||||
+ langfnames.erase ( langfnames.begin() );
|
||||
+ langfnames.prepend ( fname );
|
||||
+
|
||||
+ hname=i18nc("@item Spelling dictionary: %1 dictionary name, %2 file name",
|
||||
+ "Default - %1 [%2]", hname, fname);
|
||||
+
|
||||
+ box->setItemText (0,hname);
|
||||
+ }
|
||||
+ else
|
||||
+ {
|
||||
+ langfnames.append (fname);
|
||||
+ hname=hname+" ["+fname+']';
|
||||
+
|
||||
+ box->addItem (hname);
|
||||
+ }
|
||||
+ }
|
||||
}
|
||||
int whichelement = langfnames.indexOf(qsdict);
|
||||
if ( whichelement >= 0 ) {
|
||||
diff -ur kdelibs-4.0.0/kde3support/kdeui/k3sconfig.h kdelibs-4.0.0-k3spell-hunspell/kde3support/kdeui/k3sconfig.h
|
||||
--- kdelibs-4.0.0/kde3support/kdeui/k3sconfig.h 2008-01-05 00:59:41.000000000 +0100
|
||||
+++ kdelibs-4.0.0-k3spell-hunspell/kde3support/kdeui/k3sconfig.h 2008-01-19 16:25:43.000000000 +0100
|
||||
@@ -1,5 +1,6 @@
|
||||
/* This file is part of the KDE libraries
|
||||
Copyright (C) 1997 David Sweet <dsweet@kde.org>
|
||||
+ Copyright (C) 2007-2008 Kevin Kofler <Kevin@tigcc.ticalc.org>
|
||||
|
||||
This library is free software; you can redistribute it and/or
|
||||
modify it under the terms of the GNU Library General Public
|
||||
@@ -60,7 +61,8 @@
|
||||
KS_CLIENT_ISPELL=0,
|
||||
KS_CLIENT_ASPELL=1,
|
||||
KS_CLIENT_HSPELL=2,
|
||||
- KS_CLIENT_ZEMBEREK=3
|
||||
+ KS_CLIENT_ZEMBEREK=3,
|
||||
+ KS_CLIENT_HUNSPELL=4
|
||||
};
|
||||
|
||||
/**
|
||||
@@ -287,6 +289,7 @@
|
||||
K3SpellConfigPrivate *const d;
|
||||
void getAvailDictsIspell();
|
||||
void getAvailDictsAspell();
|
||||
+ void getAvailDictsHunspell();
|
||||
};
|
||||
|
||||
#endif // KDELIBS_KSCONFIG_H
|
||||
diff -ur kdelibs-4.0.0/kde3support/kdeui/k3spell.cpp kdelibs-4.0.0-k3spell-hunspell/kde3support/kdeui/k3spell.cpp
|
||||
--- kdelibs-4.0.0/kde3support/kdeui/k3spell.cpp 2008-01-05 00:59:41.000000000 +0100
|
||||
+++ kdelibs-4.0.0-k3spell-hunspell/kde3support/kdeui/k3spell.cpp 2008-01-19 16:44:00.000000000 +0100
|
||||
@@ -2,6 +2,7 @@
|
||||
Copyright (C) 1997 David Sweet <dsweet@kde.org>
|
||||
Copyright (C) 2000-2001 Wolfram Diestel <wolfram@steloj.de>
|
||||
Copyright (C) 2003 Zack Rusin <zack@kde.org>
|
||||
+ Copyright (C) 2007-2008 Kevin Kofler <Kevin@tigcc.ticalc.org>
|
||||
|
||||
This library is free software; you can redistribute it and/or
|
||||
modify it under the terms of the GNU Library General Public
|
||||
@@ -218,9 +219,14 @@
|
||||
*proc << "zpspell";
|
||||
kDebug(750) << "Using zemberek(zpspell)";
|
||||
break;
|
||||
+ case KS_CLIENT_HUNSPELL:
|
||||
+ *proc << "hunspell";
|
||||
+ kDebug(750) << "Using hunspell";
|
||||
+ break;
|
||||
}
|
||||
|
||||
- if ( ksconfig->client() == KS_CLIENT_ISPELL || ksconfig->client() == KS_CLIENT_ASPELL )
|
||||
+ // Hunspell doesn't need all of these options, but it'll ignore those it doesn't understand.
|
||||
+ if ( ksconfig->client() == KS_CLIENT_ISPELL || ksconfig->client() == KS_CLIENT_ASPELL || ksconfig->client() == KS_CLIENT_HUNSPELL )
|
||||
{
|
||||
*proc << "-a" << "-S";
|
||||
|
||||
@@ -238,8 +244,8 @@
|
||||
*proc << "-t";
|
||||
break;
|
||||
case Nroff:
|
||||
- //only ispell supports
|
||||
- if ( ksconfig->client() == KS_CLIENT_ISPELL )
|
||||
+ //only ispell and hunspell support
|
||||
+ if ( ksconfig->client() == KS_CLIENT_ISPELL || ksconfig->client() == KS_CLIENT_HUNSPELL )
|
||||
*proc << "-n";
|
||||
break;
|
||||
case Text:
|
||||
@@ -276,7 +282,60 @@
|
||||
// option, so k3spell tries again without it. That's why as 'ps -ax'
|
||||
// shows "ispell -a -S ..." withou the "-Tlatin2" option.
|
||||
|
||||
- if ( trystart<1 ) {
|
||||
+ if ( ksconfig->client() == KS_CLIENT_HUNSPELL && trystart<1 ) {
|
||||
+ // Note: This sets I/O encoding. Hunspell correctly handles dictionary encoding != I/O encoding.
|
||||
+ // It will be faster if the I/O encoding matches the dictionary encoding, but using UTF-8 is always safe.
|
||||
+ switch ( ksconfig->encoding() )
|
||||
+ {
|
||||
+ case KS_E_LATIN1:
|
||||
+ *proc << "-i" << "ISO-8859-1";
|
||||
+ break;
|
||||
+ case KS_E_LATIN2:
|
||||
+ *proc << "-i" << "ISO-8859-2";
|
||||
+ break;
|
||||
+ case KS_E_LATIN3:
|
||||
+ *proc << "-i" << "ISO-8859-3";
|
||||
+ break;
|
||||
+ case KS_E_LATIN4:
|
||||
+ *proc << "-i" << "ISO-8859-4";
|
||||
+ break;
|
||||
+ case KS_E_LATIN5:
|
||||
+ *proc << "-i" << "ISO-8859-5";
|
||||
+ break;
|
||||
+ case KS_E_LATIN7:
|
||||
+ *proc << "-i" << "ISO-8859-7";
|
||||
+ break;
|
||||
+ case KS_E_LATIN8:
|
||||
+ *proc << "-i" << "ISO-8859-8";
|
||||
+ break;
|
||||
+ case KS_E_LATIN9:
|
||||
+ *proc << "-i" << "ISO-8859-9";
|
||||
+ break;
|
||||
+ case KS_E_LATIN13:
|
||||
+ *proc << "-i" << "ISO-8859-13";
|
||||
+ break;
|
||||
+ case KS_E_LATIN15:
|
||||
+ *proc << "-i" << "ISO-8859-15";
|
||||
+ break;
|
||||
+ case KS_E_UTF8:
|
||||
+ *proc << "-i" << "UTF-8";
|
||||
+ break;
|
||||
+ case KS_E_KOI8R:
|
||||
+ *proc << "-i" << "KOI8-R";
|
||||
+ break;
|
||||
+ case KS_E_KOI8U:
|
||||
+ *proc << "-i" << "KOI8-U";
|
||||
+ break;
|
||||
+ case KS_E_CP1251:
|
||||
+ *proc << "-i" << "CP1251";
|
||||
+ break;
|
||||
+ case KS_E_CP1255:
|
||||
+ *proc << "-i" << "CP1255";
|
||||
+ break;
|
||||
+ default:
|
||||
+ break;
|
||||
+ }
|
||||
+ } else if ( trystart<1 ) {
|
||||
switch ( ksconfig->encoding() )
|
||||
{
|
||||
case KS_E_LATIN1:
|
||||
|
|
@ -1,25 +0,0 @@
|
|||
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)
|
||||
|
||||
|
|
@ -1,7 +1,7 @@
|
|||
diff -up kdelibs-4.2.85/kdecore/kernel/kstandarddirs.cpp.libexecdir kdelibs-4.2.85/kdecore/kernel/kstandarddirs.cpp
|
||||
--- kdelibs-4.2.85/kdecore/kernel/kstandarddirs.cpp.libexecdir 2009-05-06 05:14:38.000000000 -0500
|
||||
+++ kdelibs-4.2.85/kdecore/kernel/kstandarddirs.cpp 2009-05-14 11:34:04.732889142 -0500
|
||||
@@ -1759,7 +1759,7 @@ void KStandardDirs::addKDEDefaults()
|
||||
diff -up kdelibs-4.4.80/kdecore/kernel/kstandarddirs.cpp.libexecdir kdelibs-4.4.80/kdecore/kernel/kstandarddirs.cpp
|
||||
--- kdelibs-4.4.80/kdecore/kernel/kstandarddirs.cpp.libexecdir 2010-04-28 10:01:43.000000000 +0200
|
||||
+++ kdelibs-4.4.80/kdecore/kernel/kstandarddirs.cpp 2010-05-21 09:51:22.456216633 +0200
|
||||
@@ -1819,7 +1819,7 @@ void KStandardDirs::addKDEDefaults()
|
||||
addResourceType(types_string + types_indices[index], 0, types_string + types_indices[index+1], true);
|
||||
index+=2;
|
||||
}
|
||||
|
|
@ -10,9 +10,9 @@ diff -up kdelibs-4.2.85/kdecore/kernel/kstandarddirs.cpp.libexecdir kdelibs-4.2.
|
|||
|
||||
addResourceDir("home", QDir::homePath(), false);
|
||||
|
||||
diff -up kdelibs-4.2.85/kdecore/kernel/kstandarddirs_unix.cpp.libexecdir kdelibs-4.2.85/kdecore/kernel/kstandarddirs_unix.cpp
|
||||
--- kdelibs-4.2.85/kdecore/kernel/kstandarddirs_unix.cpp.libexecdir 2008-05-21 06:08:57.000000000 -0500
|
||||
+++ kdelibs-4.2.85/kdecore/kernel/kstandarddirs_unix.cpp 2009-05-14 11:30:40.737623244 -0500
|
||||
diff -up kdelibs-4.4.80/kdecore/kernel/kstandarddirs_unix.cpp.libexecdir kdelibs-4.4.80/kdecore/kernel/kstandarddirs_unix.cpp
|
||||
--- kdelibs-4.4.80/kdecore/kernel/kstandarddirs_unix.cpp.libexecdir 2008-05-21 13:08:57.000000000 +0200
|
||||
+++ kdelibs-4.4.80/kdecore/kernel/kstandarddirs_unix.cpp 2010-05-21 09:51:22.456216633 +0200
|
||||
@@ -62,7 +62,7 @@ QString KStandardDirs::installPath(const
|
||||
if (strcmp("lib", type) == 0)
|
||||
return QString::fromLatin1(LIB_INSTALL_DIR "/");
|
||||
|
|
@ -22,10 +22,10 @@ diff -up kdelibs-4.2.85/kdecore/kernel/kstandarddirs_unix.cpp.libexecdir kdelibs
|
|||
if (strcmp("locale", type) == 0)
|
||||
return QString::fromLatin1(LOCALE_INSTALL_DIR "/");
|
||||
break;
|
||||
diff -up kdelibs-4.2.85/kdecore/tests/kstandarddirstest.cpp.libexecdir kdelibs-4.2.85/kdecore/tests/kstandarddirstest.cpp
|
||||
--- kdelibs-4.2.85/kdecore/tests/kstandarddirstest.cpp.libexecdir 2009-02-27 06:31:32.000000000 -0600
|
||||
+++ kdelibs-4.2.85/kdecore/tests/kstandarddirstest.cpp 2009-05-14 11:30:40.737623244 -0500
|
||||
@@ -74,8 +74,9 @@ void KStandarddirsTest::testFindResource
|
||||
diff -up kdelibs-4.4.80/kdecore/tests/kstandarddirstest.cpp.libexecdir kdelibs-4.4.80/kdecore/tests/kstandarddirstest.cpp
|
||||
--- kdelibs-4.4.80/kdecore/tests/kstandarddirstest.cpp.libexecdir 2010-04-28 10:01:43.000000000 +0200
|
||||
+++ kdelibs-4.4.80/kdecore/tests/kstandarddirstest.cpp 2010-05-21 09:59:12.502278424 +0200
|
||||
@@ -83,8 +83,9 @@ void KStandarddirsTest::testFindResource
|
||||
#define KIOSLAVE "bin/kioslave.exe"
|
||||
#else
|
||||
#define EXT ""
|
||||
|
|
@ -36,19 +36,20 @@ diff -up kdelibs-4.2.85/kdecore/tests/kstandarddirstest.cpp.libexecdir kdelibs-4
|
|||
const QString bin = KGlobal::dirs()->findResource( "exe", "kioslave" EXT );
|
||||
QVERIFY( !bin.isEmpty() );
|
||||
QVERIFY( bin.endsWith( KIOSLAVE ) );
|
||||
@@ -174,7 +175,7 @@ void KStandarddirsTest::testFindExe()
|
||||
@@ -210,7 +211,8 @@ void KStandarddirsTest::testFindExe()
|
||||
// findExe with a result in libexec
|
||||
const QString lnusertemp = KGlobal::dirs()->findExe( "lnusertemp" );
|
||||
QVERIFY( !lnusertemp.isEmpty() );
|
||||
- QVERIFY( lnusertemp.endsWith( "lib" KDELIBSUFF "/kde4/libexec/lnusertemp" EXT ) );
|
||||
+ QVERIFY( lnusertemp.endsWith( "lib" KDELIBSUFF "/kde4/libexec/lnusertemp" EXT ) || lnusertemp.endsWith( "libexec/kde4/lnusertemp" EXT ) );
|
||||
- QVERIFY( lnusertemp.endsWith( "lib" KDELIBSUFF "/kde4/libexec/lnusertemp" EXT, PATH_SENSITIVITY ) );
|
||||
+ QVERIFY( lnusertemp.endsWith( "lib" KDELIBSUFF "/kde4/libexec/lnusertemp" EXT, PATH_SENSITIVITY )
|
||||
+ || lnusertemp.endsWith( "libexec/kde4/lnusertemp" EXT, PATH_SENSITIVITY ) );
|
||||
#endif
|
||||
|
||||
// Check the "exe" resource too
|
||||
diff -up kdelibs-4.2.85/kio/tests/krununittest.cpp.libexecdir kdelibs-4.2.85/kio/tests/krununittest.cpp
|
||||
--- kdelibs-4.2.85/kio/tests/krununittest.cpp.libexecdir 2008-05-21 06:08:08.000000000 -0500
|
||||
+++ kdelibs-4.2.85/kio/tests/krununittest.cpp 2009-05-14 11:30:40.737623244 -0500
|
||||
@@ -139,7 +139,7 @@ void KRunUnitTest::testProcessDesktopExe
|
||||
diff -up kdelibs-4.4.80/kio/tests/krununittest.cpp.libexecdir kdelibs-4.4.80/kio/tests/krununittest.cpp
|
||||
--- kdelibs-4.4.80/kio/tests/krununittest.cpp.libexecdir 2010-02-24 13:52:53.000000000 +0100
|
||||
+++ kdelibs-4.4.80/kio/tests/krununittest.cpp 2010-05-21 09:51:22.457216466 +0200
|
||||
@@ -147,7 +147,7 @@ void KRunUnitTest::testProcessDesktopExe
|
||||
if (kmailservice.isEmpty()) kmailservice = "kmailservice";
|
||||
if (!kdeinit.isEmpty()) {
|
||||
QVERIFY(!kmailservice.isEmpty());
|
||||
|
|
@ -0,0 +1,26 @@
|
|||
diff -up kdelibs-4.4.80/cmake/modules/FindKDE4Internal.cmake.no_rpath kdelibs-4.4.80/cmake/modules/FindKDE4Internal.cmake
|
||||
--- kdelibs-4.4.80/cmake/modules/FindKDE4Internal.cmake.no_rpath 2010-05-21 10:00:15.000000000 +0200
|
||||
+++ kdelibs-4.4.80/cmake/modules/FindKDE4Internal.cmake 2010-05-21 10:09:42.195154891 +0200
|
||||
@@ -1014,12 +1014,20 @@ if (UNIX)
|
||||
|
||||
list(FIND CMAKE_PLATFORM_IMPLICIT_LINK_DIRECTORIES "${LIB_INSTALL_DIR}" _isSystemLibDir)
|
||||
if("${_isSystemLibDir}" STREQUAL "-1")
|
||||
- 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)
|
||||
endif("${_isSystemLibDir}" STREQUAL "-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)
|
||||
|
||||
|
|
@ -1,45 +1,7 @@
|
|||
diff -up kdelibs-4.3.85/kdecore/kconfig_compiler/checkkcfg.pl.parallel_devel kdelibs-4.3.85/kdecore/kconfig_compiler/checkkcfg.pl
|
||||
--- kdelibs-4.3.85/kdecore/kconfig_compiler/checkkcfg.pl.parallel_devel 2008-05-21 06:09:13.000000000 -0500
|
||||
+++ kdelibs-4.3.85/kdecore/kconfig_compiler/checkkcfg.pl 2009-12-18 08:39:50.000000000 -0600
|
||||
@@ -15,12 +15,12 @@ $file_cpp = "$filebase.cpp";
|
||||
|
||||
$kcfgc = $file . "c";
|
||||
|
||||
-$cmd = "./kconfig_compiler $file $kcfgc";
|
||||
+$cmd = "./kconfig_compiler4 $file $kcfgc";
|
||||
|
||||
#print "CMD $cmd\n";
|
||||
|
||||
if ( system( $cmd ) != 0 ) {
|
||||
- print STDERR "Unable to run kconfig_compiler\n";
|
||||
+ print STDERR "Unable to run kconfig_compiler4\n";
|
||||
exit 1;
|
||||
}
|
||||
|
||||
diff -up kdelibs-4.3.85/kdecore/kconfig_compiler/CMakeLists.txt.parallel_devel kdelibs-4.3.85/kdecore/kconfig_compiler/CMakeLists.txt
|
||||
--- kdelibs-4.3.85/kdecore/kconfig_compiler/CMakeLists.txt.parallel_devel 2009-10-26 04:15:46.000000000 -0500
|
||||
+++ kdelibs-4.3.85/kdecore/kconfig_compiler/CMakeLists.txt 2009-12-18 08:39:50.000000000 -0600
|
||||
@@ -4,13 +4,13 @@
|
||||
set(kconfig_compiler_SRCS kconfig_compiler.cpp)
|
||||
|
||||
|
||||
-kde4_add_executable(kconfig_compiler NOGUI ${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_compiler4 ${QT_QTCORE_LIBRARY} ${QT_QTXML_LIBRARY} )
|
||||
|
||||
# "export" this target too so we can use the LOCATION property of the imported target in
|
||||
# FindKDE4Internal.cmake to get the full path to the installed executable instead of using FIND_PROGRAM(), Alex
|
||||
-install(TARGETS kconfig_compiler EXPORT kdelibsToolsTargets ${INSTALL_TARGETS_DEFAULT_ARGS} )
|
||||
+install(TARGETS kconfig_compiler4 EXPORT kdelibsToolsTargets ${INSTALL_TARGETS_DEFAULT_ARGS} )
|
||||
|
||||
|
||||
########### install files ###############
|
||||
diff -up kdelibs-4.3.85/cmake/modules/FindKDE4Internal.cmake.parallel_devel kdelibs-4.3.85/cmake/modules/FindKDE4Internal.cmake
|
||||
--- kdelibs-4.3.85/cmake/modules/FindKDE4Internal.cmake.parallel_devel 2009-12-17 10:33:38.000000000 -0600
|
||||
+++ kdelibs-4.3.85/cmake/modules/FindKDE4Internal.cmake 2009-12-18 08:39:50.000000000 -0600
|
||||
@@ -15,10 +15,10 @@
|
||||
diff -up kdelibs-4.4.80/cmake/modules/FindKDE4Internal.cmake.parallel_devel kdelibs-4.4.80/cmake/modules/FindKDE4Internal.cmake
|
||||
--- kdelibs-4.4.80/cmake/modules/FindKDE4Internal.cmake.parallel_devel 2010-05-20 13:40:44.000000000 +0200
|
||||
+++ kdelibs-4.4.80/cmake/modules/FindKDE4Internal.cmake 2010-05-20 17:08:26.446930087 +0200
|
||||
@@ -37,10 +37,10 @@
|
||||
# The following variables are defined for the various tools required to
|
||||
# compile KDE software:
|
||||
#
|
||||
|
|
@ -52,7 +14,7 @@ diff -up kdelibs-4.3.85/cmake/modules/FindKDE4Internal.cmake.parallel_devel kdel
|
|||
#
|
||||
# The following variables point to the location of the KDE libraries,
|
||||
# but shouldn't be used directly:
|
||||
@@ -138,7 +138,7 @@
|
||||
@@ -174,7 +174,7 @@
|
||||
# relative path to the file.
|
||||
#
|
||||
# KDE4_ADD_WIDGET_FILES (SRCS_VAR file1.widgets ... fileN.widgets)
|
||||
|
|
@ -61,7 +23,7 @@ diff -up kdelibs-4.3.85/cmake/modules/FindKDE4Internal.cmake.parallel_devel kdel
|
|||
# for Qt Designer plugins.
|
||||
#
|
||||
# KDE4_CREATE_FINAL_FILES (filename_CXX filename_C file1 ... fileN)
|
||||
@@ -421,25 +421,25 @@ if (_kdeBootStrapping)
|
||||
@@ -487,25 +487,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
|
||||
|
|
@ -93,7 +55,7 @@ diff -up kdelibs-4.3.85/cmake/modules/FindKDE4Internal.cmake.parallel_devel kdel
|
|||
set( _KDE4_MEINPROC_EXECUTABLE_DEP meinproc4)
|
||||
|
||||
set(KDE4_INSTALLED_VERSION_OK TRUE)
|
||||
@@ -487,7 +487,8 @@ else (_kdeBootStrapping)
|
||||
@@ -554,7 +554,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
|
||||
|
|
@ -103,7 +65,7 @@ diff -up kdelibs-4.3.85/cmake/modules/FindKDE4Internal.cmake.parallel_devel kdel
|
|||
set(KDE4_INCLUDE_DIR ${KDE4_INCLUDE_INSTALL_DIR} )
|
||||
|
||||
|
||||
@@ -503,10 +504,10 @@ else (_kdeBootStrapping)
|
||||
@@ -570,10 +571,10 @@ else (_kdeBootStrapping)
|
||||
get_target_property(_importedConfigurations ${KDE4_TARGET_PREFIX}kconfig_compiler IMPORTED_CONFIGURATIONS )
|
||||
list(GET _importedConfigurations 0 _firstConfig)
|
||||
|
||||
|
|
@ -116,7 +78,7 @@ diff -up kdelibs-4.3.85/cmake/modules/FindKDE4Internal.cmake.parallel_devel kdel
|
|||
|
||||
# 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
|
||||
@@ -907,7 +908,8 @@ set(CMAKE_SYSTEM_INCLUDE_PATH ${CMAKE_SY
|
||||
set(CMAKE_SYSTEM_PROGRAM_PATH ${CMAKE_SYSTEM_PROGRAM_PATH}
|
||||
"${KDE4_BIN_INSTALL_DIR}" )
|
||||
|
||||
|
|
@ -126,7 +88,7 @@ diff -up kdelibs-4.3.85/cmake/modules/FindKDE4Internal.cmake.parallel_devel kdel
|
|||
"${KDE4_LIB_INSTALL_DIR}" )
|
||||
|
||||
# under Windows dlls may be also installed in bin/
|
||||
@@ -1224,9 +1227,9 @@ macro (KDE4_PRINT_RESULTS)
|
||||
@@ -1309,9 +1311,9 @@ macro (KDE4_PRINT_RESULTS)
|
||||
endif (NOT _kdeBootStrapping)
|
||||
|
||||
if(KDE4_KCFGC_EXECUTABLE)
|
||||
|
|
@ -138,7 +100,7 @@ diff -up kdelibs-4.3.85/cmake/modules/FindKDE4Internal.cmake.parallel_devel kdel
|
|||
endif(KDE4_KCFGC_EXECUTABLE)
|
||||
|
||||
if(AUTOMOC4_EXECUTABLE)
|
||||
@@ -1245,7 +1248,7 @@ if (KDE4Internal_FIND_REQUIRED AND NOT K
|
||||
@@ -1330,7 +1332,7 @@ if (KDE4Internal_FIND_REQUIRED AND NOT K
|
||||
endif (NOT KDE4_INSTALLED_VERSION_OK)
|
||||
|
||||
if (NOT KDE4_KCFGC_EXECUTABLE)
|
||||
|
|
@ -147,10 +109,86 @@ diff -up kdelibs-4.3.85/cmake/modules/FindKDE4Internal.cmake.parallel_devel kdel
|
|||
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(
|
||||
diff -up kdelibs-4.4.80/doc/api/doxygen-preprocess-kcfg.sh.parallel_devel kdelibs-4.4.80/doc/api/doxygen-preprocess-kcfg.sh
|
||||
--- kdelibs-4.4.80/doc/api/doxygen-preprocess-kcfg.sh.parallel_devel 2008-05-21 13:07:26.000000000 +0200
|
||||
+++ kdelibs-4.4.80/doc/api/doxygen-preprocess-kcfg.sh 2010-05-20 17:08:26.447930205 +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.4.80/kdecore/kconfig_compiler/checkkcfg.pl.parallel_devel kdelibs-4.4.80/kdecore/kconfig_compiler/checkkcfg.pl
|
||||
--- kdelibs-4.4.80/kdecore/kconfig_compiler/checkkcfg.pl.parallel_devel 2008-05-21 13:09:13.000000000 +0200
|
||||
+++ kdelibs-4.4.80/kdecore/kconfig_compiler/checkkcfg.pl 2010-05-20 17:08:26.445742332 +0200
|
||||
@@ -15,12 +15,12 @@ $file_cpp = "$filebase.cpp";
|
||||
|
||||
$kcfgc = $file . "c";
|
||||
|
||||
-$cmd = "./kconfig_compiler $file $kcfgc";
|
||||
+$cmd = "./kconfig_compiler4 $file $kcfgc";
|
||||
|
||||
#print "CMD $cmd\n";
|
||||
|
||||
if ( system( $cmd ) != 0 ) {
|
||||
- print STDERR "Unable to run kconfig_compiler\n";
|
||||
+ print STDERR "Unable to run kconfig_compiler4\n";
|
||||
exit 1;
|
||||
}
|
||||
|
||||
diff -up kdelibs-4.4.80/kdecore/kconfig_compiler/CMakeLists.txt.parallel_devel kdelibs-4.4.80/kdecore/kconfig_compiler/CMakeLists.txt
|
||||
--- kdelibs-4.4.80/kdecore/kconfig_compiler/CMakeLists.txt.parallel_devel 2010-02-24 13:52:55.000000000 +0100
|
||||
+++ kdelibs-4.4.80/kdecore/kconfig_compiler/CMakeLists.txt 2010-05-20 17:16:28.525867551 +0200
|
||||
@@ -4,22 +4,22 @@
|
||||
if (CMAKE_CROSSCOMPILING)
|
||||
SET(IMPORT_KCONFIG_COMPILER_EXECUTABLE "${KDE_HOST_TOOLS_PATH}/ImportKConfigCompilerExecutable.cmake" CACHE FILEPATH "Point it to the export file of kconfig_compiler from a native build")
|
||||
INCLUDE(${IMPORT_KCONFIG_COMPILER_EXECUTABLE})
|
||||
- SET(KDE4_KCFGC_EXECUTABLE kconfig_compiler)
|
||||
+ SET(KDE4_KCFGC_EXECUTABLE kconfig_compiler4)
|
||||
else (CMAKE_CROSSCOMPILING)
|
||||
|
||||
set(kconfig_compiler_SRCS kconfig_compiler.cpp)
|
||||
|
||||
|
||||
- kde4_add_executable(kconfig_compiler NOGUI ${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_compiler4 ${QT_QTCORE_LIBRARY} ${QT_QTXML_LIBRARY} )
|
||||
|
||||
# "export" this target too so we can use the LOCATION property of the imported target in
|
||||
# FindKDE4Internal.cmake to get the full path to the installed executable instead of using FIND_PROGRAM(), Alex
|
||||
- install(TARGETS kconfig_compiler EXPORT kdelibsToolsTargets ${INSTALL_TARGETS_DEFAULT_ARGS} )
|
||||
+ install(TARGETS kconfig_compiler4 EXPORT kdelibsToolsTargets ${INSTALL_TARGETS_DEFAULT_ARGS} )
|
||||
|
||||
# export this binary for cross-compilation
|
||||
- EXPORT(TARGETS kconfig_compiler FILE ${CMAKE_BINARY_DIR}/ImportKConfigCompilerExecutable.cmake)
|
||||
+ EXPORT(TARGETS kconfig_compiler4 FILE ${CMAKE_BINARY_DIR}/ImportKConfigCompilerExecutable.cmake)
|
||||
endif (CMAKE_CROSSCOMPILING)
|
||||
|
||||
|
||||
diff -up kdelibs-4.4.80/kdeui/tests/kconfig_compiler/CMakeLists.txt.parallel_devel kdelibs-4.4.80/kdeui/tests/kconfig_compiler/CMakeLists.txt
|
||||
--- kdelibs-4.4.80/kdeui/tests/kconfig_compiler/CMakeLists.txt.parallel_devel 2009-08-12 12:00:20.000000000 +0200
|
||||
+++ kdelibs-4.4.80/kdeui/tests/kconfig_compiler/CMakeLists.txt 2010-05-20 17:08:26.447930205 +0200
|
||||
@@ -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.4.80/kdewidgets/CMakeLists.txt.parallel_devel kdelibs-4.4.80/kdewidgets/CMakeLists.txt
|
||||
--- kdelibs-4.4.80/kdewidgets/CMakeLists.txt.parallel_devel 2010-03-03 19:30:35.000000000 +0100
|
||||
+++ kdelibs-4.4.80/kdewidgets/CMakeLists.txt 2010-05-20 17:18:07.325929401 +0200
|
||||
@@ -14,24 +14,24 @@ include_directories(
|
||||
set(makekdewidgets_SRCS makekdewidgets.cpp )
|
||||
|
||||
|
||||
|
|
@ -168,51 +206,24 @@ diff -up kdelibs-4.3.85/kdewidgets/CMakeLists.txt.parallel_devel kdelibs-4.3.85/
|
|||
|
||||
########### next target ###############
|
||||
|
||||
if(QT_QTDESIGNER_FOUND)
|
||||
# get the name of the generated wrapper script (which sets up LD_LIBRARY_PATH)
|
||||
- get_target_property(MAKEKDEWIDGETS_EXECUTABLE makekdewidgets WRAPPER_SCRIPT)
|
||||
+ get_target_property(MAKEKDEWIDGETS_EXECUTABLE makekdewidgets4 WRAPPER_SCRIPT)
|
||||
|
||||
# get the name of the generated wrapper script (which sets up LD_LIBRARY_PATH)
|
||||
-get_target_property(MAKEKDEWIDGETS_EXECUTABLE makekdewidgets WRAPPER_SCRIPT)
|
||||
+get_target_property(MAKEKDEWIDGETS_EXECUTABLE makekdewidgets4 WRAPPER_SCRIPT)
|
||||
add_custom_command(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/kdewidgets.cpp
|
||||
COMMAND "${MAKEKDEWIDGETS_EXECUTABLE}" -o ${CMAKE_CURRENT_BINARY_DIR}/kdewidgets.cpp ${CMAKE_CURRENT_SOURCE_DIR}/kde.widgets
|
||||
- MAIN_DEPENDENCY kde.widgets DEPENDS makekdewidgets)
|
||||
+ MAIN_DEPENDENCY kde.widgets DEPENDS makekdewidgets4)
|
||||
|
||||
add_custom_command(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/kdewidgets.cpp
|
||||
COMMAND "${MAKEKDEWIDGETS_EXECUTABLE}" -o ${CMAKE_CURRENT_BINARY_DIR}/kdewidgets.cpp ${CMAKE_CURRENT_SOURCE_DIR}/kde.widgets
|
||||
- MAIN_DEPENDENCY kde.widgets DEPENDS makekdewidgets)
|
||||
+ MAIN_DEPENDENCY kde.widgets DEPENDS makekdewidgets4)
|
||||
set(kdewidgets_PART_SRCS
|
||||
classpreviews.cpp
|
||||
@@ -66,7 +66,7 @@ if(QT_QTDESIGNER_FOUND)
|
||||
|
||||
set(kdewidgets_PART_SRCS
|
||||
classpreviews.cpp
|
||||
@@ -66,7 +66,7 @@ if (QT_QT3SUPPORT_FOUND)
|
||||
|
||||
add_custom_command(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/kde3supportwidgets.cpp
|
||||
COMMAND "${MAKEKDEWIDGETS_EXECUTABLE}" -o ${CMAKE_CURRENT_BINARY_DIR}/kde3supportwidgets.cpp ${CMAKE_CURRENT_SOURCE_DIR}/kde3support.widgets
|
||||
- MAIN_DEPENDENCY kde3support.widgets DEPENDS makekdewidgets)
|
||||
+ MAIN_DEPENDENCY kde3support.widgets DEPENDS makekdewidgets4)
|
||||
|
||||
set(kde3supportwidgets_PART_SRCS
|
||||
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
|
||||
add_custom_command(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/kde3supportwidgets.cpp
|
||||
COMMAND "${MAKEKDEWIDGETS_EXECUTABLE}" -o ${CMAKE_CURRENT_BINARY_DIR}/kde3supportwidgets.cpp ${CMAKE_CURRENT_SOURCE_DIR}/kde3support.widgets
|
||||
- MAIN_DEPENDENCY kde3support.widgets DEPENDS makekdewidgets)
|
||||
+ MAIN_DEPENDENCY kde3support.widgets DEPENDS makekdewidgets4)
|
||||
|
||||
set(kde3supportwidgets_PART_SRCS
|
||||
classpreviews.cpp
|
||||
|
|
@ -1,6 +1,6 @@
|
|||
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.3.80/solid/solid/backends/hal/halstorageaccess.cpp 2009-12-01 01:27:28.000000000 +0100
|
||||
+++ kdelibs-4.3.80-policykit-workaround/solid/solid/backends/hal/halstorageaccess.cpp 2009-12-03 03:49:55.000000000 +0100
|
||||
diff -up kdelibs-4.4.80/solid/solid/backends/hal/halstorageaccess.cpp.policykit kdelibs-4.4.80/solid/solid/backends/hal/halstorageaccess.cpp
|
||||
--- kdelibs-4.4.80/solid/solid/backends/hal/halstorageaccess.cpp.policykit 2010-04-22 10:04:55.000000000 +0200
|
||||
+++ kdelibs-4.4.80/solid/solid/backends/hal/halstorageaccess.cpp 2010-05-21 09:47:01.417153488 +0200
|
||||
@@ -17,6 +17,8 @@
|
||||
|
||||
*/
|
||||
|
|
@ -10,29 +10,27 @@ diff -ur kdelibs-4.3.80/solid/solid/backends/hal/halstorageaccess.cpp kdelibs-4.
|
|||
#include "halstorageaccess.h"
|
||||
|
||||
#include "halfstabhandling.h"
|
||||
@@ -177,11 +179,21 @@
|
||||
@@ -160,9 +162,19 @@ void StorageAccess::slotPropertyChanged(
|
||||
void StorageAccess::slotDBusReply(const QDBusMessage &/*reply*/)
|
||||
{
|
||||
// TODO: Better error reporting here
|
||||
if (m_setupInProgress) {
|
||||
+ if (error.name() == "org.freedesktop.Hal.Device.PermissionDeniedByPolicy") {
|
||||
+ if (callPrivilegedMount())
|
||||
+ return;
|
||||
+ return;
|
||||
+ // if we fail to run kdesu, fall through and emit the original PermissionDeniedByPolicy error
|
||||
+ }
|
||||
m_setupInProgress = false;
|
||||
emit setupDone(Solid::UnauthorizedOperation,
|
||||
QString(error.name()+": "+error.message()),
|
||||
m_device->udi());
|
||||
m_device->broadcastActionDone("setupDone", Solid::NoError, QVariant(), m_device->udi());
|
||||
} else if (m_teardownInProgress) {
|
||||
+ if (error.name() == "org.freedesktop.Hal.Device.PermissionDeniedByPolicy") {
|
||||
+ if (callPrivilegedUnmount())
|
||||
+ return;
|
||||
+ return;
|
||||
+ // if we fail to run kdesu, fall through and emit the original PermissionDeniedByPolicy error
|
||||
+ }
|
||||
m_teardownInProgress = false;
|
||||
emit teardownDone(Solid::UnauthorizedOperation,
|
||||
QString(error.name()+": "+error.message()),
|
||||
@@ -311,8 +323,9 @@
|
||||
m_device->broadcastActionDone("teardownDone", Solid::NoError, QVariant(), m_device->udi());
|
||||
|
||||
@@ -347,8 +359,9 @@ bool StorageAccess::callHalVolumeMount()
|
||||
#else
|
||||
QString uid="uid=";
|
||||
#endif
|
||||
|
|
@ -44,7 +42,7 @@ diff -ur kdelibs-4.3.80/solid/solid/backends/hal/halstorageaccess.cpp kdelibs-4.
|
|||
}
|
||||
|
||||
#ifdef Q_OS_FREEBSD
|
||||
@@ -354,6 +367,59 @@
|
||||
@@ -390,6 +403,59 @@ bool StorageAccess::callHalVolumeMount()
|
||||
SLOT(slotDBusError(const QDBusError &)));
|
||||
}
|
||||
|
||||
|
|
@ -104,10 +102,10 @@ diff -ur kdelibs-4.3.80/solid/solid/backends/hal/halstorageaccess.cpp kdelibs-4.
|
|||
bool StorageAccess::callHalVolumeUnmount()
|
||||
{
|
||||
QDBusConnection c = QDBusConnection::systemBus();
|
||||
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.3.80/solid/solid/backends/hal/halstorageaccess.h 2009-12-01 01:27:28.000000000 +0100
|
||||
+++ kdelibs-4.3.80-policykit-workaround/solid/solid/backends/hal/halstorageaccess.h 2009-12-03 03:49:55.000000000 +0100
|
||||
@@ -70,6 +70,9 @@
|
||||
diff -up kdelibs-4.4.80/solid/solid/backends/hal/halstorageaccess.h.policykit kdelibs-4.4.80/solid/solid/backends/hal/halstorageaccess.h
|
||||
--- kdelibs-4.4.80/solid/solid/backends/hal/halstorageaccess.h.policykit 2010-04-22 10:04:55.000000000 +0200
|
||||
+++ kdelibs-4.4.80/solid/solid/backends/hal/halstorageaccess.h 2010-05-21 09:38:58.231091367 +0200
|
||||
@@ -78,6 +78,9 @@ private:
|
||||
bool callSystemMount();
|
||||
bool callSystemUnmount();
|
||||
|
||||
23
kdelibs.spec
23
kdelibs.spec
|
|
@ -7,8 +7,8 @@
|
|||
%define apidocs 1
|
||||
|
||||
Summary: KDE Libraries
|
||||
Version: 4.4.3
|
||||
Release: 5%{?dist}
|
||||
Version: 4.4.80
|
||||
Release: 1%{?dist}
|
||||
|
||||
Name: kdelibs
|
||||
Epoch: 6
|
||||
|
|
@ -50,14 +50,9 @@ Source1: kde4.sh
|
|||
Source2: kde4.csh
|
||||
|
||||
# make -devel packages parallel-installable
|
||||
Patch0: kdelibs-4.3.85-parallel_devel.patch
|
||||
Patch0: kdelibs-4.4.80-parallel_devel.patch
|
||||
# fix kde#149705
|
||||
Patch2: kdelibs-4.2.85-kde149705.patch
|
||||
## UPSTREAM ME
|
||||
# Hunspell support for K3Spell
|
||||
# http://fedoraproject.org/wiki/Releases/FeatureDictionary
|
||||
# http://bugs.kde.org/show_bug.cgi?id=154561
|
||||
Patch5: kdelibs-4.0.0-k3spell-hunspell.patch
|
||||
# install all .css files and Doxyfile.global in kdelibs-common to build
|
||||
# kdepimlibs-apidocs against
|
||||
Patch8: kdelibs-4.3.90-install_all_css.patch
|
||||
|
|
@ -67,11 +62,11 @@ Patch9: kdelibs-4.0.2-branding.patch
|
|||
# are loaded from kde4rc
|
||||
Patch10: kdelibs-4.1.72-no-cache-kdeglobals-paths.patch
|
||||
# workaround for policykit
|
||||
Patch11: kdelibs-4.3.80-policykit-workaround.patch
|
||||
Patch11: kdelibs-4.4.80-policykit-workaround.patch
|
||||
# COMMENT ME PLEASE
|
||||
Patch12: kdelibs-4.1.0-xdg-menu.patch
|
||||
# patch KStandardDirs to use %{_libexecdir}/kde4 instead of %{_libdir}/kde4/libexec
|
||||
Patch14: kdelibs-4.2.85-libexecdir.patch
|
||||
Patch14: kdelibs-4.4.80-libexecdir.patch
|
||||
# kstandarddirs changes: search /etc/kde, find %{_kde4_libexecdir}
|
||||
Patch18: kdelibs-4.1.72-kstandarddirs.patch
|
||||
# COMMENT ME PLEASE
|
||||
|
|
@ -82,7 +77,7 @@ Patch24: kdelibs-4.3.1-drkonq.patch
|
|||
# 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
|
||||
Patch27: kdelibs-4.4.80-no_rpath.patch
|
||||
|
||||
# upstreamable
|
||||
|
||||
|
|
@ -224,10 +219,9 @@ format for easy browsing.
|
|||
|
||||
%patch0 -p1 -b .parallel_devel
|
||||
%patch2 -p1 -b .kde149705
|
||||
%patch5 -p1 -b .k3spell-hunspell
|
||||
%patch8 -p1 -b .install_all_css
|
||||
%patch9 -p1 -b .branding
|
||||
%patch11 -p1 -b .policykit
|
||||
%patch11 -p1 -b .policykit-workaround
|
||||
%patch12 -p1 -b .Administration-menu
|
||||
%patch14 -p1 -b .libexecdir
|
||||
%patch18 -p1 -b .kstandarddirs
|
||||
|
|
@ -448,6 +442,9 @@ rm -rf %{buildroot}
|
|||
|
||||
|
||||
%changelog
|
||||
* Fri May 21 2010 Jaroslav Reznik <jreznik@redhat.com> - 6:4.4.80-1
|
||||
- 4.5 Beta 1 (4.4.80)
|
||||
|
||||
* Sun May 16 2010 Rex Dieter <rdieter@fedoraproject.org> 6:4.4.3-5
|
||||
- Web proxy auto-discovery (WPAD) fails (#592658)
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue