packages: kde4-kdebase-workspace/kde4-kdebase-workspace-nm-09-compat.patch, ...
arekm
arekm at pld-linux.org
Sun Jun 12 09:12:13 CEST 2011
Author: arekm Date: Sun Jun 12 07:12:13 2011 GMT
Module: packages Tag: HEAD
---- Log message:
- up to 4.6.4
---- Files affected:
packages/kde4-kdebase-workspace:
kde4-kdebase-workspace-nm-09-compat.patch (1.2 -> 1.3) , kde4-kdebase-workspace.spec (1.270 -> 1.271)
---- Diffs:
================================================================
Index: packages/kde4-kdebase-workspace/kde4-kdebase-workspace-nm-09-compat.patch
diff -u packages/kde4-kdebase-workspace/kde4-kdebase-workspace-nm-09-compat.patch:1.2 packages/kde4-kdebase-workspace/kde4-kdebase-workspace-nm-09-compat.patch:1.3
--- packages/kde4-kdebase-workspace/kde4-kdebase-workspace-nm-09-compat.patch:1.2 Wed May 4 14:22:09 2011
+++ packages/kde4-kdebase-workspace/kde4-kdebase-workspace-nm-09-compat.patch Sun Jun 12 09:12:08 2011
@@ -1,6 +1,18 @@
-diff -up kdebase-workspace-4.6.2/solid/networkmanager-0.7/dbus/introspection/nm-active-connection.xml.nm-09-compat kdebase-workspace-4.6.2/solid/networkmanager-0.7/dbus/introspection/nm-active-connection.xml
---- kdebase-workspace-4.6.2/solid/networkmanager-0.7/dbus/introspection/nm-active-connection.xml.nm-09-compat 2011-02-25 22:54:49.000000000 +0100
-+++ kdebase-workspace-4.6.2/solid/networkmanager-0.7/dbus/introspection/nm-active-connection.xml 2011-04-30 08:39:45.504050737 +0200
+diff -ur kdebase-workspace-4.6.3/solid/CMakeLists.txt kdebase-workspace-4.6.3-nm-09-compat/solid/CMakeLists.txt
+--- kdebase-workspace-4.6.3/solid/CMakeLists.txt 2011-04-28 15:14:59.000000000 +0200
++++ kdebase-workspace-4.6.3-nm-09-compat/solid/CMakeLists.txt 2011-05-08 22:19:40.000000000 +0200
+@@ -17,7 +17,7 @@
+ add_subdirectory(networkmanager-0.6)
+ endif (NM_0_6)
+
+- macro_ensure_version_range("0.7.0" ${NETWORKMANAGER_VERSION} "0.8.10" NM_0_7)
++ macro_ensure_version("0.7.0" ${NETWORKMANAGER_VERSION} NM_0_7)
+ if (NM_0_7)
+ message(STATUS "Will build networkmanager-0.7")
+ set(HAVE_NETWORKMANAGER TRUE)
+diff -ur kdebase-workspace-4.6.3/solid/networkmanager-0.7/dbus/introspection/nm-active-connection.xml kdebase-workspace-4.6.3-nm-09-compat/solid/networkmanager-0.7/dbus/introspection/nm-active-connection.xml
+--- kdebase-workspace-4.6.3/solid/networkmanager-0.7/dbus/introspection/nm-active-connection.xml 2011-02-25 22:54:49.000000000 +0100
++++ kdebase-workspace-4.6.3-nm-09-compat/solid/networkmanager-0.7/dbus/introspection/nm-active-connection.xml 2011-05-08 22:19:16.000000000 +0200
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" ?>
@@ -10,9 +22,9 @@
<property name="ServiceName" type="s" access="read">
<tp:docstring>The D-Bus service name providing this connection.</tp:docstring>
</property>
-diff -up kdebase-workspace-4.6.2/solid/networkmanager-0.7/dbus/introspection/nm-device-ethernet.xml.nm-09-compat kdebase-workspace-4.6.2/solid/networkmanager-0.7/dbus/introspection/nm-device-ethernet.xml
---- kdebase-workspace-4.6.2/solid/networkmanager-0.7/dbus/introspection/nm-device-ethernet.xml.nm-09-compat 2011-02-25 22:54:49.000000000 +0100
-+++ kdebase-workspace-4.6.2/solid/networkmanager-0.7/dbus/introspection/nm-device-ethernet.xml 2011-04-30 08:39:45.541050273 +0200
+diff -ur kdebase-workspace-4.6.3/solid/networkmanager-0.7/dbus/introspection/nm-device-ethernet.xml kdebase-workspace-4.6.3-nm-09-compat/solid/networkmanager-0.7/dbus/introspection/nm-device-ethernet.xml
+--- kdebase-workspace-4.6.3/solid/networkmanager-0.7/dbus/introspection/nm-device-ethernet.xml 2011-02-25 22:54:49.000000000 +0100
++++ kdebase-workspace-4.6.3-nm-09-compat/solid/networkmanager-0.7/dbus/introspection/nm-device-ethernet.xml 2011-05-08 22:19:16.000000000 +0200
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" ?>
@@ -22,9 +34,9 @@
<property name="HwAddress" type="s" access="read">
<tp:docstring>
-diff -up kdebase-workspace-4.6.2/solid/networkmanager-0.7/dbus/introspection/nm-device-wifi.xml.nm-09-compat kdebase-workspace-4.6.2/solid/networkmanager-0.7/dbus/introspection/nm-device-wifi.xml
---- kdebase-workspace-4.6.2/solid/networkmanager-0.7/dbus/introspection/nm-device-wifi.xml.nm-09-compat 2011-02-25 22:54:49.000000000 +0100
-+++ kdebase-workspace-4.6.2/solid/networkmanager-0.7/dbus/introspection/nm-device-wifi.xml 2011-04-30 08:39:45.545050225 +0200
+diff -ur kdebase-workspace-4.6.3/solid/networkmanager-0.7/dbus/introspection/nm-device-wifi.xml kdebase-workspace-4.6.3-nm-09-compat/solid/networkmanager-0.7/dbus/introspection/nm-device-wifi.xml
+--- kdebase-workspace-4.6.3/solid/networkmanager-0.7/dbus/introspection/nm-device-wifi.xml 2011-02-25 22:54:49.000000000 +0100
++++ kdebase-workspace-4.6.3-nm-09-compat/solid/networkmanager-0.7/dbus/introspection/nm-device-wifi.xml 2011-05-08 22:19:16.000000000 +0200
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" ?>
@@ -34,9 +46,9 @@
<method name="GetAccessPoints">
<annotation name="org.freedesktop.DBus.GLib.CSymbol" value="impl_device_get_access_points"/>
<arg name="access_points" type="ao" direction="out">
-diff -up kdebase-workspace-4.6.2/solid/networkmanager-0.7/dbus/introspection/nm-device.xml.nm-09-compat kdebase-workspace-4.6.2/solid/networkmanager-0.7/dbus/introspection/nm-device.xml
---- kdebase-workspace-4.6.2/solid/networkmanager-0.7/dbus/introspection/nm-device.xml.nm-09-compat 2011-02-25 22:54:49.000000000 +0100
-+++ kdebase-workspace-4.6.2/solid/networkmanager-0.7/dbus/introspection/nm-device.xml 2011-04-30 08:39:45.509050673 +0200
+diff -ur kdebase-workspace-4.6.3/solid/networkmanager-0.7/dbus/introspection/nm-device.xml kdebase-workspace-4.6.3-nm-09-compat/solid/networkmanager-0.7/dbus/introspection/nm-device.xml
+--- kdebase-workspace-4.6.3/solid/networkmanager-0.7/dbus/introspection/nm-device.xml 2011-02-25 22:54:49.000000000 +0100
++++ kdebase-workspace-4.6.3-nm-09-compat/solid/networkmanager-0.7/dbus/introspection/nm-device.xml 2011-05-08 22:19:16.000000000 +0200
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" ?>
@@ -46,9 +58,9 @@
<property name="Udi" type="s" access="read">
<tp:docstring>
Unique Device Identifier.
-diff -up kdebase-workspace-4.6.2/solid/networkmanager-0.7/dbus/introspection/nm-exported-connection.xml.nm-09-compat kdebase-workspace-4.6.2/solid/networkmanager-0.7/dbus/introspection/nm-exported-connection.xml
---- kdebase-workspace-4.6.2/solid/networkmanager-0.7/dbus/introspection/nm-exported-connection.xml.nm-09-compat 2011-02-25 22:54:49.000000000 +0100
-+++ kdebase-workspace-4.6.2/solid/networkmanager-0.7/dbus/introspection/nm-exported-connection.xml 2011-04-30 08:39:45.515050599 +0200
+diff -ur kdebase-workspace-4.6.3/solid/networkmanager-0.7/dbus/introspection/nm-exported-connection.xml kdebase-workspace-4.6.3-nm-09-compat/solid/networkmanager-0.7/dbus/introspection/nm-exported-connection.xml
+--- kdebase-workspace-4.6.3/solid/networkmanager-0.7/dbus/introspection/nm-exported-connection.xml 2011-02-25 22:54:49.000000000 +0100
++++ kdebase-workspace-4.6.3-nm-09-compat/solid/networkmanager-0.7/dbus/introspection/nm-exported-connection.xml 2011-05-08 22:19:16.000000000 +0200
@@ -2,7 +2,7 @@
<node name="/" xmlns:tp="http://telepathy.freedesktop.org/wiki/DbusSpec#extensions-v0">
@@ -67,10 +79,10 @@
<tp:docstring>
Secrets have a separate interface so that they can be locked down.
</tp:docstring>
-diff -up kdebase-workspace-4.6.2/solid/networkmanager-0.7/dbus/introspection/nm-manager-client.xml.nm-09-compat kdebase-workspace-4.6.2/solid/networkmanager-0.7/dbus/introspection/nm-manager-client.xml
---- kdebase-workspace-4.6.2/solid/networkmanager-0.7/dbus/introspection/nm-manager-client.xml.nm-09-compat 2011-02-25 22:54:49.000000000 +0100
-+++ kdebase-workspace-4.6.2/solid/networkmanager-0.7/dbus/introspection/nm-manager-client.xml 2011-04-30 08:39:45.519050549 +0200
-@@ -13,7 +13,7 @@ object. dbus-glib generates the same bo
+diff -ur kdebase-workspace-4.6.3/solid/networkmanager-0.7/dbus/introspection/nm-manager-client.xml kdebase-workspace-4.6.3-nm-09-compat/solid/networkmanager-0.7/dbus/introspection/nm-manager-client.xml
+--- kdebase-workspace-4.6.3/solid/networkmanager-0.7/dbus/introspection/nm-manager-client.xml 2011-02-25 22:54:49.000000000 +0100
++++ kdebase-workspace-4.6.3-nm-09-compat/solid/networkmanager-0.7/dbus/introspection/nm-manager-client.xml 2011-05-08 22:19:16.000000000 +0200
+@@ -13,7 +13,7 @@
-->
<node name="/">
@@ -79,9 +91,9 @@
<method name="GetDevices">
<annotation name="org.freedesktop.DBus.GLib.CSymbol" value="impl_manager_get_devices"/>
<arg name="devices" type="ao" direction="out"/>
-diff -up kdebase-workspace-4.6.2/solid/networkmanager-0.7/dbus/introspection/nm-manager.xml.nm-09-compat kdebase-workspace-4.6.2/solid/networkmanager-0.7/dbus/introspection/nm-manager.xml
---- kdebase-workspace-4.6.2/solid/networkmanager-0.7/dbus/introspection/nm-manager.xml.nm-09-compat 2011-02-25 22:54:49.000000000 +0100
-+++ kdebase-workspace-4.6.2/solid/networkmanager-0.7/dbus/introspection/nm-manager.xml 2011-04-30 08:39:45.522050512 +0200
+diff -ur kdebase-workspace-4.6.3/solid/networkmanager-0.7/dbus/introspection/nm-manager.xml kdebase-workspace-4.6.3-nm-09-compat/solid/networkmanager-0.7/dbus/introspection/nm-manager.xml
+--- kdebase-workspace-4.6.3/solid/networkmanager-0.7/dbus/introspection/nm-manager.xml 2011-02-25 22:54:49.000000000 +0100
++++ kdebase-workspace-4.6.3-nm-09-compat/solid/networkmanager-0.7/dbus/introspection/nm-manager.xml 2011-05-08 22:19:16.000000000 +0200
@@ -8,7 +8,7 @@
-->
@@ -91,9 +103,9 @@
<method name="GetDevices">
<tp:docstring>
Get the list of network devices.
-diff -up kdebase-workspace-4.6.2/solid/networkmanager-0.7/dbus/introspection/nm-settings-connection.xml.nm-09-compat kdebase-workspace-4.6.2/solid/networkmanager-0.7/dbus/introspection/nm-settings-connection.xml
---- kdebase-workspace-4.6.2/solid/networkmanager-0.7/dbus/introspection/nm-settings-connection.xml.nm-09-compat 2011-02-25 22:54:49.000000000 +0100
-+++ kdebase-workspace-4.6.2/solid/networkmanager-0.7/dbus/introspection/nm-settings-connection.xml 2011-04-30 08:39:45.524050486 +0200
+diff -ur kdebase-workspace-4.6.3/solid/networkmanager-0.7/dbus/introspection/nm-settings-connection.xml kdebase-workspace-4.6.3-nm-09-compat/solid/networkmanager-0.7/dbus/introspection/nm-settings-connection.xml
+--- kdebase-workspace-4.6.3/solid/networkmanager-0.7/dbus/introspection/nm-settings-connection.xml 2011-02-25 22:54:49.000000000 +0100
++++ kdebase-workspace-4.6.3-nm-09-compat/solid/networkmanager-0.7/dbus/introspection/nm-settings-connection.xml 2011-05-08 22:19:16.000000000 +0200
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE node PUBLIC "-//freedesktop//DTD D-BUS Object Introspection 1.0//EN" "http://www.freedesktop.org/standards/dbus/1.0/introspect.dtd">
@@ -112,9 +124,9 @@
<method name="GetSecrets">
<annotation name="org.freedesktop.DBus.GLib.CSymbol" value="impl_connection_settings_get_secrets"/>
<annotation name="org.freedesktop.DBus.GLib.Async" value=""/>
-diff -up kdebase-workspace-4.6.2/solid/networkmanager-0.7/dbus/introspection/nm-settings.xml.nm-09-compat kdebase-workspace-4.6.2/solid/networkmanager-0.7/dbus/introspection/nm-settings.xml
---- kdebase-workspace-4.6.2/solid/networkmanager-0.7/dbus/introspection/nm-settings.xml.nm-09-compat 2011-02-25 22:54:49.000000000 +0100
-+++ kdebase-workspace-4.6.2/solid/networkmanager-0.7/dbus/introspection/nm-settings.xml 2011-04-30 08:39:45.525050473 +0200
+diff -ur kdebase-workspace-4.6.3/solid/networkmanager-0.7/dbus/introspection/nm-settings.xml kdebase-workspace-4.6.3-nm-09-compat/solid/networkmanager-0.7/dbus/introspection/nm-settings.xml
+--- kdebase-workspace-4.6.3/solid/networkmanager-0.7/dbus/introspection/nm-settings.xml 2011-02-25 22:54:49.000000000 +0100
++++ kdebase-workspace-4.6.3-nm-09-compat/solid/networkmanager-0.7/dbus/introspection/nm-settings.xml 2011-05-08 22:19:16.000000000 +0200
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" ?>
@@ -124,9 +136,9 @@
<tp:docstring>
The NetworkManagerSettings interface is provided by the service which provides connections to NetworkManager.
</tp:docstring>
-diff -up kdebase-workspace-4.6.2/solid/networkmanager-0.7/dbus/introspection/nm-vpn-connection.xml.nm-09-compat kdebase-workspace-4.6.2/solid/networkmanager-0.7/dbus/introspection/nm-vpn-connection.xml
---- kdebase-workspace-4.6.2/solid/networkmanager-0.7/dbus/introspection/nm-vpn-connection.xml.nm-09-compat 2011-02-25 22:54:49.000000000 +0100
-+++ kdebase-workspace-4.6.2/solid/networkmanager-0.7/dbus/introspection/nm-vpn-connection.xml 2011-04-30 08:39:45.527050449 +0200
+diff -ur kdebase-workspace-4.6.3/solid/networkmanager-0.7/dbus/introspection/nm-vpn-connection.xml kdebase-workspace-4.6.3-nm-09-compat/solid/networkmanager-0.7/dbus/introspection/nm-vpn-connection.xml
+--- kdebase-workspace-4.6.3/solid/networkmanager-0.7/dbus/introspection/nm-vpn-connection.xml 2011-02-25 22:54:49.000000000 +0100
++++ kdebase-workspace-4.6.3-nm-09-compat/solid/networkmanager-0.7/dbus/introspection/nm-vpn-connection.xml 2011-05-08 22:19:16.000000000 +0200
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" ?>
@@ -145,10 +157,10 @@
<tp:docstring>
Represents an active connection to a Virtual Private Network.
</tp:docstring>
-diff -up kdebase-workspace-4.6.2/solid/networkmanager-0.7/dbus/nm-device-ethernetinterface.h.nm-09-compat kdebase-workspace-4.6.2/solid/networkmanager-0.7/dbus/nm-device-ethernetinterface.h
---- kdebase-workspace-4.6.2/solid/networkmanager-0.7/dbus/nm-device-ethernetinterface.h.nm-09-compat 2011-02-25 22:54:49.000000000 +0100
-+++ kdebase-workspace-4.6.2/solid/networkmanager-0.7/dbus/nm-device-ethernetinterface.h 2011-04-30 08:39:45.543050249 +0200
-@@ -28,7 +28,7 @@ class OrgFreedesktopNetworkManagerDevice
+diff -ur kdebase-workspace-4.6.3/solid/networkmanager-0.7/dbus/nm-device-ethernetinterface.h kdebase-workspace-4.6.3-nm-09-compat/solid/networkmanager-0.7/dbus/nm-device-ethernetinterface.h
+--- kdebase-workspace-4.6.3/solid/networkmanager-0.7/dbus/nm-device-ethernetinterface.h 2011-02-25 22:54:49.000000000 +0100
++++ kdebase-workspace-4.6.3-nm-09-compat/solid/networkmanager-0.7/dbus/nm-device-ethernetinterface.h 2011-05-08 22:19:16.000000000 +0200
+@@ -28,7 +28,7 @@
Q_OBJECT
public:
static inline const char *staticInterfaceName()
@@ -157,10 +169,10 @@
public:
OrgFreedesktopNetworkManagerDeviceWiredInterface(const QString &service, const QString &path, const QDBusConnection &connection, QObject *parent = 0);
-diff -up kdebase-workspace-4.6.2/solid/networkmanager-0.7/dbus/nm-deviceinterface.h.nm-09-compat kdebase-workspace-4.6.2/solid/networkmanager-0.7/dbus/nm-deviceinterface.h
---- kdebase-workspace-4.6.2/solid/networkmanager-0.7/dbus/nm-deviceinterface.h.nm-09-compat 2011-02-25 22:54:49.000000000 +0100
-+++ kdebase-workspace-4.6.2/solid/networkmanager-0.7/dbus/nm-deviceinterface.h 2011-04-30 08:39:45.529050425 +0200
-@@ -28,7 +28,7 @@ class OrgFreedesktopNetworkManagerDevice
+diff -ur kdebase-workspace-4.6.3/solid/networkmanager-0.7/dbus/nm-deviceinterface.h kdebase-workspace-4.6.3-nm-09-compat/solid/networkmanager-0.7/dbus/nm-deviceinterface.h
+--- kdebase-workspace-4.6.3/solid/networkmanager-0.7/dbus/nm-deviceinterface.h 2011-02-25 22:54:49.000000000 +0100
++++ kdebase-workspace-4.6.3-nm-09-compat/solid/networkmanager-0.7/dbus/nm-deviceinterface.h 2011-05-08 22:19:16.000000000 +0200
+@@ -28,7 +28,7 @@
Q_OBJECT
public:
static inline const char *staticInterfaceName()
@@ -169,10 +181,10 @@
public:
OrgFreedesktopNetworkManagerDeviceInterface(const QString &service, const QString &path, const QDBusConnection &connection, QObject *parent = 0);
-diff -up kdebase-workspace-4.6.2/solid/networkmanager-0.7/dbus/nm-device-wifiinterface.h.nm-09-compat kdebase-workspace-4.6.2/solid/networkmanager-0.7/dbus/nm-device-wifiinterface.h
---- kdebase-workspace-4.6.2/solid/networkmanager-0.7/dbus/nm-device-wifiinterface.h.nm-09-compat 2011-02-25 22:54:49.000000000 +0100
-+++ kdebase-workspace-4.6.2/solid/networkmanager-0.7/dbus/nm-device-wifiinterface.h 2011-04-30 08:39:45.547050199 +0200
-@@ -28,7 +28,7 @@ class OrgFreedesktopNetworkManagerDevice
+diff -ur kdebase-workspace-4.6.3/solid/networkmanager-0.7/dbus/nm-device-wifiinterface.h kdebase-workspace-4.6.3-nm-09-compat/solid/networkmanager-0.7/dbus/nm-device-wifiinterface.h
+--- kdebase-workspace-4.6.3/solid/networkmanager-0.7/dbus/nm-device-wifiinterface.h 2011-02-25 22:54:49.000000000 +0100
++++ kdebase-workspace-4.6.3-nm-09-compat/solid/networkmanager-0.7/dbus/nm-device-wifiinterface.h 2011-05-08 22:19:16.000000000 +0200
+@@ -28,7 +28,7 @@
Q_OBJECT
public:
static inline const char *staticInterfaceName()
@@ -181,10 +193,10 @@
public:
OrgFreedesktopNetworkManagerDeviceWirelessInterface(const QString &service, const QString &path, const QDBusConnection &connection, QObject *parent = 0);
-diff -up kdebase-workspace-4.6.2/solid/networkmanager-0.7/dbus/nm-exported-connectioninterface.h.nm-09-compat kdebase-workspace-4.6.2/solid/networkmanager-0.7/dbus/nm-exported-connectioninterface.h
---- kdebase-workspace-4.6.2/solid/networkmanager-0.7/dbus/nm-exported-connectioninterface.h.nm-09-compat 2011-02-25 22:54:49.000000000 +0100
-+++ kdebase-workspace-4.6.2/solid/networkmanager-0.7/dbus/nm-exported-connectioninterface.h 2011-04-30 08:39:45.531050399 +0200
-@@ -31,7 +31,7 @@ class OrgFreedesktopNetworkManagerSettin
+diff -ur kdebase-workspace-4.6.3/solid/networkmanager-0.7/dbus/nm-exported-connectioninterface.h kdebase-workspace-4.6.3-nm-09-compat/solid/networkmanager-0.7/dbus/nm-exported-connectioninterface.h
+--- kdebase-workspace-4.6.3/solid/networkmanager-0.7/dbus/nm-exported-connectioninterface.h 2011-02-25 22:54:49.000000000 +0100
++++ kdebase-workspace-4.6.3-nm-09-compat/solid/networkmanager-0.7/dbus/nm-exported-connectioninterface.h 2011-05-08 22:19:16.000000000 +0200
+@@ -31,7 +31,7 @@
Q_OBJECT
public:
static inline const char *staticInterfaceName()
@@ -193,7 +205,7 @@
public:
OrgFreedesktopNetworkManagerSettingsConnectionInterface(const QString &service, const QString &path, const QDBusConnection &connection, QObject *parent = 0);
-@@ -64,7 +64,7 @@ class OrgFreedesktopNetworkManagerSettin
+@@ -64,7 +64,7 @@
Q_OBJECT
public:
static inline const char *staticInterfaceName()
@@ -202,10 +214,10 @@
public:
OrgFreedesktopNetworkManagerSettingsConnectionSecretsInterface(const QString &service, const QString &path, const QDBusConnection &connection, QObject *parent = 0);
-diff -up kdebase-workspace-4.6.2/solid/networkmanager-0.7/dbus/nm-manager-clientinterface.h.nm-09-compat kdebase-workspace-4.6.2/solid/networkmanager-0.7/dbus/nm-manager-clientinterface.h
---- kdebase-workspace-4.6.2/solid/networkmanager-0.7/dbus/nm-manager-clientinterface.h.nm-09-compat 2011-02-25 22:54:49.000000000 +0100
-+++ kdebase-workspace-4.6.2/solid/networkmanager-0.7/dbus/nm-manager-clientinterface.h 2011-04-30 08:39:45.533050373 +0200
-@@ -28,7 +28,7 @@ class OrgFreedesktopNetworkManagerInterf
+diff -ur kdebase-workspace-4.6.3/solid/networkmanager-0.7/dbus/nm-manager-clientinterface.h kdebase-workspace-4.6.3-nm-09-compat/solid/networkmanager-0.7/dbus/nm-manager-clientinterface.h
+--- kdebase-workspace-4.6.3/solid/networkmanager-0.7/dbus/nm-manager-clientinterface.h 2011-02-25 22:54:49.000000000 +0100
++++ kdebase-workspace-4.6.3-nm-09-compat/solid/networkmanager-0.7/dbus/nm-manager-clientinterface.h 2011-05-08 22:19:16.000000000 +0200
+@@ -28,7 +28,7 @@
Q_OBJECT
public:
static inline const char *staticInterfaceName()
@@ -214,10 +226,10 @@
public:
OrgFreedesktopNetworkManagerInterface(const QString &service, const QString &path, const QDBusConnection &connection, QObject *parent = 0);
-diff -up kdebase-workspace-4.6.2/solid/networkmanager-0.7/dbus/nm-vpn-connectioninterface.h.nm-09-compat kdebase-workspace-4.6.2/solid/networkmanager-0.7/dbus/nm-vpn-connectioninterface.h
---- kdebase-workspace-4.6.2/solid/networkmanager-0.7/dbus/nm-vpn-connectioninterface.h.nm-09-compat 2011-02-25 22:54:49.000000000 +0100
-+++ kdebase-workspace-4.6.2/solid/networkmanager-0.7/dbus/nm-vpn-connectioninterface.h 2011-04-30 08:39:45.535050349 +0200
-@@ -28,7 +28,7 @@ class OrgFreedesktopNetworkManagerVPNCon
+diff -ur kdebase-workspace-4.6.3/solid/networkmanager-0.7/dbus/nm-vpn-connectioninterface.h kdebase-workspace-4.6.3-nm-09-compat/solid/networkmanager-0.7/dbus/nm-vpn-connectioninterface.h
+--- kdebase-workspace-4.6.3/solid/networkmanager-0.7/dbus/nm-vpn-connectioninterface.h 2011-02-25 22:54:49.000000000 +0100
++++ kdebase-workspace-4.6.3-nm-09-compat/solid/networkmanager-0.7/dbus/nm-vpn-connectioninterface.h 2011-05-08 22:19:16.000000000 +0200
+@@ -28,7 +28,7 @@
Q_OBJECT
public:
static inline const char *staticInterfaceName()
@@ -226,10 +238,10 @@
public:
OrgFreedesktopNetworkManagerVPNConnectionInterface(const QString &service, const QString &path, const QDBusConnection &connection, QObject *parent = 0);
-diff -up kdebase-workspace-4.6.2/solid/networkmanager-0.7/manager.cpp.nm-09-compat kdebase-workspace-4.6.2/solid/networkmanager-0.7/manager.cpp
---- kdebase-workspace-4.6.2/solid/networkmanager-0.7/manager.cpp.nm-09-compat 2011-04-01 12:52:43.000000000 +0200
-+++ kdebase-workspace-4.6.2/solid/networkmanager-0.7/manager.cpp 2011-04-30 08:46:01.279352899 +0200
-@@ -21,7 +21,6 @@ along with this program. If not, see <h
+diff -ur kdebase-workspace-4.6.3/solid/networkmanager-0.7/manager.cpp kdebase-workspace-4.6.3-nm-09-compat/solid/networkmanager-0.7/manager.cpp
+--- kdebase-workspace-4.6.3/solid/networkmanager-0.7/manager.cpp 2011-04-01 12:52:43.000000000 +0200
++++ kdebase-workspace-4.6.3-nm-09-compat/solid/networkmanager-0.7/manager.cpp 2011-05-08 22:19:16.000000000 +0200
+@@ -21,7 +21,6 @@
#include "manager_p.h"
#include <KDebug>
@@ -237,7 +249,7 @@
#include "dbus/nm-deviceinterface.h"
#include "networkmanagerdefinitions.h"
-@@ -31,12 +30,12 @@ along with this program. If not, see <h
+@@ -31,12 +30,12 @@
#include "networkcdmainterface.h"
const QString NMNetworkManager::DBUS_SERVICE(QString::fromLatin1("org.freedesktop.NetworkManager"));
@@ -252,7 +264,7 @@
{
kDebug(1441) << NMNetworkManager::DBUS_SERVICE;
}
-@@ -118,16 +117,16 @@ QObject *NMNetworkManager::createNetwork
+@@ -118,16 +117,16 @@
uint deviceType = devIface.deviceType();
NMNetworkInterface * createdInterface = 0;
switch ( deviceType ) {
@@ -273,10 +285,10 @@
createdInterface = new NMCdmaNetworkInterface(uni, this, 0);
break;
/*
-diff -up kdebase-workspace-4.6.2/solid/networkmanager-0.7/manager.h.nm-09-compat kdebase-workspace-4.6.2/solid/networkmanager-0.7/manager.h
---- kdebase-workspace-4.6.2/solid/networkmanager-0.7/manager.h.nm-09-compat 2011-04-30 08:41:40.275615895 +0200
-+++ kdebase-workspace-4.6.2/solid/networkmanager-0.7/manager.h 2011-04-30 08:42:18.320140272 +0200
-@@ -25,6 +25,27 @@ along with this program. If not, see <h
+diff -ur kdebase-workspace-4.6.3/solid/networkmanager-0.7/manager.h kdebase-workspace-4.6.3-nm-09-compat/solid/networkmanager-0.7/manager.h
+--- kdebase-workspace-4.6.3/solid/networkmanager-0.7/manager.h 2011-02-25 22:54:49.000000000 +0100
++++ kdebase-workspace-4.6.3-nm-09-compat/solid/networkmanager-0.7/manager.h 2011-05-08 22:19:16.000000000 +0200
+@@ -25,6 +25,27 @@
#include <QDBusObjectPath>
#include <kdemacros.h>
@@ -304,14 +316,3 @@
class NMNetworkInterface;
class NMNetworkManagerPrivate;
---- kdebase-workspace-4.6.3/solid/CMakeLists.txt~ 2011-05-04 13:56:34.371290192 +0200
-+++ kdebase-workspace-4.6.3/solid/CMakeLists.txt 2011-05-04 14:07:07.630285468 +0200
-@@ -19,7 +19,7 @@
- add_subdirectory(networkmanager-0.6)
- endif (NM_0_6)
-
-- macro_ensure_version_range("0.7.0" ${NETWORKMANAGER_VERSION} "0.9.0" NM_0_7)
-+ macro_ensure_version_range("0.7.0" "0.8.0" "0.9.0" NM_0_7)
- if (NM_0_7)
- message(STATUS "Will build networkmanager-0.7")
- set(HAVE_NETWORKMANAGER TRUE)
================================================================
Index: packages/kde4-kdebase-workspace/kde4-kdebase-workspace.spec
diff -u packages/kde4-kdebase-workspace/kde4-kdebase-workspace.spec:1.270 packages/kde4-kdebase-workspace/kde4-kdebase-workspace.spec:1.271
--- packages/kde4-kdebase-workspace/kde4-kdebase-workspace.spec:1.270 Mon May 23 13:58:32 2011
+++ packages/kde4-kdebase-workspace/kde4-kdebase-workspace.spec Sun Jun 12 09:12:08 2011
@@ -8,12 +8,12 @@
Summary: KDE 4 base workspace components
Summary(pl.UTF-8): Podstawowe komponenty środowiska KDE 4
Name: kde4-kdebase-workspace
-Version: 4.6.3
-Release: 2
+Version: 4.6.4
+Release: 1
License: GPL v2+
Group: X11/Applications
Source0: ftp://ftp.kde.org/pub/kde/%{_state}/%{version}/src/%{orgname}-%{version}.tar.bz2
-# Source0-md5: 1e481727c3a5c2e4b751b9c56bd56583
+# Source0-md5: eeb5a8d65b74adaefbe86cadb4bf8ede
Source1: kdebase-kdesktop.pam
Source2: kdebase-kdm.pam
Source3: kdebase-kdm-np.pam
@@ -50,6 +50,7 @@
BuildRequires: libdbusmenu-qt-devel >= 0.6.0
BuildRequires: libdmtx-devel
BuildRequires: libggadget-qt-devel >= 0.11.0
+BuildRequires: libqalculate-devel
BuildRequires: libraw1394-devel
BuildRequires: libtirpc-devel
BuildRequires: libusb-compat-devel
@@ -1882,6 +1883,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.271 2011/06/12 07:12:08 arekm
+- up to 4.6.4
+
Revision 1.270 2011/05/23 11:58:32 lisu
- rel 2
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/kde4-kdebase-workspace/kde4-kdebase-workspace-nm-09-compat.patch?r1=1.2&r2=1.3&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/kde4-kdebase-workspace/kde4-kdebase-workspace.spec?r1=1.270&r2=1.271&f=u
More information about the pld-cvs-commit
mailing list