packages: kde4-kdelibs/kde4-kdelibs-aboutPLD.patch, kde4-kdelibs/kde4-kdeli...

arekm arekm at pld-linux.org
Fri Jan 21 21:18:17 CET 2011 

Author: arekm                        Date: Fri Jan 21 20:18:17 2011 GMT
Module: packages                      Tag: HEAD
---- Log message:
- up to 4.6.0

---- Files affected:
packages/kde4-kdelibs:
   kde4-kdelibs-aboutPLD.patch (1.16 -> 1.17) , kde4-kdelibs-branding.patch (1.2 -> 1.3) , kde4-kdelibs-cacert.patch (1.2 -> 1.3) , kde4-kdelibs.spec (1.231 -> 1.232) 

---- Diffs:

================================================================
Index: packages/kde4-kdelibs/kde4-kdelibs-aboutPLD.patch
diff -u packages/kde4-kdelibs/kde4-kdelibs-aboutPLD.patch:1.16 packages/kde4-kdelibs/kde4-kdelibs-aboutPLD.patch:1.17
--- packages/kde4-kdelibs/kde4-kdelibs-aboutPLD.patch:1.16	Wed Jan  5 19:13:03 2011
+++ packages/kde4-kdelibs/kde4-kdelibs-aboutPLD.patch	Fri Jan 21 21:18:12 2011
@@ -4,7 +4,7 @@
 @@ -14,6 +14,7 @@
  set (KDE_VERSION_RELEASE 5)
  set (KDE_VERSION "${KDE_VERSION_MAJOR}.${KDE_VERSION_MINOR}.${KDE_VERSION_RELEASE}" )
- set (KDE_VERSION_STRING "${KDE_VERSION} (KDE 4.5.5)")
+ set (KDE_VERSION_STRING "${KDE_VERSION} (4.6.0)")
 +exec_program ("/bin/cat" ARGS "/etc/pld-release" OUTPUT_VARIABLE PLD_VERSION_STRING)
  
  set (KDE_DISTRIBUTION_TEXT "compiled sources" CACHE STRING "Indicate the distribution in bug reports" )

================================================================
Index: packages/kde4-kdelibs/kde4-kdelibs-branding.patch
diff -u packages/kde4-kdelibs/kde4-kdelibs-branding.patch:1.2 packages/kde4-kdelibs/kde4-kdelibs-branding.patch:1.3
--- packages/kde4-kdelibs/kde4-kdelibs-branding.patch:1.2	Tue May 11 16:00:47 2010
+++ packages/kde4-kdelibs/kde4-kdelibs-branding.patch	Fri Jan 21 21:18:12 2011
@@ -1,11 +1,11 @@
---- kio/kio/kprotocolmanager.cpp.orig	2008-08-20 21:54:05.000000000 +0200
-+++ kio/kio/kprotocolmanager.cpp	2009-02-22 21:46:14.736186150 +0100
-@@ -77,7 +77,7 @@
- 
- // DEFAULT USERAGENT STRING
- #define CFG_DEFAULT_UAGENT(X) \
--QString("Mozilla/5.0 (compatible; Konqueror/%1.%2%3) KHTML/%4.%5.%6 (like Gecko)") \
-+QString("Mozilla/5.0 (compatible; Konqueror/%1.%2%3) KHTML/%4.%5.%6 (like Gecko) PLDLINUX_VERSION") \
-         .arg(KDE_VERSION_MAJOR).arg(KDE_VERSION_MINOR).arg(X).arg(KDE_VERSION_MAJOR).arg(KDE_VERSION_MINOR).arg(KDE_VERSION_RELEASE)
+--- kio/kio/kprotocolmanager.cpp~	2011-01-19 23:09:45.000000000 +0100
++++ kio/kio/kprotocolmanager.cpp	2011-01-21 13:37:18.484340455 +0100
+@@ -87,7 +87,7 @@
+ QString::number(KDE::versionMajor()) % QL1C('.') % QString::number(KDE::versionMinor()) % \
+ X % QL1S(") KHTML/") % \
+ QString::number(KDE::versionMajor()) % QL1C('.') % QString::number(KDE::versionMinor()) % \
+-QL1C('.') % QString::number(KDE::versionRelease()) % QL1S(" (like Gecko)")
++QL1C('.') % QString::number(KDE::versionRelease()) % QL1S(" (like Gecko) PLDLINUX_VERSION")
  
  #define PRIVATE_DATA \
+ KProtocolManagerPrivate *d = kProtocolManagerPrivate

================================================================
Index: packages/kde4-kdelibs/kde4-kdelibs-cacert.patch
diff -u packages/kde4-kdelibs/kde4-kdelibs-cacert.patch:1.2 packages/kde4-kdelibs/kde4-kdelibs-cacert.patch:1.3
--- packages/kde4-kdelibs/kde4-kdelibs-cacert.patch:1.2	Tue May  4 15:01:56 2010
+++ packages/kde4-kdelibs/kde4-kdelibs-cacert.patch	Fri Jan 21 21:18:12 2011
@@ -19,15 +19,4 @@
          if (-1 == KDE_stat(_j.toAscii().constData(), &sb)) {
              continue;
          }
