matchbox: huge cleanups (branch yem/matchbox)
cover matchbox: huge cleanups (branch yem/matchbox)
Hello All!
This series is an attempt at cleaning up the matchbox packages.
Currently, the matchbox pckages are in a dire situation, where some package do not even have a corresponding BR2_PACKAGE_FOO option, but are nonetheless build dependencies ones of others.
Also, some support code has been bit-rotting and is not even buildable today, ike support for compositing, which simply FTBFS.
Finally, some dependencies are incorrect. For example, there are build dependencies not expressed in the Kconfig (not even counting the missing Kconfig entries for packages), or are entirely wrong.
So, this series aims at fixing all of this. And add a little bit of extra features we're currently missing. Not everything that is possible with matchbox has been handled, though, like support for NLS.
The series is split into multiple parts;
- patches 1-9 make all packages real packages, i.e. with proper Kconfig options. No functionality change.
- patches 10-13 do a little eye-candy cleanups. No functionality change.
- patches 14-17 fixes dependencies. No functionality change done on purpose, except because of added proper dependency tracking.
- patch 18 stands out alone, a bit of eye-candy to add prompts for previously prompt-less packages. No functionality change.
- patches 19-30 are not really sorted. They ar ea mix of fixes, eye-candy and the few new features.
This has been build-tested only, with about every combinations possible excercised, for ARM. No run-time testing has been done, though.
Enjoy! ;-)
Regards,
Yann E. MORIN.
The following changes since commit d3230923e62f57cdefa90b5ffb9760f39c94718e:
package/shairport-sync: bump to version 2.2.3 (2015-04-22 15:07:55 +0200)
are available in the git repository at:
git://git.busybox.net/~ymorin/git/buildroot yem/matchbox
for you to fetch changes up to 3de1b4334c76469f95d791d578f769831ab2f3a5:
package/matchbox-panel: fix WiFi monitoring (2015-04-22 19:45:03 +0200)
----------------------------------------------------------------
Yann E. MORIN (30):
package/matchbox: make matchbox-lib a real package package/matchbox: make matchbox-wm a real package package/matchbox-wm: drop useless commented options package/matchbox: make matchbox-panel a real package package/matchbox: make matchbox-desktop a real package package/matchbox: make matchbox-common a real package package/matchbox: make matchbox-fakekey a real package package/matchbox: make matchbox-keyboard a real package package/matchbox: make match-startup-monitor a real package package/matchbox: remove superfluous conditional includes package/matchbox: point to new home
package/matchbox: get rid of intermediate non-package matchbox package/matchbox: fix option prompts package/matchbox-common: fix dependencies package/matchbox-common: break dependency chain for display package/matchbox-fakekey: add missing dependency package/matchbox-startup-monitor: add misisng dependency package/matchbox: finally add prompts to all sub-packages package/matchbox: enable support for the Xsession manager package/matchbox: cleanup handling of support for compositing package/matchbox: make it a menu
package/matchbox: forcibly disable support for compositing package/matchbox: drop useless dependencies package/matchbox-keyboard: enforce disabling support for cairo package/matchbox-common: explicitly disable PDA folders when not selected package/matchbox: wrap long lines
package/matchbox: xlib-libXcursor is an optional dependency package/matchbox-panel: add option to use ACPI for the battery applet package/matchbox-panel: add support for dnotify package/matchbox-panel: fix WiFi monitoring
.../{matchbox-wm => }/0001-defaulttheme.patch | 0
package/matchbox/Config.in | 45 +++++--------------
package/matchbox/matchbox-common/Config.in | 14 ++++++
.../matchbox/matchbox-common/matchbox-common.mk | 2 +
package/matchbox/matchbox-desktop/Config.in | 5 +++
package/matchbox/matchbox-fakekey/Config.in | 5 +++
package/matchbox/matchbox-keyboard/Config.in | 7 +++
.../matchbox-keyboard/matchbox-keyboard.mk | 4 +-
package/matchbox/matchbox-lib/Config.in | 4 ++
package/matchbox/matchbox-lib/matchbox-lib.mk | 3 +-
package/matchbox/matchbox-panel/Config.in | 28 ++++++++++++
package/matchbox/matchbox-panel/matchbox-panel.mk | 18 ++++++--
.../matchbox/matchbox-startup-monitor/Config.in | 5 +++
package/matchbox/matchbox-wm/matchbox-wm.mk | 41 ------------------
.../matchbox-wm.hash => matchbox.hash} | 0
package/matchbox/matchbox.mk | 50 ++++++++++++++++++++--
16 files changed, 148 insertions(+), 83 deletions(-)
rename package/matchbox/{matchbox-wm => }/0001-defaulttheme.patch (100%)
create mode 100644 package/matchbox/matchbox-common/Config.in
create mode 100644 package/matchbox/matchbox-desktop/Config.in
create mode 100644 package/matchbox/matchbox-fakekey/Config.in
create mode 100644 package/matchbox/matchbox-keyboard/Config.in
create mode 100644 package/matchbox/matchbox-lib/Config.in
create mode 100644 package/matchbox/matchbox-panel/Config.in
create mode 100644 package/matchbox/matchbox-startup-monitor/Config.in
delete mode 100644 package/matchbox/matchbox-wm/matchbox-wm.mk
rename package/matchbox/{matchbox-wm/matchbox-wm.hash => matchbox.hash} (100%)Signature · 6 lines
.-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 223 225 172 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------'
PATCH 1/30 package/matchbox: make matchbox-lib a real package
Currently, the matchbox package is using weird, legacy constrcuts to build its different parts.
Notably, it adds matchbox-lib to the list of packages to build, even though it is not a real package since it does not have a Kconfig entry.
Fix that:
- add a Kconfig entry for matchbox-lib
- select it from the top-level matchbox package
Note that matchbox-common already depends on matchbox-lib.
--- package/matchbox/Config.in | 3 +++ package/matchbox/matchbox-lib/Config.in | 2 ++ package/matchbox/matchbox.mk | 2 +- 3 files changed, 6 insertions(+), 1 deletion(-) create mode 100644 package/matchbox/matchbox-lib/Config.in
package/matchbox/Config.in +3 -0
@@ -7,6 +7,7 @@ config BR2_PACKAGE_MATCHBOX select BR2_PACKAGE_XLIB_LIBXEXT select BR2_PACKAGE_XLIB_LIBXDAMAGE select BR2_PACKAGE_XLIB_LIBXCURSOR + select BR2_PACKAGE_MATCHBOX_LIB help Matchbox is an Open Source base environment for the X Window System running on non-desktop embedded platforms such as
@@ -17,6 +18,8 @@ config BR2_PACKAGE_MATCHBOX if BR2_PACKAGE_MATCHBOX +source "package/matchbox/matchbox-lib/Config.in" + config BR2_PACKAGE_MATCHBOX_PANEL bool "Matchbox Panel" help
package/matchbox/matchbox-lib/Config.in new file +2 -0
@@ -0,0 +1,2 @@ +config BR2_PACKAGE_MATCHBOX_LIB + bool
package/matchbox/matchbox.mk +1 -1
@@ -1,4 +1,4 @@ ifeq ($(BR2_PACKAGE_MATCHBOX),y) include $(sort $(wildcard package/matchbox/*/*.mk)) -PACKAGES += matchbox-lib matchbox-wm +PACKAGES += matchbox-wm endif
Signature · 1 line
1.9.1
PATCH 1/30 package/matchbox: make matchbox-lib a real package
Quoted 6 lines · Yann E. MORIN
Currently, the matchbox package is using weird, legacy constrcuts to build its different parts.
Notably, it adds matchbox-lib to the list of packages to build, even though it is not a real package since it does not have a
Kconfigentry.
Quoted 7 lines
Fix that:
- add aKconfigentry for matchbox-lib
- select it from the top-level matchbox packageNote that matchbox-common already depends on matchbox-lib.
Signed-off-by "Yann E. MORIN" <[email protected]>
Some suggestions below for handling the one-level-less approach.
Quoted 20 lines
--- package/matchbox/Config.in | 3 +++ package/matchbox/matchbox-lib/Config.in | 2 ++ package/matchbox/matchbox.mk | 2 +- 3 files changed, 6 insertions(+), 1 deletion(-) create mode 100644 package/matchbox/matchbox-lib/Config.inpackage/matchbox/Config.in +1
-0@@ -7,6 +7,7 @@ config BR2_PACKAGE_MATCHBOX select BR2_PACKAGE_XLIB_LIBXEXT select BR2_PACKAGE_XLIB_LIBXDAMAGE select BR2_PACKAGE_XLIB_LIBXCURSOR + select BR2_PACKAGE_MATCHBOX_LIB help Matchbox is an Open Source base environment for the X Window System running on non-desktop embedded platforms such as
package/matchbox/Config.in config BR2_PACKAGE_MATCHBOX · line 21
Quoted 4 lines
package/matchbox/Config.in +1
-0@@ -17,6 +18,8 @@ config BR2_PACKAGE_MATCHBOX if BR2_PACKAGE_MATCHBOX +source "package/matchbox/matchbox-lib/Config.in"
This should obviously move to package/Config.in, and the condition should be
copied.
Regards,
Arnout
Quoted 23 lines
package/matchbox/Config.in +1
-0+ config BR2_PACKAGE_MATCHBOX_PANEL bool "Matchbox Panel" helppackage/matchbox/matchbox-lib/Config.in new file +2
-0@@ -0,0 +1,2 @@ +config BR2_PACKAGE_MATCHBOX_LIB + boolpackage/matchbox/matchbox.mk +1
-1@@ -1,4 +1,4 @@ ifeq ($(BR2_PACKAGE_MATCHBOX),y) include $(sort $(wildcard package/matchbox/*/*.mk)) -PACKAGES += matchbox-lib matchbox-wm +PACKAGES += matchbox-wm endif
Signature · 6 lines
Arnout Vandecappelle arnout at mind be Senior Embedded Software Architect +32-16-286500 Essensium/Mind http://www.mind.be G.Geenslaan 9, 3001 Leuven, Belgium BE 872 984 063 RPR Leuven LinkedIn profile: http://www.linkedin.com/in/arnoutvandecappelle GPG fingerprint: 7CB5 E4CC 6C2E EFD4 6E3D A754 F963 ECAB 2450 2F1F
PATCH 2/30 package/matchbox: make matchbox-wm a real package
In reply to Yann E. MORINSimilarly to what we just did for matchbox-lib, we make matchbox-wm a real package.
--- package/matchbox/Config.in | 2 ++ package/matchbox/matchbox-wm/Config.in | 3 +++ package/matchbox/matchbox.mk | 1 - 3 files changed, 5 insertions(+), 1 deletion(-) create mode 100644 package/matchbox/matchbox-wm/Config.in
package/matchbox/Config.in +2 -0
@@ -8,6 +8,7 @@ config BR2_PACKAGE_MATCHBOX select BR2_PACKAGE_XLIB_LIBXDAMAGE select BR2_PACKAGE_XLIB_LIBXCURSOR select BR2_PACKAGE_MATCHBOX_LIB + select BR2_PACKAGE_MATCHBOX_WM help Matchbox is an Open Source base environment for the X Window System running on non-desktop embedded platforms such as
@@ -19,6 +20,7 @@ config BR2_PACKAGE_MATCHBOX if BR2_PACKAGE_MATCHBOX source "package/matchbox/matchbox-lib/Config.in" +source "package/matchbox/matchbox-wm/Config.in" config BR2_PACKAGE_MATCHBOX_PANEL bool "Matchbox Panel"
package/matchbox/matchbox-wm/Config.in new file +3 -0
@@ -0,0 +1,3 @@ +config BR2_PACKAGE_MATCHBOX_WM + bool + select BR2_PACKAGE_MATCHBOX_LIB
package/matchbox/matchbox.mk +0 -1
@@ -1,4 +1,3 @@ ifeq ($(BR2_PACKAGE_MATCHBOX),y) include $(sort $(wildcard package/matchbox/*/*.mk)) -PACKAGES += matchbox-wm endif
Signature · 1 line
1.9.1
PATCH 2/30 package/matchbox: make matchbox-wm a real package
Quoted 4 lines · Yann E. MORIN
Similarly to what we just did for matchbox-lib, we make matchbox-wm a real package.
Signed-off-by "Yann E. MORIN" <[email protected]>
(on condition that it goes to package/matchbox-wm)
Regards,
Arnout
Quoted 46 lines
--- package/matchbox/Config.in | 2 ++ package/matchbox/matchbox-wm/Config.in | 3 +++ package/matchbox/matchbox.mk | 1 - 3 files changed, 5 insertions(+), 1 deletion(-) create mode 100644 package/matchbox/matchbox-wm/Config.inpackage/matchbox/Config.in +2
-0@@ -8,6 +8,7 @@ config BR2_PACKAGE_MATCHBOX select BR2_PACKAGE_XLIB_LIBXDAMAGE select BR2_PACKAGE_XLIB_LIBXCURSOR select BR2_PACKAGE_MATCHBOX_LIB + select BR2_PACKAGE_MATCHBOX_WM help Matchbox is an Open Source base environment for the X Window System running on non-desktop embedded platforms such as@@ -19,6 +20,7 @@ config BR2_PACKAGE_MATCHBOX if BR2_PACKAGE_MATCHBOX source "package/matchbox/matchbox-lib/Config.in" +source "package/matchbox/matchbox-wm/Config.in" config BR2_PACKAGE_MATCHBOX_PANEL bool "Matchbox Panel"package/matchbox/matchbox-wm/Config.in new file +3
-0@@ -0,0 +1,3 @@ +config BR2_PACKAGE_MATCHBOX_WM + bool + select BR2_PACKAGE_MATCHBOX_LIBpackage/matchbox/matchbox.mk +0
-1@@ -1,4 +1,3 @@ ifeq ($(BR2_PACKAGE_MATCHBOX),y) include $(sort $(wildcard package/matchbox/*/*.mk)) -PACKAGES += matchbox-wm endif
Signature · 6 lines
Arnout Vandecappelle arnout at mind be Senior Embedded Software Architect +32-16-286500 Essensium/Mind http://www.mind.be G.Geenslaan 9, 3001 Leuven, Belgium BE 872 984 063 RPR Leuven LinkedIn profile: http://www.linkedin.com/in/arnoutvandecappelle GPG fingerprint: 7CB5 E4CC 6C2E EFD4 6E3D A754 F963 ECAB 2450 2F1F
PATCH 2/30 package/matchbox: make matchbox-wm a real package
Quoted 9 lines · Arnout Vandecappelle
Quoted 4 lines · Yann E. MORIN
Similarly to what we just did for matchbox-lib, we make matchbox-wm a real package.
Signed-off-by "Yann E. MORIN" <[email protected]>(on condition that it goes to package/matchbox-wm)
As discussed on IRC: moving all matchbox packages one directory up is for a
later patch, so this patch is good as it is.
Regards,
Arnout
Quoted 52 lines
Regards,
ArnoutQuoted 46 lines
--- package/matchbox/Config.in | 2 ++ package/matchbox/matchbox-wm/Config.in | 3 +++ package/matchbox/matchbox.mk | 1 - 3 files changed, 5 insertions(+), 1 deletion(-) create mode 100644 package/matchbox/matchbox-wm/Config.inpackage/matchbox/Config.in +2
-0@@ -8,6 +8,7 @@ config BR2_PACKAGE_MATCHBOX select BR2_PACKAGE_XLIB_LIBXDAMAGE select BR2_PACKAGE_XLIB_LIBXCURSOR select BR2_PACKAGE_MATCHBOX_LIB + select BR2_PACKAGE_MATCHBOX_WM help Matchbox is an Open Source base environment for the X Window System running on non-desktop embedded platforms such as@@ -19,6 +20,7 @@ config BR2_PACKAGE_MATCHBOX if BR2_PACKAGE_MATCHBOX source "package/matchbox/matchbox-lib/Config.in" +source "package/matchbox/matchbox-wm/Config.in" config BR2_PACKAGE_MATCHBOX_PANEL bool "Matchbox Panel"package/matchbox/matchbox-wm/Config.in new file +3
-0@@ -0,0 +1,3 @@ +config BR2_PACKAGE_MATCHBOX_WM + bool + select BR2_PACKAGE_MATCHBOX_LIBpackage/matchbox/matchbox.mk +0
-1@@ -1,4 +1,3 @@ ifeq ($(BR2_PACKAGE_MATCHBOX),y) include $(sort $(wildcard package/matchbox/*/*.mk)) -PACKAGES += matchbox-wm endif
Signature · 6 lines
Arnout Vandecappelle arnout at mind be Senior Embedded Software Architect +32-16-286500 Essensium/Mind http://www.mind.be G.Geenslaan 9, 3001 Leuven, Belgium BE 872 984 063 RPR Leuven LinkedIn profile: http://www.linkedin.com/in/arnoutvandecappelle GPG fingerprint: 7CB5 E4CC 6C2E EFD4 6E3D A754 F963 ECAB 2450 2F1F
PATCH 3/30 package/matchbox-wm: drop useless commented options
In reply to Yann E. MORIN--- package/matchbox/matchbox-wm/matchbox-wm.mk | 3 --- 1 file changed, 3 deletions(-)
package/matchbox/matchbox-wm/matchbox-wm.mk +0 -3
@@ -25,10 +25,7 @@ endif endif ifeq ($(BR2_PACKAGE_XLIB_LIBXFT),y) -#MATCHBOX_WM_OPTS += --enable-standalone-xft MATCHBOX_WM_DEPENDENCIES += xlib_libXft -else -#MATCHBOX_WM_OPTS += --disable-standalone-xft endif ifeq ($(BR2_PACKAGE_STARTUP_NOTIFICATION),y)
Signature · 1 line
1.9.1
PATCH 3/30 package/matchbox-wm: drop useless commented options
Quoted 1 line · Yann E. MORIN
Signed-off-by "Yann E. MORIN" <[email protected]>
I'd put this one at the beginning of the series though since it's the simplest
of them all and can be accepted quickly. Perhaps it's already gone by the time you respin :-).
Regards,
Arnout
Quoted 20 lines
--- package/matchbox/matchbox-wm/matchbox-wm.mk | 3 --- 1 file changed, 3 deletions(-)package/matchbox/matchbox-wm/matchbox-wm.mk +0
-3@@ -25,10 +25,7 @@ endif endif ifeq ($(BR2_PACKAGE_XLIB_LIBXFT),y) -#MATCHBOX_WM_OPTS += --enable-standalone-xft MATCHBOX_WM_DEPENDENCIES += xlib_libXft -else -#MATCHBOX_WM_OPTS += --disable-standalone-xft endif ifeq ($(BR2_PACKAGE_STARTUP_NOTIFICATION),y)
Signature · 6 lines
Arnout Vandecappelle arnout at mind be Senior Embedded Software Architect +32-16-286500 Essensium/Mind http://www.mind.be G.Geenslaan 9, 3001 Leuven, Belgium BE 872 984 063 RPR Leuven LinkedIn profile: http://www.linkedin.com/in/arnoutvandecappelle GPG fingerprint: 7CB5 E4CC 6C2E EFD4 6E3D A754 F963 ECAB 2450 2F1F
PATCH 4/30 package/matchbox: make matchbox-panel a real package
In reply to Yann E. MORINCurrently, matchbox-panel is treated as if it were an option of the matchbox package.
But that's not true, since it is a real package all by itself, with its own archive and its own buildsystem.
So, make it a real package.
--- package/matchbox/Config.in | 7 +------ package/matchbox/matchbox-panel/Config.in | 6 ++++++ 2 files changed, 7 insertions(+), 6 deletions(-) create mode 100644 package/matchbox/matchbox-panel/Config.in
package/matchbox/Config.in +1 -6
@@ -21,12 +21,7 @@ if BR2_PACKAGE_MATCHBOX source "package/matchbox/matchbox-lib/Config.in" source "package/matchbox/matchbox-wm/Config.in" - -config BR2_PACKAGE_MATCHBOX_PANEL - bool "Matchbox Panel" - help - A flexible always present 'window bar' for holding - application launchers. +source "package/matchbox/matchbox-panel/Config.in" config BR2_PACKAGE_MATCHBOX_DESKTOP bool "Matchbox Desktop"
package/matchbox/matchbox-panel/Config.in new file +6 -0
@@ -0,0 +1,6 @@ +config BR2_PACKAGE_MATCHBOX_PANEL + bool "Matchbox Panel" + select BR2_PACKAGE_MATCHBOX_LIB + help + A flexible always present 'window bar' for holding + application launchers.
Signature · 1 line
1.9.1
PATCH 4/30 package/matchbox: make matchbox-panel a real package
Quoted 9 lines · Yann E. MORIN
Currently, matchbox-panel is treated as if it were an option of the matchbox package.
But that's not true, since it is a real package all by itself, with its own archive and its own buildsystem.
So, make it a real package.
Signed-off-by "Yann E. MORIN" <[email protected]>
(on condition that it goes to matchbox/matchbox-panel)
Regards,
Arnout
Quoted 37 lines
--- package/matchbox/Config.in | 7 +------ package/matchbox/matchbox-panel/Config.in | 6 ++++++ 2 files changed, 7 insertions(+), 6 deletions(-) create mode 100644 package/matchbox/matchbox-panel/Config.inpackage/matchbox/Config.in +1
-6@@ -21,12 +21,7 @@ if BR2_PACKAGE_MATCHBOX source "package/matchbox/matchbox-lib/Config.in" source "package/matchbox/matchbox-wm/Config.in" - -config BR2_PACKAGE_MATCHBOX_PANEL - bool "Matchbox Panel" - help - A flexible always present 'window bar' for holding - application launchers. +source "package/matchbox/matchbox-panel/Config.in" config BR2_PACKAGE_MATCHBOX_DESKTOP bool "Matchbox Desktop"package/matchbox/matchbox-panel/Config.in new file +6
-0@@ -0,0 +1,6 @@ +config BR2_PACKAGE_MATCHBOX_PANEL + bool "Matchbox Panel" + select BR2_PACKAGE_MATCHBOX_LIB + help + A flexible always present 'window bar' for holding + application launchers.
Signature · 6 lines
Arnout Vandecappelle arnout at mind be Senior Embedded Software Architect +32-16-286500 Essensium/Mind http://www.mind.be G.Geenslaan 9, 3001 Leuven, Belgium BE 872 984 063 RPR Leuven LinkedIn profile: http://www.linkedin.com/in/arnoutvandecappelle GPG fingerprint: 7CB5 E4CC 6C2E EFD4 6E3D A754 F963 ECAB 2450 2F1F
PATCH 4/30 package/matchbox: make matchbox-panel a real package
In reply to Yann E. MORINQuoted 39 lines · Yann E. MORIN
Currently, matchbox-panel is treated as if it were an option of the matchbox package.
But that's not true, since it is a real package all by itself, with its own archive and its own buildsystem.
So, make it a real package.
Signed-off-by "Yann E. MORIN" <[email protected]>--- package/matchbox/Config.in | 7 +------ package/matchbox/matchbox-panel/Config.in | 6 ++++++ 2 files changed, 7 insertions(+), 6 deletions(-) create mode 100644 package/matchbox/matchbox-panel/Config.inpackage/matchbox/Config.in +1
-6@@ -21,12 +21,7 @@ if BR2_PACKAGE_MATCHBOX source "package/matchbox/matchbox-lib/Config.in" source "package/matchbox/matchbox-wm/Config.in" - -config BR2_PACKAGE_MATCHBOX_PANEL - bool "Matchbox Panel" - help - A flexible always present 'window bar' for holding - application launchers. +source "package/matchbox/matchbox-panel/Config.in" config BR2_PACKAGE_MATCHBOX_DESKTOP bool "Matchbox Desktop"package/matchbox/matchbox-panel/Config.in new file +0
-0
package/matchbox/matchbox-panel/Config.in line 2
Quoted 2 lines
package/matchbox/matchbox-panel/Config.in new file +2
-0@@ -0,0 +1,6 @@ +config BR2_PACKAGE_MATCHBOX_PANEL + bool "Matchbox Panel"
Actually, to match our style, that should be "matchbox-panel". You can choose
if that is in this patch or in a mass cleanup patch later in the series.
Regards,
Arnout
Quoted 5 lines
package/matchbox/matchbox-panel/Config.in new file +4
-0+ select BR2_PACKAGE_MATCHBOX_LIB + help + A flexible always present 'window bar' for holding + application launchers.
Signature · 6 lines
Arnout Vandecappelle arnout at mind be Senior Embedded Software Architect +32-16-286500 Essensium/Mind http://www.mind.be G.Geenslaan 9, 3001 Leuven, Belgium BE 872 984 063 RPR Leuven LinkedIn profile: http://www.linkedin.com/in/arnoutvandecappelle GPG fingerprint: 7CB5 E4CC 6C2E EFD4 6E3D A754 F963 ECAB 2450 2F1F
PATCH 4/30 package/matchbox: make matchbox-panel a real package
Quoted 32 lines · Arnout Vandecappelle
Quoted 31 lines · Yann E. MORIN
Currently, matchbox-panel is treated as if it were an option of the matchbox package.
But that's not true, since it is a real package all by itself, with its own archive and its own buildsystem.
So, make it a real package.
Signed-off-by "Yann E. MORIN" <[email protected]>--- package/matchbox/Config.in | 7 +------ package/matchbox/matchbox-panel/Config.in | 6 ++++++ 2 files changed, 7 insertions(+), 6 deletions(-) create mode 100644 package/matchbox/matchbox-panel/Config.inpackage/matchbox/Config.in +1
-6@@ -21,12 +21,7 @@ if BR2_PACKAGE_MATCHBOX source "package/matchbox/matchbox-lib/Config.in" source "package/matchbox/matchbox-wm/Config.in" - -config BR2_PACKAGE_MATCHBOX_PANEL - bool "Matchbox Panel" - help - A flexible always present 'window bar' for holding - application launchers. +source "package/matchbox/matchbox-panel/Config.in"
Quoted 13 lines
package/matchbox/matchbox-panel/Config.in line 2
Quoted 10 lines
package/matchbox/Config.in +0
-0config BR2_PACKAGE_MATCHBOX_DESKTOP bool "Matchbox Desktop"package/matchbox/matchbox-panel/Config.in new file +2
-0@@ -0,0 +1,6 @@ +config BR2_PACKAGE_MATCHBOX_PANEL + bool "Matchbox Panel"Actually, to match our style, that should be "matchbox-panel". You can choose
if that is in this patch or in a mass cleanup patch later in the series.
Argh, it already is part of a later patch. Sorry for the noise...
Regards,
Arnout
Quoted 11 lines
Regards,
ArnoutQuoted 5 lines
package/matchbox/matchbox-panel/Config.in new file +4
-0+ select BR2_PACKAGE_MATCHBOX_LIB + help + A flexible always present 'window bar' for holding + application launchers.
Signature · 6 lines
Arnout Vandecappelle arnout at mind be Senior Embedded Software Architect +32-16-286500 Essensium/Mind http://www.mind.be G.Geenslaan 9, 3001 Leuven, Belgium BE 872 984 063 RPR Leuven LinkedIn profile: http://www.linkedin.com/in/arnoutvandecappelle GPG fingerprint: 7CB5 E4CC 6C2E EFD4 6E3D A754 F963 ECAB 2450 2F1F
PATCH 5/30 package/matchbox: make matchbox-desktop a real package
In reply to Yann E. MORINCurrently, matchbox-desktop is treated as if it were an option of the matchbox package.
But that's not true, since it is a real package all by itself, with its own archive and its own buildsystem.
So, make it a real package.
--- package/matchbox/Config.in | 7 +------ package/matchbox/matchbox-desktop/Config.in | 5 +++++ 2 files changed, 6 insertions(+), 6 deletions(-) create mode 100644 package/matchbox/matchbox-desktop/Config.in
package/matchbox/Config.in +1 -6
@@ -22,12 +22,7 @@ if BR2_PACKAGE_MATCHBOX source "package/matchbox/matchbox-lib/Config.in" source "package/matchbox/matchbox-wm/Config.in" source "package/matchbox/matchbox-panel/Config.in" - -config BR2_PACKAGE_MATCHBOX_DESKTOP - bool "Matchbox Desktop" - select BR2_PACKAGE_ZLIB - help - A PDA style application launcher or 'item browser'. +source "package/matchbox/matchbox-desktop/Config.in" config BR2_PACKAGE_MATCHBOX_COMMON bool "Matchbox session common files"
package/matchbox/matchbox-desktop/Config.in new file +5 -0
@@ -0,0 +1,5 @@ +config BR2_PACKAGE_MATCHBOX_DESKTOP + bool "Matchbox Desktop" + select BR2_PACKAGE_ZLIB + help + A PDA style application launcher or 'item browser'.
Signature · 1 line
1.9.1
PATCH 5/30 package/matchbox: make matchbox-desktop a real package
Quoted 9 lines · Yann E. MORIN
Currently, matchbox-desktop is treated as if it were an option of the matchbox package.
But that's not true, since it is a real package all by itself, with its own archive and its own buildsystem.
So, make it a real package.
Signed-off-by "Yann E. MORIN" <[email protected]>
One remark below...
Quoted 11 lines
--- package/matchbox/Config.in | 7 +------ package/matchbox/matchbox-desktop/Config.in | 5 +++++ 2 files changed, 6 insertions(+), 6 deletions(-) create mode 100644 package/matchbox/matchbox-desktop/Config.inpackage/matchbox/Config.in +0
-0
package/matchbox/Config.in if BR2_PACKAGE_MATCHBOX · line 25
Quoted 10 lines
package/matchbox/Config.in +1
-6@@ -22,12 +22,7 @@ if BR2_PACKAGE_MATCHBOX source "package/matchbox/matchbox-lib/Config.in" source "package/matchbox/matchbox-wm/Config.in" source "package/matchbox/matchbox-panel/Config.in" - -config BR2_PACKAGE_MATCHBOX_DESKTOP - bool "Matchbox Desktop" - select BR2_PACKAGE_ZLIB - help - A PDA style application launcher or 'item browser'. +source "package/matchbox/matchbox-desktop/Config.in"
Note that things should be sorted alphabetically. But I think that can better
be combined with the one-directory-up patch.
Regards,
Arnout
Quoted 15 lines
package/matchbox/Config.in +0
-0config BR2_PACKAGE_MATCHBOX_COMMON bool "Matchbox session common files"package/matchbox/matchbox-desktop/Config.in new file +5
-0@@ -0,0 +1,5 @@ +config BR2_PACKAGE_MATCHBOX_DESKTOP + bool "Matchbox Desktop" + select BR2_PACKAGE_ZLIB + help + A PDA style application launcher or 'item browser'.
Signature · 6 lines
Arnout Vandecappelle arnout at mind be Senior Embedded Software Architect +32-16-286500 Essensium/Mind http://www.mind.be G.Geenslaan 9, 3001 Leuven, Belgium BE 872 984 063 RPR Leuven LinkedIn profile: http://www.linkedin.com/in/arnoutvandecappelle GPG fingerprint: 7CB5 E4CC 6C2E EFD4 6E3D A754 F963 ECAB 2450 2F1F
PATCH 5/30 package/matchbox: make matchbox-desktop a real package
Arnout, All,
On 2015-04-23 23:49 +0200, Arnout Vandecappelle spake thusly:
Quoted 31 lines · Yann E. MORIN
Quoted 9 lines
Currently, matchbox-desktop is treated as if it were an option of the matchbox package.
But that's not true, since it is a real package all by itself, with its own archive and its own buildsystem.
So, make it a real package.
Signed-off-by "Yann E. MORIN" <[email protected]>One remark below...
Quoted 16 lines
--- package/matchbox/Config.in | 7 +------ package/matchbox/matchbox-desktop/Config.in | 5 +++++ 2 files changed, 6 insertions(+), 6 deletions(-) create mode 100644 package/matchbox/matchbox-desktop/Config.inpackage/matchbox/Config.in +0
-2@@ -22,12 +22,7 @@ if BR2_PACKAGE_MATCHBOX source "package/matchbox/matchbox-lib/Config.in" source "package/matchbox/matchbox-wm/Config.in" source "package/matchbox/matchbox-panel/Config.in" - -config BR2_PACKAGE_MATCHBOX_DESKTOP
Quoted 8 lines
package/matchbox/Config.in if BR2_PACKAGE_MATCHBOX · line 25
Quoted 5 lines
package/matchbox/Config.in +1
-4- bool "Matchbox Desktop" - select BR2_PACKAGE_ZLIB - help - A PDA style application launcher or 'item browser'. +source "package/matchbox/matchbox-desktop/Config.in"Note that things should be sorted alphabetically. But I think that can better
be combined with the one-directory-up patch.
Yup, done.
Regards,
Yann E. MORIN.
Signature · 6 lines
.-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 223 225 172 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------'
PATCH 6/30 package/matchbox: make matchbox-common a real package
In reply to Yann E. MORINCurrently, matchbox-common is treated as if it were an option of the matchbox package.
But that's not true, since it is a real package all by itself, with its own archive and its own buildsystem.
So, make it a real package.
--- package/matchbox/Config.in | 11 +---------- package/matchbox/matchbox-common/Config.in | 9 +++++++++ 2 files changed, 10 insertions(+), 10 deletions(-) create mode 100644 package/matchbox/matchbox-common/Config.in
package/matchbox/Config.in +1 -10
@@ -23,16 +23,7 @@ source "package/matchbox/matchbox-lib/Config.in" source "package/matchbox/matchbox-wm/Config.in" source "package/matchbox/matchbox-panel/Config.in" source "package/matchbox/matchbox-desktop/Config.in" - -config BR2_PACKAGE_MATCHBOX_COMMON - bool "Matchbox session common files" - depends on BR2_PACKAGE_MATCHBOX_PANEL && BR2_PACKAGE_MATCHBOX_DESKTOP - help - Common desktop folders and matchbox-session script. - -config BR2_PACKAGE_MATCHBOX_COMMON_PDA - bool "PDA style desktop folders" - depends on BR2_PACKAGE_MATCHBOX_COMMON +source "package/matchbox/matchbox-common/Config.in" config BR2_PACKAGE_MATCHBOX_KEYBOARD bool "Matchbox Virtual Keyboard"
package/matchbox/matchbox-common/Config.in new file +9 -0
@@ -0,0 +1,9 @@ +config BR2_PACKAGE_MATCHBOX_COMMON + bool "Matchbox session common files" + depends on BR2_PACKAGE_MATCHBOX_PANEL && BR2_PACKAGE_MATCHBOX_DESKTOP + help + Common desktop folders and matchbox-session script. + +config BR2_PACKAGE_MATCHBOX_COMMON_PDA + bool "PDA style desktop folders" + depends on BR2_PACKAGE_MATCHBOX_COMMON
Signature · 1 line
1.9.1
PATCH 6/30 package/matchbox: make matchbox-common a real package
Quoted 9 lines · Yann E. MORIN
Currently, matchbox-common is treated as if it were an option of the matchbox package.
But that's not true, since it is a real package all by itself, with its own archive and its own buildsystem.
So, make it a real package.
Signed-off-by "Yann E. MORIN" <[email protected]>
Regards,
Arnout
Quoted 44 lines
--- package/matchbox/Config.in | 11 +---------- package/matchbox/matchbox-common/Config.in | 9 +++++++++ 2 files changed, 10 insertions(+), 10 deletions(-) create mode 100644 package/matchbox/matchbox-common/Config.inpackage/matchbox/Config.in +1
-10@@ -23,16 +23,7 @@ source "package/matchbox/matchbox-lib/Config.in" source "package/matchbox/matchbox-wm/Config.in" source "package/matchbox/matchbox-panel/Config.in" source "package/matchbox/matchbox-desktop/Config.in" - -config BR2_PACKAGE_MATCHBOX_COMMON - bool "Matchbox session common files" - depends on BR2_PACKAGE_MATCHBOX_PANEL && BR2_PACKAGE_MATCHBOX_DESKTOP - help - Common desktop folders and matchbox-session script. - -config BR2_PACKAGE_MATCHBOX_COMMON_PDA - bool "PDA style desktop folders" - depends on BR2_PACKAGE_MATCHBOX_COMMON +source "package/matchbox/matchbox-common/Config.in" config BR2_PACKAGE_MATCHBOX_KEYBOARD bool "Matchbox Virtual Keyboard"package/matchbox/matchbox-common/Config.in new file +9
-0@@ -0,0 +1,9 @@ +config BR2_PACKAGE_MATCHBOX_COMMON + bool "Matchbox session common files" + depends on BR2_PACKAGE_MATCHBOX_PANEL && BR2_PACKAGE_MATCHBOX_DESKTOP + help + Common desktop folders and matchbox-session script. + +config BR2_PACKAGE_MATCHBOX_COMMON_PDA + bool "PDA style desktop folders" + depends on BR2_PACKAGE_MATCHBOX_COMMON
Signature · 6 lines
Arnout Vandecappelle arnout at mind be Senior Embedded Software Architect +32-16-286500 Essensium/Mind http://www.mind.be G.Geenslaan 9, 3001 Leuven, Belgium BE 872 984 063 RPR Leuven LinkedIn profile: http://www.linkedin.com/in/arnoutvandecappelle GPG fingerprint: 7CB5 E4CC 6C2E EFD4 6E3D A754 F963 ECAB 2450 2F1F
PATCH 7/30 package/matchbox: make matchbox-fakekey a real package
In reply to Yann E. MORINCurrently, matchbox-fakekey is missing a Kconfig entry, but is so far solely a build-time dependency of matchbox-keyboard.
So, make it a real package, and select it from matchbox-keyboard.
--- package/matchbox/Config.in | 2 ++ package/matchbox/matchbox-fakekey/Config.in | 2 ++ 2 files changed, 4 insertions(+) create mode 100644 package/matchbox/matchbox-fakekey/Config.in
package/matchbox/Config.in +2 -0
@@ -24,11 +24,13 @@ source "package/matchbox/matchbox-wm/Config.in" source "package/matchbox/matchbox-panel/Config.in" source "package/matchbox/matchbox-desktop/Config.in" source "package/matchbox/matchbox-common/Config.in" +source "package/matchbox/matchbox-fakekey/Config.in" config BR2_PACKAGE_MATCHBOX_KEYBOARD bool "Matchbox Virtual Keyboard" select BR2_PACKAGE_XLIB_LIBXTST select BR2_PACKAGE_XLIB_LIBXFT if !BR2_PACKAGE_CAIRO + select BR2_PACKAGE_MATCHBOX_FAKEKEY help Virtual Keyboard
package/matchbox/matchbox-fakekey/Config.in new file +2 -0
@@ -0,0 +1,2 @@ +config BR2_PACKAGE_MATCHBOX_FAKEKEY + bool
Signature · 1 line
1.9.1
PATCH 7/30 package/matchbox: make matchbox-fakekey a real package
Quoted 6 lines · Yann E. MORIN
Currently, matchbox-fakekey is missing a
Kconfigentry, but is so far solely a build-time dependency of matchbox-keyboard.So, make it a real package, and select it from matchbox-keyboard.
Signed-off-by "Yann E. MORIN" <[email protected]>
Regards,
Arnout
Quoted 33 lines
--- package/matchbox/Config.in | 2 ++ package/matchbox/matchbox-fakekey/Config.in | 2 ++ 2 files changed, 4 insertions(+) create mode 100644 package/matchbox/matchbox-fakekey/Config.inpackage/matchbox/Config.in +2
-0@@ -24,11 +24,13 @@ source "package/matchbox/matchbox-wm/Config.in" source "package/matchbox/matchbox-panel/Config.in" source "package/matchbox/matchbox-desktop/Config.in" source "package/matchbox/matchbox-common/Config.in" +source "package/matchbox/matchbox-fakekey/Config.in" config BR2_PACKAGE_MATCHBOX_KEYBOARD bool "Matchbox Virtual Keyboard" select BR2_PACKAGE_XLIB_LIBXTST select BR2_PACKAGE_XLIB_LIBXFT if !BR2_PACKAGE_CAIRO + select BR2_PACKAGE_MATCHBOX_FAKEKEY help Virtual Keyboardpackage/matchbox/matchbox-fakekey/Config.in new file +2
-0@@ -0,0 +1,2 @@ +config BR2_PACKAGE_MATCHBOX_FAKEKEY + bool
Signature · 6 lines
Arnout Vandecappelle arnout at mind be Senior Embedded Software Architect +32-16-286500 Essensium/Mind http://www.mind.be G.Geenslaan 9, 3001 Leuven, Belgium BE 872 984 063 RPR Leuven LinkedIn profile: http://www.linkedin.com/in/arnoutvandecappelle GPG fingerprint: 7CB5 E4CC 6C2E EFD4 6E3D A754 F963 ECAB 2450 2F1F
PATCH 8/30 package/matchbox: make matchbox-keyboard a real package
In reply to Yann E. MORINCurrently, matchbox-keyboard is treated as if it were an option of the matchbox package.
But that's not true, since it is a real package all by itself, with its own archive and its own buildsystem.
So, make it a real package.
--- package/matchbox/Config.in | 9 +-------- package/matchbox/matchbox-keyboard/Config.in | 7 +++++++ 2 files changed, 8 insertions(+), 8 deletions(-) create mode 100644 package/matchbox/matchbox-keyboard/Config.in
package/matchbox/Config.in +1 -8
@@ -25,13 +25,6 @@ source "package/matchbox/matchbox-panel/Config.in" source "package/matchbox/matchbox-desktop/Config.in" source "package/matchbox/matchbox-common/Config.in" source "package/matchbox/matchbox-fakekey/Config.in" - -config BR2_PACKAGE_MATCHBOX_KEYBOARD - bool "Matchbox Virtual Keyboard" - select BR2_PACKAGE_XLIB_LIBXTST - select BR2_PACKAGE_XLIB_LIBXFT if !BR2_PACKAGE_CAIRO - select BR2_PACKAGE_MATCHBOX_FAKEKEY - help - Virtual Keyboard +source "package/matchbox/matchbox-keyboard/Config.in" endif
package/matchbox/matchbox-keyboard/Config.in new file +7 -0
@@ -0,0 +1,7 @@ +config BR2_PACKAGE_MATCHBOX_KEYBOARD + bool "Matchbox Virtual Keyboard" + select BR2_PACKAGE_XLIB_LIBXTST + select BR2_PACKAGE_XLIB_LIBXFT if !BR2_PACKAGE_CAIRO + select BR2_PACKAGE_MATCHBOX_FAKEKEY + help + Virtual Keyboard
Signature · 1 line
1.9.1
PATCH 8/30 package/matchbox: make matchbox-keyboard a real package
Quoted 9 lines · Yann E. MORIN
Currently, matchbox-keyboard is treated as if it were an option of the matchbox package.
But that's not true, since it is a real package all by itself, with its own archive and its own buildsystem.
So, make it a real package.
Signed-off-by "Yann E. MORIN" <[email protected]>
Regards,
Arnout
Quoted 39 lines
--- package/matchbox/Config.in | 9 +-------- package/matchbox/matchbox-keyboard/Config.in | 7 +++++++ 2 files changed, 8 insertions(+), 8 deletions(-) create mode 100644 package/matchbox/matchbox-keyboard/Config.inpackage/matchbox/Config.in +1
-8@@ -25,13 +25,6 @@ source "package/matchbox/matchbox-panel/Config.in" source "package/matchbox/matchbox-desktop/Config.in" source "package/matchbox/matchbox-common/Config.in" source "package/matchbox/matchbox-fakekey/Config.in" - -config BR2_PACKAGE_MATCHBOX_KEYBOARD - bool "Matchbox Virtual Keyboard" - select BR2_PACKAGE_XLIB_LIBXTST - select BR2_PACKAGE_XLIB_LIBXFT if !BR2_PACKAGE_CAIRO - select BR2_PACKAGE_MATCHBOX_FAKEKEY - help - Virtual Keyboard +source "package/matchbox/matchbox-keyboard/Config.in" endifpackage/matchbox/matchbox-keyboard/Config.in new file +7
-0@@ -0,0 +1,7 @@ +config BR2_PACKAGE_MATCHBOX_KEYBOARD + bool "Matchbox Virtual Keyboard" + select BR2_PACKAGE_XLIB_LIBXTST + select BR2_PACKAGE_XLIB_LIBXFT if !BR2_PACKAGE_CAIRO + select BR2_PACKAGE_MATCHBOX_FAKEKEY + help + Virtual Keyboard
Signature · 6 lines
Arnout Vandecappelle arnout at mind be Senior Embedded Software Architect +32-16-286500 Essensium/Mind http://www.mind.be G.Geenslaan 9, 3001 Leuven, Belgium BE 872 984 063 RPR Leuven LinkedIn profile: http://www.linkedin.com/in/arnoutvandecappelle GPG fingerprint: 7CB5 E4CC 6C2E EFD4 6E3D A754 F963 ECAB 2450 2F1F
PATCH 9/30 package/matchbox: make match-startup-monitor a real package
In reply to Yann E. MORIN Currently, matchbox-startup-monitor is missing a Kconfig entry, but is
so far solely a build-time dependency of matchbox-panel.
So, make it a real package, and only build-depend on it when enabled. Fix the condition to build-depend on it.
--- package/matchbox/Config.in | 1 + package/matchbox/matchbox-panel/matchbox-panel.mk | 4 ++-- package/matchbox/matchbox-startup-monitor/Config.in | 2 ++ 3 files changed, 5 insertions(+), 2 deletions(-) create mode 100644 package/matchbox/matchbox-startup-monitor/Config.in
package/matchbox/Config.in +1 -0
@@ -26,5 +26,6 @@ source "package/matchbox/matchbox-desktop/Config.in" source "package/matchbox/matchbox-common/Config.in" source "package/matchbox/matchbox-fakekey/Config.in" source "package/matchbox/matchbox-keyboard/Config.in" +source "package/matchbox/matchbox-startup-monitor/Config.in" endif
package/matchbox/matchbox-panel/matchbox-panel.mk +2 -2
@@ -13,9 +13,9 @@ MATCHBOX_PANEL_LICENSE_FILES = COPYING MATCHBOX_PANEL_DEPENDENCIES = matchbox-lib MATCHBOX_PANEL_CONF_OPTS = --enable-expat -ifeq ($(BR2_PACKAGE_STARTUP_NOTIFICATION),y) +ifeq ($(BR2_PACKAGE_MATCHBOX_STARTUP_MONITOR),y) MATCHBOX_PANEL_CONF_OPTS += --enable-startup-notification -MATCHBOX_PANEL_DEPENDENCIES += startup-notification matchbox-startup-monitor +MATCHBOX_PANEL_DEPENDENCIES += matchbox-startup-monitor else MATCHBOX_PANEL_CONF_OPTS += --disable-startup-notification endif
package/matchbox/matchbox-startup-monitor/Config.in new file +2 -0
@@ -0,0 +1,2 @@ +config BR2_PACKAGE_MATCHBOX_STARTUP_MONITOR + bool
Signature · 1 line
1.9.1
PATCH 9/30 package/matchbox: make match-startup-monitor a real package
Quoted 1 line · Yann E. MORIN
Currently, matchbox-startup-monitor is missing a
Kconfigentry, but is
^
Quoted 4 lines
so far solely a build-time dependency of matchbox-panel.
So, make it a real package, and only build-depend on it when enabled. Fix the condition to build-depend on it.
Update commit message according to my comment below.
Quoted 42 lines
Signed-off-by "Yann E. MORIN" <[email protected]>--- package/matchbox/Config.in | 1 + package/matchbox/matchbox-panel/matchbox-panel.mk | 4 ++-- package/matchbox/matchbox-startup-monitor/Config.in | 2 ++ 3 files changed, 5 insertions(+), 2 deletions(-) create mode 100644 package/matchbox/matchbox-startup-monitor/Config.inpackage/matchbox/Config.in +1
-0@@ -26,5 +26,6 @@ source "package/matchbox/matchbox-desktop/Config.in" source "package/matchbox/matchbox-common/Config.in" source "package/matchbox/matchbox-fakekey/Config.in" source "package/matchbox/matchbox-keyboard/Config.in" +source "package/matchbox/matchbox-startup-monitor/Config.in" endifpackage/matchbox/matchbox-panel/matchbox-panel.mk +2
-2@@ -13,9 +13,9 @@ MATCHBOX_PANEL_LICENSE_FILES = COPYING MATCHBOX_PANEL_DEPENDENCIES = matchbox-lib MATCHBOX_PANEL_CONF_OPTS = --enable-expat -ifeq ($(BR2_PACKAGE_STARTUP_NOTIFICATION),y) +ifeq ($(BR2_PACKAGE_MATCHBOX_STARTUP_MONITOR),y) MATCHBOX_PANEL_CONF_OPTS += --enable-startup-notification -MATCHBOX_PANEL_DEPENDENCIES += startup-notification matchbox-startup-monitor +MATCHBOX_PANEL_DEPENDENCIES += matchbox-startup-monitor else MATCHBOX_PANEL_CONF_OPTS += --disable-startup-notification endifpackage/matchbox/matchbox-startup-monitor/Config.in new file +0
-0
package/matchbox/matchbox-startup-monitor/Config.in line 2
Quoted 2 lines
package/matchbox/matchbox-startup-monitor/Config.in new file +2
-0@@ -0,0 +1,2 @@ +config BR2_PACKAGE_MATCHBOX_STARTUP_MONITOR + bool
This changes behaviour: it used to be selected automatically when
startup-notification was selected. So you should add
default y if BR2_PACKAGE_STARTUP_NOTIFICATION
Of course, that's going to be reverted anyway when you later add a prompt to
this package, so perhaps it's not that important.
Regards,
Arnout
Quoted 1 line
Signature · 6 lines
Arnout Vandecappelle arnout at mind be Senior Embedded Software Architect +32-16-286500 Essensium/Mind http://www.mind.be G.Geenslaan 9, 3001 Leuven, Belgium BE 872 984 063 RPR Leuven LinkedIn profile: http://www.linkedin.com/in/arnoutvandecappelle GPG fingerprint: 7CB5 E4CC 6C2E EFD4 6E3D A754 F963 ECAB 2450 2F1F
PATCH 9/30 package/matchbox: make match-startup-monitor a real package
Arnout, All,
On 2015-04-24 00:00 +0200, Arnout Vandecappelle spake thusly:
Quoted 1 line · Yann E. MORIN
[--SNIP--]
Quoted 12 lines
package/matchbox/matchbox-startup-monitor/Config.in line 2
Quoted 8 lines
package/matchbox/matchbox-startup-monitor/Config.in new file +2
-0@@ -0,0 +1,2 @@ +config BR2_PACKAGE_MATCHBOX_STARTUP_MONITOR + boolThis changes behaviour: it used to be selected automatically when
startup-notification was selected. So you should add
Quoted 4 lines
default y if
BR2_PACKAGE_STARTUP_NOTIFICATIONOf course, that's going to be reverted anyway when you later add a prompt to
this package, so perhaps it's not that important.
Well, I've done as you suggested, so this patch does not introduce a change in behaviour, and is purely a cleanup patch.
The change in beaviour is being done in a following patch.
Thanks!
Regards,
Yann E. MORIN.
Signature · 6 lines
.-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 223 225 172 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------'
PATCH 10/30 package/matchbox: remove superfluous conditional includes
In reply to Yann E. MORINNow that the matchbox package no longer forcibly add entries to the PACKAGES list, and entirely relies on having proper packages, we can safely include all matchbox sub-packages .mk files, and the pkg-infra will take care of building only those that are enabled.
--- package/matchbox/matchbox.mk | 2 -- 1 file changed, 2 deletions(-)
package/matchbox/matchbox.mk +0 -2
@@ -1,3 +1 @@ -ifeq ($(BR2_PACKAGE_MATCHBOX),y) include $(sort $(wildcard package/matchbox/*/*.mk)) -endif
Signature · 1 line
1.9.1
PATCH 10/30 package/matchbox: remove superfluous conditional includes
Quoted 6 lines · Yann E. MORIN
Now that the matchbox package no longer forcibly add entries to the PACKAGES list, and entirely relies on having proper packages, we can safely include all matchbox sub-packages .mk files, and the pkg-infra will take care of building only those that are enabled.
Signed-off-by "Yann E. MORIN" <[email protected]>
This could already been done after patches 1 and 2.
Regards,
Arnout
Quoted 13 lines
--- package/matchbox/matchbox.mk | 2 -- 1 file changed, 2 deletions(-)package/matchbox/matchbox.mk +0
-2@@ -1,3 +1 @@ -ifeq ($(BR2_PACKAGE_MATCHBOX),y) include $(sort $(wildcard package/matchbox/*/*.mk)) -endif
Signature · 6 lines
Arnout Vandecappelle arnout at mind be Senior Embedded Software Architect +32-16-286500 Essensium/Mind http://www.mind.be G.Geenslaan 9, 3001 Leuven, Belgium BE 872 984 063 RPR Leuven LinkedIn profile: http://www.linkedin.com/in/arnoutvandecappelle GPG fingerprint: 7CB5 E4CC 6C2E EFD4 6E3D A754 F963 ECAB 2450 2F1F
PATCH 10/30 package/matchbox: remove superfluous conditional includes
Arnout, All,
On 2015-04-24 00:01 +0200, Arnout Vandecappelle spake thusly:
Quoted 11 lines · Yann E. MORIN
Quoted 6 lines
Now that the matchbox package no longer forcibly add entries to the PACKAGES list, and entirely relies on having proper packages, we can safely include all matchbox sub-packages .mk files, and the pkg-infra will take care of building only those that are enabled.
Signed-off-by "Yann E. MORIN" <[email protected]>This could already been done after patches 1 and 2.
It might be possible to do so, but I'd prefer all matchbox packages to be converted/cleaned-up first, in case there's an unwanted side-effect in the package infra about a package with no Kconfig entry.
So, I'm not moving that patch (also due to some lazyness in testing there would be no problem! ;-] ).
Thanks!
Regards,
Yann E. MORIN.
Signature · 6 lines
.-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 223 225 172 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------'
PATCH 11/30 package/matchbox: point to new home
In reply to Yann E. MORINThe new home of the matchbox project is with the Yocto project^Wumbrella^Wbuildsystem^Wdistribution^Wwhatever that is. ;-)
--- package/matchbox/Config.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
package/matchbox/Config.in +1 -1
@@ -15,7 +15,7 @@ config BR2_PACKAGE_MATCHBOX handhelds, set-top boxes, kiosks and anything else for which screen space, input mechanisms or system resources are limited. - http://matchbox-project.org/ + https://www.yoctoproject.org/tools-resources/projects/matchbox if BR2_PACKAGE_MATCHBOX
Signature · 1 line
1.9.1
PATCH 11/30 package/matchbox: point to new home
Quoted 4 lines · Yann E. MORIN
The new home of the matchbox project is with the Yocto project^Wumbrella^Wbuildsystem^Wdistribution^Wwhatever that is. ;-)
I'm not sure that kind of comments will make people take buildroot seriously. The correct behaviour would be to actually be happy that someone is willing to maintain matchbox.
Quoted 25 lines
Signed-off-by "Yann E. MORIN" <[email protected]>--- package/matchbox/Config.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)package/matchbox/Config.in +1
-1@@ -15,7 +15,7 @@ config BR2_PACKAGE_MATCHBOX handhelds, set-top boxes, kiosks and anything else for which screen space, input mechanisms or system resources are limited. - http://matchbox-project.org/ + https://www.yoctoproject.org/tools-resources/projects/matchbox if BR2_PACKAGE_MATCHBOXSignature · 6 lines
1.9.1 _______________________________________________ buildroot mailing list buildroot at busybox.net http://lists.busybox.net/mailman/listinfo/buildroot
Signature · 3 lines
Alexandre Belloni, Free Electrons Embedded Linux, Kernel and Android engineering http://free-electrons.com
PATCH 11/30 package/matchbox: point to new home
Alexandre, All,
On 2015-04-23 10:58 +0200, Alexandre Belloni spake thusly:
Quoted 8 lines · Yann E. MORIN
Quoted 3 lines
The new home of the matchbox project is with the Yocto project^Wumbrella^Wbuildsystem^Wdistribution^Wwhatever that is. ;-)
I'm not sure that kind of comments will make people take buildroot seriously. The correct behaviour would be to actually be happy that someone is willing to maintain matchbox.
OK, so that was probably not that good a joke, in retrospect, even with the smiley... Yes, it may have been a little bit too sarcastic. I'll withdraw in the next respin. Thanks for the lecture.
And yes, I'm happy matchbox as well as many other things are hosted there. But matchbox being 'maintained' is another story: most every matchbox packages have not been touched for 2 years, the only exception being a commit and its prompt revert. Still, that's not a reproach
whatsoever: matchbox is dead, and that's part of life for a package; nothing wrong with that.
Thanks for the feedback. :-)
Regards,
Yann E. MORIN.
Quoted 30 lines
Quoted 25 lines
Signed-off-by "Yann E. MORIN" <[email protected]>--- package/matchbox/Config.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)package/matchbox/Config.in +1
-1@@ -15,7 +15,7 @@ config BR2_PACKAGE_MATCHBOX handhelds, set-top boxes, kiosks and anything else for which screen space, input mechanisms or system resources are limited. - http://matchbox-project.org/ + https://www.yoctoproject.org/tools-resources/projects/matchbox if BR2_PACKAGE_MATCHBOXSignature · 6 lines
1.9.1 _______________________________________________ buildroot mailing list buildroot at busybox.net http://lists.busybox.net/mailman/listinfo/buildrootSignature · 3 lines
Alexandre Belloni, Free Electrons Embedded Linux, Kernel and Android engineering http://free-electrons.com
Signature · 6 lines
.-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 223 225 172 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------'
PATCH 11/30 package/matchbox: point to new home
In reply to Yann E. MORINQuoted 3 lines · Yann E. MORIN
The new home of the matchbox project is with the Yocto project^Wumbrella^Wbuildsystem^Wdistribution^Wwhatever that is. ;-)
I have no problem with this commit message :-)
Quoted 2 lines
Signed-off-by "Yann E. MORIN" <[email protected]>
Regards,
Arnout
Quoted 18 lines
--- package/matchbox/Config.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)package/matchbox/Config.in +1
-1@@ -15,7 +15,7 @@ config BR2_PACKAGE_MATCHBOX handhelds, set-top boxes, kiosks and anything else for which screen space, input mechanisms or system resources are limited. - http://matchbox-project.org/ + https://www.yoctoproject.org/tools-resources/projects/matchbox if BR2_PACKAGE_MATCHBOX
Signature · 6 lines
Arnout Vandecappelle arnout at mind be Senior Embedded Software Architect +32-16-286500 Essensium/Mind http://www.mind.be G.Geenslaan 9, 3001 Leuven, Belgium BE 872 984 063 RPR Leuven LinkedIn profile: http://www.linkedin.com/in/arnoutvandecappelle GPG fingerprint: 7CB5 E4CC 6C2E EFD4 6E3D A754 F963 ECAB 2450 2F1F
PATCH 12/30 package/matchbox: get rid of intermediate non-package matchbox
In reply to Yann E. MORINCurrently, the matchbox entry in the menu is a non-package entry, that forcibly selects the matchbox-wm package, which is the real matchbox WM.
So, get rid of the current matchbox option, rename the exisiting matchbox-wm to simply matchbox, so we have a real package from the onset.
Since we're reusing the previous option for the WM package, there is no need for a entry in the legacy menu.
---
.../{matchbox-wm => }/0001-defaulttheme.patch | 0
package/matchbox/Config.in | 2 --
package/matchbox/matchbox-wm/Config.in | 3 --
package/matchbox/matchbox-wm/matchbox-wm.mk | 38 --------------------
.../matchbox-wm.hash => matchbox.hash} | 0
package/matchbox/matchbox.mk | 40 ++++++++++++++++++++++
6 files changed, 40 insertions(+), 43 deletions(-)
rename package/matchbox/{matchbox-wm => }/0001-defaulttheme.patch (100%)
delete mode 100644 package/matchbox/matchbox-wm/Config.in
delete mode 100644 package/matchbox/matchbox-wm/matchbox-wm.mk
rename package/matchbox/{matchbox-wm/matchbox-wm.hash => matchbox.hash} (100%)package/matchbox/0001-defaulttheme.patch renamed from package/matchbox/matchbox-wm/0001-defaulttheme.patch +0 -0
package/matchbox/Config.in +0 -2
@@ -8,7 +8,6 @@ config BR2_PACKAGE_MATCHBOX select BR2_PACKAGE_XLIB_LIBXDAMAGE select BR2_PACKAGE_XLIB_LIBXCURSOR select BR2_PACKAGE_MATCHBOX_LIB - select BR2_PACKAGE_MATCHBOX_WM help Matchbox is an Open Source base environment for the X Window System running on non-desktop embedded platforms such as
@@ -20,7 +19,6 @@ config BR2_PACKAGE_MATCHBOX if BR2_PACKAGE_MATCHBOX source "package/matchbox/matchbox-lib/Config.in" -source "package/matchbox/matchbox-wm/Config.in" source "package/matchbox/matchbox-panel/Config.in" source "package/matchbox/matchbox-desktop/Config.in" source "package/matchbox/matchbox-common/Config.in"
package/matchbox/matchbox-wm/Config.in deleted +0 -3
@@ -1,3 +0,0 @@ -config BR2_PACKAGE_MATCHBOX_WM - bool - select BR2_PACKAGE_MATCHBOX_LIB
package/matchbox/matchbox-wm/matchbox-wm.mk deleted +0 -38
@@ -1,38 +0,0 @@ -################################################################################ -# -# matchbox-wm -# -################################################################################ - -MATCHBOX_WM_VERSION = 1.2 -MATCHBOX_WM_SOURCE = matchbox-window-manager-$(MATCHBOX_WM_VERSION).tar.bz2 -MATCHBOX_WM_SITE = http://downloads.yoctoproject.org/releases/matchbox/matchbox-window-manager/$(MATCHBOX_WM_VERSION) -MATCHBOX_WM_LICENSE = GPLv2+ -MATCHBOX_WM_LICENSE_FILES = COPYING - -MATCHBOX_WM_DEPENDENCIES = matchbox-lib -MATCHBOX_WM_CONF_OPTS = --enable-expat - -# Workaround bug in configure script -MATCHBOX_WM_CONF_ENV = expat=yes - -ifeq ($(BR2_PACKAGE_X11R7_LIBXCOMPOSITE),y) -ifeq ($(BR2_PACKAGE_X11R7_LIBXPM),y) -MATCHBOX_WM_CONF_OPTS += --enable-composite -MATCHBOX_WM_DEPENDENCIES += xlib_libXcomposite -MATCHBOX_WM_DEPENDENCIES += xlib_libXpm -endif -endif - -ifeq ($(BR2_PACKAGE_XLIB_LIBXFT),y) -MATCHBOX_WM_DEPENDENCIES += xlib_libXft -endif - -ifeq ($(BR2_PACKAGE_STARTUP_NOTIFICATION),y) -MATCHBOX_WM_CONF_OPTS += --enable-startup-notification -MATCHBOX_WM_DEPENDENCIES += startup-notification -else -MATCHBOX_WM_CONF_OPTS += --disable-startup-notification -endif - -$(eval $(autotools-package))
package/matchbox/matchbox.hash renamed from package/matchbox/matchbox-wm/matchbox-wm.hash +0 -0
package/matchbox/matchbox.mk +40 -0
@@ -1 +1,41 @@ +################################################################################ +# +# matchbox +# +################################################################################ + +MATCHBOX_VERSION = 1.2 +MATCHBOX_SOURCE = matchbox-window-manager-$(MATCHBOX_VERSION).tar.bz2 +MATCHBOX_SITE = http://downloads.yoctoproject.org/releases/matchbox/matchbox-window-manager/$(MATCHBOX_VERSION) +MATCHBOX_LICENSE = GPLv2+ +MATCHBOX_LICENSE_FILES = COPYING + +MATCHBOX_DEPENDENCIES = matchbox-lib +MATCHBOX_CONF_OPTS = --enable-expat + +# Workaround bug in configure script +MATCHBOX_CONF_ENV = expat=yes + +ifeq ($(BR2_PACKAGE_X11R7_LIBXCOMPOSITE),y) +ifeq ($(BR2_PACKAGE_X11R7_LIBXPM),y) +MATCHBOX_CONF_OPTS += --enable-composite +MATCHBOX_DEPENDENCIES += xlib_libXcomposite +MATCHBOX_DEPENDENCIES += xlib_libXpm +endif +endif + +ifeq ($(BR2_PACKAGE_XLIB_LIBXFT),y) +MATCHBOX_DEPENDENCIES += xlib_libXft +endif + +ifeq ($(BR2_PACKAGE_STARTUP_NOTIFICATION),y) +MATCHBOX_CONF_OPTS += --enable-startup-notification +MATCHBOX_DEPENDENCIES += startup-notification +else +MATCHBOX_CONF_OPTS += --disable-startup-notification +endif + +$(eval $(autotools-package)) + +# After we called a package infra, w ecan include more files include $(sort $(wildcard package/matchbox/*/*.mk))
Signature · 1 line
1.9.1
PATCH 12/30 package/matchbox: get rid of intermediate non-package matchbox
Quoted 11 lines · Yann E. MORIN
Currently, the matchbox entry in the menu is a non-package entry, that forcibly selects the matchbox-wm package, which is the real matchbox WM.
So, get rid of the current matchbox option, rename the exisiting matchbox-wm to simply matchbox, so we have a real package from the onset.
Since we're reusing the previous option for the WM package, there is no need for a entry in the legacy menu.
Signed-off-by "Yann E. MORIN" <[email protected]>
Quoted 1 line
---
[snip]
Quoted 1 line
+# After we called a package infra, w ecan include more files
^^
This comment becomes redundant after the move.
Regards,
Arnout
Quoted 2 lines
include $(sort $(wildcard package/matchbox/*/*.mk))
Signature · 6 lines
Arnout Vandecappelle arnout at mind be Senior Embedded Software Architect +32-16-286500 Essensium/Mind http://www.mind.be G.Geenslaan 9, 3001 Leuven, Belgium BE 872 984 063 RPR Leuven LinkedIn profile: http://www.linkedin.com/in/arnoutvandecappelle GPG fingerprint: 7CB5 E4CC 6C2E EFD4 6E3D A754 F963 ECAB 2450 2F1F
PATCH 12/30 package/matchbox: get rid of intermediate non-package matchbox
Arnout, All,
On 2015-04-24 00:27 +0200, Arnout Vandecappelle spake thusly:
Quoted 13 lines · Yann E. MORIN
Quoted 11 lines
Currently, the matchbox entry in the menu is a non-package entry, that forcibly selects the matchbox-wm package, which is the real matchbox WM.
So, get rid of the current matchbox option, rename the exisiting matchbox-wm to simply matchbox, so we have a real package from the onset.
Since we're reusing the previous option for the WM package, there is no need for a entry in the legacy menu.
Signed-off-by "Yann E. MORIN" <[email protected]>
Quoted 8 lines
Quoted 1 line
---
[snip]
Quoted 1 line
+# After we called a package infra, w ecan include more files
^^This comment becomes redundant after the move.
Yup, I already removed that locally. Thanks! :-)
Regards,
Yann E. MORIN.
Signature · 6 lines
.-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 223 225 172 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------'
PATCH 13/30 package/matchbox: fix option prompts
In reply to Yann E. MORINUse the package names instead of some fancy human-readable strings. ;-)
--- package/matchbox/Config.in | 2 +- package/matchbox/matchbox-common/Config.in | 4 ++-- package/matchbox/matchbox-desktop/Config.in | 2 +- package/matchbox/matchbox-keyboard/Config.in | 2 +- package/matchbox/matchbox-panel/Config.in | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-)
package/matchbox/Config.in +1 -1
@@ -1,5 +1,5 @@ config BR2_PACKAGE_MATCHBOX - bool "MatchBox Window Manager" + bool "matchbox" depends on BR2_PACKAGE_XORG7 depends on BR2_USE_MMU # fork() select BR2_PACKAGE_FONTCONFIG
package/matchbox/matchbox-common/Config.in +2 -2
@@ -1,9 +1,9 @@ config BR2_PACKAGE_MATCHBOX_COMMON - bool "Matchbox session common files" + bool "matchbox-common" depends on BR2_PACKAGE_MATCHBOX_PANEL && BR2_PACKAGE_MATCHBOX_DESKTOP help Common desktop folders and matchbox-session script. config BR2_PACKAGE_MATCHBOX_COMMON_PDA - bool "PDA style desktop folders" + bool "PDA style app folder" depends on BR2_PACKAGE_MATCHBOX_COMMON
package/matchbox/matchbox-desktop/Config.in +1 -1
@@ -1,5 +1,5 @@ config BR2_PACKAGE_MATCHBOX_DESKTOP - bool "Matchbox Desktop" + bool "matchbox-desktop" select BR2_PACKAGE_ZLIB help A PDA style application launcher or 'item browser'.
package/matchbox/matchbox-keyboard/Config.in +1 -1
@@ -1,5 +1,5 @@ config BR2_PACKAGE_MATCHBOX_KEYBOARD - bool "Matchbox Virtual Keyboard" + bool "matchbox-keyboard" select BR2_PACKAGE_XLIB_LIBXTST select BR2_PACKAGE_XLIB_LIBXFT if !BR2_PACKAGE_CAIRO select BR2_PACKAGE_MATCHBOX_FAKEKEY
package/matchbox/matchbox-panel/Config.in +1 -1
@@ -1,5 +1,5 @@ config BR2_PACKAGE_MATCHBOX_PANEL - bool "Matchbox Panel" + bool "matchbox-panel" select BR2_PACKAGE_MATCHBOX_LIB help A flexible always present 'window bar' for holding
Signature · 1 line
1.9.1
PATCH 13/30 package/matchbox: fix option prompts
Quoted 16 lines · Yann E. MORIN
Use the package names instead of some fancy human-readable strings. ;-)
Signed-off-by "Yann E. MORIN" <[email protected]>--- package/matchbox/Config.in | 2 +- package/matchbox/matchbox-common/Config.in | 4 ++-- package/matchbox/matchbox-desktop/Config.in | 2 +- package/matchbox/matchbox-keyboard/Config.in | 2 +- package/matchbox/matchbox-panel/Config.in | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-)package/matchbox/Config.in +0
-0
package/matchbox/Config.in line 2
Quoted 3 lines
package/matchbox/Config.in +1
-1@@ -1,5 +1,5 @@ config BR2_PACKAGE_MATCHBOX - bool "MatchBox Window Manager" + bool "matchbox"
Not so sure about this one... The upstream name is matchbox-window-manager, and
it is useful information that it's a window manager. OTOH that's already in the comment right above it.
So in the end I'm OK either way.
Regards,
Arnout
Quoted 53 lines
package/matchbox/Config.in +0
-0depends on BR2_PACKAGE_XORG7 depends on BR2_USE_MMU # fork() select BR2_PACKAGE_FONTCONFIGpackage/matchbox/matchbox-common/Config.in +2
-2@@ -1,9 +1,9 @@ config BR2_PACKAGE_MATCHBOX_COMMON - bool "Matchbox session common files" + bool "matchbox-common" depends on BR2_PACKAGE_MATCHBOX_PANEL && BR2_PACKAGE_MATCHBOX_DESKTOP help Common desktop folders and matchbox-session script. config BR2_PACKAGE_MATCHBOX_COMMON_PDA - bool "PDA style desktop folders" + bool "PDA style app folder" depends on BR2_PACKAGE_MATCHBOX_COMMONpackage/matchbox/matchbox-desktop/Config.in +1
-1@@ -1,5 +1,5 @@ config BR2_PACKAGE_MATCHBOX_DESKTOP - bool "Matchbox Desktop" + bool "matchbox-desktop" select BR2_PACKAGE_ZLIB help A PDA style application launcher or 'item browser'.package/matchbox/matchbox-keyboard/Config.in +1
-1@@ -1,5 +1,5 @@ config BR2_PACKAGE_MATCHBOX_KEYBOARD - bool "Matchbox Virtual Keyboard" + bool "matchbox-keyboard" select BR2_PACKAGE_XLIB_LIBXTST select BR2_PACKAGE_XLIB_LIBXFT if !BR2_PACKAGE_CAIRO select BR2_PACKAGE_MATCHBOX_FAKEKEYpackage/matchbox/matchbox-panel/Config.in +1
-1@@ -1,5 +1,5 @@ config BR2_PACKAGE_MATCHBOX_PANEL - bool "Matchbox Panel" + bool "matchbox-panel" select BR2_PACKAGE_MATCHBOX_LIB help A flexible always present 'window bar' for holding
Signature · 6 lines
Arnout Vandecappelle arnout at mind be Senior Embedded Software Architect +32-16-286500 Essensium/Mind http://www.mind.be G.Geenslaan 9, 3001 Leuven, Belgium BE 872 984 063 RPR Leuven LinkedIn profile: http://www.linkedin.com/in/arnoutvandecappelle GPG fingerprint: 7CB5 E4CC 6C2E EFD4 6E3D A754 F963 ECAB 2450 2F1F
PATCH 13/30 package/matchbox: fix option prompts
Arnout, All,
On 2015-04-24 00:26 +0200, Arnout Vandecappelle spake thusly:
Quoted 12 lines · Yann E. MORIN
Quoted 11 lines
Use the package names instead of some fancy human-readable strings. ;-)
Signed-off-by "Yann E. MORIN" <[email protected]>--- package/matchbox/Config.in | 2 +- package/matchbox/matchbox-common/Config.in | 4 ++-- package/matchbox/matchbox-desktop/Config.in | 2 +- package/matchbox/matchbox-keyboard/Config.in | 2 +- package/matchbox/matchbox-panel/Config.in | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-)
Quoted 12 lines
package/matchbox/Config.in line 2
Quoted 8 lines
package/matchbox/Config.in +1
-1@@ -1,5 +1,5 @@ config BR2_PACKAGE_MATCHBOX - bool "MatchBox Window Manager" + bool "matchbox"Not so sure about this one... The upstream name is matchbox-window-manager, and
it is useful information that it's a window manager. OTOH that's already in the comment right above it.
Well, even though I agree on principle:
- "matchbox-window-manager" is a bit long
- as you said, it's in the "Window Manager" section
- the global stuff is named "matchbox", and I suppose users would expect to see just "matchbox"
Quoted 1 line
So in the end I'm OK either way.
I can see if naming that package accordingly to the upstream name, and if it proves to cumbersome, I'll just let it as it is now...
Regards,
Yann E. MORIN.
Signature · 6 lines
.-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 223 225 172 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------'
PATCH 14/30 package/matchbox-common: fix dependencies
In reply to Yann E. MORINmatchbox-common can be used by both matchbox-desktop and matchbox-panel, so it needs to depend on either, not both.
--- package/matchbox/matchbox-common/Config.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
package/matchbox/matchbox-common/Config.in +1 -1
@@ -1,6 +1,6 @@ config BR2_PACKAGE_MATCHBOX_COMMON bool "matchbox-common" - depends on BR2_PACKAGE_MATCHBOX_PANEL && BR2_PACKAGE_MATCHBOX_DESKTOP + depends on BR2_PACKAGE_MATCHBOX_PANEL || BR2_PACKAGE_MATCHBOX_DESKTOP help Common desktop folders and matchbox-session script.
Signature · 1 line
1.9.1
PATCH 14/30 package/matchbox-common: fix dependencies
Quoted 4 lines · Yann E. MORIN
matchbox-common can be used by both matchbox-desktop and matchbox-panel, so it needs to depend on either, not both.
Signed-off-by "Yann E. MORIN" <[email protected]>
Regards,
Arnout
Quoted 17 lines
--- package/matchbox/matchbox-common/Config.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)package/matchbox/matchbox-common/Config.in +1
-1@@ -1,6 +1,6 @@ config BR2_PACKAGE_MATCHBOX_COMMON bool "matchbox-common" - depends on BR2_PACKAGE_MATCHBOX_PANEL && BR2_PACKAGE_MATCHBOX_DESKTOP + depends on BR2_PACKAGE_MATCHBOX_PANEL || BR2_PACKAGE_MATCHBOX_DESKTOP help Common desktop folders and matchbox-session script.
Signature · 6 lines
Arnout Vandecappelle arnout at mind be Senior Embedded Software Architect +32-16-286500 Essensium/Mind http://www.mind.be G.Geenslaan 9, 3001 Leuven, Belgium BE 872 984 063 RPR Leuven LinkedIn profile: http://www.linkedin.com/in/arnoutvandecappelle GPG fingerprint: 7CB5 E4CC 6C2E EFD4 6E3D A754 F963 ECAB 2450 2F1F
PATCH 15/30 package/matchbox-common: break dependency chain for display
In reply to Yann E. MORINCurrently, matchbox-common depends on either matchbox-dsktop or matchbox-panel, and the three are organised so that matchbox-common gets indented in the menuconfig.
That's a feature of menuconfig to consider the dependency chain to indent sub-options.
Add a fake, prompt-less option to break that dependency chain.
Note: yes, this is an dirty hack.
--- package/matchbox/matchbox-common/Config.in | 5 +++++ 1 file changed, 5 insertions(+)
package/matchbox/matchbox-common/Config.in +5 -0
@@ -1,3 +1,8 @@ +# Hack! Break dependency chain so that matchbox-common does +# not get indented below matchbox-panel or matchbox-desktop. +config FOO + bool + config BR2_PACKAGE_MATCHBOX_COMMON bool "matchbox-common" depends on BR2_PACKAGE_MATCHBOX_PANEL || BR2_PACKAGE_MATCHBOX_DESKTOP
Signature · 1 line
1.9.1
PATCH 15/30 package/matchbox-common: break dependency chain for display
Quoted 4 lines · Yann E. MORIN
Currently, matchbox-common depends on either matchbox-dsktop or matchbox-panel, and the three are organised so that matchbox-common gets indented in the menuconfig.
Quoted 8 lines
That's a feature of menuconfig to consider the dependency chain to indent sub-options.
Add a fake, prompt-less option to break that dependency chain.
Note: yes, this is an dirty hack.
Signed-off-by "Yann E. MORIN" <[email protected]>
Now that you've moved the packages out of the matchbox/ directory and sorted
them alphabetically, this is no longer needed.
Or else, I missed the point :-)
Regards,
Arnout
Quoted 18 lines
--- package/matchbox/matchbox-common/Config.in | 5 +++++ 1 file changed, 5 insertions(+)package/matchbox/matchbox-common/Config.in +5
-0@@ -1,3 +1,8 @@ +# Hack! Break dependency chain so that matchbox-common does +# not get indented below matchbox-panel or matchbox-desktop. +config FOO + bool + config BR2_PACKAGE_MATCHBOX_COMMON bool "matchbox-common" depends on BR2_PACKAGE_MATCHBOX_PANEL || BR2_PACKAGE_MATCHBOX_DESKTOP
Signature · 6 lines
Arnout Vandecappelle arnout at mind be Senior Embedded Software Architect +32-16-286500 Essensium/Mind http://www.mind.be G.Geenslaan 9, 3001 Leuven, Belgium BE 872 984 063 RPR Leuven LinkedIn profile: http://www.linkedin.com/in/arnoutvandecappelle GPG fingerprint: 7CB5 E4CC 6C2E EFD4 6E3D A754 F963 ECAB 2450 2F1F
PATCH 15/30 package/matchbox-common: break dependency chain for display
Arnout, All,
On 2015-05-01 22:02 +0200, Arnout Vandecappelle spake thusly:
Quoted 10 lines · Yann E. MORIN
Quoted 9 lines
Currently, matchbox-common depends on either matchbox-dsktop or matchbox-panel, and the three are organised so that matchbox-common gets indented in the menuconfig.
That's a feature of menuconfig to consider the dependency chain to indent sub-options.
Add a fake, prompt-less option to break that dependency chain.
Quoted 8 lines
Quoted 3 lines
Note: yes, this is an dirty hack.
Signed-off-by "Yann E. MORIN" <[email protected]>Now that you've moved the packages out of the matchbox/ directory and sorted
them alphabetically, this is no longer needed.Or else, I missed the point :-)
No, that's correct. I'll drop this.
Thanks! :-)
Regards,
Yann E. MORIN.
Signature · 6 lines
.-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 223 225 172 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------'
PATCH 16/30 package/matchbox-fakekey: add missing dependency
In reply to Yann E. MORINmatchbox-fakekey build-depends on xlib_libXtst, but does not select it.
Fix that.
--- package/matchbox/matchbox-fakekey/Config.in | 1 + 1 file changed, 1 insertion(+)
package/matchbox/matchbox-fakekey/Config.in +1 -0
@@ -1,2 +1,3 @@ config BR2_PACKAGE_MATCHBOX_FAKEKEY bool + select BR2_PACKAGE_XLIB_LIBXTST
Signature · 1 line
1.9.1
PATCH 16/30 package/matchbox-fakekey: add missing dependency
Quoted 5 lines · Yann E. MORIN
matchbox-fakekey build-depends on
xlib_libXtst, but does not select it.Fix that.
Signed-off-by "Yann E. MORIN" <[email protected]>
package/matchbox/matchbox-fakekey/Config.in line 3
Quoted 12 lines
--- package/matchbox/matchbox-fakekey/Config.in | 1 + 1 file changed, 1 insertion(+)package/matchbox/matchbox-fakekey/Config.in +1
-0@@ -1,2 +1,3 @@ config BR2_PACKAGE_MATCHBOX_FAKEKEY bool + select BR2_PACKAGE_XLIB_LIBXTST
It also depends on matchbox-lib without selecting it (like all matchbox
packages BTW).
Of course, matchbox-lib is always selected because matchbox selects it and
matchbox-* depends on matchbox. However, if there is ever going to be a checkpackage script, it will check for consistency between select and DEPENDENCIES. So you can just as well add it now.
Probably best to do that for all matchbox packages in a single commit, so not
in this patch. Hence my Ack.
Regards,
Arnout
Quoted 1 line
Signature · 6 lines
Arnout Vandecappelle arnout at mind be Senior Embedded Software Architect +32-16-286500 Essensium/Mind http://www.mind.be G.Geenslaan 9, 3001 Leuven, Belgium BE 872 984 063 RPR Leuven LinkedIn profile: http://www.linkedin.com/in/arnoutvandecappelle GPG fingerprint: 7CB5 E4CC 6C2E EFD4 6E3D A754 F963 ECAB 2450 2F1F
PATCH 17/30 package/matchbox-startup-monitor: add misisng dependency
In reply to Yann E. MORINmatchbox-startup-monitor build-depends on startup-notifications, but does not select it.
Fix that.
--- package/matchbox/matchbox-startup-monitor/Config.in | 1 + 1 file changed, 1 insertion(+)
package/matchbox/matchbox-startup-monitor/Config.in +1 -0
@@ -1,2 +1,3 @@ config BR2_PACKAGE_MATCHBOX_STARTUP_MONITOR bool + select BR2_PACKAGE_STARTUP_NOTIFICATION
Signature · 1 line
1.9.1
PATCH 17/30 package/matchbox-startup-monitor: add misisng dependency
Quoted 6 lines · Yann E. MORIN
matchbox-startup-monitor build-depends on startup-notifications, but does not select it.
Fix that.
Signed-off-by "Yann E. MORIN" <[email protected]>
Regards,
Arnout
Quoted 13 lines
--- package/matchbox/matchbox-startup-monitor/Config.in | 1 + 1 file changed, 1 insertion(+)package/matchbox/matchbox-startup-monitor/Config.in +1
-0@@ -1,2 +1,3 @@ config BR2_PACKAGE_MATCHBOX_STARTUP_MONITOR bool + select BR2_PACKAGE_STARTUP_NOTIFICATION
Signature · 6 lines
Arnout Vandecappelle arnout at mind be Senior Embedded Software Architect +32-16-286500 Essensium/Mind http://www.mind.be G.Geenslaan 9, 3001 Leuven, Belgium BE 872 984 063 RPR Leuven LinkedIn profile: http://www.linkedin.com/in/arnoutvandecappelle GPG fingerprint: 7CB5 E4CC 6C2E EFD4 6E3D A754 F963 ECAB 2450 2F1F
PATCH 18/30 package/matchbox: finally add prompts to all sub-packages
In reply to Yann E. MORINWe currently do not have that many packages without a prompt, and when we do, they are limited to system-related packages that can't be selected or are forcibly selected under various system-specific conditions.
This is clearly not the case for the matchbox sub-packages, so just give them a prompt, even when they are forcibly selected by the main matchbox package, and can't be selected without it.
That will at least tell the user those packages exist and are to be built.
--- package/matchbox/matchbox-fakekey/Config.in | 4 +++- package/matchbox/matchbox-lib/Config.in | 4 +++- package/matchbox/matchbox-startup-monitor/Config.in | 4 +++- 3 files changed, 9 insertions(+), 3 deletions(-)
package/matchbox/matchbox-fakekey/Config.in +3 -1
@@ -1,3 +1,5 @@ config BR2_PACKAGE_MATCHBOX_FAKEKEY - bool + bool "matchbox-fakekey" select BR2_PACKAGE_XLIB_LIBXTST + help + Library for simulating key press events under X11.
package/matchbox/matchbox-lib/Config.in +3 -1
@@ -1,2 +1,4 @@ config BR2_PACKAGE_MATCHBOX_LIB - bool + bool "matchbox-lib" + help + Matchbox common functionality library.
package/matchbox/matchbox-startup-monitor/Config.in +3 -1
@@ -1,3 +1,5 @@ config BR2_PACKAGE_MATCHBOX_STARTUP_MONITOR - bool + bool "matchbox-startup-monitor" select BR2_PACKAGE_STARTUP_NOTIFICATION + help + Matchbox Panel Startup Monitor Applet.
Signature · 1 line
1.9.1
PATCH 18/30 package/matchbox: finally add prompts to all sub-packages
Quoted 5 lines · Yann E. MORIN
We currently do not have that many packages without a prompt, and when we do, they are limited to system-related packages that can't be selected or are forcibly selected under various system-specific conditions.
Quoted 8 lines
This is clearly not the case for the matchbox sub-packages, so just give them a prompt, even when they are forcibly selected by the main matchbox package, and can't be selected without it.
That will at least tell the user those packages exist and are to be built.
Signed-off-by "Yann E. MORIN" <[email protected]>
Actually, for startup-monitor, it couldn't be selected anymore after you
inverted the dependency chain (9b7e06a in your current branch). So perhaps that part should move to the previous commit.
Regards,
Arnout
Quoted 39 lines
--- package/matchbox/matchbox-fakekey/Config.in | 4 +++- package/matchbox/matchbox-lib/Config.in | 4 +++- package/matchbox/matchbox-startup-monitor/Config.in | 4 +++- 3 files changed, 9 insertions(+), 3 deletions(-)package/matchbox/matchbox-fakekey/Config.in +3
-1@@ -1,3 +1,5 @@ config BR2_PACKAGE_MATCHBOX_FAKEKEY - bool + bool "matchbox-fakekey" select BR2_PACKAGE_XLIB_LIBXTST + help + Library for simulating key press events under X11.package/matchbox/matchbox-lib/Config.in +3
-1@@ -1,2 +1,4 @@ config BR2_PACKAGE_MATCHBOX_LIB - bool + bool "matchbox-lib" + help + Matchbox common functionality library.package/matchbox/matchbox-startup-monitor/Config.in +3
-1@@ -1,3 +1,5 @@ config BR2_PACKAGE_MATCHBOX_STARTUP_MONITOR - bool + bool "matchbox-startup-monitor" select BR2_PACKAGE_STARTUP_NOTIFICATION + help + Matchbox Panel Startup Monitor Applet.
Signature · 6 lines
Arnout Vandecappelle arnout at mind be Senior Embedded Software Architect +32-16-286500 Essensium/Mind http://www.mind.be G.Geenslaan 9, 3001 Leuven, Belgium BE 872 984 063 RPR Leuven LinkedIn profile: http://www.linkedin.com/in/arnoutvandecappelle GPG fingerprint: 7CB5 E4CC 6C2E EFD4 6E3D A754 F963 ECAB 2450 2F1F
PATCH 18/30 package/matchbox: finally add prompts to all sub-packages
Arnout, All,
On 2015-05-01 22:23 +0200, Arnout Vandecappelle spake thusly:
Quoted 13 lines · Yann E. MORIN
Quoted 12 lines
We currently do not have that many packages without a prompt, and when we do, they are limited to system-related packages that can't be selected or are forcibly selected under various system-specific conditions.
This is clearly not the case for the matchbox sub-packages, so just give them a prompt, even when they are forcibly selected by the main matchbox package, and can't be selected without it.
That will at least tell the user those packages exist and are to be built.
Quoted 7 lines
Quoted 1 line
Signed-off-by "Yann E. MORIN" <[email protected]>Actually, for startup-monitor, it couldn't be selected anymore after you
inverted the dependency chain (9b7e06a in your current branch). So perhaps that part should move to the previous commit.
Indeed, I missed that case. I'll fix it.
Thanks! :-)
Regards,
Yann E. MORIN.
Quoted 51 lines
Regards,
ArnoutQuoted 39 lines
--- package/matchbox/matchbox-fakekey/Config.in | 4 +++- package/matchbox/matchbox-lib/Config.in | 4 +++- package/matchbox/matchbox-startup-monitor/Config.in | 4 +++- 3 files changed, 9 insertions(+), 3 deletions(-)package/matchbox/matchbox-fakekey/Config.in +3
-1@@ -1,3 +1,5 @@ config BR2_PACKAGE_MATCHBOX_FAKEKEY - bool + bool "matchbox-fakekey" select BR2_PACKAGE_XLIB_LIBXTST + help + Library for simulating key press events under X11.package/matchbox/matchbox-lib/Config.in +3
-1@@ -1,2 +1,4 @@ config BR2_PACKAGE_MATCHBOX_LIB - bool + bool "matchbox-lib" + help + Matchbox common functionality library.package/matchbox/matchbox-startup-monitor/Config.in +3
-1@@ -1,3 +1,5 @@ config BR2_PACKAGE_MATCHBOX_STARTUP_MONITOR - bool + bool "matchbox-startup-monitor" select BR2_PACKAGE_STARTUP_NOTIFICATION + help + Matchbox Panel Startup Monitor Applet.Signature · 6 lines
Arnout Vandecappelle arnout at mind be Senior Embedded Software Architect +32-16-286500 Essensium/Mind http://www.mind.be G.Geenslaan 9, 3001 Leuven, Belgium BE 872 984 063 RPR Leuven LinkedIn profile: http://www.linkedin.com/in/arnoutvandecappelle GPG fingerprint: 7CB5 E4CC 6C2E EFD4 6E3D A754 F963 ECAB 2450 2F1F
Signature · 6 lines
.-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 223 225 172 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------'
PATCH 19/30 package/matchbox: enable support for the Xsession manager
In reply to Yann E. MORIN--- package/matchbox/matchbox.mk | 7 +++++++ 1 file changed, 7 insertions(+)
package/matchbox/matchbox.mk +7 -0
@@ -35,6 +35,13 @@ else MATCHBOX_CONF_OPTS += --disable-startup-notification endif +ifeq ($(BR2_PACKAGE_XLIB_LIBSM),y) +MATCHBOX_CONF_OPTS += --enable-session +MATCHBOX_DEPENDENCIES += xlib_libSM +else +MATCHBOX_CONF_OPTS += --disable-session +endif + $(eval $(autotools-package)) # After we called a package infra, w ecan include more files
Signature · 1 line
1.9.1
PATCH 19/30 package/matchbox: enable support for the Xsession manager
Quoted 1 line · Yann E. MORIN
Signed-off-by "Yann E. MORIN" <[email protected]>
Although I wonder: are users really expected to go an select some X library to
enable the multisession feature? I think this is one that falls under the "non-obvious dependency" class.
Regards,
Arnout
Quoted 23 lines
--- package/matchbox/matchbox.mk | 7 +++++++ 1 file changed, 7 insertions(+)package/matchbox/matchbox.mk +7
-0@@ -35,6 +35,13 @@ else MATCHBOX_CONF_OPTS += --disable-startup-notification endif +ifeq ($(BR2_PACKAGE_XLIB_LIBSM),y) +MATCHBOX_CONF_OPTS += --enable-session +MATCHBOX_DEPENDENCIES += xlib_libSM +else +MATCHBOX_CONF_OPTS += --disable-session +endif + $(eval $(autotools-package)) # After we called a package infra, w ecan include more files
Signature · 6 lines
Arnout Vandecappelle arnout at mind be Senior Embedded Software Architect +32-16-286500 Essensium/Mind http://www.mind.be G.Geenslaan 9, 3001 Leuven, Belgium BE 872 984 063 RPR Leuven LinkedIn profile: http://www.linkedin.com/in/arnoutvandecappelle GPG fingerprint: 7CB5 E4CC 6C2E EFD4 6E3D A754 F963 ECAB 2450 2F1F
PATCH 19/30 package/matchbox: enable support for the Xsession manager
Arnout, All,
On 2015-05-01 22:28 +0200, Arnout Vandecappelle spake thusly:
Quoted 8 lines · Yann E. MORIN
Quoted 1 line
Signed-off-by "Yann E. MORIN" <[email protected]>Although I wonder: are users really expected to go an select some X library to
enable the multisession feature? I think this is one that falls under the "non-obvious dependency" class.
OK, I'll make that an option in Kconfig.
Regards,
Yann E. MORIN.
Quoted 35 lines
Regards,
ArnoutQuoted 23 lines
--- package/matchbox/matchbox.mk | 7 +++++++ 1 file changed, 7 insertions(+)package/matchbox/matchbox.mk +7
-0@@ -35,6 +35,13 @@ else MATCHBOX_CONF_OPTS += --disable-startup-notification endif +ifeq ($(BR2_PACKAGE_XLIB_LIBSM),y) +MATCHBOX_CONF_OPTS += --enable-session +MATCHBOX_DEPENDENCIES += xlib_libSM +else +MATCHBOX_CONF_OPTS += --disable-session +endif + $(eval $(autotools-package)) # After we called a package infra, w ecan include more filesSignature · 6 lines
Arnout Vandecappelle arnout at mind be Senior Embedded Software Architect +32-16-286500 Essensium/Mind http://www.mind.be G.Geenslaan 9, 3001 Leuven, Belgium BE 872 984 063 RPR Leuven LinkedIn profile: http://www.linkedin.com/in/arnoutvandecappelle GPG fingerprint: 7CB5 E4CC 6C2E EFD4 6E3D A754 F963 ECAB 2450 2F1F
Signature · 6 lines
.-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 223 225 172 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------'
PATCH 20/30 package/matchbox: cleanup handling of support for compositing
In reply to Yann E. MORINSupport for /compositing/ requires Xcomposite, Xfixes, Xdamage and Xrender, as can be seen in the configure.ac. And it is optional.
Fix that by removing 'select' in Config.in, and chcking all four dependencies in the .mk.
--- package/matchbox/Config.in | 1 - package/matchbox/matchbox.mk | 13 ++++++++----- 2 files changed, 8 insertions(+), 6 deletions(-)
package/matchbox/Config.in +0 -1
@@ -5,7 +5,6 @@ config BR2_PACKAGE_MATCHBOX select BR2_PACKAGE_FONTCONFIG select BR2_PACKAGE_EXPAT select BR2_PACKAGE_XLIB_LIBXEXT - select BR2_PACKAGE_XLIB_LIBXDAMAGE select BR2_PACKAGE_XLIB_LIBXCURSOR select BR2_PACKAGE_MATCHBOX_LIB help
package/matchbox/matchbox.mk +8 -5
@@ -16,12 +16,15 @@ MATCHBOX_CONF_OPTS = --enable-expat # Workaround bug in configure script MATCHBOX_CONF_ENV = expat=yes -ifeq ($(BR2_PACKAGE_X11R7_LIBXCOMPOSITE),y) -ifeq ($(BR2_PACKAGE_X11R7_LIBXPM),y) +ifeq ($(BR2_PACKAGE_XLIB_LIBXCOMPOSITE)$(BR2_PACKAGE_XLIB_LIBXFIXES)$(BR2_PACKAGE_XLIB_LIBXDAMAGE)$(BR2_PACKAGE_XLIB_LIBXRENDER),yyyy) MATCHBOX_CONF_OPTS += --enable-composite -MATCHBOX_DEPENDENCIES += xlib_libXcomposite -MATCHBOX_DEPENDENCIES += xlib_libXpm -endif +MATCHBOX_DEPENDENCIES += \ + xlib_libXcomposite \ + xlib_libXfixes \ + xlib_libXdamage \ + xlib_libXrender +else +MATCHBOX_CONF_OPTS += --disable-composite endif ifeq ($(BR2_PACKAGE_XLIB_LIBXFT),y)
Signature · 1 line
1.9.1
PATCH 20/30 package/matchbox: cleanup handling of support for compositing
Quoted 4 lines · Yann E. MORIN
Support for /compositing/ requires Xcomposite, Xfixes, Xdamage and Xrender, as can be seen in the configure.ac. And it is optional.
Fix that by removing 'select' in Config.in, and chcking all four
checking
Quoted 3 lines
dependencies in the .mk.
Signed-off-by "Yann E. MORIN" <[email protected]>
Regards,
Arnout
Quoted 43 lines
--- package/matchbox/Config.in | 1 - package/matchbox/matchbox.mk | 13 ++++++++----- 2 files changed, 8 insertions(+), 6 deletions(-)package/matchbox/Config.in +0
-1@@ -5,7 +5,6 @@ config BR2_PACKAGE_MATCHBOX select BR2_PACKAGE_FONTCONFIG select BR2_PACKAGE_EXPAT select BR2_PACKAGE_XLIB_LIBXEXT - select BR2_PACKAGE_XLIB_LIBXDAMAGE select BR2_PACKAGE_XLIB_LIBXCURSOR select BR2_PACKAGE_MATCHBOX_LIB helppackage/matchbox/matchbox.mk +8
-5@@ -16,12 +16,15 @@ MATCHBOX_CONF_OPTS = --enable-expat # Workaround bug in configure script MATCHBOX_CONF_ENV = expat=yes -ifeq ($(BR2_PACKAGE_X11R7_LIBXCOMPOSITE),y) -ifeq ($(BR2_PACKAGE_X11R7_LIBXPM),y) +ifeq ($(BR2_PACKAGE_XLIB_LIBXCOMPOSITE)$(BR2_PACKAGE_XLIB_LIBXFIXES)$(BR2_PACKAGE_XLIB_LIBXDAMAGE)$(BR2_PACKAGE_XLIB_LIBXRENDER),yyyy) MATCHBOX_CONF_OPTS += --enable-composite -MATCHBOX_DEPENDENCIES += xlib_libXcomposite -MATCHBOX_DEPENDENCIES += xlib_libXpm -endif +MATCHBOX_DEPENDENCIES += \ + xlib_libXcomposite \ + xlib_libXfixes \ + xlib_libXdamage \ + xlib_libXrender +else +MATCHBOX_CONF_OPTS += --disable-composite endif ifeq ($(BR2_PACKAGE_XLIB_LIBXFT),y)
Signature · 6 lines
Arnout Vandecappelle arnout at mind be Senior Embedded Software Architect +32-16-286500 Essensium/Mind http://www.mind.be G.Geenslaan 9, 3001 Leuven, Belgium BE 872 984 063 RPR Leuven LinkedIn profile: http://www.linkedin.com/in/arnoutvandecappelle GPG fingerprint: 7CB5 E4CC 6C2E EFD4 6E3D A754 F963 ECAB 2450 2F1F
PATCH 21/30 package/matchbox: make it a menu
In reply to Yann E. MORINWe're about to add a few more options, so it now warrants a menu for itself.
--- package/matchbox/Config.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
package/matchbox/Config.in +1 -1
@@ -1,4 +1,4 @@ -config BR2_PACKAGE_MATCHBOX +menuconfig BR2_PACKAGE_MATCHBOX bool "matchbox" depends on BR2_PACKAGE_XORG7 depends on BR2_USE_MMU # fork()
Signature · 1 line
1.9.1
PATCH 21/30 package/matchbox: make it a menu
Quoted 4 lines · Yann E. MORIN
We're about to add a few more options, so it now warrants a menu for itself.
Signed-off-by "Yann E. MORIN" <[email protected]>
I would move this earlier in the series (around the time you move everything
one directory up), but that's not so important.
Regards,
Arnout
Quoted 15 lines
--- package/matchbox/Config.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)package/matchbox/Config.in +1
-1@@ -1,4 +1,4 @@ -config BR2_PACKAGE_MATCHBOX +menuconfig BR2_PACKAGE_MATCHBOX bool "matchbox" depends on BR2_PACKAGE_XORG7 depends on BR2_USE_MMU # fork()
Signature · 6 lines
Arnout Vandecappelle arnout at mind be Senior Embedded Software Architect +32-16-286500 Essensium/Mind http://www.mind.be G.Geenslaan 9, 3001 Leuven, Belgium BE 872 984 063 RPR Leuven LinkedIn profile: http://www.linkedin.com/in/arnoutvandecappelle GPG fingerprint: 7CB5 E4CC 6C2E EFD4 6E3D A754 F963 ECAB 2450 2F1F
PATCH 22/30 package/matchbox: forcibly disable support for compositing
In reply to Yann E. MORINBuilding with the experimental support for compositing is broken:
/home/ymorin/dev/buildroot/O/host/usr/bin/arm-linux-gnueabihf-gcc -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64
-Os -o matchbox-window-manager main.o wm.o base_client.o main_client.o toolbar_client.o toolbar_client_alt.o dockbar_client.o dialog_client.o select_client.o desktop_client.o ewmh.o misc.o client_common.o keys.o list.o stack.o composite-engine.o session.o mbtheme.o xml.o
-lmb -lX11 -L/home/ymorin/dev/buildroot/O/host/usr/arm-buildroot-linux-gnueabihf/sysroot/usr/lib -lXext -lXcomposite -lXdamage -lXfixes -lXrender -L/home/ymorin/dev/buildroot/O/host/usr/arm-buildroot-linux-gnueabihf/sysroot/usr/lib -lX11 -lexpat -L/home/ymorin/dev/buildroot/O/host/usr/arm-buildroot-linux-gnueabihf/sysroot/usr/lib -lXfixes
composite-engine.o: In function `gaussian':
/home/ymorin/dev/buildroot/O/build/matchbox-1.2/src/composite-engine.c:65:
undefined reference to `exp'
That's because it forgets to link with -lm.
However, adding "MATCHBOX_CONF_ENV = -lm" does not solve the issue, as it still does not link with -lm at all.
Furthermore, the package does not autoreconf, since it is missing the gconf m4 macros, and Buildroot does not have a package for gconf, hence we can not even patch Makefile.am and autoreconf.
Patching Makefile.in (in addition to .am) could be a solution, but support for compositing is explicitly marked as being experimental.
So, just forcibly disable it altogether.
--- package/matchbox/matchbox.mk | 13 +------------ 1 file changed, 1 insertion(+), 12 deletions(-)
package/matchbox/matchbox.mk +1 -12
@@ -11,22 +11,11 @@ MATCHBOX_LICENSE = GPLv2+ MATCHBOX_LICENSE_FILES = COPYING MATCHBOX_DEPENDENCIES = matchbox-lib -MATCHBOX_CONF_OPTS = --enable-expat +MATCHBOX_CONF_OPTS = --enable-expat --disable-composite # Workaround bug in configure script MATCHBOX_CONF_ENV = expat=yes -ifeq ($(BR2_PACKAGE_XLIB_LIBXCOMPOSITE)$(BR2_PACKAGE_XLIB_LIBXFIXES)$(BR2_PACKAGE_XLIB_LIBXDAMAGE)$(BR2_PACKAGE_XLIB_LIBXRENDER),yyyy) -MATCHBOX_CONF_OPTS += --enable-composite -MATCHBOX_DEPENDENCIES += \ - xlib_libXcomposite \ - xlib_libXfixes \ - xlib_libXdamage \ - xlib_libXrender -else -MATCHBOX_CONF_OPTS += --disable-composite -endif - ifeq ($(BR2_PACKAGE_XLIB_LIBXFT),y) MATCHBOX_DEPENDENCIES += xlib_libXft endif
Signature · 1 line
1.9.1
PATCH 22/30 package/matchbox: forcibly disable support for compositing
Quoted 28 lines · Yann E. MORIN
Building with the experimental support for compositing is broken:
/home/ymorin/dev/buildroot/O/host/usr/bin/arm-linux-gnueabihf-gcc-D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64
-Os -o matchbox-window-manager main.o wm.o base_client.o main_client.o toolbar_client.o toolbar_client_alt.o dockbar_client.o dialog_client.o select_client.o desktop_client.o ewmh.o misc.o client_common.o keys.o list.o stack.o composite-engine.o session.o mbtheme.o xml.o
-lmb -lX11 -L/home/ymorin/dev/buildroot/O/host/usr/arm-buildroot-linux-gnueabihf/sysroot/usr/lib -lXext -lXcomposite -lXdamage -lXfixes -lXrender -L/home/ymorin/dev/buildroot/O/host/usr/arm-buildroot-linux-gnueabihf/sysroot/usr/lib -lX11 -lexpat -L/home/ymorin/dev/buildroot/O/host/usr/arm-buildroot-linux-gnueabihf/sysroot/usr/lib -lXfixes
composite-engine.o: In function `gaussian':
/home/ymorin/dev/buildroot/O/build/matchbox-1.2/src/composite-engine.c:65:
undefined reference to `exp'That's because it forgets to link with -lm.
However, adding "
MATCHBOX_CONF_ENV= -lm" does not solve the issue, as it still does not link with -lm at all.Furthermore, the package does not autoreconf, since it is missing the gconf m4 macros, and Buildroot does not have a package for gconf, hence we can not even patch Makefile.am and autoreconf.
Quoted 6 lines
Patching Makefile.in (in addition to .am) could be a solution, but support for compositing is explicitly marked as being experimental.
So, just forcibly disable it altogether.
Signed-off-by "Yann E. MORIN" <[email protected]>
It kind of makes the previous patch redundant, but there you go...
Quoted 33 lines
--- package/matchbox/matchbox.mk | 13 +------------ 1 file changed, 1 insertion(+), 12 deletions(-)package/matchbox/matchbox.mk +1
-12@@ -11,22 +11,11 @@ MATCHBOX_LICENSE = GPLv2+ MATCHBOX_LICENSE_FILES = COPYING MATCHBOX_DEPENDENCIES = matchbox-lib -MATCHBOX_CONF_OPTS = --enable-expat +MATCHBOX_CONF_OPTS = --enable-expat --disable-composite # Workaround bug in configure script MATCHBOX_CONF_ENV = expat=yes -ifeq ($(BR2_PACKAGE_XLIB_LIBXCOMPOSITE)$(BR2_PACKAGE_XLIB_LIBXFIXES)$(BR2_PACKAGE_XLIB_LIBXDAMAGE)$(BR2_PACKAGE_XLIB_LIBXRENDER),yyyy) -MATCHBOX_CONF_OPTS += --enable-composite -MATCHBOX_DEPENDENCIES += \ - xlib_libXcomposite \ - xlib_libXfixes \ - xlib_libXdamage \ - xlib_libXrender -else -MATCHBOX_CONF_OPTS += --disable-composite -endif - ifeq ($(BR2_PACKAGE_XLIB_LIBXFT),y) MATCHBOX_DEPENDENCIES += xlib_libXft endif
Signature · 6 lines
Arnout Vandecappelle arnout at mind be Senior Embedded Software Architect +32-16-286500 Essensium/Mind http://www.mind.be G.Geenslaan 9, 3001 Leuven, Belgium BE 872 984 063 RPR Leuven LinkedIn profile: http://www.linkedin.com/in/arnoutvandecappelle GPG fingerprint: 7CB5 E4CC 6C2E EFD4 6E3D A754 F963 ECAB 2450 2F1F
PATCH 22/30 package/matchbox: forcibly disable support for compositing
Arnout, All,
On 2015-05-01 22:31 +0200, Arnout Vandecappelle spake thusly:
Quoted 32 lines · Yann E. MORIN
Quoted 31 lines
Building with the experimental support for compositing is broken:
/home/ymorin/dev/buildroot/O/host/usr/bin/arm-linux-gnueabihf-gcc-D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64
-Os -o matchbox-window-manager main.o wm.o base_client.o main_client.o toolbar_client.o toolbar_client_alt.o dockbar_client.o dialog_client.o select_client.o desktop_client.o ewmh.o misc.o client_common.o keys.o list.o stack.o composite-engine.o session.o mbtheme.o xml.o
-lmb -lX11 -L/home/ymorin/dev/buildroot/O/host/usr/arm-buildroot-linux-gnueabihf/sysroot/usr/lib -lXext -lXcomposite -lXdamage -lXfixes -lXrender -L/home/ymorin/dev/buildroot/O/host/usr/arm-buildroot-linux-gnueabihf/sysroot/usr/lib -lX11 -lexpat -L/home/ymorin/dev/buildroot/O/host/usr/arm-buildroot-linux-gnueabihf/sysroot/usr/lib -lXfixes
composite-engine.o: In function `gaussian':
/home/ymorin/dev/buildroot/O/build/matchbox-1.2/src/composite-engine.c:65:
undefined reference to `exp'That's because it forgets to link with -lm.
However, adding "
MATCHBOX_CONF_ENV= -lm" does not solve the issue, as it still does not link with -lm at all.Furthermore, the package does not autoreconf, since it is missing the gconf m4 macros, and Buildroot does not have a package for gconf, hence we can not even patch Makefile.am and autoreconf.
Patching Makefile.in (in addition to .am) could be a solution, but support for compositing is explicitly marked as being experimental.
Quoted 7 lines
Quoted 3 lines
So, just forcibly disable it altogether.
Signed-off-by "Yann E. MORIN" <[email protected]>It kind of makes the previous patch redundant, but there you go...
Right. I've squashed the two patches together, so compositing is directly disabled without trying to fix it up first.
Thanks! :-)
Regards,
Yann E. MORIN.
Quoted 42 lines
Quoted 33 lines
--- package/matchbox/matchbox.mk | 13 +------------ 1 file changed, 1 insertion(+), 12 deletions(-)package/matchbox/matchbox.mk +1
-12@@ -11,22 +11,11 @@ MATCHBOX_LICENSE = GPLv2+ MATCHBOX_LICENSE_FILES = COPYING MATCHBOX_DEPENDENCIES = matchbox-lib -MATCHBOX_CONF_OPTS = --enable-expat +MATCHBOX_CONF_OPTS = --enable-expat --disable-composite # Workaround bug in configure script MATCHBOX_CONF_ENV = expat=yes -ifeq ($(BR2_PACKAGE_XLIB_LIBXCOMPOSITE)$(BR2_PACKAGE_XLIB_LIBXFIXES)$(BR2_PACKAGE_XLIB_LIBXDAMAGE)$(BR2_PACKAGE_XLIB_LIBXRENDER),yyyy) -MATCHBOX_CONF_OPTS += --enable-composite -MATCHBOX_DEPENDENCIES += \ - xlib_libXcomposite \ - xlib_libXfixes \ - xlib_libXdamage \ - xlib_libXrender -else -MATCHBOX_CONF_OPTS += --disable-composite -endif - ifeq ($(BR2_PACKAGE_XLIB_LIBXFT),y) MATCHBOX_DEPENDENCIES += xlib_libXft endifSignature · 6 lines
Arnout Vandecappelle arnout at mind be Senior Embedded Software Architect +32-16-286500 Essensium/Mind http://www.mind.be G.Geenslaan 9, 3001 Leuven, Belgium BE 872 984 063 RPR Leuven LinkedIn profile: http://www.linkedin.com/in/arnoutvandecappelle GPG fingerprint: 7CB5 E4CC 6C2E EFD4 6E3D A754 F963 ECAB 2450 2F1F
Signature · 6 lines
.-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 223 225 172 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------'
PATCH 23/30 package/matchbox: drop useless dependencies
In reply to Yann E. MORINxlib-libXft is only needed when building a 'standalone' matchbox, which means not using matchbox-lib.
But we *are* building matchbox-lib, and we do not support the standalone mode (and probably won't, as even upstream says it is ugly, by lack of theming).
Similarly, xlib-libXext is only used for its 'xsync' extension, for which support is entirely commented-out in matchbox.
So, drop the dependency on xlib-libXft, and make it explicit we're not building either standalone modes; drop xlib-libXext.
--- package/matchbox/Config.in | 1 - package/matchbox/matchbox.mk | 6 +++++- 2 files changed, 5 insertions(+), 2 deletions(-)
package/matchbox/Config.in +0 -1
@@ -4,7 +4,6 @@ menuconfig BR2_PACKAGE_MATCHBOX depends on BR2_USE_MMU # fork() select BR2_PACKAGE_FONTCONFIG select BR2_PACKAGE_EXPAT - select BR2_PACKAGE_XLIB_LIBXEXT select BR2_PACKAGE_XLIB_LIBXCURSOR select BR2_PACKAGE_MATCHBOX_LIB help
package/matchbox/matchbox.mk +5 -1
@@ -11,7 +11,11 @@ MATCHBOX_LICENSE = GPLv2+ MATCHBOX_LICENSE_FILES = COPYING MATCHBOX_DEPENDENCIES = matchbox-lib -MATCHBOX_CONF_OPTS = --enable-expat --disable-composite +MATCHBOX_CONF_OPTS = \ + --enable-expat \ + --disable-composite \ + --disable-standalone \ + --disable-standalone-xft # Workaround bug in configure script MATCHBOX_CONF_ENV = expat=yes
Signature · 1 line
1.9.1
PATCH 23/30 package/matchbox: drop useless dependencies
Quoted 36 lines · Yann E. MORIN
xlib-libXft is only needed when building a 'standalone' matchbox, which means not using matchbox-lib.
But we *are* building matchbox-lib, and we do not support the standalone mode (and probably won't, as even upstream says it is ugly, by lack of theming).
Similarly, xlib-libXext is only used for its 'xsync' extension, for which support is entirely commented-out in matchbox.
So, drop the dependency on xlib-libXft, and make it explicit we're not building either standalone modes; drop xlib-libXext.
Signed-off-by "Yann E. MORIN" <[email protected]>--- package/matchbox/Config.in | 1 - package/matchbox/matchbox.mk | 6 +++++- 2 files changed, 5 insertions(+), 2 deletions(-)package/matchbox/Config.in +0
-1@@ -4,7 +4,6 @@ menuconfig BR2_PACKAGE_MATCHBOX depends on BR2_USE_MMU # fork() select BR2_PACKAGE_FONTCONFIG select BR2_PACKAGE_EXPAT - select BR2_PACKAGE_XLIB_LIBXEXT select BR2_PACKAGE_XLIB_LIBXCURSOR select BR2_PACKAGE_MATCHBOX_LIB helppackage/matchbox/matchbox.mk +0
-0
package/matchbox/matchbox.mk MATCHBOX_LICENSE = GPLv2+ · line 18
Quoted 9 lines
package/matchbox/matchbox.mk +5
-1@@ -11,7 +11,11 @@ MATCHBOX_LICENSE = GPLv2+ MATCHBOX_LICENSE_FILES = COPYING MATCHBOX_DEPENDENCIES = matchbox-lib -MATCHBOX_CONF_OPTS = --enable-expat --disable-composite +MATCHBOX_CONF_OPTS = \ + --enable-expat \ + --disable-composite \ + --disable-standalone \ + --disable-standalone-xft
So, is the dependency on xlib_libXft a few lines lower still relevant? If so,
comment on it in the commit message.
Regards,
Arnout
Quoted 4 lines
package/matchbox/matchbox.mk +0
-0# Workaround bug in configure script MATCHBOX_CONF_ENV = expat=yes
Signature · 6 lines
Arnout Vandecappelle arnout at mind be Senior Embedded Software Architect +32-16-286500 Essensium/Mind http://www.mind.be G.Geenslaan 9, 3001 Leuven, Belgium BE 872 984 063 RPR Leuven LinkedIn profile: http://www.linkedin.com/in/arnoutvandecappelle GPG fingerprint: 7CB5 E4CC 6C2E EFD4 6E3D A754 F963 ECAB 2450 2F1F
PATCH 23/30 package/matchbox: drop useless dependencies
Quoted 39 lines · Arnout Vandecappelle
Quoted 38 lines · Yann E. MORIN
xlib-libXft is only needed when building a 'standalone' matchbox, which means not using matchbox-lib.
But we *are* building matchbox-lib, and we do not support the standalone mode (and probably won't, as even upstream says it is ugly, by lack of theming).
Similarly, xlib-libXext is only used for its 'xsync' extension, for which support is entirely commented-out in matchbox.
So, drop the dependency on xlib-libXft, and make it explicit we're not building either standalone modes; drop xlib-libXext.
Signed-off-by "Yann E. MORIN" <[email protected]>--- package/matchbox/Config.in | 1 - package/matchbox/matchbox.mk | 6 +++++- 2 files changed, 5 insertions(+), 2 deletions(-)package/matchbox/Config.in +0
-1@@ -4,7 +4,6 @@ menuconfig BR2_PACKAGE_MATCHBOX depends on BR2_USE_MMU # fork() select BR2_PACKAGE_FONTCONFIG select BR2_PACKAGE_EXPAT - select BR2_PACKAGE_XLIB_LIBXEXT select BR2_PACKAGE_XLIB_LIBXCURSOR select BR2_PACKAGE_MATCHBOX_LIB helppackage/matchbox/matchbox.mk +0
-0@@ -11,7 +11,11 @@ MATCHBOX_LICENSE = GPLv2+ MATCHBOX_LICENSE_FILES = COPYING
Quoted 10 lines
package/matchbox/matchbox.mk MATCHBOX_LICENSE = GPLv2+ · line 18
Quoted 7 lines
package/matchbox/matchbox.mk +5
-1MATCHBOX_DEPENDENCIES = matchbox-lib -MATCHBOX_CONF_OPTS = --enable-expat --disable-composite +MATCHBOX_CONF_OPTS = \ + --enable-expat \ + --disable-composite \ + --disable-standalone \ + --disable-standalone-xftSo, is the dependency on
xlib_libXfta few lines lower still relevant? If so,
comment on it in the commit message.
It actually is, configure checks for it and it is used in the code. So
but I'd still like it to be mentioned in the commit message.
Regards,
Arnout
Quoted 10 lines
Regards,
ArnoutQuoted 4 lines
package/matchbox/matchbox.mk +0
-0# Workaround bug in configure script MATCHBOX_CONF_ENV = expat=yes
Signature · 6 lines
Arnout Vandecappelle arnout at mind be Senior Embedded Software Architect +32-16-286500 Essensium/Mind http://www.mind.be G.Geenslaan 9, 3001 Leuven, Belgium BE 872 984 063 RPR Leuven LinkedIn profile: http://www.linkedin.com/in/arnoutvandecappelle GPG fingerprint: 7CB5 E4CC 6C2E EFD4 6E3D A754 F963 ECAB 2450 2F1F
PATCH 23/30 package/matchbox: drop useless dependencies
Arnout, All,
On 2015-05-01 22:58 +0200, Arnout Vandecappelle spake thusly:
Quoted 51 lines · Arnout Vandecappelle
Quoted 39 lines · Yann E. MORIN
Quoted 38 lines
xlib-libXft is only needed when building a 'standalone' matchbox, which means not using matchbox-lib.
But we *are* building matchbox-lib, and we do not support the standalone mode (and probably won't, as even upstream says it is ugly, by lack of theming).
Similarly, xlib-libXext is only used for its 'xsync' extension, for which support is entirely commented-out in matchbox.
So, drop the dependency on xlib-libXft, and make it explicit we're not building either standalone modes; drop xlib-libXext.
Signed-off-by "Yann E. MORIN" <[email protected]>--- package/matchbox/Config.in | 1 - package/matchbox/matchbox.mk | 6 +++++- 2 files changed, 5 insertions(+), 2 deletions(-)package/matchbox/Config.in +0
-1@@ -4,7 +4,6 @@ menuconfig BR2_PACKAGE_MATCHBOX depends on BR2_USE_MMU # fork() select BR2_PACKAGE_FONTCONFIG select BR2_PACKAGE_EXPAT - select BR2_PACKAGE_XLIB_LIBXEXT select BR2_PACKAGE_XLIB_LIBXCURSOR select BR2_PACKAGE_MATCHBOX_LIB helppackage/matchbox/matchbox.mk +0
-0@@ -11,7 +11,11 @@ MATCHBOX_LICENSE = GPLv2+ MATCHBOX_LICENSE_FILES = COPYINGQuoted 10 lines
package/matchbox/matchbox.mk MATCHBOX_LICENSE = GPLv2+ · line 18
Quoted 7 lines
package/matchbox/matchbox.mk +5
-1MATCHBOX_DEPENDENCIES = matchbox-lib -MATCHBOX_CONF_OPTS = --enable-expat --disable-composite +MATCHBOX_CONF_OPTS = \ + --enable-expat \ + --disable-composite \ + --disable-standalone \ + --disable-standalone-xftSo, is the dependency on
xlib_libXfta few lines lower still relevant? If so,
comment on it in the commit message.
Quoted 3 lines
It actually is, configure checks for it and it is used in the code. So
but I'd still like it to be mentioned in the commit message.
Well, not sure. AFAICS, checks for libxft are done only when either standalone or standalone-xft is specified. Also, Xft is only used in src/mbtheme-standalone.c, which as its name implies, is the standalone mode.
So, I'll remove that dependency in the patch that disable standalone mode (pending a test-build without libXft, but pretty confident it'll work, nothing selects it in matchbox, I never manually selected it, and all my previous builds were successfull).
Thanks!
Regards,
Yann E. MORIN.
Signature · 6 lines
.-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 223 225 172 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------'
PATCH 23/30 package/matchbox: drop useless dependencies
Arnout, All,
On 2015-05-02 15:40 +0200, Yann E. MORIN spake thusly:
Quoted 5 lines
On 2015-05-01 22:58 +0200, Arnout Vandecappelle spake thusly:
Quoted 4 lines · Arnout Vandecappelle
Quoted 3 lines · Yann E. MORIN
Quoted 2 lines
xlib-libXft is only needed when building a 'standalone' matchbox, which means not using matchbox-lib.
[--SNIP--]
Quoted 12 lines
Quoted 6 lines
Quoted 2 lines
So, is the dependency on
xlib_libXfta few lines lower still relevant? If so,
comment on it in the commit message.It actually is, configure checks for it and it is used in the code. So
but I'd still like it to be mentioned in the commit message.
Well, not sure. AFAICS, checks for libxft are done only when either standalone or standalone-xft is specified. Also, Xft is only used in
src/mbtheme-standalone.c, which as its name implies, is the standalone mode.
Quoted 4 lines
So, I'll remove that dependency in the patch that disable standalone mode (pending a test-build without libXft, but pretty confident it'll work, nothing selects it in matchbox, I never manually selected it, and all my previous builds were successfull).
OK, the build goes on successfully as expected.
So I'll drop the dependency on libXft.
Thanks! :-)
Regards,
Yann E. MORIN.
Signature · 6 lines
.-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 223 225 172 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------'
PATCH 24/30 package/matchbox-keyboard: enforce disabling support for cairo
In reply to Yann E. MORINWe usually explicitly enforce disabling optional support when it is possible.
Do so for Cairo.
--- package/matchbox/matchbox-keyboard/matchbox-keyboard.mk | 1 + 1 file changed, 1 insertion(+)
package/matchbox/matchbox-keyboard/matchbox-keyboard.mk +1 -0
@@ -24,6 +24,7 @@ ifeq ($(BR2_PACKAGE_CAIRO),y) MATCHBOX_KEYBOARD_CONF_OPTS += --enable-cairo MATCHBOX_KEYBOARD_DEPENDENCIES += cairo else +MATCHBOX_KEYBOARD_CONF_OPTS += --disable-cairo MATCHBOX_KEYBOARD_DEPENDENCIES += xlib_libXft endif
Signature · 1 line
1.9.1
PATCH 24/30 package/matchbox-keyboard: enforce disabling support for cairo
Quoted 6 lines · Yann E. MORIN
We usually explicitly enforce disabling optional support when it is possible.
Do so for Cairo.
Signed-off-by "Yann E. MORIN" <[email protected]>
Regards,
Arnout
Quoted 17 lines
--- package/matchbox/matchbox-keyboard/matchbox-keyboard.mk | 1 + 1 file changed, 1 insertion(+)package/matchbox/matchbox-keyboard/matchbox-keyboard.mk +1
-0@@ -24,6 +24,7 @@ ifeq ($(BR2_PACKAGE_CAIRO),y) MATCHBOX_KEYBOARD_CONF_OPTS += --enable-cairo MATCHBOX_KEYBOARD_DEPENDENCIES += cairo else +MATCHBOX_KEYBOARD_CONF_OPTS += --disable-cairo MATCHBOX_KEYBOARD_DEPENDENCIES += xlib_libXft endif
Signature · 6 lines
Arnout Vandecappelle arnout at mind be Senior Embedded Software Architect +32-16-286500 Essensium/Mind http://www.mind.be G.Geenslaan 9, 3001 Leuven, Belgium BE 872 984 063 RPR Leuven LinkedIn profile: http://www.linkedin.com/in/arnoutvandecappelle GPG fingerprint: 7CB5 E4CC 6C2E EFD4 6E3D A754 F963 ECAB 2450 2F1F
PATCH 25/30 package/matchbox-common: explicitly disable PDA folders when not selected
In reply to Yann E. MORIN--- package/matchbox/matchbox-common/matchbox-common.mk | 2 ++ 1 file changed, 2 insertions(+)
package/matchbox/matchbox-common/matchbox-common.mk +2 -0
@@ -14,6 +14,8 @@ MATCHBOX_COMMON_DEPENDENCIES = matchbox-lib ifeq ($(strip $(BR2_PACKAGE_MATCHBOX_COMMON_PDA)),y) MATCHBOX_COMMON_CONF_OPTS += --enable-pda-folders +else +MATCHBOX_COMMON_CONF_OPTS += --disable-pda-folders endif $(eval $(autotools-package))
Signature · 1 line
1.9.1
PATCH 25/30 package/matchbox-common: explicitly disable PDA folders when not selected
Quoted 1 line · Yann E. MORIN
Signed-off-by "Yann E. MORIN" <[email protected]>
Though for an option that is not related to a dependency I think it's less
important to explicitly disable, it's still nice to do the same thing everywhere.
Regards,
Arnout
Quoted 18 lines
--- package/matchbox/matchbox-common/matchbox-common.mk | 2 ++ 1 file changed, 2 insertions(+)package/matchbox/matchbox-common/matchbox-common.mk +2
-0@@ -14,6 +14,8 @@ MATCHBOX_COMMON_DEPENDENCIES = matchbox-lib ifeq ($(strip $(BR2_PACKAGE_MATCHBOX_COMMON_PDA)),y) MATCHBOX_COMMON_CONF_OPTS += --enable-pda-folders +else +MATCHBOX_COMMON_CONF_OPTS += --disable-pda-folders endif $(eval $(autotools-package))
Signature · 6 lines
Arnout Vandecappelle arnout at mind be Senior Embedded Software Architect +32-16-286500 Essensium/Mind http://www.mind.be G.Geenslaan 9, 3001 Leuven, Belgium BE 872 984 063 RPR Leuven LinkedIn profile: http://www.linkedin.com/in/arnoutvandecappelle GPG fingerprint: 7CB5 E4CC 6C2E EFD4 6E3D A754 F963 ECAB 2450 2F1F
PATCH 26/30 package/matchbox: wrap long lines
In reply to Yann E. MORIN--- package/matchbox/matchbox-keyboard/matchbox-keyboard.mk | 3 ++- package/matchbox/matchbox-lib/matchbox-lib.mk | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-)
package/matchbox/matchbox-keyboard/matchbox-keyboard.mk +2 -1
@@ -15,7 +15,8 @@ MATCHBOX_KEYBOARD_DEPENDENCIES = host-pkgconf matchbox-lib matchbox-fakekey expa MATCHBOX_KEYBOARD_CONF_ENV = expat=yes define MATCHBOX_KEYBOARD_POST_INSTALL_FIXES - $(INSTALL) -D -m 0755 package/matchbox/matchbox-keyboard/mb-applet-kbd-wrapper.sh $(TARGET_DIR)/usr/bin/mb-applet-kbd-wrapper.sh + $(INSTALL) -D -m 0755 package/matchbox/matchbox-keyboard/mb-applet-kbd-wrapper.sh \ + $(TARGET_DIR)/usr/bin/mb-applet-kbd-wrapper.sh endef MATCHBOX_KEYBOARD_POST_INSTALL_TARGET_HOOKS += MATCHBOX_KEYBOARD_POST_INSTALL_FIXES
package/matchbox/matchbox-lib/matchbox-lib.mk +2 -1
@@ -15,7 +15,8 @@ MATCHBOX_LIB_CONF_OPTS = --enable-expat --disable-doxygen-docs MATCHBOX_LIB_CONF_ENV = LIBS="-lX11" define MATCHBOX_LIB_POST_INSTALL_FIXES - $(SED) 's:-I[^$$].*/usr/include/freetype2:-I/usr/include/freetype2:' $(STAGING_DIR)/usr/lib/pkgconfig/libmb.pc + $(SED) 's:-I[^$$].*/usr/include/freetype2:-I/usr/include/freetype2:' \ + $(STAGING_DIR)/usr/lib/pkgconfig/libmb.pc endef MATCHBOX_LIB_POST_INSTALL_STAGING_HOOKS += MATCHBOX_LIB_POST_INSTALL_FIXES
Signature · 1 line
1.9.1
PATCH 27/30 package/matchbox: xlib-libXcursor is an optional dependency
In reply to Yann E. MORINmatchbox selects xlib-libXcursor, but does not build-depend on it.
But xlib-libXcursor is only an optional dependency.
Fix that by removing the select, and properly build-depend on it when it is enabled.
--- package/matchbox/Config.in | 1 - package/matchbox/matchbox.mk | 4 ++++ 2 files changed, 4 insertions(+), 1 deletion(-)
package/matchbox/Config.in +0 -1
@@ -4,7 +4,6 @@ menuconfig BR2_PACKAGE_MATCHBOX depends on BR2_USE_MMU # fork() select BR2_PACKAGE_FONTCONFIG select BR2_PACKAGE_EXPAT - select BR2_PACKAGE_XLIB_LIBXCURSOR select BR2_PACKAGE_MATCHBOX_LIB help Matchbox is an Open Source base environment for the X Window
package/matchbox/matchbox.mk +4 -0
@@ -38,6 +38,10 @@ else MATCHBOX_CONF_OPTS += --disable-session endif +ifeq ($(BR2_PACKAGE_XLIB_LIBXCURSOR),y) +MATCHBOX_DEPENDENCIES += xlib_libXcursor +endif + $(eval $(autotools-package)) # After we called a package infra, w ecan include more files
Signature · 1 line
1.9.1
PATCH 27/30 package/matchbox: xlib-libXcursor is an optional dependency
Quoted 8 lines · Yann E. MORIN
matchbox selects xlib-libXcursor, but does not build-depend on it.
But xlib-libXcursor is only an optional dependency.
Fix that by removing the select, and properly build-depend on it when it is enabled.
Signed-off-by "Yann E. MORIN" <[email protected]>
While you're at it: configure also has --disable-gconf (we don't have the
package but maybe in the future...) and the script checks for xlib_libXfixes.
Regards,
Arnout
Quoted 33 lines
--- package/matchbox/Config.in | 1 - package/matchbox/matchbox.mk | 4 ++++ 2 files changed, 4 insertions(+), 1 deletion(-)package/matchbox/Config.in +0
-1@@ -4,7 +4,6 @@ menuconfig BR2_PACKAGE_MATCHBOX depends on BR2_USE_MMU # fork() select BR2_PACKAGE_FONTCONFIG select BR2_PACKAGE_EXPAT - select BR2_PACKAGE_XLIB_LIBXCURSOR select BR2_PACKAGE_MATCHBOX_LIB help Matchbox is an Open Source base environment for the X Windowpackage/matchbox/matchbox.mk +4
-0@@ -38,6 +38,10 @@ else MATCHBOX_CONF_OPTS += --disable-session endif +ifeq ($(BR2_PACKAGE_XLIB_LIBXCURSOR),y) +MATCHBOX_DEPENDENCIES += xlib_libXcursor +endif + $(eval $(autotools-package)) # After we called a package infra, w ecan include more files
Signature · 6 lines
Arnout Vandecappelle arnout at mind be Senior Embedded Software Architect +32-16-286500 Essensium/Mind http://www.mind.be G.Geenslaan 9, 3001 Leuven, Belgium BE 872 984 063 RPR Leuven LinkedIn profile: http://www.linkedin.com/in/arnoutvandecappelle GPG fingerprint: 7CB5 E4CC 6C2E EFD4 6E3D A754 F963 ECAB 2450 2F1F
PATCH 27/30 package/matchbox: xlib-libXcursor is an optional dependency
Arnout, All,
On 2015-05-01 23:02 +0200, Arnout Vandecappelle spake thusly:
Quoted 8 lines · Yann E. MORIN
Quoted 7 lines
matchbox selects xlib-libXcursor, but does not build-depend on it.
But xlib-libXcursor is only an optional dependency.
Fix that by removing the select, and properly build-depend on it when it is enabled.
Quoted 6 lines
Quoted 1 line
Signed-off-by "Yann E. MORIN" <[email protected]>While you're at it: configure also has --disable-gconf (we don't have the
package but maybe in the future...) and the script checks forxlib_libXfixes.
Both fixed. Thanks! :-)
Regards,
Yann E. MORIN.
Quoted 42 lines
Quoted 33 lines
--- package/matchbox/Config.in | 1 - package/matchbox/matchbox.mk | 4 ++++ 2 files changed, 4 insertions(+), 1 deletion(-)package/matchbox/Config.in +0
-1@@ -4,7 +4,6 @@ menuconfig BR2_PACKAGE_MATCHBOX depends on BR2_USE_MMU # fork() select BR2_PACKAGE_FONTCONFIG select BR2_PACKAGE_EXPAT - select BR2_PACKAGE_XLIB_LIBXCURSOR select BR2_PACKAGE_MATCHBOX_LIB help Matchbox is an Open Source base environment for the X Windowpackage/matchbox/matchbox.mk +4
-0@@ -38,6 +38,10 @@ else MATCHBOX_CONF_OPTS += --disable-session endif +ifeq ($(BR2_PACKAGE_XLIB_LIBXCURSOR),y) +MATCHBOX_DEPENDENCIES += xlib_libXcursor +endif + $(eval $(autotools-package)) # After we called a package infra, w ecan include more filesSignature · 6 lines
Arnout Vandecappelle arnout at mind be Senior Embedded Software Architect +32-16-286500 Essensium/Mind http://www.mind.be G.Geenslaan 9, 3001 Leuven, Belgium BE 872 984 063 RPR Leuven LinkedIn profile: http://www.linkedin.com/in/arnoutvandecappelle GPG fingerprint: 7CB5 E4CC 6C2E EFD4 6E3D A754 F963 ECAB 2450 2F1F
Signature · 6 lines
.-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 223 225 172 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------'
PATCH 28/30 package/matchbox-panel: add option to use ACPI for the battery applet
In reply to Yann E. MORINIt is possible to use ACPI to monitor the battery with the battery min-applet. If ACPI is not explicitly enabled, then APM is used if available; if ACPI is not explcitly enabled and APM is not available, then the battery applet id not built.
What is a pity is that there is no way to explicitly enable or disable the applet; it only relies on auto-detection... :-(
So, add an option to enable use of ACPI, visible only on architectures that have at least some hope of having ACPI support.
--- package/matchbox/matchbox-panel/Config.in | 15 +++++++++++++++ package/matchbox/matchbox-panel/matchbox-panel.mk | 6 ++++++ 2 files changed, 21 insertions(+)
package/matchbox/matchbox-panel/Config.in +15 -0
@@ -4,3 +4,18 @@ config BR2_PACKAGE_MATCHBOX_PANEL help A flexible always present 'window bar' for holding application launchers. + +if BR2_PACKAGE_MATCHBOX_PANEL + +config BR2_PACKAGE_MATCHBOX_PANEL_ACPI + bool "use ACPI for battery mini-applet" + depends on BR2_i386 || BR2_x86_64 || BR2_aarch64 + help + Use ACPI to monitor the battery. + + Say 'y' here to use ACPI to monitor the battery. + If you say 'n', then APM will be used if available; + otherwise the battery monitor mini-applet is not + built. + +endif # BR2_PACKAGE_MATCHBOX_PANEL
package/matchbox/matchbox-panel/matchbox-panel.mk +6 -0
@@ -20,6 +20,12 @@ else MATCHBOX_PANEL_CONF_OPTS += --disable-startup-notification endif +ifeq ($(BR2_PACKAGE_MATCHBOX_PANEL_ACPI),y) +MATCHBOX_PANEL_CONF_OPTS += --enable-acpi-linux +else +MATCHBOX_PANEL_CONF_OPTS += --disable-acpi-linux +endif + ifeq ($(BR2_PACKAGE_WIRELESS_TOOLS),y) MATCHBOX_PANEL_DEPENDENCIES += wireless_tools endif
Signature · 1 line
1.9.1
PATCH 28/30 package/matchbox-panel: add option to use ACPI for the battery applet
Quoted 10 lines · Yann E. MORIN
It is possible to use ACPI to monitor the battery with the battery min-applet. If ACPI is not explicitly enabled, then APM is used if available; if ACPI is not explcitly enabled and APM is not available, then the battery applet id not built.
What is a pity is that there is no way to explicitly enable or disable the applet; it only relies on auto-detection... :-(
So, add an option to enable use of ACPI, visible only on architectures that have at least some hope of having ACPI support.
Since APM exists only on x86, there is basically no way to disable the applet
on x86. The only thing that the configure option does is to force the applet to use the deprecated and most likely unavailable APM interface.
Therefore, I'd remove the Config.in option and just pass --enable-acpi-linux
unconditionally on x86 and aarch64. The worst that can happen is that you build a tiny applet that turns out not to work.
That said, the applet doesn't build for me (with Sourcery x86_64 toolchain)
because the 'line_parse' inner function is declared static...
Regards,
Arnout
Quoted 48 lines
Signed-off-by "Yann E. MORIN" <[email protected]>--- package/matchbox/matchbox-panel/Config.in | 15 +++++++++++++++ package/matchbox/matchbox-panel/matchbox-panel.mk | 6 ++++++ 2 files changed, 21 insertions(+)package/matchbox/matchbox-panel/Config.in +15
-0@@ -4,3 +4,18 @@ config BR2_PACKAGE_MATCHBOX_PANEL help A flexible always present 'window bar' for holding application launchers. + +if BR2_PACKAGE_MATCHBOX_PANEL + +config BR2_PACKAGE_MATCHBOX_PANEL_ACPI + bool "use ACPI for battery mini-applet" + depends on BR2_i386 || BR2_x86_64 || BR2_aarch64 + help + Use ACPI to monitor the battery. + + Say 'y' here to use ACPI to monitor the battery. + If you say 'n', then APM will be used if available; + otherwise the battery monitor mini-applet is not + built. + +endif # BR2_PACKAGE_MATCHBOX_PANELpackage/matchbox/matchbox-panel/matchbox-panel.mk +6
-0@@ -20,6 +20,12 @@ else MATCHBOX_PANEL_CONF_OPTS += --disable-startup-notification endif +ifeq ($(BR2_PACKAGE_MATCHBOX_PANEL_ACPI),y) +MATCHBOX_PANEL_CONF_OPTS += --enable-acpi-linux +else +MATCHBOX_PANEL_CONF_OPTS += --disable-acpi-linux +endif + ifeq ($(BR2_PACKAGE_WIRELESS_TOOLS),y) MATCHBOX_PANEL_DEPENDENCIES += wireless_tools endif
Signature · 6 lines
Arnout Vandecappelle arnout at mind be Senior Embedded Software Architect +32-16-286500 Essensium/Mind http://www.mind.be G.Geenslaan 9, 3001 Leuven, Belgium BE 872 984 063 RPR Leuven LinkedIn profile: http://www.linkedin.com/in/arnoutvandecappelle GPG fingerprint: 7CB5 E4CC 6C2E EFD4 6E3D A754 F963 ECAB 2450 2F1F
PATCH 28/30 package/matchbox-panel: add option to use ACPI for the battery applet
Arnout, All,
On 2015-05-01 23:39 +0200, Arnout Vandecappelle spake thusly:
Quoted 12 lines · Yann E. MORIN
Quoted 10 lines
It is possible to use ACPI to monitor the battery with the battery min-applet. If ACPI is not explicitly enabled, then APM is used if available; if ACPI is not explcitly enabled and APM is not available, then the battery applet id not built.
What is a pity is that there is no way to explicitly enable or disable the applet; it only relies on auto-detection... :-(
So, add an option to enable use of ACPI, visible only on architectures that have at least some hope of having ACPI support.
Quoted 7 lines
Since APM exists only on x86, there is basically no way to disable the applet
on x86. The only thing that the configure option does is to force the applet to use the deprecated and most likely unavailable APM interface.Therefore, I'd remove the Config.in option and just pass --enable-acpi-linux
unconditionally on x86 and aarch64. The worst that can happen is that you build a tiny applet that turns out not to work.
Ok, done: ACPI forcibly used on supported platforms.
Quoted 2 lines
That said, the applet doesn't build for me (with Sourcery
x86_64toolchain)
because the 'line_parse' inner function is declared static...
Weird, itworked for me, but with another toolchain. Fixed.
Regards,
Yann E. MORIN.
Quoted 56 lines
Quoted 47 lines
Signed-off-by "Yann E. MORIN" <[email protected]>--- package/matchbox/matchbox-panel/Config.in | 15 +++++++++++++++ package/matchbox/matchbox-panel/matchbox-panel.mk | 6 ++++++ 2 files changed, 21 insertions(+)package/matchbox/matchbox-panel/Config.in +15
-0@@ -4,3 +4,18 @@ config BR2_PACKAGE_MATCHBOX_PANEL help A flexible always present 'window bar' for holding application launchers. + +if BR2_PACKAGE_MATCHBOX_PANEL + +config BR2_PACKAGE_MATCHBOX_PANEL_ACPI + bool "use ACPI for battery mini-applet" + depends on BR2_i386 || BR2_x86_64 || BR2_aarch64 + help + Use ACPI to monitor the battery. + + Say 'y' here to use ACPI to monitor the battery. + If you say 'n', then APM will be used if available; + otherwise the battery monitor mini-applet is not + built. + +endif # BR2_PACKAGE_MATCHBOX_PANELpackage/matchbox/matchbox-panel/matchbox-panel.mk +6
-0@@ -20,6 +20,12 @@ else MATCHBOX_PANEL_CONF_OPTS += --disable-startup-notification endif +ifeq ($(BR2_PACKAGE_MATCHBOX_PANEL_ACPI),y) +MATCHBOX_PANEL_CONF_OPTS += --enable-acpi-linux +else +MATCHBOX_PANEL_CONF_OPTS += --disable-acpi-linux +endif + ifeq ($(BR2_PACKAGE_WIRELESS_TOOLS),y) MATCHBOX_PANEL_DEPENDENCIES += wireless_tools endifSignature · 6 lines
Arnout Vandecappelle arnout at mind be Senior Embedded Software Architect +32-16-286500 Essensium/Mind http://www.mind.be G.Geenslaan 9, 3001 Leuven, Belgium BE 872 984 063 RPR Leuven LinkedIn profile: http://www.linkedin.com/in/arnoutvandecappelle GPG fingerprint: 7CB5 E4CC 6C2E EFD4 6E3D A754 F963 ECAB 2450 2F1F
Signature · 6 lines
.-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 223 225 172 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------'
PATCH 29/30 package/matchbox-panel: add support for dnotify
In reply to Yann E. MORINUsing dnotify, matchbox-panel can automatically reload its menu.
dnotify requires a kernel >=2.4, which we can consider to be virtually for granted.
--- package/matchbox/matchbox-panel/Config.in | 7 +++++++ package/matchbox/matchbox-panel/matchbox-panel.mk | 6 ++++++ 2 files changed, 13 insertions(+)
package/matchbox/matchbox-panel/Config.in +7 -0
@@ -18,4 +18,11 @@ config BR2_PACKAGE_MATCHBOX_PANEL_ACPI otherwise the battery monitor mini-applet is not built. +config BR2_PACKAGE_MATCHBOX_PANEL_DNOTIFY + bool "use dnotify" + help + Using dnotify allows matchbox-panel to automatically reload + its menu when entries are changed (e.g. when a new application + is installed). + endif # BR2_PACKAGE_MATCHBOX_PANEL
package/matchbox/matchbox-panel/matchbox-panel.mk +6 -0
@@ -26,6 +26,12 @@ else MATCHBOX_PANEL_CONF_OPTS += --disable-acpi-linux endif +ifeq ($(BR2_PACKAGE_MATCHBOX_PANEL_DNOTIFY),y) +MATCHBOX_PANEL_CONF_OPTS += --enable-dnotify +else +MATCHBOX_PANEL_CONF_OPTS += --disable-dnotify +endif + ifeq ($(BR2_PACKAGE_WIRELESS_TOOLS),y) MATCHBOX_PANEL_DEPENDENCIES += wireless_tools endif
Signature · 1 line
1.9.1
PATCH 29/30 package/matchbox-panel: add support for dnotify
Quoted 4 lines · Yann E. MORIN
Using dnotify, matchbox-panel can automatically reload its menu.
dnotify requires a kernel >=2.4, which we can consider to be virtually for granted.
So, why not enable this unconditionally?
Regards,
Arnout
Quoted 41 lines
Signed-off-by "Yann E. MORIN" <[email protected]>--- package/matchbox/matchbox-panel/Config.in | 7 +++++++ package/matchbox/matchbox-panel/matchbox-panel.mk | 6 ++++++ 2 files changed, 13 insertions(+)package/matchbox/matchbox-panel/Config.in +7
-0@@ -18,4 +18,11 @@ config BR2_PACKAGE_MATCHBOX_PANEL_ACPI otherwise the battery monitor mini-applet is not built. +config BR2_PACKAGE_MATCHBOX_PANEL_DNOTIFY + bool "use dnotify" + help + Using dnotify allows matchbox-panel to automatically reload + its menu when entries are changed (e.g. when a new application + is installed). + endif # BR2_PACKAGE_MATCHBOX_PANELpackage/matchbox/matchbox-panel/matchbox-panel.mk +6
-0@@ -26,6 +26,12 @@ else MATCHBOX_PANEL_CONF_OPTS += --disable-acpi-linux endif +ifeq ($(BR2_PACKAGE_MATCHBOX_PANEL_DNOTIFY),y) +MATCHBOX_PANEL_CONF_OPTS += --enable-dnotify +else +MATCHBOX_PANEL_CONF_OPTS += --disable-dnotify +endif + ifeq ($(BR2_PACKAGE_WIRELESS_TOOLS),y) MATCHBOX_PANEL_DEPENDENCIES += wireless_tools endif
Signature · 6 lines
Arnout Vandecappelle arnout at mind be Senior Embedded Software Architect +32-16-286500 Essensium/Mind http://www.mind.be G.Geenslaan 9, 3001 Leuven, Belgium BE 872 984 063 RPR Leuven LinkedIn profile: http://www.linkedin.com/in/arnoutvandecappelle GPG fingerprint: 7CB5 E4CC 6C2E EFD4 6E3D A754 F963 ECAB 2450 2F1F
PATCH 29/30 package/matchbox-panel: add support for dnotify
Arnout, All,
On 2015-05-01 23:44 +0200, Arnout Vandecappelle spake thusly:
Quoted 7 lines · Yann E. MORIN
Quoted 4 lines
Using dnotify, matchbox-panel can automatically reload its menu.
dnotify requires a kernel >=2.4, which we can consider to be virtually for granted.
So, why not enable this unconditionally?
Well... OK, done.
Regards,
Yann E. MORIN.
Quoted 49 lines
Quoted 40 lines
Signed-off-by "Yann E. MORIN" <[email protected]>--- package/matchbox/matchbox-panel/Config.in | 7 +++++++ package/matchbox/matchbox-panel/matchbox-panel.mk | 6 ++++++ 2 files changed, 13 insertions(+)package/matchbox/matchbox-panel/Config.in +7
-0@@ -18,4 +18,11 @@ config BR2_PACKAGE_MATCHBOX_PANEL_ACPI otherwise the battery monitor mini-applet is not built. +config BR2_PACKAGE_MATCHBOX_PANEL_DNOTIFY + bool "use dnotify" + help + Using dnotify allows matchbox-panel to automatically reload + its menu when entries are changed (e.g. when a new application + is installed). + endif # BR2_PACKAGE_MATCHBOX_PANELpackage/matchbox/matchbox-panel/matchbox-panel.mk +6
-0@@ -26,6 +26,12 @@ else MATCHBOX_PANEL_CONF_OPTS += --disable-acpi-linux endif +ifeq ($(BR2_PACKAGE_MATCHBOX_PANEL_DNOTIFY),y) +MATCHBOX_PANEL_CONF_OPTS += --enable-dnotify +else +MATCHBOX_PANEL_CONF_OPTS += --disable-dnotify +endif + ifeq ($(BR2_PACKAGE_WIRELESS_TOOLS),y) MATCHBOX_PANEL_DEPENDENCIES += wireless_tools endifSignature · 6 lines
Arnout Vandecappelle arnout at mind be Senior Embedded Software Architect +32-16-286500 Essensium/Mind http://www.mind.be G.Geenslaan 9, 3001 Leuven, Belgium BE 872 984 063 RPR Leuven LinkedIn profile: http://www.linkedin.com/in/arnoutvandecappelle GPG fingerprint: 7CB5 E4CC 6C2E EFD4 6E3D A754 F963 ECAB 2450 2F1F
Signature · 6 lines
.-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 223 225 172 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------'
PATCH 30/30 package/matchbox-panel: fix WiFi monitoring
In reply to Yann E. MORINmatchbox-panel can build a simple applet to monitor the WiFi. For that, it tries to see if libiwl is available; if so, WiFi monitoring is enabled, otherwise it is disabled; there is not option to explicitly enable or disable it.
Currently, matchbox-panel depends on the wireless-tools package. However, that's not enough, since the library will only be installed if explictly enabled in the menuconfig *and* this is not a static build.
Change the dependency to be on the library, not the package.
--- package/matchbox/matchbox-panel/matchbox-panel.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
package/matchbox/matchbox-panel/matchbox-panel.mk +1 -1
@@ -32,7 +32,7 @@ else MATCHBOX_PANEL_CONF_OPTS += --disable-dnotify endif -ifeq ($(BR2_PACKAGE_WIRELESS_TOOLS),y) +ifeq ($(BR2_PACKAGE_WIRELESS_TOOLS_LIB),y) MATCHBOX_PANEL_DEPENDENCIES += wireless_tools endif
Signature · 1 line
1.9.1
PATCH 30/30 package/matchbox-panel: fix WiFi monitoring
Quoted 8 lines · Yann E. MORIN
matchbox-panel can build a simple applet to monitor the WiFi. For that, it tries to see if libiwl is available; if so, WiFi monitoring is enabled, otherwise it is disabled; there is not option to explicitly enable or disable it.
Currently, matchbox-panel depends on the wireless-tools package. However, that's not enough, since the library will only be installed if explictly enabled in the menuconfig *and* this is not a static build.
explicitly
Quoted 4 lines
Change the dependency to be on the library, not the package.
Signed-off-by "Yann E. MORIN" <[email protected]>
Regards,
Arnout
Quoted 18 lines
--- package/matchbox/matchbox-panel/matchbox-panel.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)package/matchbox/matchbox-panel/matchbox-panel.mk +1
-1@@ -32,7 +32,7 @@ else MATCHBOX_PANEL_CONF_OPTS += --disable-dnotify endif -ifeq ($(BR2_PACKAGE_WIRELESS_TOOLS),y) +ifeq ($(BR2_PACKAGE_WIRELESS_TOOLS_LIB),y) MATCHBOX_PANEL_DEPENDENCIES += wireless_tools endif
Signature · 6 lines
Arnout Vandecappelle arnout at mind be Senior Embedded Software Architect +32-16-286500 Essensium/Mind http://www.mind.be G.Geenslaan 9, 3001 Leuven, Belgium BE 872 984 063 RPR Leuven LinkedIn profile: http://www.linkedin.com/in/arnoutvandecappelle GPG fingerprint: 7CB5 E4CC 6C2E EFD4 6E3D A754 F963 ECAB 2450 2F1F
cover matchbox: huge cleanups (branch yem/matchbox)
In reply to Yann E. MORINQuoted 3 lines · Yann E. MORIN
Hello All!
This series is an attempt at cleaning up the matchbox packages.
Hi Yann,
Kudos for this!
Quoted 12 lines
Currently, the matchbox pckages are in a dire situation, where some package do not even have a corresponding
BR2_PACKAGE_FOOoption, but are nonetheless build dependencies ones of others.Also, some support code has been bit-rotting and is not even buildable today, ike support for compositing, which simply FTBFS.
Finally, some dependencies are incorrect. For example, there are build dependencies not expressed in the
Kconfig(not even counting the missingKconfigentries for packages), or are entirely wrong.
Quoted 8 lines
So, this series aims at fixing all of this. And add a little bit of extra features we're currently missing. Not everything that is possible with matchbox has been handled, though, like support for NLS.
The series is split into multiple parts;
- patches 1-9 make all packages real packages, i.e. with proper
Kconfigoptions. No functionality change.
One overall remark to this part of the series: I'd move them directly under
package/ which is supposed to be the standard way of doing things now, so get rid of the matchbox subdirectory. That's also the way it works with Kodi BTW.
Regards,
Arnout
Quoted 20 lines
- patches 10-13 do a little eye-candy cleanups. No functionality change.
- patches 14-17 fixes dependencies. No functionality change done on purpose, except because of added proper dependency tracking.
- patch 18 stands out alone, a bit of eye-candy to add prompts for previously prompt-less packages. No functionality change.
- patches 19-30 are not really sorted. They ar ea mix of fixes, eye-candy and the few new features.
This has been build-tested only, with about every combinations possible excercised, for ARM. No run-time testing has been done, though.
Enjoy! ;-)
Regards,
Yann E. MORIN.
[snip]
Signature · 6 lines
Arnout Vandecappelle arnout at mind be Senior Embedded Software Architect +32-16-286500 Essensium/Mind http://www.mind.be G.Geenslaan 9, 3001 Leuven, Belgium BE 872 984 063 RPR Leuven LinkedIn profile: http://www.linkedin.com/in/arnoutvandecappelle GPG fingerprint: 7CB5 E4CC 6C2E EFD4 6E3D A754 F963 ECAB 2450 2F1F
cover matchbox: huge cleanups (branch yem/matchbox)
Arnout, All,
On 2015-04-23 23:24 +0200, Arnout Vandecappelle spake thusly:
Quoted 1 line · Yann E. MORIN
[--SNIP--]
Quoted 8 lines
Quoted 4 lines
The series is split into multiple parts;
- patches 1-9 make all packages real packages, i.e. with proper
Kconfigoptions. No functionality change.One overall remark to this part of the series: I'd move them directly under
package/ which is supposed to be the standard way of doing things now, so get rid of the matchbox subdirectory. That's also the way it works with Kodi BTW.
Right, I can do that (though that will be a hell of a rebase!).
Regards,
Yann E. MORIN.
Signature · 6 lines
.-----------------.--------------------.------------------.--------------------. | Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: | | +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ | | +33 223 225 172 `------------.-------: X AGAINST | \e/ There is no | | http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. | '------------------------------^-------^------------------^--------------------'