diff options
author | Adam Feldman <NP-Hardass@gentoo.org> | 2021-05-23 14:30:32 -0400 |
---|---|---|
committer | Adam Feldman <NP-Hardass@gentoo.org> | 2021-05-23 15:48:39 -0400 |
commit | 29084dcdc4716e25c17ddf9f898d1b3fc4acac81 (patch) | |
tree | 3b3bf3a7aa5fa9506c4b58d3a999e515a482e71c /mate-extra | |
parent | x11-misc/mozo: Drop 1.22.x (diff) | |
download | gentoo-mate-29084dcdc4716e25c17ddf9f898d1b3fc4acac81.tar.gz gentoo-mate-29084dcdc4716e25c17ddf9f898d1b3fc4acac81.tar.bz2 gentoo-mate-29084dcdc4716e25c17ddf9f898d1b3fc4acac81.zip |
mate-extra/mate-utils: Drop 1.22.x
Package-Manager: Portage-3.0.18, Repoman-3.0.3
Signed-off-by: Adam Feldman <NP-Hardass@gentoo.org>
Diffstat (limited to 'mate-extra')
5 files changed, 0 insertions, 369 deletions
diff --git a/mate-extra/mate-utils/Manifest b/mate-extra/mate-utils/Manifest index 3f09230..007d46c 100644 --- a/mate-extra/mate-utils/Manifest +++ b/mate-extra/mate-utils/Manifest @@ -1,2 +1 @@ -DIST mate-utils-1.22.2.tar.xz 7306448 BLAKE2B 0fb28f85e39ac58c1e78e6f5f4c6d01e72a2b8c32197739b93ec3f17617b4676fdfe251b81e3b5b01c44f69136d9bfc8d12d64fff832d5a9f1c30591b2facebb SHA512 bf33019ebd1dc4ff6010ba0824981334b7065a62dfc7a73170487df5f165ad20831a900ef4e4e0641ca130aa618f82aa27606f0a48c2cb9907ea7ef118f02a60 DIST mate-utils-1.24.0.tar.xz 7930068 BLAKE2B 0e2c82afbc2d8a90b8c31d56d9bfbb3a477b1e9cd67108e52c96f4087d09336ed9e6980551e39b43797743b9ef86cc2beabfa84fd7a5820e38122e0d0a7c968d SHA512 d8945c85936a55d22f3ed94c9858ba84cadf552a63cdd2d9eec9120111ad71526ac88772f8e4b7a6a460b691574534e52706fba35a0395b1d894b27eece9e92c diff --git a/mate-extra/mate-utils/files/mate-utils-1.22.1-make-inkscape-optional.patch b/mate-extra/mate-utils/files/mate-utils-1.22.1-make-inkscape-optional.patch deleted file mode 100644 index 57d984b..0000000 --- a/mate-extra/mate-utils/files/mate-utils-1.22.1-make-inkscape-optional.patch +++ /dev/null @@ -1,192 +0,0 @@ -From 563dec11a51f4c6517509642e335a1fd64cd4ec4 Mon Sep 17 00:00:00 2001 -From: rbuj <robert.buj@gmail.com> -Date: Thu, 2 May 2019 20:51:09 +0200 -Subject: [PATCH] Make inkscape and rsvg-convert optional - -TEST on Fedora: -inkscape, librsvg2-tools package are not installed on system: The user can build, install and distribute the package: - - $ sudo dnf remove inkscape librsvg2-tools -y - $ ./configure --prefix=/usr - $ make - $ sudo make install - $ make distcheck - -logview/data/icons: - -Can not run build-png-icons target if inkscape package is not installed on system: - - $ make -C logview/data/icons clean-png-icons -make: Entering directory '/home/robert/devel/mate-utils/logview/data/icons' -rm -f hicolor_apps_16x16_mate-system-log.png hicolor_apps_22x22_mate-system-log.png hicolor_apps_32x32_mate-system-log.png hicolor_apps_48x48_mate-system-log.png hicolor_apps_256x256_mate-system-log.png -make: Leaving directory '/home/robert/devel/mate-utils/logview/data/icons' - $ make -C logview/data/icons build-png-icons -make: Entering directory '/home/robert/devel/mate-utils/logview/data/icons' -make: *** No rule to make target 'hicolor_apps_16x16_mate-system-log.png', needed by 'build-png-icons'. Stop. -make: Leaving directory '/home/robert/devel/mate-utils/logview/data/icons' - -Can run build-png-icons target if inkscape package is installed on system: - - $ sudo dnf install inkscape -y - $ ./configure --prefix=/usr - $ make -C logview/data/icons build-png-icons -make: Entering directory '/home/robert/devel/mate-utils/logview/data/icons' -Background RRGGBBAA: ffffff00 Area 303:65:319:81 exported to 16 x 16 pixels (96 dpi) Bitmap saved as: hicolor_apps_16x16_mate-system-log.png -Background RRGGBBAA: ffffff00 Area 303:101:325:123 exported to 22 x 22 pixels (96 dpi) Bitmap saved as: hicolor_apps_22x22_mate-system-log.png -Background RRGGBBAA: ffffff00 Area 304:142:336:174 exported to 32 x 32 pixels (96 dpi) Bitmap saved as: hicolor_apps_32x32_mate-system-log.png -Background RRGGBBAA: ffffff00 Area 296:202:344:250 exported to 48 x 48 pixels (96 dpi) Bitmap saved as: hicolor_apps_48x48_mate-system-log.png -Background RRGGBBAA: ffffff00 Area 33:11:289:267 exported to 256 x 256 pixels (96 dpi) Bitmap saved as: hicolor_apps_256x256_mate-system-log.png -make: Nothing to be done for 'build-png-icons'. -make: Leaving directory '/home/robert/devel/mate-utils/logview/data/icons' - -baobab/pixmaps: - -Can not run build-png-icons target if librsvg2-tools package is not installed on system: - - $ make -C baobab/pixmaps clean-png-icons -make: Entering directory '/home/robert/devel/mate-utils/baobab/pixmaps' -rm -f hicolor_apps_16x16_mate-disk-usage-analyzer.png hicolor_apps_22x22_mate-disk-usage-analyzer.png hicolor_apps_32x32_mate-disk-usage-analyzer.png hicolor_apps_48x48_mate-disk-usage-analyzer.png hicolor_apps_128x128_mate-disk-usage-analyzer.png -make: Leaving directory '/home/robert/devel/mate-utils/baobab/pixmaps' - $ make -C baobab/pixmaps build-png-icons -make: Entering directory '/home/robert/devel/mate-utils/baobab/pixmaps' -make: *** No rule to make target 'hicolor_apps_16x16_mate-disk-usage-analyzer.png', needed by 'build-png-icons'. Stop. -make: Leaving directory '/home/robert/devel/mate-utils/baobab/pixmaps' - -Can run build-png-icons target if librsvg2-tools package is installed on system: - - $ sudo dnf install -y librsvg2-tools - $ ./configure --prefix=/usr - $ make -C baobab/pixmaps build-png-icons -make: Entering directory '/home/robert/devel/mate-utils/baobab/pixmaps' -/usr/bin/rsvg-convert -w 16 -h 16 hicolor_apps_scalable_mate-disk-usage-analyzer.svg -o hicolor_apps_16x16_mate-disk-usage-analyzer.png -/usr/bin/rsvg-convert -w 22 -h 22 hicolor_apps_scalable_mate-disk-usage-analyzer.svg -o hicolor_apps_22x22_mate-disk-usage-analyzer.png -/usr/bin/rsvg-convert -w 32 -h 32 hicolor_apps_scalable_mate-disk-usage-analyzer.svg -o hicolor_apps_32x32_mate-disk-usage-analyzer.png -/usr/bin/rsvg-convert -w 48 -h 48 hicolor_apps_scalable_mate-disk-usage-analyzer.svg -o hicolor_apps_48x48_mate-disk-usage-analyzer.png -/usr/bin/rsvg-convert -w 128 -h 128 hicolor_apps_scalable_mate-disk-usage-analyzer.svg -o hicolor_apps_128x128_mate-disk-usage-analyzer.png -make: Leaving directory '/home/robert/devel/mate-utils/baobab/pixmaps' - -Closes #223 ---- - baobab/pixmaps/Makefile.am | 6 ++++-- - configure.ac | 8 ++------ - logview/data/icons/Makefile.am | 31 ++++++++++++++++++++++++------- - 3 files changed, 30 insertions(+), 15 deletions(-) - -diff --git a/baobab/pixmaps/Makefile.am b/baobab/pixmaps/Makefile.am -index f36e8bf3..6804bef9 100644 ---- a/baobab/pixmaps/Makefile.am -+++ b/baobab/pixmaps/Makefile.am -@@ -11,8 +11,10 @@ public_icons = \ - hicolor_apps_scalable_mate-disk-usage-analyzer.svg \ - $(NULL) - -+if HAVE_RSVG_CONVERT - hicolor_apps_%.png: hicolor_apps_scalable_mate-disk-usage-analyzer.svg - $(RSVG_CONVERT) -w $(word 1, $(subst x, ,$(word 1,$(subst _, ,$*)))) -h $(word 2, $(subst x, ,$(word 1,$(subst _, ,$*)))) $^ -o $@ -+endif - - EXTRA_DIST = \ - $(public_icons) \ -@@ -20,7 +22,7 @@ EXTRA_DIST = \ - - ############################################################################### - --install-icons: $(public_icons) -+install-icons: | $(public_icons) - for icon in $(public_icons); do \ - THEME=`echo $$icon | cut -d_ -f1`; \ - CONTEXT=`echo $$icon | cut -d_ -f2`; \ -@@ -57,7 +59,7 @@ update-icon-cache: - fi - - .PHONY: build-png-icons clean-png-icons --build-png-icons: $(png_icons) -+build-png-icons: | $(png_icons) - - clean-png-icons: - rm -f $(png_icons) -diff --git a/configure.ac b/configure.ac -index d65e5b54..0907e194 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -31,13 +31,9 @@ AC_PATH_PROG(GLIB_MKENUMS, [glib-mkenums]) - - dnl ICONS: convert svg to png - AC_PATH_PROG(RSVG_CONVERT, rsvg-convert) --if test x$RSVG_CONVERT = x ; then -- AC_MSG_ERROR([could not locate rsvg-convert]) --fi -+AM_CONDITIONAL([HAVE_RSVG_CONVERT], [test "x$RSVG_CONVERT" != x]) - AC_PATH_PROG(INKSCAPE, inkscape) --if test x$INKSCAPE = x ; then -- AC_MSG_ERROR([could not locate inkscape]) --fi -+AM_CONDITIONAL([HAVE_INKSCAPE], [test "x$INKSCAPE" != x]) - - MATE_COMPILE_WARNINGS([yes]) - -diff --git a/logview/data/icons/Makefile.am b/logview/data/icons/Makefile.am -index 9db44489..30fff904 100644 ---- a/logview/data/icons/Makefile.am -+++ b/logview/data/icons/Makefile.am -@@ -17,20 +17,37 @@ public_icons = \ - hicolor_apps_scalable_mate-system-log-symbolic.svg \ - $(NULL) - -+if HAVE_INKSCAPE - hicolor_apps_16x16_mate-system-log.png: logview.svg -- $(INKSCAPE) -z $^ --export-area=303:65:319:81 -w=16 -h=16 -e=$@ -+ $(if $(wildcard $(INKSCAPE)), \ -+ $(info $(shell $(INKSCAPE) -z $^ --export-area=303:65:319:81 -w=16 -h=16 -e=$@)), \ -+ $(error could not locate inkscape) \ -+ ) - - hicolor_apps_22x22_mate-system-log.png: logview.svg -- $(INKSCAPE) -z $^ --export-area=303:101:325:123 -w=22 -h=22 -e=$@ -+ $(if $(wildcard $(INKSCAPE)), \ -+ $(info $(shell $(INKSCAPE) -z $^ --export-area=303:101:325:123 -w=22 -h=22 -e=$@)), \ -+ $(error could not locate inkscape) \ -+ ) - - hicolor_apps_32x32_mate-system-log.png: logview.svg -- $(INKSCAPE) -z $^ --export-area=304:142:336:174 -w=32 -h=32 -e=$@ -+ $(if $(wildcard $(INKSCAPE)), \ -+ $(info $(shell $(INKSCAPE) -z $^ --export-area=304:142:336:174 -w=32 -h=32 -e=$@)), \ -+ $(error could not locate inkscape) \ -+ ) - - hicolor_apps_48x48_mate-system-log.png: logview.svg -- $(INKSCAPE) -z $^ --export-area=296:202:344:250 -w=48 -h=48 -e=$@ -+ $(if $(wildcard $(INKSCAPE)), \ -+ $(info $(shell $(INKSCAPE) -z $^ --export-area=296:202:344:250 -w=48 -h=48 -e=$@)), \ -+ $(error could not locate inkscape) \ -+ ) - - hicolor_apps_256x256_mate-system-log.png: logview.svg -- $(INKSCAPE) -z $^ --export-area=33:11:289:267 -w=256 -h=256 -e=$@ -+ $(if $(wildcard $(INKSCAPE)), \ -+ $(info $(shell $(INKSCAPE) -z $^ --export-area=33:11:289:267 -w=256 -h=256 -e=$@)), \ -+ $(error could not locate inkscape) \ -+ ) -+endif - - noinst_DATA = \ - logview.svg \ -@@ -43,7 +60,7 @@ EXTRA_DIST = \ - - ############################################################################### - --install-icons: -+install-icons: | $(public_icons) - for icon in $(public_icons); do \ - THEME=`echo $$icon | cut -d_ -f1`; \ - CONTEXT=`echo $$icon | cut -d_ -f2`; \ -@@ -80,7 +97,7 @@ update-icon-cache: - fi - - .PHONY: build-png-icons clean-png-icons --build-png-icons: $(png_icons) -+build-png-icons: | $(png_icons) - - clean-png-icons: - rm -f $(png_icons) diff --git a/mate-extra/mate-utils/files/mate-utils-1.22.2-gcc-10-fno-common.patch b/mate-extra/mate-utils/files/mate-utils-1.22.2-gcc-10-fno-common.patch deleted file mode 100644 index 052c1a2..0000000 --- a/mate-extra/mate-utils/files/mate-utils-1.22.2-gcc-10-fno-common.patch +++ /dev/null @@ -1,37 +0,0 @@ -From d2d4902a68b8eabf4dc26a8ba49019e5ea6040c6 Mon Sep 17 00:00:00 2001 -From: rbuj <robert.buj@gmail.com> -Date: Wed, 29 Jan 2020 16:22:09 +0100 -Subject: [PATCH] Fix build using gcc 10 -fno-common flag - -Closes #258 ---- - baobab/src/baobab.c | 2 ++ - baobab/src/baobab.h | 2 +- - 2 files changed, 3 insertions(+), 1 deletion(-) - -diff --git a/baobab/src/baobab.c b/baobab/src/baobab.c -index 07af1a1d..d4edde1f 100644 ---- a/baobab/src/baobab.c -+++ b/baobab/src/baobab.c -@@ -42,6 +42,8 @@ - static void push_iter_in_stack (GtkTreeIter *); - static GtkTreeIter pop_iter_from_stack (void); - -+BaobabApplication baobab; -+ - static gint currentdepth = 0; - static GtkTreeIter currentiter; - static GtkTreeIter firstiter; -diff --git a/baobab/src/baobab.h b/baobab/src/baobab.h -index b8d01817..76b22d6a 100644 ---- a/baobab/src/baobab.h -+++ b/baobab/src/baobab.h -@@ -99,7 +99,7 @@ struct _BaobabApplication { - }; - - /* Application singleton */ --BaobabApplication baobab; -+extern BaobabApplication baobab; - - struct chan_data { - guint64 size; diff --git a/mate-extra/mate-utils/mate-utils-1.22.2-r1.ebuild b/mate-extra/mate-utils/mate-utils-1.22.2-r1.ebuild deleted file mode 100644 index b58cd08..0000000 --- a/mate-extra/mate-utils/mate-utils-1.22.2-r1.ebuild +++ /dev/null @@ -1,69 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -MATE_LA_PUNT="yes" - -inherit mate - -if [[ ${PV} != 9999 ]]; then - KEYWORDS="amd64 ~arm ~arm64 x86" -fi - -DESCRIPTION="Utilities for the MATE desktop" -LICENSE="FDL-1.1+ GPL-2+ GPL-3+ LGPL-2+" -SLOT="0" - -IUSE="X applet debug ipv6 test" -RESTRICT="!test? ( test )" - -RDEPEND=" - dev-libs/atk - >=dev-libs/glib-2.50:2 - >=gnome-base/libgtop-2.12:2= - >=media-libs/libcanberra-0.4[gtk3] - sys-libs/zlib - x11-libs/cairo - x11-libs/gdk-pixbuf:2 - >=x11-libs/gtk+-3.22:3 - x11-libs/libICE - x11-libs/libSM - x11-libs/libX11 - x11-libs/libXext - x11-libs/pango - applet? ( >=mate-base/mate-panel-1.17.0 )" - -DEPEND="${RDEPEND} - app-text/rarian - >=app-text/scrollkeeper-dtd-1:1.0 - app-text/yelp-tools - dev-util/glib-utils - dev-util/gtk-doc - dev-util/gtk-doc-am - >=dev-util/intltool-0.50.1 - sys-devel/gettext - virtual/pkgconfig - x11-base/xorg-proto" - -PATCHES=( - "${FILESDIR}/${P}-gcc-10-fno-common.patch" -) - -src_prepare() { - # Make apps visible in all DEs. - LC_ALL=C find . -iname '*.desktop.in*' -exec \ - sed -e '/OnlyShowIn/d' -i {} + || die - - mate_src_prepare -} - -src_configure() { - mate_src_configure \ - --disable-maintainer-flags \ - --enable-zlib \ - --enable-debug=$(usex debug yes minimum) \ - $(use_with X x) \ - $(use_enable applet gdict-applet) \ - $(use_enable ipv6) -} diff --git a/mate-extra/mate-utils/mate-utils-1.22.2-r2.ebuild b/mate-extra/mate-utils/mate-utils-1.22.2-r2.ebuild deleted file mode 100644 index 9ad9cf8..0000000 --- a/mate-extra/mate-utils/mate-utils-1.22.2-r2.ebuild +++ /dev/null @@ -1,70 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -MATE_LA_PUNT="yes" - -inherit mate - -if [[ ${PV} != 9999 ]]; then - KEYWORDS="~amd64 ~arm ~arm64 ~x86" -fi - -DESCRIPTION="Utilities for the MATE desktop" -LICENSE="FDL-1.1+ GPL-2+ GPL-3+ LGPL-2+" -SLOT="0" - -IUSE="X applet debug ipv6 test" -RESTRICT="!test? ( test )" - -RDEPEND=" - dev-libs/atk - >=dev-libs/glib-2.50:2 - >=gnome-base/libgtop-2.12:2= - mate-base/mate-desktop - >=media-libs/libcanberra-0.4[gtk3] - sys-libs/zlib - x11-libs/cairo - x11-libs/gdk-pixbuf:2 - >=x11-libs/gtk+-3.22:3 - x11-libs/libICE - x11-libs/libSM - x11-libs/libX11 - x11-libs/libXext - x11-libs/pango - applet? ( >=mate-base/mate-panel-1.17.0 )" - -DEPEND="${RDEPEND} - app-text/rarian - >=app-text/scrollkeeper-dtd-1:1.0 - app-text/yelp-tools - dev-util/glib-utils - dev-util/gtk-doc - dev-util/gtk-doc-am - >=dev-util/intltool-0.50.1 - sys-devel/gettext - virtual/pkgconfig - x11-base/xorg-proto" - -PATCHES=( - "${FILESDIR}/${P}-gcc-10-fno-common.patch" -) - -src_prepare() { - # Make apps visible in all DEs. - LC_ALL=C find . -iname '*.desktop.in*' -exec \ - sed -e '/OnlyShowIn/d' -i {} + || die - - mate_src_prepare -} - -src_configure() { - mate_src_configure \ - --disable-maintainer-flags \ - --enable-zlib \ - --enable-debug=$(usex debug yes minimum) \ - $(use_with X x) \ - $(use_enable applet gdict-applet) \ - $(use_enable ipv6) -} |