From 22910f5d14da606bd7f06e19a2f61c5d1a8fc94b Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Fri, 25 May 2018 15:22:17 +0100 Subject: gentoo resync : 25.05.2018 --- media-gfx/Manifest.gz | Bin 41931 -> 41922 bytes media-gfx/inkscape/Manifest | 5 +- .../files/inkscape-0.92.3-freetype_pkgconfig.patch | 22 ++++++- .../files/inkscape-0.92.3-poppler-0.65.patch | 29 ++++++++++ media-gfx/inkscape/inkscape-0.92.3.ebuild | 1 + media-gfx/shotwell/Manifest | 2 + media-gfx/shotwell/shotwell-0.29.2.ebuild | 63 +++++++++++++++++++++ 7 files changed, 117 insertions(+), 5 deletions(-) create mode 100644 media-gfx/inkscape/files/inkscape-0.92.3-poppler-0.65.patch create mode 100644 media-gfx/shotwell/shotwell-0.29.2.ebuild (limited to 'media-gfx') diff --git a/media-gfx/Manifest.gz b/media-gfx/Manifest.gz index 9a2338d94d01..9ac5b8f32478 100644 Binary files a/media-gfx/Manifest.gz and b/media-gfx/Manifest.gz differ diff --git a/media-gfx/inkscape/Manifest b/media-gfx/inkscape/Manifest index 749b212cfab5..978fb80e7f28 100644 --- a/media-gfx/inkscape/Manifest +++ b/media-gfx/inkscape/Manifest @@ -4,11 +4,12 @@ AUX inkscape-0.91_pre3-exif.patch 321 BLAKE2B 36f9d7ce19c1716b56800431ac095f047c AUX inkscape-0.91_pre3-sk-man.patch 362 BLAKE2B adfe363332dcf46297d01feb986ffaf4e5fe2f2db88c5d7e663e477736a56f226183caa90ca2b421f064ce42e5e7b4e81419026681987aa85040f4379c74511d SHA512 5b4b6fd927b88fbf5d113da7fbd70a5d39a7926849b7e0118bbade0218e8429e751d977e0630894ba7f024d1628c4ff9e54c9a0a4ed6b9b87315e200b04bd8ab AUX inkscape-0.92.1-automagic.patch 5421 BLAKE2B 0885e9f785b7884e10659c1f8aace9a843113b5d1c059251c75297ef828eb7c704815798c861e03060c89c02e36cb45edf566065234d330c1757e8f2bcc89688 SHA512 c6bc791c8e0a4302f2b21c1ad4d39e8e880017f4cdcf8b23d7749498a0f0a1d2460abeab3216e9eeb6b87a300e17451ace86c738c58a174e92946cb280ef43b9 AUX inkscape-0.92.1-desktop.patch 919 BLAKE2B c9952613e8d8dca1cd11146afd4d8db210be0f65f61b1a674cf5443dfaed3422e7082667cb93e183589d1e840ac3b55c7e70d03f44c0302b8c7db8ae621a976d SHA512 0000e5c6bd83e7d3994712d5a9f7369b2ecb7a15ba8371bfc9e2646b33293334eff987ffc360c2753025d0561395368024587d71ffc015f5a0e8c39077fd45b2 -AUX inkscape-0.92.3-freetype_pkgconfig.patch 489 BLAKE2B 4f0e9dda521f21dc888267193ddba63ec89011cf8dbd32c0901991e58397f0c22134c1a7647239cb6bc26c4d45d5583bbaac83fb4a26681122cc8cf488a93a58 SHA512 da286f5eea8bdc443d0b4b3c2ffb6a403b4ea85f7f355545ea5dde05bb75e59e0a0bb42d28d5cbc77115acd2e0ebecf48536664a508ffb788c7f3e09a59557b4 +AUX inkscape-0.92.3-freetype_pkgconfig.patch 948 BLAKE2B 4a21ed3ef6c002a6fd756b31989d531f94f0bbf2c9bad2ac5fdb453f8a1a5c169e71d7ef5d71ca55072f76fd31646589a62c06b5d44809f6ef873cbe1edca1f9 SHA512 95a265b0e7e9fda74a9bcf31eb6d23afead4c71567126ca893b75c0dcc87f5b03e38c30e2917b4278dbf4fcaf35c2b3fe7a1b509a43b19212c814a2a2b9de53d AUX inkscape-0.92.3-poppler-0.64.patch 4493 BLAKE2B 3ee9635cf8b287c1a530a8a70876c92c1e941e6d89a9a74e4f6bb3fdd445bc60a47c8adb6f567f8bc539241c0884ca093add00ede19dfba3220ffcccde0a5384 SHA512 dbfc28ec5dd7b96c7994ab57bcde95baa57ec600d2ec5458c242273407d822f0947d8fd2ef0ce7ac07125f108314a25eb1646aaad474fa150e3010031c1807bb +AUX inkscape-0.92.3-poppler-0.65.patch 904 BLAKE2B cd31960bf20fbc3cff762949d435838864ebff18dbcef99a658ed5732a3c7fe647c2a7e4b15bdf79a6c445f523dd2b7c19b3c3bc71cc656f0dabfc2bf5ce7ce4 SHA512 38887caacfd8c37f017b8b9c3a6de09aaa1d1ea7caffe9ab91d234b162a36bb4fc19e4985acd9a120929f4941126be31fc9d51a84628803157746834b60de8bb DIST inkscape-0.92.1-poppler.patch 44142 BLAKE2B 4431a4185cfeb6c41f08da656db4335017fc08a62e154f75ef4ef1a2ae92dd510f22a4f9cd1cf8bb1fae09770f47a398b7b789c8bad4e47bc4941b9e8f79c1f0 SHA512 4a0504c236c816f413b3bf055754513bb53b52eb5f0323faa28ab445ce3fb83b6f41de5bc6e3865909e50fc9be937e3f99282e8414f4cdc954e04b974d7f15ab DIST inkscape-0.92.2.tar.bz2 31224100 BLAKE2B c0a7b01220d1b0b0863f71f3e1c8ba7bdb58bd86e79c2d3f214831a344c992a1084d64813de00e6f88d77b1b1f1b8562c7a0ee98824149cb867eba586314d27d SHA512 e790cafb7cc2be2eb75f04ac4c18ae8558ae997f4261c38dac9c2a3383c7a12a0f4a090956770d1341b212fc9698d31d212f2c1609421907255f8af650569b30 DIST inkscape-0.92.3.tar.bz2 31606442 BLAKE2B bc90dc160ca059395a2951b7b2daeb8730753c551f78e6af88b51b41322a438256499f754fb6b07946d77b80e1ddfe5514944f9b5cbb19d2bfdecb8625328db0 SHA512 af3c0f672a108e583f3c92cde1451b3f1f5319c1669891005c230e73b3485aa8951af6d7b21c7ccd9e4acbca8eaa5a3bb61ae1d828e81885bc7b61a8ae933687 EBUILD inkscape-0.92.2.ebuild 3875 BLAKE2B 980f69de82cfd74d88e0dccd55fa8500847aba1614ee291e990bcc167dd409e61dccc473d6a62711a125d6586ab26cb9d4c661dcbdea4af6adcca5508785fad9 SHA512 258802353c77b8a1cbec4df73aacc0edfb6b601d6a9a8200f7cf82c97f5bd7582033d547c9f7df1d8ebefd1d8fab2a6ccdd5c9efebbfa05df21990cedcb5a500 -EBUILD inkscape-0.92.3.ebuild 3911 BLAKE2B a351a676e95df783f9105922c90c89a9f68b2a81ec9e6cb516f943a4d6b5964c6eae212b2967aac4a6c1b37607df90da8f2fd9586c74249df315e29987c93a37 SHA512 c15f6a8b96b2eab7a4b2dc1bdd27104c048a6d5e43e0effdb987eeebda59e91cc14c2f47300128a620a1f53682724f6ec9b537b72dc18a44e992401811b1b103 +EBUILD inkscape-0.92.3.ebuild 3958 BLAKE2B 301b320e79f50648df33780705180fbb0b781d7b1e65cbe755c56aa6178ae2cc6962922a2cef62b5e663ac7197a8ef9c8676b5631099646238663de618cacf1b SHA512 bac3b875f935d5a64a85058b33571693ad394b0fb7a14f0b0ae7d20d33d1e1df52c7b3c55396822c7bd9fcfed739cb0064b1cd9d2aad54d3836d6237f163eb57 MISC metadata.xml 812 BLAKE2B 9b06a44ec7ded4b7b4618813bb4b2b5deed3bbc45fd43cffcf435594f3141943a45e592bf2947b00895f0f40d40b0fbe51109daa63f73f3276f50afec620d9fa SHA512 dbe4bb2e918a4c8a20c9a273cef29976d8cfe74e6c2ae1ba8cb77f592c885e8353b7bc3ca8f529e00629f6a0ac7627877cdef68fe07472fc1f417abba5d0268b diff --git a/media-gfx/inkscape/files/inkscape-0.92.3-freetype_pkgconfig.patch b/media-gfx/inkscape/files/inkscape-0.92.3-freetype_pkgconfig.patch index 0f577bd0e9ab..d00c23d8addc 100644 --- a/media-gfx/inkscape/files/inkscape-0.92.3-freetype_pkgconfig.patch +++ b/media-gfx/inkscape/files/inkscape-0.92.3-freetype_pkgconfig.patch @@ -1,6 +1,19 @@ ---- inkscape-0.92.3/configure.ac -+++ inkscape-0.92.3/configure.ac -@@ -252,12 +252,9 @@ +From 62ed18b4d99e690298cc1984b6f2df2363d165fe Mon Sep 17 00:00:00 2001 +From: Lars Wendler +Date: Fri, 18 May 2018 07:55:38 +0200 +Subject: [PATCH] Use pkg-config to find freetype + +As of freetype-2.9.1 the freetype-config file no longer gets installed +by default. +--- + configure.ac | 9 +++------ + 1 file changed, 3 insertions(+), 6 deletions(-) + +diff --git a/configure.ac b/configure.ac +index 12a081612b..1b75e23670 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -252,12 +252,9 @@ AC_CHECK_FUNCS([mallinfo], [ [#include ]) ]) @@ -16,3 +29,6 @@ AC_SUBST(FREETYPE_CFLAGS) AC_SUBST(FREETYPE_LIBS) +-- +2.17.0 + diff --git a/media-gfx/inkscape/files/inkscape-0.92.3-poppler-0.65.patch b/media-gfx/inkscape/files/inkscape-0.92.3-poppler-0.65.patch new file mode 100644 index 000000000000..86d9e48396df --- /dev/null +++ b/media-gfx/inkscape/files/inkscape-0.92.3-poppler-0.65.patch @@ -0,0 +1,29 @@ +From 332a80f4847715546be9a00756f693b4aa1316e2 Mon Sep 17 00:00:00 2001 +From: Jan Palus +Date: Fri, 25 May 2018 00:30:17 +0200 +Subject: [PATCH] Fix compilation with poppler 0.65.0 + +replace unused includes with one that is actually used + +Signed-off-by: Jan Palus +--- + src/extension/internal/pdfinput/pdf-parser.cpp | 3 +-- + 1 file changed, 1 insertion(+), 2 deletions(-) + +diff --git a/src/extension/internal/pdfinput/pdf-parser.cpp b/src/extension/internal/pdfinput/pdf-parser.cpp +index 6c498f9..caaeca1 100644 +--- a/src/extension/internal/pdfinput/pdf-parser.cpp ++++ b/src/extension/internal/pdfinput/pdf-parser.cpp +@@ -37,8 +37,7 @@ extern "C" { + #include "util/units.h" + + #include "goo/gmem.h" +-#include "goo/GooTimer.h" +-#include "goo/GooHash.h" ++#include "goo/GooString.h" + #include "GlobalParams.h" + #include "CharTypes.h" + #include "Object.h" +-- +2.17.0 + diff --git a/media-gfx/inkscape/inkscape-0.92.3.ebuild b/media-gfx/inkscape/inkscape-0.92.3.ebuild index 97020416d36e..89ad5363774c 100644 --- a/media-gfx/inkscape/inkscape-0.92.3.ebuild +++ b/media-gfx/inkscape/inkscape-0.92.3.ebuild @@ -101,6 +101,7 @@ PATCHES=( "${FILESDIR}/${PN}-0.48.4-epython.patch" "${FILESDIR}/${PN}-0.92.3-freetype_pkgconfig.patch" "${FILESDIR}/${PN}-0.92.3-poppler-0.64.patch" + "${FILESDIR}/${PN}-0.92.3-poppler-0.65.patch" ) S="${WORKDIR}/${MY_P}" diff --git a/media-gfx/shotwell/Manifest b/media-gfx/shotwell/Manifest index 34e8897d743d..96fc5403c99f 100644 --- a/media-gfx/shotwell/Manifest +++ b/media-gfx/shotwell/Manifest @@ -2,8 +2,10 @@ DIST shotwell-0.26.4.tar.xz 5619280 BLAKE2B 0ca9ecf6e96019aa8e9bd4bae09d1b888902 DIST shotwell-0.28.2.tar.xz 5582276 BLAKE2B 20d35f714543d35bd04fe81617040419664e662664ae504cbfb0b3bb160d97a5469478e1e134b6432b174fc19bb4fc370b5eb38c576c805e876d00999fb7d979 SHA512 dc00f45e55eabadaaf825de5a4152d40db2eb652f966b870a08d36006887a18aacf570b05d232a9fc7ef7df097a468a497778022bf7b86ae2143877c02540cc0 DIST shotwell-0.28.3.tar.xz 5531900 BLAKE2B b585989434e3da9b2d5f43aabf41451e33b7b2f537a21305ff9decd9992d42e5422971d1f89836936630f641efdac1242dc21574d86f61a4c71562b657e0300d SHA512 9a0c15bfe856dabaa85038fe875cc178be6a3e104397b36555005615212ac92579234fc6277f1a4a7bddba517e9ea0db5ed06e0fc30614453e3db1153b47dc16 DIST shotwell-0.29.1.tar.xz 2368080 BLAKE2B b706229803528c55486219a4190d1145d98b513ff26a4a3d2989abd57ff3465ffab231b1779014b7babf7ce33cc875fa11905a95bbf108251c57d3692a5156a4 SHA512 25e7e7d303ecbe89ecf4eba219b6f10ad44d23209d2c2724c6d61afae47afc0a6e1a7a7fe99931888f7374419818c5d74e28bb6120383e191c038c967c84ce39 +DIST shotwell-0.29.2.tar.xz 2321576 BLAKE2B 2dd3c959ca8aba6ecb7c3c15ca491291a2c6ead860fac9c1fb1b97ad22140ce9e67617dd268b2d4d362bb8a0c2606d97b5cc71c12e19fcb59fec0185f27c3f0f SHA512 98c57d511a384ced717e2fb410af16326080e2291fce77ea953a377430459c7a81de73118925b2d42bf96b8b717efc93a898d0d859fbab1364c0c192dbb60311 EBUILD shotwell-0.26.4.ebuild 1488 BLAKE2B a18a437d65ca3a9999f0f238d7442564c012b08d209384d8b47fedd12a8eca4c1e91e28ba18b456ff860c56a16cd1059b2d7a0541d06f10d2937efcf893a607b SHA512 2cd5b9e390f61de3d0db9ff5d0ea59ff36eef745afb237ea82d87f584fda7ca200b95eb7273e1a74f401e5a7187e8eb78c98910723d68dccdf90535a094bd0d6 EBUILD shotwell-0.28.2.ebuild 1488 BLAKE2B a18a437d65ca3a9999f0f238d7442564c012b08d209384d8b47fedd12a8eca4c1e91e28ba18b456ff860c56a16cd1059b2d7a0541d06f10d2937efcf893a607b SHA512 2cd5b9e390f61de3d0db9ff5d0ea59ff36eef745afb237ea82d87f584fda7ca200b95eb7273e1a74f401e5a7187e8eb78c98910723d68dccdf90535a094bd0d6 EBUILD shotwell-0.28.3.ebuild 1490 BLAKE2B b6ddc14476e5cccc9b2d023c4c263d7672fe0b6533f9816344be00b490d484eb01da730b1bd1635d1728a6a34dd80a5728ce6adcb8fcd7da8a6fa0776b2cac46 SHA512 4de0d6fc6c0f9a942248a49115ff1468f23f1e34714b23d7eebd44869cae5e42b7501587118e67017d703932d598a30d27325858e9989a1dd81c292dc05b095a EBUILD shotwell-0.29.1.ebuild 1490 BLAKE2B b6ddc14476e5cccc9b2d023c4c263d7672fe0b6533f9816344be00b490d484eb01da730b1bd1635d1728a6a34dd80a5728ce6adcb8fcd7da8a6fa0776b2cac46 SHA512 4de0d6fc6c0f9a942248a49115ff1468f23f1e34714b23d7eebd44869cae5e42b7501587118e67017d703932d598a30d27325858e9989a1dd81c292dc05b095a +EBUILD shotwell-0.29.2.ebuild 1490 BLAKE2B b6ddc14476e5cccc9b2d023c4c263d7672fe0b6533f9816344be00b490d484eb01da730b1bd1635d1728a6a34dd80a5728ce6adcb8fcd7da8a6fa0776b2cac46 SHA512 4de0d6fc6c0f9a942248a49115ff1468f23f1e34714b23d7eebd44869cae5e42b7501587118e67017d703932d598a30d27325858e9989a1dd81c292dc05b095a MISC metadata.xml 900 BLAKE2B 62d1bd65c242a5da435f9217c538250495879be4d0b2de3477111018ed456f019abeb0bf678835997ff2c567fdbb844ca257d0c4bad8d07c3ad590adc82202cf SHA512 aab4bb7556cb7fc926b59e68d16a2425af57cab5ae80c68ce2dd650bf49b9e3872771fee51552aa0aba9c50167a33b1976700f65bbc1531de44ac638cdd4a0be diff --git a/media-gfx/shotwell/shotwell-0.29.2.ebuild b/media-gfx/shotwell/shotwell-0.29.2.ebuild new file mode 100644 index 000000000000..ed1f73414218 --- /dev/null +++ b/media-gfx/shotwell/shotwell-0.29.2.ebuild @@ -0,0 +1,63 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 +GNOME2_LA_PUNT="yes" +VALA_MIN_API_VERSION="0.28" + +inherit gnome2 multilib toolchain-funcs vala versionator + +MY_PV=$(get_version_component_range 1-2) +DESCRIPTION="Open source photo manager for GNOME" +HOMEPAGE="https://wiki.gnome.org/Apps/Shotwell" + +LICENSE="LGPL-2.1" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86" +IUSE="" + +RDEPEND=" + >=app-crypt/gcr-3[gtk] + >=dev-db/sqlite-3.5.9:3 + >=dev-libs/glib-2.40.0:2 + >=dev-libs/json-glib-0.7.6 + >=dev-libs/libgee-0.8.5:0.8 + >=dev-libs/libxml2-2.6.32:2 + gnome-base/dconf + >=media-libs/gexiv2-0.10.4 + media-libs/gst-plugins-base:1.0 + media-libs/gst-plugins-good:1.0 + media-libs/gstreamer:1.0 + media-libs/lcms:2 + >=media-libs/libexif-0.6.16:= + >=media-libs/libgphoto2-2.5:= + >=media-libs/libraw-0.13.2:= + media-plugins/gst-plugins-gdkpixbuf:1.0 + >=net-libs/libsoup-2.42.0:2.4 + net-libs/webkit-gtk:4 + virtual/libgudev:=[introspection] + >=x11-libs/gtk+-3.14.0:3[X] + dev-libs/libgdata + +" +DEPEND="${RDEPEND} + $(vala_depend) + dev-util/itstool + >=sys-devel/gettext-0.19.7 + >=sys-devel/m4-1.4.13 + virtual/pkgconfig +" + +# This probably comes from libraries that +# shotwell-video-thumbnailer links to. +# Nothing we can do at the moment. #435048 +QA_FLAGS_IGNORED="/usr/libexec/${PN}/${PN}-video-thumbnailer" + +src_prepare() { + vala_src_prepare + gnome2_src_prepare +} + +src_configure() { + gnome2_src_configure --disable-static +} -- cgit v1.2.3