From: Yann E. MORIN Date: Wed, 3 Jun 2015 20:41:30 +0000 (+0200) Subject: package/matchbox-common: move one directory higher X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=3b468acbb4ec2aca748fc022ff0d53a530b3264b;p=buildroot.git package/matchbox-common: move one directory higher We usually do not have a sub-directory for a family of related packages, so move matchbox packages one directory higher, so they all are in packages/ Also re-order packages alphabetically. Reported-by: Arnout Vandecappelle Signed-off-by: "Yann E. MORIN" Reviewed-by: Arnout Vandecappelle (Essensium/Mind) Signed-off-by: Thomas Petazzoni --- diff --git a/package/matchbox-common/Config.in b/package/matchbox-common/Config.in new file mode 100644 index 0000000000..7d22d05f19 --- /dev/null +++ b/package/matchbox-common/Config.in @@ -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 diff --git a/package/matchbox-common/matchbox-common.hash b/package/matchbox-common/matchbox-common.hash new file mode 100644 index 0000000000..619d8473c0 --- /dev/null +++ b/package/matchbox-common/matchbox-common.hash @@ -0,0 +1,2 @@ +# From http://downloads.yoctoproject.org/releases/matchbox/matchbox-common/0.9/matchbox-common-0.9.1.tar.bz2.md5 +md5 8e8ba0ee170a9ac78fdc583b00ccf76b matchbox-common-0.9.1.tar.bz2 diff --git a/package/matchbox-common/matchbox-common.mk b/package/matchbox-common/matchbox-common.mk new file mode 100644 index 0000000000..da6bec7135 --- /dev/null +++ b/package/matchbox-common/matchbox-common.mk @@ -0,0 +1,19 @@ +################################################################################ +# +# matchbox-common +# +################################################################################ + +MATCHBOX_COMMON_VERSION_MAJOR = 0.9 +MATCHBOX_COMMON_VERSION = $(MATCHBOX_COMMON_VERSION_MAJOR).1 +MATCHBOX_COMMON_SOURCE = matchbox-common-$(MATCHBOX_COMMON_VERSION).tar.bz2 +MATCHBOX_COMMON_SITE = http://downloads.yoctoproject.org/releases/matchbox/matchbox-common/$(MATCHBOX_COMMON_VERSION_MAJOR) +MATCHBOX_COMMON_LICENSE = GPLv2+ +MATCHBOX_COMMON_LICENSE_FILES = COPYING +MATCHBOX_COMMON_DEPENDENCIES = matchbox-lib + +ifeq ($(strip $(BR2_PACKAGE_MATCHBOX_COMMON_PDA)),y) +MATCHBOX_COMMON_CONF_OPTS += --enable-pda-folders +endif + +$(eval $(autotools-package)) diff --git a/package/matchbox-desktop/Config.in b/package/matchbox-desktop/Config.in new file mode 100644 index 0000000000..c9fd196134 --- /dev/null +++ b/package/matchbox-desktop/Config.in @@ -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'. diff --git a/package/matchbox-desktop/matchbox-desktop.hash b/package/matchbox-desktop/matchbox-desktop.hash new file mode 100644 index 0000000000..e48a4a955c --- /dev/null +++ b/package/matchbox-desktop/matchbox-desktop.hash @@ -0,0 +1,2 @@ +# From http://downloads.yoctoproject.org/releases/matchbox/matchbox-desktop/0.9/matchbox-desktop-0.9.1.tar.bz2.md5 +md5 3335a30b1a1aacfb39f23b505254765c matchbox-desktop-0.9.1.tar.bz2 diff --git a/package/matchbox-desktop/matchbox-desktop.mk b/package/matchbox-desktop/matchbox-desktop.mk new file mode 100644 index 0000000000..a703a18e55 --- /dev/null +++ b/package/matchbox-desktop/matchbox-desktop.mk @@ -0,0 +1,28 @@ +################################################################################ +# +# matchbox-desktop +# +################################################################################ + +MATCHBOX_DESKTOP_VERSION_MAJOR = 0.9 +MATCHBOX_DESKTOP_VERSION = $(MATCHBOX_DESKTOP_VERSION_MAJOR).1 +MATCHBOX_DESKTOP_SOURCE = matchbox-desktop-$(MATCHBOX_DESKTOP_VERSION).tar.bz2 +MATCHBOX_DESKTOP_SITE = http://downloads.yoctoproject.org/releases/matchbox/matchbox-desktop/$(MATCHBOX_DESKTOP_VERSION_MAJOR) +MATCHBOX_DESKTOP_LICENSE = GPLv2+ +MATCHBOX_DESKTOP_LICENSE_FILES = COPYING +MATCHBOX_DESKTOP_DEPENDENCIES = matchbox-lib zlib +MATCHBOX_DESKTOP_CONF_OPTS = --enable-expat + +# The bundled configure script does not properly replace LIBADD_DL, so +# we force an autoreconf even if we don't have any patches touching +# configure.ac/Makefile.am. +MATCHBOX_DESKTOP_AUTORECONF = YES + +ifeq ($(BR2_PACKAGE_STARTUP_NOTIFICATION),y) +MATCHBOX_DESKTOP_CONF_OPTS += --enable-startup-notification +MATCHBOX_DESKTOP_DEPENDENCIES += startup-notification +else +MATCHBOX_DESKTOP_CONF_OPTS += --disable-startup-notification +endif + +$(eval $(autotools-package)) diff --git a/package/matchbox-fakekey/Config.in b/package/matchbox-fakekey/Config.in new file mode 100644 index 0000000000..334f3a2a33 --- /dev/null +++ b/package/matchbox-fakekey/Config.in @@ -0,0 +1,2 @@ +config BR2_PACKAGE_MATCHBOX_FAKEKEY + bool diff --git a/package/matchbox-fakekey/matchbox-fakekey.hash b/package/matchbox-fakekey/matchbox-fakekey.hash new file mode 100644 index 0000000000..3e8778a6e1 --- /dev/null +++ b/package/matchbox-fakekey/matchbox-fakekey.hash @@ -0,0 +1,2 @@ +# From http://downloads.yoctoproject.org/releases/matchbox/libfakekey/0.1/libfakekey-0.1.tar.bz2.md5 +md5 83dbde4d77e8baf0176fe4291d8a2303 libfakekey-0.1.tar.bz2 diff --git a/package/matchbox-fakekey/matchbox-fakekey.mk b/package/matchbox-fakekey/matchbox-fakekey.mk new file mode 100644 index 0000000000..ea8e6dcd61 --- /dev/null +++ b/package/matchbox-fakekey/matchbox-fakekey.mk @@ -0,0 +1,23 @@ +################################################################################ +# +# matchbox-fakekey +# +################################################################################ + +MATCHBOX_FAKEKEY_VERSION = 0.1 +MATCHBOX_FAKEKEY_SOURCE = libfakekey-$(MATCHBOX_FAKEKEY_VERSION).tar.bz2 +MATCHBOX_FAKEKEY_SITE = http://downloads.yoctoproject.org/releases/matchbox/libfakekey/$(MATCHBOX_FAKEKEY_VERSION) +MATCHBOX_FAKEKEY_LICENSE = GPLv2+ +MATCHBOX_FAKEKEY_LICENSE_FILES = COPYING +MATCHBOX_FAKEKEY_INSTALL_STAGING = YES +MATCHBOX_FAKEKEY_DEPENDENCIES = matchbox-lib xlib_libXtst +MATCHBOX_FAKEKEY_CONF_OPTS = --enable-expat + +define MATCHBOX_FAKEKEY_POST_CONFIGURE_FIXES + $(SED) 's:-I[^$$].*/usr/include/freetype2:-I/usr/include/freetype2:' $(STAGING_DIR)/usr/lib/pkgconfig/libmb.pc + $(SED) 's:^SUBDIRS = fakekey src tests.*:SUBDIRS = fakekey src:g' $(MATCHBOX_FAKEKEY_DIR)/Makefile +endef + +MATCHBOX_FAKEKEY_POST_CONFIGURE_HOOKS += MATCHBOX_FAKEKEY_POST_CONFIGURE_FIXES + +$(eval $(autotools-package)) diff --git a/package/matchbox-keyboard/Config.in b/package/matchbox-keyboard/Config.in new file mode 100644 index 0000000000..e017358b35 --- /dev/null +++ b/package/matchbox-keyboard/Config.in @@ -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 diff --git a/package/matchbox-keyboard/matchbox-keyboard.hash b/package/matchbox-keyboard/matchbox-keyboard.hash new file mode 100644 index 0000000000..76997b0da3 --- /dev/null +++ b/package/matchbox-keyboard/matchbox-keyboard.hash @@ -0,0 +1,2 @@ +# From http://downloads.yoctoproject.org/releases/matchbox/matchbox-keyboard/0.1/matchbox-keyboard-0.1.tar.bz2.md5 +md5 50940321d59fee23b38a4941100abf25 matchbox-keyboard-0.1.tar.bz2 diff --git a/package/matchbox-keyboard/matchbox-keyboard.mk b/package/matchbox-keyboard/matchbox-keyboard.mk new file mode 100644 index 0000000000..fcdd8b1390 --- /dev/null +++ b/package/matchbox-keyboard/matchbox-keyboard.mk @@ -0,0 +1,30 @@ +################################################################################ +# +# matchbox-keyboard +# +################################################################################ + +MATCHBOX_KEYBOARD_VERSION = 0.1 +MATCHBOX_KEYBOARD_SOURCE = matchbox-keyboard-$(MATCHBOX_KEYBOARD_VERSION).tar.bz2 +MATCHBOX_KEYBOARD_SITE = http://downloads.yoctoproject.org/releases/matchbox/matchbox-keyboard/$(MATCHBOX_KEYBOARD_VERSION) +MATCHBOX_KEYBOARD_LICENSE = GPLv2+ +MATCHBOX_KEYBOARD_LICENSE_FILES = COPYING +MATCHBOX_KEYBOARD_DEPENDENCIES = host-pkgconf matchbox-lib matchbox-fakekey expat + +# Workaround bug in configure script +MATCHBOX_KEYBOARD_CONF_ENV = expat=yes + +define MATCHBOX_KEYBOARD_POST_INSTALL_FIXES + $(INSTALL) -D -m 0755 package/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 + +ifeq ($(BR2_PACKAGE_CAIRO),y) +MATCHBOX_KEYBOARD_CONF_OPTS += --enable-cairo +MATCHBOX_KEYBOARD_DEPENDENCIES += cairo +else +MATCHBOX_KEYBOARD_DEPENDENCIES += xlib_libXft +endif + +$(eval $(autotools-package)) diff --git a/package/matchbox-keyboard/mb-applet-kbd-wrapper.sh b/package/matchbox-keyboard/mb-applet-kbd-wrapper.sh new file mode 100644 index 0000000000..be202b5d65 --- /dev/null +++ b/package/matchbox-keyboard/mb-applet-kbd-wrapper.sh @@ -0,0 +1,8 @@ +#!/bin/sh +# + +killall matchbox-keyboard +if [ ! $? -eq 0 ] +then + matchbox-keyboard & +fi diff --git a/package/matchbox-lib/0001-index-is-legacy.patch b/package/matchbox-lib/0001-index-is-legacy.patch new file mode 100644 index 0000000000..b486fb18d4 --- /dev/null +++ b/package/matchbox-lib/0001-index-is-legacy.patch @@ -0,0 +1,35 @@ +index() is a legacy function, not implemented in some uClibc +configurations. + +Signed-off-by: Thomas Petazzoni +--- + libmb/mbexp.c | 2 +- + libmb/mbmenu.c | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +Index: libmatchbox-1.9/libmb/mbexp.c +=================================================================== +--- libmatchbox-1.9.orig/libmb/mbexp.c ++++ libmatchbox-1.9/libmb/mbexp.c +@@ -492,7 +492,7 @@ + + /* get the family */ + +- if (index(spec, ',') != NULL || index(spec, '-') != NULL) ++ if (strchr(spec, ',') != NULL || strchr(spec, '-') != NULL) + has_comma_delim = True; + + while (!got_family) { +Index: libmatchbox-1.9/libmb/mbmenu.c +=================================================================== +--- libmatchbox-1.9.orig/libmb/mbmenu.c ++++ libmatchbox-1.9/libmb/mbmenu.c +@@ -433,7 +433,7 @@ + { + s = p; + found = NULL; +- while(index("/\0", *p) == NULL) p++; ++ while(strchr("/\0", *p) == NULL) p++; + if (*p != '\0') { *p = '\0'; p++; }; + + item = current->items; diff --git a/package/matchbox-lib/0002-libpng15.patch b/package/matchbox-lib/0002-libpng15.patch new file mode 100644 index 0000000000..3d68573b5f --- /dev/null +++ b/package/matchbox-lib/0002-libpng15.patch @@ -0,0 +1,26 @@ +Support for libpng 1.5+ shamelessly taken from Gentoo. + +Signed-off-by: Gustavo Zacarias + +--- a/libmb/mbpixbuf.c ++++ b/libmb/mbpixbuf.c +@@ -247,7 +247,7 @@ + return NULL; + } + +- if ( setjmp( png_ptr->jmpbuf ) ) { ++ if ( setjmp( png_jmpbuf(png_ptr) ) ) { + png_destroy_read_struct( &png_ptr, &info_ptr, NULL); + fclose(fd); + return NULL; +@@ -269,8 +269,8 @@ + ( color_type == PNG_COLOR_TYPE_GRAY_ALPHA )) + png_set_gray_to_rgb(png_ptr); + +- if ( info_ptr->color_type == PNG_COLOR_TYPE_RGB_ALPHA +- || info_ptr->color_type == PNG_COLOR_TYPE_GRAY_ALPHA ++ if ( color_type == PNG_COLOR_TYPE_RGB_ALPHA ++ || color_type == PNG_COLOR_TYPE_GRAY_ALPHA + ) + *has_alpha = 1; + else diff --git a/package/matchbox-lib/0003-include-setjmp-h.patch b/package/matchbox-lib/0003-include-setjmp-h.patch new file mode 100644 index 0000000000..72e1e45d8f --- /dev/null +++ b/package/matchbox-lib/0003-include-setjmp-h.patch @@ -0,0 +1,17 @@ +matchbox-lib: include setjmp.h + +Based on this upstream patch: + + http://git.yoctoproject.org/cgit/cgit.cgi/libmatchbox/commit/?id=9315bcce1f01e7d6c00161442d61d3c676794d9d + +Signed-off-by: Vicente Olivert Riera +--- libmatchbox-1.9/libmb/mbpixbuf.c.orig 2014-02-21 12:45:46.867035956 +0000 ++++ libmatchbox-1.9/libmb/mbpixbuf.c 2014-02-21 12:46:43.482949583 +0000 +@@ -22,6 +22,7 @@ + + #include + #include "mbpixbuf.h" ++#include + + #define BYTE_ORD_24_RGB 0 + #define BYTE_ORD_24_RBG 1 diff --git a/package/matchbox-lib/Config.in b/package/matchbox-lib/Config.in new file mode 100644 index 0000000000..480e6fe4b2 --- /dev/null +++ b/package/matchbox-lib/Config.in @@ -0,0 +1,2 @@ +config BR2_PACKAGE_MATCHBOX_LIB + bool diff --git a/package/matchbox-lib/matchbox-lib.hash b/package/matchbox-lib/matchbox-lib.hash new file mode 100644 index 0000000000..6f3a6531ee --- /dev/null +++ b/package/matchbox-lib/matchbox-lib.hash @@ -0,0 +1,2 @@ +# From http://downloads.yoctoproject.org/releases/matchbox/libmatchbox/1.9/libmatchbox-1.9.tar.bz2.md5 +md5 9f73e7515cc4679171a5db180dc1343b libmatchbox-1.9.tar.bz2 diff --git a/package/matchbox-lib/matchbox-lib.mk b/package/matchbox-lib/matchbox-lib.mk new file mode 100644 index 0000000000..3b697bbc5f --- /dev/null +++ b/package/matchbox-lib/matchbox-lib.mk @@ -0,0 +1,57 @@ +################################################################################ +# +# matchbox-lib +# +################################################################################ + +MATCHBOX_LIB_VERSION = 1.9 +MATCHBOX_LIB_SOURCE = libmatchbox-$(MATCHBOX_LIB_VERSION).tar.bz2 +MATCHBOX_LIB_SITE = http://downloads.yoctoproject.org/releases/matchbox/libmatchbox/$(MATCHBOX_LIB_VERSION) +MATCHBOX_LIB_LICENSE = LGPLv2.1+ +MATCHBOX_LIB_LICENSE_FILES = COPYING +MATCHBOX_LIB_INSTALL_STAGING = YES +MATCHBOX_LIB_DEPENDENCIES = host-pkgconf expat xlib_libXext +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 +endef + +MATCHBOX_LIB_POST_INSTALL_STAGING_HOOKS += MATCHBOX_LIB_POST_INSTALL_FIXES + +ifeq ($(BR2_PACKAGE_X11R7_LIBXCOMPOSITE),y) +ifeq ($(BR2_PACKAGE_X11R7_LIBXPM),y) +MATCHBOX_LIB_DEPENDENCIES += xlib_libXpm +endif +endif + +ifeq ($(BR2_PACKAGE_JPEG),y) +MATCHBOX_LIB_CONF_OPTS += --enable-jpeg +MATCHBOX_LIB_DEPENDENCIES += jpeg +else +MATCHBOX_LIB_CONF_OPTS += --disable-jpeg +endif + +ifeq ($(BR2_PACKAGE_LIBPNG),y) +MATCHBOX_LIB_CONF_OPTS += --enable-png +MATCHBOX_LIB_DEPENDENCIES += libpng +else +MATCHBOX_LIB_CONF_OPTS += --disable-png +endif + +ifeq ($(BR2_PACKAGE_PANGO)$(BR2_PACKAGE_XLIB_LIBXFT)$(BR2_PACKAGE_XLIB_LIBXRENDER),yyy) +MATCHBOX_LIB_CONF_OPTS += --enable-pango +MATCHBOX_LIB_DEPENDENCIES += pango +else +MATCHBOX_LIB_CONF_OPTS += --disable-pango +endif + +ifeq ($(BR2_PACKAGE_XLIB_LIBXFT),y) +MATCHBOX_LIB_CONF_OPTS += --enable-xft +MATCHBOX_LIB_DEPENDENCIES += xlib_libXft +else +MATCHBOX_LIB_CONF_OPTS += --disable-xft +endif + +$(eval $(autotools-package)) diff --git a/package/matchbox-panel/0001-index-is-legacy.patch b/package/matchbox-panel/0001-index-is-legacy.patch new file mode 100644 index 0000000000..925c326e71 --- /dev/null +++ b/package/matchbox-panel/0001-index-is-legacy.patch @@ -0,0 +1,20 @@ +Replace the legacy index() with strchr() + +Signed-off-by: Thomas Petazzoni +--- + applets/mb-applet-menu-launcher.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +Index: matchbox-panel-0.9.3/applets/mb-applet-menu-launcher.c +=================================================================== +--- matchbox-panel-0.9.3.orig/applets/mb-applet-menu-launcher.c ++++ matchbox-panel-0.9.3/applets/mb-applet-menu-launcher.c +@@ -280,7 +280,7 @@ + DBG("\tkey %s ", key); + if (*(++p) == '"') { p++; tc = sc; } /* skip "'s */ + val = p; +- while(index(tc,*p) == NULL) ++ while(strchr(tc,*p) == NULL) + { + if (*p == '\\' && *(p+1) == '"') p++; /* skip \" */ + p++; diff --git a/package/matchbox-panel/0002-mb-applet-wireless.patch b/package/matchbox-panel/0002-mb-applet-wireless.patch new file mode 100644 index 0000000000..93633b367e --- /dev/null +++ b/package/matchbox-panel/0002-mb-applet-wireless.patch @@ -0,0 +1,34 @@ +mb-applet-wireless: fix undefined reference to `log' and `lrint' + +mb-applet-wireless.o: In function `update_wireless': +.. matchbox-panel-0.9.3/applets/mb-applet-wireless.c:143: undefined reference to `log' +.. matchbox-panel-0.9.3/applets/mb-applet-wireless.c:143: undefined reference to `lrint' + +Signed-off-by: Jean-Paul Etienne +Signed-off-by: Arnout Vandecappelle (Essensium/Mind) +[arnout: add description and Signed-off-by] +--- +diff -rup matchbox-panel-0.9.3.orig/applets/Makefile.in matchbox-panel-0.9.3/applets/Makefile.in +--- matchbox-panel-0.9.3.orig/applets/Makefile.in 2015-01-23 00:16:47.594850985 +0100 ++++ matchbox-panel-0.9.3/applets/Makefile.in 2015-01-23 00:15:18.458694947 +0100 +@@ -198,7 +198,7 @@ WANT_SMALL_ICONS_FALSE = @WANT_SMALL_ICO + WANT_SMALL_ICONS_TRUE = @WANT_SMALL_ICONS_TRUE@ + WANT_WIFI_FALSE = @WANT_WIFI_FALSE@ + WANT_WIFI_TRUE = @WANT_WIFI_TRUE@ +-WIRELESS_LIBS = @WIRELESS_LIBS@ ++WIRELESS_LIBS = @WIRELESS_LIBS@ -lm + XGETTEXT = @XGETTEXT@ + ac_ct_CC = @ac_ct_CC@ + ac_ct_STRIP = @ac_ct_STRIP@ +diff -rup matchbox-panel-0.9.3.orig/applets/mb-applet-wireless.c matchbox-panel-0.9.3/applets/mb-applet-wireless.c +--- matchbox-panel-0.9.3.orig/applets/mb-applet-wireless.c 2015-01-23 00:16:31.531822865 +0100 ++++ matchbox-panel-0.9.3/applets/mb-applet-wireless.c 2015-01-23 00:03:43.067563827 +0100 +@@ -50,6 +50,8 @@ + + #endif + ++#include ++ + #ifdef MB_HAVE_PNG + #define IMG_EXT "png" + #else diff --git a/package/matchbox-panel/Config.in b/package/matchbox-panel/Config.in new file mode 100644 index 0000000000..e3daaf5fae --- /dev/null +++ b/package/matchbox-panel/Config.in @@ -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. diff --git a/package/matchbox-panel/matchbox-panel.hash b/package/matchbox-panel/matchbox-panel.hash new file mode 100644 index 0000000000..82802a9982 --- /dev/null +++ b/package/matchbox-panel/matchbox-panel.hash @@ -0,0 +1,2 @@ +# From http://downloads.yoctoproject.org/releases/matchbox/matchbox-panel/0.9/matchbox-panel-0.9.3.tar.bz2.md5 +md5 56d1807636f3919e22e51896ab7ccd2e matchbox-panel-0.9.3.tar.bz2 diff --git a/package/matchbox-panel/matchbox-panel.mk b/package/matchbox-panel/matchbox-panel.mk new file mode 100644 index 0000000000..f7d699bdac --- /dev/null +++ b/package/matchbox-panel/matchbox-panel.mk @@ -0,0 +1,27 @@ +################################################################################ +# +# matchbox-panel +# +################################################################################ + +MATCHBOX_PANEL_VERSION_MAJOR = 0.9 +MATCHBOX_PANEL_VERSION = $(MATCHBOX_PANEL_VERSION_MAJOR).3 +MATCHBOX_PANEL_SOURCE = matchbox-panel-$(MATCHBOX_PANEL_VERSION).tar.bz2 +MATCHBOX_PANEL_SITE = http://downloads.yoctoproject.org/releases/matchbox/matchbox-panel/$(MATCHBOX_PANEL_VERSION_MAJOR) +MATCHBOX_PANEL_LICENSE = GPLv2+ +MATCHBOX_PANEL_LICENSE_FILES = COPYING +MATCHBOX_PANEL_DEPENDENCIES = matchbox-lib +MATCHBOX_PANEL_CONF_OPTS = --enable-expat + +ifeq ($(BR2_PACKAGE_MATCHBOX_STARTUP_MONITOR),y) +MATCHBOX_PANEL_CONF_OPTS += --enable-startup-notification +MATCHBOX_PANEL_DEPENDENCIES += matchbox-startup-monitor +else +MATCHBOX_PANEL_CONF_OPTS += --disable-startup-notification +endif + +ifeq ($(BR2_PACKAGE_WIRELESS_TOOLS),y) +MATCHBOX_PANEL_DEPENDENCIES += wireless_tools +endif + +$(eval $(autotools-package)) diff --git a/package/matchbox-startup-monitor/0001-true-false.patch b/package/matchbox-startup-monitor/0001-true-false.patch new file mode 100644 index 0000000000..c92a0776b0 --- /dev/null +++ b/package/matchbox-startup-monitor/0001-true-false.patch @@ -0,0 +1,21 @@ +mbmonitor uses TRUE / FALSE without defining them + +Signed-off-by: Peter Korsgaard +--- + mbmonitor.c | 3 +++ + 1 file changed, 3 insertions(+) + +Index: mb-applet-startup-monitor-0.1/mbmonitor.c +=================================================================== +--- mb-applet-startup-monitor-0.1.orig/mbmonitor.c ++++ mb-applet-startup-monitor-0.1/mbmonitor.c +@@ -43,6 +43,9 @@ + #define POLLTIME 10 + #define HOURGLASS_N_FRAMES 8 + ++#define FALSE 0 ++#define TRUE 1 ++ + typedef struct LaunchList LaunchList; + + struct LaunchList diff --git a/package/matchbox-startup-monitor/Config.in b/package/matchbox-startup-monitor/Config.in new file mode 100644 index 0000000000..95af5fc842 --- /dev/null +++ b/package/matchbox-startup-monitor/Config.in @@ -0,0 +1,3 @@ +config BR2_PACKAGE_MATCHBOX_STARTUP_MONITOR + bool + default y if BR2_PACKAGE_STARTUP_NOTIFICATION diff --git a/package/matchbox-startup-monitor/matchbox-startup-monitor.hash b/package/matchbox-startup-monitor/matchbox-startup-monitor.hash new file mode 100644 index 0000000000..b08e228912 --- /dev/null +++ b/package/matchbox-startup-monitor/matchbox-startup-monitor.hash @@ -0,0 +1,2 @@ +# From http://downloads.yoctoproject.org/releases/matchbox/mb-applet-startup-monitor/0.1/mb-applet-startup-monitor-0.1.tar.bz2.md5 +md5 ea4b3c1ebee3f731b77a2d4bf8e9aa3c mb-applet-startup-monitor-0.1.tar.bz2 diff --git a/package/matchbox-startup-monitor/matchbox-startup-monitor.mk b/package/matchbox-startup-monitor/matchbox-startup-monitor.mk new file mode 100644 index 0000000000..be572396d8 --- /dev/null +++ b/package/matchbox-startup-monitor/matchbox-startup-monitor.mk @@ -0,0 +1,14 @@ +################################################################################ +# +# matchbox-startup-monitor +# +################################################################################ + +MATCHBOX_STARTUP_MONITOR_VERSION = 0.1 +MATCHBOX_STARTUP_MONITOR_SOURCE = mb-applet-startup-monitor-$(MATCHBOX_STARTUP_MONITOR_VERSION).tar.bz2 +MATCHBOX_STARTUP_MONITOR_SITE = http://downloads.yoctoproject.org/releases/matchbox/mb-applet-startup-monitor/$(MATCHBOX_STARTUP_MONITOR_VERSION) +MATCHBOX_STARTUP_MONITOR_LICENSE = GPLv2+ +MATCHBOX_STARTUP_MONITOR_LICENSE_FILES = COPYING +MATCHBOX_STARTUP_MONITOR_DEPENDENCIES = matchbox-lib startup-notification + +$(eval $(autotools-package)) diff --git a/package/matchbox/Config.in b/package/matchbox/Config.in index 7d06bb29aa..3d771d3cc6 100644 --- a/package/matchbox/Config.in +++ b/package/matchbox/Config.in @@ -18,12 +18,12 @@ config BR2_PACKAGE_MATCHBOX if BR2_PACKAGE_MATCHBOX -source "package/matchbox/matchbox-lib/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" -source "package/matchbox/matchbox-keyboard/Config.in" -source "package/matchbox/matchbox-startup-monitor/Config.in" +source "package/matchbox-common/Config.in" +source "package/matchbox-desktop/Config.in" +source "package/matchbox-fakekey/Config.in" +source "package/matchbox-keyboard/Config.in" +source "package/matchbox-lib/Config.in" +source "package/matchbox-panel/Config.in" +source "package/matchbox-startup-monitor/Config.in" endif diff --git a/package/matchbox/matchbox-common/Config.in b/package/matchbox/matchbox-common/Config.in deleted file mode 100644 index 7d22d05f19..0000000000 --- a/package/matchbox/matchbox-common/Config.in +++ /dev/null @@ -1,9 +0,0 @@ -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 diff --git a/package/matchbox/matchbox-common/matchbox-common.hash b/package/matchbox/matchbox-common/matchbox-common.hash deleted file mode 100644 index 619d8473c0..0000000000 --- a/package/matchbox/matchbox-common/matchbox-common.hash +++ /dev/null @@ -1,2 +0,0 @@ -# From http://downloads.yoctoproject.org/releases/matchbox/matchbox-common/0.9/matchbox-common-0.9.1.tar.bz2.md5 -md5 8e8ba0ee170a9ac78fdc583b00ccf76b matchbox-common-0.9.1.tar.bz2 diff --git a/package/matchbox/matchbox-common/matchbox-common.mk b/package/matchbox/matchbox-common/matchbox-common.mk deleted file mode 100644 index da6bec7135..0000000000 --- a/package/matchbox/matchbox-common/matchbox-common.mk +++ /dev/null @@ -1,19 +0,0 @@ -################################################################################ -# -# matchbox-common -# -################################################################################ - -MATCHBOX_COMMON_VERSION_MAJOR = 0.9 -MATCHBOX_COMMON_VERSION = $(MATCHBOX_COMMON_VERSION_MAJOR).1 -MATCHBOX_COMMON_SOURCE = matchbox-common-$(MATCHBOX_COMMON_VERSION).tar.bz2 -MATCHBOX_COMMON_SITE = http://downloads.yoctoproject.org/releases/matchbox/matchbox-common/$(MATCHBOX_COMMON_VERSION_MAJOR) -MATCHBOX_COMMON_LICENSE = GPLv2+ -MATCHBOX_COMMON_LICENSE_FILES = COPYING -MATCHBOX_COMMON_DEPENDENCIES = matchbox-lib - -ifeq ($(strip $(BR2_PACKAGE_MATCHBOX_COMMON_PDA)),y) -MATCHBOX_COMMON_CONF_OPTS += --enable-pda-folders -endif - -$(eval $(autotools-package)) diff --git a/package/matchbox/matchbox-desktop/Config.in b/package/matchbox/matchbox-desktop/Config.in deleted file mode 100644 index c9fd196134..0000000000 --- a/package/matchbox/matchbox-desktop/Config.in +++ /dev/null @@ -1,5 +0,0 @@ -config BR2_PACKAGE_MATCHBOX_DESKTOP - bool "Matchbox Desktop" - select BR2_PACKAGE_ZLIB - help - A PDA style application launcher or 'item browser'. diff --git a/package/matchbox/matchbox-desktop/matchbox-desktop.hash b/package/matchbox/matchbox-desktop/matchbox-desktop.hash deleted file mode 100644 index e48a4a955c..0000000000 --- a/package/matchbox/matchbox-desktop/matchbox-desktop.hash +++ /dev/null @@ -1,2 +0,0 @@ -# From http://downloads.yoctoproject.org/releases/matchbox/matchbox-desktop/0.9/matchbox-desktop-0.9.1.tar.bz2.md5 -md5 3335a30b1a1aacfb39f23b505254765c matchbox-desktop-0.9.1.tar.bz2 diff --git a/package/matchbox/matchbox-desktop/matchbox-desktop.mk b/package/matchbox/matchbox-desktop/matchbox-desktop.mk deleted file mode 100644 index a703a18e55..0000000000 --- a/package/matchbox/matchbox-desktop/matchbox-desktop.mk +++ /dev/null @@ -1,28 +0,0 @@ -################################################################################ -# -# matchbox-desktop -# -################################################################################ - -MATCHBOX_DESKTOP_VERSION_MAJOR = 0.9 -MATCHBOX_DESKTOP_VERSION = $(MATCHBOX_DESKTOP_VERSION_MAJOR).1 -MATCHBOX_DESKTOP_SOURCE = matchbox-desktop-$(MATCHBOX_DESKTOP_VERSION).tar.bz2 -MATCHBOX_DESKTOP_SITE = http://downloads.yoctoproject.org/releases/matchbox/matchbox-desktop/$(MATCHBOX_DESKTOP_VERSION_MAJOR) -MATCHBOX_DESKTOP_LICENSE = GPLv2+ -MATCHBOX_DESKTOP_LICENSE_FILES = COPYING -MATCHBOX_DESKTOP_DEPENDENCIES = matchbox-lib zlib -MATCHBOX_DESKTOP_CONF_OPTS = --enable-expat - -# The bundled configure script does not properly replace LIBADD_DL, so -# we force an autoreconf even if we don't have any patches touching -# configure.ac/Makefile.am. -MATCHBOX_DESKTOP_AUTORECONF = YES - -ifeq ($(BR2_PACKAGE_STARTUP_NOTIFICATION),y) -MATCHBOX_DESKTOP_CONF_OPTS += --enable-startup-notification -MATCHBOX_DESKTOP_DEPENDENCIES += startup-notification -else -MATCHBOX_DESKTOP_CONF_OPTS += --disable-startup-notification -endif - -$(eval $(autotools-package)) diff --git a/package/matchbox/matchbox-fakekey/Config.in b/package/matchbox/matchbox-fakekey/Config.in deleted file mode 100644 index 334f3a2a33..0000000000 --- a/package/matchbox/matchbox-fakekey/Config.in +++ /dev/null @@ -1,2 +0,0 @@ -config BR2_PACKAGE_MATCHBOX_FAKEKEY - bool diff --git a/package/matchbox/matchbox-fakekey/matchbox-fakekey.hash b/package/matchbox/matchbox-fakekey/matchbox-fakekey.hash deleted file mode 100644 index 3e8778a6e1..0000000000 --- a/package/matchbox/matchbox-fakekey/matchbox-fakekey.hash +++ /dev/null @@ -1,2 +0,0 @@ -# From http://downloads.yoctoproject.org/releases/matchbox/libfakekey/0.1/libfakekey-0.1.tar.bz2.md5 -md5 83dbde4d77e8baf0176fe4291d8a2303 libfakekey-0.1.tar.bz2 diff --git a/package/matchbox/matchbox-fakekey/matchbox-fakekey.mk b/package/matchbox/matchbox-fakekey/matchbox-fakekey.mk deleted file mode 100644 index ea8e6dcd61..0000000000 --- a/package/matchbox/matchbox-fakekey/matchbox-fakekey.mk +++ /dev/null @@ -1,23 +0,0 @@ -################################################################################ -# -# matchbox-fakekey -# -################################################################################ - -MATCHBOX_FAKEKEY_VERSION = 0.1 -MATCHBOX_FAKEKEY_SOURCE = libfakekey-$(MATCHBOX_FAKEKEY_VERSION).tar.bz2 -MATCHBOX_FAKEKEY_SITE = http://downloads.yoctoproject.org/releases/matchbox/libfakekey/$(MATCHBOX_FAKEKEY_VERSION) -MATCHBOX_FAKEKEY_LICENSE = GPLv2+ -MATCHBOX_FAKEKEY_LICENSE_FILES = COPYING -MATCHBOX_FAKEKEY_INSTALL_STAGING = YES -MATCHBOX_FAKEKEY_DEPENDENCIES = matchbox-lib xlib_libXtst -MATCHBOX_FAKEKEY_CONF_OPTS = --enable-expat - -define MATCHBOX_FAKEKEY_POST_CONFIGURE_FIXES - $(SED) 's:-I[^$$].*/usr/include/freetype2:-I/usr/include/freetype2:' $(STAGING_DIR)/usr/lib/pkgconfig/libmb.pc - $(SED) 's:^SUBDIRS = fakekey src tests.*:SUBDIRS = fakekey src:g' $(MATCHBOX_FAKEKEY_DIR)/Makefile -endef - -MATCHBOX_FAKEKEY_POST_CONFIGURE_HOOKS += MATCHBOX_FAKEKEY_POST_CONFIGURE_FIXES - -$(eval $(autotools-package)) diff --git a/package/matchbox/matchbox-keyboard/Config.in b/package/matchbox/matchbox-keyboard/Config.in deleted file mode 100644 index e017358b35..0000000000 --- a/package/matchbox/matchbox-keyboard/Config.in +++ /dev/null @@ -1,7 +0,0 @@ -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 diff --git a/package/matchbox/matchbox-keyboard/matchbox-keyboard.hash b/package/matchbox/matchbox-keyboard/matchbox-keyboard.hash deleted file mode 100644 index 76997b0da3..0000000000 --- a/package/matchbox/matchbox-keyboard/matchbox-keyboard.hash +++ /dev/null @@ -1,2 +0,0 @@ -# From http://downloads.yoctoproject.org/releases/matchbox/matchbox-keyboard/0.1/matchbox-keyboard-0.1.tar.bz2.md5 -md5 50940321d59fee23b38a4941100abf25 matchbox-keyboard-0.1.tar.bz2 diff --git a/package/matchbox/matchbox-keyboard/matchbox-keyboard.mk b/package/matchbox/matchbox-keyboard/matchbox-keyboard.mk deleted file mode 100644 index 2017730ccc..0000000000 --- a/package/matchbox/matchbox-keyboard/matchbox-keyboard.mk +++ /dev/null @@ -1,30 +0,0 @@ -################################################################################ -# -# matchbox-keyboard -# -################################################################################ - -MATCHBOX_KEYBOARD_VERSION = 0.1 -MATCHBOX_KEYBOARD_SOURCE = matchbox-keyboard-$(MATCHBOX_KEYBOARD_VERSION).tar.bz2 -MATCHBOX_KEYBOARD_SITE = http://downloads.yoctoproject.org/releases/matchbox/matchbox-keyboard/$(MATCHBOX_KEYBOARD_VERSION) -MATCHBOX_KEYBOARD_LICENSE = GPLv2+ -MATCHBOX_KEYBOARD_LICENSE_FILES = COPYING -MATCHBOX_KEYBOARD_DEPENDENCIES = host-pkgconf matchbox-lib matchbox-fakekey expat - -# Workaround bug in configure script -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 -endef - -MATCHBOX_KEYBOARD_POST_INSTALL_TARGET_HOOKS += MATCHBOX_KEYBOARD_POST_INSTALL_FIXES - -ifeq ($(BR2_PACKAGE_CAIRO),y) -MATCHBOX_KEYBOARD_CONF_OPTS += --enable-cairo -MATCHBOX_KEYBOARD_DEPENDENCIES += cairo -else -MATCHBOX_KEYBOARD_DEPENDENCIES += xlib_libXft -endif - -$(eval $(autotools-package)) diff --git a/package/matchbox/matchbox-keyboard/mb-applet-kbd-wrapper.sh b/package/matchbox/matchbox-keyboard/mb-applet-kbd-wrapper.sh deleted file mode 100644 index be202b5d65..0000000000 --- a/package/matchbox/matchbox-keyboard/mb-applet-kbd-wrapper.sh +++ /dev/null @@ -1,8 +0,0 @@ -#!/bin/sh -# - -killall matchbox-keyboard -if [ ! $? -eq 0 ] -then - matchbox-keyboard & -fi diff --git a/package/matchbox/matchbox-lib/0001-index-is-legacy.patch b/package/matchbox/matchbox-lib/0001-index-is-legacy.patch deleted file mode 100644 index b486fb18d4..0000000000 --- a/package/matchbox/matchbox-lib/0001-index-is-legacy.patch +++ /dev/null @@ -1,35 +0,0 @@ -index() is a legacy function, not implemented in some uClibc -configurations. - -Signed-off-by: Thomas Petazzoni ---- - libmb/mbexp.c | 2 +- - libmb/mbmenu.c | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -Index: libmatchbox-1.9/libmb/mbexp.c -=================================================================== ---- libmatchbox-1.9.orig/libmb/mbexp.c -+++ libmatchbox-1.9/libmb/mbexp.c -@@ -492,7 +492,7 @@ - - /* get the family */ - -- if (index(spec, ',') != NULL || index(spec, '-') != NULL) -+ if (strchr(spec, ',') != NULL || strchr(spec, '-') != NULL) - has_comma_delim = True; - - while (!got_family) { -Index: libmatchbox-1.9/libmb/mbmenu.c -=================================================================== ---- libmatchbox-1.9.orig/libmb/mbmenu.c -+++ libmatchbox-1.9/libmb/mbmenu.c -@@ -433,7 +433,7 @@ - { - s = p; - found = NULL; -- while(index("/\0", *p) == NULL) p++; -+ while(strchr("/\0", *p) == NULL) p++; - if (*p != '\0') { *p = '\0'; p++; }; - - item = current->items; diff --git a/package/matchbox/matchbox-lib/0002-libpng15.patch b/package/matchbox/matchbox-lib/0002-libpng15.patch deleted file mode 100644 index 3d68573b5f..0000000000 --- a/package/matchbox/matchbox-lib/0002-libpng15.patch +++ /dev/null @@ -1,26 +0,0 @@ -Support for libpng 1.5+ shamelessly taken from Gentoo. - -Signed-off-by: Gustavo Zacarias - ---- a/libmb/mbpixbuf.c -+++ b/libmb/mbpixbuf.c -@@ -247,7 +247,7 @@ - return NULL; - } - -- if ( setjmp( png_ptr->jmpbuf ) ) { -+ if ( setjmp( png_jmpbuf(png_ptr) ) ) { - png_destroy_read_struct( &png_ptr, &info_ptr, NULL); - fclose(fd); - return NULL; -@@ -269,8 +269,8 @@ - ( color_type == PNG_COLOR_TYPE_GRAY_ALPHA )) - png_set_gray_to_rgb(png_ptr); - -- if ( info_ptr->color_type == PNG_COLOR_TYPE_RGB_ALPHA -- || info_ptr->color_type == PNG_COLOR_TYPE_GRAY_ALPHA -+ if ( color_type == PNG_COLOR_TYPE_RGB_ALPHA -+ || color_type == PNG_COLOR_TYPE_GRAY_ALPHA - ) - *has_alpha = 1; - else diff --git a/package/matchbox/matchbox-lib/0003-include-setjmp-h.patch b/package/matchbox/matchbox-lib/0003-include-setjmp-h.patch deleted file mode 100644 index 72e1e45d8f..0000000000 --- a/package/matchbox/matchbox-lib/0003-include-setjmp-h.patch +++ /dev/null @@ -1,17 +0,0 @@ -matchbox-lib: include setjmp.h - -Based on this upstream patch: - - http://git.yoctoproject.org/cgit/cgit.cgi/libmatchbox/commit/?id=9315bcce1f01e7d6c00161442d61d3c676794d9d - -Signed-off-by: Vicente Olivert Riera ---- libmatchbox-1.9/libmb/mbpixbuf.c.orig 2014-02-21 12:45:46.867035956 +0000 -+++ libmatchbox-1.9/libmb/mbpixbuf.c 2014-02-21 12:46:43.482949583 +0000 -@@ -22,6 +22,7 @@ - - #include - #include "mbpixbuf.h" -+#include - - #define BYTE_ORD_24_RGB 0 - #define BYTE_ORD_24_RBG 1 diff --git a/package/matchbox/matchbox-lib/Config.in b/package/matchbox/matchbox-lib/Config.in deleted file mode 100644 index 480e6fe4b2..0000000000 --- a/package/matchbox/matchbox-lib/Config.in +++ /dev/null @@ -1,2 +0,0 @@ -config BR2_PACKAGE_MATCHBOX_LIB - bool diff --git a/package/matchbox/matchbox-lib/matchbox-lib.hash b/package/matchbox/matchbox-lib/matchbox-lib.hash deleted file mode 100644 index 6f3a6531ee..0000000000 --- a/package/matchbox/matchbox-lib/matchbox-lib.hash +++ /dev/null @@ -1,2 +0,0 @@ -# From http://downloads.yoctoproject.org/releases/matchbox/libmatchbox/1.9/libmatchbox-1.9.tar.bz2.md5 -md5 9f73e7515cc4679171a5db180dc1343b libmatchbox-1.9.tar.bz2 diff --git a/package/matchbox/matchbox-lib/matchbox-lib.mk b/package/matchbox/matchbox-lib/matchbox-lib.mk deleted file mode 100644 index 3b697bbc5f..0000000000 --- a/package/matchbox/matchbox-lib/matchbox-lib.mk +++ /dev/null @@ -1,57 +0,0 @@ -################################################################################ -# -# matchbox-lib -# -################################################################################ - -MATCHBOX_LIB_VERSION = 1.9 -MATCHBOX_LIB_SOURCE = libmatchbox-$(MATCHBOX_LIB_VERSION).tar.bz2 -MATCHBOX_LIB_SITE = http://downloads.yoctoproject.org/releases/matchbox/libmatchbox/$(MATCHBOX_LIB_VERSION) -MATCHBOX_LIB_LICENSE = LGPLv2.1+ -MATCHBOX_LIB_LICENSE_FILES = COPYING -MATCHBOX_LIB_INSTALL_STAGING = YES -MATCHBOX_LIB_DEPENDENCIES = host-pkgconf expat xlib_libXext -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 -endef - -MATCHBOX_LIB_POST_INSTALL_STAGING_HOOKS += MATCHBOX_LIB_POST_INSTALL_FIXES - -ifeq ($(BR2_PACKAGE_X11R7_LIBXCOMPOSITE),y) -ifeq ($(BR2_PACKAGE_X11R7_LIBXPM),y) -MATCHBOX_LIB_DEPENDENCIES += xlib_libXpm -endif -endif - -ifeq ($(BR2_PACKAGE_JPEG),y) -MATCHBOX_LIB_CONF_OPTS += --enable-jpeg -MATCHBOX_LIB_DEPENDENCIES += jpeg -else -MATCHBOX_LIB_CONF_OPTS += --disable-jpeg -endif - -ifeq ($(BR2_PACKAGE_LIBPNG),y) -MATCHBOX_LIB_CONF_OPTS += --enable-png -MATCHBOX_LIB_DEPENDENCIES += libpng -else -MATCHBOX_LIB_CONF_OPTS += --disable-png -endif - -ifeq ($(BR2_PACKAGE_PANGO)$(BR2_PACKAGE_XLIB_LIBXFT)$(BR2_PACKAGE_XLIB_LIBXRENDER),yyy) -MATCHBOX_LIB_CONF_OPTS += --enable-pango -MATCHBOX_LIB_DEPENDENCIES += pango -else -MATCHBOX_LIB_CONF_OPTS += --disable-pango -endif - -ifeq ($(BR2_PACKAGE_XLIB_LIBXFT),y) -MATCHBOX_LIB_CONF_OPTS += --enable-xft -MATCHBOX_LIB_DEPENDENCIES += xlib_libXft -else -MATCHBOX_LIB_CONF_OPTS += --disable-xft -endif - -$(eval $(autotools-package)) diff --git a/package/matchbox/matchbox-panel/0001-index-is-legacy.patch b/package/matchbox/matchbox-panel/0001-index-is-legacy.patch deleted file mode 100644 index 925c326e71..0000000000 --- a/package/matchbox/matchbox-panel/0001-index-is-legacy.patch +++ /dev/null @@ -1,20 +0,0 @@ -Replace the legacy index() with strchr() - -Signed-off-by: Thomas Petazzoni ---- - applets/mb-applet-menu-launcher.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -Index: matchbox-panel-0.9.3/applets/mb-applet-menu-launcher.c -=================================================================== ---- matchbox-panel-0.9.3.orig/applets/mb-applet-menu-launcher.c -+++ matchbox-panel-0.9.3/applets/mb-applet-menu-launcher.c -@@ -280,7 +280,7 @@ - DBG("\tkey %s ", key); - if (*(++p) == '"') { p++; tc = sc; } /* skip "'s */ - val = p; -- while(index(tc,*p) == NULL) -+ while(strchr(tc,*p) == NULL) - { - if (*p == '\\' && *(p+1) == '"') p++; /* skip \" */ - p++; diff --git a/package/matchbox/matchbox-panel/0002-mb-applet-wireless.patch b/package/matchbox/matchbox-panel/0002-mb-applet-wireless.patch deleted file mode 100644 index 93633b367e..0000000000 --- a/package/matchbox/matchbox-panel/0002-mb-applet-wireless.patch +++ /dev/null @@ -1,34 +0,0 @@ -mb-applet-wireless: fix undefined reference to `log' and `lrint' - -mb-applet-wireless.o: In function `update_wireless': -.. matchbox-panel-0.9.3/applets/mb-applet-wireless.c:143: undefined reference to `log' -.. matchbox-panel-0.9.3/applets/mb-applet-wireless.c:143: undefined reference to `lrint' - -Signed-off-by: Jean-Paul Etienne -Signed-off-by: Arnout Vandecappelle (Essensium/Mind) -[arnout: add description and Signed-off-by] ---- -diff -rup matchbox-panel-0.9.3.orig/applets/Makefile.in matchbox-panel-0.9.3/applets/Makefile.in ---- matchbox-panel-0.9.3.orig/applets/Makefile.in 2015-01-23 00:16:47.594850985 +0100 -+++ matchbox-panel-0.9.3/applets/Makefile.in 2015-01-23 00:15:18.458694947 +0100 -@@ -198,7 +198,7 @@ WANT_SMALL_ICONS_FALSE = @WANT_SMALL_ICO - WANT_SMALL_ICONS_TRUE = @WANT_SMALL_ICONS_TRUE@ - WANT_WIFI_FALSE = @WANT_WIFI_FALSE@ - WANT_WIFI_TRUE = @WANT_WIFI_TRUE@ --WIRELESS_LIBS = @WIRELESS_LIBS@ -+WIRELESS_LIBS = @WIRELESS_LIBS@ -lm - XGETTEXT = @XGETTEXT@ - ac_ct_CC = @ac_ct_CC@ - ac_ct_STRIP = @ac_ct_STRIP@ -diff -rup matchbox-panel-0.9.3.orig/applets/mb-applet-wireless.c matchbox-panel-0.9.3/applets/mb-applet-wireless.c ---- matchbox-panel-0.9.3.orig/applets/mb-applet-wireless.c 2015-01-23 00:16:31.531822865 +0100 -+++ matchbox-panel-0.9.3/applets/mb-applet-wireless.c 2015-01-23 00:03:43.067563827 +0100 -@@ -50,6 +50,8 @@ - - #endif - -+#include -+ - #ifdef MB_HAVE_PNG - #define IMG_EXT "png" - #else diff --git a/package/matchbox/matchbox-panel/Config.in b/package/matchbox/matchbox-panel/Config.in deleted file mode 100644 index e3daaf5fae..0000000000 --- a/package/matchbox/matchbox-panel/Config.in +++ /dev/null @@ -1,6 +0,0 @@ -config BR2_PACKAGE_MATCHBOX_PANEL - bool "Matchbox Panel" - select BR2_PACKAGE_MATCHBOX_LIB - help - A flexible always present 'window bar' for holding - application launchers. diff --git a/package/matchbox/matchbox-panel/matchbox-panel.hash b/package/matchbox/matchbox-panel/matchbox-panel.hash deleted file mode 100644 index 82802a9982..0000000000 --- a/package/matchbox/matchbox-panel/matchbox-panel.hash +++ /dev/null @@ -1,2 +0,0 @@ -# From http://downloads.yoctoproject.org/releases/matchbox/matchbox-panel/0.9/matchbox-panel-0.9.3.tar.bz2.md5 -md5 56d1807636f3919e22e51896ab7ccd2e matchbox-panel-0.9.3.tar.bz2 diff --git a/package/matchbox/matchbox-panel/matchbox-panel.mk b/package/matchbox/matchbox-panel/matchbox-panel.mk deleted file mode 100644 index f7d699bdac..0000000000 --- a/package/matchbox/matchbox-panel/matchbox-panel.mk +++ /dev/null @@ -1,27 +0,0 @@ -################################################################################ -# -# matchbox-panel -# -################################################################################ - -MATCHBOX_PANEL_VERSION_MAJOR = 0.9 -MATCHBOX_PANEL_VERSION = $(MATCHBOX_PANEL_VERSION_MAJOR).3 -MATCHBOX_PANEL_SOURCE = matchbox-panel-$(MATCHBOX_PANEL_VERSION).tar.bz2 -MATCHBOX_PANEL_SITE = http://downloads.yoctoproject.org/releases/matchbox/matchbox-panel/$(MATCHBOX_PANEL_VERSION_MAJOR) -MATCHBOX_PANEL_LICENSE = GPLv2+ -MATCHBOX_PANEL_LICENSE_FILES = COPYING -MATCHBOX_PANEL_DEPENDENCIES = matchbox-lib -MATCHBOX_PANEL_CONF_OPTS = --enable-expat - -ifeq ($(BR2_PACKAGE_MATCHBOX_STARTUP_MONITOR),y) -MATCHBOX_PANEL_CONF_OPTS += --enable-startup-notification -MATCHBOX_PANEL_DEPENDENCIES += matchbox-startup-monitor -else -MATCHBOX_PANEL_CONF_OPTS += --disable-startup-notification -endif - -ifeq ($(BR2_PACKAGE_WIRELESS_TOOLS),y) -MATCHBOX_PANEL_DEPENDENCIES += wireless_tools -endif - -$(eval $(autotools-package)) diff --git a/package/matchbox/matchbox-startup-monitor/0001-true-false.patch b/package/matchbox/matchbox-startup-monitor/0001-true-false.patch deleted file mode 100644 index c92a0776b0..0000000000 --- a/package/matchbox/matchbox-startup-monitor/0001-true-false.patch +++ /dev/null @@ -1,21 +0,0 @@ -mbmonitor uses TRUE / FALSE without defining them - -Signed-off-by: Peter Korsgaard ---- - mbmonitor.c | 3 +++ - 1 file changed, 3 insertions(+) - -Index: mb-applet-startup-monitor-0.1/mbmonitor.c -=================================================================== ---- mb-applet-startup-monitor-0.1.orig/mbmonitor.c -+++ mb-applet-startup-monitor-0.1/mbmonitor.c -@@ -43,6 +43,9 @@ - #define POLLTIME 10 - #define HOURGLASS_N_FRAMES 8 - -+#define FALSE 0 -+#define TRUE 1 -+ - typedef struct LaunchList LaunchList; - - struct LaunchList diff --git a/package/matchbox/matchbox-startup-monitor/Config.in b/package/matchbox/matchbox-startup-monitor/Config.in deleted file mode 100644 index 95af5fc842..0000000000 --- a/package/matchbox/matchbox-startup-monitor/Config.in +++ /dev/null @@ -1,3 +0,0 @@ -config BR2_PACKAGE_MATCHBOX_STARTUP_MONITOR - bool - default y if BR2_PACKAGE_STARTUP_NOTIFICATION diff --git a/package/matchbox/matchbox-startup-monitor/matchbox-startup-monitor.hash b/package/matchbox/matchbox-startup-monitor/matchbox-startup-monitor.hash deleted file mode 100644 index b08e228912..0000000000 --- a/package/matchbox/matchbox-startup-monitor/matchbox-startup-monitor.hash +++ /dev/null @@ -1,2 +0,0 @@ -# From http://downloads.yoctoproject.org/releases/matchbox/mb-applet-startup-monitor/0.1/mb-applet-startup-monitor-0.1.tar.bz2.md5 -md5 ea4b3c1ebee3f731b77a2d4bf8e9aa3c mb-applet-startup-monitor-0.1.tar.bz2 diff --git a/package/matchbox/matchbox-startup-monitor/matchbox-startup-monitor.mk b/package/matchbox/matchbox-startup-monitor/matchbox-startup-monitor.mk deleted file mode 100644 index be572396d8..0000000000 --- a/package/matchbox/matchbox-startup-monitor/matchbox-startup-monitor.mk +++ /dev/null @@ -1,14 +0,0 @@ -################################################################################ -# -# matchbox-startup-monitor -# -################################################################################ - -MATCHBOX_STARTUP_MONITOR_VERSION = 0.1 -MATCHBOX_STARTUP_MONITOR_SOURCE = mb-applet-startup-monitor-$(MATCHBOX_STARTUP_MONITOR_VERSION).tar.bz2 -MATCHBOX_STARTUP_MONITOR_SITE = http://downloads.yoctoproject.org/releases/matchbox/mb-applet-startup-monitor/$(MATCHBOX_STARTUP_MONITOR_VERSION) -MATCHBOX_STARTUP_MONITOR_LICENSE = GPLv2+ -MATCHBOX_STARTUP_MONITOR_LICENSE_FILES = COPYING -MATCHBOX_STARTUP_MONITOR_DEPENDENCIES = matchbox-lib startup-notification - -$(eval $(autotools-package)) diff --git a/package/matchbox/matchbox.mk b/package/matchbox/matchbox.mk index 100a633363..29e240eded 100644 --- a/package/matchbox/matchbox.mk +++ b/package/matchbox/matchbox.mk @@ -36,6 +36,3 @@ MATCHBOX_CONF_OPTS += --disable-startup-notification endif $(eval $(autotools-package)) - -# After we called a package infra, we can include more files -include $(sort $(wildcard package/matchbox/*/*.mk))