From 6080b2228cb1c5b46645a200bb22f55f23ed6660 Mon Sep 17 00:00:00 2001 From: Vicente Olivert Riera Date: Fri, 21 Feb 2014 13:53:16 +0000 Subject: matchbox-lib: rename patches to follow BR guidelines Signed-off-by: Vicente Olivert Riera Signed-off-by: Peter Korsgaard --- .../matchbox-lib-0001-index-is-legacy.patch | 35 ++++++++++++++++++++++ .../matchbox-lib/matchbox-lib-0002-libpng15.patch | 26 ++++++++++++++++ .../matchbox-lib-1.9-index-is-legacy.patch | 35 ---------------------- .../matchbox-lib/matchbox-lib-1.9-libpng15.patch | 26 ---------------- 4 files changed, 61 insertions(+), 61 deletions(-) create mode 100644 package/matchbox/matchbox-lib/matchbox-lib-0001-index-is-legacy.patch create mode 100644 package/matchbox/matchbox-lib/matchbox-lib-0002-libpng15.patch delete mode 100644 package/matchbox/matchbox-lib/matchbox-lib-1.9-index-is-legacy.patch delete mode 100644 package/matchbox/matchbox-lib/matchbox-lib-1.9-libpng15.patch (limited to 'package/matchbox') diff --git a/package/matchbox/matchbox-lib/matchbox-lib-0001-index-is-legacy.patch b/package/matchbox/matchbox-lib/matchbox-lib-0001-index-is-legacy.patch new file mode 100644 index 000000000..b486fb18d --- /dev/null +++ b/package/matchbox/matchbox-lib/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/matchbox-lib/matchbox-lib-0002-libpng15.patch b/package/matchbox/matchbox-lib/matchbox-lib-0002-libpng15.patch new file mode 100644 index 000000000..3d68573b5 --- /dev/null +++ b/package/matchbox/matchbox-lib/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/matchbox-lib/matchbox-lib-1.9-index-is-legacy.patch b/package/matchbox/matchbox-lib/matchbox-lib-1.9-index-is-legacy.patch deleted file mode 100644 index b486fb18d..000000000 --- a/package/matchbox/matchbox-lib/matchbox-lib-1.9-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/matchbox-lib-1.9-libpng15.patch b/package/matchbox/matchbox-lib/matchbox-lib-1.9-libpng15.patch deleted file mode 100644 index 3d68573b5..000000000 --- a/package/matchbox/matchbox-lib/matchbox-lib-1.9-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 -- cgit v1.2.3-70-g09d2