From 65bc87247c4ee7dfede32398a20abafd2668f79f Mon Sep 17 00:00:00 2001 From: Wang Mingyu Date: Wed, 7 Sep 2022 16:42:33 +0800 Subject: libforms: upgrade 1.2.3 -> 1.2.4 0001-Make-extern-declarations-in-header-file.patch refreshed for new version. 0001-Modify-include-dir.patch added to modify the dir of nonexist file. Signed-off-by: Wang Mingyu Signed-off-by: Khem Raj --- ...1-Make-extern-declarations-in-header-file.patch | 17 +---------- .../libforms/files/0001-Modify-include-dir.patch | 33 ++++++++++++++++++++++ .../recipes-graphics/libforms/libforms_1.2.3.bb | 27 ------------------ .../recipes-graphics/libforms/libforms_1.2.4.bb | 26 +++++++++++++++++ 4 files changed, 60 insertions(+), 43 deletions(-) create mode 100644 meta-oe/recipes-graphics/libforms/files/0001-Modify-include-dir.patch delete mode 100644 meta-oe/recipes-graphics/libforms/libforms_1.2.3.bb create mode 100644 meta-oe/recipes-graphics/libforms/libforms_1.2.4.bb 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 619bad6d0..16689f64b 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 Signed-off-by: Khem Raj --- fdesign/sp_spinner.c | 2 +- - lib/flinternal.h | 4 ++-- - 2 files changed, 3 insertions(+), 3 deletions(-) + 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/fdesign/sp_spinner.c b/fdesign/sp_spinner.c index 04f2c19..6206daa 100644 @@ -26,20 +25,6 @@ index 04f2c19..6206daa 100644 /*************************************** -diff --git a/lib/flinternal.h b/lib/flinternal.h -index 06d847e..577bd10 100644 ---- a/lib/flinternal.h -+++ b/lib/flinternal.h -@@ -138,8 +138,8 @@ enum { - - /* events.c or event related */ - --FL_OBJECT * fli_handled_obj; --FL_OBJECT * fli_handled_parent; -+extern FL_OBJECT * fli_handled_obj; -+extern FL_OBJECT * fli_handled_parent; - - void fli_obj_queue_delete( void ); -- 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 000000000..0b7c06380 --- /dev/null +++ b/meta-oe/recipes-graphics/libforms/files/0001-Modify-include-dir.patch @@ -0,0 +1,33 @@ +From d2d05928342f7f9f687ffea5e0b77f97f0ae5aad Mon Sep 17 00:00:00 2001 +From: Wang Mingyu +Date: Wed, 7 Sep 2022 14:29:13 +0900 +Subject: [PATCH] Modify include dir + +error messagge: +../../xforms-1.2.4/lib/fd/cmdbr.h:28:10: fatal error: ../include/forms.h: No such file or directory + +../include/forms.h specified in the header file cmdbr.h is not exist. + +Upstream-Status: Pending + +Signed-off-by: Wang Mingyu +--- + lib/fd/cmdbr.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/lib/fd/cmdbr.h b/lib/fd/cmdbr.h +index 8495e05..2ddeced 100644 +--- a/lib/fd/cmdbr.h ++++ b/lib/fd/cmdbr.h +@@ -25,7 +25,7 @@ + #ifndef FD_cmd_h_ + #define FD_cmd_h_ + +-#include "../include/forms.h" ++#include "include/forms.h" + + /* Callbacks, globals and object handlers */ + +-- +2.25.1 + diff --git a/meta-oe/recipes-graphics/libforms/libforms_1.2.3.bb b/meta-oe/recipes-graphics/libforms/libforms_1.2.3.bb deleted file mode 100644 index 838c1d517..000000000 --- a/meta-oe/recipes-graphics/libforms/libforms_1.2.3.bb +++ /dev/null @@ -1,27 +0,0 @@ -DESCRIPTION = "The XForms graphical interface widget library " -HOMEPAGE = "http://savannah.nongnu.org/projects/xforms/" -PR = "r0" - -LICENSE = "LGPL-2.1-or-later" -LIC_FILES_CHKSUM = "file://COPYING.LIB;md5=ade9a053df81f5b9408d2f4f5546df86" - -SRC_URI = "http://download.savannah.nongnu.org/releases/xforms/xforms-${PV}.tar.gz \ - file://fix-link-to-xforms-man.patch \ - file://add-absolute-path-for-include-dir.patch \ - file://fix-path-fdesign_LDADD.patch \ - file://0001-Make-extern-declarations-in-header-file.patch \ - " - -SRC_URI[md5sum] = "235720a758a8b8d9e6e452dc67190e9b" -SRC_URI[sha256sum] = "7989b39598c769820ad451ad91e5cb0de29946940c8240aac94ca8238c2def61" - -inherit autotools features_check - -REQUIRED_DISTRO_FEATURES = "opengl x11" - -S = "${WORKDIR}/xforms-${PV}" - -DEPENDS = "libxpm jpeg libx11 mesa" -RDEPENDS:${PN} = "bash" - -EXTRA_OECONF = "--with-extra-inc=${S}/lib" diff --git a/meta-oe/recipes-graphics/libforms/libforms_1.2.4.bb b/meta-oe/recipes-graphics/libforms/libforms_1.2.4.bb new file mode 100644 index 000000000..01db3c4d3 --- /dev/null +++ b/meta-oe/recipes-graphics/libforms/libforms_1.2.4.bb @@ -0,0 +1,26 @@ +DESCRIPTION = "The XForms graphical interface widget library " +HOMEPAGE = "http://savannah.nongnu.org/projects/xforms/" + +LICENSE = "LGPL-2.1-or-later" +LIC_FILES_CHKSUM = "file://COPYING.LIB;md5=ade9a053df81f5b9408d2f4f5546df86" + +SRC_URI = "http://download.savannah.nongnu.org/releases/xforms/xforms-${PV}.tar.gz \ + file://fix-link-to-xforms-man.patch \ + file://add-absolute-path-for-include-dir.patch \ + file://fix-path-fdesign_LDADD.patch \ + file://0001-Make-extern-declarations-in-header-file.patch \ + file://0001-Modify-include-dir.patch \ + " + +SRC_URI[sha256sum] = "78cc6b07071bbeaa1f906e0a22d5e9980e48f8913577bc082d661afe5cb75696" + +inherit autotools features_check + +REQUIRED_DISTRO_FEATURES = "opengl x11" + +S = "${WORKDIR}/xforms-${PV}" + +DEPENDS = "libxpm jpeg libx11 mesa" +RDEPENDS:${PN} = "bash" + +EXTRA_OECONF = "--with-extra-inc=${S}/lib" -- cgit v1.2.3-54-g00ecf