Merge remote branch 'origin/master' into f13/master
Conflicts: .gitignore kdelibs.spec sources
This commit is contained in:
Rex Dieter
commit
cdedde6d19
|
|
@ -1,2 +1,6 @@
|
|||
<<<<<<< HEAD
|
||||
kdelibs-4.4.3.tar.bz2
|
||||
kdelibs-4.4.4.tar.bz2
|
||||
=======
|
||||
/kdelibs-4.5.2.tar.bz2
|
||||
>>>>>>> origin/master
|
||||
|
|
|
|||
14
kde4.csh
14
kde4.csh
|
|
@ -1,14 +0,0 @@
|
|||
## http://kde.ground.cz/tiki-index.php?page=Environment+Variables
|
||||
## for possible entries here
|
||||
|
||||
## Make sure KDEDIRS is set
|
||||
if ( ! $?KDEDIRS ) setenv KDEDIRS /usr
|
||||
|
||||
## When/if using prelinking, avoids use of kdeinit
|
||||
if ( -f /etc/sysconfig/prelink ) then
|
||||
set PRELINKING = `grep "^PRELINKING=" /etc/sysconfig/prelink | cut -d"=" -f2`
|
||||
if ( "$PRELINKING" == "yes" ) then
|
||||
if ( ! $?KDE_IS_PRELINKED ) setenv KDE_IS_PRELINKED 1
|
||||
endif
|
||||
unset PRELINKING
|
||||
endif
|
||||
11
kde4.sh
11
kde4.sh
|
|
@ -1,11 +0,0 @@
|
|||
## http://kde.ground.cz/tiki-index.php?page=Environment+Variables
|
||||
## for possible entries here
|
||||
|
||||
## Make sure KDEDIRS is set
|
||||
[ -z "$KDEDIRS" ] && KDEDIRS="/usr" && export KDEDIRS
|
||||
|
||||
## When/if using prelinking, avoids (some) use of kdeinit
|
||||
if [ -z "$KDE_IS_PRELINKED" ] ; then
|
||||
grep -qs '^PRELINKING=yes' /etc/sysconfig/prelink && \
|
||||
KDE_IS_PRELINKED=1 && export KDE_IS_PRELINKED
|
||||
fi
|
||||
|
|
@ -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,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-workaround kdelibs-4.4.80/solid/solid/backends/hal/halstorageaccess.cpp
|
||||
--- kdelibs-4.4.80/solid/solid/backends/hal/halstorageaccess.cpp.policykit-workaround 2010-04-22 10:04:55.000000000 +0200
|
||||
+++ kdelibs-4.4.80/solid/solid/backends/hal/halstorageaccess.cpp 2010-05-21 22:07:08.043211300 +0200
|
||||
@@ -17,6 +17,8 @@
|
||||
|
||||
*/
|
||||
|
|
@ -10,29 +10,29 @@ diff -ur kdelibs-4.3.80/solid/solid/backends/hal/halstorageaccess.cpp kdelibs-4.
|
|||
#include "halstorageaccess.h"
|
||||
|
||||
#include "halfstabhandling.h"
|
||||
@@ -177,11 +179,21 @@
|
||||
@@ -201,11 +203,21 @@ void StorageAccess::slotDBusError(const
|
||||
{
|
||||
// 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,
|
||||
m_device->broadcastActionDone("setupDone", Solid::UnauthorizedOperation,
|
||||
QString(error.name()+": "+error.message()),
|
||||
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,
|
||||
m_device->broadcastActionDone("teardownDone", Solid::UnauthorizedOperation,
|
||||
QString(error.name()+": "+error.message()),
|
||||
@@ -311,8 +323,9 @@
|
||||
@@ -347,8 +359,9 @@ bool StorageAccess::callHalVolumeMount()
|
||||
#else
|
||||
QString uid="uid=";
|
||||
#endif
|
||||
|
|
@ -44,7 +44,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 +104,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-workaround kdelibs-4.4.80/solid/solid/backends/hal/halstorageaccess.h
|
||||
--- kdelibs-4.4.80/solid/solid/backends/hal/halstorageaccess.h.policykit-workaround 2010-04-22 10:04:55.000000000 +0200
|
||||
+++ kdelibs-4.4.80/solid/solid/backends/hal/halstorageaccess.h 2010-05-21 22:03:25.933210697 +0200
|
||||
@@ -78,6 +78,9 @@ private:
|
||||
bool callSystemMount();
|
||||
bool callSystemUnmount();
|
||||
|
||||
|
|
@ -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.85/cmake/modules/FindKDE4Internal.cmake.parallel_devel kdelibs-4.4.85/cmake/modules/FindKDE4Internal.cmake
|
||||
--- kdelibs-4.4.85/cmake/modules/FindKDE4Internal.cmake.parallel_devel 2010-05-20 13:40:44.000000000 +0200
|
||||
+++ kdelibs-4.4.85/cmake/modules/FindKDE4Internal.cmake 2010-06-07 15:50:26.148340678 +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,75 @@ 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.85/doc/api/doxygen-preprocess-kcfg.sh.parallel_devel kdelibs-4.4.85/doc/api/doxygen-preprocess-kcfg.sh
|
||||
--- kdelibs-4.4.85/doc/api/doxygen-preprocess-kcfg.sh.parallel_devel 2008-05-21 13:07:26.000000000 +0200
|
||||
+++ kdelibs-4.4.85/doc/api/doxygen-preprocess-kcfg.sh 2010-06-07 15:50:26.149340577 +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.85/kdecore/kconfig_compiler/checkkcfg.pl.parallel_devel kdelibs-4.4.85/kdecore/kconfig_compiler/checkkcfg.pl
|
||||
--- kdelibs-4.4.85/kdecore/kconfig_compiler/checkkcfg.pl.parallel_devel 2008-05-21 13:09:13.000000000 +0200
|
||||
+++ kdelibs-4.4.85/kdecore/kconfig_compiler/checkkcfg.pl 2010-06-07 15:50:26.154403288 +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.85/kdecore/kconfig_compiler/CMakeLists.txt.parallel_devel kdelibs-4.4.85/kdecore/kconfig_compiler/CMakeLists.txt
|
||||
--- kdelibs-4.4.85/kdecore/kconfig_compiler/CMakeLists.txt.parallel_devel 2010-05-27 19:25:31.000000000 +0200
|
||||
+++ kdelibs-4.4.85/kdecore/kconfig_compiler/CMakeLists.txt 2010-06-07 15:57:35.970340770 +0200
|
||||
@@ -11,13 +11,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} )
|
||||
|
||||
|
||||
# # export this binary for cross-compilation
|
||||
diff -up kdelibs-4.4.85/kdeui/tests/kconfig_compiler/CMakeLists.txt.parallel_devel kdelibs-4.4.85/kdeui/tests/kconfig_compiler/CMakeLists.txt
|
||||
--- kdelibs-4.4.85/kdeui/tests/kconfig_compiler/CMakeLists.txt.parallel_devel 2009-08-12 12:00:20.000000000 +0200
|
||||
+++ kdelibs-4.4.85/kdeui/tests/kconfig_compiler/CMakeLists.txt 2010-06-07 15:50:26.155403451 +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.85/kdewidgets/CMakeLists.txt.parallel_devel kdelibs-4.4.85/kdewidgets/CMakeLists.txt
|
||||
--- kdelibs-4.4.85/kdewidgets/CMakeLists.txt.parallel_devel 2010-03-03 19:30:35.000000000 +0100
|
||||
+++ kdelibs-4.4.85/kdewidgets/CMakeLists.txt 2010-06-07 15:50:26.156403509 +0200
|
||||
@@ -14,24 +14,24 @@ include_directories(
|
||||
set(makekdewidgets_SRCS makekdewidgets.cpp )
|
||||
|
||||
|
||||
|
|
@ -168,51 +195,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
|
||||
|
|
@ -0,0 +1,78 @@
|
|||
diff -up kdelibs-4.5.1/knewstuff/knewstuff2/core/security.cpp.gpg2 kdelibs-4.5.1/knewstuff/knewstuff2/core/security.cpp
|
||||
--- kdelibs-4.5.1/knewstuff/knewstuff2/core/security.cpp.gpg2 2009-11-30 18:27:20.000000000 -0600
|
||||
+++ kdelibs-4.5.1/knewstuff/knewstuff2/core/security.cpp 2010-08-27 10:49:10.619703933 -0500
|
||||
@@ -61,7 +61,7 @@ void Security::readKeys()
|
||||
m_runMode = List;
|
||||
m_keys.clear();
|
||||
m_process = new KProcess();
|
||||
- *m_process << "gpg"
|
||||
+ *m_process << "gpg2"
|
||||
<< "--no-secmem-warning"
|
||||
<< "--no-tty"
|
||||
<< "--with-colon"
|
||||
@@ -87,7 +87,7 @@ void Security::readSecretKeys()
|
||||
}
|
||||
m_runMode = ListSecret;
|
||||
m_process = new KProcess();
|
||||
- *m_process << "gpg"
|
||||
+ *m_process << "gpg2"
|
||||
<< "--no-secmem-warning"
|
||||
<< "--no-tty"
|
||||
<< "--with-colon"
|
||||
@@ -258,7 +258,7 @@ void Security::slotCheckValidity()
|
||||
|
||||
//verify the signature
|
||||
m_process = new KProcess();
|
||||
- *m_process << "gpg"
|
||||
+ *m_process << "gpg2"
|
||||
<< "--no-secmem-warning"
|
||||
<< "--status-fd=2"
|
||||
<< "--command-fd=0"
|
||||
@@ -340,7 +340,7 @@ void Security::slotSignFile()
|
||||
|
||||
//verify the signature
|
||||
m_process = new KProcess();
|
||||
- *m_process << "gpg"
|
||||
+ *m_process << "gpg2"
|
||||
<< "--no-secmem-warning"
|
||||
<< "--status-fd=2"
|
||||
<< "--command-fd=0"
|
||||
diff -up kdelibs-4.5.1/knewstuff/knewstuff3/core/security.cpp.gpg2 kdelibs-4.5.1/knewstuff/knewstuff3/core/security.cpp
|
||||
--- kdelibs-4.5.1/knewstuff/knewstuff3/core/security.cpp.gpg2 2009-11-30 18:27:19.000000000 -0600
|
||||
+++ kdelibs-4.5.1/knewstuff/knewstuff3/core/security.cpp 2010-08-27 10:49:50.493454042 -0500
|
||||
@@ -61,7 +61,7 @@ void Security::readKeys()
|
||||
m_runMode = List;
|
||||
m_keys.clear();
|
||||
m_process = new KProcess();
|
||||
- *m_process << "gpg"
|
||||
+ *m_process << "gpg2"
|
||||
<< "--no-secmem-warning"
|
||||
<< "--no-tty"
|
||||
<< "--with-colon"
|
||||
@@ -87,7 +87,7 @@ void Security::readSecretKeys()
|
||||
}
|
||||
m_runMode = ListSecret;
|
||||
m_process = new KProcess();
|
||||
- *m_process << "gpg"
|
||||
+ *m_process << "gpg2"
|
||||
<< "--no-secmem-warning"
|
||||
<< "--no-tty"
|
||||
<< "--with-colon"
|
||||
@@ -258,7 +258,7 @@ void Security::slotCheckValidity()
|
||||
|
||||
//verify the signature
|
||||
m_process = new KProcess();
|
||||
- *m_process << "gpg"
|
||||
+ *m_process << "gpg2"
|
||||
<< "--no-secmem-warning"
|
||||
<< "--status-fd=2"
|
||||
<< "--command-fd=0"
|
||||
@@ -340,7 +340,7 @@ void Security::slotSignFile()
|
||||
|
||||
//verify the signature
|
||||
m_process = new KProcess();
|
||||
- *m_process << "gpg"
|
||||
+ *m_process << "gpg2"
|
||||
<< "--no-secmem-warning"
|
||||
<< "--status-fd=2"
|
||||
<< "--command-fd=0"
|
||||
|
|
@ -0,0 +1,19 @@
|
|||
--- branches/KDE/4.5/kdelibs/plasma/tooltipmanager.cpp 2010/09/28 01:19:58 1180436
|
||||
+++ branches/KDE/4.5/kdelibs/plasma/tooltipmanager.cpp 2010/10/08 11:35:52 1183776
|
||||
@@ -236,10 +236,12 @@
|
||||
}
|
||||
}
|
||||
|
||||
- d->tipWidget->setContent(widget, data);
|
||||
- d->tipWidget->prepareShowing();
|
||||
- if (m_corona) {
|
||||
- d->tipWidget->moveTo(m_corona->popupPosition(widget, d->tipWidget->size(), Qt::AlignCenter));
|
||||
+ if (d->tipWidget) {
|
||||
+ d->tipWidget->setContent(widget, data);
|
||||
+ d->tipWidget->prepareShowing();
|
||||
+ if (m_corona) {
|
||||
+ d->tipWidget->moveTo(m_corona->popupPosition(widget, d->tipWidget->size(), Qt::AlignCenter));
|
||||
+ }
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -0,0 +1,14 @@
|
|||
--- branches/KDE/4.5/kdelibs/kio/kio/krun.cpp 2010/10/15 15:53:49 1186277
|
||||
+++ branches/KDE/4.5/kdelibs/kio/kio/krun.cpp 2010/10/15 16:00:27 1186278
|
||||
@@ -368,9 +368,9 @@
|
||||
}
|
||||
else {
|
||||
if (supportedProtocols.isEmpty()) {
|
||||
- // compat mode: assume KIO if not set and it's a KDE app
|
||||
+ // compat mode: assume KIO if not set and it's a KDE app (or a KDE service)
|
||||
const QStringList categories = _service.property("Categories").toStringList();
|
||||
- if (categories.contains("KDE")) {
|
||||
+ if (categories.contains("KDE") || !_service.isApplication()) {
|
||||
supportedProtocols.append("KIO");
|
||||
}
|
||||
else { // if no KDE app, be a bit over-generic
|
||||
|
|
@ -0,0 +1,10 @@
|
|||
--- kdelibs-4.5.2/kio/kio/krun.cpp.orig 2010/09/07 20:07:19 1172681
|
||||
+++ kdelibs-4.5.2/kio/kio/krun.cpp 2010/10/06 22:33:23 1183317
|
||||
@@ -375,6 +375,7 @@
|
||||
}
|
||||
else { // if no KDE app, be a bit over-generic
|
||||
supportedProtocols.append("http");
|
||||
+ supportedProtocols.append("https"); // #253294
|
||||
supportedProtocols.append("ftp");
|
||||
}
|
||||
}
|
||||
|
|
@ -0,0 +1,36 @@
|
|||
--- trunk/KDE/kdelibs/plasma/containment.cpp 2010/10/14 15:42:21 1185911
|
||||
+++ trunk/KDE/kdelibs/plasma/containment.cpp 2010/10/14 15:46:05 1185912
|
||||
@@ -2079,6 +2079,17 @@
|
||||
Applet::showConfigurationInterface();
|
||||
}
|
||||
|
||||
+void Containment::configChanged()
|
||||
+{
|
||||
+ if (d->drawWallpaper) {
|
||||
+ KConfigGroup group = config();
|
||||
+ setWallpaper(group.readEntry("wallpaperplugin", defaultWallpaper),
|
||||
+ group.readEntry("wallpaperpluginmode", defaultWallpaperMode));
|
||||
+ }
|
||||
+
|
||||
+ Applet::configChanged();
|
||||
+}
|
||||
+
|
||||
void ContainmentPrivate::requestConfiguration()
|
||||
{
|
||||
emit q->configureRequested(q);
|
||||
--- trunk/KDE/kdelibs/plasma/containment.h 2010/10/14 15:42:21 1185911
|
||||
+++ trunk/KDE/kdelibs/plasma/containment.h 2010/10/14 15:46:05 1185912
|
||||
@@ -527,6 +527,13 @@
|
||||
*/
|
||||
void showConfigurationInterface();
|
||||
|
||||
+ /**
|
||||
+ * Called when applet configuration values have changed.
|
||||
+ * @reimp
|
||||
+ * @sa Applet::configChanged()
|
||||
+ */
|
||||
+ void configChanged();
|
||||
+
|
||||
protected:
|
||||
/**
|
||||
* Sets the type of this containment.
|
||||
295
kdelibs.spec
295
kdelibs.spec
|
|
@ -1,14 +1,18 @@
|
|||
|
||||
%define attica_ver 0.1.3
|
||||
%define phonon_ver 4.4.0
|
||||
%define soprano_ver 2.4.0
|
||||
%define attica_ver 0.1.4
|
||||
%define dbusmenu_qt_ver 0.5.2
|
||||
%define phonon_ver 4.4.2
|
||||
%define qt4_ver 4.6.2
|
||||
%define soprano_ver 2.5.0
|
||||
%define strigi_ver 0.7.2
|
||||
# to build/include apidocs or not
|
||||
%define apidocs 1
|
||||
# to build/include QCH apidocs or not (currently broken)
|
||||
#define apidocs_qch 1
|
||||
|
||||
Summary: KDE Libraries
|
||||
Version: 4.4.5
|
||||
Release: 2%{?dist}
|
||||
Version: 4.5.2
|
||||
Release: 7%{?dist}
|
||||
|
||||
Name: kdelibs
|
||||
Epoch: 6
|
||||
|
|
@ -25,10 +29,11 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
|
|||
|
||||
BuildRequires: kde4-macros(api) >= 2
|
||||
BuildRequires: kde-filesystem >= 4-23
|
||||
%if 0%{?fedora} && 0%{?fedora} < 12
|
||||
# used in kde.(sh|csh)
|
||||
Requires: coreutils grep
|
||||
%endif
|
||||
BuildRequires: docbook-dtds docbook-style-xsl
|
||||
Requires: ca-certificates
|
||||
%global dbusmenu_qt_version %(pkg-config --modversion dbusmenu-qt 2>/dev/null || echo %{dbusmenu_qt_ver})
|
||||
Requires: dbusmenu-qt%{?_isa} >= %{dbusmenu_qt_version}
|
||||
Requires: docbook-dtds docbook-style-xsl
|
||||
Requires: hicolor-icon-theme
|
||||
Requires: kde-filesystem >= 4-23
|
||||
Requires: kde-settings
|
||||
|
|
@ -49,14 +54,9 @@ Requires: soprano%{?_isa} >= %{soprano_version}
|
|||
Requires: strigi-libs%{?_isa} >= %{strigi_version}
|
||||
|
||||
# make -devel packages parallel-installable
|
||||
Patch0: kdelibs-4.3.85-parallel_devel.patch
|
||||
Patch0: kdelibs-4.4.85-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
|
||||
|
|
@ -66,11 +66,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
|
||||
|
|
@ -81,13 +81,23 @@ 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
|
||||
## upstreamable
|
||||
# add gpg2 support to knewstuff, rough first try s/gpg/gpg2/
|
||||
# reverting to our past gnupg2-only setup.
|
||||
# TODO: try to use either gpg or gpg2, whichever is available
|
||||
Patch50: kdelibs-4.5.1-knewstuff_gpg2.patch
|
||||
|
||||
## 4.4 upstream
|
||||
## 4.5 upstream
|
||||
Patch100: kdelibs-4.5.2-comic_applet_kde253387.patch
|
||||
# http://websvn.kde.org/?view=revision&revision=1186278
|
||||
Patch101: kdelibs-4.5.2-kio_krun_services.patch
|
||||
|
||||
## trunk upstream
|
||||
Patch150: kdelibs-4.5.2-krun-kde#253294.patch
|
||||
# http://websvn.kde.org/?view=revision&revision=1185912
|
||||
Patch151: kdelibs-4.5.2-plasma_wallpaper_configchanged.patch
|
||||
|
||||
## security fix
|
||||
# Not Upstreamed? why not ? -- Rex
|
||||
|
|
@ -97,7 +107,7 @@ Patch200: kdelibs-4.3.1-CVE-2009-2702.patch
|
|||
Conflicts: kdebase-workspace-libs < 4.3.80
|
||||
%endif
|
||||
|
||||
BuildRequires: qt4-devel >= 4.6.0
|
||||
BuildRequires: qt4-devel >= %{qt4_ver}
|
||||
BuildRequires: qt4-webkit-devel
|
||||
%{?_qt4_version:Requires: qt4%{?_isa} >= %{_qt4_version}}
|
||||
Requires: xdg-utils
|
||||
|
|
@ -136,11 +146,13 @@ BuildRequires: soprano-devel >= %{soprano_ver}
|
|||
BuildRequires: strigi-devel >= %{strigi_ver}
|
||||
BuildRequires: xz-devel
|
||||
BuildRequires: zlib-devel
|
||||
BuildRequires: dbusmenu-qt-devel
|
||||
# extra X deps (seemingly needed and/or checked-for by most kde4 buildscripts)
|
||||
%define x_deps libSM-devel libXcomposite-devel libXdamage-devel libxkbfile-devel libXpm-devel libXScrnSaver-devel libXtst-devel libXv-devel libXxf86misc-devel
|
||||
%{?x_deps:BuildRequires: %{x_deps}}
|
||||
|
||||
%if 0%{?apidocs}
|
||||
BuildRequires: docbook-dtds
|
||||
BuildRequires: doxygen
|
||||
BuildRequires: graphviz
|
||||
BuildRequires: qt4-doc
|
||||
|
|
@ -169,9 +181,6 @@ This package includes the common files for the KDE 3 and KDE 4 libraries.
|
|||
Group: Development/Libraries
|
||||
Summary: Header files for compiling KDE 4 applications
|
||||
# stuff moved, help upgrade path
|
||||
%if 0%{?fedora} && 0%{?fedora} < 12
|
||||
Conflicts: kdebase-runtime < 4.2.90
|
||||
%endif
|
||||
%if 0%{?fedora} && 0%{?fedora} < 13
|
||||
Conflicts: kdebase-workspace-devel < 4.3.80
|
||||
Obsoletes: kdelibs-experimental-devel < 4.3.75
|
||||
|
|
@ -217,16 +226,31 @@ BuildArch: noarch
|
|||
This package includes the KDE 4 API documentation in HTML
|
||||
format for easy browsing.
|
||||
|
||||
%package apidocs-qch
|
||||
Group: Development/Documentation
|
||||
Summary: KDE 4 API documentation for Qt Assistant
|
||||
# Not strictly required -- Rex
|
||||
# Requires: %{name} = %{?epoch:%{epoch}:}%{version}
|
||||
# Directory ownership (%{_qt4_docdir}/qch)
|
||||
Requires: qt4
|
||||
Provides: kdelibs4-apidocs-qch = %{version}-%{release}
|
||||
BuildArch: noarch
|
||||
|
||||
%description apidocs-qch
|
||||
This package includes the KDE 4 API documentation in Qt Assistant QCH
|
||||
format for use with the Qt 4 Assistant or KDevelop 4.
|
||||
|
||||
|
||||
%prep
|
||||
%setup -q -n kdelibs-%{version}%{?alphatag}
|
||||
|
||||
%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
|
||||
# add release version as part of branding (suggested by cailon)
|
||||
sed -i -e "s|@@VERSION_RELEASE@@|%{version}-%{release}|" kio/kio/kprotocolmanager.cpp
|
||||
%patch11 -p1 -b .policykit-workaround
|
||||
%patch12 -p1 -b .Administration-menu
|
||||
%patch14 -p1 -b .libexecdir
|
||||
%patch18 -p1 -b .kstandarddirs
|
||||
|
|
@ -237,8 +261,13 @@ format for easy browsing.
|
|||
%patch27 -p1 -b .no_rpath
|
||||
|
||||
# upstreamable patches
|
||||
%patch50 -p1 -b .knewstuff_gpg2
|
||||
|
||||
# upstream patches
|
||||
%patch100 -p4 -b .comic_applet_kde253387
|
||||
%patch101 -p4 -b .kio_krun_services
|
||||
%patch150 -p1 -b .kde#253294
|
||||
%patch151 -p3 -b .plasma_wallpaper_configchanged
|
||||
|
||||
# security fix
|
||||
%patch200 -p1 -b .CVE-2009-2702
|
||||
|
|
@ -246,9 +275,6 @@ format for easy browsing.
|
|||
|
||||
%build
|
||||
|
||||
# add release version
|
||||
sed -i -e "s|@@VERSION_RELEASE@@|%{version}-%{release}|" kio/kio/kprotocolmanager.cpp
|
||||
|
||||
mkdir -p %{_target_platform}
|
||||
pushd %{_target_platform}
|
||||
%{cmake_kde4} -DKDE_DISTRIBUTION_TEXT="%{version}-%{release} Fedora" ..
|
||||
|
|
@ -258,9 +284,15 @@ make %{?_smp_mflags} -C %{_target_platform}
|
|||
|
||||
# build apidocs
|
||||
%if 0%{?apidocs}
|
||||
export QTDOCDIR=`pkg-config --variable=docdir Qt`
|
||||
export QTDOCDIR="%{?_qt4_docdir}%{?!_qt4_docdir:%(pkg-config --variable=docdir Qt)}"
|
||||
%if 0%{?apidocs_qch}
|
||||
export PROJECT_NAME="%{name}"
|
||||
export PROJECT_VERSION="%{version}%{?alphatag}"
|
||||
doc/api/doxygen.sh --qhppages .
|
||||
%else
|
||||
doc/api/doxygen.sh .
|
||||
%endif
|
||||
%endif
|
||||
|
||||
|
||||
%install
|
||||
|
|
@ -272,8 +304,18 @@ make install/fast DESTDIR=%{buildroot} -C %{_target_platform}
|
|||
mv %{buildroot}%{_kde4_sysconfdir}/xdg/menus/applications.menu \
|
||||
%{buildroot}%{_kde4_sysconfdir}/xdg/menus/kde4-applications.menu
|
||||
|
||||
# create/own, see http://bugzilla.redhat.com/483318
|
||||
# create/own stuff
|
||||
# see http://bugzilla.redhat.com/483318
|
||||
mkdir -p %{buildroot}%{_kde4_libdir}/kconf_update_bin
|
||||
mkdir -p %{buildroot}%{_kde4_libdir}/plugins/{gui_platform,styles}
|
||||
|
||||
## use ca-certificates' ca-bundle.crt, symlink as what most other
|
||||
## distros do these days (http://bugzilla.redhat.com/521902)
|
||||
if [ -f %{buildroot}%{_kde4_appsdir}/kssl/ca-bundle.crt -a \
|
||||
-f /etc/pki/tls/certs/ca-bundle.crt ]; then
|
||||
ln -sf /etc/pki/tls/certs/ca-bundle.crt \
|
||||
%{buildroot}%{_kde4_appsdir}/kssl/ca-bundle.crt
|
||||
fi
|
||||
|
||||
# move devel symlinks
|
||||
mkdir -p %{buildroot}%{_kde4_libdir}/kde4/devel
|
||||
|
|
@ -303,7 +345,20 @@ install -p -D doc/api/doxygen.sh %{buildroot}%{_kde4_bindir}/kde4-doxygen.sh
|
|||
|
||||
%if 0%{?apidocs}
|
||||
mkdir -p %{buildroot}%{_kde4_docdir}/HTML/en
|
||||
cp -prf kdelibs-%{version}%{?alphatag}-apidocs %{buildroot}%{_kde4_docdir}/HTML/en/kdelibs4-apidocs
|
||||
cp -a kdelibs-%{version}%{?alphatag}-apidocs %{buildroot}%{_kde4_docdir}/HTML/en/kdelibs4-apidocs
|
||||
find %{buildroot}%{_kde4_docdir}/HTML/en/ -name 'installdox' -exec rm -fv {} ';'
|
||||
rm -vf %{buildroot}%{_kde4_docdir}/HTML/en/kdelibs4-apidocs/*.tmp \
|
||||
%{buildroot}%{_kde4_docdir}/HTML/en/kdelibs4-apidocs/index.qhp \
|
||||
%{buildroot}%{_kde4_docdir}/HTML/en/kdelibs4-apidocs/*/html/index.qhp
|
||||
|
||||
%if 0%{?apidocs_qch}
|
||||
mkdir -p %{buildroot}%{_qt4_docdir}/qch
|
||||
for i in %{buildroot}%{_kde4_docdir}/HTML/en/kdelibs4-apidocs/*/qch
|
||||
do
|
||||
mv -f "$i"/* %{buildroot}%{_qt4_docdir}/qch/
|
||||
rmdir "$i"
|
||||
done
|
||||
%endif
|
||||
%endif
|
||||
|
||||
|
||||
|
|
@ -334,18 +389,47 @@ rm -rf %{buildroot}
|
|||
%defattr(-,root,root,-)
|
||||
%doc AUTHORS README TODO
|
||||
%doc COPYING.LIB
|
||||
%{_kde4_bindir}/*
|
||||
%exclude %{_kde4_bindir}/kconfig_compiler4
|
||||
%{_kde4_appsdir}/*
|
||||
# kdewidgets
|
||||
%exclude %{_kde4_bindir}/makekdewidgets4
|
||||
%exclude %{_kde4_bindir}/kde4-doxygen.sh
|
||||
%exclude %{_kde4_appsdir}/kdewidgets/
|
||||
%exclude %{_kde4_appsdir}/cmake/
|
||||
%{_kde4_configdir}/*
|
||||
%{_kde4_bindir}/checkXML
|
||||
%{_kde4_bindir}/kbuildsycoca4
|
||||
%{_kde4_bindir}/kcookiejar4
|
||||
%{_kde4_bindir}/kde4-config
|
||||
%{_kde4_bindir}/kded4
|
||||
%{_kde4_bindir}/kdeinit4
|
||||
%{_kde4_bindir}/kdeinit4_shutdown
|
||||
%{_kde4_bindir}/kdeinit4_wrapper
|
||||
%{_kde4_bindir}/kjs
|
||||
%{_kde4_bindir}/kjscmd
|
||||
%{_kde4_bindir}/kross
|
||||
%{_kde4_bindir}/kshell4
|
||||
%{_kde4_bindir}/kunittestmodrunner
|
||||
%{_kde4_bindir}/kwrapper4
|
||||
%{_kde4_bindir}/nepomuk-rcgen
|
||||
%{_kde4_bindir}/meinproc4
|
||||
%{_kde4_bindir}/meinproc4_simple
|
||||
%{_kde4_appsdir}/katepart/
|
||||
%{_kde4_appsdir}/kauth/
|
||||
%{_kde4_appsdir}/kcharselect/
|
||||
%{_kde4_appsdir}/kcm_componentchooser/
|
||||
%{_kde4_appsdir}/kconf_update/
|
||||
%{_kde4_appsdir}/khtml/
|
||||
%{_kde4_appsdir}/kjava/
|
||||
%{_kde4_appsdir}/knewstuff/
|
||||
%{_kde4_appsdir}/ksgmltools2/
|
||||
%{_kde4_appsdir}/kssl/
|
||||
%{_kde4_appsdir}/ktexteditor_exporter/
|
||||
%{_kde4_appsdir}/ktexteditor_iconinserter/
|
||||
%{_kde4_appsdir}/ktexteditor_insanehtml_le/
|
||||
%{_kde4_appsdir}/ktexteditor_insertfile/
|
||||
%{_kde4_appsdir}/ktexteditor_kdatatool/
|
||||
%{_kde4_appsdir}/LICENSES/
|
||||
%{_kde4_appsdir}/plasma/
|
||||
%{_kde4_appsdir}/proxyscout/
|
||||
%{_kde4_configdir}/accept-languages.codes
|
||||
%{_kde4_configdir}/katemoderc
|
||||
%{_kde4_configdir}/katepartpluginsrc
|
||||
%{_kde4_configdir}/khtmlrc
|
||||
%{_kde4_configdir}/plasmoids.knsrc
|
||||
%{_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_sharedir}/kde4/services/*
|
||||
|
|
@ -361,10 +445,8 @@ rm -rf %{buildroot}
|
|||
%{_kde4_libexecdir}/filesharelist
|
||||
%{_kde4_libexecdir}/fileshareset
|
||||
%{_kde4_libexecdir}/kauth-policy-gen
|
||||
%{_kde4_libexecdir}/kcmremotewidgetshelper
|
||||
%{_kde4_libexecdir}/kconf_update
|
||||
%{_kde4_libexecdir}/kdesu_stub
|
||||
%{_kde4_libexecdir}/kdontchangethehostname
|
||||
%{_kde4_libexecdir}/kio_http_cache_cleaner
|
||||
%{_kde4_libexecdir}/kioslave
|
||||
%{_kde4_libexecdir}/klauncher
|
||||
|
|
@ -390,31 +472,16 @@ rm -rf %{buildroot}
|
|||
%{_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}/kdebugrc
|
||||
%exclude %{_kde4_configdir}/ui/ui_standards.rc
|
||||
%exclude %{_kde4_appsdir}/kdeui
|
||||
%exclude %{_kde4_configdir}/colors/40.colors
|
||||
%exclude %{_kde4_configdir}/colors/Rainbow.colors
|
||||
%exclude %{_kde4_configdir}/colors/Royal.colors
|
||||
%exclude %{_kde4_configdir}/colors/Web.colors
|
||||
%exclude %{_kde4_configdir}/ksslcalist
|
||||
%exclude %{_kde4_bindir}/preparetips
|
||||
|
||||
%files common
|
||||
%defattr(-,root,root,-)
|
||||
%{_kde4_configdir}/colors/40.colors
|
||||
%{_kde4_configdir}/colors/Rainbow.colors
|
||||
%{_kde4_configdir}/colors/Royal.colors
|
||||
%{_kde4_configdir}/colors/Web.colors
|
||||
%{_kde4_configdir}/ksslcalist
|
||||
%{_kde4_bindir}/preparetips
|
||||
%{_kde4_configdir}/colors/
|
||||
%{_kde4_configdir}/ksslcalist
|
||||
%{_kde4_configdir}/kdebug.areas
|
||||
%{_kde4_configdir}/kdebugrc
|
||||
%dir %{_kde4_configdir}/ui
|
||||
%{_kde4_configdir}/ui/ui_standards.rc
|
||||
%{_kde4_appsdir}/kdeui
|
||||
%{_kde4_configdir}/ui/
|
||||
%{_kde4_appsdir}/kdeui/
|
||||
%{_kde4_docdir}/HTML/en/common/
|
||||
%{_kde4_datadir}/locale/all_languages/
|
||||
|
||||
|
|
@ -435,19 +502,107 @@ rm -rf %{buildroot}
|
|||
%files apidocs
|
||||
%defattr(-,root,root,-)
|
||||
%{_kde4_docdir}/HTML/en/kdelibs4-apidocs/
|
||||
|
||||
%if 0%{?apidocs_qch}
|
||||
%files apidocs-qch
|
||||
%defattr(-,root,root,-)
|
||||
%{_qt4_docdir}/qch/*.qch
|
||||
%endif
|
||||
%endif
|
||||
|
||||
|
||||
%changelog
|
||||
* Fri Jul 16 2010 Rex Dieter <rdieter@fedoraproject.org> - 6:4.4.5-2
|
||||
* Fri Oct 15 2010 Rex Dieter <rdieter@fedoraproject.org> - 4.5.2-7
|
||||
- backport configChanged() for wallpaper
|
||||
|
||||
* Fri Oct 15 2010 Rex Dieter <rdieter@fedoraproject.org> - 4.5.2-6
|
||||
- kio/krun patch so kde services can open urls directly too
|
||||
|
||||
* Fri Oct 08 2010 Rex Dieter <rdieter@fedoraproject.org> - 4.5.2-5
|
||||
- switching comic in comic applet crashes plasma (kde#253387,rh#640619)
|
||||
|
||||
* Thu Oct 07 2010 Than Ngo <than@redhat.com> - 4.5.2-4
|
||||
- kde253294, KMail and Kopete download and open https url instead of only opening
|
||||
|
||||
* Tue Oct 05 2010 Lukas Tinkl <ltinkl@redhat.com> - 4.5.2-3
|
||||
- tarball respin
|
||||
|
||||
* Fri Oct 01 2010 Rex Dieter <rdieter@fedoraproject.org> 4.5.2-2
|
||||
- rebuild (phonon)
|
||||
|
||||
* Fri Oct 01 2010 Rex Dieter <rdieter@fedoraproject.org> 4.5.2-1
|
||||
- 4.5.2
|
||||
|
||||
* Fri Sep 10 2010 Thomas Janssen <thomasj@fedoraproject.org> 4.5.1-4
|
||||
- backport patches to fix a crashing kdevelop (kde 4.5.1 only)
|
||||
|
||||
* Fri Aug 27 2010 Kevin Kofler <Kevin@tigcc.ticalc.org> - 4.5.1-3
|
||||
- make building -apidocs-qch optional and disable it by default until fixed
|
||||
|
||||
* Fri Aug 27 2010 Rex Dieter <rdieter@fedoraproject.org> - 4.5.1-2
|
||||
- -apidocs : exclude installdox
|
||||
|
||||
* Fri Aug 27 2010 Jaroslav Reznik <jreznik@redhat.com> - 4.5.1-1
|
||||
- 4.5.1
|
||||
- use gpg2 in knewstuff (kde#249152)
|
||||
|
||||
* Thu Aug 26 2010 Rex Dieter <rdieter@fedoraproject.org> - 4.5.0-6
|
||||
- use ca-certificates' ca-bundle.crt (#521902)
|
||||
|
||||
* Wed Aug 18 2010 Kevin Kofler <Kevin@tigcc.ticalc.org> - 4.5.0-5
|
||||
- fix packaging of QCH apidocs
|
||||
|
||||
* Wed Aug 18 2010 Kevin Kofler <Kevin@tigcc.ticalc.org> - 4.5.0-4
|
||||
- package QCH apidocs (-apidocs-qch noarch subpackage)
|
||||
|
||||
* Wed Aug 18 2010 Kevin Kofler <Kevin@tigcc.ticalc.org> - 4.5.0-3
|
||||
- generate QCH apidocs (try 1)
|
||||
|
||||
* Tue Aug 10 2010 Rex Dieter <rdieter@fedoraproject.org> - 4.5.0-2
|
||||
- (Build)Requires: qt4(-devel) >= 4.6.3
|
||||
- dbusmenu_qt_ver 0.5.2, soprano_ver 4.5.0
|
||||
|
||||
* Tue Aug 03 2010 Than Ngo <than@redhat.com> - 4.5.0-1
|
||||
- 4.5.0
|
||||
|
||||
* Sat Jul 25 2010 Rex Dieter <rdieter@fedoraproject.org> - 6:4.4.95-1
|
||||
- 4.5 RC3 (4.4.95)
|
||||
|
||||
* Wed Jul 21 2010 Than Ngo <than@redhat.com> - 6:4.4.92-4
|
||||
- (Build)Requires: qt4(-devel) >= 4.7.0
|
||||
- drop icon-name-qt47 patch
|
||||
|
||||
* Fri Jul 16 2010 Rex Dieter <rdieter@fedoraproject.org> - 6:4.4.92-3
|
||||
- Requires: oxygen-icon-theme (ensures default fallback is present)
|
||||
- up attica,phonon,strigi min deps
|
||||
|
||||
* Tue Jun 29 2010 Rex Dieter <rdieter@fedoraproject.org> - 6:4.4.5-1
|
||||
- 4.4.5
|
||||
* Wed Jul 07 2010 Rex Dieter <rdieter@fedoraproject.org> - 6:4.4.92-2
|
||||
- tarball respin
|
||||
|
||||
* Sun May 30 2010 Than Ngo <than@redhat.com> - 6:4.4.4-1
|
||||
- 4.4.4
|
||||
* Wed Jul 07 2010 Rex Dieter <rdieter@fedoraproject.org> - 6:4.4.92-1
|
||||
- 4.5 RC2 (4.4.92)
|
||||
|
||||
* Fri Jun 25 2010 Jaroslav Reznik <jreznik@redhat.com> - 6:4.4.90-1
|
||||
- 4.5 RC1 (4.4.90)
|
||||
|
||||
* Thu Jun 17 2010 Rex Dieter <rdieter@fedoraproject.org> - 6:4.4.85-3
|
||||
- Plasma crash on startup (kde#241298)
|
||||
|
||||
* Tue Jun 08 2010 Jaroslav Reznik <jreznik@redhat.com> - 6:4.4.85-2
|
||||
- (Build)Requires: docbook-dtds, docbook-style-xsl
|
||||
- drop fedora < 12 conditionals
|
||||
|
||||
* Mon Jun 07 2010 Jaroslav Reznik <jreznik@redhat.com> - 6:4.4.85-1
|
||||
- 4.5 Beta 2 (4.4.85)
|
||||
|
||||
* Tue May 25 2010 Rex Dieter <rdieter@fedoraproject.org> - 6:4.4.80-3
|
||||
- Blur shadow around widgets does not smoothly fade out (kde#235620)
|
||||
|
||||
* Sun May 23 2010 Rex Dieter <rdieter@fedoraproject.org> - 6:4.4.80-2
|
||||
- own %%{_kde4_libdir}/plugins/{gui_platform,styles}
|
||||
|
||||
* Fri May 21 2010 Jaroslav Reznik <jreznik@redhat.com> - 6:4.4.80-1
|
||||
- 4.5 Beta 1 (4.4.80)
|
||||
- BuildRequires: dbusmenu-qt-devel
|
||||
|
||||
* 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