public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] repo/gentoo:master commit in: xfce-base/exo/files/, xfce-base/exo/
@ 2016-08-15 16:24 Jason Zaman
  0 siblings, 0 replies; 3+ messages in thread
From: Jason Zaman @ 2016-08-15 16:24 UTC (permalink / raw
  To: gentoo-commits

commit:     2886d997e951be795ef11f37e837254a0273732a
Author:     Jason Zaman <perfinion <AT> gentoo <DOT> org>
AuthorDate: Mon Aug 15 15:22:01 2016 +0000
Commit:     Jason Zaman <perfinion <AT> gentoo <DOT> org>
CommitDate: Mon Aug 15 15:23:16 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2886d997

xfce-base/exo: Add patch to preserve environment

Package-Manager: portage-2.2.28

 xfce-base/exo/exo-0.11.0-r1.ebuild       | 45 ++++++++++++++++++++++++++++++++
 xfce-base/exo/files/exo-0.11.0-env.patch | 26 ++++++++++++++++++
 2 files changed, 71 insertions(+)

diff --git a/xfce-base/exo/exo-0.11.0-r1.ebuild b/xfce-base/exo/exo-0.11.0-r1.ebuild
new file mode 100644
index 0000000..824d3e9
--- /dev/null
+++ b/xfce-base/exo/exo-0.11.0-r1.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit xfconf
+
+DESCRIPTION="Extensions, widgets and framework library with session support for Xfce"
+HOMEPAGE="http://www.xfce.org/projects/"
+SRC_URI="mirror://xfce/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-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
+IUSE="debug"
+
+RDEPEND=">=dev-lang/perl-5.6
+	>=dev-libs/glib-2.30:=
+	dev-perl/URI
+	>=x11-libs/gtk+-2.24:2=
+	>=x11-libs/gtk+-3.6.0:3=
+	>=xfce-base/libxfce4ui-4.12:=[gtk3(+)]
+	>=xfce-base/libxfce4util-4.10:="
+DEPEND="${RDEPEND}
+	dev-util/gtk-doc-am
+	dev-util/intltool
+	sys-devel/gettext
+	virtual/pkgconfig"
+
+PATCHES=( ${FILESDIR}/${P}-env.patch )
+
+pkg_setup() {
+	XFCONF=(
+		--docdir="${EPREFIX}"/usr/share/doc/${PF}
+		$(xfconf_use_debug)
+		# both required for GTK+3 support
+		# (non-GTK+3 variant fails to build, as predicted)
+		--enable-gtk3
+		--enable-libxfce4ui2
+		)
+
+	[[ ${CHOST} == *-darwin* ]] && XFCONF+=( --disable-visibility ) #366857
+
+	DOCS=( AUTHORS ChangeLog HACKING NEWS README THANKS TODO )
+}

diff --git a/xfce-base/exo/files/exo-0.11.0-env.patch b/xfce-base/exo/files/exo-0.11.0-env.patch
new file mode 100644
index 0000000..67ad54f
--- /dev/null
+++ b/xfce-base/exo/files/exo-0.11.0-env.patch
@@ -0,0 +1,26 @@
+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, &pid, &err);
++      succeed = g_spawn_async (NULL, argv, NULL, G_SPAWN_DO_NOT_REAP_CHILD | G_SPAWN_SEARCH_PATH, NULL, NULL, &pid, &err);
+ 
+       /* 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);


^ permalink raw reply related	[flat|nested] 3+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: xfce-base/exo/files/, xfce-base/exo/
@ 2020-06-03 10:24 Michał Górny
  0 siblings, 0 replies; 3+ messages in thread
From: Michał Górny @ 2020-06-03 10:24 UTC (permalink / raw
  To: gentoo-commits

commit:     358fa544c31daa667725a389bced6d6c8a536fe1
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Wed Jun  3 10:11:24 2020 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Wed Jun  3 10:23:59 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=358fa544

xfce-base/exo: Backport parallel make fix

Closes: https://bugs.gentoo.org/725882
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>

 xfce-base/exo/exo-4.15.1.ebuild                    |  4 ++
 xfce-base/exo/files/exo-4.15.1-parallel-make.patch | 66 ++++++++++++++++++++++
 2 files changed, 70 insertions(+)

diff --git a/xfce-base/exo/exo-4.15.1.ebuild b/xfce-base/exo/exo-4.15.1.ebuild
index 5089b190c4c..1f9eb2e523e 100644
--- a/xfce-base/exo/exo-4.15.1.ebuild
+++ b/xfce-base/exo/exo-4.15.1.ebuild
@@ -25,6 +25,10 @@ DEPEND="${RDEPEND}
 	sys-devel/gettext
 	virtual/pkgconfig"
 
+PATCHES=(
+	"${FILESDIR}"/exo-4.15.1-parallel-make.patch
+)
+
 src_install() {
 	default
 	find "${D}" -name '*.la' -delete || die

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
new file mode 100644
index 00000000000..f18159442fe
--- /dev/null
+++ b/xfce-base/exo/files/exo-4.15.1-parallel-make.patch
@@ -0,0 +1,66 @@
+From d3f3232eb53a052711029d2fafc36e23da971b35 Mon Sep 17 00:00:00 2001
+From: Romain Bouvier <skunnyk@alteroot.org>
+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)					\
+-	$(libexo_headers)						\
+-	exo.h								\
+-	exo-config.h
+-
+-
+-##
+-## GTK+ 3 support library
+-##
+-
+ libexo_2_includedir = $(includedir)/exo-2/exo
+ 
+ lib_LTLIBRARIES = libexo-2.la
+@@ -141,10 +125,10 @@ CLEANFILES =								\
+ DISTCLEANFILES =							\
+ 	stamp-exo-enum-types.h						\
+ 	stamp-exo-marshal.h						\
+-	$(libexo_built_sources)
++	$(libexo_2_built_sources)
+ 
+ BUILT_SOURCES =								\
+-	$(libexo_built_sources)
++	$(libexo_2_built_sources)
+ 
+ exo-alias.h: make-exo-alias.pl exo.symbols
+ 	$(AM_V_GEN) $(PERL) $(srcdir)/make-exo-alias.pl < $(srcdir)/exo.symbols > exo-alias.h
+-- 
+2.26.2
+


^ permalink raw reply related	[flat|nested] 3+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: xfce-base/exo/files/, xfce-base/exo/
@ 2023-03-17 10:50 Michał Górny
  0 siblings, 0 replies; 3+ messages in thread
From: Michał Górny @ 2023-03-17 10:50 UTC (permalink / raw
  To: gentoo-commits

commit:     e8557011716fbe2fba8539d68dc1623041f6b14f
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Fri Mar 17 10:42:31 2023 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Fri Mar 17 10:50:06 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e8557011

xfce-base/exo: Remove old

Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>

 xfce-base/exo/Manifest                           |  2 -
 xfce-base/exo/exo-4.16.4.ebuild                  | 55 ----------------------
 xfce-base/exo/exo-4.17.4.ebuild                  | 47 -------------------
 xfce-base/exo/files/exo-4.16.0-allow-cross.patch | 59 ------------------------
 4 files changed, 163 deletions(-)

diff --git a/xfce-base/exo/Manifest b/xfce-base/exo/Manifest
index d2f4dc2f922f..586c0b60b777 100644
--- a/xfce-base/exo/Manifest
+++ b/xfce-base/exo/Manifest
@@ -1,3 +1 @@
-DIST exo-4.16.4.tar.bz2 876080 BLAKE2B a29511c0d2e1bbbd861cfd8946d2f2917eb1004bb85621d0bb8bb9b1339f213a14da651e16a6492138cceff8e3e0ec1d1132226ac60a9846426bf6dc2a621ded SHA512 2cf2267a0bd8526dc870cbe48a0d95573c153a990caffabb13365c6e90c155b6d3383ad1282715cb22ce413e704d170bf7fec1af09ad1b0609507a46c4d1233d
-DIST exo-4.17.4.tar.bz2 895388 BLAKE2B a48f2c7f1509a41d74b924c428fd57b4801b9e45dfa86a2b300ed5b296f5b4bda489e0e71e10a3dd9720b2164ac0debd3ec86a081413f2157637fed80fa819a7 SHA512 b4d7308931b286ae9ab296970a1de924a5da515032b50a594b564c60b1d7d50c06896615f8b3dc986bd1e44feeddc656fa3788bb745e93162231257fffc90c0c
 DIST exo-4.18.0.tar.bz2 896849 BLAKE2B 99cd22b9f2c806907449afdd640abd85be2ec37269d0436a20300ac88ee4fbe39807e39ba51ae8fe82d621c478d65d1f452209779e7d48caee899305b40f3a27 SHA512 32f3a319ff31a37cdaf8e2e7bdbdbaa9b797d6731a27854838b47d6078f45af83ed1a664aef4663f616fd9abcae9233c6f68ab2cc18599f1b2ced487602c51ce

diff --git a/xfce-base/exo/exo-4.16.4.ebuild b/xfce-base/exo/exo-4.16.4.ebuild
deleted file mode 100644
index dc41a78a4f84..000000000000
--- a/xfce-base/exo/exo-4.16.4.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools 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 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
-
-RDEPEND="
-	>=dev-libs/glib-2.50
-	>=x11-libs/gtk+-3.22:3
-	>=xfce-base/libxfce4ui-4.15.1:=[gtk3(+)]
-	>=xfce-base/libxfce4util-4.12:=
-"
-DEPEND="
-	${RDEPEND}
-"
-BDEPEND="
-	dev-util/gtk-doc-am
-	dev-util/intltool
-	>=dev-util/xfce4-dev-tools-4.16.0
-	sys-devel/gettext
-	virtual/pkgconfig
-"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-4.16.0-allow-cross.patch"
-)
-
-src_prepare() {
-	default
-	eautoreconf
-	# needs to be executed after glib-gettextize, bug 829859
-	intltoolize --automake --copy --force || die "intltoolize failed"
-}
-
-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/exo-4.17.4.ebuild b/xfce-base/exo/exo-4.17.4.ebuild
deleted file mode 100644
index 510712a94c77..000000000000
--- a/xfce-base/exo/exo-4.17.4.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit xdg-utils
-
-DESCRIPTION="Extensions, widgets and framework library with session support for Xfce"
-HOMEPAGE="
-	https://docs.xfce.org/xfce/exo/start
-	https://gitlab.xfce.org/xfce/exo/
-"
-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 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
-
-RDEPEND="
-	>=dev-libs/glib-2.66
-	>=x11-libs/gtk+-3.22:3
-	>=xfce-base/libxfce4ui-4.15.1:=[gtk3(+)]
-	>=xfce-base/libxfce4util-4.17.2:=
-"
-DEPEND="
-	${RDEPEND}
-"
-BDEPEND="
-	dev-util/gtk-doc-am
-	dev-util/intltool
-	>=dev-util/xfce4-dev-tools-4.16.0
-	sys-devel/gettext
-	virtual/pkgconfig
-"
-
-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.16.0-allow-cross.patch b/xfce-base/exo/files/exo-4.16.0-allow-cross.patch
deleted file mode 100644
index 098a0b23d645..000000000000
--- a/xfce-base/exo/files/exo-4.16.0-allow-cross.patch
+++ /dev/null
@@ -1,59 +0,0 @@
-From c3e6d0a34d9b2be550994c39c264e3f96a2cc43a Mon Sep 17 00:00:00 2001
-From: David Michael <fedora.dm0@gmail.com>
-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 <fedora.dm0@gmail.com>
----
- 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 <string.h>
-   #include <time.h>
-   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


^ permalink raw reply related	[flat|nested] 3+ messages in thread

end of thread, other threads:[~2023-03-17 10:50 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2020-06-03 10:24 [gentoo-commits] repo/gentoo:master commit in: xfce-base/exo/files/, xfce-base/exo/ Michał Górny
  -- strict thread matches above, loose matches on Subject: below --
2023-03-17 10:50 Michał Górny
2016-08-15 16:24 Jason Zaman

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox