diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2014-10-07 06:24:31 +0200 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2014-10-07 06:24:31 +0200 |
| commit | a5393320f05f681006915fcffe5631da874daee8 (patch) | |
| tree | 0bc9563da6929ec872bad3263a23519426ec91d4 /package/ympd/patches | |
| parent | c9712ddbbaf32cbf5bcdfd8154a733f2c2c84f6a (diff) | |
| parent | c59a468aae2eb6522e97d877992f3b059b4e6242 (diff) | |
Merge branch 'master' of git+ssh://openadk.org/git/openadk
Diffstat (limited to 'package/ympd/patches')
| -rw-r--r-- | package/ympd/patches/patch-CMakeLists_txt | 4 | ||||
| -rw-r--r-- | package/ympd/patches/patch-htdocs_mkdata_c | 35 |
2 files changed, 37 insertions, 2 deletions
diff --git a/package/ympd/patches/patch-CMakeLists_txt b/package/ympd/patches/patch-CMakeLists_txt index 779a5d26b..762e46601 100644 --- a/package/ympd/patches/patch-CMakeLists_txt +++ b/package/ympd/patches/patch-CMakeLists_txt @@ -1,5 +1,5 @@ --- ympd-1.2.2.orig/CMakeLists.txt 2014-09-28 13:39:27.000000000 +0200 -+++ ympd-1.2.2/CMakeLists.txt 2014-09-28 16:12:53.000000000 +0200 ++++ ympd-1.2.2/CMakeLists.txt 2014-10-05 00:46:09.000000000 +0200 @@ -16,9 +16,6 @@ include_directories(${PROJECT_BINARY_DIR include(CheckCSourceCompiles) @@ -10,7 +10,7 @@ file(GLOB RESOURCES RELATIVE ${PROJECT_SOURCE_DIR} htdocs/js/* -@@ -28,11 +25,11 @@ file(GLOB RESOURCES +@@ -28,11 +25,11 @@ file(GLOB RESOURCES htdocs/index.html ) diff --git a/package/ympd/patches/patch-htdocs_mkdata_c b/package/ympd/patches/patch-htdocs_mkdata_c new file mode 100644 index 000000000..e285e5dc3 --- /dev/null +++ b/package/ympd/patches/patch-htdocs_mkdata_c @@ -0,0 +1,35 @@ +--- ympd-1.2.2.orig/htdocs/mkdata.c 2014-09-28 13:39:27.000000000 +0200 ++++ ympd-1.2.2/htdocs/mkdata.c 2014-10-05 08:52:52.000000000 +0200 +@@ -7,7 +7,6 @@ + + #include <stdlib.h> + #include <stdio.h> +-#include <error.h> + #include <errno.h> + #include <string.h> + +@@ -58,16 +57,20 @@ int main(int argc, char *argv[]) + int i, j, buf; + FILE *fd; + +- if(argc <= 1) +- error(EXIT_FAILURE, 0, "Usage: ./%s <this_file> <file1> [file2, ...] > embedded_data.c", argv[0]); ++ if(argc <= 1) { ++ printf("Usage: ./%s <this_file> <file1> [file2, ...] > embedded_data.c", argv[0]); ++ exit(EXIT_FAILURE); ++ } + + for(i = 1; i < argc; i++) + { + printf("static const unsigned char v%d[] = {", i); + + fd = fopen(argv[i], "r"); +- if(!fd) +- error(EXIT_FAILURE, errno, "Failed open file %s", argv[i]); ++ if(!fd) { ++ printf("Failed open file %s", argv[i]); ++ exit(EXIT_FAILURE); ++ } + + j = 0; + while((buf = fgetc(fd)) != EOF) |