---- kdecore/network/ksslcertificatemanager.cpp.orig	2010-05-04 14:57:32.907278420 +0200
-+++ kdecore/network/ksslcertificatemanager.cpp	2010-05-04 15:01:04.990025543 +0200
-@@ -224,7 +224,8 @@
-         }
- 
-         // set default CAs from KDE's own bundle
--        QStringList bundles = KGlobal::dirs()->findAllResources("data", "kssl/ca-bundle.crt");
-+        QStringList bundles;
-+	bundles << "/etc/certs/ca-certificates.crt";
-         foreach (const QString &bundle, bundles) {
-             defaultCaCertificates += QSslCertificate::fromPath(bundle);
-         }
+

================================================================
Index: packages/kde4-kdelibs/kde4-kdelibs.spec
diff -u packages/kde4-kdelibs/kde4-kdelibs.spec:1.231 packages/kde4-kdelibs/kde4-kdelibs.spec:1.232
--- packages/kde4-kdelibs/kde4-kdelibs.spec:1.231	Tue Jan 11 08:48:15 2011
+++ packages/kde4-kdelibs/kde4-kdelibs.spec	Fri Jan 21 21:18:12 2011
@@ -14,12 +14,12 @@
 Summary(ru.UTF-8):	K Desktop Environment - Библиотеки
 Summary(uk.UTF-8):	K Desktop Environment - Бібліотеки
 Name:		kde4-kdelibs
-Version:	4.5.5
-Release:	3
+Version:	4.6.0
+Release:	1
 License:	LGPL
 Group:		X11/Libraries
 Source0:	ftp://ftp.kde.org/pub/kde/%{_state}/%{version}/src/%{orgname}-%{version}.tar.bz2
-# Source0-md5:	a6037c53d34fe28f8a135181fe7c923b
+# Source0-md5:	9ee32f375809a42a4a8d512bd06a612b
 Source1:	%{name}-pld_box.png
 Patch100:	%{name}-branch.diff
 Patch0:		%{name}-branding.patch
@@ -31,6 +31,7 @@
 BuildRequires:	Qt3Support-devel >= %{qtver}
 BuildRequires:	QtCore-devel >= %{qtver}
 BuildRequires:	QtDBus-devel >= %{qtver}
+BuildRequires:	QtDeclarative-devel >= %{qtver}
 BuildRequires:	QtDesigner-devel >= %{qtver}
 BuildRequires:	QtGui-devel >= %{qtver}
 BuildRequires:	QtOpenGL-devel >= %{qtver}
@@ -42,7 +43,7 @@
 BuildRequires:	QtXml-devel >= %{qtver}
 BuildRequires:	acl-devel
 BuildRequires:	aspell-devel
-BuildRequires:	attica-devel >= 0.1.4
+BuildRequires:	attica-devel >= 0.2.0
 BuildRequires:	audiofile-devel
 BuildRequires:	automoc4 >= 0.9.88
 BuildRequires:	avahi-devel
@@ -55,6 +56,7 @@
 BuildRequires:	fam-devel
 BuildRequires:	flex
 BuildRequires:	giflib-devel
+BuildRequires:	grantlee-devel >= 0.1.1
 BuildRequires:	heimdal-devel
 BuildRequires:	hspell-devel
 BuildRequires:	issue
@@ -80,14 +82,14 @@
 BuildRequires:	pcre-devel >= 3.5
 BuildRequires:	phonon-devel >= 4.3.80
 BuildRequires:	pkgconfig
-BuildRequires:	polkit-qt-1-gui-devel >= 0.96.1
+BuildRequires:	polkit-qt-1-gui-devel >= 0.99.0
 BuildRequires:	qca-devel >= 2.0.0
 BuildRequires:	qt4-build >= %{qtver}
 BuildRequires:	qt4-qmake >= %{qtver}
 BuildRequires:	rpmbuild(macros) >= 1.600
 BuildRequires:	shared-desktop-ontologies-devel >= 0.5
 BuildRequires:	shared-mime-info >= 0.18
-BuildRequires:	soprano-devel >= 2.4.63
+BuildRequires:	soprano-devel >= 2.5.63
 BuildRequires:	strigi-devel >= 0.7.0
 BuildRequires:	sysstat
 BuildRequires:	utempter-devel
@@ -284,8 +286,6 @@
 %files
 %defattr(644,root,root,755)
 %dir %{_docdir}/kde
-# from kde4-kdebase.spec - old common subpackage
-%dir %{_desktopdir}/kde4
 # DO NOT PACKAGE THIS FILE vvvv - use applnk
 #%{_sysconfdir}/xdg/menus/applications.menu
 %attr(755,root,root) %{_bindir}/kjs
