mirror of
https://github.com/openembedded/meta-openembedded.git
synced 2025-12-14 14:25:53 +01:00
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>
This commit is contained in:
Kai Kang
Khem Raj
parent
7bc1509b54
commit
c1eb32e34f
|
|
@ -1,57 +0,0 @@
|
|||
From 13a74582ffd7f81dbd66a7296fc76007718e9d4d Mon Sep 17 00:00:00 2001
|
||||
From: Andreas Mueller <schnitzeltony@gmx.de>
|
||||
Date: Mon, 1 Aug 2011 17:16:29 +0200
|
||||
|
||||
Upstream-Status: Inappropriate [embedded specific]
|
||||
|
||||
Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
|
||||
|
||||
---
|
||||
configure.ac | 34 ++++++++++++++++++----------------
|
||||
1 file changed, 18 insertions(+), 16 deletions(-)
|
||||
|
||||
diff --git a/configure.ac b/configure.ac
|
||||
index 0de5ceb..3f92d1b 100644
|
||||
--- a/configure.ac
|
||||
+++ b/configure.ac
|
||||
@@ -143,22 +143,24 @@ AC_FUNC_MMAP()
|
||||
dnl ***************************************
|
||||
dnl *** Check for strftime() extensions ***
|
||||
dnl ***************************************
|
||||
-AC_TRY_RUN([
|
||||
- #include <string.h>
|
||||
- #include <time.h>
|
||||
- int
|
||||
- main (int argc, char **argv)
|
||||
- {
|
||||
- struct tm tm;
|
||||
- char buffer[16];
|
||||
- tm.tm_year = 81;
|
||||
- if (strftime (buffer, 16, "%EY", &tm) == 4 && strcmp (buffer, "1981") == 0)
|
||||
- return 0;
|
||||
- return 1;
|
||||
- }
|
||||
-], [
|
||||
- AC_DEFINE([HAVE_STRFTIME_EXTENSION], 1, [Define if strftime supports %E and %O modifiers.])
|
||||
-])
|
||||
+dnl grrrr... this doesn't work for cross compiling, define it for OE
|
||||
+AC_DEFINE([HAVE_STRFTIME_EXTENSION], 1, [Define if strftime supports %E and %O modifiers.])
|
||||
+dnl AC_TRY_RUN([
|
||||
+dnl #include <string.h>
|
||||
+dnl #include <time.h>
|
||||
+dnl int
|
||||
+dnl main (int argc, char **argv)
|
||||
+dnl {
|
||||
+dnl struct tm tm;
|
||||
+dnl char buffer[16];
|
||||
+dnl tm.tm_year = 81;
|
||||
+dnl if (strftime (buffer, 16, "%EY", &tm) == 4 && strcmp (buffer, "1981") == 0)
|
||||
+dnl return 0;
|
||||
+dnl return 1;
|
||||
+dnl }
|
||||
+dnl ], [
|
||||
+dnl AC_DEFINE([HAVE_STRFTIME_EXTENSION], 1, [Define if strftime supports %E and %O modifiers.])
|
||||
+dnl ])
|
||||
|
||||
dnl ******************************
|
||||
dnl *** Check for i18n support ***
|
||||
|
|
@ -10,17 +10,20 @@ Upstream-Status: Inappropriate [embedded specific]
|
|||
|
||||
Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
|
||||
|
||||
Rebase for xfce4 4.18.0.
|
||||
|
||||
Signed-off-by: Kai Kang <kai.kang@windriver.com>
|
||||
---
|
||||
Makefile.am | 3 +--
|
||||
1 file changed, 1 insertion(+), 2 deletions(-)
|
||||
|
||||
diff --git a/Makefile.am b/Makefile.am
|
||||
index 226e79d..62ad18d 100644
|
||||
index 513ac36..c395272 100644
|
||||
--- a/Makefile.am
|
||||
+++ b/Makefile.am
|
||||
@@ -9,8 +9,7 @@ SUBDIRS = \
|
||||
@@ -6,8 +6,7 @@ SUBDIRS = \
|
||||
exo-open \
|
||||
docs \
|
||||
icons \
|
||||
pixmaps \
|
||||
- po \
|
||||
- tests
|
||||
|
|
|
|||
|
|
@ -1,90 +0,0 @@
|
|||
From e710d8d4a3e3480416826c70d56ea3d2598a77e4 Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com>
|
||||
Date: Sat, 4 May 2019 14:50:11 +0200
|
||||
Subject: [PATCH] reduce build to exo-csource only
|
||||
MIME-Version: 1.0
|
||||
Content-Type: text/plain; charset=UTF-8
|
||||
Content-Transfer-Encoding: 8bit
|
||||
|
||||
exo-csource creates c-header files from glade resource output files. When
|
||||
building xfce-packages from git instead of tarball this exo-csource-native is
|
||||
required.
|
||||
|
||||
Upstream-Status: Inappropriate [embedded specific]
|
||||
|
||||
Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
|
||||
|
||||
---
|
||||
Makefile.am | 10 +---------
|
||||
configure.ac | 20 --------------------
|
||||
2 files changed, 1 insertion(+), 29 deletions(-)
|
||||
|
||||
diff --git a/Makefile.am b/Makefile.am
|
||||
index 62ad18d..8934f1f 100644
|
||||
--- a/Makefile.am
|
||||
+++ b/Makefile.am
|
||||
@@ -1,15 +1,7 @@
|
||||
ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS}
|
||||
|
||||
SUBDIRS = \
|
||||
- exo \
|
||||
- exo-csource \
|
||||
- exo-desktop-item-edit \
|
||||
- exo-helper \
|
||||
- exo-open \
|
||||
- docs \
|
||||
- icons \
|
||||
- pixmaps \
|
||||
- po
|
||||
+ exo-csource
|
||||
|
||||
distclean-local:
|
||||
rm -rf *.cache *~
|
||||
diff --git a/configure.ac b/configure.ac
|
||||
index 4e4eb5e..237184c 100644
|
||||
--- a/configure.ac
|
||||
+++ b/configure.ac
|
||||
@@ -120,15 +120,6 @@ AC_PROG_CC()
|
||||
AM_PROG_CC_C_O()
|
||||
AC_PROG_INSTALL()
|
||||
IT_PROG_INTLTOOL([intltool_minimum_version], [no-xml])
|
||||
-AC_CHECK_PROGS([PERL], [perl5 perl])
|
||||
-
|
||||
-dnl ***************************************
|
||||
-dnl *** Check for required Perl modules ***
|
||||
-dnl ***************************************
|
||||
-AC_PROG_PERL_MODULES([URI::Escape URI::file URI::URL], [],
|
||||
-[
|
||||
- AC_MSG_ERROR([Atleast one of the required Perl modules (URI::Escape, URI::file and URI::URL) was not found on your system])
|
||||
-])
|
||||
|
||||
dnl ***************************************
|
||||
dnl *** Check for standard header files ***
|
||||
@@ -175,12 +166,6 @@ dnl ***********************************
|
||||
dnl *** Check for required packages ***
|
||||
dnl ***********************************
|
||||
XDT_CHECK_PACKAGE([GLIB], [glib-2.0], [2.42.0])
|
||||
-XDT_CHECK_PACKAGE([GIO], [gio-2.0], [2.42.0])
|
||||
-XDT_CHECK_PACKAGE([GTK3], [gtk+-3.0], [3.22.0])
|
||||
-XDT_CHECK_PACKAGE([GTHREAD], [gthread-2.0], [2.42.0])
|
||||
-XDT_CHECK_PACKAGE([LIBXFCE4UTIL], [libxfce4util-1.0], [4.12.0])
|
||||
-XDT_CHECK_PACKAGE([LIBXFCE4UI2], [libxfce4ui-2], [4.12.0])
|
||||
-XDT_CHECK_OPTIONAL_PACKAGE([GIO_UNIX], [gio-unix-2.0], [2.42.0], [gio-unix], [GIO-Unix features])
|
||||
|
||||
dnl ***********************************************************
|
||||
dnl *** Optional support for a GTK+2 version of the library ***
|
||||
@@ -190,11 +175,6 @@ XDT_CHECK_OPTIONAL_PACKAGE([GTK2],
|
||||
[GTK+ 2 support])
|
||||
AM_CONDITIONAL([ENABLE_GTK2_LIBRARY], [test "x$GTK2_FOUND" = "xyes"])
|
||||
|
||||
-dnl *********************
|
||||
-dnl *** Check for X11 ***
|
||||
-dnl *********************
|
||||
-XDT_CHECK_LIBX11_REQUIRE()
|
||||
-
|
||||
dnl *************************
|
||||
dnl *** Check for gtk-doc ***
|
||||
dnl *************************
|
||||
--
|
||||
2.20.1
|
||||
|
||||
|
|
@ -1,6 +1,6 @@
|
|||
DESCRIPTION = "Application library for the Xfce desktop environment"
|
||||
SECTION = "x11"
|
||||
LICENSE = "GPL-2.0-only"
|
||||
LICENSE = "GPL-2.0-or-later"
|
||||
LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263"
|
||||
DEPENDS = "gtk+3 libxfce4ui liburi-perl-native cairo"
|
||||
|
||||
|
|
@ -13,10 +13,9 @@ ANY_OF_DISTRO_FEATURES = "${GTK3DISTROFEATURES}"
|
|||
# SRC_URI must follow inherited one
|
||||
SRC_URI += " \
|
||||
file://exo-no-tests-0.8.patch \
|
||||
file://configure.patch \
|
||||
"
|
||||
|
||||
SRC_URI[sha256sum] = "82a50c67e78f1e5c420b7615515bcca759b86eeab99224ab8eca4306b89d2eca"
|
||||
SRC_URI[sha256sum] = "4f2c61d045a888cdb64297fd0ae20cc23da9b97ffb82562ed12806ed21da7d55"
|
||||
|
||||
# Note: python bindings did not work in oe-dev and are about to be moved to
|
||||
# pyxfce see http://comments.gmane.org/gmane.comp.desktop.xfce.devel.version4/19560
|
||||
Loading…
Reference in New Issue
Block a user