[gentoo-commits] repo/gentoo:master commit in: xfce-base/exo/, xfce-base/exo/files/
commit: 833ca5702969a66822d9a7a129722e7d19365779
Author: David Michael gmail com>
AuthorDate: Fri Jan 8 00:10:54 2021 +
Commit: Michał Górny gentoo org>
CommitDate: Tue Jan 12 18:33:34 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=833ca570
xfce-base/exo: support cross-compiling
An execution test in the configure script would fail when cross-
compiling, so patch it to support a cache variable that is enabled
by default. This requires installing the xfce-dev-tools package
for autoconf macro definitions.
Package-Manager: Portage-3.0.12, Repoman-3.0.2
Signed-off-by: David Michael gmail.com>
Signed-off-by: Michał Górny gentoo.org>
xfce-base/exo/exo-4.16.0.ebuild | 14 +-
xfce-base/exo/files/exo-4.16.0-allow-cross.patch | 59
2 files changed, 71 insertions(+), 2 deletions(-)
diff --git a/xfce-base/exo/exo-4.16.0.ebuild b/xfce-base/exo/exo-4.16.0.ebuild
index f67b9786796..96c225ee8e5 100644
--- a/xfce-base/exo/exo-4.16.0.ebuild
+++ b/xfce-base/exo/exo-4.16.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
-inherit xdg-utils
+inherit autotools xdg-utils
DESCRIPTION="Extensions, widgets and framework library with session support
for Xfce"
HOMEPAGE="https://www.xfce.org/projects/;
@@ -21,9 +21,19 @@ DEPEND="${RDEPEND}"
BDEPEND="
dev-util/gtk-doc-am
dev-util/intltool
+ dev-util/xfce4-dev-tools
sys-devel/gettext
virtual/pkgconfig"
+PATCHES=(
+ "${FILESDIR}/${PN}-4.16.0-allow-cross.patch"
+)
+
+src_prepare() {
+ default
+ eautoreconf
+}
+
src_install() {
default
find "${D}" -name '*.la' -delete || die
diff --git a/xfce-base/exo/files/exo-4.16.0-allow-cross.patch
b/xfce-base/exo/files/exo-4.16.0-allow-cross.patch
new file mode 100644
index 000..098a0b23d64
--- /dev/null
+++ b/xfce-base/exo/files/exo-4.16.0-allow-cross.patch
@@ -0,0 +1,59 @@
+From c3e6d0a34d9b2be550994c39c264e3f96a2cc43a Mon Sep 17 00:00:00 2001
+From: David Michael
+Date: Fri, 8 Jan 2021 18:35:16 -0500
+Subject: [PATCH] configure.ac: Allow cross-compiling
+
+AC_TRY_RUN fails by default when cross-compiling if it does not
+have the fourth parameter. This implements a new cache variable
+ac_cv_have_strftime_extension for that test which allows overriding
+the result to specify the target system behavior. It defaults to
+supporting the extension when cross-compiling.
+
+Signed-off-by: David Michael
+---
+ configure.ac.in | 22 --
+ 1 file changed, 16 insertions(+), 6 deletions(-)
+
+diff --git a/configure.ac.in b/configure.ac.in
+index b98fce6e..0483c8fa 100644
+--- a/configure.ac
b/configure.ac
+@@ -133,10 +133,16 @@
+ dnl
+ AC_FUNC_MMAP()
+
+-dnl ***
+-dnl *** Check for strftime() extensions ***
+-dnl ***
+-AC_TRY_RUN([
++dnl
***
++dnl *** Check for strftime() extensions
***
++dnl ***
***
++dnl *** AC_TRY_RUN must be able to build and execute programs natively on
***
++dnl *** the build system, so it fails when cross-compiling unless given an
***
++dnl *** action in the fourth parameter. This sets its results in a cache
***
++dnl *** variable that users can override to specify target system behavior.
***
++dnl
***
++AC_CACHE_CHECK([for strftime %E and %O modifiers],
++ [ac_cv_have_strftime_extension], [AC_TRY_RUN([
+ #include
+ #include
+ int
+@@ -149,9 +155,13 @@
+ return 0;
+ return 1;
+ }
+-], [
++],
++[ac_cv_have_strftime_extension=yes],
++[ac_cv_have_strftime_extension=no],
++[ac_cv_have_strftime_extension=cross])])
++if test x"$ac_cv_have_strftime_extension" != x"no"; then
+ AC_DEFINE([HAVE_STRFTIME_EXTENSION], 1, [Define if strftime supports %E and
%O modifiers.])
+-])
++fi
+
+ dnl **
+ dnl *** Check for i18n support ***
+--
+GitLab
[gentoo-commits] repo/gentoo:master commit in: xfce-base/exo/, xfce-base/exo/files/
commit: 62bf811e3a63501fc48e45534e5c1c54ff150c96
Author: Michał Górny gentoo org>
AuthorDate: Fri Sep 18 09:40:16 2020 +
Commit: Michał Górny gentoo org>
CommitDate: Fri Sep 18 09:45:36 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=62bf811e
xfce-base/exo: Remove old
Signed-off-by: Michał Górny gentoo.org>
xfce-base/exo/Manifest | 1 -
xfce-base/exo/exo-4.15.1.ebuild| 43
xfce-base/exo/files/exo-4.15.1-parallel-make.patch | 219 -
3 files changed, 263 deletions(-)
diff --git a/xfce-base/exo/Manifest b/xfce-base/exo/Manifest
index 8955709d541..38593801750 100644
--- a/xfce-base/exo/Manifest
+++ b/xfce-base/exo/Manifest
@@ -1,3 +1,2 @@
DIST exo-0.12.11.tar.bz2 1333227 BLAKE2B
4e95809c58b6db26ecdf524663c06df9cd70007726091e381a1f0dd58be52efee85ad9721c421c0df6438073bb9de97d56cd039f520e2f7c0f5722a1839ba167
SHA512
ecbf20feddf86178d34a5c70212f0c2310ab1d6ce25291846d6d1d3045270ae3e68102065d7b3d8840137406f826f9bc37fed92a16c1268c3d14f2833a97d533
-DIST exo-4.15.1.tar.bz2 1049760 BLAKE2B
365a51a6be44b36290d1bbe7100bc4e9a164436b2111997c969bdcc2f46306c0532fa41bedc231c5640992910e44acc8d072f5c070fc8d56f02b561002985224
SHA512
46b60bfde133969a25e72a5a80644454b06543888e554e8473145486d1b1952c4e508f2303045f183c49b053969189f50316ce7d18a0be2c404daa691e26d276
DIST exo-4.15.2.tar.bz2 1010181 BLAKE2B
02b6cee68de61b1580e1676f7206f8f48f8c7c1a17050bf44e0ff922675ebd1a0eeceae2adc9f004e7e73a7e878af21867d7ca61c2fde9f10b2f80e917d1a318
SHA512
9b5838d2a69876164e5a89bd474428ace39bfb8f651bbe6c0873b52359893e40e156c862fb8a9f9ac3138ff2fa153e10085326e41045a41771e8961d3c0823f3
diff --git a/xfce-base/exo/exo-4.15.1.ebuild b/xfce-base/exo/exo-4.15.1.ebuild
deleted file mode 100644
index 1f9eb2e523e..000
--- a/xfce-base/exo/exo-4.15.1.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit xdg-utils
-
-DESCRIPTION="Extensions, widgets and framework library with session support
for Xfce"
-HOMEPAGE="https://www.xfce.org/projects/;
-SRC_URI="https://archive.xfce.org/src/xfce/${PN}/${PV%.*}/${P}.tar.bz2;
-
-LICENSE="GPL-2+ LGPL-2.1+"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86
~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
-
-RDEPEND=">=dev-lang/perl-5.6
- >=dev-libs/glib-2.42
- dev-perl/URI
- >=x11-libs/gtk+-3.22:3
- >=xfce-base/libxfce4ui-4.12:=[gtk3(+)]
- >=xfce-base/libxfce4util-4.12:="
-DEPEND="${RDEPEND}
- dev-util/gtk-doc-am
- dev-util/intltool
- sys-devel/gettext
- virtual/pkgconfig"
-
-PATCHES=(
- "${FILESDIR}"/exo-4.15.1-parallel-make.patch
-)
-
-src_install() {
- default
- find "${D}" -name '*.la' -delete || die
-}
-
-pkg_postinst() {
- xdg_icon_cache_update
-}
-
-pkg_postrm() {
- xdg_icon_cache_update
-}
diff --git a/xfce-base/exo/files/exo-4.15.1-parallel-make.patch
b/xfce-base/exo/files/exo-4.15.1-parallel-make.patch
deleted file mode 100644
index 34bc669655c..000
--- a/xfce-base/exo/files/exo-4.15.1-parallel-make.patch
+++ /dev/null
@@ -1,219 +0,0 @@
-From d3f3232eb53a052711029d2fafc36e23da971b35 Mon Sep 17 00:00:00 2001
-From: Romain Bouvier
-Date: Fri, 29 May 2020 11:11:41 +0200
-Subject: [PATCH] exo-29: Fix race condition in make install
-
-- Since the exo drop of gtk2, HEADERS are declared twice, which can lead
- to race conditions when using parallel make "make -j4 install"
-- Simplify Makefile to only have one HEADERS section
-- This fix #29
- exo/Makefile.am | 24
- 1 file changed, 4 insertions(+), 20 deletions(-)
-
-diff --git a/exo/Makefile.am b/exo/Makefile.am
-index fc8845d4..358ae9cb 100644
a/exo/Makefile.am
-+++ b/exo/Makefile.am
-@@ -23,30 +23,14 @@ libexo_headers =
\
- exo-tree-view.h \
- exo-utils.h
-
--libexo_built_public_sources = \
-- exo-enum-types.h
--
--libexo_built_sources =
\
-- $(libexo_built_public_sources) \
-+libexo_2_built_sources =
\
-+ exo-enum-types.h \
- exo-alias.h \
- exo-aliasdef.c \
- exo-enum-types.c\
- exo-marshal.c \
- exo-marshal.h
-
--libexoincludedir = $(includedir)/exo-2/exo
--
--libexoinclude_HEADERS =
\
-- $(libexo_built_public_sources) \
--
[gentoo-commits] repo/gentoo:master commit in: xfce-base/exo/, xfce-base/exo/files/
commit: 7d4ec2ab360118d4ec587688342a7038d3a5a315
Author: Jason Zaman gentoo org>
AuthorDate: Wed Aug 17 10:41:47 2016 +
Commit: Jason Zaman gentoo org>
CommitDate: Wed Aug 17 10:50:52 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7d4ec2ab
xfce-base/exo: bump and drop old
Package-Manager: portage-2.2.28
xfce-base/exo/Manifest | 2 +-
.../{exo-0.11.0-r1.ebuild => exo-0.11.1.ebuild}| 2 --
xfce-base/exo/files/exo-0.11.0-env.patch | 26 --
3 files changed, 1 insertion(+), 29 deletions(-)
diff --git a/xfce-base/exo/Manifest b/xfce-base/exo/Manifest
index b1cfef1..dc84a7b 100644
--- a/xfce-base/exo/Manifest
+++ b/xfce-base/exo/Manifest
@@ -1,3 +1,3 @@
DIST exo-0.10.6.tar.bz2 1276178 SHA256
1cc0e5a432e050a5e5aa64d126b988f4440da4f27474aaf42a4d8e13651d0752 SHA512
be537145ea0f0ea87566908f3ed4850ee3b20caf292d27dd752a9eaba7047598b585b398c2a6e4c925d832b5b2f76e0b9cc763ee3c955f08d47c6ac8bf3a2805
WHIRLPOOL
8daa7a8021faea4b87a5204d2a6604fde732efd183aa3d7404b6b0b52444edbceab28ac636a254f145c705689baa3996a4ccd39256edd4a3ae148b7b40dc9034
DIST exo-0.10.7.tar.bz2 1262301 SHA256
521581481128af93e815f9690020998181f947ac9e9c2b232b1f144d76b1b35c SHA512
5a872e6895595da027f403fb7951922c40481d53242cb4d9c3da2d36690c61dce2fdb34ba0eb39367558a5e3055733af25432d1f3a8f60984b7e2ed997408b60
WHIRLPOOL
4c8a71b70e67f0db0bfaa752b0b1f01a80a83cbe84d754b44b3d45811743cf4276abe5d9cde40cef13f87f6013666255ccc5a1cc64afe129a55fe813b4dbcb1e
-DIST exo-0.11.0.tar.bz2 1231778 SHA256
bd168a4dd4eb1ee8ef960d7adb36b64162b1c4611d7ab71dec1b2281a4bf655b SHA512
de97cb8d06393a2de826e252b141c6119001d9daa5fc0f1b9c50bdc21b10028f2b1ee89e47dbab0e23e333ff276f32e0e1008f9489785e7724809e45d2a2adbd
WHIRLPOOL
c5adac9765d9de08043afa2346125004edea948c65d5b44aaaca3f3c30095c8c3b74cd978b41476a8c25bf7fce8a4ae1781312b6dd4c42d31bb326dc1b3c0ae4
+DIST exo-0.11.1.tar.bz2 1231288 SHA256
c70c47f690284a5cb4f507dd89088efbdd8123506f924e33a5f97aab74eb97d4 SHA512
626640c135f316ceb9e9cdff7c1ae4f537737ac71a2e0b242dd723e35cc7a3119ba198c894d22f373b58c49c4b1640eaf64658a27c3341a6efbb0c52807c67cf
WHIRLPOOL
ae0c0b3f8993fdf463bc0936a9565e12cb11e815c6202ad2234fecb63498fbf3e5a7b8a848516bb38bba2a78453e2bda4e10c8ba9ecc8032fb8f94ae81908c64
diff --git a/xfce-base/exo/exo-0.11.0-r1.ebuild
b/xfce-base/exo/exo-0.11.1.ebuild
similarity index 96%
rename from xfce-base/exo/exo-0.11.0-r1.ebuild
rename to xfce-base/exo/exo-0.11.1.ebuild
index 824d3e9..194f783 100644
--- a/xfce-base/exo/exo-0.11.0-r1.ebuild
+++ b/xfce-base/exo/exo-0.11.1.ebuild
@@ -27,8 +27,6 @@ DEPEND="${RDEPEND}
sys-devel/gettext
virtual/pkgconfig"
-PATCHES=( ${FILESDIR}/${P}-env.patch )
-
pkg_setup() {
XFCONF=(
--docdir="${EPREFIX}"/usr/share/doc/${PF}
diff --git a/xfce-base/exo/files/exo-0.11.0-env.patch
b/xfce-base/exo/files/exo-0.11.0-env.patch
deleted file mode 100644
index 67ad54f..000
--- a/xfce-base/exo/files/exo-0.11.0-env.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-diff --git a/exo-helper/exo-helper.c b/exo-helper/exo-helper.c
-index ce5ef9e..7b4b9c2 100644
a/exo-helper/exo-helper.c
-+++ b/exo-helper/exo-helper.c
-@@ -406,7 +406,7 @@ exo_helper_execute (ExoHelper *helper,
- envp = g_environ_setenv (envp, "DISPLAY", display, TRUE);
-
- /* try to run the command */
-- succeed = g_spawn_async (NULL, argv, envp, G_SPAWN_DO_NOT_REAP_CHILD |
G_SPAWN_SEARCH_PATH, NULL, NULL, , );
-+ succeed = g_spawn_async (NULL, argv, NULL, G_SPAWN_DO_NOT_REAP_CHILD |
G_SPAWN_SEARCH_PATH, NULL, NULL, , );
-
- /* cleanup */
- g_strfreev (argv);
-diff --git a/exo/exo-execute.c b/exo/exo-execute.c
-index 1fabf57..f6016cf 100644
a/exo/exo-execute.c
-+++ b/exo/exo-execute.c
-@@ -150,7 +150,7 @@ exo_execute_preferred_application_on_screen (const gchar
*category,
- envp = g_environ_setenv (envp, "DISPLAY", display, TRUE);
-
- /* launch the command */
-- success = g_spawn_async (working_directory, argv, envp, 0, NULL, NULL,
NULL, error);
-+ success = g_spawn_async (working_directory, argv, NULL, 0, NULL, NULL,
NULL, error);
-
- g_free (display);
- g_strfreev (envp);
