[Buildroot] [PATCH 1/4] matchbox-panel: specify optional dependency on wireless_tools

[Buildroot] [PATCH 1/4] matchbox-panel: specify optional dependency on wireless_tools

[Arnout Vandecappelle]

Make sure build is reproducible and doesn't depend on the order.

There is no corresponding configure option, but configure looks for
iwlib.h

Cc: Jean-Paul Etienne <fractalclone@gmail.com>
Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
---
 package/matchbox/matchbox-panel/matchbox-panel.mk | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/package/matchbox/matchbox-panel/matchbox-panel.mk b/package/matchbox/matchbox-panel/matchbox-panel.mk
index 72ee286..9b3b6ac9 100644
--- a/package/matchbox/matchbox-panel/matchbox-panel.mk
+++ b/package/matchbox/matchbox-panel/matchbox-panel.mk
@@ -22,6 +22,10 @@ else
 MATCHBOX_PANEL_CONF_OPTS += --disable-startup-notification
 endif
 
+ifeq ($(BR2_PACKAGE_WIRELESS_TOOLS),y)
+MATCHBOX_PANEL_DEPENDENCIES += wireless_tools
+endif
+
 ################################################################################
 
 $(eval $(autotools-package))
-- 
2.1.4

[Buildroot] [PATCH 2/4] matchbox-panel: remove redundant hash lines

[Arnout Vandecappelle]

Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
---
 package/matchbox/matchbox-panel/matchbox-panel.mk | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/package/matchbox/matchbox-panel/matchbox-panel.mk b/package/matchbox/matchbox-panel/matchbox-panel.mk
index 9b3b6ac9..d3efed9 100644
--- a/package/matchbox/matchbox-panel/matchbox-panel.mk
+++ b/package/matchbox/matchbox-panel/matchbox-panel.mk
@@ -13,8 +13,6 @@ MATCHBOX_PANEL_LICENSE_FILES = COPYING
 MATCHBOX_PANEL_DEPENDENCIES = matchbox-lib
 MATCHBOX_PANEL_CONF_OPTS = --enable-expat
 
-################################################################################
-
 ifeq ($(BR2_PACKAGE_STARTUP_NOTIFICATION),y)
 MATCHBOX_PANEL_CONF_OPTS += --enable-startup-notification
 MATCHBOX_PANEL_DEPENDENCIES += startup-notification matchbox-startup-monitor
@@ -26,6 +24,4 @@ ifeq ($(BR2_PACKAGE_WIRELESS_TOOLS),y)
 MATCHBOX_PANEL_DEPENDENCIES += wireless_tools
 endif
 
-################################################################################
-
 $(eval $(autotools-package))
-- 
2.1.4

[Buildroot] [PATCH 3/4] matchbox-panel: rename patch to the new naming convention

[Arnout Vandecappelle]

Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
---
 ...chbox-panel-0.9.3-index-is-legacy.patch => 0001-index-is-legacy.patch} | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename package/matchbox/matchbox-panel/{matchbox-panel-0.9.3-index-is-legacy.patch => 0001-index-is-legacy.patch} (100%)

diff --git a/package/matchbox/matchbox-panel/matchbox-panel-0.9.3-index-is-legacy.patch b/package/matchbox/matchbox-panel/0001-index-is-legacy.patch
similarity index 100%
rename from package/matchbox/matchbox-panel/matchbox-panel-0.9.3-index-is-legacy.patch
rename to package/matchbox/matchbox-panel/0001-index-is-legacy.patch
-- 
2.1.4

[Buildroot] [PATCH 4/4] matchbox-panel: fixed undefined reference to `log' and `lrint'

[Arnout Vandecappelle]

From: Jean-Paul Etienne <fractalclone@gmail.com>

Encountered the following while compiling matchbox-panel

