- rel 2; fix build with attica 0.1.4

Changed files:
    kde4-kdebase-runtime-attica.patch -> 1.1
    kde4-kdebase-runtime.spec -> 1.112

diff --git a/kde4-kdebase-runtime-attica.patch b/kde4-kdebase-runtime-attica.patch
new file mode 100644 (file)
index 0000000..7668fbc
--- /dev/null
+++ b/kde4-kdebase-runtime-attica.patch
@@ -0,0 +1,89 @@
+--- trunk/KDE/kdebase/runtime/attica/kdeplugin/kdeplatformdependent.cpp        2009/12/30 14:40:48     1067762
++++ trunk/KDE/kdebase/runtime/attica/kdeplugin/kdeplatformdependent.cpp        2010/04/08 15:11:27     1112575
+@@ -202,7 +202,6 @@
+     return false;
+ }
+ 
+-
+ QList<QUrl> KdePlatformDependent::getDefaultProviderFiles() const
+ {
+     KConfigGroup group(m_config, "General");
+@@ -215,6 +214,23 @@
+     return paths;
+ }
+ 
++void KdePlatformDependent::addDefaultProviderFile(const QUrl& url)
++{
++    KConfigGroup group(m_config, "General");
++    QStringList pathStrings = group.readPathEntry("providerFiles", QStringList("http://download.kde.org/ocs/providers.xml"));
++    pathStrings.append(url.toString());
++    group.writeEntry("providerFiles", pathStrings);
++    group.sync();
++    kDebug() << "wrote providers: " << pathStrings;
++}
++
++void KdePlatformDependent::removeDefaultProviderFile(const QUrl& url)
++{
++    KConfigGroup group(m_config, "General");
++    QStringList pathStrings = group.readPathEntry("providerFiles", QStringList("http://download.kde.org/ocs/providers.xml"));
++    pathStrings.removeAll(url.toString());
++    group.writeEntry("providerFiles", pathStrings);
++}
+ 
+ QNetworkAccessManager* Attica::KdePlatformDependent::nam()
+ {
+--- trunk/KDE/kdebase/runtime/attica/kdeplugin/kdeplatformdependent.cpp        2010/04/08 15:11:27     1112575
++++ trunk/KDE/kdebase/runtime/attica/kdeplugin/kdeplatformdependent.cpp        2010/04/09 14:19:45     1112935
+@@ -232,6 +232,27 @@
+     group.writeEntry("providerFiles", pathStrings);
+ }
+ 
++void KdePlatformDependent::enableProvider(const QUrl& baseUrl, bool enabled) const
++{
++    KConfigGroup group(m_config, "General");
++    QStringList pathStrings = group.readPathEntry("disabledProviders", QStringList());
++    if (enabled) {
++        pathStrings.removeAll(baseUrl.toString());
++    } else {
++        if (!pathStrings.contains(baseUrl.toString())) {
++            pathStrings.append(baseUrl.toString());
++        }
++    }
++    group.writeEntry("disabledProviders", pathStrings);
++    group.sync();
++}
++
++bool KdePlatformDependent::isEnabled(const QUrl& baseUrl) const
++{
++    KConfigGroup group(m_config, "General");
++    return !group.readPathEntry("disabledProviders", QStringList()).contains(baseUrl.toString());
++}
++
+ QNetworkAccessManager* Attica::KdePlatformDependent::nam()
+ {
+     return m_accessManager;
+--- trunk/KDE/kdebase/runtime/attica/kdeplugin/kdeplatformdependent.h  2009/12/30 14:40:48     1067762
++++ trunk/KDE/kdebase/runtime/attica/kdeplugin/kdeplatformdependent.h  2010/04/08 15:11:27     1112575
+@@ -47,6 +47,9 @@
+     KdePlatformDependent();
+     virtual ~KdePlatformDependent();
+     virtual QList<QUrl> getDefaultProviderFiles() const;
++    virtual void addDefaultProviderFile(const QUrl& url);
++    virtual void removeDefaultProviderFile(const QUrl& url);    
++    
+     virtual QNetworkReply* post(const QNetworkRequest& request, const QByteArray& data);
+     virtual QNetworkReply* post(const QNetworkRequest& request, QIODevice* data);
+     virtual QNetworkReply* get(const QNetworkRequest& request);
+--- trunk/KDE/kdebase/runtime/attica/kdeplugin/kdeplatformdependent.h  2010/04/08 15:11:27     1112575
++++ trunk/KDE/kdebase/runtime/attica/kdeplugin/kdeplatformdependent.h  2010/04/09 14:19:45     1112935
+@@ -48,7 +48,9 @@
+     virtual ~KdePlatformDependent();
+     virtual QList<QUrl> getDefaultProviderFiles() const;
+     virtual void addDefaultProviderFile(const QUrl& url);
+-    virtual void removeDefaultProviderFile(const QUrl& url);    
++    virtual void removeDefaultProviderFile(const QUrl& url);
++    virtual void enableProvider(const QUrl& baseUrl, bool enabled) const;
++    virtual bool isEnabled(const QUrl& baseUrl) const;
+     
+     virtual QNetworkReply* post(const QNetworkRequest& request, const QByteArray& data);
+     virtual QNetworkReply* post(const QNetworkRequest& request, QIODevice* data);

diff --git a/kde4-kdebase-runtime.spec b/kde4-kdebase-runtime.spec
index 3bb3aa99f2ad824e41c1f902e1bfa199ac22c012..c50b185dbde11e9acd714d809190e644b3f4a74c 100644 (file)
--- a/kde4-kdebase-runtime.spec
+++ b/kde4-kdebase-runtime.spec
@@ -11,7 +11,7 @@ Summary:      KDE 4 base runtime components
 Summary(pl.UTF-8):     Komponenty uruchomieniowe podstawowej części KDE 4
 Name:          kde4-kdebase-runtime
 Version:       4.4.4
-Release:       1
+Release:       2
 License:       GPL
 Group:         X11/Applications
 Source0:       ftp://ftp.kde.org/pub/kde/%{_state}/%{version}/src/%{orgname}-%{version}.tar.bz2
@@ -20,6 +20,7 @@ Source1:      kdebase-searchproviders.tar.bz2
 # Source1-md5: 126c3524b5367f5096a628acbf9dc86f
 Source2:       l10n-iso639-1
 Patch100:      %{name}-branch.diff
+Patch0:                %{name}-attica.patch
 URL:           http://www.kde.org/
 BuildRequires: OpenEXR-devel
 BuildRequires: Qt3Support-devel >= %{qtver}
@@ -29,8 +30,7 @@ BuildRequires:        QtSvg-devel >= %{qtver}
 BuildRequires: QtTest-devel >= %{qtver}
 BuildRequires: QtUiTools-devel >= %{qtver}
 BuildRequires: alsa-lib-devel
-BuildRequires: attica-devel >= 0.1
-BuildRequires: attica-devel < 0.1.4
+BuildRequires: attica-devel
 BuildRequires: automoc4 >= 0.9.88
 BuildRequires: bzip2-devel
 BuildRequires: clucene-core-devel >= 0.9.21
@@ -103,6 +103,7 @@ Styl Oxygen dla KDE.
 %prep
 %setup -q -n %{orgname}-%{version} -a1
 #%patch100 -p1
+%patch0 -p4
 
 %build
 install -d build