From ccfd73b007c05e9d5dcfeb25db01a134385fcd4a Mon Sep 17 00:00:00 2001 From: Jaroslav Reznik Date: Fri, 8 Jul 2011 13:57:01 +0200 Subject: [PATCH] 4.6.95 (rc2) --- .gitignore | 6 +- kdelibs-4.6.90-kdoctools_docbook.patch | 395 ------------------------- kdelibs.spec | 10 +- sources | 4 +- 4 files changed, 9 insertions(+), 406 deletions(-) delete mode 100644 kdelibs-4.6.90-kdoctools_docbook.patch diff --git a/.gitignore b/.gitignore index ec2b58b..9099e5e 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,2 @@ -/kdelibs-4.6.80.tar.bz2 -/kate-4.6.80.tar.bz2 -/kate-4.6.90.tar.bz2 -/kdelibs-4.6.90.tar.bz2 +/kdelibs-4.6.95.tar.bz2 +/kate-4.6.95.tar.bz2 diff --git a/kdelibs-4.6.90-kdoctools_docbook.patch b/kdelibs-4.6.90-kdoctools_docbook.patch deleted file mode 100644 index 7db32ca..0000000 --- a/kdelibs-4.6.90-kdoctools_docbook.patch +++ /dev/null @@ -1,395 +0,0 @@ -diff -up kdelibs-4.6.90/kdoctools/CMakeLists.txt.kdoctools_docbook kdelibs-4.6.90/kdoctools/CMakeLists.txt ---- kdelibs-4.6.90/kdoctools/CMakeLists.txt.kdoctools_docbook 2011-06-23 09:49:06.000000000 -0500 -+++ kdelibs-4.6.90/kdoctools/CMakeLists.txt 2011-06-29 13:15:19.930441407 -0500 -@@ -219,9 +219,7 @@ add_custom_command( TARGET docbookl10nhe - ${DOCBOOKXSL_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/customization/xsl - ${CMAKE_CURRENT_BINARY_DIR}/customization/xsl - ) --# all-l10n.xml and kde-custom-l10n.xml are generated by docbookl10nhelper -+# all-l10n.xml is generated by docbookl10nhelper - install(FILES ${CMAKE_CURRENT_BINARY_DIR}/customization/xsl/all-l10n.xml - DESTINATION ${DATA_INSTALL_DIR}/ksgmltools2/customization/xsl/ ) --install(FILES ${CMAKE_CURRENT_BINARY_DIR}/customization/xsl/kde-custom-l10n.xml -- DESTINATION ${DATA_INSTALL_DIR}/ksgmltools2/customization/xsl/ ) - -diff -up kdelibs-4.6.90/kdoctools/customization/kde-include-common.xsl.cmake.kdoctools_docbook kdelibs-4.6.90/kdoctools/customization/kde-include-common.xsl.cmake ---- kdelibs-4.6.90/kdoctools/customization/kde-include-common.xsl.cmake.kdoctools_docbook 2011-05-20 15:24:54.000000000 -0500 -+++ kdelibs-4.6.90/kdoctools/customization/kde-include-common.xsl.cmake 2011-06-29 13:15:19.931441447 -0500 -@@ -5,6 +5,5 @@ - - - -- -- -+ - -diff -up kdelibs-4.6.90/kdoctools/customization/kde-include-man.xsl.cmake.kdoctools_docbook kdelibs-4.6.90/kdoctools/customization/kde-include-man.xsl.cmake ---- kdelibs-4.6.90/kdoctools/customization/kde-include-man.xsl.cmake.kdoctools_docbook 2011-05-20 15:24:54.000000000 -0500 -+++ kdelibs-4.6.90/kdoctools/customization/kde-include-man.xsl.cmake 2011-06-29 13:15:19.931441447 -0500 -@@ -7,6 +7,5 @@ - - - -- - - -diff -up kdelibs-4.6.90/kdoctools/customization/xsl/ca.xml.kdoctools_docbook kdelibs-4.6.90/kdoctools/customization/xsl/ca.xml ---- kdelibs-4.6.90/kdoctools/customization/xsl/ca.xml.kdoctools_docbook 2011-05-20 15:24:54.000000000 -0500 -+++ kdelibs-4.6.90/kdoctools/customization/xsl/ca.xml 2011-06-29 13:15:19.931441447 -0500 -@@ -1,6 +1,7 @@ -- -- -+ -+ - - - - -+ -diff -up kdelibs-4.6.90/kdoctools/customization/xsl/de.xml.kdoctools_docbook kdelibs-4.6.90/kdoctools/customization/xsl/de.xml ---- kdelibs-4.6.90/kdoctools/customization/xsl/de.xml.kdoctools_docbook 2011-05-20 15:24:54.000000000 -0500 -+++ kdelibs-4.6.90/kdoctools/customization/xsl/de.xml 2011-06-29 13:15:19.931441447 -0500 -@@ -1,6 +1,7 @@ -- -- -+ -+ - - - - -+ -diff -up kdelibs-4.6.90/kdoctools/customization/xsl/el.xml.kdoctools_docbook kdelibs-4.6.90/kdoctools/customization/xsl/el.xml ---- kdelibs-4.6.90/kdoctools/customization/xsl/el.xml.kdoctools_docbook 2011-05-20 15:24:54.000000000 -0500 -+++ kdelibs-4.6.90/kdoctools/customization/xsl/el.xml 2011-06-29 13:15:19.931441447 -0500 -@@ -1,5 +1,5 @@ -- -- -+ -+ - - - -@@ -55,3 +55,4 @@ - - - -+ -diff -up kdelibs-4.6.90/kdoctools/customization/xsl/en.xml.kdoctools_docbook kdelibs-4.6.90/kdoctools/customization/xsl/en.xml ---- kdelibs-4.6.90/kdoctools/customization/xsl/en.xml.kdoctools_docbook 2011-05-20 15:24:54.000000000 -0500 -+++ kdelibs-4.6.90/kdoctools/customization/xsl/en.xml 2011-06-29 13:15:19.932441487 -0500 -@@ -1,5 +1,5 @@ -- -- -+ -+ - - - -@@ -7,3 +7,4 @@ - - - -+ -diff -up kdelibs-4.6.90/kdoctools/customization/xsl/es.xml.kdoctools_docbook kdelibs-4.6.90/kdoctools/customization/xsl/es.xml ---- kdelibs-4.6.90/kdoctools/customization/xsl/es.xml.kdoctools_docbook 2011-05-20 15:24:54.000000000 -0500 -+++ kdelibs-4.6.90/kdoctools/customization/xsl/es.xml 2011-06-29 13:15:19.932441487 -0500 -@@ -1,6 +1,7 @@ -- -- -+ -+ - - - - -+ -diff -up kdelibs-4.6.90/kdoctools/customization/xsl/et.xml.kdoctools_docbook kdelibs-4.6.90/kdoctools/customization/xsl/et.xml ---- kdelibs-4.6.90/kdoctools/customization/xsl/et.xml.kdoctools_docbook 2011-05-20 15:24:54.000000000 -0500 -+++ kdelibs-4.6.90/kdoctools/customization/xsl/et.xml 2011-06-29 13:15:19.932441487 -0500 -@@ -1,5 +1,5 @@ -- -- -+ -+ - - - -@@ -9,3 +9,4 @@ - - - -+ -diff -up kdelibs-4.6.90/kdoctools/customization/xsl/fr.xml.kdoctools_docbook kdelibs-4.6.90/kdoctools/customization/xsl/fr.xml ---- kdelibs-4.6.90/kdoctools/customization/xsl/fr.xml.kdoctools_docbook 2011-05-20 15:24:54.000000000 -0500 -+++ kdelibs-4.6.90/kdoctools/customization/xsl/fr.xml 2011-06-29 13:15:19.932441487 -0500 -@@ -1,6 +1,7 @@ -- -- -+ -+ - - - - -+ -diff -up kdelibs-4.6.90/kdoctools/customization/xsl/gl.xml.kdoctools_docbook kdelibs-4.6.90/kdoctools/customization/xsl/gl.xml ---- kdelibs-4.6.90/kdoctools/customization/xsl/gl.xml.kdoctools_docbook 2011-05-20 15:24:54.000000000 -0500 -+++ kdelibs-4.6.90/kdoctools/customization/xsl/gl.xml 2011-06-29 13:15:19.932441487 -0500 -@@ -1,6 +1,7 @@ -- -- -+ -+ - - - - -+ -diff -up kdelibs-4.6.90/kdoctools/customization/xsl/it.xml.kdoctools_docbook kdelibs-4.6.90/kdoctools/customization/xsl/it.xml ---- kdelibs-4.6.90/kdoctools/customization/xsl/it.xml.kdoctools_docbook 2011-05-20 15:24:54.000000000 -0500 -+++ kdelibs-4.6.90/kdoctools/customization/xsl/it.xml 2011-06-29 13:15:19.933441526 -0500 -@@ -1,5 +1,5 @@ -- -- -+ -+ - - - -@@ -46,3 +46,4 @@ - - - -+ -diff -up kdelibs-4.6.90/kdoctools/customization/xsl/lt.xml.kdoctools_docbook kdelibs-4.6.90/kdoctools/customization/xsl/lt.xml ---- kdelibs-4.6.90/kdoctools/customization/xsl/lt.xml.kdoctools_docbook 2011-05-20 15:24:54.000000000 -0500 -+++ kdelibs-4.6.90/kdoctools/customization/xsl/lt.xml 2011-06-29 13:15:19.933441526 -0500 -@@ -1,6 +1,7 @@ -- -- -+ -+ - - - - -+ -diff -up kdelibs-4.6.90/kdoctools/customization/xsl/nl.xml.kdoctools_docbook kdelibs-4.6.90/kdoctools/customization/xsl/nl.xml ---- kdelibs-4.6.90/kdoctools/customization/xsl/nl.xml.kdoctools_docbook 2011-05-20 15:24:54.000000000 -0500 -+++ kdelibs-4.6.90/kdoctools/customization/xsl/nl.xml 2011-06-29 13:16:00.768061292 -0500 -@@ -1,5 +1,5 @@ -- -- -+ -+ - - - -diff -up kdelibs-4.6.90/kdoctools/customization/xsl/nn.xml.kdoctools_docbook kdelibs-4.6.90/kdoctools/customization/xsl/nn.xml ---- kdelibs-4.6.90/kdoctools/customization/xsl/nn.xml.kdoctools_docbook 2011-05-20 15:24:54.000000000 -0500 -+++ kdelibs-4.6.90/kdoctools/customization/xsl/nn.xml 2011-06-29 13:15:19.933441526 -0500 -@@ -1,5 +1,5 @@ -- -- -+ -+ - - - -@@ -200,3 +200,4 @@ - - - -+ -diff -up kdelibs-4.6.90/kdoctools/customization/xsl/pl.xml.kdoctools_docbook kdelibs-4.6.90/kdoctools/customization/xsl/pl.xml ---- kdelibs-4.6.90/kdoctools/customization/xsl/pl.xml.kdoctools_docbook 2011-05-20 15:24:54.000000000 -0500 -+++ kdelibs-4.6.90/kdoctools/customization/xsl/pl.xml 2011-06-29 13:15:19.934441566 -0500 -@@ -1,6 +1,7 @@ -- -- -+ -+ - - - - -+ -diff -up kdelibs-4.6.90/kdoctools/customization/xsl/pt_br.xml.kdoctools_docbook kdelibs-4.6.90/kdoctools/customization/xsl/pt_br.xml ---- kdelibs-4.6.90/kdoctools/customization/xsl/pt_br.xml.kdoctools_docbook 2011-05-20 15:24:54.000000000 -0500 -+++ kdelibs-4.6.90/kdoctools/customization/xsl/pt_br.xml 2011-06-29 13:15:19.934441566 -0500 -@@ -1,6 +1,7 @@ -- -- -+ -+ - - - - -+ -diff -up kdelibs-4.6.90/kdoctools/customization/xsl/pt.xml.kdoctools_docbook kdelibs-4.6.90/kdoctools/customization/xsl/pt.xml ---- kdelibs-4.6.90/kdoctools/customization/xsl/pt.xml.kdoctools_docbook 2011-05-20 15:24:54.000000000 -0500 -+++ kdelibs-4.6.90/kdoctools/customization/xsl/pt.xml 2011-06-29 13:15:19.934441566 -0500 -@@ -1,6 +1,7 @@ -- -- -+ -+ - - - - -+ -diff -up kdelibs-4.6.90/kdoctools/customization/xsl/ru.xml.kdoctools_docbook kdelibs-4.6.90/kdoctools/customization/xsl/ru.xml ---- kdelibs-4.6.90/kdoctools/customization/xsl/ru.xml.kdoctools_docbook 2011-05-20 15:24:54.000000000 -0500 -+++ kdelibs-4.6.90/kdoctools/customization/xsl/ru.xml 2011-06-29 13:15:19.934441566 -0500 -@@ -1,6 +1,7 @@ -- -- -+ -+ - - - - -+ -diff -up kdelibs-4.6.90/kdoctools/customization/xsl/sl.xml.kdoctools_docbook kdelibs-4.6.90/kdoctools/customization/xsl/sl.xml ---- kdelibs-4.6.90/kdoctools/customization/xsl/sl.xml.kdoctools_docbook 2011-05-20 15:24:54.000000000 -0500 -+++ kdelibs-4.6.90/kdoctools/customization/xsl/sl.xml 2011-06-29 13:15:19.934441566 -0500 -@@ -1,5 +1,5 @@ -- -- -+ -+ - - - -@@ -119,3 +119,4 @@ - - - -+ -diff -up kdelibs-4.6.90/kdoctools/customization/xsl/sr.xml.kdoctools_docbook kdelibs-4.6.90/kdoctools/customization/xsl/sr.xml ---- kdelibs-4.6.90/kdoctools/customization/xsl/sr.xml.kdoctools_docbook 2011-05-20 15:24:54.000000000 -0500 -+++ kdelibs-4.6.90/kdoctools/customization/xsl/sr.xml 2011-06-29 13:15:19.935441606 -0500 -@@ -1,6 +1,5 @@ -- -- -+ - - -@@ -692,3 +691,4 @@ - z - - -+ -diff -up kdelibs-4.6.90/kdoctools/customization/xsl/sv.xml.kdoctools_docbook kdelibs-4.6.90/kdoctools/customization/xsl/sv.xml ---- kdelibs-4.6.90/kdoctools/customization/xsl/sv.xml.kdoctools_docbook 2011-05-20 15:24:54.000000000 -0500 -+++ kdelibs-4.6.90/kdoctools/customization/xsl/sv.xml 2011-06-29 13:15:19.935441606 -0500 -@@ -1,6 +1,7 @@ -- -- -+ -+ - - - - -+ -diff -up kdelibs-4.6.90/kdoctools/customization/xsl/tr.xml.kdoctools_docbook kdelibs-4.6.90/kdoctools/customization/xsl/tr.xml ---- kdelibs-4.6.90/kdoctools/customization/xsl/tr.xml.kdoctools_docbook 2011-05-20 15:24:54.000000000 -0500 -+++ kdelibs-4.6.90/kdoctools/customization/xsl/tr.xml 2011-06-29 13:15:19.935441606 -0500 -@@ -1,6 +1,7 @@ -- -- -+ -+ - - - - -+ -diff -up kdelibs-4.6.90/kdoctools/customization/xsl/uk.xml.kdoctools_docbook kdelibs-4.6.90/kdoctools/customization/xsl/uk.xml ---- kdelibs-4.6.90/kdoctools/customization/xsl/uk.xml.kdoctools_docbook 2011-05-20 15:24:54.000000000 -0500 -+++ kdelibs-4.6.90/kdoctools/customization/xsl/uk.xml 2011-06-29 13:15:19.935441606 -0500 -@@ -1,5 +1,5 @@ -- -- -+ -+ - - - -@@ -33,3 +33,4 @@ - - - -+ -diff -up kdelibs-4.6.90/kdoctools/docbookl10nhelper.cpp.kdoctools_docbook kdelibs-4.6.90/kdoctools/docbookl10nhelper.cpp ---- kdelibs-4.6.90/kdoctools/docbookl10nhelper.cpp.kdoctools_docbook 2011-05-20 15:24:54.000000000 -0500 -+++ kdelibs-4.6.90/kdoctools/docbookl10nhelper.cpp 2011-06-29 13:15:19.936441645 -0500 -@@ -85,6 +85,39 @@ int writeLangFile( const QString &fname, - return( 0 ); - } - -+int writeLangFileNew( const QString &fname, const QString &dtdPath, -+ const LangListType &langMap ) { -+ -+ QFile outFile( fname ); -+ if ( ! outFile.open( QIODevice::WriteOnly ) ) { -+ qCritical() << QString( "Could not write %1" ) -+ .arg( outFile.fileName() ); -+ return( 1 ); -+ } -+ -+ QTextStream outStream( &outFile ); -+ outStream << "" << endl; -+ outStream << QString( "" ) -+ .arg( dtdPath ) << endl; -+ -+ if ( langMap.size() > 0 ) { -+ outStream -+ << "" -+ << endl; -+ LangListType::const_iterator i = langMap.constBegin(); -+ while ( i != langMap.constEnd() ) { -+ outStream << QString( "" ) -+ .arg( (*i).first ).arg( (*i).second ) << endl; -+ ++i; -+ } -+ outStream << "" << endl; -+ } -+ -+ outFile.close(); -+ -+ return( 0 ); -+} -+ - inline const QString addTrailingSlash( const QString &p ) { - return p.endsWith( "/" ) ? p : p + "/"; - } -@@ -199,11 +232,16 @@ int main( int argc, char **argv ) { - ++i; - } - -+ int res = 0; - -- int res = writeLangFile( all10nFName, l10nDir + "common/l10n.dtd", -- allLangs ); -- res += writeLangFile( customl10nFName, l10nDir + "common/l10n.dtd", -- customLangs ); -+ if ( foundRxEntity ) { -+ /* old style (docbook-xsl<=1.75) */ -+ res = writeLangFile( all10nFName, l10nDir + "common/l10n.dtd", -+ allLangs ); -+ } else { -+ res = writeLangFileNew( all10nFName, l10nDir + "common/l10n.dtd", -+ allLangs ); -+ } - - return( res ); - } diff --git a/kdelibs.spec b/kdelibs.spec index 0bd2eea..333fca1 100644 --- a/kdelibs.spec +++ b/kdelibs.spec @@ -12,8 +12,8 @@ #define apidocs_qch 1 Summary: KDE Libraries -Version: 4.6.90 -Release: 4%{?dist} +Version: 4.6.95 +Release: 1%{?dist} Name: kdelibs Epoch: 6 @@ -108,8 +108,6 @@ Patch51: kdelibs-4.6.2-uri_mimetypes.patch # https://projects.kde.org/projects/kde/kdelibs/repository/revisions/d44186bce4670d2985fb6aba8dba59bbd2c4c77a # fix KConfigXT KComboBox for Qt 4.8 TP1 Patch100: kdelibs-4.6.90-kconfigxt-qt48.patch -# fix docbook-style-xsl borkage -Patch101: kdelibs-4.6.90-kdoctools_docbook.patch ## security fix # Not Upstreamed? why not ? -- Rex @@ -304,7 +302,6 @@ sed -i -e "s|@@VERSION_RELEASE@@|%{version}-%{release}|" kio/kio/kprotocolmanage # upstream patches %patch100 -p1 -b .kconfigxt-qt48 -%patch101 -p1 -b .kdoctools_docbook # security fix %patch200 -p1 -b .CVE-2009-2702 @@ -559,6 +556,9 @@ rm -rf %{buildroot} %changelog +* Fri Jul 08 2011 Jaroslav Reznik 4.6.95-1 +- 4.6.95 (rc2) + * Thu Jun 30 2011 Rex Dieter 4.6.90-4 - drop unneeded kstatusnotify_dbus_leak.patch (upstream fixed better) diff --git a/sources b/sources index 32e426a..9264749 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -69e9043ef92e0206ce2c757909ec5c83 kate-4.6.90.tar.bz2 -6298ed492f98674fec1e3b31959c3d7a kdelibs-4.6.90.tar.bz2 +b5bfb4e550b410c8d552ff00fd28ef52 kdelibs-4.6.95.tar.bz2 +6e2c9738995fa1da32aa34c593998d97 kate-4.6.95.tar.bz2