mb-applet-wireless.o: In function `update_wireless':
.. matchbox-panel-0.9.3/applets/mb-applet-wireless.c:143: undefined reference to `log'
.. matchbox-panel-0.9.3/applets/mb-applet-wireless.c:143: undefined reference to `lrint'

fixed the issue by adding
1) #include <math.h> in mb-applet-wireless.c
2) -lm option to WIRELESS_LIB in applets/Makefile.in

Signed-off-by: Jean-Paul Etienne <fractalclone@gmail.com>
Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
[arnout: rename patch and add description and Signed-off-by]

Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
---
 .../matchbox-panel/0002-mb-applet-wireless.patch   | 34 ++++++++++++++++++++++
 1 file changed, 34 insertions(+)
 create mode 100644 package/matchbox/matchbox-panel/0002-mb-applet-wireless.patch

diff --git a/package/matchbox/matchbox-panel/0002-mb-applet-wireless.patch b/package/matchbox/matchbox-panel/0002-mb-applet-wireless.patch
new file mode 100644
index 0000000..93633b3
--- /dev/null
+++ b/package/matchbox/matchbox-panel/0002-mb-applet-wireless.patch
@@ -0,0 +1,34 @@
+mb-applet-wireless: fix undefined reference to `log' and `lrint'
+
+mb-applet-wireless.o: In function `update_wireless':
+.. matchbox-panel-0.9.3/applets/mb-applet-wireless.c:143: undefined reference to `log'
+.. matchbox-panel-0.9.3/applets/mb-applet-wireless.c:143: undefined reference to `lrint'
+
+Signed-off-by: Jean-Paul Etienne <fractalclone@gmail.com>
+Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
+[arnout: add description and Signed-off-by]
+---
+diff -rup matchbox-panel-0.9.3.orig/applets/Makefile.in matchbox-panel-0.9.3/applets/Makefile.in
+--- matchbox-panel-0.9.3.orig/applets/Makefile.in	2015-01-23 00:16:47.594850985 +0100
++++ matchbox-panel-0.9.3/applets/Makefile.in	2015-01-23 00:15:18.458694947 +0100
+@@ -198,7 +198,7 @@ WANT_SMALL_ICONS_FALSE = @WANT_SMALL_ICO
+ WANT_SMALL_ICONS_TRUE = @WANT_SMALL_ICONS_TRUE@
+ WANT_WIFI_FALSE = @WANT_WIFI_FALSE@
+ WANT_WIFI_TRUE = @WANT_WIFI_TRUE@
+-WIRELESS_LIBS = @WIRELESS_LIBS@
++WIRELESS_LIBS = @WIRELESS_LIBS@ -lm
+ XGETTEXT = @XGETTEXT@
+ ac_ct_CC = @ac_ct_CC@
+ ac_ct_STRIP = @ac_ct_STRIP@
+diff -rup matchbox-panel-0.9.3.orig/applets/mb-applet-wireless.c matchbox-panel-0.9.3/applets/mb-applet-wireless.c
+--- matchbox-panel-0.9.3.orig/applets/mb-applet-wireless.c	2015-01-23 00:16:31.531822865 +0100
++++ matchbox-panel-0.9.3/applets/mb-applet-wireless.c	2015-01-23 00:03:43.067563827 +0100
+@@ -50,6 +50,8 @@
+ 
+ #endif
+ 
++#include <math.h>
++
+ #ifdef MB_HAVE_PNG
+ #define IMG_EXT "png"
+ #else
-- 
2.1.4

[Buildroot] [PATCH 1/4] matchbox-panel: specify optional dependency on wireless_tools

[Peter Korsgaard]

>>>>> "Arnout" == Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be> writes:

 > Make sure build is reproducible and doesn't depend on the order.
 > There is no corresponding configure option, but configure looks for
 > iwlib.h

 > Cc: Jean-Paul Etienne <fractalclone@gmail.com>
 > Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>

Committed series, thanks.

-- 
Bye, Peter Korsgaard