diff options
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 b8f949aa74..e098e8c9ed 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 @@ | |||
| 1 | --- | ||
| 2 | configure.ac | 3 +-- | ||
| 3 | src/main.c | 8 ++++++++ | ||
| 4 | 2 files changed, 9 insertions(+), 2 deletions(-) | ||
| 5 | |||
| 1 | Index: src/main.c | 6 | Index: src/main.c |
| 2 | =================================================================== | 7 | =================================================================== |
| 3 | --- src/main.c (revision 193) | 8 | --- src/main.c.orig 2007-09-26 10:39:16.000000000 +0100 |
| 4 | +++ src/main.c (working copy) | 9 | +++ src/main.c 2007-09-26 10:39:37.000000000 +0100 |
| 5 | @@ -27,7 +27,9 @@ | 10 | @@ -27,7 +27,9 @@ |
| 6 | 11 | ||
| 7 | #include <string.h> | 12 | #include <string.h> |
| @@ -28,7 +33,7 @@ Index: src/main.c | |||
| 28 | 33 | ||
| 29 | bindtextdomain (GETTEXT_PACKAGE, GNOMELOCALEDIR); | 34 | bindtextdomain (GETTEXT_PACKAGE, GNOMELOCALEDIR); |
| 30 | bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8"); | 35 | bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8"); |
| 31 | @@ -53,7 +59,9 @@ | 36 | @@ -53,7 +59,9 @@ int main (int argc, char *argv[]) |
| 32 | gtk_main (); | 37 | gtk_main (); |
| 33 | 38 | ||
| 34 | g_object_unref (applet); | 39 | g_object_unref (applet); |
| @@ -40,9 +45,9 @@ Index: src/main.c | |||
| 40 | } | 45 | } |
| 41 | Index: configure.ac | 46 | Index: configure.ac |
| 42 | =================================================================== | 47 | =================================================================== |
| 43 | --- configure.ac (revision 193) | 48 | --- configure.ac.orig 2007-09-26 10:39:30.000000000 +0100 |
| 44 | +++ configure.ac (working copy) | 49 | +++ configure.ac 2007-09-26 10:39:37.000000000 +0100 |
| 45 | @@ -65,8 +65,7 @@ | 50 | @@ -65,8 +65,7 @@ PKG_CHECK_MODULES(NMA, |
| 46 | gtk+-2.0 >= 2.6 | 51 | gtk+-2.0 >= 2.6 |
| 47 | libglade-2.0 | 52 | libglade-2.0 |
| 48 | gconf-2.0 | 53 | gconf-2.0 |
diff --git a/meta-extras/packages/networkmanager/networkmanager-applet_svn.bb b/meta-extras/packages/networkmanager/networkmanager-applet_svn.bb index 5a340d6867..d61e134e96 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 | |||
| 9 | SRC_URI = "svn://svn.gnome.org/svn/network-manager-applet/;module=trunk;proto=http \ | 9 | SRC_URI = "svn://svn.gnome.org/svn/network-manager-applet/;module=trunk;proto=http \ |
| 10 | file://applet-no-gnome.diff;patch=1;pnum=0" | 10 | file://applet-no-gnome.diff;patch=1;pnum=0" |
| 11 | 11 | ||
| 12 | PV = "0.0+svnr${SRCREV}" | ||
| 13 | |||
| 12 | S = "${WORKDIR}/trunk" | 14 | S = "${WORKDIR}/trunk" |
| 13 | 15 | ||
| 14 | FILES_${PN} += "${datadir}/nm-applet/ \ | 16 | FILES_${PN} += "${datadir}/nm-applet/ \ |
diff --git a/meta-extras/packages/networkmanager/networkmanager_svn.bb b/meta-extras/packages/networkmanager/networkmanager_svn.bb index 5f05c1433d..610bd01e7e 100644 --- a/meta-extras/packages/networkmanager/networkmanager_svn.bb +++ b/meta-extras/packages/networkmanager/networkmanager_svn.bb | |||
| @@ -6,7 +6,7 @@ PRIORITY = "optional" | |||
| 6 | DEPENDS = "libnl dbus dbus-glib hal gconf-dbus wireless-tools ppp" | 6 | DEPENDS = "libnl dbus dbus-glib hal gconf-dbus wireless-tools ppp" |
| 7 | RDEPENDS = "hal wpa-supplicant iproute2 dhcp-client" | 7 | RDEPENDS = "hal wpa-supplicant iproute2 dhcp-client" |
| 8 | 8 | ||
| 9 | PV = "0.7+svn${SRCDATE}" | 9 | PV = "0.7+svnr${SRCREV}" |
| 10 | PR = "r2" | 10 | PR = "r2" |
| 11 | 11 | ||
| 12 | SRC_URI="svn://svn.gnome.org/svn/NetworkManager/;module=trunk;proto=http \ | 12 | SRC_URI="svn://svn.gnome.org/svn/NetworkManager/;module=trunk;proto=http \ |
