rpms/kdebindings/devel kdebindings-4.2.85-t965327-remove-akonadi-private-API.patch, NONE, 1.1 kdebindings-4.2.85-t965859-remove-KSystemTimeZones_Simulated.patch, NONE, 1.1 kdebindings-4.2.85-t966090-fix-soprano-header-list.patch, NONE, 1.1 kdebindings-4.2.85-t966176-add-missing-file.patch, NONE, 1.1 kdebindings-4.2.85-t966386-add-BackendSetting-class.patch, NONE, 1.1 kdebindings-4.2.85-t966386-fix-phonon-link.patch, NONE, 1.1 kdebindings.spec, 1.196, 1.197
Kevin Kofler
kkofler at fedoraproject.org
Wed May 20 02:43:06 UTC 2009
Author: kkofler
Update of /cvs/pkgs/rpms/kdebindings/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11632/devel
Modified Files:
kdebindings.spec
Added Files:
kdebindings-4.2.85-t965327-remove-akonadi-private-API.patch
kdebindings-4.2.85-t965859-remove-KSystemTimeZones_Simulated.patch
kdebindings-4.2.85-t966090-fix-soprano-header-list.patch
kdebindings-4.2.85-t966176-add-missing-file.patch
kdebindings-4.2.85-t966386-add-BackendSetting-class.patch
kdebindings-4.2.85-t966386-fix-phonon-link.patch
Log Message:
- build fixes backported from trunk by Nicolas Lécureuil <neoclust at mandriva.org>
kdebindings-4.2.85-t965327-remove-akonadi-private-API.patch:
--- NEW FILE kdebindings-4.2.85-t965327-remove-akonadi-private-API.patch ---
--- python/pykde4/sip/akonadi/agentfilterproxymodel.sip 2009/05/08 15:16:50 965326
+++ python/pykde4/sip/akonadi/agentfilterproxymodel.sip 2009/05/08 15:31:32 965327
@@ -60,7 +60,6 @@
#include <akonadi/kmime/messagemodel.h>
#include <akonadi/kmime/messagethreaderproxymodel.h>
#include <akonadi/monitor.h>
-#include <akonadi/resourceselectjob.h>
#include <akonadi/searchcreatejob.h>
#include <akonadi/servermanager.h>
#include <akonadi/session.h>
--- python/pykde4/sip/akonadi/akonadimod.sip 2009/05/08 15:16:50 965326
+++ python/pykde4/sip/akonadi/akonadimod.sip 2009/05/08 15:31:32 965327
@@ -74,7 +74,6 @@
%Include mimetypechecker.sip
%Include monitor.sip
//%Include resourcebase.sip
-%Include resourceselectjob.sip
%Include searchcreatejob.sip
%Include servermanager.sip
%Include session.sip
--- python/pykde4/sip/akonadi/agentfilterproxymodel.sip~ 2009-05-08 18:03:35.000000000 +0200
+++ python/pykde4/sip/akonadi/agentfilterproxymodel.sip 2009-05-08 18:07:24.000000000 +0200
@@ -173,8 +173,6 @@
sipClass = sipClass_Akonadi_ItemSync;
else if (dynamic_cast<Akonadi::LinkJob*>(sipCpp))
sipClass = sipClass_Akonadi_LinkJob;
- else if (dynamic_cast<Akonadi::ResourceSelectJob*>(sipCpp))
- sipClass = sipClass_Akonadi_ResourceSelectJob;
else if (dynamic_cast<Akonadi::SearchCreateJob*>(sipCpp))
sipClass = sipClass_Akonadi_SearchCreateJob;
else if (dynamic_cast<Akonadi::TransactionBeginJob*>(sipCpp))
kdebindings-4.2.85-t965859-remove-KSystemTimeZones_Simulated.patch:
--- NEW FILE kdebindings-4.2.85-t965859-remove-KSystemTimeZones_Simulated.patch ---
Index: python/pykde4/sip/kdecore/kdatetime.sip
===================================================================
--- python/pykde4/sip/kdecore/kdatetime.sip (revision 965858)
+++ python/pykde4/sip/kdecore/kdatetime.sip (revision 965859)
@@ -163,17 +163,3 @@
}; // KDateTime
-class KSystemTimeZones_Simulated : KSystemTimeZones /Abstract/
-{
-%TypeHeaderCode
-#include <kdatetime.h>
-%End
-
-public:
- static KTimeZone realLocalZone ();
- static KTimeZone local ();
- static void setLocalZone (const KTimeZone& tz);
- static bool isSimulated ();
-}; // KSystemTimeZones_Simulated
-
-
kdebindings-4.2.85-t966090-fix-soprano-header-list.patch:
--- NEW FILE kdebindings-4.2.85-t966090-fix-soprano-header-list.patch ---
Index: smoke/soprano/soprano_header_list
===================================================================
--- smoke/soprano/soprano_header_list (revision 966089)
+++ smoke/soprano/soprano_header_list (revision 966090)
@@ -21,6 +21,7 @@
soprano/inferenceruleset.h
soprano/iteratorbackend.h
soprano/iterator.h
+soprano/languagetag.h
soprano/literalvalue.h
soprano/localsocketclient.h
soprano/locator.h
kdebindings-4.2.85-t966176-add-missing-file.patch:
--- NEW FILE kdebindings-4.2.85-t966176-add-missing-file.patch ---
Index: csharp/soprano/soprano/Soprano_Backend.cs
===================================================================
--- csharp/soprano/soprano/Soprano_Backend.cs (revision 0)
+++ csharp/soprano/soprano/Soprano_Backend.cs (revision 966176)
@@ -0,0 +1,108 @@
+//Auto-generated by kalyptus. DO NOT EDIT.
+namespace Soprano {
+ using Soprano;
+ using System;
+ using Qyoto;
+ using System.Collections.Generic;
+ /// <remarks>
+ /// \class Backend backend.h Soprano/Backend
+ /// \brief Soprano.Backend defines the interface for a Soprano backend plugin.
+ /// The Backend interface defines two important methods: createModel() and supportedFeatures().
+ /// It inherits from Error.ErrorCache for error handling and subclasses should use clearError()
+ /// and setError() to report the status.
+ /// \sa \ref soprano_writing_plugins
+ /// \author Sebastian Trueg <trueg at kde.org>
+ /// </remarks> <short> \class Backend backend.</short>
+ [SmokeClass("Soprano::Backend")]
+ public abstract class Backend : Soprano.Plugin, Soprano.Error.IErrorCache {
+ protected Backend(Type dummy) : base((Type) null) {}
+ protected new void CreateProxy() {
+ interceptor = new SmokeInvocation(typeof(Backend), this);
+ }
+ // Error lastError(); >>>> NOT CONVERTED
+ // void setError(const Error& arg1); >>>> NOT CONVERTED
+ public Backend(string name) : this((Type) null) {
+ CreateProxy();
+ interceptor.Invoke("Backend$", "Backend(const QString&)", typeof(void), typeof(string), name);
+ }
+ /// <remarks>
+ /// Creates a new RDF model with options.
+ /// The caller takes ownership and has to care about deletion.
+ /// \param settings The settings that should be used to create the Model. Backend implementations
+ /// should never ignore settings but rather return 0 if an option is not supported. Backends can,
+ /// however, define their own default settings. Invalid settings should result in an Error with value
+ /// Error.ErrorInvalidArgument.
+ /// \sa BackendSetting
+ /// </remarks> <short> Creates a new RDF model with options.</short>
+ [SmokeMethod("createModel(const QList<Soprano::BackendSetting>&) const")]
+ public abstract Soprano.StorageModel CreateModel(List<Soprano.BackendSetting> settings);
+ /// <remarks>
+ /// Phyically delete all data for a specific model. For most backends this means deleting some files
+ /// on the hard disk. With others it may mean to delete tables from an SQL database.
+ /// \param settings The settings that were used to create the model which should be deleted.
+ /// For most backends the Soprano.BackendOptionStorageDir setting is probably most important.
+ /// If the settings do not provide enough information to uniquely identify the model
+ /// to delete, the method should be terminated with an Error.ErrorInvalidArgument
+ /// error.
+ /// \return <pre>true</pre> if the data was successfully removed, <pre>false</pre> otherwise. ErrorCache.LastError()
+ /// may provide more detailed error information in the latter case.
+ /// \since 2.1
+ /// </remarks> <short> Phyically delete all data for a specific model.</short>
+ [SmokeMethod("deleteModelData(const QList<Soprano::BackendSetting>&) const")]
+ public abstract bool DeleteModelData(List<Soprano.BackendSetting> settings);
+ /// <remarks>
+ /// Each backend can support a set of features. Backends without any features do not make much sense.
+ /// If the features include Soprano.BackendFeatureUser additional user features not defined in
+ /// Backend.BackendFeature can be supported via supportedUserFeatures().
+ /// \return A combination of Soprano.BackendFeature values.
+ /// </remarks> <short> Each backend can support a set of features.</short>
+ [SmokeMethod("supportedFeatures() const")]
+ public abstract uint SupportedFeatures();
+ /// <remarks>
+ /// A Backend can support additional features that are not defined in Backend.BackendFeature.
+ /// These user defined features have string identifiers. If a backend supports additional features
+ /// it has to include Soprano.BackendFeatureUser in supportedFeatures().
+ /// The default implementation returns an empty list.
+ /// \return the list of supported user features.
+ /// </remarks> <short> A Backend can support additional features that are not defined in Backend.BackendFeature.</short>
+ [SmokeMethod("supportedUserFeatures() const")]
+ public virtual List<string> SupportedUserFeatures() {
+ return (List<string>) interceptor.Invoke("supportedUserFeatures", "supportedUserFeatures() const", typeof(List<string>));
+ }
+ /// <remarks>
+ /// Check if a backend supports certain features. If feature includes Soprano.BackendFeatureUser
+ /// the list if userFeatures is also compared.
+ /// \return <pre>true</pre> if the backend does support the requested features, <pre>false</pre> otherwise.
+ /// </remarks> <short> Check if a backend supports certain features.</short>
+ public bool SupportsFeatures(uint feature, List<string> userFeatures) {
+ return (bool) interceptor.Invoke("supportsFeatures$?", "supportsFeatures(Soprano::BackendFeatures, const QStringList&) const", typeof(bool), typeof(uint), feature, typeof(List<string>), userFeatures);
+ }
+ public bool SupportsFeatures(uint feature) {
+ return (bool) interceptor.Invoke("supportsFeatures$", "supportsFeatures(Soprano::BackendFeatures) const", typeof(bool), typeof(uint), feature);
+ }
+ /// <remarks>
+ /// Get the last error that occured in the current thread.
+ /// </remarks> <short> Get the last error that occured in the current thread.</short>
+ /// <remarks>
+ /// Reset the error for the current thread to no error.
+ /// </remarks> <short> Reset the error for the current thread to no error.</short>
+ protected void ClearError() {
+ interceptor.Invoke("clearError", "clearError() const", typeof(void));
+ }
+ /// <remarks>
+ /// Set the last occured error. This method is const to allow setting
+ /// of errors in all types of methods. The last error is as such a
+ /// mutable property.
+ /// </remarks> <short> Set the last occured error.</short>
+ /// <remarks>
+ /// Convenience method to set simple string error messages with a default
+ /// error code ErrorUnknown.
+ /// </remarks> <short> Convenience method to set simple string error messages with a default error code ErrorUnknown.</short>
+ protected void SetError(string errorMessage, int code) {
+ interceptor.Invoke("setError$$", "setError(const QString&, int) const", typeof(void), typeof(string), errorMessage, typeof(int), code);
+ }
+ protected void SetError(string errorMessage) {
+ interceptor.Invoke("setError$", "setError(const QString&) const", typeof(void), typeof(string), errorMessage);
+ }
+ }
+}
kdebindings-4.2.85-t966386-add-BackendSetting-class.patch:
--- NEW FILE kdebindings-4.2.85-t966386-add-BackendSetting-class.patch ---
Index: csharp/soprano/soprano/Soprano_BackendSetting.cs
===================================================================
--- csharp/soprano/soprano/Soprano_BackendSetting.cs (revision 0)
+++ csharp/soprano/soprano/Soprano_BackendSetting.cs (revision 966536)
@@ -0,0 +1,91 @@
+//Auto-generated by kalyptus. DO NOT EDIT.
+namespace Soprano {
+ using Soprano;
+ using System;
+ using Qyoto;
+ /// <remarks>
+ /// \class BackendSetting backend.h Soprano/BackendSetting
+ /// \brief Wraps one setting for Model creation.
+ /// A BackendSetting consists of an option type and an option value. The option type can either be a predefined
+ /// value from Soprano.BackendOption or a user defined string value that depends on the Backend implementation. In the
+ /// latter case option has to be set to Soprano.BackendOptionUser.
+ /// \sa Backend.CreateModel(), BackendSettings, isOptionInSettings, settingInSettings, valueInSettings
+ /// \author Sebastian Trueg <trueg at kde.org>
+ /// </remarks> <short> \class BackendSetting backend.</short>
+ [SmokeClass("Soprano::BackendSetting")]
+ public class BackendSetting : Object, IDisposable {
+ protected SmokeInvocation interceptor = null;
+ private IntPtr smokeObject;
+ protected BackendSetting(Type dummy) {}
+ protected void CreateProxy() {
+ interceptor = new SmokeInvocation(typeof(BackendSetting), this);
+ }
+ /// <remarks>
+ /// Create an empty setting.
+ /// \sa Soprano.BackendOptionNone
+ /// </remarks> <short> Create an empty setting.</short>
+ public BackendSetting() : this((Type) null) {
+ CreateProxy();
+ interceptor.Invoke("BackendSetting", "BackendSetting()", typeof(void));
+ }
+ /// <remarks>
+ /// Create a boolean setting with a default true value.
+ /// </remarks> <short> Create a boolean setting with a default true value.</short>
+ public BackendSetting(Soprano.BackendOption option) : this((Type) null) {
+ CreateProxy();
+ interceptor.Invoke("BackendSetting$", "BackendSetting(Soprano::BackendOption)", typeof(void), typeof(Soprano.BackendOption), option);
+ }
+ /// <remarks>
+ /// Create a standard setting with option <pre>s</pre> and value <pre>value_</pre>.
+ /// </remarks> <short> Create a standard setting with option \p s and value \p value_.</short>
+ public BackendSetting(Soprano.BackendOption s, QVariant value_) : this((Type) null) {
+ CreateProxy();
+ interceptor.Invoke("BackendSetting$#", "BackendSetting(Soprano::BackendOption, const QVariant&)", typeof(void), typeof(Soprano.BackendOption), s, typeof(QVariant), value_);
+ }
+ /// <remarks>
+ /// Create a user setting with user option name <pre>userOption</pre> and value <pre>value_</pre>.
+ /// </remarks> <short> Create a user setting with user option name \p userOption and value \p value_.</short>
+ public BackendSetting(string userOption, QVariant value_) : this((Type) null) {
+ CreateProxy();
+ interceptor.Invoke("BackendSetting$#", "BackendSetting(const QString&, const QVariant&)", typeof(void), typeof(string), userOption, typeof(QVariant), value_);
+ }
+ /// <remarks>
+ /// Copy constructor.
+ /// </remarks> <short> Copy constructor.</short>
+ public BackendSetting(Soprano.BackendSetting other) : this((Type) null) {
+ CreateProxy();
+ interceptor.Invoke("BackendSetting#", "BackendSetting(const Soprano::BackendSetting&)", typeof(void), typeof(Soprano.BackendSetting), other);
+ }
+ /// <remarks>
+ /// The option that this setting sets. If Soprano.BackendOptionUser
+ /// the option is identified by userOptionName().
+ /// </remarks> <short> The option that this setting sets.</short>
+ public Soprano.BackendOption Option() {
+ return (Soprano.BackendOption) interceptor.Invoke("option", "option() const", typeof(Soprano.BackendOption));
+ }
+ /// <remarks>
+ /// The name of the user option if option() is Soprano.BackendOptionUser.
+ /// </remarks> <short> The name of the user option if option() is Soprano.BackendOptionUser.</short>
+ public string UserOptionName() {
+ return (string) interceptor.Invoke("userOptionName", "userOptionName() const", typeof(string));
+ }
+ /// <remarks>
+ /// The value of the setting.
+ /// </remarks> <short> The value of the setting.</short>
+ public QVariant Value() {
+ return (QVariant) interceptor.Invoke("value", "value() const", typeof(QVariant));
+ }
+ /// <remarks>
+ /// Set the value of the Setting.
+ /// </remarks> <short> Set the value of the Setting.</short>
+ public void SetValue(QVariant value) {
+ interceptor.Invoke("setValue#", "setValue(const QVariant&)", typeof(void), typeof(QVariant), value);
+ }
+ ~BackendSetting() {
+ interceptor.Invoke("~BackendSetting", "~BackendSetting()", typeof(void));
+ }
+ public void Dispose() {
+ interceptor.Invoke("~BackendSetting", "~BackendSetting()", typeof(void));
+ }
+ }
+}
kdebindings-4.2.85-t966386-fix-phonon-link.patch:
--- NEW FILE kdebindings-4.2.85-t966386-fix-phonon-link.patch ---
Index: smoke/phonon/CMakeLists.txt
===================================================================
--- smoke/phonon/CMakeLists.txt (revision 966358)
+++ smoke/phonon/CMakeLists.txt (working copy)
@@ -69,7 +69,7 @@
ENDIF(CMAKE_CXX_FLAGS MATCHES "-fvisibility")
add_library(smokephonon SHARED ${smokephonon_LIB_SRCS})
-target_link_libraries(smokephonon smokeqt ${PHONON_LIBS})
+target_link_libraries(smokephonon smokeqt ${KDE4_PHONON_LIBS})
set_target_properties(smokephonon PROPERTIES VERSION 2.0.0 SOVERSION 2 )
Index: kdebindings.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdebindings/devel/kdebindings.spec,v
retrieving revision 1.196
retrieving revision 1.197
diff -u -p -r1.196 -r1.197
--- kdebindings.spec 19 May 2009 15:31:42 -0000 1.196
+++ kdebindings.spec 20 May 2009 02:43:05 -0000 1.197
@@ -41,6 +41,12 @@ Source1: http://websvn.kde.org/*checkout
# patch to disable examples (trouble with them installing to the buildroot)
Patch0: kdebindings-qyoto-examples.patch
# upstream patches
+Patch100: kdebindings-4.2.85-t965327-remove-akonadi-private-API.patch
+Patch101: kdebindings-4.2.85-t965859-remove-KSystemTimeZones_Simulated.patch
+Patch102: kdebindings-4.2.85-t966090-fix-soprano-header-list.patch
+Patch103: kdebindings-4.2.85-t966176-add-missing-file.patch
+Patch104: kdebindings-4.2.85-t966386-fix-phonon-link.patch
+Patch105: kdebindings-4.2.85-t966386-add-BackendSetting-class.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -242,6 +248,12 @@ Falcon plugin for the Kross archtecture
%prep
%setup -q
%patch0
+%patch100 -p0
+%patch101 -p0
+%patch102 -p0
+%patch103 -p0
+%patch104 -p0
+%patch105 -p0
%build
@@ -479,8 +491,9 @@ rm -rf %{buildroot}
%changelog
-* Tue May 19 2009 Than Ngo <than at redhat.com> - 4.2.85-1
+* Wed May 20 2009 Than Ngo <than at redhat.com> - 4.2.85-1
- 4.2.85 (4.3 beta1)
+- build fixes backported from trunk by Nicolas Lécureuil <neoclust at mandriva.org>
* Tue Apr 21 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> - 4.2.2-5
- F11+: enable csharp on ppc64
More information about the scm-commits
mailing list