@@ -368,6 +368,10 @@
 
 %{_datadir}/dbus-1/interfaces/*.xml
 
+# from kde4-kdebase.spec - old common subpackage
+%dir %{_desktopdir}/kde4
+%{_desktopdir}/kde4/*.desktop
+
 # kauth
 %{_datadir}/apps/kauth
 /etc/dbus-1/system.d/org.kde.auth.conf
@@ -376,6 +380,7 @@
 %dir %{_datadir}/apps/plasma/services
 %{_datadir}/apps/plasma/services/dataengineservice.operations
 %{_datadir}/apps/plasma/services/plasmoidservice.operations
+%{_datadir}/apps/plasma/services/storage.operations
 
 %{_datadir}/apps/katepart
 %{_datadir}/apps/kcm_componentchooser
@@ -466,6 +471,8 @@
 %attr(755,root,root) %ghost %{_libdir}/libkutils.so.?
 %attr(755,root,root) %{_libdir}/libnepomuk.so.*.*
 %attr(755,root,root) %ghost %{_libdir}/libnepomuk.so.?
+%attr(755,root,root) %{_libdir}/libnepomukutils.so.*.*
+%attr(755,root,root) %ghost %{_libdir}/libnepomukutils.so.?
 %attr(755,root,root) %{_libdir}/libnepomukquery.so.*.*
 %attr(755,root,root) %ghost %{_libdir}/libnepomukquery.so.?
 %attr(755,root,root) %{_libdir}/libplasma.so.*.*
@@ -490,6 +497,8 @@
 %dir %{_libdir}/kde4/plugins/kauth/helper
 %attr(755,root,root) %{_libdir}/kde4/plugins/kauth/helper/kauth_helper_plugin.so
 %dir %{_libdir}/kde4/plugins/designer
+%attr(755,root,root) %{_libdir}/kde4/plugins/designer/kdedeprecated.so
+%attr(755,root,root) %{_libdir}/kde4/plugins/designer/kdewebkitwidgets.so
 %attr(755,root,root) %{_libdir}/kde4/plugins/designer/kdewidgets.so
 %attr(755,root,root) %{_libdir}/kde4/plugins/designer/kde3supportwidgets.so
 %dir %{_libdir}/kde4/plugins/imageformats
@@ -532,6 +541,7 @@
 %attr(755,root,root) %{_libdir}/libkunittest.so
 %attr(755,root,root) %{_libdir}/libkutils.so
 %attr(755,root,root) %{_libdir}/libnepomuk.so
+%attr(755,root,root) %{_libdir}/libnepomukutils.so
 %attr(755,root,root) %{_libdir}/libnepomukquery.so
 %attr(755,root,root) %{_libdir}/libplasma.so
 %attr(755,root,root) %{_libdir}/libsolid.so
@@ -690,6 +700,7 @@
 %{_includedir}/KDE/KCrash
 %{_includedir}/KDE/KCrashBookmarkImporter
 %{_includedir}/KDE/KCrashBookmarkImporterImpl
+%{_includedir}/KDE/KCurrencyCode
 %{_includedir}/KDE/KCursor
 %{_includedir}/KDE/KDBusServiceStarter
 %{_includedir}/KDE/KDEDModule
@@ -718,8 +729,10 @@
 %{_includedir}/KDE/KDiskFreeSpaceInfo
 %{_includedir}/KDE/KDoubleNumInput
 %{_includedir}/KDE/KDoubleValidator
+%{_includedir}/KDE/KDualAction
 %{_includedir}/KDE/KEMailSettings
 %{_includedir}/KDE/KEditListBox
+%{_includedir}/KDE/KEditListWidget
 %{_includedir}/KDE/KEditToolBar
 %{_includedir}/KDE/KEmoticons
 %{_includedir}/KDE/KEmoticonsProvider
@@ -902,6 +915,7 @@
 %{_includedir}/KDE/KScanDialog
 %{_includedir}/KDE/KSelectAction
 %{_includedir}/KDE/KSelectionOwner
+%{_includedir}/KDE/KSelectionProxyModel
 %{_includedir}/KDE/KSelectionWatcher
 %{_includedir}/KDE/KSelector
 %{_includedir}/KDE/KSeparator
@@ -943,6 +957,7 @@
 %{_includedir}/KDE/KSvgRenderer
 %{_includedir}/KDE/KSycoca
 %{_includedir}/KDE/KSycocaEntry
+%{_includedir}/KDE/KSystemEventFilter
 %{_includedir}/KDE/KSystemTimeZone
 %{_includedir}/KDE/KSystemTimeZoneSource
 %{_includedir}/KDE/KSystemTimeZones
@@ -1085,6 +1100,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.232  2011/01/21 20:18:12  arekm
+- up to 4.6.0
+
 Revision 1.231  2011/01/11 07:48:15  arekm
 - release 3
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/kde4-kdelibs/kde4-kdelibs-aboutPLD.patch?r1=1.16&r2=1.17&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/kde4-kdelibs/kde4-kdelibs-branding.patch?r1=1.2&r2=1.3&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/kde4-kdelibs/kde4-kdelibs-cacert.patch?r1=1.2&r2=1.3&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/kde4-kdelibs/kde4-kdelibs.spec?r1=1.231&r2=1.232&f=u

More information about the pld-cvs-commit mailing list