diff options
Diffstat (limited to 'meta-oe/recipes-graphics/libforms')
-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/files/add-absolute-path-for-include-dir.patch | 2 | ||||
-rw-r--r-- | meta-oe/recipes-graphics/libforms/files/fix-link-to-xforms-man.patch | 2 | ||||
-rw-r--r-- | meta-oe/recipes-graphics/libforms/files/fix-path-fdesign_LDADD.patch | 2 | ||||
-rw-r--r-- | meta-oe/recipes-graphics/libforms/libforms_1.2.5pre1.bb (renamed from meta-oe/recipes-graphics/libforms/libforms_1.2.3.bb) | 12 |
6 files changed, 48 insertions, 20 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 Signed-off-by: Khem Raj <raj.khem@gmail.com> --- 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 0000000000..0b7c063804 --- /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 <wangmy@fujitsu.com> +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 <wangmy@fujitsu.com> +--- + 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/files/add-absolute-path-for-include-dir.patch b/meta-oe/recipes-graphics/libforms/files/add-absolute-path-for-include-dir.patch index db400f7022..4836b46b11 100644 --- a/meta-oe/recipes-graphics/libforms/files/add-absolute-path-for-include-dir.patch +++ b/meta-oe/recipes-graphics/libforms/files/add-absolute-path-for-include-dir.patch @@ -1,3 +1,5 @@ +Upstream-Status: Pending + diff -Naur xforms-1.2.3.orig/fdesign/Makefile.am xforms-1.2.3/fdesign/Makefile.am --- xforms-1.2.3.orig/fdesign/Makefile.am 2019-02-24 12:58:51.968645873 +0000 +++ xforms-1.2.3/fdesign/Makefile.am 2019-02-24 13:00:48.500635163 +0000 diff --git a/meta-oe/recipes-graphics/libforms/files/fix-link-to-xforms-man.patch b/meta-oe/recipes-graphics/libforms/files/fix-link-to-xforms-man.patch index c95bd18da8..9ab67b35ac 100644 --- a/meta-oe/recipes-graphics/libforms/files/fix-link-to-xforms-man.patch +++ b/meta-oe/recipes-graphics/libforms/files/fix-link-to-xforms-man.patch @@ -1,3 +1,5 @@ +Upstream-Status: Pending + diff -Naur xforms-1.2.3.orig/lib/Makefile.am xforms-1.2.3/lib/Makefile.am --- xforms-1.2.3.orig/lib/Makefile.am 2019-02-24 12:53:58.340678373 +0000 +++ xforms-1.2.3/lib/Makefile.am 2019-02-24 12:54:33.096674102 +0000 diff --git a/meta-oe/recipes-graphics/libforms/files/fix-path-fdesign_LDADD.patch b/meta-oe/recipes-graphics/libforms/files/fix-path-fdesign_LDADD.patch index 73956dee9f..dc494281b2 100644 --- a/meta-oe/recipes-graphics/libforms/files/fix-path-fdesign_LDADD.patch +++ b/meta-oe/recipes-graphics/libforms/files/fix-path-fdesign_LDADD.patch @@ -1,3 +1,5 @@ +Upstream-Status: Pending + diff -Naur xforms-1.2.3.orig/fdesign/Makefile.am xforms-1.2.3/fdesign/Makefile.am --- xforms-1.2.3.orig/fdesign/Makefile.am 2019-02-24 13:08:48.412603250 +0000 +++ xforms-1.2.3/fdesign/Makefile.am 2019-02-24 13:09:18.412601874 +0000 diff --git a/meta-oe/recipes-graphics/libforms/libforms_1.2.3.bb b/meta-oe/recipes-graphics/libforms/libforms_1.2.5pre1.bb index 838c1d5173..db648ec8c2 100644 --- a/meta-oe/recipes-graphics/libforms/libforms_1.2.3.bb +++ b/meta-oe/recipes-graphics/libforms/libforms_1.2.5pre1.bb @@ -1,6 +1,5 @@ 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" @@ -10,10 +9,10 @@ SRC_URI = "http://download.savannah.nongnu.org/releases/xforms/xforms-${PV}.tar. 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[md5sum] = "235720a758a8b8d9e6e452dc67190e9b" -SRC_URI[sha256sum] = "7989b39598c769820ad451ad91e5cb0de29946940c8240aac94ca8238c2def61" +SRC_URI[sha256sum] = "92b5e6466ea2dffca7332aec12734e65b3e961825eb3100b7d889c0d1abb4697" inherit autotools features_check @@ -21,7 +20,12 @@ REQUIRED_DISTRO_FEATURES = "opengl x11" S = "${WORKDIR}/xforms-${PV}" -DEPENDS = "libxpm jpeg libx11 mesa" +DEPENDS = "libxpm jpeg libx11 virtual/libgl" RDEPENDS:${PN} = "bash" EXTRA_OECONF = "--with-extra-inc=${S}/lib" + +do_compile:append() { + sed -i -e 's|${B}|.|' ${B}/fd2ps/fd2ps + sed -i -e 's|${B}|.|' ${B}/fdesign/fdesign +} |