From c8a77dfe4d3d307c1d5dd2650b7297447d8b609d Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 12 Jan 2019 16:58:08 +0000 Subject: gentoo resync : 12.01.2019 --- gnome-extra/Manifest.gz | Bin 10699 -> 10705 bytes gnome-extra/gnome-color-manager/Manifest | 5 +- .../gnome-color-manager-3.24.0-exiv2-0.27.patch | 41 +++++++++++++++ .../gnome-color-manager-3.24.0.ebuild | 7 ++- .../gnome-color-manager-3.30.0-r1.ebuild | 5 +- .../gnome-shell-extension-gsconnect/Manifest | 2 +- .../gnome-shell-extension-gsconnect-12-r1.ebuild | 56 +++++++++++++++++++++ .../gnome-shell-extension-gsconnect-12.ebuild | 55 -------------------- gnome-extra/libgda/Manifest | 2 +- gnome-extra/libgda/libgda-5.2.8.ebuild | 1 + 10 files changed, 113 insertions(+), 61 deletions(-) create mode 100644 gnome-extra/gnome-color-manager/files/gnome-color-manager-3.24.0-exiv2-0.27.patch create mode 100644 gnome-extra/gnome-shell-extension-gsconnect/gnome-shell-extension-gsconnect-12-r1.ebuild delete mode 100644 gnome-extra/gnome-shell-extension-gsconnect/gnome-shell-extension-gsconnect-12.ebuild (limited to 'gnome-extra') diff --git a/gnome-extra/Manifest.gz b/gnome-extra/Manifest.gz index ccaf3ae5c9e4..5b2aea4aeb3c 100644 Binary files a/gnome-extra/Manifest.gz and b/gnome-extra/Manifest.gz differ diff --git a/gnome-extra/gnome-color-manager/Manifest b/gnome-extra/gnome-color-manager/Manifest index 14be2a21469e..48f5fd86eca9 100644 --- a/gnome-extra/gnome-color-manager/Manifest +++ b/gnome-extra/gnome-color-manager/Manifest @@ -1,6 +1,7 @@ AUX 3.28-remove-unwvanted-check.patch 556 BLAKE2B 1037c7dfc3102ab7d10fc407e09b1948f3b666d81fb20678751ed3cd06fd2c8d59b9532a7b7487e3ab2bbfedacc447b4184b2789f069cd2ea1f1f327084e8bdb SHA512 0e27b8df076f211f2210a207005cf2f3f2b9e73ab7e7323c4edbd837957e5abe5abe0d657d528dd27fec8e85b410314e0efc1e8c0db1a1ea898c09457025bf90 +AUX gnome-color-manager-3.24.0-exiv2-0.27.patch 1179 BLAKE2B 10c0163f9a3f904dd925e3ee56c8bffa12810b691d883fd7c722ab44d5c34f03325d10d511a7df79f014c12ab5a45265bd7d8091b99804530f57637e5caf55d2 SHA512 a499ac862c6ec5090e88733ddd560c0f4d351ffacfab14f96a5534c6889ed03e8e13e643519a86aaca0a95b25a08617b0a0ab73b8714989b65350c86a3b9003a DIST gnome-color-manager-3.24.0.tar.xz 2857120 BLAKE2B c73c3718f77517a41fc74c12347101c57b9939101b2c816cc6390185fb0b21f87d16ed30b17a94f7bd03e28abb4bd5f5d411c086d350659f6686cfffb7e88cf2 SHA512 e145caf4e885ea6e9c4ee5a5b4d800d70af338e26d3bfcda81e20c6144e36d0581638d07099302d30787d6d30e9d58f2b8373f6585ae3788df825d6d24f5b003 DIST gnome-color-manager-3.30.0.tar.xz 2611088 BLAKE2B 2bbed2184d2c7afa9c4c4cd88470df3350f7deb2d776863dcd18ad6253538f1daee5f6397c598af8bdf1ce720980ede9280891139a9366edaffde3672d64b47a SHA512 ec28179f1089317b5a1920757e81b6126ab42a087831a92cd47174ddfbe6093fa868747c2a1d1d70c23f3fb87bc1b839627160407bf85c936ab0a3b125932ccc -EBUILD gnome-color-manager-3.24.0.ebuild 1537 BLAKE2B 084f0e787a17f17923e8996d81b8e01151abe110045e6fb5f7d2a229b96559d4dc25167a0f5dd738bc6d9ac78c9327748f303364f80f921c9fa33fffb62cc9ba SHA512 bf6667a55b0e63a9c5797e6cdfa13534be558f6ece1aa4ed15be39915ea203051e51f5e6c2a1a98933d115a35134b29d3fd95f107224d0a2a64ede099497a3f8 -EBUILD gnome-color-manager-3.30.0-r1.ebuild 1892 BLAKE2B 7f0845ab8fb49ab87a088e9f23deff36b950094423812febe0202996ce2ed1b3e7d2e6f33c3b114689e345a35958d223719448a645cbae31b2409674c9b91f89 SHA512 871d4d680471297a7d10fbe547ada0f4765289975d0d7c2c6ce6a298c0ecdfd1c6528b52b9cc075a11b895f71235a7848e11668295adb1b0987eb79913840fbc +EBUILD gnome-color-manager-3.24.0.ebuild 1660 BLAKE2B b2e823babb1fd2533c2bf5a6249d40f6b818af3f88252c06f80fbc5249af45ea80287335d2b28ab7eabaf595a14592fb5c3ba8921ab1fccde7784c0708b1fbe8 SHA512 6b6fd6acb3e41c7f44620a2a891222c0a800196546f2b54726be597439237d315f3103614ee11fa2a7419523ececcd8239e38496358e23b1ad036a7fc17f27e9 +EBUILD gnome-color-manager-3.30.0-r1.ebuild 2014 BLAKE2B 951f55cd37da169a0bf8483a10c57d108c21a1660385d6b67cf444c61d706da41e6b5f19c031874b616d9caf0bbcb752ae560185fdae2dcc035591e9a7c8dc53 SHA512 33e46a0f5ed513e8ebc41642b97c3fb9daa9466baacfb4970a2feb06d7e07461a34f5e1d1e53c2626c9f9060faa1daf6839258bbc2dfc1758063f8c3af5c65a2 MISC metadata.xml 394 BLAKE2B 1a38f315a074ea0d45493f48b8de54baccea3378a2c8e4a07aa097750487e8b32f10b6c1e7ccadbefd52762e4723a842fe20a58f3e7b3d044eec9a9bdcac04f3 SHA512 628edb4565daf3f3591c8306916b0271b7647c3cbad1476414c368be1cec2bb790da5cd8f29a660b04dde649b21f2271660ce84cc87079e753709f1d3394f48d diff --git a/gnome-extra/gnome-color-manager/files/gnome-color-manager-3.24.0-exiv2-0.27.patch b/gnome-extra/gnome-color-manager/files/gnome-color-manager-3.24.0-exiv2-0.27.patch new file mode 100644 index 000000000000..00878bc26a85 --- /dev/null +++ b/gnome-extra/gnome-color-manager/files/gnome-color-manager-3.24.0-exiv2-0.27.patch @@ -0,0 +1,41 @@ +Patch kindly borrowed from Mageia. + +https://gitlab.gnome.org/GNOME/gnome-color-manager/issues/4 + +diff -Nru a/src/gcm-helper-exiv.cpp b/src/gcm-helper-exiv.cpp +--- a/src/gcm-helper-exiv.cpp 2018-09-04 13:50:05.000000000 +0200 ++++ b/src/gcm-helper-exiv.cpp 2018-12-31 15:39:52.288495398 +0100 +@@ -19,8 +19,7 @@ + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + */ + +-#include +-#include ++#include + #include + #include + +@@ -51,7 +50,11 @@ + if (argc == 2) + filename = argv[1]; + if (filename.empty()) ++#if EXIV2_TEST_VERSION(0,27,0) ++ throw Exiv2::Error(Exiv2::kerErrorMessage, "No filename specified"); ++#else + throw Exiv2::Error(1, "No filename specified"); ++#endif + image = Exiv2::ImageFactory::open(filename); + image->readMetadata(); + +@@ -60,7 +63,11 @@ + if (exifData.empty()) { + std::string error(argv[1]); + error += ": No Exif data found in the file"; ++#if EXIV2_TEST_VERSION(0,27,0) ++ throw Exiv2::Error(Exiv2::kerErrorMessage, error); ++#else + throw Exiv2::Error(1, error); ++#endif + } + + /* try to find make, model and serial number */ diff --git a/gnome-extra/gnome-color-manager/gnome-color-manager-3.24.0.ebuild b/gnome-extra/gnome-color-manager/gnome-color-manager-3.24.0.ebuild index 441b966300cd..3ab3d64df806 100644 --- a/gnome-extra/gnome-color-manager/gnome-color-manager-3.24.0.ebuild +++ b/gnome-extra/gnome-color-manager/gnome-color-manager-3.24.0.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -39,6 +39,11 @@ DEPEND="${RDEPEND} virtual/pkgconfig " +PATCHES=( + # https://gitlab.gnome.org/GNOME/gnome-color-manager/issues/4 + "${FILESDIR}"/${P}-exiv2-0.27.patch # bug 674086 +) + src_configure() { # Always enable tests since they are check_PROGRAMS anyway # appstream does not want to be relax by default ! diff --git a/gnome-extra/gnome-color-manager/gnome-color-manager-3.30.0-r1.ebuild b/gnome-extra/gnome-color-manager/gnome-color-manager-3.30.0-r1.ebuild index 5f035f751268..4048b8ef3bf5 100644 --- a/gnome-extra/gnome-color-manager/gnome-color-manager-3.30.0-r1.ebuild +++ b/gnome-extra/gnome-color-manager/gnome-color-manager-3.30.0-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2018 Gentoo Authors +# Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -42,6 +42,9 @@ DEPEND="${RDEPEND} PATCHES=( # https://bugzilla.gnome.org/show_bug.cgi?id=796428 "${FILESDIR}"/3.28-remove-unwvanted-check.patch + + # https://gitlab.gnome.org/GNOME/gnome-color-manager/issues/4 + "${FILESDIR}"/${PN}-3.24.0-exiv2-0.27.patch # bug 674086 ) src_prepare() { diff --git a/gnome-extra/gnome-shell-extension-gsconnect/Manifest b/gnome-extra/gnome-shell-extension-gsconnect/Manifest index 4b36215e02a5..086ebf15ac0d 100644 --- a/gnome-extra/gnome-shell-extension-gsconnect/Manifest +++ b/gnome-extra/gnome-shell-extension-gsconnect/Manifest @@ -1,3 +1,3 @@ DIST gnome-shell-extension-gsconnect-12.tar.gz 1034122 BLAKE2B dc9e4003532bbb500c81d2bd0d2a715f60bb5c70b6bcf3286ebd8b2219d511f51e63c93ef30b0b71ced720531c811462f3b343d9a9eaa07ef4a56a498e5c497f SHA512 3b88aa7ff6e55556a6e438376c578a007d41d266dc91f6d56dfccde217bd0ede7ed40c10b05903582d9bde392f0a375f34b1fbdfd1aae0204f46b9d7e6c246ef -EBUILD gnome-shell-extension-gsconnect-12.ebuild 1439 BLAKE2B cc555b929f416f68ca21f16e82f4974ea87ed81e40e6a6f1d0d26d922c9019b3f1d2401ceedb43f5a740bed88908e77e1fb4a92fb220714cfb4f74ca95063447 SHA512 496a23fdb4a1f0b0f617a7b49e7e00faaf78ca06ab86fce24e387b8470f3b6b61fa9e52a1a092875334b986ac024ba33700e34059650e623391a9bf85748e9ef +EBUILD gnome-shell-extension-gsconnect-12-r1.ebuild 1467 BLAKE2B f89f94c2a40773189c8c23e6e39bb26d3e56ad3870ffbf878fe751a9f4985fe67a237a7607615de3e5855ccc4748197c0c154cb6bd522fe91582115031022f89 SHA512 8f8aa26056806b879abee4ba26dec54c72809d8bb94fc7209dce72ce2e6eac8f3dccdc2095ea7eb4ecb809387d466aabbe15ffbb40a804275b99994371fa66fb MISC metadata.xml 216 BLAKE2B 0fbfa16661345362ff89f87adc0bb42fc5f5c9145cdedb36f3f537b39af4023b91c4dfb0d8e83a4f9ac963141f594ba8ae678371c338d992a96e02c11fd84195 SHA512 628a69805356b7458edaa2297901224178b016477a937f77e692a78ce3e7a0b6d2d7b4c4b7e70d0185d7112e6a59a5131e07d8c950e90b9c8722471d7511afc6 diff --git a/gnome-extra/gnome-shell-extension-gsconnect/gnome-shell-extension-gsconnect-12-r1.ebuild b/gnome-extra/gnome-shell-extension-gsconnect/gnome-shell-extension-gsconnect-12-r1.ebuild new file mode 100644 index 000000000000..8fb81e051a80 --- /dev/null +++ b/gnome-extra/gnome-shell-extension-gsconnect/gnome-shell-extension-gsconnect-12-r1.ebuild @@ -0,0 +1,56 @@ +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 +inherit gnome2-utils meson readme.gentoo-r1 + +DESCRIPTION="KDE Connect implementation for Gnome Shell" +HOMEPAGE="https://github.com/andyholmes/gnome-shell-extension-gsconnect" +SRC_URI="https://github.com/andyholmes/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="GPL-2+" +SLOT="0" +KEYWORDS="amd64" +IUSE="" + +COMMON_DEPEND="dev-libs/glib:2" + +RDEPEND="${COMMON_DEPEND} + app-eselect/eselect-gnome-shell-extensions + >=dev-libs/gjs-1.48 + dev-python/nautilus-python + >=gnome-base/gnome-shell-3.24 + gnome-base/nautilus[introspection] + net-fs/sshfs + || ( ( net-libs/gnome-online-accounts dev-libs/libgdata ) dev-libs/folks ) + || ( media-libs/libcanberra media-libs/gsound ) +" +DEPEND="${COMMON_DEPEND} + virtual/pkgconfig +" + +DISABLE_AUTOFORMATTING="yes" +DOC_CONTENTS="For knowing more about how to do the setup, please visit: +https://github.com/andyholmes/gnome-shell-extension-gsconnect/wiki/Installation" + +src_install() { + meson_src_install + + # Rule for install is not complete, only works for install-zip + # target + glib-compile-schemas "${ED}"/usr/share/gnome-shell/extensions/gsconnect@andyholmes.github.io/schemas || die + + readme.gentoo_create_doc +} + +pkg_postinst() { + gnome2_schemas_update + ebegin "Updating list of installed extensions" + eselect gnome-shell-extensions update + eend $? + readme.gentoo_print_elog +} + +pkg_postrm() { + gnome2_schemas_update +} diff --git a/gnome-extra/gnome-shell-extension-gsconnect/gnome-shell-extension-gsconnect-12.ebuild b/gnome-extra/gnome-shell-extension-gsconnect/gnome-shell-extension-gsconnect-12.ebuild deleted file mode 100644 index 2dd95cd96429..000000000000 --- a/gnome-extra/gnome-shell-extension-gsconnect/gnome-shell-extension-gsconnect-12.ebuild +++ /dev/null @@ -1,55 +0,0 @@ -# Copyright 1999-2018 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -inherit gnome2-utils meson readme.gentoo-r1 - -DESCRIPTION="KDE Connect implementation for Gnome Shell" -HOMEPAGE="https://github.com/andyholmes/gnome-shell-extension-gsconnect" -SRC_URI="https://github.com/andyholmes/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="GPL-2+" -SLOT="0" -KEYWORDS="amd64" -IUSE="" - -COMMON_DEPEND="dev-libs/glib:2" - -RDEPEND="${COMMON_DEPEND} - app-eselect/eselect-gnome-shell-extensions - >=dev-libs/gjs-1.48 - >=gnome-base/gnome-shell-3.24 - gnome-base/nautilus[introspection] - net-fs/sshfs - || ( ( net-libs/gnome-online-accounts dev-libs/libgdata ) dev-libs/folks ) - || ( media-libs/libcanberra media-libs/gsound ) -" -DEPEND="${COMMON_DEPEND} - virtual/pkgconfig -" - -DISABLE_AUTOFORMATTING="yes" -DOC_CONTENTS="For knowing more about how to do the setup, please visit: -https://github.com/andyholmes/gnome-shell-extension-gsconnect/wiki/Installation" - -src_install() { - meson_src_install - - # Rule for install is not complete, only works for install-zip - # target - glib-compile-schemas "${ED}"/usr/share/gnome-shell/extensions/gsconnect@andyholmes.github.io/schemas || die - - readme.gentoo_create_doc -} - -pkg_postinst() { - gnome2_schemas_update - ebegin "Updating list of installed extensions" - eselect gnome-shell-extensions update - eend $? - readme.gentoo_print_elog -} - -pkg_postrm() { - gnome2_schemas_update -} diff --git a/gnome-extra/libgda/Manifest b/gnome-extra/libgda/Manifest index f266c22ff432..99a9b294cd92 100644 --- a/gnome-extra/libgda/Manifest +++ b/gnome-extra/libgda/Manifest @@ -6,5 +6,5 @@ AUX libgda-5.2.4-vala-check.patch 920 BLAKE2B 97ec35e7f3bceaa05ffb31dbb1bc895240 DIST libgda-5.2.4.tar.xz 12320228 BLAKE2B 567b82934e9fe05abdd7405f17c3e8db1a335698236aed069c66037bb387f34adfc41eae7663d8cedb1ba97d2b54afda15280d745c574e5b28cb1856ff8376b1 SHA512 90449795a64136389c26ee4bbdbd5c1330d441e6c11ff15eff83d0ee39c4ce3abd686222aaa468995496ba1417c0fbc963898107f1806d80648cdc939d3c87cc DIST libgda-5.2.8.tar.xz 12506208 BLAKE2B 7174aa862f04ec6c73fe98560914ee307afe75b9713adad70fa7dedf97fd4ddb79c98ad1e9a8919218f7453014d8e71e42730e168fae7c6ca0dc58ae99b0558e SHA512 6512d08df072dfc10837b71b2369ab538fa8bf0cdac51ecbb738a138f5b765f030fc7a88b14232eaab2724af8e749898da146bb63969983d3bcfeb11bc22aece EBUILD libgda-5.2.4-r2.ebuild 4949 BLAKE2B 554ec6cc79bb402d73d9cc86c59a16f49d235388abd83ab085a77f75dd4f6ca9b99461220e24436059a5e0add9bdca99a9ba37c407229ee6baf43c47780cde30 SHA512 c59cbf63e1f5f8256a2b54bf3b31eebab3ae05fc90e24f7519ec9e3dc76c3380779a23c0c3501a2f2880b7972528f0948d49d53738976043a6b6754a07a6c184 -EBUILD libgda-5.2.8.ebuild 5020 BLAKE2B c5d5f7bff23e606c109e28d1902023d16f50ae10d15204b46024e00de2476e3024128aacaaae38195c3243348cb5de5f426b8da937aaa6b254fc52e918784d9b SHA512 0a8019b11978e5fed29b6e69434e883e330f7a3247ace6bf539636efe180ddd80d53dfae2140488c669cadb1984ef39da9f310f2081ed7acbf4b8aec77e38685 +EBUILD libgda-5.2.8.ebuild 5064 BLAKE2B 49382d9e5de106d987193134ea65aaa03cb9b6fae17d1b85be929111d8066e9249cbf0e4bbebcac125f3903f4e938c9f34e4234024cf8981ad4475f1e158fb81 SHA512 0424e4bccac3f59bfbef3953cac7240954987fb99c53dc8fe991b06e16fc10805c29ed215ba702ec70d59c7c4dd63b7631502ef6f41f41f8b5488f56f17e8543 MISC metadata.xml 759 BLAKE2B ce4b021f5697460110c6d976231579b4299875991f28fad526ce29b83da1db248d0be46eb83e1f2704c3aa997b1a7f4546f901410ee1751dbd2d03718fc2e935 SHA512 aa0bce4d0262948dc57ce220d453a92dd957db925dc381a362055e5a5d09479cf3954e1bc19966cca21ab0e4d9e41f8611242bcf9f3fe1051388c5a8094c851e diff --git a/gnome-extra/libgda/libgda-5.2.8.ebuild b/gnome-extra/libgda/libgda-5.2.8.ebuild index 0eb06d4b35cc..6570bb39df71 100644 --- a/gnome-extra/libgda/libgda-5.2.8.ebuild +++ b/gnome-extra/libgda/libgda-5.2.8.ebuild @@ -143,6 +143,7 @@ src_configure() { "$(use_with java java $JAVA_HOME)" \ $(use_enable json) \ $(use_with ldap) \ + --with-ldap-libdir-name="$(get_libdir)" \ $(use_with mdb mdb /usr) \ $(use_with mysql mysql /usr) \ $(use_with oci8 oracle) \ -- cgit v1.2.3