diff options
| -rw-r--r-- | meta-oe/recipes-graphics/libforms/files/0001-Make-extern-declarations-in-header-file.patch | 17 | ||||
| -rw-r--r-- | meta-oe/recipes-graphics/libforms/files/0001-Modify-include-dir.patch | 33 | ||||
| -rw-r--r-- | meta-oe/recipes-graphics/libforms/libforms_1.2.4.bb (renamed from meta-oe/recipes-graphics/libforms/libforms_1.2.3.bb) | 5 |
3 files changed, 36 insertions, 19 deletions
diff --git a/meta-oe/recipes-graphics/libforms/files/0001-Make-extern-declarations-in-header-file.patch b/meta-oe/recipes-graphics/libforms/files/0001-Make-extern-declarations-in-header-file.patch index 619bad6d02..16689f64b9 100644 --- a/meta-oe/recipes-graphics/libforms/files/0001-Make-extern-declarations-in-header-file.patch +++ b/meta-oe/recipes-graphics/libforms/files/0001-Make-extern-declarations-in-header-file.patch | |||
| @@ -10,8 +10,7 @@ Upstream-Status: Pending | |||
| 10 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | 10 | Signed-off-by: Khem Raj <raj.khem@gmail.com> |
| 11 | --- | 11 | --- |
| 12 | fdesign/sp_spinner.c | 2 +- | 12 | fdesign/sp_spinner.c | 2 +- |
| 13 | lib/flinternal.h | 4 ++-- | 13 | 1 files changed, 1 insertions(+), 1 deletions(-) |
| 14 | 2 files changed, 3 insertions(+), 3 deletions(-) | ||
| 15 | 14 | ||
| 16 | diff --git a/fdesign/sp_spinner.c b/fdesign/sp_spinner.c | 15 | diff --git a/fdesign/sp_spinner.c b/fdesign/sp_spinner.c |
| 17 | index 04f2c19..6206daa 100644 | 16 | index 04f2c19..6206daa 100644 |
| @@ -26,20 +25,6 @@ index 04f2c19..6206daa 100644 | |||
| 26 | 25 | ||
| 27 | 26 | ||
| 28 | /*************************************** | 27 | /*************************************** |
| 29 | diff --git a/lib/flinternal.h b/lib/flinternal.h | ||
| 30 | index 06d847e..577bd10 100644 | ||
| 31 | --- a/lib/flinternal.h | ||
| 32 | +++ b/lib/flinternal.h | ||
| 33 | @@ -138,8 +138,8 @@ enum { | ||
| 34 | |||
| 35 | /* events.c or event related */ | ||
| 36 | |||
| 37 | -FL_OBJECT * fli_handled_obj; | ||
| 38 | -FL_OBJECT * fli_handled_parent; | ||
| 39 | +extern FL_OBJECT * fli_handled_obj; | ||
| 40 | +extern FL_OBJECT * fli_handled_parent; | ||
| 41 | |||
| 42 | void fli_obj_queue_delete( void ); | ||
| 43 | 28 | ||
| 44 | -- | 29 | -- |
| 45 | 2.28.0 | 30 | 2.28.0 |
diff --git a/meta-oe/recipes-graphics/libforms/files/0001-Modify-include-dir.patch b/meta-oe/recipes-graphics/libforms/files/0001-Modify-include-dir.patch new file mode 100644 index 0000000000..0b7c063804 --- /dev/null +++ b/meta-oe/recipes-graphics/libforms/files/0001-Modify-include-dir.patch | |||
| @@ -0,0 +1,33 @@ | |||
| 1 | From d2d05928342f7f9f687ffea5e0b77f97f0ae5aad Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Wang Mingyu <wangmy@fujitsu.com> | ||
| 3 | Date: Wed, 7 Sep 2022 14:29:13 +0900 | ||
| 4 | Subject: [PATCH] Modify include dir | ||
| 5 | |||
| 6 | error messagge: | ||
| 7 | ../../xforms-1.2.4/lib/fd/cmdbr.h:28:10: fatal error: ../include/forms.h: No such file or directory | ||
| 8 | |||
| 9 | ../include/forms.h specified in the header file cmdbr.h is not exist. | ||
| 10 | |||
| 11 | Upstream-Status: Pending | ||
| 12 | |||
| 13 | Signed-off-by: Wang Mingyu <wangmy@fujitsu.com> | ||
| 14 | --- | ||
| 15 | lib/fd/cmdbr.h | 2 +- | ||
| 16 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
| 17 | |||
| 18 | diff --git a/lib/fd/cmdbr.h b/lib/fd/cmdbr.h | ||
| 19 | index 8495e05..2ddeced 100644 | ||
| 20 | --- a/lib/fd/cmdbr.h | ||
| 21 | +++ b/lib/fd/cmdbr.h | ||
| 22 | @@ -25,7 +25,7 @@ | ||
| 23 | #ifndef FD_cmd_h_ | ||
| 24 | #define FD_cmd_h_ | ||
| 25 | |||
| 26 | -#include "../include/forms.h" | ||
| 27 | +#include "include/forms.h" | ||
| 28 | |||
| 29 | /* Callbacks, globals and object handlers */ | ||
| 30 | |||
| 31 | -- | ||
| 32 | 2.25.1 | ||
| 33 | |||
diff --git a/meta-oe/recipes-graphics/libforms/libforms_1.2.3.bb b/meta-oe/recipes-graphics/libforms/libforms_1.2.4.bb index 838c1d5173..01db3c4d3d 100644 --- a/meta-oe/recipes-graphics/libforms/libforms_1.2.3.bb +++ b/meta-oe/recipes-graphics/libforms/libforms_1.2.4.bb | |||
| @@ -1,6 +1,5 @@ | |||
| 1 | DESCRIPTION = "The XForms graphical interface widget library " | 1 | DESCRIPTION = "The XForms graphical interface widget library " |
| 2 | HOMEPAGE = "http://savannah.nongnu.org/projects/xforms/" | 2 | HOMEPAGE = "http://savannah.nongnu.org/projects/xforms/" |
| 3 | PR = "r0" | ||
| 4 | 3 | ||
| 5 | LICENSE = "LGPL-2.1-or-later" | 4 | LICENSE = "LGPL-2.1-or-later" |
| 6 | LIC_FILES_CHKSUM = "file://COPYING.LIB;md5=ade9a053df81f5b9408d2f4f5546df86" | 5 | LIC_FILES_CHKSUM = "file://COPYING.LIB;md5=ade9a053df81f5b9408d2f4f5546df86" |
| @@ -10,10 +9,10 @@ SRC_URI = "http://download.savannah.nongnu.org/releases/xforms/xforms-${PV}.tar. | |||
| 10 | file://add-absolute-path-for-include-dir.patch \ | 9 | file://add-absolute-path-for-include-dir.patch \ |
| 11 | file://fix-path-fdesign_LDADD.patch \ | 10 | file://fix-path-fdesign_LDADD.patch \ |
| 12 | file://0001-Make-extern-declarations-in-header-file.patch \ | 11 | file://0001-Make-extern-declarations-in-header-file.patch \ |
| 12 | file://0001-Modify-include-dir.patch \ | ||
| 13 | " | 13 | " |
| 14 | 14 | ||
| 15 | SRC_URI[md5sum] = "235720a758a8b8d9e6e452dc67190e9b" | 15 | SRC_URI[sha256sum] = "78cc6b07071bbeaa1f906e0a22d5e9980e48f8913577bc082d661afe5cb75696" |
| 16 | SRC_URI[sha256sum] = "7989b39598c769820ad451ad91e5cb0de29946940c8240aac94ca8238c2def61" | ||
| 17 | 16 | ||
| 18 | inherit autotools features_check | 17 | inherit autotools features_check |
| 19 | 18 | ||
