[gentoo-commits] repo/gentoo:master commit in: mate-extra/mate-utils/, mate-extra/mate-utils/files/
commit: a01ebe3ec7bbac9118cb4cb36bd9dcfa996fa989 Author: NP-Hardass gentoo org> AuthorDate: Mon Sep 5 18:07:19 2016 + Commit: NP Hardass gentoo org> CommitDate: Sat Sep 10 19:35:50 2016 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a01ebe3e mate-extra/mate-utils: Backport gtk3 fix for mate-dict Package-Manager: portage-2.3.0 .../files/mate-utils-1.12.0-dict-gtk3.patch| 53 ++ 12.0-r1.ebuild => mate-utils-1.12.0-r2.ebuild} | 2 + 2 files changed, 55 insertions(+) diff --git a/mate-extra/mate-utils/files/mate-utils-1.12.0-dict-gtk3.patch b/mate-extra/mate-utils/files/mate-utils-1.12.0-dict-gtk3.patch new file mode 100644 index ..dff6dbe --- /dev/null +++ b/mate-extra/mate-utils/files/mate-utils-1.12.0-dict-gtk3.patch @@ -0,0 +1,53 @@ +From 5ab184661ff38baca3ea2709d81932a578654392 Mon Sep 17 00:00:00 2001 +From: Kir Kolyshkin +Date: Mon, 16 May 2016 14:52:28 -0700 +Subject: [PATCH] mate-dict.pc: depend upon proper gtk version + +If the package is built against gtk-3.0 (as in +./configure --with-gtk=3.0), mate-dict.pc still wants gtk-2.0 +since it's hardcoded it there. This can lead to improper builds +of packages using libmatedict (although I can't find any now), +as well as improper RPM dependencies, like this: + + $ rpm -e gtk2-devel + error: Failed dependencies: + ... + pkgconfig(gtk+-2.0) is needed by (installed) mate-utils-devel-1.14.0-1gtk3.fc23.x86_64 + +Fortunately, the file is already generated, so it's trivial to add +a proper substitution. + +[v2: also add min GTK version required] + +Signed-off-by: Kir Kolyshkin +--- + configure.ac | 2 ++ + mate-dictionary/libgdict/mate-dict.pc.in | 2 +- + 2 files changed, 3 insertions(+), 1 deletion(-) + +diff --git a/configure.ac b/configure.ac +index 64aba70..39cc6f8 100644 +--- a/configure.ac b/configure.ac +@@ -89,6 +89,8 @@ case "$with_gtk" in + LIBCANBERRA_GTK_REQUIRED=0.4 + ;; + esac ++AC_SUBST(GTK_API_VERSION) ++AC_SUBST(GTK_REQUIRED) + + # common checks + PKG_CHECK_MODULES(GLIB, glib-2.0 >= $GLIB_REQUIRED) +diff --git a/mate-dictionary/libgdict/mate-dict.pc.in b/mate-dictionary/libgdict/mate-dict.pc.in +index e409a0c..8168de2 100644 +--- a/mate-dictionary/libgdict/mate-dict.pc.in b/mate-dictionary/libgdict/mate-dict.pc.in +@@ -5,7 +5,7 @@ includedir=@includedir@ + + Name: gdict-1.0 + Description: MATE Dictionary Protocol client library +-Requires: gtk+-2.0 ++Requires: gtk+-@GTK_API_VERSION@ >= @GTK_REQUIRED@ + Version: @GDICT_VERSION@ + Libs: -L${libdir} -lmatedict + Cflags: -I${includedir}/mate-dict diff --git a/mate-extra/mate-utils/mate-utils-1.12.0-r1.ebuild b/mate-extra/mate-utils/mate-utils-1.12.0-r2.ebuild similarity index 96% rename from mate-extra/mate-utils/mate-utils-1.12.0-r1.ebuild rename to mate-extra/mate-utils/mate-utils-1.12.0-r2.ebuild index 9453ec5..106 100644 --- a/mate-extra/mate-utils/mate-utils-1.12.0-r1.ebuild +++ b/mate-extra/mate-utils/mate-utils-1.12.0-r2.ebuild @@ -50,6 +50,8 @@ DEPEND="${RDEPEND} sys-devel/gettext:* virtual/pkgconfig:*" +PATCHES=( "${FILESDIR}/${P}-dict-gtk3.patch" ) + src_configure() { mate_src_configure \ --disable-maintainer-flags \
[gentoo-commits] repo/gentoo:master commit in: mate-extra/mate-utils/, mate-extra/mate-utils/files/
commit: 106aa6e9989ddf9cc5c97810c6b1038aa142708b Author: Adam Feldman gentoo org> AuthorDate: Mon Apr 6 22:14:04 2020 + Commit: Adam Feldman gentoo org> CommitDate: Mon Apr 6 22:14:36 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=106aa6e9 mate-extra/mate-utils: Fix #709976 Closes: https://bugs.gentoo.org/709976 Package-Manager: Portage-2.3.96, Repoman-2.3.21 Signed-off-by: Adam Feldman gentoo.org> .../mate-utils-1.22.2-gcc-10-fno-common.patch | 37 ++ ...s-1.22.2.ebuild => mate-utils-1.22.2-r1.ebuild} | 4 +++ 2 files changed, 41 insertions(+) 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 new file mode 100644 index 000..052c1a27bbe --- /dev/null +++ b/mate-extra/mate-utils/files/mate-utils-1.22.2-gcc-10-fno-common.patch @@ -0,0 +1,37 @@ +From d2d4902a68b8eabf4dc26a8ba49019e5ea6040c6 Mon Sep 17 00:00:00 2001 +From: rbuj +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.ebuild b/mate-extra/mate-utils/mate-utils-1.22.2-r1.ebuild similarity index 95% rename from mate-extra/mate-utils/mate-utils-1.22.2.ebuild rename to mate-extra/mate-utils/mate-utils-1.22.2-r1.ebuild index e739dfd9899..63022e807b7 100644 --- a/mate-extra/mate-utils/mate-utils-1.22.2.ebuild +++ b/mate-extra/mate-utils/mate-utils-1.22.2-r1.ebuild @@ -46,6 +46,10 @@ DEPEND="${RDEPEND} 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 \
[gentoo-commits] repo/gentoo:master commit in: mate-extra/mate-utils/, mate-extra/mate-utils/files/
commit: 4daa571b055f26a218ce64ab263f05d932e0278b Author: NP-Hardass gentoo org> AuthorDate: Wed May 15 15:06:49 2019 + Commit: Göktürk Yüksek gentoo org> CommitDate: Wed May 15 19:50:38 2019 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4daa571b mate-extra/mate-utils: Fix bug where build depends on inkscape Closes: https://bugs.gentoo.org/685890 Package-Manager: Portage-2.3.62, Repoman-2.3.12 Signed-off-by: Göktürk Yüksek gentoo.org> .../mate-utils-1.22.1-make-inkscape-optional.patch | 192 + ...s-1.22.1.ebuild => mate-utils-1.22.1-r1.ebuild} | 2 + 2 files changed, 194 insertions(+) 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 new file mode 100644 index 000..57d984b91cc --- /dev/null +++ b/mate-extra/mate-utils/files/mate-utils-1.22.1-make-inkscape-optional.patch @@ -0,0 +1,192 @@ +From 563dec11a51f4c6517509642e335a1fd64cd4ec4 Mon Sep 17 00:00:00 2001 +From: rbuj +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: ff00 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: ff00 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: ff00 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: ff00 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: ff00 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
[gentoo-commits] repo/gentoo:master commit in: mate-extra/mate-utils/, mate-extra/mate-utils/files/
commit: cbce202a5db01cfb0246b26bdc430a2459df3e11 Author: Adam Feldman gentoo org> AuthorDate: Fri May 8 04:34:50 2020 + Commit: Adam Feldman gentoo org> CommitDate: Fri May 8 04:44:25 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cbce202a mate-extra/mate-utils: Drop old Package-Manager: Portage-2.3.99, Repoman-2.3.22 Signed-off-by: Adam Feldman gentoo.org> mate-extra/mate-utils/Manifest | 2 - .../mate-utils-1.22.1-make-inkscape-optional.patch | 192 - mate-extra/mate-utils/mate-utils-1.22.0.ebuild | 65 --- mate-extra/mate-utils/mate-utils-1.22.1-r1.ebuild | 68 4 files changed, 327 deletions(-) diff --git a/mate-extra/mate-utils/Manifest b/mate-extra/mate-utils/Manifest index cd12a5d7a11..3f092304965 100644 --- a/mate-extra/mate-utils/Manifest +++ b/mate-extra/mate-utils/Manifest @@ -1,4 +1,2 @@ -DIST mate-utils-1.22.0.tar.xz 7300112 BLAKE2B 8a613b6dcb99e652ad6b44bd64ad9b2f9c809713b5fb904059b64234b51e2a06b2290dcf14d7dde82e8011be2ca395fe74d87bcae5b903b196d55bb50e8fdf07 SHA512 248c6e4108900768a4e8b272d20ac9b2d70e8bf77375f4669a099f4d8386c2e8affeafb772d209f00906f96f20d7ee347167ef4837186f44d8aaad85ef855f70 -DIST mate-utils-1.22.1.tar.xz 7284496 BLAKE2B 83e7e39a0daadae595ab2cc90ad250f61a294afc896df28bf17259cec619af4b0c9d1927c07b03a0cdd7449174af258227678299823169e2cb4d9c4d3ec98c92 SHA512 0f70f088de80440ff6954c899eab75c2bf22d332293c1ec61bf8391396ed31a2ab126279dc4d9dab6f4932225120309bc52e122bcd5a8dc17abccfd6e480390d 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 57d984b91cc..000 --- 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 -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: ff00 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: ff00 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: ff00 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: ff00 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: ff00 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 librsv