diff options
Diffstat (limited to 'xfce-base/xfce4-settings')
-rw-r--r-- | xfce-base/xfce4-settings/Manifest | 3 | ||||
-rw-r--r-- | xfce-base/xfce4-settings/files/xfce4-settings-4.15.1-install-icons.patch | 70 | ||||
-rw-r--r-- | xfce-base/xfce4-settings/xfce4-settings-4.15.1-r1.ebuild (renamed from xfce-base/xfce4-settings/xfce4-settings-4.15.1.ebuild) | 8 |
3 files changed, 78 insertions, 3 deletions
diff --git a/xfce-base/xfce4-settings/Manifest b/xfce-base/xfce4-settings/Manifest index a6b02ffe7de0..34c44f2c56f9 100644 --- a/xfce-base/xfce4-settings/Manifest +++ b/xfce-base/xfce4-settings/Manifest @@ -1,3 +1,4 @@ +AUX xfce4-settings-4.15.1-install-icons.patch 2160 BLAKE2B 35c3e66101d33e8213dd848194d9d5fa3cbb424b466f2538e5109329064b37d7130c4cc4b4cfd7f65ba023f68d9547d752903be5610925f543d0967a82ccb417 SHA512 e2a5120a65636cc30c381e2065f1322b94cab25bd42a6d79da321328c79cd801919c6e5de0cc11422a461d5f57c2b1a9a4cb9b225ceb4751b9fdd9dc6f816910 DIST xfce4-settings-4.14.2.tar.bz2 1194714 BLAKE2B ffcc17ca5c39837d8d60c3b5916cf6643218316e6f7a67f3d88c949ff814e98e1a7f46ccd4c9c1280e1fdade91f7c244e80080031b9b05060afa5546720ea03e SHA512 5882e96504e2ad869504e7c8e6e62d1d04f61beef524ba85a3ed962ca689d6e72a4ed717173f9e2645c078c2c8757caed1f3395dd185a3b0b5dc8b27a1a3d2d1 DIST xfce4-settings-4.14.3.tar.bz2 1201308 BLAKE2B daf20e5adda24f3c1ecc88506c1a1cd03b33b379bafc236ed3b99404b816803288041de7d507072a311c3966bb0e040986e358ea94d01636c56ea31c1b843c8d SHA512 fcc5bfa98d8903dc3ac51ec909e542485a44f6c11ddca815508c2ed913410a0becd54b2db6761ee48f5a20d6ca08377eeefbb54bd0cb7cde0a0c0d4b65802ab5 DIST xfce4-settings-4.15.0.tar.bz2 1199360 BLAKE2B add423dee8b5de6386aa5008c082d6266e0d4ffaf656ab960bca12798d03aedf6dcf98aae2200f4e855aec9749eaf69e4220c8f7d5ce5968edff469546afe614 SHA512 ef0d253ee5f79d57b62dc467223d23050fd21b99891fa7a3c8329d97261ba918a0f4b62a345916558685cae59bfee5da58b1e66a8a7f1b2219eb6cec2094fcbf @@ -5,5 +6,5 @@ DIST xfce4-settings-4.15.1.tar.bz2 1366752 BLAKE2B 1f236d39529b7a403691bbc82e577 EBUILD xfce4-settings-4.14.2.ebuild 1563 BLAKE2B 45a73d4ada2598eda4a41b52c695ea07ee0cd3f8aaa6649bcb7fe1a0279832157f17d00ed7406b9ed24ff91b4dc7c0f2bf80a5eaffc31e77b87960e097686459 SHA512 f1984880e7249b27ea37de135af9032460ec93ada9fce55287cfafa1d81abe72e6ab55fe970d7a2edc3af8abc266398ef1d4854992fa918af0eec36ea5e12167 EBUILD xfce4-settings-4.14.3.ebuild 1568 BLAKE2B 89e50683bef0f0158cf193523e936542a4079796919e9e24dc91cd4f29553fe175f4f01d4e62e22bc2c6c640357d9d55cafce4e1a2cca1dc182865ed1007c791 SHA512 eff37b47e3d9703217309461b656ae0108048b01f5dc6204f59b8ca5af61737cda3888d08d83fa4b0f80d44e27cf04bb786229cd06dc58a24f6b6960ff52602b EBUILD xfce4-settings-4.15.0.ebuild 1580 BLAKE2B d56cfba06ba8a1401766ff19c9ae6aa65bf9875c6c2364e517ab7e7255513d0a512b7eb6580a74ad11fa12b3bbac9baf9f7801f6ca3c4f3e2b2bfad151215434 SHA512 80b78019bbcc522e9ee29ba7142b20eb9c5bb1c31ec73853bf4e6cac846781c76a30ef13c363244919bd1d38430ea9696018a6d98077ef725b84178560fd1862 -EBUILD xfce4-settings-4.15.1.ebuild 1606 BLAKE2B 8c83534af91b530ff48ee032383b4cc122a23e2f5881e2d2512beb1fd4ba81de9f7b0382ecd58fec3acd9d401a620c047770d857161fa8afab3a001d4a6a53a0 SHA512 2cce9d1be7c01967511782bf1e02417d5ce846d47c8775ef4a6a800a2f24535ab3a6fd4f5d66c7d38fb506b77321052d5e2c4334a15e0dee9478517ac71f6770 +EBUILD xfce4-settings-4.15.1-r1.ebuild 1668 BLAKE2B 6b40caa5e907176a14b25e13a0ea853455a932d778a7cce87740790c28376c7e61c216b2628cedd1f089454721e7ad9f526db3c48b3000b38c166bcc010f7f8c SHA512 b96dd6e215eaac651d4e2557673f63a59499a933ec354645abe25dbccac4b43846b4e1b62c74d5a7d54e8ed7ed26b3d909ca97fb53a163209a5fe9d595b798ee MISC metadata.xml 479 BLAKE2B d15c203e15371edc17aabffe86e690c03c7e853e78c74e0de5753f977dbb9d080813706e3d3170dffb952591abc70f0aea6ac96ce9ca24ca7dbb627beeb8ea1f SHA512 56e89d92ba3fc3c53a86855721394993d8ac930549f19389728e0f8d60de6e92eb3475aeb0e09ca8f43412ba5e86c59482e7488dd5d0cd357968fabc6b3227b9 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 000000000000..2d84b8e7637d --- /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.000000000 +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.000000000 +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 index c2973c92f819..396625415b5d 100644 --- a/xfce-base/xfce4-settings/xfce4-settings-4.15.1.ebuild +++ b/xfce-base/xfce4-settings/xfce4-settings-4.15.1-r1.ebuild @@ -14,9 +14,9 @@ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~a IUSE="colord input_devices_libinput libcanberra libnotify upower +xklavier" RDEPEND=" - >=dev-libs/glib-2.24 + >=dev-libs/glib-2.45.8 media-libs/fontconfig - x11-libs/gtk+:3 + >=x11-libs/gtk+-3.20:3 x11-libs/libX11 >=x11-libs/libXcursor-1.1 >=x11-libs/libXi-1.3 @@ -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) |