diff options
author | Andreas Müller <schnitzeltony@googlemail.com> | 2017-08-08 23:38:13 +0200 |
---|---|---|
committer | Martin Jansa <Martin.Jansa@gmail.com> | 2017-08-13 13:21:00 +0200 |
commit | 2681ad6688bd40121426231484b82b2a3041fc10 (patch) | |
tree | 16cacd151eb4611ba4bb0110b96b2451cb4a4875 /meta-xfce/recipes-xfce | |
parent | 66809684b7b8868c43dfe223501fe9ce91d42101 (diff) | |
download | meta-openembedded-2681ad6688bd40121426231484b82b2a3041fc10.tar.gz |
exo: update 0.11.2 -> 0.11.5
Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'meta-xfce/recipes-xfce')
-rw-r--r-- | meta-xfce/recipes-xfce/exo/exo/reduce-build-to-exo-csource-only.patch | 40 | ||||
-rw-r--r-- | meta-xfce/recipes-xfce/exo/exo_0.11.5.bb (renamed from meta-xfce/recipes-xfce/exo/exo_0.11.2.bb) | 4 |
2 files changed, 17 insertions, 27 deletions
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 index 8073fcaa4..99318d5aa 100644 --- 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 | |||
@@ -15,11 +15,11 @@ Upstream-Status: Inappropriate [configuration] | |||
15 | Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com> | 15 | Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com> |
16 | --- | 16 | --- |
17 | Makefile.am | 10 +--------- | 17 | Makefile.am | 10 +--------- |
18 | configure.ac | 26 -------------------------- | 18 | configure.ac | 22 ---------------------- |
19 | 2 files changed, 1 insertion(+), 35 deletions(-) | 19 | 2 files changed, 1 insertion(+), 31 deletions(-) |
20 | 20 | ||
21 | diff --git a/Makefile.am b/Makefile.am | 21 | diff --git a/Makefile.am b/Makefile.am |
22 | index 9979b36..05d594e 100644 | 22 | index 62ad18d..bdc5fae 100644 |
23 | --- a/Makefile.am | 23 | --- a/Makefile.am |
24 | +++ b/Makefile.am | 24 | +++ b/Makefile.am |
25 | @@ -1,15 +1,7 @@ | 25 | @@ -1,15 +1,7 @@ |
@@ -40,7 +40,7 @@ index 9979b36..05d594e 100644 | |||
40 | distclean-local: | 40 | distclean-local: |
41 | rm -rf *.cache *~ | 41 | rm -rf *.cache *~ |
42 | diff --git a/configure.ac b/configure.ac | 42 | diff --git a/configure.ac b/configure.ac |
43 | index b66c92b..5243132 100644 | 43 | index ba5395d..2605067 100644 |
44 | --- a/configure.ac | 44 | --- a/configure.ac |
45 | +++ b/configure.ac | 45 | +++ b/configure.ac |
46 | @@ -116,15 +116,6 @@ AC_PROG_CC() | 46 | @@ -116,15 +116,6 @@ AC_PROG_CC() |
@@ -59,36 +59,26 @@ index b66c92b..5243132 100644 | |||
59 | 59 | ||
60 | dnl *************************************** | 60 | dnl *************************************** |
61 | dnl *** Check for standard header files *** | 61 | dnl *** Check for standard header files *** |
62 | @@ -171,29 +162,12 @@ dnl *********************************** | 62 | @@ -171,19 +162,6 @@ dnl *********************************** |
63 | dnl *** Check for required packages *** | 63 | dnl *** Check for required packages *** |
64 | dnl *********************************** | 64 | dnl *********************************** |
65 | XDT_CHECK_PACKAGE([GLIB], [glib-2.0], [2.30.0]) | 65 | XDT_CHECK_PACKAGE([GLIB], [glib-2.0], [2.42.0]) |
66 | -XDT_CHECK_PACKAGE([GIO], [gio-2.0], [2.30.0]) | 66 | -XDT_CHECK_PACKAGE([GIO], [gio-2.0], [2.42.0]) |
67 | -XDT_CHECK_PACKAGE([GTK], [gtk+-2.0], [2.24.0]) | 67 | -XDT_CHECK_PACKAGE([GTK], [gtk+-2.0], [2.24.0]) |
68 | -XDT_CHECK_PACKAGE([GTHREAD], [gthread-2.0], [2.30.0]) | 68 | -XDT_CHECK_PACKAGE([GTK3], [gtk+-3.0], [3.20.0]) |
69 | -XDT_CHECK_PACKAGE([GTHREAD], [gthread-2.0], [2.42.0]) | ||
69 | -XDT_CHECK_PACKAGE([LIBXFCE4UTIL], [libxfce4util-1.0], [4.10.0]) | 70 | -XDT_CHECK_PACKAGE([LIBXFCE4UTIL], [libxfce4util-1.0], [4.10.0]) |
70 | -XDT_CHECK_PACKAGE([LIBXFCE4UI], [libxfce4ui-1], [4.10.0]) | 71 | -XDT_CHECK_PACKAGE([LIBXFCE4UI], [libxfce4ui-1], [4.12.0]) |
71 | -XDT_CHECK_OPTIONAL_PACKAGE([GIO_UNIX], [gio-unix-2.0], [2.30.0], [gio-unix], [GIO-Unix features]) | 72 | -XDT_CHECK_PACKAGE([LIBXFCE4UI2], [libxfce4ui-2], [4.12.0]) |
72 | 73 | -XDT_CHECK_OPTIONAL_PACKAGE([GIO_UNIX], [gio-unix-2.0], [2.42.0], [gio-unix], [GIO-Unix features]) | |
73 | dnl *********************************************************** | 74 | - |
74 | dnl *** Optional support for a GTK+3 version of the library *** | ||
75 | dnl *********************************************************** | ||
76 | -XDT_CHECK_OPTIONAL_PACKAGE([GTK3], | ||
77 | - [gtk+-3.0], [3.6.0], [gtk3], | ||
78 | - [GTK+ 3 support]) | ||
79 | -XDT_CHECK_OPTIONAL_PACKAGE([LIBXFCE4UI2], | ||
80 | - [libxfce4ui-2], [4.12.0], [libxfce4ui2], | ||
81 | - [GTK+ 3 support: libxfce4ui-2]) | ||
82 | AM_CONDITIONAL([ENABLE_GTK3_LIBRARY], [test "x$GTK3_FOUND" = "xyes" && test "x$LIBXFCE4UI2_FOUND" = "xyes" ]) | ||
83 | |||
84 | -dnl ********************* | 75 | -dnl ********************* |
85 | -dnl *** Check for X11 *** | 76 | -dnl *** Check for X11 *** |
86 | -dnl ********************* | 77 | -dnl ********************* |
87 | -XDT_CHECK_LIBX11_REQUIRE() | 78 | -XDT_CHECK_LIBX11_REQUIRE() |
88 | - | 79 | |
89 | dnl ************************* | 80 | dnl ************************* |
90 | dnl *** Check for gtk-doc *** | 81 | dnl *** Check for gtk-doc *** |
91 | dnl ************************* | ||
92 | -- | 82 | -- |
93 | 2.5.5 | 83 | 2.9.4 |
94 | 84 | ||
diff --git a/meta-xfce/recipes-xfce/exo/exo_0.11.2.bb b/meta-xfce/recipes-xfce/exo/exo_0.11.5.bb index cb29c34a4..d5508c0a5 100644 --- a/meta-xfce/recipes-xfce/exo/exo_0.11.2.bb +++ b/meta-xfce/recipes-xfce/exo/exo_0.11.5.bb | |||
@@ -20,8 +20,8 @@ SRC_URI_append_class-native = " \ | |||
20 | file://reduce-build-to-exo-csource-only.patch \ | 20 | file://reduce-build-to-exo-csource-only.patch \ |
21 | " | 21 | " |
22 | 22 | ||
23 | SRC_URI[md5sum] = "0b036c8042a2ed5d3767d1177a4213a2" | 23 | SRC_URI[md5sum] = "2e560edfa8ddf77e21c4787a6f600171" |
24 | SRC_URI[sha256sum] = "76bd1c4229503ff3c301485de3a41c55dec93e98de1a9eef1be77fe502ca4f77" | 24 | SRC_URI[sha256sum] = "8e8629f33783eba1ce6d092a42c28217458a0cc3d1ad7474097b9187054955c1" |
25 | 25 | ||
26 | PACKAGES =+ "exo-csource" | 26 | PACKAGES =+ "exo-csource" |
27 | 27 | ||