From ce0ce125656df5331f77f333a55cbfbb9c91fa59 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Andreas=20M=C3=BCller?= Date: Fri, 26 Sep 2014 12:38:29 +0200 Subject: [PATCH] network-manager-applet: update to 0.9.8.10 MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit * add libsecret to DEPENDS * remove libglade from DEPENDS * wireless (nm-signal-*.png) icons were updated upstream * inherit gnomebase instead of gnome * make bluetooth PACKAGECONFIG - disabled by default (From meta-openembedded rev: d6627b628b451b2bd57ededf9cad146d5bce73c9) Signed-off-by: Andreas Müller Signed-off-by: Patrick Ohly --- ...ses-and-properties-which-are-not-supporte.patch | 42 ++++----------------- .../files/icons/nm-signal-00.png | Bin 494 -> 0 bytes .../files/icons/nm-signal-100.png | Bin 413 -> 0 bytes .../files/icons/nm-signal-25.png | Bin 500 -> 0 bytes .../files/icons/nm-signal-50.png | Bin 496 -> 0 bytes .../files/icons/nm-signal-75.png | Bin 474 -> 0 bytes ...9.8.0.bb => network-manager-applet_0.9.8.10.bb} | 21 ++++------- 7 files changed, 15 insertions(+), 48 deletions(-) delete mode 100644 meta-openembedded/meta-gnome/recipes-connectivity/network-manager-applet/files/icons/nm-signal-00.png delete mode 100644 meta-openembedded/meta-gnome/recipes-connectivity/network-manager-applet/files/icons/nm-signal-100.png delete mode 100644 meta-openembedded/meta-gnome/recipes-connectivity/network-manager-applet/files/icons/nm-signal-25.png delete mode 100644 meta-openembedded/meta-gnome/recipes-connectivity/network-manager-applet/files/icons/nm-signal-50.png delete mode 100644 meta-openembedded/meta-gnome/recipes-connectivity/network-manager-applet/files/icons/nm-signal-75.png rename meta-openembedded/meta-gnome/recipes-connectivity/network-manager-applet/{network-manager-applet_0.9.8.0.bb => network-manager-applet_0.9.8.10.bb} (59%) diff --git a/meta-openembedded/meta-gnome/recipes-connectivity/network-manager-applet/files/0001-remove-classes-and-properties-which-are-not-supporte.patch b/meta-openembedded/meta-gnome/recipes-connectivity/network-manager-applet/files/0001-remove-classes-and-properties-which-are-not-supporte.patch index b8ba181..4bd0e4f 100644 --- a/meta-openembedded/meta-gnome/recipes-connectivity/network-manager-applet/files/0001-remove-classes-and-properties-which-are-not-supporte.patch +++ b/meta-openembedded/meta-gnome/recipes-connectivity/network-manager-applet/files/0001-remove-classes-and-properties-which-are-not-supporte.patch @@ -1,8 +1,7 @@ -From 023b17f53d888dfb45981b141ce4dc151ab140f0 Mon Sep 17 00:00:00 2001 +From c7d75ce38fa392c04c39a75e7b7e068666a7b1e7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20M=C3=BCller?= -Date: Thu, 4 Apr 2013 20:23:00 +0200 -Subject: [PATCH] remove classes and properties which are not supported by - gtk+ +Date: Tue, 8 Apr 2014 15:22:54 +0200 +Subject: [PATCH] remove classes and properties which are not supported by gtk+ MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit @@ -13,12 +12,11 @@ Upstream-Status: Inappropriate [configuration] Signed-off-by: Andreas Müller --- - src/connection-editor/ce-page-general.ui | 7 +------ - src/connection-editor/nm-connection-editor.ui | 2 +- - 2 files changed, 2 insertions(+), 7 deletions(-) + src/connection-editor/ce-page-general.ui | 3 --- + 1 file changed, 3 deletions(-) diff --git a/src/connection-editor/ce-page-general.ui b/src/connection-editor/ce-page-general.ui -index f505c14..a3e8d2b 100644 +index b05f0df..049432b 100644 --- a/src/connection-editor/ce-page-general.ui +++ b/src/connection-editor/ce-page-general.ui @@ -37,8 +37,6 @@ @@ -38,32 +36,6 @@ index f505c14..a3e8d2b 100644 True 0 True -@@ -86,11 +83,9 @@ - - - -- -+ - True - False -- start -- True - 6 - - -diff --git a/src/connection-editor/nm-connection-editor.ui b/src/connection-editor/nm-connection-editor.ui -index 74ee266..6f1e166 100644 ---- a/src/connection-editor/nm-connection-editor.ui -+++ b/src/connection-editor/nm-connection-editor.ui -@@ -11,7 +11,7 @@ - preferences-system-network - dialog - -- -+ - True - False - vertical -- -1.7.6.5 +1.8.3.1 diff --git a/meta-openembedded/meta-gnome/recipes-connectivity/network-manager-applet/files/icons/nm-signal-00.png b/meta-openembedded/meta-gnome/recipes-connectivity/network-manager-applet/files/icons/nm-signal-00.png deleted file mode 100644 index 836e723a2f53624d375650a8939dcc20b6a582eb..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 494 zcmeAS@N?(olHy`uVBq!ia0vp^Vj#@H1|*Mc$*~4fY)RhkE)4%caKYZ?lYt_f1s;*b z3=G`DAk4@xYmNj^kiEpy*OmP)3#Txr+V|l6HlUDVW=KSdbAE1aYF-JD%fR4Vl$uzQ znxasiS(2d;l98(5?&%wlyJ0#|iqX&0#WBR<^xKeye$I{pbMDUEyTsq5LrtT}QK;#l zeW;9zMU$g|%Ks)6MaM>EM)#~!>L1+s8Q<@?F6Q-FLE_rmyKmpTJ9Cfe|F_#|wvU$^ z*WFE8m7jV&eEL?#j57sgbra85GiwWNEC2TFeD#)n+z(v2EI1duWbN5~d-kn+OD*jz zTa_NU5LX13j^XNtq~Qz2)z%Q3!G)=_dOKM=O&$H#~J+Dr{B`1txA)B>7J z^XE*`J+9s5&bjzvm1FAyC!N*@Un1W=YgnFp`e!54M5b$7I+=8|R32B$_^bJ6vt8lk zdHnI;W{o8t8p2Z#EOIC}*~Sv#CBfI;s=uV;&u>Ylr9P~x5}e0_5*Dsn^~SojW6Jif zg9_=(oyyNA)oI>au&Uuv;*uA4cJH$9eRqF$SC+wxADT<^1R|fkE%(Xb1pKiac14LJ8nvfa$-oqo*BXW{_NQ!eu(M+x3^-Ycji~mu`zkP?%cA?!Jl5F zzuY0$|GUFB{{6gTkN7UCGxRNNEsVct&CPtEXmhwt2U|Y3x!d%N6=FaCOnMx?xV}WR z`>msW-J)IR7g?&zF|W%ti!0e!D|poL_~o0KCI6czEPX7>t*~rUx&d>K!uGhMHu2H! zJ_1@dyjG()dPCF(hF;-q&Ss>$_;Pv*#)3D>~3>*VO z!ybP0l+XkKkVl`x diff --git a/meta-openembedded/meta-gnome/recipes-connectivity/network-manager-applet/files/icons/nm-signal-25.png b/meta-openembedded/meta-gnome/recipes-connectivity/network-manager-applet/files/icons/nm-signal-25.png deleted file mode 100644 index 362960b8e744e5dcf34a29e85dff27670d043900..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 500 zcmeAS@N?(olHy`uVBq!ia0vp^Vj#@H1|*Mc$*~4fY)RhkE)4%caKYZ?lYt_f1s;*b z3=G`DAk4@xYmNj^kiEpy*OmP)3#Tv_Yn`O8IZ#M3GbEzKIX^cyHLnE7WngeFN=+%?lQ$+a`*&Yc&+q|ll0|AE2$?`+H1*Q{B${e1P7eQXaVmaLF$xWX+FKK=RB znuyJNH?!|@4pk5?D`hLQnl`OnvW>@J>$#vU(dFzvBcHu92z9VB+P8P-It5OqqsN|! zonh)}SyJwMHmlcqR=NsX^HC?Rrq;+3Ctvlw*^K?KrhVowsVMMRrC$_r@WPqrmw)_t zl=(2ZxnPU+p5=lEnNM|lB}gT%@-S)_DPP>q)WPwt^7mOz<;@~)PG=TumN+gUc>KI& zxbhw6x=p=z%17^4bEFr3Mc0; mTVyC3oOJ8^EB1Mh?7PhU#q3uc5qB;G1-_@NpUXO@geCxTwZc9C diff --git a/meta-openembedded/meta-gnome/recipes-connectivity/network-manager-applet/files/icons/nm-signal-50.png b/meta-openembedded/meta-gnome/recipes-connectivity/network-manager-applet/files/icons/nm-signal-50.png deleted file mode 100644 index 1add41dcbd48a18c4637d46868b1c5b1cf3f3e35..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 496 zcmeAS@N?(olHy`uVBq!ia0vp^Vj#@H1|*Mc$*~4fY)RhkE)4%caKYZ?lYt_f1s;*b z3=G`DAk4@xYmNj^kiEpy*OmP)3#Txr*{dh@kAOmonIRD+&iT2ysd*(pE(3#eQEFmI zYKlU6W=V!ZNJgrHyQgnJ?uO|=DaHU#7sn8b({Dqp{SG?_)PD9p%PQdO)spd|mbXPI zP{GS@f|2+F7pFxXCo~-vI&3Luh*2plo7VJWbD07s+eL$`Z*F}4@@(%-)_;$;H(P!4 zmwvwHz?F4p^77XiGYNDS6jp{_vu0lXwVczdG4WL~PPoy-@-OU)~q z99-+3pL=vcDMNs8=bYjMr2}tPTIAcZ7r*|$4ZH^ByWPtQTOtV*XKHso@L9ji$~8Y3$m0r;o4j zV=@VemEFUXC@mVzeV9ioSVw6>z;P>veJdx|zJL9MNATc_6RezzI3iy!e5KiT==yCF zNtefR-5yRd3o>STtceTUTc0xV@x}Db^SctQf@-$M|2Yu+$NdKjt4HyK2JyNmP!M~% L`njxgN@xNAAqunS diff --git a/meta-openembedded/meta-gnome/recipes-connectivity/network-manager-applet/network-manager-applet_0.9.8.0.bb b/meta-openembedded/meta-gnome/recipes-connectivity/network-manager-applet/network-manager-applet_0.9.8.10.bb similarity index 59% rename from meta-openembedded/meta-gnome/recipes-connectivity/network-manager-applet/network-manager-applet_0.9.8.0.bb rename to meta-openembedded/meta-gnome/recipes-connectivity/network-manager-applet/network-manager-applet_0.9.8.10.bb index 95c6802..e3c7663 100644 --- a/meta-openembedded/meta-gnome/recipes-connectivity/network-manager-applet/network-manager-applet_0.9.8.0.bb +++ b/meta-openembedded/meta-gnome/recipes-connectivity/network-manager-applet/network-manager-applet_0.9.8.10.bb @@ -2,27 +2,26 @@ SUMMARY = "GTK+ applet for NetworkManager" LICENSE = "GPLv2" LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552" -PNBLACKLIST[network-manager-applet] = "BROKEN: depends on broken networkmanager" +DEPENDS = "polkit-gnome libnotify libsecret networkmanager dbus-glib gconf gnome-keyring libgnome-keyring iso-codes" -DEPENDS = "gnome-bluetooth polkit-gnome libnotify networkmanager dbus-glib libglade gconf gnome-keyring libgnome-keyring iso-codes" - -inherit gnome gtk-icon-cache +inherit gnomebase gtk-icon-cache GNOME_COMPRESS_TYPE = "xz" SRC_URI += " \ file://0001-remove-classes-and-properties-which-are-not-supporte.patch \ - file://images/* \ " -SRC_URI[archive.md5sum] = "531ce56c51ec86c5d2dc4cbe58649583" -SRC_URI[archive.sha256sum] = "1afb6e736870ba95132bf0d211c46849e02a820ba3902a059a616be888053590" +SRC_URI[archive.md5sum] = "5148348c139229c6a753f815f3f11e1c" +SRC_URI[archive.sha256sum] = "46fee9a1e667d1826e6a94bb6bd2e6bdbde535fc995e534542f5f7e8b8dae0cb" # GTK2.x mode EXTRA_OECONF += " \ --with-gtkver=2 \ - --with-bluetooth=yes \ " +PACKAGECONFIG[bluetooth] = "--with-bluetooth,--without-bluetooth,gnome-bluetooth,gnome-bluetooth" +PACKAGECONFIG ??= "" + do_configure_append() { rm config.log # Sigh... --enable-compile-warnings=no doesn't actually turn off -Werror @@ -31,12 +30,8 @@ do_configure_append() { done } -do_install_append() { - install -m 0644 ${WORKDIR}/icons/* ${D}/usr/share/icons/hicolor/22x22/apps/ -} - RDEPENDS_${PN} =+ "networkmanager" -RRECOMMENDS_${PN} =+ "gnome-bluetooth gnome-keyring" +RRECOMMENDS_${PN} =+ "gnome-keyring" FILES_${PN} += " \ ${datadir}/nm-applet/ \ -- 2.7.4