summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--meta-extras/packages/networkmanager/files/applet-no-gnome.diff17
-rw-r--r--meta-extras/packages/networkmanager/networkmanager-applet_svn.bb2
-rw-r--r--meta-extras/packages/networkmanager/networkmanager_svn.bb2
3 files changed, 14 insertions, 7 deletions
diff --git a/meta-extras/packages/networkmanager/files/applet-no-gnome.diff b/meta-extras/packages/networkmanager/files/applet-no-gnome.diff
index b8f949aa7..e098e8c9e 100644
--- a/meta-extras/packages/networkmanager/files/applet-no-gnome.diff
+++ b/meta-extras/packages/networkmanager/files/applet-no-gnome.diff
@@ -1,7 +1,12 @@
+---
+ configure.ac | 3 +--
+ src/main.c | 8 ++++++++
+ 2 files changed, 9 insertions(+), 2 deletions(-)
+
Index: src/main.c
===================================================================
---- src/main.c (revision 193)
-+++ src/main.c (working copy)
+--- src/main.c.orig 2007-09-26 10:39:16.000000000 +0100
++++ src/main.c 2007-09-26 10:39:37.000000000 +0100
@@ -27,7 +27,9 @@
#include <string.h>
@@ -28,7 +33,7 @@ Index: src/main.c
bindtextdomain (GETTEXT_PACKAGE, GNOMELOCALEDIR);
bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
-@@ -53,7 +59,9 @@
+@@ -53,7 +59,9 @@ int main (int argc, char *argv[])
gtk_main ();
g_object_unref (applet);
@@ -40,9 +45,9 @@ Index: src/main.c
}
Index: configure.ac
===================================================================
---- configure.ac (revision 193)
-+++ configure.ac (working copy)
-@@ -65,8 +65,7 @@
+--- configure.ac.orig 2007-09-26 10:39:30.000000000 +0100
++++ configure.ac 2007-09-26 10:39:37.000000000 +0100
+@@ -65,8 +65,7 @@ PKG_CHECK_MODULES(NMA,
gtk+-2.0 >= 2.6
libglade-2.0
gconf-2.0
diff --git a/meta-extras/packages/networkmanager/networkmanager-applet_svn.bb b/meta-extras/packages/networkmanager/networkmanager-applet_svn.bb
index 5a340d686..d61e134e9 100644
--- a/meta-extras/packages/networkmanager/networkmanager-applet_svn.bb
+++ b/meta-extras/packages/networkmanager/networkmanager-applet_svn.bb
@@ -9,6 +9,8 @@ inherit gnome gtk-icon-cache
SRC_URI = "svn://svn.gnome.org/svn/network-manager-applet/;module=trunk;proto=http \
file://applet-no-gnome.diff;patch=1;pnum=0"
+PV = "0.0+svnr${SRCREV}"
+
S = "${WORKDIR}/trunk"
FILES_${PN} += "${datadir}/nm-applet/ \
diff --git a/meta-extras/packages/networkmanager/networkmanager_svn.bb b/meta-extras/packages/networkmanager/networkmanager_svn.bb
index 5f05c1433..610bd01e7 100644
--- a/meta-extras/packages/networkmanager/networkmanager_svn.bb
+++ b/meta-extras/packages/networkmanager/networkmanager_svn.bb
@@ -6,7 +6,7 @@ PRIORITY = "optional"
DEPENDS = "libnl dbus dbus-glib hal gconf-dbus wireless-tools ppp"
RDEPENDS = "hal wpa-supplicant iproute2 dhcp-client"
-PV = "0.7+svn${SRCDATE}"
+PV = "0.7+svnr${SRCREV}"
PR = "r2"
SRC_URI="svn://svn.gnome.org/svn/NetworkManager/;module=trunk;proto=http \