[gentoo-commits] repo/gentoo:master commit in: xfce-base/exo/files/, xfce-base/exo/
commit: e8557011716fbe2fba8539d68dc1623041f6b14f Author: Michał Górny gentoo org> AuthorDate: Fri Mar 17 10:42:31 2023 + Commit: Michał Górny gentoo org> CommitDate: Fri Mar 17 10:50:06 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e8557011 xfce-base/exo: Remove old Signed-off-by: Michał Górny 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.. --- 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.. --- 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.. --- a/xfce-base/exo/files/exo-4.16.0-allow-cross.patch +++ /dev/null @@ -1,59 +0,0 @@ -From c3e6d0a34d9b2be550994c39c264e3f96a2cc43a Mon Sep 17 00:
[gentoo-commits] repo/gentoo:master commit in: xfce-base/exo/files/
commit: 0a067e98971fa1155d1d1f56b98e040b7f449f2a Author: Michał Górny gentoo org> AuthorDate: Mon Jun 22 15:35:20 2020 + Commit: Michał Górny gentoo org> CommitDate: Mon Jun 22 15:35:39 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0a067e98 xfce-base/exo: Patch Makefile.in too Closes: https://bugs.gentoo.org/725882 Signed-off-by: Michał Górny gentoo.org> xfce-base/exo/files/exo-4.15.1-parallel-make.patch | 153 + 1 file changed, 153 insertions(+) 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 index f18159442fe..34bc669655c 100644 --- a/xfce-base/exo/files/exo-4.15.1-parallel-make.patch +++ b/xfce-base/exo/files/exo-4.15.1-parallel-make.patch @@ -64,3 +64,156 @@ index fc8845d4..358ae9cb 100644 -- 2.26.2 +diff --git a/exo/Makefile.in b/exo/Makefile.in +index 56abe35..ee1be62 100644 +--- a/exo/Makefile.in b/exo/Makefile.in +@@ -98,7 +98,7 @@ am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \ + am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) + DIST_COMMON = $(srcdir)/Makefile.am $(libexo_2_include_HEADERS) \ +- $(libexoinclude_HEADERS) $(am__DIST_COMMON) ++ $(am__DIST_COMMON) + mkinstalldirs = $(install_sh) -d + CONFIG_HEADER = $(top_builddir)/config.h + CONFIG_CLEAN_FILES = exo-2.pc exo-config.h +@@ -131,8 +131,7 @@ am__uninstall_files_from_dir = { \ + $(am__cd) "$$dir" && rm -f $$files; }; \ + } + am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(pkgconfigdir)" \ +- "$(DESTDIR)$(libexo_2_includedir)" \ +- "$(DESTDIR)$(libexoincludedir)" ++ "$(DESTDIR)$(libexo_2_includedir)" + LTLIBRARIES = $(lib_LTLIBRARIES) + am__DEPENDENCIES_1 = + libexo_2_la_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ +@@ -224,7 +223,7 @@ am__can_run_installinfo = \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac + DATA = $(pkgconfig_DATA) +-HEADERS = $(libexo_2_include_HEADERS) $(libexoinclude_HEADERS) ++HEADERS = $(libexo_2_include_HEADERS) + am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) + # Read a list of newline-separated strings from the standard input, + # and print each of them once, without duplicates. Input order is +@@ -657,24 +656,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 +- + libexo_2_includedir = $(includedir)/exo-2/exo + lib_LTLIBRARIES = libexo-2.la + libexo_2_include_HEADERS = \ +@@ -756,10 +745,10 @@ pkgconfig_DATA = exo-2.pc + @MAINTAINER_MODE_TRUE@DISTCLEANFILES = \ + @MAINTAINER_MODE_TRUE@stamp-exo-enum-types.h \ + @MAINTAINER_MODE_TRUE@stamp-exo-marshal.h \ +-@MAINTAINER_MODE_TRUE@$(libexo_built_sources) ++@MAINTAINER_MODE_TRUE@$(libexo_2_built_sources) + + @MAINTAINER_MODE_TRUE@BUILT_SOURCES = \ +-@MAINTAINER_MODE_TRUE@$(libexo_built_sources) ++@MAINTAINER_MODE_TRUE@$(libexo_2_built_sources) + + EXTRA_DIST = \ + abicheck.sh \ +@@ -1091,27 +1080,6 @@ uninstall-libexo_2_includeHEADERS: + @list='$(libexo_2_include_HEADERS)'; test -n "$(libexo_2_includedir)" || list=; \ + files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ + dir='$(DESTDIR)$(libexo_2_includedir)'; $(am__uninstall_files_from_dir) +-install-libexoincludeHEADERS: $(libexoinclude_HEADERS) +- @$(NORMAL_INSTALL) +- @list='$(libexoinclude_HEADERS)'; test -n "$(libexoincludedir)" || list=; \ +- if test -n "$$list"; then \ +-echo " $(MKDIR_P) '$(DESTDIR)$(libexoincludedir)'"; \ +-$(MKDIR_P) "$(DESTDIR)$(libexoincludedir)" || exit 1; \ +- fi; \ +- for p in $$list; do \ +-if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ +-echo "$$d$$p"; \ +- done | $(am__base_list) | \ +- while read files; do \ +-echo " $(INSTALL_HEADER) $$files '$(DESTDIR)$(libexoincludedir
[gentoo-commits] repo/gentoo:master commit in: xfce-base/exo/files/, xfce-base/exo/
commit: 358fa544c31daa667725a389bced6d6c8a536fe1 Author: Michał Górny gentoo org> AuthorDate: Wed Jun 3 10:11:24 2020 + Commit: Michał Górny gentoo org> CommitDate: Wed Jun 3 10:23:59 2020 + 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 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 000..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 +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 +
[gentoo-commits] repo/gentoo:master commit in: xfce-base/exo/files/, xfce-base/exo/
commit: 2886d997e951be795ef11f37e837254a0273732a Author: Jason Zaman gentoo org> AuthorDate: Mon Aug 15 15:22:01 2016 + Commit: Jason Zaman gentoo org> CommitDate: Mon Aug 15 15:23:16 2016 + 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 000..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 000..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);