summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKai Kang <kai.kang@windriver.com>2022-12-25 05:33:35 +0800
committerKhem Raj <raj.khem@gmail.com>2022-12-27 16:03:06 -0800
commitc1eb32e34f2f728e9bf50cca5644a385ece9169e (patch)
tree332e815dbb108f5168af16ccdb5555ecc27675a0
parent7bc1509b54df9c2b73988305486176a5189f6908 (diff)
downloadmeta-openembedded-c1eb32e34f2f728e9bf50cca5644a385ece9169e.tar.gz
exo: 4.16.4 -> 4.18.0
Update exo from 4.16.4 to 4.18.0 * update license which should be GPL-2.0-or-later * remove configure.patch that it supports cross compil now * remove obsolete patch reduce-build-to-exo-csource-only.patch Signed-off-by: Kai Kang <kai.kang@windriver.com> Signed-off-by: Khem Raj <raj.khem@gmail.com>
-rw-r--r--meta-xfce/recipes-xfce/exo/exo/configure.patch57
-rw-r--r--meta-xfce/recipes-xfce/exo/exo/exo-no-tests-0.8.patch9
-rw-r--r--meta-xfce/recipes-xfce/exo/exo/reduce-build-to-exo-csource-only.patch90
-rw-r--r--meta-xfce/recipes-xfce/exo/exo_4.18.0.bb (renamed from meta-xfce/recipes-xfce/exo/exo_4.16.4.bb)5
4 files changed, 8 insertions, 153 deletions
diff --git a/meta-xfce/recipes-xfce/exo/exo/configure.patch b/meta-xfce/recipes-xfce/exo/exo/configure.patch
deleted file mode 100644
index 89cc1f3874..0000000000
--- a/meta-xfce/recipes-xfce/exo/exo/configure.patch
+++ /dev/null
@@ -1,57 +0,0 @@
1From 13a74582ffd7f81dbd66a7296fc76007718e9d4d Mon Sep 17 00:00:00 2001
2From: Andreas Mueller <schnitzeltony@gmx.de>
3Date: Mon, 1 Aug 2011 17:16:29 +0200
4
5Upstream-Status: Inappropriate [embedded specific]
6
7Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
8
9---
10 configure.ac | 34 ++++++++++++++++++----------------
11 1 file changed, 18 insertions(+), 16 deletions(-)
12
13diff --git a/configure.ac b/configure.ac
14index 0de5ceb..3f92d1b 100644
15--- a/configure.ac
16+++ b/configure.ac
17@@ -143,22 +143,24 @@ AC_FUNC_MMAP()
18 dnl ***************************************
19 dnl *** Check for strftime() extensions ***
20 dnl ***************************************
21-AC_TRY_RUN([
22- #include <string.h>
23- #include <time.h>
24- int
25- main (int argc, char **argv)
26- {
27- struct tm tm;
28- char buffer[16];
29- tm.tm_year = 81;
30- if (strftime (buffer, 16, "%EY", &tm) == 4 && strcmp (buffer, "1981") == 0)
31- return 0;
32- return 1;
33- }
34-], [
35- AC_DEFINE([HAVE_STRFTIME_EXTENSION], 1, [Define if strftime supports %E and %O modifiers.])
36-])
37+dnl grrrr... this doesn't work for cross compiling, define it for OE
38+AC_DEFINE([HAVE_STRFTIME_EXTENSION], 1, [Define if strftime supports %E and %O modifiers.])
39+dnl AC_TRY_RUN([
40+dnl #include <string.h>
41+dnl #include <time.h>
42+dnl int
43+dnl main (int argc, char **argv)
44+dnl {
45+dnl struct tm tm;
46+dnl char buffer[16];
47+dnl tm.tm_year = 81;
48+dnl if (strftime (buffer, 16, "%EY", &tm) == 4 && strcmp (buffer, "1981") == 0)
49+dnl return 0;
50+dnl return 1;
51+dnl }
52+dnl ], [
53+dnl AC_DEFINE([HAVE_STRFTIME_EXTENSION], 1, [Define if strftime supports %E and %O modifiers.])
54+dnl ])
55
56 dnl ******************************
57 dnl *** Check for i18n support ***
diff --git a/meta-xfce/recipes-xfce/exo/exo/exo-no-tests-0.8.patch b/meta-xfce/recipes-xfce/exo/exo/exo-no-tests-0.8.patch
index 348e147cf9..c5e7a097f0 100644
--- a/meta-xfce/recipes-xfce/exo/exo/exo-no-tests-0.8.patch
+++ b/meta-xfce/recipes-xfce/exo/exo/exo-no-tests-0.8.patch
@@ -10,17 +10,20 @@ Upstream-Status: Inappropriate [embedded specific]
10 10
11Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com> 11Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
12 12
13Rebase for xfce4 4.18.0.
14
15Signed-off-by: Kai Kang <kai.kang@windriver.com>
13--- 16---
14 Makefile.am | 3 +-- 17 Makefile.am | 3 +--
15 1 file changed, 1 insertion(+), 2 deletions(-) 18 1 file changed, 1 insertion(+), 2 deletions(-)
16 19
17diff --git a/Makefile.am b/Makefile.am 20diff --git a/Makefile.am b/Makefile.am
18index 226e79d..62ad18d 100644 21index 513ac36..c395272 100644
19--- a/Makefile.am 22--- a/Makefile.am
20+++ b/Makefile.am 23+++ b/Makefile.am
21@@ -9,8 +9,7 @@ SUBDIRS = \ 24@@ -6,8 +6,7 @@ SUBDIRS = \
25 exo-open \
22 docs \ 26 docs \
23 icons \
24 pixmaps \ 27 pixmaps \
25- po \ 28- po \
26- tests 29- tests
diff --git a/meta-xfce/recipes-xfce/exo/exo/reduce-build-to-exo-csource-only.patch b/meta-xfce/recipes-xfce/exo/exo/reduce-build-to-exo-csource-only.patch
deleted file mode 100644
index 8c950299f7..0000000000
--- a/meta-xfce/recipes-xfce/exo/exo/reduce-build-to-exo-csource-only.patch
+++ /dev/null
@@ -1,90 +0,0 @@
1From e710d8d4a3e3480416826c70d56ea3d2598a77e4 Mon Sep 17 00:00:00 2001
2From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com>
3Date: Sat, 4 May 2019 14:50:11 +0200
4Subject: [PATCH] reduce build to exo-csource only
5MIME-Version: 1.0
6Content-Type: text/plain; charset=UTF-8
7Content-Transfer-Encoding: 8bit
8
9exo-csource creates c-header files from glade resource output files. When
10building xfce-packages from git instead of tarball this exo-csource-native is
11required.
12
13Upstream-Status: Inappropriate [embedded specific]
14
15Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
16
17---
18 Makefile.am | 10 +---------
19 configure.ac | 20 --------------------
20 2 files changed, 1 insertion(+), 29 deletions(-)
21
22diff --git a/Makefile.am b/Makefile.am
23index 62ad18d..8934f1f 100644
24--- a/Makefile.am
25+++ b/Makefile.am
26@@ -1,15 +1,7 @@
27 ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS}
28
29 SUBDIRS = \
30- exo \
31- exo-csource \
32- exo-desktop-item-edit \
33- exo-helper \
34- exo-open \
35- docs \
36- icons \
37- pixmaps \
38- po
39+ exo-csource
40
41 distclean-local:
42 rm -rf *.cache *~
43diff --git a/configure.ac b/configure.ac
44index 4e4eb5e..237184c 100644
45--- a/configure.ac
46+++ b/configure.ac
47@@ -120,15 +120,6 @@ AC_PROG_CC()
48 AM_PROG_CC_C_O()
49 AC_PROG_INSTALL()
50 IT_PROG_INTLTOOL([intltool_minimum_version], [no-xml])
51-AC_CHECK_PROGS([PERL], [perl5 perl])
52-
53-dnl ***************************************
54-dnl *** Check for required Perl modules ***
55-dnl ***************************************
56-AC_PROG_PERL_MODULES([URI::Escape URI::file URI::URL], [],
57-[
58- AC_MSG_ERROR([Atleast one of the required Perl modules (URI::Escape, URI::file and URI::URL) was not found on your system])
59-])
60
61 dnl ***************************************
62 dnl *** Check for standard header files ***
63@@ -175,12 +166,6 @@ dnl ***********************************
64 dnl *** Check for required packages ***
65 dnl ***********************************
66 XDT_CHECK_PACKAGE([GLIB], [glib-2.0], [2.42.0])
67-XDT_CHECK_PACKAGE([GIO], [gio-2.0], [2.42.0])
68-XDT_CHECK_PACKAGE([GTK3], [gtk+-3.0], [3.22.0])
69-XDT_CHECK_PACKAGE([GTHREAD], [gthread-2.0], [2.42.0])
70-XDT_CHECK_PACKAGE([LIBXFCE4UTIL], [libxfce4util-1.0], [4.12.0])
71-XDT_CHECK_PACKAGE([LIBXFCE4UI2], [libxfce4ui-2], [4.12.0])
72-XDT_CHECK_OPTIONAL_PACKAGE([GIO_UNIX], [gio-unix-2.0], [2.42.0], [gio-unix], [GIO-Unix features])
73
74 dnl ***********************************************************
75 dnl *** Optional support for a GTK+2 version of the library ***
76@@ -190,11 +175,6 @@ XDT_CHECK_OPTIONAL_PACKAGE([GTK2],
77 [GTK+ 2 support])
78 AM_CONDITIONAL([ENABLE_GTK2_LIBRARY], [test "x$GTK2_FOUND" = "xyes"])
79
80-dnl *********************
81-dnl *** Check for X11 ***
82-dnl *********************
83-XDT_CHECK_LIBX11_REQUIRE()
84-
85 dnl *************************
86 dnl *** Check for gtk-doc ***
87 dnl *************************
88--
892.20.1
90
diff --git a/meta-xfce/recipes-xfce/exo/exo_4.16.4.bb b/meta-xfce/recipes-xfce/exo/exo_4.18.0.bb
index 01c3bff062..b339b181f1 100644
--- a/meta-xfce/recipes-xfce/exo/exo_4.16.4.bb
+++ b/meta-xfce/recipes-xfce/exo/exo_4.18.0.bb
@@ -1,6 +1,6 @@
1DESCRIPTION = "Application library for the Xfce desktop environment" 1DESCRIPTION = "Application library for the Xfce desktop environment"
2SECTION = "x11" 2SECTION = "x11"
3LICENSE = "GPL-2.0-only" 3LICENSE = "GPL-2.0-or-later"
4LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" 4LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263"
5DEPENDS = "gtk+3 libxfce4ui liburi-perl-native cairo" 5DEPENDS = "gtk+3 libxfce4ui liburi-perl-native cairo"
6 6
@@ -13,10 +13,9 @@ ANY_OF_DISTRO_FEATURES = "${GTK3DISTROFEATURES}"
13# SRC_URI must follow inherited one 13# SRC_URI must follow inherited one
14SRC_URI += " \ 14SRC_URI += " \
15 file://exo-no-tests-0.8.patch \ 15 file://exo-no-tests-0.8.patch \
16 file://configure.patch \
17" 16"
18 17
19SRC_URI[sha256sum] = "82a50c67e78f1e5c420b7615515bcca759b86eeab99224ab8eca4306b89d2eca" 18SRC_URI[sha256sum] = "4f2c61d045a888cdb64297fd0ae20cc23da9b97ffb82562ed12806ed21da7d55"
20 19
21# Note: python bindings did not work in oe-dev and are about to be moved to 20# Note: python bindings did not work in oe-dev and are about to be moved to
22# pyxfce see http://comments.gmane.org/gmane.comp.desktop.xfce.devel.version4/19560 21# pyxfce see http://comments.gmane.org/gmane.comp.desktop.xfce.devel.version4/19560