* [gentoo-commits] repo/gentoo:master commit in: xfce-base/xfce4-settings/, xfce-base/xfce4-settings/files/
@ 2018-06-21 7:24 Michał Górny
0 siblings, 0 replies; 2+ messages in thread
From: Michał Górny @ 2018-06-21 7:24 UTC (permalink / raw
To: gentoo-commits
commit: 119b99e71dac157bea5c066fa853b473dd38a1fb
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Thu Jun 21 07:02:42 2018 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Thu Jun 21 07:24:49 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=119b99e7
xfce-base/xfce4-settings: Drop old
xfce-base/xfce4-settings/Manifest | 3 --
.../xfce4-settings-4.12.0-HDMI-power-cycling.patch | 15 ------
.../xfce4-settings/xfce4-settings-4.12.0-r2.ebuild | 54 ---------------------
.../xfce4-settings/xfce4-settings-4.13.2.ebuild | 55 ---------------------
.../xfce4-settings/xfce4-settings-4.13.3.ebuild | 56 ----------------------
5 files changed, 183 deletions(-)
diff --git a/xfce-base/xfce4-settings/Manifest b/xfce-base/xfce4-settings/Manifest
index 9289da502e6..faa0f8f481e 100644
--- a/xfce-base/xfce4-settings/Manifest
+++ b/xfce-base/xfce4-settings/Manifest
@@ -1,6 +1,3 @@
-DIST xfce4-settings-4.12.0.tar.bz2 973324 BLAKE2B 2c6103ac0d43c89f523e530d2eccc0974b6a67a9206f300aba8630b6ea819ea16774141d92647e7b3682b437555a75a4c0a8e06e4abf593a302010342dfb3a10 SHA512 4a61c16f1f03de98c9968a00b50595e2934aaf28b80613c59403d33a293a7f8ef9ebb6fad98b0eeb97a6590b9100e91f73dd6363133d5d8bd06714f1126d8856
DIST xfce4-settings-4.12.3.tar.bz2 1035504 BLAKE2B db045839ea075d08acbad2bb316a4b577df959312146f8487e667c1de3fe69d129e9c80a21b97834e7f86598d776d7aaf7104f7640429a45a6d02ca3ca6c8bc4 SHA512 46bde0de70d8ebcc869ea5ba4f3eb0f123fb2e6f16e8a837c301e445044d65d90843fe3c8274a53818099112e43ff6217dfffd32bc032560331f5ca5fc5ba3ad
DIST xfce4-settings-4.12.4.tar.bz2 1036773 BLAKE2B 512547a172081d75e7eeb97f499e77320a3df1090e80ef548dbbaf84d454b614ddb6a36bbfe4cd06d18b478ada7bd76f385dde374a93380f848ffcc232b133d3 SHA512 9b74daa3f98f15c8cb696dc79f9913fecb37f2ca44c2fd3f24865ae03e9a1db93cb5a8ddb27da3c4af7d7a9e9d718a22e46188ff515caf925a5cedfaab37b189
-DIST xfce4-settings-4.13.2.tar.bz2 1043277 BLAKE2B acbb2b78ce7002afb1489491f0cd856b42ee7db6441a908e1244aa22a0bd497de4ba11bd31cff33d2c4a5f0a94bec6a63244c7c493d15deac7d8b5016ec8c0a1 SHA512 3564ee50914a6cb1955457c2b7bc5b515815142b04df418c70ed87692bc9aa87365af61682f07a5d979501df0fe32fe229f5be927fe0233855dfd9f454ff9643
-DIST xfce4-settings-4.13.3.tar.bz2 1046817 BLAKE2B b9cf9e3da447e9d9c59a0576cf918503b551e23add6b02f109b0df367f45a89fa96cc0213591edac3344c5bfb3ccf897cdee1b067d52ee6da39c12b7d193109a SHA512 666478c56eacbd0abc6da67ae4d98e89ed5fa0b923d8475edb74bb09619db8516f5db55483ddcbb607b71c0d44cb5031b9415de777ae20ce49947b7232fdff18
DIST xfce4-settings-4.13.4.tar.bz2 1046733 BLAKE2B 8694a72e32568b963d4c754faf578ac3e651ce0be5a4b650a45393822fcb6102de4ea9ce0eb16c387605ddecd763057dcb622ef60ce546aeca2d42d3ea5561d0 SHA512 39e2adaa93e2d86ff51e47f194306e57d025c13b5c07ee76cad7f67994f26fe03677c5a3bac91d1db4a25201371f6d135f36eed110dc15a1fbb46228ee715893
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
deleted file mode 100644
index 895dd58e1b1..00000000000
--- a/xfce-base/xfce4-settings/files/xfce4-settings-4.12.0-HDMI-power-cycling.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-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-r2.ebuild b/xfce-base/xfce4-settings/xfce4-settings-4.12.0-r2.ebuild
deleted file mode 100644
index 4255798bb47..00000000000
--- a/xfce-base/xfce4-settings/xfce4-settings-4.12.0-r2.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit xfconf
-
-DESCRIPTION="Configuration system for the Xfce desktop environment"
-HOMEPAGE="https://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 ~amd64-linux ~x86-linux"
-IUSE="debug input_devices_libinput libcanberra 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] )
- input_devices_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-base/xorg-proto"
-
-pkg_setup() {
- XFCONF=(
- $(use_enable upower upower-glib)
- $(use_enable input_devices_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" )
-}
diff --git a/xfce-base/xfce4-settings/xfce4-settings-4.13.2.ebuild b/xfce-base/xfce4-settings/xfce4-settings-4.13.2.ebuild
deleted file mode 100644
index 7164a73dcb5..00000000000
--- a/xfce-base/xfce4-settings/xfce4-settings-4.13.2.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit gnome2-utils
-
-DESCRIPTION="Configuration system for the Xfce desktop environment"
-HOMEPAGE="https://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 ~amd64-linux ~x86-linux"
-IUSE="input_devices_libinput libcanberra libnotify upower +xklavier"
-
-RDEPEND=">=dev-libs/dbus-glib-0.100
- >=dev-libs/glib-2.24
- media-libs/fontconfig
- x11-libs/gtk+:3
- 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.11
- >=xfce-base/libxfce4ui-4.12
- >=xfce-base/libxfce4util-4.12
- >=xfce-base/xfconf-4.13
- libcanberra? ( >=media-libs/libcanberra-0.25[sound] )
- input_devices_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-base/xorg-proto"
-
-src_configure() {
- econf \
- $(use_enable upower upower-glib) \
- $(use_enable input_devices_libinput xorg-libinput) \
- $(use_enable libnotify) \
- $(use_enable xklavier libxklavier) \
- $(use_enable libcanberra sound-settings)
-}
-
-pkg_postinst() {
- gnome2_icon_cache_update
-}
-
-pkg_postrm() {
- gnome2_icon_cache_update
-}
diff --git a/xfce-base/xfce4-settings/xfce4-settings-4.13.3.ebuild b/xfce-base/xfce4-settings/xfce4-settings-4.13.3.ebuild
deleted file mode 100644
index 0d6ecd2df12..00000000000
--- a/xfce-base/xfce4-settings/xfce4-settings-4.13.3.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit gnome2-utils
-
-DESCRIPTION="Configuration system for the Xfce desktop environment"
-HOMEPAGE="https://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 ~amd64-linux ~x86-linux"
-IUSE="input_devices_libinput libcanberra libnotify upower +xklavier"
-
-RDEPEND="
- >=dev-libs/glib-2.24
- media-libs/fontconfig
- x11-libs/gtk+:3
- 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.11
- >=xfce-base/libxfce4ui-4.12
- >=xfce-base/libxfce4util-4.12
- >=xfce-base/xfconf-4.13
- libcanberra? ( >=media-libs/libcanberra-0.25[sound] )
- input_devices_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/gdbus-codegen
- dev-util/intltool
- virtual/pkgconfig
- sys-devel/gettext
- x11-base/xorg-proto"
-
-src_configure() {
- econf \
- $(use_enable upower upower-glib) \
- $(use_enable input_devices_libinput xorg-libinput) \
- $(use_enable libnotify) \
- $(use_enable xklavier libxklavier) \
- $(use_enable libcanberra sound-settings)
-}
-
-pkg_postinst() {
- gnome2_icon_cache_update
-}
-
-pkg_postrm() {
- gnome2_icon_cache_update
-}
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: xfce-base/xfce4-settings/, xfce-base/xfce4-settings/files/
@ 2024-03-18 14:39 Michał Górny
0 siblings, 0 replies; 2+ messages in thread
From: Michał Górny @ 2024-03-18 14:39 UTC (permalink / raw
To: gentoo-commits
commit: d0936f9eaa4e3c811e8345d11fec3c1245bf1774
Author: orbea <orbea <AT> riseup <DOT> net>
AuthorDate: Sun Mar 17 19:59:32 2024 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Mon Mar 18 14:39:19 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d0936f9e
xfce-base/xfce4-settings: fix undefined references
Closes: https://bugs.gentoo.org/913864
Bug: https://gitlab.xfce.org/xfce/xfce4-settings/-/issues/494
Upstream-Commit: https://gitlab.xfce.org/xfce/xfce4-settings/-/commit/f13b9ff1e5361439eafb9cffafd4d23fa6b2cb9e
Signed-off-by: orbea <orbea <AT> riseup.net>
Closes: https://github.com/gentoo/gentoo/pull/35807
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
.../files/xfce4-settings-4.19.1-gmodule-libs.patch | 35 ++++++++++++++++++++++
.../xfce4-settings/xfce4-settings-4.19.1.ebuild | 15 ++++++++--
2 files changed, 48 insertions(+), 2 deletions(-)
diff --git a/xfce-base/xfce4-settings/files/xfce4-settings-4.19.1-gmodule-libs.patch b/xfce-base/xfce4-settings/files/xfce4-settings-4.19.1-gmodule-libs.patch
new file mode 100644
index 000000000000..8c8f14e25f14
--- /dev/null
+++ b/xfce-base/xfce4-settings/files/xfce4-settings-4.19.1-gmodule-libs.patch
@@ -0,0 +1,35 @@
+https://bugs.gentoo.org/913864
+https://gitlab.xfce.org/xfce/xfce4-settings/-/issues/494
+https://gitlab.xfce.org/xfce/xfce4-settings/-/commit/f13b9ff1e5361439eafb9cffafd4d23fa6b2cb9e
+
+From f13b9ff1e5361439eafb9cffafd4d23fa6b2cb9e Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Ga=C3=ABl=20Bonithon?= <gael@xfce.org>
+Date: Tue, 28 Nov 2023 11:27:59 +0100
+Subject: [PATCH] build: Check for gmodule-2.0 (V2)
+
+Completes: c4a489aebce624301e7ad63ad14a97fbc46c3207
+Related: #494
+---
+ xfsettingsd/Makefile.am | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/xfsettingsd/Makefile.am b/xfsettingsd/Makefile.am
+index 181b5e77..0a81974a 100644
+--- a/xfsettingsd/Makefile.am
++++ b/xfsettingsd/Makefile.am
+@@ -158,6 +158,7 @@ libxfsettingsd_gtk_settings_sync_la_SOURCES = \
+ gtk-settings-module.c
+
+ libxfsettingsd_gtk_settings_sync_la_CFLAGS = \
++ $(GMODULE_CFLAGS) \
+ $(GTK_CFLAGS) \
+ $(XFCONF_CFLAGS)
+
+@@ -169,6 +170,7 @@ libxfsettingsd_gtk_settings_sync_la_LDFLAGS = \
+ $(PLATFORM_LDFLAGS)
+
+ libxfsettingsd_gtk_settings_sync_la_LIBADD = \
++ $(GMODULE_LIBS) \
+ $(GTK_LIBS) \
+ $(XFCONF_LIBS)
+
diff --git a/xfce-base/xfce4-settings/xfce4-settings-4.19.1.ebuild b/xfce-base/xfce4-settings/xfce4-settings-4.19.1.ebuild
index 5f2eb5cf173a..d2f2822092c8 100644
--- a/xfce-base/xfce4-settings/xfce4-settings-4.19.1.ebuild
+++ b/xfce-base/xfce4-settings/xfce4-settings-4.19.1.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
PYTHON_COMPAT=( python3_{10..11} )
-inherit python-single-r1 xdg-utils
+inherit autotools python-single-r1 xdg-utils
DESCRIPTION="Configuration system for the Xfce desktop environment"
HOMEPAGE="
@@ -63,6 +63,17 @@ BDEPEND="
virtual/pkgconfig
"
+PATCHES=(
+ # https://bugs.gentoo.org/913864
+ # https://gitlab.xfce.org/xfce/xfce4-settings/-/issues/494
+ "${FILESDIR}"/${PN}-4.19.1-gmodule-libs.patch
+)
+
+src_prepare() {
+ default
+ eautomake
+}
+
src_configure() {
local myconf=(
$(use_enable upower upower-glib)
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2024-03-18 14:39 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2024-03-18 14:39 [gentoo-commits] repo/gentoo:master commit in: xfce-base/xfce4-settings/, xfce-base/xfce4-settings/files/ Michał Górny
-- strict thread matches above, loose matches on Subject: below --
2018-06-21 7:24 Michał Górny
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox