[gentoo-commits] repo/gentoo:master commit in: xfce-base/xfce4-settings/files/, xfce-base/xfce4-settings/
commit: 2cf40973f0ef65529cb9b7843b11ce726b453515 Author: Michał Górny gentoo org> AuthorDate: Fri Sep 18 09:44:21 2020 + Commit: Michał Górny gentoo org> CommitDate: Fri Sep 18 09:45:47 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2cf40973 xfce-base/xfce4-settings: Remove old Signed-off-by: Michał Górny gentoo.org> xfce-base/xfce4-settings/Manifest | 1 - .../xfce4-settings-4.15.1-install-icons.patch | 70 -- .../xfce4-settings/xfce4-settings-4.15.1-r1.ebuild | 65 3 files changed, 136 deletions(-) diff --git a/xfce-base/xfce4-settings/Manifest b/xfce-base/xfce4-settings/Manifest index 50a6329884b..669d3d5e635 100644 --- a/xfce-base/xfce4-settings/Manifest +++ b/xfce-base/xfce4-settings/Manifest @@ -1,3 +1,2 @@ DIST xfce4-settings-4.14.3.tar.bz2 1201308 BLAKE2B daf20e5adda24f3c1ecc88506c1a1cd03b33b379bafc236ed3b99404b816803288041de7d507072a311c3966bb0e040986e358ea94d01636c56ea31c1b843c8d SHA512 fcc5bfa98d8903dc3ac51ec909e542485a44f6c11ddca815508c2ed913410a0becd54b2db6761ee48f5a20d6ca08377eeefbb54bd0cb7cde0a0c0d4b65802ab5 -DIST xfce4-settings-4.15.1.tar.bz2 1366752 BLAKE2B 1f236d39529b7a403691bbc82e5776d3c36af4e3414aa43b49cafb2ed9a9f9793dcd6d2fde35ab0d1a6764976a13ec337e097e64f39f9d7961763487c6021bad SHA512 5749db022e70b7bda3a8de1a09d339a69bd55ef6151e5b0f03f3cdc11ecd285cafd44be36299731d0d535cc396f2ec5afca6255291cfc02e0388977ac5ef19b6 DIST xfce4-settings-4.15.2.tar.bz2 1415214 BLAKE2B 508a2eaa8c73ab643ed42a768af3f2c5c97ac367a5dd5919f401424e21de6f9bea8a747d9920c396a313f3734ea1bd60d562a35bdd275b32314cc9658a2a4bda SHA512 f286be970d2351d1b47d7ff1ddf862093e8b88cd2d29aa088f81d48c30f120e03c0712526c562fb6fb3cc33939a7098c5d4de8938c1f825b87560544bad7606c diff --git a/xfce-base/xfce4-settings/files/xfce4-settings-4.15.1-install-icons.patch b/xfce-base/xfce4-settings/files/xfce4-settings-4.15.1-install-icons.patch deleted file mode 100644 index 2d84b8e7637..000 --- a/xfce-base/xfce4-settings/files/xfce4-settings-4.15.1-install-icons.patch +++ /dev/null @@ -1,70 +0,0 @@ -# Upstream issue: https://gitlab.xfce.org/xfce/xfce4-settings/-/issues/176 -# This issue has been fixed in upstream master, so this patch won't be need in the future. - ./Makefile.am 2020-05-27 02:54:17.0 +0200 -+++ ./Makefile.am 2020-05-30 23:53:57.647209221 +0200 -@@ -6,15 +6,11 @@ - xfce4-settings-manager \ - xfce4-settings-editor \ - xfsettingsd \ -- po -- --if HAVE_COLORD --SUBDIRS += \ -+ po \ - icons - - distuninstallcheck_listfiles = \ - find . -type f -print | grep -v ./share/icons/hicolor/icon-theme.cache --endif - - EXTRA_DIST = \ - intltool-extract.in \ ./Makefile.in 2020-05-27 03:07:44.0 +0200 -+++ ./Makefile.in 2020-05-30 23:54:08.477620446 +0200 -@@ -87,10 +87,6 @@ - POST_UNINSTALL = : - build_triplet = @build@ - host_triplet = @host@ --@HAVE_COLORD_TRUE@am__append_1 = \ --@HAVE_COLORD_TRUE@icons -- --distuninstallcheck_listfiles = find . -type f -print - subdir = . - ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 - am__aclocal_m4_deps = $(top_srcdir)/configure.ac -@@ -160,8 +156,7 @@ - ETAGS = etags - CTAGS = ctags - CSCOPE = cscope --DIST_SUBDIRS = common dialogs xfce4-settings-manager \ -- xfce4-settings-editor xfsettingsd po icons -+DIST_SUBDIRS = $(SUBDIRS) - am__DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/config.h.in AUTHORS \ - COPYING ChangeLog INSTALL NEWS README TODO compile \ - config.guess config.sub install-sh ltmain.sh missing -@@ -463,10 +457,17 @@ - top_builddir = @top_builddir@ - top_srcdir = @top_srcdir@ - ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS} --SUBDIRS = common dialogs xfce4-settings-manager xfce4-settings-editor \ -- xfsettingsd po $(am__append_1) --@HAVE_COLORD_TRUE@distuninstallcheck_listfiles = \ --@HAVE_COLORD_TRUE@find . -type f -print | grep -v ./share/icons/hicolor/icon-theme.cache -+SUBDIRS = \ -+ common \ -+ dialogs \ -+ xfce4-settings-manager \ -+ xfce4-settings-editor \ -+ xfsettingsd \ -+ po \ -+ icons -+ -+distuninstallcheck_listfiles = \ -+ find . -type f -print | grep -v ./share/icons/hicolor/icon-theme.cache - - EXTRA_DIST = \ - intltool-extract.in \ - dist-tarZ: distdir - @echo WARNING: "Support for distribution archives compressed with" \ - "legacy program 'compress' is deprecated." >&2 diff --git a/xfce-base/xfce4-settings/xfce4-settings-4.15.1-r1.ebuild b/xfce-base/xfce4-settings/xfce4-settings-4.15.1-r1.ebuild deleted file mode 100644 index 396625415b5..000 --- a/xfce-base/xfce4-settings/xfce4-settings-4.15.1-r1.ebuild +++ /dev/null @@ -1,65 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -inherit xdg-utils -
[gentoo-commits] repo/gentoo:master commit in: xfce-base/xfce4-settings/files/, xfce-base/xfce4-settings/
commit: b75291a9e68d6f173dfa5a59aee38dc12191900f Author: Jan Ziak <0xe2.0x9a.0x9b gmail com> AuthorDate: Sat Jun 6 22:57:45 2020 + Commit: Michał Górny gentoo org> CommitDate: Sun Jun 7 06:55:52 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b75291a9 xfce-base/xfce4-settings: fix missing icons in xfce4-settings-manager The added patch file is specific to version 4.15.1. The issue has been fixed in upstream master, so the patch file won't be needed in version 4.15.2/4.16. Upstream bug: https://gitlab.xfce.org/xfce/xfce4-settings/-/issues/176 Signed-off-by: Jan Ziak <0xe2.0x9a.0x9b gmail.com> Closes: https://github.com/gentoo/gentoo/pull/16101 Signed-off-by: Michał Górny gentoo.org> .../xfce4-settings-4.15.1-install-icons.patch | 70 ++ ...15.1.ebuild => xfce4-settings-4.15.1-r1.ebuild} | 4 ++ 2 files changed, 74 insertions(+) diff --git a/xfce-base/xfce4-settings/files/xfce4-settings-4.15.1-install-icons.patch b/xfce-base/xfce4-settings/files/xfce4-settings-4.15.1-install-icons.patch new file mode 100644 index 000..2d84b8e7637 --- /dev/null +++ b/xfce-base/xfce4-settings/files/xfce4-settings-4.15.1-install-icons.patch @@ -0,0 +1,70 @@ +# Upstream issue: https://gitlab.xfce.org/xfce/xfce4-settings/-/issues/176 +# This issue has been fixed in upstream master, so this patch won't be need in the future. + +--- ./Makefile.am 2020-05-27 02:54:17.0 +0200 ./Makefile.am 2020-05-30 23:53:57.647209221 +0200 +@@ -6,15 +6,11 @@ + xfce4-settings-manager \ + xfce4-settings-editor \ + xfsettingsd \ +- po +- +-if HAVE_COLORD +-SUBDIRS += \ ++ po \ + icons + + distuninstallcheck_listfiles = \ + find . -type f -print | grep -v ./share/icons/hicolor/icon-theme.cache +-endif + + EXTRA_DIST = \ + intltool-extract.in \ +--- ./Makefile.in 2020-05-27 03:07:44.0 +0200 ./Makefile.in 2020-05-30 23:54:08.477620446 +0200 +@@ -87,10 +87,6 @@ + POST_UNINSTALL = : + build_triplet = @build@ + host_triplet = @host@ +-@HAVE_COLORD_TRUE@am__append_1 = \ +-@HAVE_COLORD_TRUE@icons +- +-distuninstallcheck_listfiles = find . -type f -print + subdir = . + ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 + am__aclocal_m4_deps = $(top_srcdir)/configure.ac +@@ -160,8 +156,7 @@ + ETAGS = etags + CTAGS = ctags + CSCOPE = cscope +-DIST_SUBDIRS = common dialogs xfce4-settings-manager \ +- xfce4-settings-editor xfsettingsd po icons ++DIST_SUBDIRS = $(SUBDIRS) + am__DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/config.h.in AUTHORS \ + COPYING ChangeLog INSTALL NEWS README TODO compile \ + config.guess config.sub install-sh ltmain.sh missing +@@ -463,10 +457,17 @@ + top_builddir = @top_builddir@ + top_srcdir = @top_srcdir@ + ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS} +-SUBDIRS = common dialogs xfce4-settings-manager xfce4-settings-editor \ +- xfsettingsd po $(am__append_1) +-@HAVE_COLORD_TRUE@distuninstallcheck_listfiles = \ +-@HAVE_COLORD_TRUE@find . -type f -print | grep -v ./share/icons/hicolor/icon-theme.cache ++SUBDIRS = \ ++ common \ ++ dialogs \ ++ xfce4-settings-manager \ ++ xfce4-settings-editor \ ++ xfsettingsd \ ++ po \ ++ icons ++ ++distuninstallcheck_listfiles = \ ++ find . -type f -print | grep -v ./share/icons/hicolor/icon-theme.cache + + EXTRA_DIST = \ + intltool-extract.in \ + dist-tarZ: distdir + @echo WARNING: "Support for distribution archives compressed with" \ + "legacy program 'compress' is deprecated." >&2 diff --git a/xfce-base/xfce4-settings/xfce4-settings-4.15.1.ebuild b/xfce-base/xfce4-settings/xfce4-settings-4.15.1-r1.ebuild similarity index 96% rename from xfce-base/xfce4-settings/xfce4-settings-4.15.1.ebuild rename to xfce-base/xfce4-settings/xfce4-settings-4.15.1-r1.ebuild index 36bdf55c705..396625415b5 100644 --- a/xfce-base/xfce4-settings/xfce4-settings-4.15.1.ebuild +++ b/xfce-base/xfce4-settings/xfce4-settings-4.15.1-r1.ebuild @@ -40,6 +40,10 @@ DEPEND="${RDEPEND} sys-devel/gettext x11-base/xorg-proto" +PATCHES=( + "${FILESDIR}"/${P}-install-icons.patch +) + src_configure() { local myconf=( $(use_enable upower upower-glib)
[gentoo-commits] repo/gentoo:master commit in: xfce-base/xfce4-settings/files/, xfce-base/xfce4-settings/
commit: 096e2a949ecadd5a4fdf3731249431c57414fbcb Author: Jason Zaman gentoo org> AuthorDate: Sun Sep 13 11:53:59 2015 + Commit: Jason Zaman gentoo org> CommitDate: Sun Sep 13 11:54:29 2015 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=096e2a94 xfce-base/xfce4-settings: fix HDMI power cycling bug Thanks to Micke Eriksson for testing Gentoo-Bug: https://bugs.gentoo.org/553896 Package-Manager: portage-2.2.20.1 .../xfce4-settings-4.12.0-HDMI-power-cycling.patch | 15 ++ .../xfce4-settings/xfce4-settings-4.12.0-r1.ebuild | 55 ++ 2 files changed, 70 insertions(+) diff --git a/xfce-base/xfce4-settings/files/xfce4-settings-4.12.0-HDMI-power-cycling.patch b/xfce-base/xfce4-settings/files/xfce4-settings-4.12.0-HDMI-power-cycling.patch new file mode 100644 index 000..895dd58 --- /dev/null +++ b/xfce-base/xfce4-settings/files/xfce4-settings-4.12.0-HDMI-power-cycling.patch @@ -0,0 +1,15 @@ +From https://bugzilla.xfce.org/show_bug.cgi?id=11107#c3 + +diff --git a/xfsettingsd/displays.c b/xfsettingsd/displays.c +index 3497804..449500b 100644 +--- a/xfsettingsd/displays.c b/xfsettingsd/displays.c +@@ -368,7 +368,7 @@ xfce_displays_helper_reload (XfceDisplaysHelper *helper) + xfsettings_dbg (XFSD_DEBUG_DISPLAYS, "Refreshing RandR cache."); + + /* Free the caches */ +-g_ptr_array_unref (helper->outputs); ++g_ptr_array_free (helper->outputs, TRUE); + g_ptr_array_unref (helper->crtcs); + + gdk_error_trap_push (); diff --git a/xfce-base/xfce4-settings/xfce4-settings-4.12.0-r1.ebuild b/xfce-base/xfce4-settings/xfce4-settings-4.12.0-r1.ebuild new file mode 100644 index 000..562a627 --- /dev/null +++ b/xfce-base/xfce4-settings/xfce4-settings-4.12.0-r1.ebuild @@ -0,0 +1,55 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 +inherit xfconf + +DESCRIPTION="Configuration system for the Xfce desktop environment" +HOMEPAGE="http://www.xfce.org/projects/; +SRC_URI="mirror://xfce/src/xfce/${PN}/${PV%.*}/${P}.tar.bz2" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux" +IUSE="debug libcanberra libinput libnotify upower +xklavier" + +RDEPEND=">=dev-libs/dbus-glib-0.100 + >=dev-libs/glib-2.24 + media-libs/fontconfig + >=x11-libs/gtk+-2.20:2 + x11-libs/libX11 + >=x11-libs/libXcursor-1.1 + >=x11-libs/libXi-1.3 + >=x11-libs/libXrandr-1.2 + >=xfce-base/garcon-0.2 + >=xfce-base/exo-0.8 + >=xfce-base/libxfce4ui-4.11 + >=xfce-base/libxfce4util-4.11 + >=xfce-base/xfconf-4.10 + libcanberra? ( >=media-libs/libcanberra-0.25[sound] ) + libinput? ( x11-drivers/xf86-input-libinput ) + libnotify? ( >=x11-libs/libnotify-0.7 ) + upower? ( || ( >=sys-power/upower-0.9.23 sys-power/upower-pm-utils ) ) + xklavier? ( >=x11-libs/libxklavier-5 )" +DEPEND="${RDEPEND} + dev-util/intltool + virtual/pkgconfig + sys-devel/gettext + >=x11-proto/inputproto-1.4 + x11-proto/xproto" + +pkg_setup() { + XFCONF=( + $(use_enable upower upower-glib) + $(use_enable libinput xorg-libinput) + $(use_enable libnotify) + $(use_enable xklavier libxklavier) + $(use_enable libcanberra sound-settings) + $(xfconf_use_debug) + ) + + DOCS=( AUTHORS ChangeLog NEWS TODO ) + + PATCHES=( "${FILESDIR}/${P}-HDMI-power-cycling.patch" ) +}