Author: arekm Date: Sat May 29 00:52:48 2010 GMT Module: packages Tag: HEAD ---- Log message: - rel 2; fix build with attica 0.1.4
---- Files affected: packages/kde4-kdebase-runtime: kde4-kdebase-runtime.spec (1.111 -> 1.112) , kde4-kdebase-runtime-attica.patch (NONE -> 1.1) (NEW) ---- Diffs: ================================================================ Index: packages/kde4-kdebase-runtime/kde4-kdebase-runtime.spec diff -u packages/kde4-kdebase-runtime/kde4-kdebase-runtime.spec:1.111 packages/kde4-kdebase-runtime/kde4-kdebase-runtime.spec:1.112 --- packages/kde4-kdebase-runtime/kde4-kdebase-runtime.spec:1.111 Fri May 28 23:33:47 2010 +++ packages/kde4-kdebase-runtime/kde4-kdebase-runtime.spec Sat May 29 02:52:42 2010 @@ -12,7 +12,7 @@ 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 @@ -21,6 +21,7 @@ # 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} @@ -30,8 +31,7 @@ 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 @@ -104,6 +104,7 @@ %prep %setup -q -n %{orgname}-%{version} -a1 #%patch100 -p1 +%patch0 -p4 %build install -d build @@ -552,6 +553,9 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.112 2010/05/29 00:52:42 arekm +- rel 2; fix build with attica 0.1.4 + Revision 1.111 2010/05/28 21:33:47 shadzik - attica < 0.1.4 as BR - won't build with attica = 0.1.4 ================================================================ Index: packages/kde4-kdebase-runtime/kde4-kdebase-runtime-attica.patch diff -u /dev/null packages/kde4-kdebase-runtime/kde4-kdebase-runtime-attica.patch:1.1 --- /dev/null Sat May 29 02:52:48 2010 +++ packages/kde4-kdebase-runtime/kde4-kdebase-runtime-attica.patch Sat May 29 02:52:42 2010 @@ -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); ================================================================ ---- CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/kde4-kdebase-runtime/kde4-kdebase-runtime.spec?r1=1.111&r2=1.112&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
