diff options
| author | V3n3RiX <venerix@redcorelinux.org> | 2019-09-13 17:49:31 +0100 |
|---|---|---|
| committer | V3n3RiX <venerix@redcorelinux.org> | 2019-09-13 17:49:31 +0100 |
| commit | 36ac65103bf5503e5bad1ecc7e8cb9e7643f6840 (patch) | |
| tree | d9d1fbc20509d4c90f57fb2d9e1459bc8034c831 /media-gfx | |
| parent | a1392efe64137262023d92492396ca9156d22396 (diff) | |
Revert "gentoo resync : 13.09.2019"
This reverts commit a1392efe64137262023d92492396ca9156d22396.
Diffstat (limited to 'media-gfx')
43 files changed, 1121 insertions, 166 deletions
diff --git a/media-gfx/Manifest.gz b/media-gfx/Manifest.gz Binary files differindex c55589ddbdd2..1eb434555a4d 100644 --- a/media-gfx/Manifest.gz +++ b/media-gfx/Manifest.gz diff --git a/media-gfx/digikam/Manifest b/media-gfx/digikam/Manifest index d07a110b30be..c5b96ee029e2 100644 --- a/media-gfx/digikam/Manifest +++ b/media-gfx/digikam/Manifest @@ -1,10 +1,13 @@ +AUX digikam-6.0.0-cmake.patch 1972 BLAKE2B 103f282e8cdc33d6e7cc3982bb15b290ff2381846d6262005922b97df1b54d9dd7572fb95eee01a3cf413dda9eed28e0201123bfedddc7beda6dc4ddc99e5d55 SHA512 8efe171f763692efd7c8449e1365e2d531a4d1b6da79fe1f5048dbe1b328f70b6e923298015f2a162751843eb88db2dd1af744a2b2cd3219e0f44aea4d3a569a AUX digikam-6.2.0-cmake.patch 2011 BLAKE2B da9e459cd8c7f89d986166cf19dde36d599565f573831057c0d68706c05f4b49240215e159d36e377f16b178c7de04e713bdfb3214bd83e114cbbd5b40f4f37a SHA512 44a63a08da538bee35efc965789b463455646c3ee9ed8fbe6f22591155c20b623e48838af52f8b521a35b3548fe44909516a15a4d815347e61de71d07bbfad17 AUX digikam-6.2.0-googlephoto-upload.patch 1072 BLAKE2B 5384a259b2fdd15cf195fed8f5aa1a16a0af3932af1e2226b3bfd2be95d19f6fee003fd9d3344c0921ff5655d22ea4f30f98e8ed7c1e5dee1d4b91d4d031562e SHA512 c71ab51371e45538f33ba9603eabdc8e3e518f7e38aa274407d90f216a14f6071066f388291d072fca46eb6589e3cafe0eb5b78f3bb3520ca9aa85add092d265 AUX digikam-6.2.0-imagemagick-7.0.8.60.patch 641 BLAKE2B c2a7261a92cb757aa39f2ccb5a561b8cb34563540e1c0e84662a056dad66e17c941a77ee9d42b168e83d18f72786e9bf49e741f73bf20c714496fad80ad22987 SHA512 d1ecf5a25a3cdf542ababa6d4306bf6bce25b5f04e8f880460a8a67f4f4eac283f139b82848a085a28dc16b0a8a9310a3ed294d110105b0562239ef21ce6e442 AUX digikam-6.3.0-cmake.patch 2038 BLAKE2B 73c6c7d008c3b76f9347f4192d435e10aa3607abf62436372ef131ac034ef538c1baa8d0d03e6b587b771fb766fa3286c649a6ffc7640a2f21e292b1e524cab6 SHA512 c8e6d2fd6c18d8c8e8733dffd1e0e2fb66b8bf3496aa6f767a4c633a56733c85bc53bdceaf689e84beca672a5013a02349cfca73d9f1e89a99252c7bac526a4d AUX digikam-6.3.0-googlephoto-import-crash.patch 2815 BLAKE2B e39efa7815aef3f7b165e0915610e54af188479af3bef140717d5d903e557bb0da49fa493e06df9a76b9695df7ebe84cbf6132674209f45476da0a1d4752ceb7 SHA512 523dc9add1ee5b9ffb675c1983e8f54624b7537dbec567a60661fdd58b045978f2a794a47093f5a3d268e4aa159a8064cd6b261798bf19cfeb5241fd5ce4cdb8 +DIST digikam-6.0.0.tar.xz 331386500 BLAKE2B 93da3822ad10b3c017aadcdcc1501af5dfcfa07640d73b6987cc7e1229573e02489c166abf16a07378466fcd2bf7c4423415af563b5ab835e6d5d8ea63a04eba SHA512 b8a70dde0b3838c4ccaffa3324eacb0541642e82177c90a1f8fcbd9691c194369f2760c4ea56c58b7ae049fc1a748d5d88cb537c62e3700ed5e21bad44d01adb DIST digikam-6.2.0.tar.xz 339472960 BLAKE2B 0db48839474d599a364fba73cad751b889fe6f37c88323d1feddce67acb0ecad306c67976e1524328e6aaf33464c9dd35b1b85cf3c41ba72be9cef664e30d520 SHA512 05667c91af290df0eabd3b18a7c6741ded3f1b01b0a9cb572d6df79f25787d0291624760d6c0fa23bd36665a94bc7ccba845c117ee381de7edff97d1d4158e56 DIST digikam-6.3.0.tar.xz 335641824 BLAKE2B 1ecddeee653d6b97570aa3616c6dd0a951210983400fe8aca19ee9e01aef29820f0ab32e3cbc2e92e833868f0f652c5bdd0809324437b6fa778dfdaf04ea3c83 SHA512 9463d7a8351acae32e2fa77c96026d1cb60e56fcc20ad2b71ac7461ff1e5e2e02ca0ef8a12e4d5ae2324aa66e185cdf5b237d6330f4741691876977e773511ce -EBUILD digikam-6.2.0.ebuild 4166 BLAKE2B 7dda2079c57b887ba01a6243c6f5d4506baa4eb285b218d05c2ee6de84f1d1014154a621bcfc4c4980ec1dd5d4d1c2d3d6c80a33187b1e52638e9c67fb041ac5 SHA512 ee99c9c55687aa28283179c92e6e9fc1e19027206fe0ff3a51541da23bb024297c1d03c9ab59039f481820856ae44de03f4958db26333f3a9f0976c3729d8ea0 +EBUILD digikam-6.0.0.ebuild 3904 BLAKE2B d3184396f4e28bd1eb765074fcac1a5b29eac28444375502b09cbc6b74d36a24f62febe9a28e360ce25783223fe4c533d156b41f19a2a4e468cc63894be38b5d SHA512 7524e08ea4e8daa15786e3d5bf4f2fa085d88bf5687b9f1cb6809c3fb9b732f0532e1240a43d14da473d6221706fb19bc679f254b9d78b118561d3376792cf60 +EBUILD digikam-6.2.0.ebuild 4167 BLAKE2B 42ea9b4b5a8e407b6c6b60cb1af2e9de1a4ad7db15ec7e34df559c88734a7e70756db554250cbfcb8a6c193b5afc44b48e9b56fed2694573d61c31d6851b7f02 SHA512 8275593169c750e21d779946f7b2d11bda4c5f767d4d83a7d2b643e1df8f12a6eff971f4e6a1d719137d7d58009851121936b8d77ae913a6323084edf7e1ea79 EBUILD digikam-6.3.0.ebuild 4127 BLAKE2B dd3aadddedca2bb93412994ff869c486b9653eedeea4faffc4dc970886b80448a0d487cc36173ea93a93e617aebfec39f012910a18885ef1f468093dfbb165e8 SHA512 58c0c44f993dd4ed6088ca6697c9f2a00ea7c33b75f6c80877308cc17d0a292305b9c423d7eae7e4896571097d3025602714c4e8379732f66949f9fb0264d2fe MISC metadata.xml 1256 BLAKE2B c3899279a6382ac2b2a12f5b94938db2324093bd63e0db8e3f82bb56ea9944d4369b793f7fa039c2c08af1887e4cc51d58f4e89a57c81b18cb5f896ef4cd0a5c SHA512 9b220b4271d0cb7b9fd5549fec165c4bc20c250cc66ce14ecb3cb16d0eb8355f35d0e585d9d800ed70437b3cd5434bcacc7dfd783f2a5683dbe1b1b3ce48356f diff --git a/media-gfx/digikam/digikam-6.0.0.ebuild b/media-gfx/digikam/digikam-6.0.0.ebuild new file mode 100644 index 000000000000..2e6852810eb2 --- /dev/null +++ b/media-gfx/digikam/digikam-6.0.0.ebuild @@ -0,0 +1,143 @@ +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +CMAKE_MAKEFILE_GENERATOR="emake" # keep until CMAKE_MIN_VERSION=3.13.4 +inherit kde5 toolchain-funcs + +if [[ ${KDE_BUILD_TYPE} != live ]]; then + MY_PV=${PV/_/-} + MY_P=${PN}-${MY_PV} + SRC_BRANCH=stable + [[ ${PV} =~ beta[0-9]$ ]] && SRC_BRANCH=unstable + SRC_URI="mirror://kde/${SRC_BRANCH}/digikam/${PV}/${MY_P}.tar.xz" + KEYWORDS="amd64 x86" + S="${WORKDIR}/${MY_P}" +fi + +DESCRIPTION="Digital photo management application" +HOMEPAGE="https://www.digikam.org/" + +LICENSE="GPL-2" +IUSE="addressbook calendar gphoto2 +lensfun libav marble mediaplayer mysql opengl openmp +panorama scanner semantic-desktop vkontakte webkit X" + +BDEPEND=" + sys-devel/gettext + panorama? ( + sys-devel/bison + sys-devel/flex + ) +" +COMMON_DEPEND=" + $(add_frameworks_dep kconfig) + $(add_frameworks_dep kconfigwidgets) + $(add_frameworks_dep kcoreaddons) + $(add_frameworks_dep ki18n) + $(add_frameworks_dep kiconthemes) + $(add_frameworks_dep kio) + $(add_frameworks_dep knotifications) + $(add_frameworks_dep knotifyconfig) + $(add_frameworks_dep kservice) + $(add_frameworks_dep kwidgetsaddons) + $(add_frameworks_dep kwindowsystem) + $(add_frameworks_dep kxmlgui) + $(add_frameworks_dep solid) + $(add_qt_dep qtconcurrent) + $(add_qt_dep qtdbus) + $(add_qt_dep qtgui '-gles2') + $(add_qt_dep qtnetwork) + $(add_qt_dep qtprintsupport) + $(add_qt_dep qtsql 'mysql?') + $(add_qt_dep qtwidgets) + $(add_qt_dep qtxml) + $(add_qt_dep qtxmlpatterns) + dev-libs/expat + >=media-gfx/exiv2-0.26:= + media-libs/lcms:2 + media-libs/liblqr + media-libs/libpng:0= + >=media-libs/opencv-3.1.0:= + media-libs/tiff:0 + virtual/jpeg:0 + addressbook? ( + $(add_kdeapps_dep akonadi-contacts) + $(add_kdeapps_dep kcontacts) + ) + calendar? ( $(add_kdeapps_dep kcalcore) ) + gphoto2? ( media-libs/libgphoto2:= ) + lensfun? ( media-libs/lensfun ) + marble? ( + $(add_frameworks_dep kbookmarks) + $(add_kdeapps_dep marble) + $(add_qt_dep qtconcurrent) + ) + mediaplayer? ( + media-libs/qtav[opengl] + !libav? ( media-video/ffmpeg:= ) + libav? ( media-video/libav:= ) + ) + opengl? ( + $(add_qt_dep qtopengl) + virtual/opengl + ) + panorama? ( $(add_frameworks_dep threadweaver) ) + scanner? ( $(add_kdeapps_dep libksane) ) + semantic-desktop? ( $(add_frameworks_dep kfilemetadata) ) + vkontakte? ( net-libs/libkvkontakte:5 ) + !webkit? ( $(add_qt_dep qtwebengine 'widgets') ) + webkit? ( >=dev-qt/qtwebkit-5.212.0_pre20180120:5 ) + X? ( + $(add_qt_dep qtx11extras) + x11-libs/libX11 + ) +" +DEPEND="${COMMON_DEPEND} + dev-cpp/eigen:3 + dev-libs/boost[threads] +" +RDEPEND="${COMMON_DEPEND} + mysql? ( virtual/mysql[server] ) + panorama? ( media-gfx/hugin ) +" + +RESTRICT+=" test" +# bug 366505 + +PATCHES=( "${FILESDIR}/${P}-cmake.patch" ) + +pkg_pretend() { + [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp + kde5_pkg_pretend +} + +pkg_setup() { + [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp + kde5_pkg_setup +} + +# FIXME: Unbundle libraw (libs/rawengine/libraw) +src_configure() { + local mycmakeargs=( + -DENABLE_APPSTYLES=ON + -DENABLE_AKONADICONTACTSUPPORT=$(usex addressbook) + $(cmake-utils_use_find_package calendar KF5CalendarCore) + $(cmake-utils_use_find_package gphoto2 Gphoto2) + -DCMAKE_DISABLE_FIND_PACKAGE_Jasper=ON + $(cmake-utils_use_find_package lensfun LensFun) + $(cmake-utils_use_find_package marble Marble) + -DENABLE_MEDIAPLAYER=$(usex mediaplayer) + $(cmake-utils_use_find_package mediaplayer QtAV) + -DENABLE_MYSQLSUPPORT=$(usex mysql) + -DENABLE_INTERNALMYSQL=$(usex mysql) + $(cmake-utils_use_find_package opengl OpenGL) + $(cmake-utils_use_find_package panorama KF5ThreadWeaver) + $(cmake-utils_use_find_package scanner KF5Sane) + $(cmake-utils_use_find_package semantic-desktop KF5FileMetaData) + $(cmake-utils_use_find_package vkontakte KF5Vkontakte) + -DENABLE_QWEBENGINE=$(usex !webkit) + $(cmake-utils_use_find_package X X11) + ) + + kde5_src_configure +} diff --git a/media-gfx/digikam/digikam-6.2.0.ebuild b/media-gfx/digikam/digikam-6.2.0.ebuild index b91dd599e0f1..04257cd79584 100644 --- a/media-gfx/digikam/digikam-6.2.0.ebuild +++ b/media-gfx/digikam/digikam-6.2.0.ebuild @@ -12,7 +12,7 @@ if [[ ${KDE_BUILD_TYPE} != live ]]; then SRC_BRANCH=stable [[ ${PV} =~ beta[0-9]$ ]] && SRC_BRANCH=unstable SRC_URI="mirror://kde/${SRC_BRANCH}/digikam/${PV}/${MY_P}.tar.xz" - KEYWORDS="amd64 x86" + KEYWORDS="~amd64 x86" S="${WORKDIR}/${MY_P}" fi diff --git a/media-gfx/digikam/files/digikam-6.0.0-cmake.patch b/media-gfx/digikam/files/digikam-6.0.0-cmake.patch new file mode 100644 index 000000000000..f90067f48126 --- /dev/null +++ b/media-gfx/digikam/files/digikam-6.0.0-cmake.patch @@ -0,0 +1,62 @@ +From 0d24a8971700454533c66ab9fc63043c67d44da6 Mon Sep 17 00:00:00 2001 +From: Andreas Sturmlechner <andreas.sturmlechner@gmail.com> +Date: Sun, 17 Feb 2019 23:51:03 +0100 +Subject: [PATCH] Un-break optional Qt5 detection + +--- + core/CMakeLists.txt | 22 ++++++++++------------ + 1 file changed, 10 insertions(+), 12 deletions(-) + +diff --git a/core/CMakeLists.txt b/core/CMakeLists.txt +index 27d3819323..17c8aa0320 100644 +--- a/core/CMakeLists.txt ++++ b/core/CMakeLists.txt +@@ -134,16 +134,14 @@ find_package(Qt5 ${QT_MIN_VERSION} + ) + + if(ENABLE_QWEBENGINE) +- find_package(Qt5 ${QT_MIN_VERSION} NO_MODULE COMPONENTS WebEngineWidgets) ++ find_package(Qt5WebEngineWidgets ${QT_MIN_VERSION} NO_MODULE) + else() +- find_package(Qt5 ${QT_MIN_VERSION} NO_MODULE COMPONENTS WebKitWidgets) ++ find_package(Qt5WebKitWidgets ${QT_MIN_VERSION} NO_MODULE) + endif() + +-find_package(Qt5 ${QT_MIN_VERSION} +- OPTIONAL_COMPONENTS +- DBus +- OpenGL +-) ++find_package(Qt5DBus ${QT_MIN_VERSION}) ++ ++find_package(Qt5OpenGL ${QT_MIN_VERSION}) + + if(ENABLE_DBUS) + if(NOT Qt5DBus_FOUND) +@@ -154,10 +152,10 @@ endif() + # Dependencies For unit tests and CLI test tools + + if(BUILD_TESTING) +- find_package(Qt5 ${QT_MIN_VERSION} NO_MODULE COMPONENTS +- Test +- Qml WebView # Optional, for 'sialis' O2 library test tool. +- ) ++ find_package(Qt5Test ${QT_MIN_VERSION} NO_MODULE) ++ # Optional, for 'sialis' O2 library test tool. ++ find_package(Qt5Qml ${QT_MIN_VERSION} NO_MODULE) ++ find_package(Qt5WebView ${QT_MIN_VERSION} NO_MODULE) + endif() + + find_package(KF5 ${KF5_MIN_VERSION} +@@ -323,7 +321,7 @@ find_package(OpenGL) # For Presentation tool. + find_package(X11) + + if(X11_FOUND) +- find_package(Qt5 ${QT_MIN_VERSION} NO_MODULE COMPONENTS X11Extras) ++ find_package(Qt5X11Extras ${QT_MIN_VERSION} NO_MODULE) + set(HAVE_X11 TRUE) + else() + set(HAVE_X11 FALSE) +-- +2.20.1 + diff --git a/media-gfx/feh/Manifest b/media-gfx/feh/Manifest index b7ef0e3bc513..1440366ac25b 100644 --- a/media-gfx/feh/Manifest +++ b/media-gfx/feh/Manifest @@ -1,4 +1,11 @@ +AUX feh-2.6.2-debug-cflags.patch 197 BLAKE2B a5a9b2c2ac22869401303706b92a10474d091cb01869c6272adac79000eb02591e424fd71734d3c0bd29d253854a27f4fe1fe21f99ba55cd48c66325521dc836 SHA512 eb09a90a9ff3ba2ae7a40c8ef9e5b361d42bb045e194ddb5823111d780da265371ee087c6f80963d80f5cd1d0427478f46fec9b0f0607ad2bb122415a9c2e397 AUX feh-3.2-debug-cflags.patch 193 BLAKE2B 298f65a8f9142167d1cd2cfce0bc61ad9d7d4a5519ab8e78d1259ea60b5566376f8d9ddba660db65ef5e229bdc0ff254d9aab2284d8929ea0ac171da44f8c44d SHA512 336d23b767c5c3da9b94a1e6759129c242caf70a611b2410816a562d90720e3abab6a3444ce06975d62b4ebbe8e54c70942800516c7575cc6d5e13ce69679884 +DIST feh-3.1.1.tar.bz2 2109534 BLAKE2B ea02ab09791ef61a9ac5db84b5a0f69ddc76f994343660cf4072a41769a59ddd2936e0f047eeed26be0b3676711b1e440c0483325e6bb621205788ebe13c1fca SHA512 cbdf6e36831a750a6bdb9f1a5735c814662b5274d9c453392de88b98926b539cc54e2041fc0cd2a393762f14ec24b81435de6d506d9efc1ee4c7d80105aa6243 +DIST feh-3.1.3.tar.bz2 2110285 BLAKE2B ee42b766eccf7e4661a47bd6c748b2e0cc6345fb9c08de425b0f4ef87c7fb383dd20140fb2c8b2fc540b70a6c01bb612b48aa76fc1f47a117f2503257bf3b403 SHA512 dc4960706e4134bbe6c34036a9c9b7cd98eb8935e13e2354504664a1599d4af193c6b977433a40c7e3638b2b3e2928960e0c755b04f7c48076ef15445f792583 DIST feh-3.2.1.tar.bz2 2112281 BLAKE2B 2918d2714f0557e1b67284709bce22c5e14d8f7f545ca33c16ec7928273edf18c9be48a685c3e9a032170bf2b7e572a4b78664f37b2a16c5ae5829b3cc55ca76 SHA512 11a136990f7d02409501f10553659c64ad5d18d4bfaa4e5cfdeb7a2f53ffdb8bd9b8347796c65e75c49615ac4c12bc81bf3a58325f778cb5e0c1608181d7b53a +DIST feh-3.2.tar.bz2 2111743 BLAKE2B 2fd9838845bb86cc17d99650ac595c2b9f573be30d6ea86512a37a2f0439b10d6fe0b6bc028b81d03219530db2c0c58b1e6642834c32a621b191a310d53c7499 SHA512 f87d07edb9aa098a6c71b37306c42fdfe2b9cdb8cafcd72dd04f82b5a79da47c4e55979a0a8365fe22681f857215120009c84cde34b6f36e599522a2c4af6f70 +EBUILD feh-3.1.1.ebuild 1497 BLAKE2B f6e2659966cface0e1f154b219101caf560c075699545d52611e5c5f4f49fa8caafe9b96a06e7a8b06712cf5023feef0433fea82c377a08b737c41fb70dded2d SHA512 73681572193a12dfdb2c7bbb8bd99a29ebfda1ef01be4664ca7664afa00e8633ddaeb0a7929859882f9c0f8cf8a10b09c40efcd0fa9fdb1b877d49e4acdd18e9 +EBUILD feh-3.1.3.ebuild 1501 BLAKE2B 1e2bfdded6414e79a76ba2365246e9baf5d525b999e0a3f61a692b1724b3d2455567e924b6c2c675519c78d1ad3845479429e149328140854f02d78f9d9d9932 SHA512 702a19de9be1bb591d2daadd4285bd9a942de5ebda401de2f62ca03984ee0f68bc437689b405c35aa405e641638e98ef8c9d765b6f8c107a7e19d9c2181bc764 EBUILD feh-3.2.1.ebuild 1522 BLAKE2B 79c8a59656764fc43e28f15616dc26ffd40b81b1417d885e5c1b89e32a6ff854c7b6af763acddd0897ce58bf0231eb7250319090c48fa282f14218dfb477edd2 SHA512 6e4ef3a5b5a962510bbce7957b09b11d46111ffd10593159d965bd86e09c7da7800175459b8cdc553a58ac616d146a7752253cf72afd6be003cf93be81eb5409 +EBUILD feh-3.2.ebuild 1494 BLAKE2B af02b7ba7319db9101fd13ed9e3bf797b11aff36591802cd7a3bf3a6f32b728ed392d6e9ae579a2f7e0fec94709e6ba0da9885c205ef56610b8e0cab070a22d9 SHA512 17ec2bf6d4ae373e9dcf32d2235e2cd3d5149c9e363c71da207c27076073d9f8c6140f8b0538165e96d9cd7cc284fb012c3047a4902e5349af9fdf2e45104d41 MISC metadata.xml 358 BLAKE2B 602fb8b872f5f209abd20adbb141035c0d0396a7712839c950cfa19e78201c0c39e88fa5e8bebc6224459bb8e328e732ff30db848f6c84510f91830951f2087c SHA512 51fad9cc41f31b03f42e0ac4254ea05a848df755091cdd47ee4ce73f7189acd83e8956c230329ea0053d1f794b529e498525f6ce282a947c9809c4954a5b9a19 diff --git a/media-gfx/feh/feh-3.1.1.ebuild b/media-gfx/feh/feh-3.1.1.ebuild new file mode 100644 index 000000000000..9c2309b6d220 --- /dev/null +++ b/media-gfx/feh/feh-3.1.1.ebuild @@ -0,0 +1,73 @@ +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 +inherit toolchain-funcs gnome2-utils xdg-utils + +DESCRIPTION="A fast, lightweight imageviewer using imlib2" +HOMEPAGE="https://feh.finalrewind.org/" +SRC_URI="https://feh.finalrewind.org/${P}.tar.bz2" + +LICENSE="feh" +SLOT="0" +KEYWORDS="amd64 ~arm ~mips ppc ppc64 x86" +IUSE="debug curl exif test xinerama" + +COMMON_DEPEND="media-libs/imlib2[X] + >=media-libs/libpng-1.2:0= + x11-libs/libX11 + curl? ( net-misc/curl ) + exif? ( media-libs/libexif ) + xinerama? ( x11-libs/libXinerama )" +RDEPEND="${COMMON_DEPEND} + virtual/jpeg:0" +DEPEND="${COMMON_DEPEND} + x11-base/xorg-proto + x11-libs/libXt + test? ( + >=dev-lang/perl-5.10 + dev-perl/Test-Command + media-libs/imlib2[gif,jpeg,png] + )" + +PATCHES=( "${FILESDIR}"/${PN}-2.6.2-debug-cflags.patch ) + +pkg_setup() { + use_feh() { usex $1 1 0; } + + fehopts=( + DESTDIR="${D}" + PREFIX="${EPREFIX}"/usr + doc_dir='${main_dir}'/share/doc/${PF} + example_dir='${main_dir}'/share/doc/${PF}/examples + curl=$(use_feh curl) + debug=$(use_feh debug) + xinerama=$(use_feh xinerama) + exif=$(use_feh exif) + ) +} + +src_compile() { + tc-export CC + emake "${fehopts[@]}" +} + +src_install() { + emake "${fehopts[@]}" install +} + +pkg_preinst() { + gnome2_icon_savelist +} + +pkg_postinst() { + gnome2_icon_cache_update + xdg_mimeinfo_database_update + xdg_desktop_database_update +} + +pkg_postrm() { + gnome2_icon_cache_update + xdg_mimeinfo_database_update + xdg_desktop_database_update +} diff --git a/media-gfx/feh/feh-3.1.3.ebuild b/media-gfx/feh/feh-3.1.3.ebuild new file mode 100644 index 000000000000..e701805c82c7 --- /dev/null +++ b/media-gfx/feh/feh-3.1.3.ebuild @@ -0,0 +1,73 @@ +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 +inherit toolchain-funcs gnome2-utils xdg-utils + +DESCRIPTION="A fast, lightweight imageviewer using imlib2" +HOMEPAGE="https://feh.finalrewind.org/" +SRC_URI="https://feh.finalrewind.org/${P}.tar.bz2" + +LICENSE="feh" +SLOT="0" +KEYWORDS="~amd64 ~arm ~mips ~ppc ~ppc64 ~x86" +IUSE="debug curl exif test xinerama" + +COMMON_DEPEND="media-libs/imlib2[X] + >=media-libs/libpng-1.2:0= + x11-libs/libX11 + curl? ( net-misc/curl ) + exif? ( media-libs/libexif ) + xinerama? ( x11-libs/libXinerama )" +RDEPEND="${COMMON_DEPEND} + virtual/jpeg:0" +DEPEND="${COMMON_DEPEND} + x11-base/xorg-proto + x11-libs/libXt + test? ( + >=dev-lang/perl-5.10 + dev-perl/Test-Command + media-libs/imlib2[gif,jpeg,png] + )" + +PATCHES=( "${FILESDIR}"/${PN}-2.6.2-debug-cflags.patch ) + +pkg_setup() { + use_feh() { usex $1 1 0; } + + fehopts=( + DESTDIR="${D}" + PREFIX="${EPREFIX}"/usr + doc_dir='${main_dir}'/share/doc/${PF} + example_dir='${main_dir}'/share/doc/${PF}/examples + curl=$(use_feh curl) + debug=$(use_feh debug) + xinerama=$(use_feh xinerama) + exif=$(use_feh exif) + ) +} + +src_compile() { + tc-export CC + emake "${fehopts[@]}" +} + +src_install() { + emake "${fehopts[@]}" install +} + +pkg_preinst() { + gnome2_icon_savelist +} + +pkg_postinst() { + gnome2_icon_cache_update + xdg_mimeinfo_database_update + xdg_desktop_database_update +} + +pkg_postrm() { + gnome2_icon_cache_update + xdg_mimeinfo_database_update + xdg_desktop_database_update +} diff --git a/media-gfx/feh/feh-3.2.ebuild b/media-gfx/feh/feh-3.2.ebuild new file mode 100644 index 000000000000..299ad0eac2eb --- /dev/null +++ b/media-gfx/feh/feh-3.2.ebuild @@ -0,0 +1,73 @@ +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 +inherit toolchain-funcs gnome2-utils xdg-utils + +DESCRIPTION="A fast, lightweight imageviewer using imlib2" +HOMEPAGE="https://feh.finalrewind.org/" +SRC_URI="https://feh.finalrewind.org/${P}.tar.bz2" + +LICENSE="feh" +SLOT="0" +KEYWORDS="~amd64 ~arm ~mips ~ppc ~ppc64 ~x86" +IUSE="debug curl exif test xinerama" + +COMMON_DEPEND="media-libs/imlib2[X] + >=media-libs/libpng-1.2:0= + x11-libs/libX11 + curl? ( net-misc/curl ) + exif? ( media-libs/libexif ) + xinerama? ( x11-libs/libXinerama )" +RDEPEND="${COMMON_DEPEND} + virtual/jpeg:0" +DEPEND="${COMMON_DEPEND} + x11-base/xorg-proto + x11-libs/libXt + test? ( + >=dev-lang/perl-5.10 + dev-perl/Test-Command + media-libs/imlib2[gif,jpeg,png] + )" + +PATCHES=( "${FILESDIR}"/${P}-debug-cflags.patch ) + +pkg_setup() { + use_feh() { usex $1 1 0; } + + fehopts=( + DESTDIR="${D}" + PREFIX="${EPREFIX}"/usr + doc_dir='${main_dir}'/share/doc/${PF} + example_dir='${main_dir}'/share/doc/${PF}/examples + curl=$(use_feh curl) + debug=$(use_feh debug) + xinerama=$(use_feh xinerama) + exif=$(use_feh exif) + ) +} + +src_compile() { + tc-export CC + emake "${fehopts[@]}" +} + +src_install() { + emake "${fehopts[@]}" install +} + +pkg_preinst() { + gnome2_icon_savelist +} + +pkg_postinst() { + gnome2_icon_cache_update + xdg_mimeinfo_database_update + xdg_desktop_database_update +} + +pkg_postrm() { + gnome2_icon_cache_update + xdg_mimeinfo_database_update + xdg_desktop_database_update +} diff --git a/media-gfx/feh/files/feh-2.6.2-debug-cflags.patch b/media-gfx/feh/files/feh-2.6.2-debug-cflags.patch new file mode 100644 index 000000000000..a4a71acef30c --- /dev/null +++ b/media-gfx/feh/files/feh-2.6.2-debug-cflags.patch @@ -0,0 +1,11 @@ +--- feh-2.6.2/config.mk ++++ feh-2.6.2/config.mk +@@ -32,7 +32,7 @@ + endif + + ifeq (${debug},1) +- CFLAGS += -DDEBUG -O0 ++ CFLAGS += -DDEBUG + MAN_DEBUG = . This is a debug build. + else + MAN_DEBUG = diff --git a/media-gfx/imagemagick/Manifest b/media-gfx/imagemagick/Manifest index c02325618d9c..30eff8c38195 100644 --- a/media-gfx/imagemagick/Manifest +++ b/media-gfx/imagemagick/Manifest @@ -1,12 +1,12 @@ AUX policy-hardening.snippet 442 BLAKE2B d79fdbddab418fc9d8391e78992e3dda844e096052115113ff6f759c1a54541bcd7d7793547bc7140776659c98379a9e9f004aa46f757300a33f445d396fbf14 SHA512 e9e723c40d5b8c52bbc2f2b9a3ad7c7e2aee493bc37b6c3940e8486b92a1c6659e47b1e12ee2fb11c8a8b6ee48a7fc10354617ae12c36181a58e9e73b239368d AUX policy.test.xml 746 BLAKE2B 6bfa073606469b81cf517d9b069e48794cbda9272d12c3abb8ae3456aaf30cd1923510baddb7d813aa8ccde84e161de0b29314cef7b1a37730c7ad5236d1f5dc SHA512 22f66004324e3777393446a3df738ecd2aa405df088d39137008514cd86b436765b48ccd4355d670a42061ce4e5a7b2fd8e4be5852cd914f62ff0250a4a7ae57 +DIST ImageMagick-6.9.10-56.tar.xz 8950748 BLAKE2B 5d1b4ad20ec3aa6f89aedf08ac91266be218464cd998ca950623c1a23954968f84b21bfc140c1a1dfdcd68c8420ddcd39f76cd31d3872d43bf631b5782980665 SHA512 e5d1dd4da8b361858ff2d7a4c7956280bd55053022c7b0ad27fac4a70e9d2cafb75299e7970e1b2091b83b3bedd2355d5752e9bff6999f9272619a92a8892c0f DIST ImageMagick-6.9.10-60.tar.xz 8939576 BLAKE2B a4b493838da9bfa183f55d19d9643dcd83fe533884b28d579b9586357af7d3ffba16f88e73ed42658a3b41ac47de9ebf7a7ddbefc0339bd90338a1f32dbd96a7 SHA512 cd34014322bd48b02d3680564756db58292fabd5487a187bb3913ec9f5ffd0b990a112a145a9be544cfc334cb917232683cdafc815baee85638a95a9a89f4604 -DIST ImageMagick-6.9.10-64.tar.xz 9060412 BLAKE2B 1c27abab10910f4013ff65dfdf32b4bcf8541b1a15195eefa7bd32a6a375abe6cfe3e5f243716c0e6aa7b82acf498fec142efa72b1bdf1696138c727be159113 SHA512 e4be41a7a47da479e2128791fa0cafdd6a1a369c0520e68b34049ba951590635aad956df58f52c84f676b0909689aabea6c9e3d7fdcb82040e78f368d4eb76b4 +DIST ImageMagick-7.0.8-56.tar.xz 9465124 BLAKE2B c31c66ae84e9bb91fc744673c07d12300a5e5a07729eaee9654e988efc46cc9d5321e6906325fe9fcfbeb81785a74a52e6059d2983c280b86d0ad305c0818b9d SHA512 22651b0f5b0b0821b7ae74a10671590d8ecfddcc95b60bf056ef7a7cbeab37beedaf49d0bcf97cb0ac2f1ec564192c15c7820c9593db965b4b192338abdaf5dc DIST ImageMagick-7.0.8-60.tar.xz 9464992 BLAKE2B 26a75c0df77459582b9025612c0f70b30bedf9fee7bdfe5b0083ca9f5a7184d19e849c8a18d3781ed39d1788a17d6b1de608424193c24ec5e11ab9b50bd64874 SHA512 4db1c24942b522cab1ff80c3eb3df7a81cfd2ec7f7f91dcd00b2d4867b2afe5026ffbeacbed83ddb9178448f1ded3dacb34002fc65892704e863794338ba6436 -DIST ImageMagick-7.0.8-64.tar.xz 9463488 BLAKE2B db44b8d0a03f15c26d6912ada5900932bf393eefa6fe8ead03c668552810b06078fca4f9cef9f78e78049b61222ecb6abf2072a5719a0326aca357ff2f49eae0 SHA512 6ddd12a6b5e7870364575f6646e38ca49dc14c2857d8a41217d24e3dccf87cf8730d2aef692dc7b62616e54eb76f320c550e9f409376e22bfcf89e472f8dd0e6 -EBUILD imagemagick-6.9.10.60.ebuild 6883 BLAKE2B 1f0a8acce9f7c79171822ba87d131aa0457f1d9afa6621a29972b77958f9abc6150b8ce756065e9e51b2c399c78115393ab04c56b35074c2ff42cddb00f95c15 SHA512 b96f189b6b59ce49628ddc311fef7a7c21c8e81aa268b4958a71b832ecc329c6ce0ffd858f9b0d036c3f5d3de43926d2d2486c0313177362278b999b2ea91fa8 -EBUILD imagemagick-6.9.10.64.ebuild 6892 BLAKE2B 9a7579489c9e2ccd38b3ae9f91393680f13ebe29745ee90fef5e8a72059a731da47a8d8f0394621baf2261d9e848166783738c3fd881372630ce8bb82fd67de8 SHA512 83f54f846c25d858c8a093f5058b764690c1b15d69c09519ee492f0ec4d13555c191991f241fe75a5438fd421d6bc036b655d8d0febfba575897db979cd157bf -EBUILD imagemagick-7.0.8.60.ebuild 7150 BLAKE2B 52a9342ec82c516f5bc3339c4f41f016448950bc7dd486babdc57d1a62ecc005dd0937073ebad7a4e170f050c11ed7ca4dca9ce39cd18d6498807259eeea643b SHA512 e9f3ab662260bc535d27a6d7166a52d8e29bd999923fa6995b2ffd3b5161de41e62d9e3774bfbdded2bc447b8c0087ed597a0c6a0a79954e06478d3113418a1f -EBUILD imagemagick-7.0.8.64.ebuild 7160 BLAKE2B 276ed8dc19455db44ec6a14244f07070e5b9a8a6158e0d06ef2ab0ab4541e607244c216a7ffbaefcf166439edf4a00aab2a5f826a4fc917dade1f710f47b66cb SHA512 5c6f6ce5a3801c56b550c78f8ca5a1a2f812ea39db7fcd9eb65fa6e9130d3035102eef379e9fe5617ec62910ebff039fde9ce9f02eac96a62431d18b5b954245 +EBUILD imagemagick-6.9.10.56.ebuild 6883 BLAKE2B 1f0a8acce9f7c79171822ba87d131aa0457f1d9afa6621a29972b77958f9abc6150b8ce756065e9e51b2c399c78115393ab04c56b35074c2ff42cddb00f95c15 SHA512 b96f189b6b59ce49628ddc311fef7a7c21c8e81aa268b4958a71b832ecc329c6ce0ffd858f9b0d036c3f5d3de43926d2d2486c0313177362278b999b2ea91fa8 +EBUILD imagemagick-6.9.10.60.ebuild 6892 BLAKE2B 9a7579489c9e2ccd38b3ae9f91393680f13ebe29745ee90fef5e8a72059a731da47a8d8f0394621baf2261d9e848166783738c3fd881372630ce8bb82fd67de8 SHA512 83f54f846c25d858c8a093f5058b764690c1b15d69c09519ee492f0ec4d13555c191991f241fe75a5438fd421d6bc036b655d8d0febfba575897db979cd157bf +EBUILD imagemagick-7.0.8.56.ebuild 7150 BLAKE2B 52a9342ec82c516f5bc3339c4f41f016448950bc7dd486babdc57d1a62ecc005dd0937073ebad7a4e170f050c11ed7ca4dca9ce39cd18d6498807259eeea643b SHA512 e9f3ab662260bc535d27a6d7166a52d8e29bd999923fa6995b2ffd3b5161de41e62d9e3774bfbdded2bc447b8c0087ed597a0c6a0a79954e06478d3113418a1f +EBUILD imagemagick-7.0.8.60.ebuild 7160 BLAKE2B 276ed8dc19455db44ec6a14244f07070e5b9a8a6158e0d06ef2ab0ab4541e607244c216a7ffbaefcf166439edf4a00aab2a5f826a4fc917dade1f710f47b66cb SHA512 5c6f6ce5a3801c56b550c78f8ca5a1a2f812ea39db7fcd9eb65fa6e9130d3035102eef379e9fe5617ec62910ebff039fde9ce9f02eac96a62431d18b5b954245 EBUILD imagemagick-9999.ebuild 7160 BLAKE2B 2435e94755e6e1a9d6ee4cab669b8564daaa06e7c75024463cf5df4f851f695afd2afdfb84930ff8886ceef6bed578365d7489d7febd877064621c4dd541f74b SHA512 c65b9cb286317eafefb96c63984f25850c835a81eb04fe452d8bd22bacded153c460716c06a2f924b7595925ecbb417ea809d737aa291bc174c125d97dc7cbba -MISC metadata.xml 1111 BLAKE2B 3592f2d81f67d91239152d723c736437a5e8056f8dba1fc5c97e2ead08efd4e913400b441eb6d6b90f26cccf3b89f115c18a5551bc070d1fd81e68dd218493c9 SHA512 33bd68bc4f88cd6029528b0feab9cc9fde0d60475ba5fad8c4f92ff6d373666628e6525d54268735e99182abd2658aa32c7c72ff22106c65f81ed8af5e4f7ea2 +MISC metadata.xml 1015 BLAKE2B 3fbe479f30575b11fa9e78de7bb00c231370aa4b2ca3b0e16924710189013ab91199db8c8cb7cff4611a2924c7fa01e4a43bfd9f7f61cfe45a4de3a254d4c8e2 SHA512 bf1479f91de5f8248c4a86d98017a332ab3d5eb153bb896ca1a39fce2fbff4e8248df92025987f6bfaf7e0d36677c167177c9c21969f1f0b8c2e0a53197efece diff --git a/media-gfx/imagemagick/imagemagick-6.9.10.64.ebuild b/media-gfx/imagemagick/imagemagick-6.9.10.56.ebuild index b09291336ccb..b6bca9ea8b20 100644 --- a/media-gfx/imagemagick/imagemagick-6.9.10.64.ebuild +++ b/media-gfx/imagemagick/imagemagick-6.9.10.56.ebuild @@ -14,7 +14,7 @@ SRC_URI="mirror://${PN}/${MY_P}.tar.xz" LICENSE="imagemagick" SLOT="0/${PV}" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris" +KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris" IUSE="bzip2 corefonts cxx djvu fftw fontconfig fpx graphviz hdri heif jbig jpeg jpeg2k lcms lqr lzma opencl openexr openmp pango perl png postscript q32 q8 raw static-libs svg test tiff truetype webp wmf X xml zlib" RESTRICT="perl? ( userpriv )" diff --git a/media-gfx/imagemagick/imagemagick-6.9.10.60.ebuild b/media-gfx/imagemagick/imagemagick-6.9.10.60.ebuild index b6bca9ea8b20..b09291336ccb 100644 --- a/media-gfx/imagemagick/imagemagick-6.9.10.60.ebuild +++ b/media-gfx/imagemagick/imagemagick-6.9.10.60.ebuild @@ -14,7 +14,7 @@ SRC_URI="mirror://${PN}/${MY_P}.tar.xz" LICENSE="imagemagick" SLOT="0/${PV}" -KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris" +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris" IUSE="bzip2 corefonts cxx djvu fftw fontconfig fpx graphviz hdri heif jbig jpeg jpeg2k lcms lqr lzma opencl openexr openmp pango perl png postscript q32 q8 raw static-libs svg test tiff truetype webp wmf X xml zlib" RESTRICT="perl? ( userpriv )" diff --git a/media-gfx/imagemagick/imagemagick-7.0.8.64.ebuild b/media-gfx/imagemagick/imagemagick-7.0.8.56.ebuild index 69c412db11b7..59c2b130c53d 100644 --- a/media-gfx/imagemagick/imagemagick-7.0.8.64.ebuild +++ b/media-gfx/imagemagick/imagemagick-7.0.8.56.ebuild @@ -13,7 +13,7 @@ else MY_PV="$(ver_rs 3 '-')" MY_P="ImageMagick-${MY_PV}" SRC_URI="mirror://${PN}/${MY_P}.tar.xz" - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris" + KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris" fi DESCRIPTION="A collection of tools and libraries for many image formats" diff --git a/media-gfx/imagemagick/imagemagick-7.0.8.60.ebuild b/media-gfx/imagemagick/imagemagick-7.0.8.60.ebuild index 59c2b130c53d..69c412db11b7 100644 --- a/media-gfx/imagemagick/imagemagick-7.0.8.60.ebuild +++ b/media-gfx/imagemagick/imagemagick-7.0.8.60.ebuild @@ -13,7 +13,7 @@ else MY_PV="$(ver_rs 3 '-')" MY_P="ImageMagick-${MY_PV}" SRC_URI="mirror://${PN}/${MY_P}.tar.xz" - KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris" + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris" fi DESCRIPTION="A collection of tools and libraries for many image formats" diff --git a/media-gfx/imagemagick/metadata.xml b/media-gfx/imagemagick/metadata.xml index 0c9668ee1af7..0ca390d487a7 100644 --- a/media-gfx/imagemagick/metadata.xml +++ b/media-gfx/imagemagick/metadata.xml @@ -16,7 +16,4 @@ <flag name="q32">Set quantum depth value to 32</flag> <flag name="q8">Set quantum depth value to 8</flag> </use> - <upstream> - <remote-id type="cpe">cpe:/a:imagemagick:imagemagick</remote-id> - </upstream> </pkgmetadata> diff --git a/media-gfx/krita/Manifest b/media-gfx/krita/Manifest index f592067e1fd2..65c8b25c4f86 100644 --- a/media-gfx/krita/Manifest +++ b/media-gfx/krita/Manifest @@ -4,8 +4,6 @@ AUX krita-4.1.8-qt-5.12-fix-unsupported-composition-mode.patch 1591 BLAKE2B d11c AUX krita-4.2.4-tests-optional.patch 12292 BLAKE2B a30463dcc6e02e877b308c4add529f0657d96ace7a13ba7424f4cdf260f3b636d03b2bac224d6239253393650163b622ac54d8d81bbdced2fb153bf216b5fb2d SHA512 1d5045b35981822bc16c4b23e573a299a8325353c8be347c56a4e2fc4e3cd9e937e8eb253f9c6cdc0197a3db7989b822fb41274afe3cd506b9c907daf1867df3 DIST krita-4.1.8.tar.gz 244065767 BLAKE2B ba2cbb6d1575cec189e8f10461b720a081f185e1e078fc1e8194c9e6d455dade45f35f1ae5a891717918b3c03863a2a7f3f819753a106ede5695003cfa260157 SHA512 d027444415bffbd6abd29ca69598fdb1e6a652fd4f1944092ff12016a57ff2ee3bab209c93e065905ec9bfea395e50f833915bb924b97a2c119d101057cba6c9 DIST krita-4.2.5.tar.xz 170060232 BLAKE2B fba124653edad23826fd6d4d932cb1ea4c63450d460bebf2b2e2d9167e437331a31d76b19d57d9f15f603195c0eea367463ea6d9e610e74d0844bb80d21f0741 SHA512 5134c0a889cb039c5253759965acfba5cef0c431e8230236c1288e0253628feba52a493eaa42c93adb1716014c17818232294c1c90ade760ad89940833599d9e -DIST krita-4.2.6.tar.xz 164332440 BLAKE2B d60c87743de77d300b2c2c9d1f1b3a31b238e8ef434981d3762713094eeebbe5e51547987c981b9f50d82f2363881ec74ef488b35d27cd5271d568987607557e SHA512 c6c6bb0b2d46b421c6edd38427f7a71636c78267413a4265a61123509ebac8f24d981ce5b5540f0813e26b89e655d44c2cc32395694161eb925f2789b0e8119e EBUILD krita-4.1.8-r1.ebuild 3390 BLAKE2B 4cb6c211221e5a0e13ce674b7a10c984539a5e5f529a533d6e56f1facfe591e7d1b57707a84c8d87266221cb5445ad7fd15b57954d3a67b114c46c90329730a8 SHA512 14e135e8d6451489127ca1653179de82d7460d182ad6a18bd4fbabd81d16851fcaa783d06be2bbc8cef9ea435f90f5a3f799cf87a338888188acb26ee9b3564a EBUILD krita-4.2.5.ebuild 3134 BLAKE2B 286e53a3758f23f90c0f972158d125779dc91d7d0ad2a552dacaf5447a14321dbaa81a59a6f5a2c263720641b9a146141f9571961db7ba7acc0a79c451f1f35d SHA512 e20075fb679c828347155280315f368faab8aafa5d25d35765ba2516fbcf868e1de54071c185cc7409806e3b39df08e969b0ff35743a8eb2887b3547bffeed26 -EBUILD krita-4.2.6.ebuild 3134 BLAKE2B 286e53a3758f23f90c0f972158d125779dc91d7d0ad2a552dacaf5447a14321dbaa81a59a6f5a2c263720641b9a146141f9571961db7ba7acc0a79c451f1f35d SHA512 e20075fb679c828347155280315f368faab8aafa5d25d35765ba2516fbcf868e1de54071c185cc7409806e3b39df08e969b0ff35743a8eb2887b3547bffeed26 MISC metadata.xml 696 BLAKE2B 433ca97e92c2e6c8a0f5bfbd4cba667576be6cc8c93330b689e0088663ac6df263d62b7be6d42debf3480b706721f06be089c5e9a139451e49b609ea4a081ae2 SHA512 becd89686babf0fde2a7e53196715bbca2a4f0d6bad0bc3a55128c9ee19dbe5819be1020db6458ec0c053cf7370a390ff1e84fd9c49331fc28e5a60348fd34dd diff --git a/media-gfx/krita/krita-4.2.6.ebuild b/media-gfx/krita/krita-4.2.6.ebuild deleted file mode 100644 index 0cb6e37c9883..000000000000 --- a/media-gfx/krita/krita-4.2.6.ebuild +++ /dev/null @@ -1,117 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -KDE_TEST="forceoptional" -VIRTUALX_REQUIRED="test" -PYTHON_COMPAT=( python3_{5,6,7} ) -inherit kde5 python-single-r1 - -if [[ ${KDE_BUILD_TYPE} = release ]]; then - SRC_URI="mirror://kde/stable/${PN}/${PV}/${P}.tar.xz" - KEYWORDS="~amd64 ~x86" -fi - -DESCRIPTION="Free digital painting application. Digital Painting, Creative Freedom!" -HOMEPAGE="https://kde.org/applications/graphics/krita/ https://krita.org/" -LICENSE="GPL-3" -IUSE="color-management fftw gif +gsl heif +jpeg openexr pdf qtmedia +raw tiff vc" -REQUIRED_USE="${PYTHON_REQUIRED_USE}" - -BDEPEND=" - dev-cpp/eigen:3 - dev-lang/perl - sys-devel/gettext -" -COMMON_DEPEND="${PYTHON_DEPS} - $(add_frameworks_dep karchive) - $(add_frameworks_dep kcompletion) - $(add_frameworks_dep kconfig) - $(add_frameworks_dep kcoreaddons) - $(add_frameworks_dep kcrash) - $(add_frameworks_dep kguiaddons) - $(add_frameworks_dep ki18n) - $(add_frameworks_dep kiconthemes) - $(add_frameworks_dep kitemmodels) - $(add_frameworks_dep kitemviews) - $(add_frameworks_dep kwidgetsaddons) - $(add_frameworks_dep kwindowsystem) - $(add_frameworks_dep kxmlgui) - $(add_qt_dep qtconcurrent) - $(add_qt_dep qtdbus) - $(add_qt_dep qtdeclarative) - $(add_qt_dep qtgui '-gles2' '' '5=') - $(add_qt_dep qtnetwork) - $(add_qt_dep qtprintsupport) - $(add_qt_dep qtsvg) - $(add_qt_dep qtwidgets) - $(add_qt_dep qtx11extras) - $(add_qt_dep qtxml) - dev-libs/boost:= - dev-libs/quazip - dev-python/PyQt5[${PYTHON_USEDEP}] - dev-python/sip[${PYTHON_USEDEP}] - media-gfx/exiv2:= - media-libs/lcms - media-libs/libpng:0= - sys-libs/zlib - virtual/opengl - x11-libs/libX11 - x11-libs/libxcb - x11-libs/libXi - color-management? ( media-libs/opencolorio ) - fftw? ( sci-libs/fftw:3.0= ) - gif? ( media-libs/giflib ) - gsl? ( sci-libs/gsl:= ) - jpeg? ( virtual/jpeg:0 ) - heif? ( media-libs/libheif:= ) - openexr? ( - media-libs/ilmbase:= - media-libs/openexr - ) - pdf? ( app-text/poppler[qt5] ) - qtmedia? ( $(add_qt_dep qtmultimedia) ) - raw? ( media-libs/libraw:= ) - tiff? ( media-libs/tiff:0 ) -" -DEPEND="${COMMON_DEPEND} - vc? ( >=dev-libs/vc-1.1.0 ) -" -RDEPEND="${COMMON_DEPEND} - !app-office/calligra:4[calligra_features_krita] - !app-office/calligra-l10n:4[calligra_features_krita(+)] -" - -# bug 630508 -RESTRICT+=" test" - -PATCHES=( "${FILESDIR}"/${PN}-4.2.4-tests-optional.patch ) - -pkg_setup() { - python-single-r1_pkg_setup - kde5_pkg_setup -} - -src_configure() { - # Prevent sandbox violation from FindPyQt5.py module - # See Gentoo-bug 655918 - addpredict /dev/dri - - local mycmakeargs=( - $(cmake-utils_use_find_package color-management OCIO) - $(cmake-utils_use_find_package fftw FFTW3) - $(cmake-utils_use_find_package gif GIF) - $(cmake-utils_use_find_package gsl GSL) - $(cmake-utils_use_find_package heif HEIF) - $(cmake-utils_use_find_package jpeg JPEG) - $(cmake-utils_use_find_package openexr OpenEXR) - $(cmake-utils_use_find_package pdf Poppler) - $(cmake-utils_use_find_package qtmedia Qt5Multimedia) - $(cmake-utils_use_find_package raw LibRaw) - $(cmake-utils_use_find_package tiff TIFF) - $(cmake-utils_use_find_package vc Vc) - ) - - kde5_src_configure -} diff --git a/media-gfx/libimagequant/Manifest b/media-gfx/libimagequant/Manifest index f80c6150534f..bfda0d84101e 100644 --- a/media-gfx/libimagequant/Manifest +++ b/media-gfx/libimagequant/Manifest @@ -5,5 +5,5 @@ DIST libimagequant-2.12.2.tar.gz 75611 BLAKE2B 23f5d3666fd21696d4f4dab9db3669642 DIST libimagequant-2.12.3.tar.gz 75866 BLAKE2B 857a0e3f0187251e37e0c7f4f5f5cbf49266e4eb9f684118705778d9469330cf95780ea11b83d19e28251f047a7e9b8e7ac32ac4d9554cb5d9e1b3230d39e796 SHA512 4818b00b6f154407f3e402d56f4891c2d7594c8056fada0402d7fa0024ae50127340dd8295da5f5dca13fe1829670a3fa8793aa528f3e74a2294c9a7e37b7257 EBUILD libimagequant-2.11.7.ebuild 1191 BLAKE2B 61db0687381d1ad9c124e94be50b93bba3d70a3758dfdde81bbf3fe2a9a9ffd26cc73ef29ee1fc7bbd3fdab8947b7316c76622ca1c5f28f923212c63ca2c81fa SHA512 38db43ddfb6c4e8aad817dde0cc20ccf5397f4bcc4a3183a33d1256122a42a79ba6b079677746b31d17625b275f2e3d9e346e314a1311981b86d4add48238dce EBUILD libimagequant-2.12.2.ebuild 1451 BLAKE2B c2864c295cca60262bd47c613d60fafa2f6f5cb3f3fdf6db13c334fd7470d8109fff3a75b2fa95ba267dd528e25ac5ffa0cb5c32ea241e179d76108b56a2e010 SHA512 132f76b9be03b93143f7117de9923f2f79d8e1b05843320bcfc57cffc5ee5f8b89890a4edc964f08d389c801f4f9be298548be297c4507e001f555602901a378 -EBUILD libimagequant-2.12.3.ebuild 1453 BLAKE2B b24ebd32b44478f6750844e253f97ba11f5a57c6eb1b8496dda379b7cfdcdb138aaf88f37c0a2cb52a33b3452c5712939649a361266d6fbf7a75a76ca910ac7c SHA512 24cf319daee94c6a1e3a5ac1e78f3d2432b1af71e8788f2989f780947771f2e86aea4c4e1cf98a7ec962760af1787a3e9b6aad48a4e301df47670e43affbd32b +EBUILD libimagequant-2.12.3.ebuild 1455 BLAKE2B cadabeda73ed89e9eba80becbb547a16b605d9dd7480ab4a4404212677ee2d0a6d946ed5099b0d6e63d95591656db1d36f44fa854af602bd64cd08f0ef3c7da4 SHA512 5223e918e3b19df4b3baaf7b2e745a239398199a09bbaa5d573595982d71ab4f793833d0d8891e4c95d441af62145fa9051e104e63adb490492919023ccd60e8 MISC metadata.xml 527 BLAKE2B c3fa42153fa6cfede4de3d59e12063aeb44f67ce89d36be63c7df4671c57ecfdd43d08aee89bd96387ecbee2e41b1d5921e9ad2486b4dd8f06e6e93529afb0a8 SHA512 82b458b27288b6b49df16d5778f6c75b492d958bcc1c2f2950dee741bfddc82f561be50f590d3f891bf736ee67e5325ae297bf49f99c769ca97ac68042beee11 diff --git a/media-gfx/libimagequant/libimagequant-2.12.3.ebuild b/media-gfx/libimagequant/libimagequant-2.12.3.ebuild index f9eacf2fae59..0cb22153f6fd 100644 --- a/media-gfx/libimagequant/libimagequant-2.12.3.ebuild +++ b/media-gfx/libimagequant/libimagequant-2.12.3.ebuild @@ -11,7 +11,7 @@ SRC_URI="https://github.com/ImageOptim/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz LICENSE="GPL-3" SLOT="0/0" -KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux" +KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux" IUSE="cpu_flags_x86_sse2 debug openmp static-libs" DEPEND="" diff --git a/media-gfx/lximage-qt/Manifest b/media-gfx/lximage-qt/Manifest index 030b4de56c5e..14d503b085a4 100644 --- a/media-gfx/lximage-qt/Manifest +++ b/media-gfx/lximage-qt/Manifest @@ -1,3 +1,3 @@ DIST lximage-qt-0.14.1.tar.xz 78960 BLAKE2B c58e5c553e2803cd8d40d807cd1650b72e4de6297f29cdffce19cf3eb402d01735d869ed4e31e9c28ce03e09038628331cc547aebcb636c34dc936b349e33c9a SHA512 61286ade177a41d954e7b624b9f1320dc64fe6ef5ccc5ffbde5edee1e8cb00f3691b6a04f8eac4314b3fb622ba0613eb4d1851358f3a8c12e4a69d990c1ce3cd -EBUILD lximage-qt-0.14.1-r1.ebuild 880 BLAKE2B 3ca53743d4547793947308b288763b570dc83abc8a79af34202c22a277646fc3d6db65690087a7c3957f9dd913942da87710c16fc0dfc73ad076fb967dd2b62d SHA512 e64b5b4f4b70d460629a332904171d9999556e4b9d4fd35bbf843dd3de57fc723a41bbb750e78c6fed614c1d0dec50b02bbec8e488bbe94f5dd3d3ab82b7cf29 +EBUILD lximage-qt-0.14.1-r1.ebuild 873 BLAKE2B 9c51a5bf90065b0b13b2f506f538244e0af20b0c1704daa7a56b395dcc0fe84220a9b646d016941822bbb72ec634f96b6d6a248a990ade99b33ffe4c2e75fbf2 SHA512 bbd759e21943a7ead75e3f7d7a2808140da1de1f7106bb68e757c6b62524e8334708ed0c75061612fe48660590bb4611c0ddd501a943979ced535a15857d0874 MISC metadata.xml 316 BLAKE2B 4efdea74e716c40a0a63878d175f612e550669866bada61cbc0b22d5320a7bbb6a7158796bd5337e71c8aa70d42a977142d9466ac42fbb91f5eb2adcd83fb714 SHA512 b3cad1b8550e54a57940f2cea14c38bd714da71dc772ae073065c6c56c5d4d02a7258dc3ffc226a194d290e7b968a198fa07b02f6c011282896f9ba7173c3c53 diff --git a/media-gfx/lximage-qt/lximage-qt-0.14.1-r1.ebuild b/media-gfx/lximage-qt/lximage-qt-0.14.1-r1.ebuild index 6a97c334b7a4..3b7064657413 100644 --- a/media-gfx/lximage-qt/lximage-qt-0.14.1-r1.ebuild +++ b/media-gfx/lximage-qt/lximage-qt-0.14.1-r1.ebuild @@ -13,7 +13,7 @@ if [[ ${PV} = *9999* ]]; then EGIT_REPO_URI="https://github.com/lxqt/${PN}.git" else SRC_URI="https://downloads.lxqt.org/downloads/${PN}/${PV}/${P}.tar.xz" - KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86" + KEYWORDS="amd64 ~arm ~arm64 x86" fi LICENSE="GPL-2+ LGPL-2.1+" diff --git a/media-gfx/mypaint/Manifest b/media-gfx/mypaint/Manifest index 754b62999fb2..9cb8f384520c 100644 --- a/media-gfx/mypaint/Manifest +++ b/media-gfx/mypaint/Manifest @@ -1,3 +1,8 @@ +AUX mypaint-1.1.0-build-env-vars.patch 1812 BLAKE2B 4af7b90bdcd19dafd712631abe8282d9092caf55ea964511888c299188e28f952c3990feb6ce26f83dd327568ce315801dbdbcd3a3b0df3036f7027704a1be0d SHA512 336a9c838ac9e51f929f9727008feab8251ab9defd106d7161fe5d5b5150460573c66873b88f202d616e4668d3bf272b8dc8305e367ef7c450620b6a48330fe9 +AUX mypaint-1.1.0-desktop.patch 626 BLAKE2B efe635fc8c58d91935be0491c5847a69da1bd78b8a83e9e6ff110d1d69c17dbde91a36f9a2baa5fc97b8a0d81ee47759e040e319a5ca7f43fa6626228a61c425 SHA512 77f267ad6a12b6d18fa955b5b9f8ef3a3eb6fed832745eda4db539d75c49056bb7fd6474ee904e6ac7cab12ae286beb48617e4825b826ca77a439764873e8d75 +AUX mypaint-1.1.0-json-c-0.11.patch 403 BLAKE2B 1608cb7706d85cb84284cc58bb78921c063bf1e1d04d32eb11c7abdc61e3d03eabbe014f66f9c43f13ff8b0a583f900c85fe24fc17bdf4cf3c7ff0ebaccaf37b SHA512 554d0f0cc8c9cb4a48b1f9c57532247461e9705ad819c52f2e264ea238783fe60728af3e51e01667dc0c60883375727624811a48d1603436ad9970282a682605 +DIST mypaint-1.1.0.tar.bz2 37416388 BLAKE2B 4ced9087a51b855ad943d104801d06a03a6f78dfd39eba975cbdeddd304c12ffb0ccd48267fcf31f3608acc069b88bc3f07ed2ab750d77eb31bd64df2f6492a9 SHA512 a3eef378ddcaa0a33f9afc49cc587489ecfff6f3e46e2238aab83f89d682f2407e2760e6029eaac3591f0a8955c95280c12839adcb42ec452cefbcdb142ab9b9 DIST mypaint-1.2.1.tar.xz 37897196 BLAKE2B 2d8f6b03f710febae1c2d617a6e542543786be384585ae8a973604da2eba8a0fb770d185aa3d2dfc6f794adf29ffb9c217356a96ab27d677ebb57816f62fae9c SHA512 1783765e495b9535669a83a29d27ba684e6201fdfe0875bdd2c167b1dab8af05993b19025767fe0b2770ed9e578e4709f75d8a4820ac945812cba85609f9eb9b +EBUILD mypaint-1.1.0-r2.ebuild 1927 BLAKE2B e0d4354567a619e5d259fcb50820186fc8b6f4f6f7108c0676059da9a3065830b504b68a2f9e575032fb30e0b5b6e8e71de23d4e4f778cc28bb0d8e3220282ae SHA512 356a6bef73fb283b0e7953be068bdd8feec0d92a3e06a1fdf0fbe1d80fe6225a777cf95c6ae198afa40269bad9d25f8762c9ac318a8b2e4a3763912b40127477 EBUILD mypaint-1.2.1-r3.ebuild 1838 BLAKE2B 142ff5c4619f973055f9db2fab1535ec6f7be72e64876a94b657f850f4dd23678c1f51ba43f60a128e660c6382f9f24c48f14015f356913a703f318c922cb73d SHA512 85dbdf683e5f415e89f1199f44220f708ba75f177aee0c1272b18b7871d32f74723e1846ac200f390deb274154ba3b5b625bb2cec5314f49e2c80e8dd84e1a74 MISC metadata.xml 247 BLAKE2B 3a8d267e6befd2f46c41982b7196470f32b4fcf5dc6a42ead10b13e81bdcb7975ea998a51d0deb2c3c1a49f00b5f9216d8e43ad7e6dd0aea0f3352b19532d0a0 SHA512 21b957bb801d29dfed1d0aeceac553c9ba039a7fe94ebf899e7ab5c3316bbad116c7bd63a07ccbbb8277d2ce19f27b964499d2ccd942028290519e465e989dbb diff --git a/media-gfx/mypaint/files/mypaint-1.1.0-build-env-vars.patch b/media-gfx/mypaint/files/mypaint-1.1.0-build-env-vars.patch new file mode 100644 index 000000000000..7d7ac3e36359 --- /dev/null +++ b/media-gfx/mypaint/files/mypaint-1.1.0-build-env-vars.patch @@ -0,0 +1,53 @@ +From 516d184b5db8ebdd8b184ef871050c3ab3f03fdf Mon Sep 17 00:00:00 2001 +From: Andrew Chadwick <andrewc-git@piffle.org> +Date: Sun, 21 Apr 2013 22:51:05 +0100 +Subject: [PATCH] SConstruct: support standard build environ vars + +Support the standard build environment vars CC, CXX, CFLAGS, CXXFLAGS, +CPPFLAGS, and LDFLAGS everywhere. + +Partially addresses https://gna.org/bugs/?20754 +--- + SConstruct | 19 +++++++++++++++++++ + 1 file changed, 19 insertions(+) + +diff --git a/SConstruct b/SConstruct +index 0b55da1..ef39b9e 100644 +--- a/SConstruct ++++ b/SConstruct +@@ -1,6 +1,7 @@ + import os, sys + from os.path import join, basename + from SCons.Script.SConscript import SConsEnvironment ++import SCons.Util + + EnsureSConsVersion(1, 0) + +@@ -45,6 +46,24 @@ print('using %r (use scons python_config=xxx to change)' % env['python_config']) + if sys.platform == "win32": + # remove this mingw if trying VisualStudio + env = Environment(tools=tools + ['mingw'], ENV=os.environ, options=opts) ++ ++# Respect some standard build environment stuff ++if os.environ.has_key('CC'): ++ env['CC'] = os.environ['CC'] ++if os.environ.has_key('CFLAGS'): ++ env['CCFLAGS'] += SCons.Util.CLVar(os.environ['CFLAGS']) ++if os.environ.has_key('CXX'): ++ env['CXX'] = os.environ['CXX'] ++if os.environ.has_key('CXXFLAGS'): ++ env['CXXFLAGS'] += SCons.Util.CLVar(os.environ['CXXFLAGS']) ++if os.environ.has_key('CPPFLAGS'): ++ env['CCFLAGS'] += SCons.Util.CLVar(os.environ['CPPFLAGS']) ++ env['CXXFLAGS'] += SCons.Util.CLVar(os.environ['CPPFLAGS']) ++if os.environ.has_key('LDFLAGS'): ++ env['LINKFLAGS'] += SCons.Util.CLVar(os.environ['LDFLAGS']) ++if "$CCFLAGS" in env['CXXCOM']: ++ env['CXXCOM'] = env['CXXCOM'].replace("$CCFLAGS","") ++ + opts.Update(env) + + env.Append(CXXFLAGS=' -Wall -Wno-sign-compare -Wno-write-strings') +-- +1.7.10.4 + diff --git a/media-gfx/mypaint/files/mypaint-1.1.0-desktop.patch b/media-gfx/mypaint/files/mypaint-1.1.0-desktop.patch new file mode 100644 index 000000000000..b992131bf29e --- /dev/null +++ b/media-gfx/mypaint/files/mypaint-1.1.0-desktop.patch @@ -0,0 +1,24 @@ +From: Andrew Chadwick <andrewc-git@piffle.org> +Date: Tue, 8 Jan 2013 13:53:01 +0000 +Subject: desktop: remove deprecated Encoding key + +The Encoding key is deprecated as of 1.0 of the Desktop Entry Specification +(8 Jan 2012) + +http://standards.freedesktop.org/desktop-entry-spec/1.0/apc.html +--- + desktop/mypaint.desktop | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/desktop/mypaint.desktop b/desktop/mypaint.desktop +index 9850b54..24383db 100644 +--- a/desktop/mypaint.desktop ++++ b/desktop/mypaint.desktop +@@ -1,6 +1,5 @@ + [Desktop Entry] + Version=1.0 +-Encoding=UTF-8 + Name=MyPaint + TryExec=mypaint + Exec=mypaint %f +-- diff --git a/media-gfx/mypaint/files/mypaint-1.1.0-json-c-0.11.patch b/media-gfx/mypaint/files/mypaint-1.1.0-json-c-0.11.patch new file mode 100644 index 000000000000..f2aa9b9a0edf --- /dev/null +++ b/media-gfx/mypaint/files/mypaint-1.1.0-json-c-0.11.patch @@ -0,0 +1,15 @@ +https://bugs.gentoo.org/show_bug.cgi?id=467322 +Patch-by: Helmut Jarausch <jarausch@igpm.rwth-aachen.de> +Fixes pkgconfig name for new json-c (since 0.11) + +--- brushlib/SConscript.ORIG 2012-12-31 18:03:38.000000000 +0100 ++++ brushlib/SConscript 2013-04-26 11:47:27.008232199 +0200 +@@ -73,7 +73,7 @@ + + env.Append(CPPPATH='./') + +-pkg_deps = ['json'] ++pkg_deps = ['json-c'] + libs = ['m'] + linkflags = [] + diff --git a/media-gfx/mypaint/mypaint-1.1.0-r2.ebuild b/media-gfx/mypaint/mypaint-1.1.0-r2.ebuild new file mode 100644 index 000000000000..8c81ae609842 --- /dev/null +++ b/media-gfx/mypaint/mypaint-1.1.0-r2.ebuild @@ -0,0 +1,85 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=5 + +PYTHON_COMPAT=( python2_7 ) + +inherit fdo-mime gnome2-utils multilib scons-utils toolchain-funcs python-single-r1 + +DESCRIPTION="fast and easy graphics application for digital painters" +HOMEPAGE="http://mypaint.intilinux.com/" +SRC_URI="http://download.gna.org/${PN}/${P}.tar.bz2" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="amd64 x86" +IUSE="" + +LANGS="cs de en_CA en_GB es fr hu id it ja ko nb nn_NO pl pt_BR ro ru sl sv uk zh_CN zh_TW" + +RDEPEND=" + dev-python/pygtk:2[${PYTHON_USEDEP}] + dev-python/numpy[${PYTHON_USEDEP}] + >=dev-python/pycairo-1.4[${PYTHON_USEDEP}] + dev-python/protobuf-python[${PYTHON_USEDEP}] + >=dev-libs/json-c-0.11:= + media-libs/lcms:2 + media-libs/libpng:0= + ${PYTHON_DEPS} +" +DEPEND="${RDEPEND} + dev-lang/swig + virtual/pkgconfig" + +REQUIRED_USE=${PYTHON_REQUIRED_USE} + +pkg_setup() { + python-single-r1_pkg_setup +} + +src_prepare() { + # multilib support + sed -i -e "s:lib\/${PN}:$(get_libdir)\/${PN}:" \ + SConstruct SConscript || die + # respect CXXFLAGS,CXX,LDFLAGS + epatch "${FILESDIR}"/${P}-build-env-vars.patch + # fix mypaint.desktop + epatch "${FILESDIR}"/${P}-desktop.patch + # pkgconfig patch for json-c-0.11. 467322 + epatch "${FILESDIR}"/${P}-json-c-0.11.patch +} + +src_compile() { + #workaround scons bug with locales. Bug #352700 + export LANG="en_US.UTF-8" + tc-export CC CXX + escons +} + +src_install () { + escons prefix="${D}/usr" install + newicon pixmaps/${PN}_logo.png ${PN}.png + for x in ${LANGS}; do + if ! has ${x} ${LINGUAS}; then + rm -rf "${ED}"/usr/share/locale/${x} || die + fi + done + + python_optimize "${D}"usr/share/${PN} + # not used and broken + rm -rf "${ED}"/usr/{include/,lib/libmypaint.a,lib/pkgconfig/} || die +} + +pkg_preinst() { + gnome2_icon_savelist +} + +pkg_postinst() { + fdo-mime_desktop_database_update + gnome2_icon_cache_update +} + +pkg_postrm() { + fdo-mime_desktop_database_update +} diff --git a/media-gfx/qimgv/Manifest b/media-gfx/qimgv/Manifest index c73a7f1c4a63..58323dc75b23 100644 --- a/media-gfx/qimgv/Manifest +++ b/media-gfx/qimgv/Manifest @@ -1,4 +1,4 @@ -DIST qimgv-0.8.2.tar.gz 237098 BLAKE2B da71da019e87041cfa9f21592827e5a5623b2088e1349e534c437b0d5e50377980279fe99b7a18fb447c99ddb643a15c418fcfa2f261d3a559c639f560add0c4 SHA512 e80caa356cd2c7607a1d92a4ef4a79486ed504adb8ae454557e6a94d1d3ca5c023b78921e49777b1a06ca82556255d51357948281aae6a671ec01c597492a2cf -EBUILD qimgv-0.8.2.ebuild 1112 BLAKE2B e05f594b38b95380bbeed1494820efcdd67dd02d9d8ba33d445075a6dc3067364e6b54c73de2b21e511a312cad28225c72e773f3664209fe522a19df5a5144e6 SHA512 205f9d0cd702077c0c37b481eb783a22836af40bc2ae46196ab5d567108b69983391ca9b7824c484ca81920dceff0428189bbb8d4cfbb1988e47e46c7ac7734b +DIST qimgv-0.7.3.tar.gz 266307 BLAKE2B b13794f4bd7ff8b2c9309f95453baa65f91c60d155e22a86eac1eb79b3dc7f9da003dbfdbfc2d14cbb6242c769516283785ed72e2f50d5bb51b394db05c167b8 SHA512 fae7986ce29941232dd2863a0900651fb3a7d6d184b05e763670b16c74bb0cc27ce6eb936b2a41a2183e3dc5c33006e3fe3491ed043c6e357ea31d6a716d80e0 +EBUILD qimgv-0.7.3.ebuild 1087 BLAKE2B 470d072b17c63ab07b40bdda43a1416fe0f62f24ca553e0357c4cc088c07cd7478956306a3939c2a1cc685100d9d6698e5984626a6e04787d5a7df722597954c SHA512 0cb3f80c0b83a830f1aff592bc59bb870b019efd5fdd3e6206deef2f4921de32d1603d81e09c339265f7be8479afe1bce9b6ef8b000aa21775737ec65bd8585f EBUILD qimgv-9999.ebuild 696 BLAKE2B 4341560b05ddf294b877cd659b3647e5409e55bb39b34161106bec650c451ae46a2398a0a0d78580b1db0f27582b409162e1c199023891df764d77c123809586 SHA512 cb1d5e0eaff96f45f4cb63d50f75033a035ea0687fc801f921b0ca0c63a6812331c3efa17fd957fd07564f8d2a340530bfd4114851dab827b94830dfd09f6670 -MISC metadata.xml 365 BLAKE2B 84ac26390de8ab8b943b77f3922629d2b687fc15dd8a983480375c854fea4001b0772e52263a0883a5e0d8b32db7eaf3432c763cf54d0bfb0358b3ffc0fd0e69 SHA512 974bc950ab7ff01bc784247efbf1c5090974d5af3afc668554050bd0f0ae76254245c008175db0161896bf176049c574e421c1173774cb4e89e4ff9bd00db358 +MISC metadata.xml 454 BLAKE2B bb9012bfbeff8b79f1f3a4de8b7e24bbb664d0137a92c8bde3189612e99ce7f94f4d135b5fcda3a935b8d3b8181e9ca882b073cbe26a6f7ace7d52ac0a57804f SHA512 3f2ec50c29ac720c91d61a5ede051eb62a58771974e8c9591ee9b3a98a8a8d0af2071b29c8e7abb842999559ab330f63b39d7de87c8a1d6fd560002e9bf7d107 diff --git a/media-gfx/qimgv/metadata.xml b/media-gfx/qimgv/metadata.xml index ccef191fae16..21ece4b81016 100644 --- a/media-gfx/qimgv/metadata.xml +++ b/media-gfx/qimgv/metadata.xml @@ -9,4 +9,8 @@ <email>proxy-maint@gentoo.org</email> <name>Proxy Maintainers</name> </maintainer> + + <use> + <flag name="video">Add support for gif/webm playback via libmpv</flag> + </use> </pkgmetadata> diff --git a/media-gfx/qimgv/qimgv-0.8.2.ebuild b/media-gfx/qimgv/qimgv-0.7.3.ebuild index 52a5b418e7b7..002bdbd7f4fd 100644 --- a/media-gfx/qimgv/qimgv-0.8.2.ebuild +++ b/media-gfx/qimgv/qimgv-0.7.3.ebuild @@ -1,56 +1,52 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=6 -inherit cmake-utils xdg-utils +inherit cmake-utils gnome2-utils xdg-utils -DESCRIPTION="A cross-platform image viewer with webm support, written in qt5" +DESCRIPTION="A cross-platform image viewer with webm support. Written in qt5" HOMEPAGE="https://github.com/easymodo/qimgv" SRC_URI="https://github.com/easymodo/qimgv/archive/v${PV}.tar.gz -> ${P}.tar.gz" LICENSE="GPL-3" SLOT="0" KEYWORDS="~amd64 ~x86" -IUSE="exif kde" +IUSE="kde video" -BDEPEND=" - dev-util/cmake - virtual/pkgconfig -" -DEPEND=" +RDEPEND=" dev-qt/qtconcurrent:5 dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 - media-video/mpv[libmpv] - exif? ( media-libs/libexif ) kde? ( kde-frameworks/kwindowsystem:5 ) + video? ( media-video/mpv[libmpv] ) " -RDEPEND=" - ${DEPEND} +DEPEND=" + ${RDEPEND} + virtual/pkgconfig " src_prepare() { cmake-utils_src_prepare # respect make.conf CXXFLAGS - sed -i -e '/set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++17 -lstdc++fs -O3")/d' CMakeLists.txt || die + sed -i -e '/set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -O3")/d' CMakeLists.txt || die } src_configure() { local mycmakeargs=( - -DEXIV2=$(usex exif) -DKDE_SUPPORT=$(usex kde) + -DVIDEO_SUPPORT=$(usex video) ) cmake-utils_src_configure } pkg_postinst() { - xdg_icon_cache_update + gnome2_icon_cache_update xdg_desktop_database_update } pkg_postrm() { - xdg_icon_cache_update + gnome2_icon_cache_update xdg_desktop_database_update } diff --git a/media-gfx/sane-backends/Manifest b/media-gfx/sane-backends/Manifest index edc632c106aa..f653d227c5aa 100644 --- a/media-gfx/sane-backends/Manifest +++ b/media-gfx/sane-backends/Manifest @@ -11,4 +11,4 @@ AUX saned.socket 132 BLAKE2B 5e9f0350a1553fc75aea88ce355fb68b881e3b2194ac0e3c6f3 AUX saned_at.service 434 BLAKE2B 6dad3c809e01c17c0064a52c4103486b19294ed3cf8fc71faad18edaf71b920584366ac988d354f45bc07607ea64a97ea480fe152ac9a1cd896df99ff457cbf7 SHA512 891c751261107676f8159f403e0f4d4254099b709b9ba0ac9f2af97a9ed30f677411ad6bc316c2e6e673c616ba988253479d5e30c9617e3ae279beb79f70e965 DIST sane-backends-1.0.27.tar.gz 6430188 BLAKE2B 90f910311e31a436eaa0ca0fedd998aac3331f89a346f31613776ebc860a10cc37055fd15db8de8d743498914ea0c16e4153dbaa101380eb6e36857d730c3456 SHA512 c6552768bfc10216730fc11011c82f74ca0952182019ded3916072147ec09be5c975ce1d37dc3ccea050c488dbdf983c2ca17dcd702644060ba796ae2591f9c5 EBUILD sane-backends-1.0.27-r3.ebuild 8133 BLAKE2B f7854db7ed404b086ed600e0435c9bc53227b5b34d237f3b883363bd938cce12893f90432e76446249ff3ba00fad67eed9dd2282b01142439e0c6c6ba8d0483b SHA512 70890882acefc387de8988f51a2d09fc1b90794032016bea46ab0f6c624e7161dfa4fa6904bcbb22748a8c7a368058fd319d9058d37b1c1290672a177b86091d -MISC metadata.xml 266 BLAKE2B c76ad15982ba5b341a41155c75a5fda95a99ef658ed972c452bfb7b0968aafe33f83cc5bd0f2effb1c2b4f9721a8f61987f2fb7906855b3869e7787226f2b385 SHA512 67d43b02a8c1aab418ca79b30d88af0e78f9df9b95c93887cfed5976290e714409e7dc400f09170d7e7844a411aa3e3202f49f31f39b7f580a8c0b6f3d4db659 +MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84 diff --git a/media-gfx/sane-backends/metadata.xml b/media-gfx/sane-backends/metadata.xml index 92df0ba49ba5..6f49eba8f496 100644 --- a/media-gfx/sane-backends/metadata.xml +++ b/media-gfx/sane-backends/metadata.xml @@ -2,7 +2,4 @@ <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <!-- maintainer-needed --> -<upstream> -<remote-id type="cpe">cpe:/a:sane-backends_project:sane-backends</remote-id> -</upstream> </pkgmetadata> diff --git a/media-gfx/sxiv/Manifest b/media-gfx/sxiv/Manifest index b94ac21e043c..ddcdc95470dc 100644 --- a/media-gfx/sxiv/Manifest +++ b/media-gfx/sxiv/Manifest @@ -2,6 +2,6 @@ AUX sxiv-25-makefile.patch 251 BLAKE2B 05b96799c7e94c2a907158becfbd3d0844a3919f7 DIST sxiv-24.tar.gz 47148 BLAKE2B 69d70d64ea6cf6ae7a044d06df78a2e1e53941ef281d6445f54a28c4368112674461bc4e71a0226946588e604de33dd0972960cb072a00efd64512e5273cef09 SHA512 e4c9d4e18b4f1999b6441256b4c0d4683a105f1f64d4f754d6f9bc4f467ee1ccc6b6996cec8a210276c5fbec59417627fb838cb4f7be37cce32fa2c5d45d347b DIST sxiv-25.tar.gz 48814 BLAKE2B 17ef2ff0e75acd6acce068dfc17dfbce78bb1a38b652e948b5f88902adcbae504e9322c92d125b71c511a95c7e8e47b58060ff58e2c804a7296b5a801d3fc0e8 SHA512 ca0d834c9982c5e98c0bae51d21b7d08692af2d692eeb2ac55e19c4da7d09b16bbaa8022af0a0d00c52def4120058d895f37a2f8b14f453a0ceb65eebe564814 EBUILD sxiv-24.ebuild 1219 BLAKE2B da05f3f295ee8c8afb247ff3e31609ddf0b8c0fe8fb0db47f7e108b4253aa6565ff9dae5fe8b1c6875d5177705a2260fcf2be2a20e0d56374d31761537f30f65 SHA512 62ba4b36f941fc709a8e83a0be2bd581493041f1f93c21acd43753f8d7d368c9a6d6b8d9d3560dd78c9ebe0c4a15fc09cc48cb8a60fe77c4691b1663d0f8a370 -EBUILD sxiv-25.ebuild 1286 BLAKE2B ea500e8d7ced602d4616efed270173499204332fe6bb665d6c52e33833a1745423aa15ce417fb3502c5471b3746bf73c438533d9010b193b728154c0fe6a3c5f SHA512 9bade847c07cf76abd4131e6ced11c3dba85d8522b4b441b1556f9f20eef69907221dfcec4b7492c782de17f93a6a39453ae66a24223367145002509e979e35f +EBUILD sxiv-25.ebuild 1287 BLAKE2B f9e1ec5504f664946ce7fcd867e16bfc31a44b49cca0a9eaee690dd82846afd4115db0c5e4e42ab92ec7a39109a9332ea33a4761db648bb76af5e73889603dfe SHA512 e0d44bae62dc321155d51576563ac284a9520a772b1e578dfe65c29f8607bc59cf0cab6f9283fd23e8ade17ed0ce3b5cb61d5709f7e338de6473fee2b5c5c044 EBUILD sxiv-9999.ebuild 1241 BLAKE2B 4881e1503bf20cb06434fbb1cf4c540ecd2d724fb845c00eae2e349b96fc4440ed54359113f72a710a39564b7d4d2f015465b8754e1e6a6fb94abc1d6702e53f SHA512 1f8b2885556990c7de6b572cfc0f54d94d2fc804a73da9953d7f36511d73256c8318855ac32f578acb8bbb286eb0b70c411581a5cdaac2424239c866bab9d441 MISC metadata.xml 347 BLAKE2B 0e614a8efac493e84e5b64dc4347616e6af23c5e95a84b29fe755ab73d2bec9527a3e7dfd39cb9d952df4571c2b6d6f3de10e949bd5356d9628f3761bc578a4f SHA512 9aca2dd50b12a3bc6a0175bf8fe1767990b519ba92f91eca79137383901119fb7002b0e31d817a287ec08595d32c0074d92aefb0b0ae14c8e4c0b6b366e28515 diff --git a/media-gfx/sxiv/sxiv-25.ebuild b/media-gfx/sxiv/sxiv-25.ebuild index 577cc55b305c..5ce1e79a92e4 100644 --- a/media-gfx/sxiv/sxiv-25.ebuild +++ b/media-gfx/sxiv/sxiv-25.ebuild @@ -10,7 +10,7 @@ if [[ ${PV} == "9999" ]] ; then inherit git-r3 else SRC_URI="https://github.com/muennich/sxiv/archive/v${PV}.tar.gz -> ${P}.tar.gz" - KEYWORDS="amd64 x86" + KEYWORDS="~amd64 x86" fi DESCRIPTION="Simple (or small or suckless) X Image Viewer" diff --git a/media-gfx/xpaint/Manifest b/media-gfx/xpaint/Manifest index 428d18b6b9cb..4c8e302e8308 100644 --- a/media-gfx/xpaint/Manifest +++ b/media-gfx/xpaint/Manifest @@ -1,3 +1,13 @@ +AUX xpaint-2.9.10.2-QA2.patch 2235 BLAKE2B ff69a7b5b192d00a7bc308760f2d677e336b81023f458bd890574562c04946d9c1e8693e1edb09bef7c3799ba28c42a77c853f17d5d3730f6449259c5f17006e SHA512 5b8a34d8181f2b3b3b8459d4579b44e8a22807b25458401d3fe9243922ea1c7d565c25e938ff9506202ddd755e70ac103e70f9f258356ad0b240d8cbf2c53271 +AUX xpaint-2.9.10.2-tiff.patch 860 BLAKE2B 147daa24f9ec9ac321f488272873855eb025a0f8857463a7462f7627897b5b5bd9dcc6706a8b9efc9f0eaba1f0aafc91b62bbc21241a8dd2e2610d4c17ca1fe9 SHA512 38a34e3f317a3ac9a0ea5b8a62f3c93566c70889315ffa652c1dbec796e1448efabdcd58c8a7e67e70a4fa185871dfd6ca163bf38f50e9592ac792a4ca827dac +AUX xpaint-2.9.10.3-Fix-build-with-clang.patch 669 BLAKE2B 72e06035a5cbc8f1f20f1ea22ee61047395f7f503ea77a7737ddc8b57b640be95f04ff199f2c69958fbdac9cdd1448e57ec292a3d2471404578e39db74fbd2b0 SHA512 7a8138a82eb3d4824d138a21d03759986ad03d05d65d0ef24fb911b642e1906bc5b6aba7417836fa4756cb63ae09427b7ec2a05be1588fd86a1668b52418f9e7 +AUX xpaint-2.9.9.4-QA1.patch 3336 BLAKE2B ef04f399152e9a66e774cff98c6b2c8d6f75761ef03736f33363be8af84421e2fec702aa13353124cf552eccbb3b49645cf2d3515955b39a7407fc90b2d29704 SHA512 2760bd60bc1e6335c48ce4576e9176c5893e70568f99d535b48878e6917591258ff5d206851c312b3af6b1bcda93076a60bcb3452176a49f588d4ffa1ed69a79 +AUX xpaint-2.9.9.4-parallel-make.patch 655 BLAKE2B 37c8ecee14090cb6a7a5543c9d53d52baf31446a5ef731ddf6b397660f6f6f6a598ee72c3309a0df82149e60fe123ad31936858eb48e5d1a141c3de54ddbbfcc SHA512 45161a7a76f05ebff009b8dda5c52baddcd936ee8c5984a3e0fa02d80a56947ba55df68c1241115dcce5a1f75d8993794b761ba0dbadb94b86b9c2ebfbe7c3d7 +AUX xpaint-2.9.9.4-submake.patch 747 BLAKE2B bbdce5e4ccbd6eb6b3957b9969261957d5e42ec12e273000abea0d34eef253325e1092b20df5d86ed2b30083acc5627ac2830d557b42d85f52394f3a99ef16f5 SHA512 72525c5cd892772210cba85b0f5ff193a6474657d6ffbead23c711de3346c87f8d306e252fdd8b98ae136f32311d88be6107bbe72932039bf17e4c0c64b70bae DIST xpaint-2.10.2.tar.bz2 1891925 BLAKE2B 056ef057357a2441c8a286adf326a98650e5e0905ee07c5ef24b0689dbb57247711c44b63211494e4ca9e44429d6237c017f53e2690f99790fa6100e4ce4d118 SHA512 a25aa940931c686e86cbc2bd8d6fd3c80d2c793a20d7a2dd90fb5cba1cd360b5e1c8433bf0d639e2b86cb2a74040be373f732c4617909aaf8c5ada2624ab5614 +DIST xpaint-2.9.10.2.tar.bz2 1245813 BLAKE2B 9ff1a94bdbaf996f7ca41fd8df86ccfc58d7f51b24b20311f082beb30620dc48a6e9ae0e28ccf2cf41a7cd7901cf303fda1d45a7b48ff4ec356a3ac1f2ccd642 SHA512 8aa388d4b82b5867817eca2188f50734140c395efe663c290a78b4f24314754fb29257165a64c9b8a03634dede03d919d9a3a54c1d32049cc34216a1f3d4e499 +DIST xpaint-2.9.10.3.tar.bz2 1283725 BLAKE2B 46e1798830ddff6cc7d6d827fad0cad6d42a61dd6e6740ae6d3bca70ae7012a7c63d1d3ea5b6ebb21e0b2889c96c3f0e57969ec02bb8e742f945027e0e22e3b8 SHA512 d5d365e0308e50166e5ac70859e388436d8f0cb870b2dea0155fbc9a65a8377a861bea2217df2b5c016f8751c9ff1f74509eaff310acfaacd7b29c51cf726ac5 EBUILD xpaint-2.10.2.ebuild 1510 BLAKE2B 84c90679da7f4d8f48a57ad494d6a9914f4fa47a97e3d18bfa4f71c13619c94018e49879371fe18f852c15faf1a75ae4c9228e93d97d7b3c3eac62748c443aaa SHA512 8f009d6bdea418b73a4295e8f66e8b255f6b1b221346ddfe86beb44675fc66954ca2b6fb232f5248e2eb20aa19e7c5bd80b2be25c8ca0c9f5e6f849d34adbeea +EBUILD xpaint-2.9.10.2-r1.ebuild 1634 BLAKE2B fd9d07d153e335a36ad0357348938782f6a887f4b3346ad3191c000cd0237c4f6e1dd3993515686b28da958218f5631c6558ec8b8d7deec8241830aad276823a SHA512 fa3117c3dda557ce2c19717652088d3ad0d7c7546d660ad3e5dbdd788056ffd462905c69f74b3b114658c3f3d7defeeb26307d00425009884a790381f0a259ac +EBUILD xpaint-2.9.10.3-r1.ebuild 1696 BLAKE2B 140a5a043d216e0350294123b5a9f98da8b36b7648fa4b13c82726392e0fb976015d87fcfe1d2457b28db01ba89b010335d12d5da4c034940c26e3ba9987daa5 SHA512 1fac714e82d6df4f2f0dbe19f5a2fd9751d284496ed3b66487986155d20e4d01de8f0671000214ce87ff7eea09a96f0a3916aa2363c3532837b19f509fe50992 MISC metadata.xml 1204 BLAKE2B 3cd1cf2062126075b6b4be1b987ab9098ae31b611abe6e81c15e684e62ed0a1133177c4718e5bc51d5be2a0b5b2b58fb4d4a2d67ea77f21ca6d9009f2a4d4150 SHA512 e2b37b1d3381dd97ecdd40f20535426539d7caff8032ffcb5e6b74d65968adb7319523a55e45d31a697a75b9aa384e0a5155059237730ea080cf46532da12c22 diff --git a/media-gfx/xpaint/files/xpaint-2.9.10.2-QA2.patch b/media-gfx/xpaint/files/xpaint-2.9.10.2-QA2.patch new file mode 100644 index 000000000000..9179585974c2 --- /dev/null +++ b/media-gfx/xpaint/files/xpaint-2.9.10.2-QA2.patch @@ -0,0 +1,67 @@ +From 08bdf5f5d0c64384b2be16bd8ac68244675388d5 Mon Sep 17 00:00:00 2001 +From: hasufell <hasufell@gentoo.org> +Date: Sun, 6 Oct 2013 21:13:51 +0200 +Subject: [PATCH] respect CFLAGS + +--- + Makefile.am | 2 +- + configure.ac | 2 +- + rw/Makefile.am | 2 +- + rw/configure.ac | 2 +- + 4 files changed, 4 insertions(+), 4 deletions(-) + +diff --git a/Makefile.am b/Makefile.am +index 4cf1753..414597f 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -26,7 +26,7 @@ EXTERN_VIEWER = display + ## -D_BSD_SOURCE -D_SVID_SOURCE -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 \ + ## -DFUNCPROTO=15 -DNARROWPROTO + +-ARCH_DEFINES = -g -O2 -fno-strict-aliasing -fPIC ++ARCH_DEFINES = -fno-strict-aliasing -fPIC + + ## + ## Specific xpaint options +diff --git a/configure.ac b/configure.ac +index e058529..3979075 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -29,7 +29,7 @@ AC_TYPE_UINT16_T + AC_TYPE_UINT32_T + AC_TYPE_UINT64_T + +-CFLAGS="-I/usr/include -I/usr/include/X11 -I/usr/include/X11/Xaw3dxft" ++CFLAGS="$CFLAGS -I/usr/include -I/usr/include/X11 -I/usr/include/X11/Xaw3dxft" + LIBS="$LIBS -lm" + echo "VERSION = $VERSION" > .version + +diff --git a/rw/Makefile.am b/rw/Makefile.am +index d91d5d5..2f50253 100644 +--- a/rw/Makefile.am ++++ b/rw/Makefile.am +@@ -10,7 +10,7 @@ SHAREDIR = $(prefix)/share/xpaint + ## -D_BSD_SOURCE -D_SVID_SOURCE -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 \ + ## -DFUNCPROTO=15 -DNARROWPROTO + +-ARCH_DEFINES = -g -O2 -fno-strict-aliasing -fPIC ++ARCH_DEFINES = -fno-strict-aliasing -fPIC + + ## + ## Specific xpaint options +diff --git a/rw/configure.ac b/rw/configure.ac +index fb4f3d4..d9c7601 100644 +--- a/rw/configure.ac ++++ b/rw/configure.ac +@@ -29,7 +29,7 @@ AC_TYPE_UINT16_T + AC_TYPE_UINT32_T + AC_TYPE_UINT64_T + +-CFLAGS="-D_POSIX_C_SOURCE=199309L -D_POSIX_SOURCE -D_XOPEN_SOURCE -D_BSD_SOURCE -D_SVID_SOURCE -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 -DFUNCPROTO=15 -DNARROWPROTO -I/usr/include -I/usr/include/X11 -I/usr/include/X11/Xaw3dxft" ++CFLAGS="$CFLAGS -D_POSIX_C_SOURCE=199309L -D_POSIX_SOURCE -D_XOPEN_SOURCE -D_BSD_SOURCE -D_SVID_SOURCE -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 -DFUNCPROTO=15 -DNARROWPROTO -I/usr/include -I/usr/include/X11 -I/usr/include/X11/Xaw3dxft" + LIBS="$LIBS -lm" + + dnl check X11 +-- +1.8.3.2 + diff --git a/media-gfx/xpaint/files/xpaint-2.9.10.2-tiff.patch b/media-gfx/xpaint/files/xpaint-2.9.10.2-tiff.patch new file mode 100644 index 000000000000..20e59872b84d --- /dev/null +++ b/media-gfx/xpaint/files/xpaint-2.9.10.2-tiff.patch @@ -0,0 +1,37 @@ +From: Julian Ospald <hasufell@gentoo.org> +Date: Fri Jun 20 13:52:42 UTC 2014 +Subject: fix tiff build switch + +--- xpaint-2.9.10.2/configure.ac ++++ xpaint-2.9.10.2/configure.ac +@@ -125,9 +125,11 @@ + with_libtiff="yes" + tiff_header_found="no" + # +-AC_ARG_ENABLE(tiff, ++AC_ARG_ENABLE([tiff], + [ --enable-tiff[=[yes|no]] Build with TIFF support [ [default=yes] ]], +-test "$enable_tiff" = "no" && with_libtiff="no") ++ [with_libtiff=$enableval], ++ [with_libtiff=yes] ++) + # + if test "x$with_libtiff" = xyes ; then + #TIFF compiled with JPEG and JBIG support? +--- xpaint-2.9.10.2/rw/readWriteTIFF.c ++++ xpaint-2.9.10.2/rw/readWriteTIFF.c +@@ -14,6 +14,8 @@ + + /* $Id$ */ + ++#ifdef HAVE_TIFF ++ + #include <stdio.h> + #include <stdlib.h> + #include "tiffio.h" +@@ -527,3 +529,5 @@ int WriteTIFF(char *file, Image * image) + + return 0; + } ++ ++#endif /* HAVE_TIFF */ diff --git a/media-gfx/xpaint/files/xpaint-2.9.10.3-Fix-build-with-clang.patch b/media-gfx/xpaint/files/xpaint-2.9.10.3-Fix-build-with-clang.patch new file mode 100644 index 000000000000..a5a26214409e --- /dev/null +++ b/media-gfx/xpaint/files/xpaint-2.9.10.3-Fix-build-with-clang.patch @@ -0,0 +1,25 @@ +From 69a76e5f4a72d83635cd413b7460df4776b2605f Mon Sep 17 00:00:00 2001 +From: hasufell <hasufell@gentoo.org> +Date: Sun, 16 Aug 2015 16:51:26 +0200 +Subject: [PATCH] Fix build with clang + +--- + rw/readWriteTGA.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/rw/readWriteTGA.c b/rw/readWriteTGA.c +index 306a751..9046ee3 100644 +--- a/rw/readWriteTGA.c ++++ b/rw/readWriteTGA.c +@@ -607,7 +607,7 @@ int WriteTGA(char *file_name, Image * image) + int tga_defdir = 1; + int transparency = -1; + +- if (!image) return; ++ if (!image) return -1; + w = image->width; + h = image->height; + bpp = image->scale; +-- +2.5.0 + diff --git a/media-gfx/xpaint/files/xpaint-2.9.9.4-QA1.patch b/media-gfx/xpaint/files/xpaint-2.9.9.4-QA1.patch new file mode 100644 index 000000000000..31e3a38ba005 --- /dev/null +++ b/media-gfx/xpaint/files/xpaint-2.9.9.4-QA1.patch @@ -0,0 +1,91 @@ +From 2987bfa203a8467a697efffa211b90b12858b40b Mon Sep 17 00:00:00 2001 +From: hasufell <hasufell@gentoo.org> +Date: Sun, 6 Oct 2013 20:37:28 +0200 +Subject: [PATCH] respect flags, add WITH_PGF option, fix echo + +--- + util/Makefile | 56 +++++++++++++++++++++++++++++++++++--------------------- + 1 file changed, 35 insertions(+), 21 deletions(-) + +diff --git a/util/Makefile b/util/Makefile +index e6af415..21a0d17 100644 +--- a/util/Makefile ++++ b/util/Makefile +@@ -1,39 +1,53 @@ +-GCC = gcc +-CPP = g++ -fpermissive ++# set to anything but "no" to enable ++WITH_PGF=no + ++ifneq ($(WITH_PGF),no) + all: pdfconcat ppmtops pgf2pnm ++else ++all: pdfconcat ppmtops ++endif + + pdfconcat: +- $(GCC) -O3 -s -DNDEBUG=1 -DNO_CONFIG=1 -ansi -pedantic -Wunused -Wall -W -Wstrict-prototypes -Wtraditional -Wnested-externs -Winline -Wpointer-arith -Wbad-function-cast -Wcast-qual -Wmissing-prototypes -Wmissing-declarations pdfconcat.c -o pdfconcat ++ $(CC) $(CFLAGS) -DNDEBUG=1 -DNO_CONFIG=1 -ansi -pedantic -Wunused -Wall -W -Wstrict-prototypes -Wtraditional -Wnested-externs -Winline -Wpointer-arith -Wbad-function-cast -Wcast-qual -Wmissing-prototypes -Wmissing-declarations pdfconcat.c -o pdfconcat $(LDFLAGS) + + ppmtops: +- $(GCC) ppmtops.c -o ppmtops ++ $(CC) $(CFLAGS) ppmtops.c -o ppmtops $(LDFLAGS) + ++ifneq ($(WITH_PGF),no) + pgf2pnm: main.cpp pnm.cpp + @if [ -x /usr/include/libpgf ] ; then \ +- $(CPP) -c main.cpp -o main.o -I/usr/include/libpgf ; \ +- $(CPP) -c pnm.cpp -o pnm.o -I/usr/include/libpgf ; \ +- $(CPP) -o pgf2pnm main.o pnm.o -lpgf ; \ ++ $(CXX) $(CXXFLAGS) -fpermissive -c main.cpp -o main.o -I/usr/include/libpgf ; \ ++ $(CXX) $(CXXFLAGS) -fpermissive -c pnm.cpp -o pnm.o -I/usr/include/libpgf ; \ ++ $(CXX) $(CXXFLAGS) -fpermissive -o pgf2pnm main.o pnm.o $(LDFLAGS) -lpgf ; \ + else \ +- @echo "libpgf not installed !!" ; \ ++ echo "libpgf not installed !!" ; \ + fi ++endif + +-install: ++install-common: + @if [ -x pdfconcat ] ; then \ +- mkdir -p $(DESTDIR)/usr/bin ; \ +- install -c pdfconcat $(DESTDIR)/usr/bin ; \ +- echo "install -c pdfconcat $(DESTDIR)/usr/bin" ; \ +- mkdir -p $(DESTDIR)/usr/share/man/man1 ; \ +- install -c -m 644 pdfconcat.1 $(DESTDIR)/usr/share/man/man1 ; \ +- echo "install -c pdfconcat.1 $(DESTDIR)/usr/share/man/man1" ; fi ++ mkdir -p "$(DESTDIR)"/usr/bin ; \ ++ install -c pdfconcat "$(DESTDIR)"/usr/bin ; \ ++ echo "install -c pdfconcat "$(DESTDIR)"/usr/bin" ; \ ++ mkdir -p "$(DESTDIR)"/usr/share/man/man1 ; \ ++ install -c -m 644 pdfconcat.1 "$(DESTDIR)"/usr/share/man/man1 ; \ ++ echo "install -c pdfconcat.1 "$(DESTDIR)"/usr/share/man/man1" ; fi + @if [ -x ppmtops ] ; then \ +- mkdir -p $(DESTDIR)/usr/bin ; \ +- install -c ppmtops $(DESTDIR)/usr/bin ; \ +- echo "install -c ppmtops $(DESTDIR)/usr/bin" ; fi ++ mkdir -p "$(DESTDIR)"/usr/bin ; \ ++ install -c ppmtops "$(DESTDIR)"/usr/bin ; \ ++ echo "install -c ppmtops "$(DESTDIR)"/usr/bin" ; fi ++ ++install-pgf: + @if [ -x pgf2pnm ] ; then \ +- mkdir -p $(DESTDIR)/usr/bin ; \ +- install -c pgf2pnm $(DESTDIR)/usr/bin ; \ +- echo "install -c pgf2pnm $(DESTDIR)/usr/bin" ; fi ++ mkdir -p "$(DESTDIR)"/usr/bin ; \ ++ install -c pgf2pnm "$(DESTDIR)"/usr/bin ; \ ++ echo "install -c pgf2pnm "$(DESTDIR)"/usr/bin" ; fi ++ ++ifneq ($(WITH_PGF),no) ++install: install-common install-pgf ++else ++install: install-common ++endif + + clean: + rm -f core *~ *.o pdfconcat ppmtops pgf2pnm +-- +1.8.3.2 + diff --git a/media-gfx/xpaint/files/xpaint-2.9.9.4-parallel-make.patch b/media-gfx/xpaint/files/xpaint-2.9.9.4-parallel-make.patch new file mode 100644 index 000000000000..250f634f9973 --- /dev/null +++ b/media-gfx/xpaint/files/xpaint-2.9.9.4-parallel-make.patch @@ -0,0 +1,25 @@ +From ae11f5cb975749bd8d6ffda48301eb4aadfee35d Mon Sep 17 00:00:00 2001 +From: hasufell <hasufell@gentoo.org> +Date: Sun, 6 Oct 2013 21:02:12 +0200 +Subject: [PATCH] fix parallel make + +--- + Makefile.am | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/Makefile.am b/Makefile.am +index b2285a0..4cf1753 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -112,7 +112,7 @@ XPaint.ad: app-defaults + XPaint.ad.h: substads XPaint.ad + ./substads -ad2c XPaint.ad $@ + +-xpaint.1: xpaint.1.in version.h ++xpaint.1: substads xpaint.1.in version.h + ./substads -single xpaint.1.in xpaint.1 XPAINT_VERSION $(PACKAGE_VERSION) + + install-exec-hook: +-- +1.8.3.2 + diff --git a/media-gfx/xpaint/files/xpaint-2.9.9.4-submake.patch b/media-gfx/xpaint/files/xpaint-2.9.9.4-submake.patch new file mode 100644 index 000000000000..e218eb4c75e9 --- /dev/null +++ b/media-gfx/xpaint/files/xpaint-2.9.9.4-submake.patch @@ -0,0 +1,29 @@ +From 11b369b69c4637431b139960391bded531a9f652 Mon Sep 17 00:00:00 2001 +From: hasufell <hasufell@gentoo.org> +Date: Sun, 6 Oct 2013 20:25:14 +0200 +Subject: [PATCH] don't run submake + +--- + Makefile.am | 5 ----- + 1 file changed, 5 deletions(-) + +diff --git a/Makefile.am b/Makefile.am +index 5b2caec..b2285a0 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -139,11 +139,6 @@ install-exec-hook: + mkdir -p $(DESTDIR)$(SHAREDIR)/messages + cd share/messages ; $(RM) -f *~ ; cp -f Messages* $(DESTDIR)$(SHAREDIR)/messages + chmod -R a+r $(DESTDIR)$(SHAREDIR)/ +- cd util ; make ; make install DESTDIR=$(DESTDIR)$ + + clean-local: + rm -f xaw_incdir +- cd util ; make clean +- +-distclean-local: +- cd util ; make distclean +\ No newline at end of file +-- +1.8.3.2 + diff --git a/media-gfx/xpaint/xpaint-2.9.10.2-r1.ebuild b/media-gfx/xpaint/xpaint-2.9.10.2-r1.ebuild new file mode 100644 index 000000000000..4ca535290046 --- /dev/null +++ b/media-gfx/xpaint/xpaint-2.9.10.2-r1.ebuild @@ -0,0 +1,84 @@ +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=5 + +inherit autotools eutils + +DESCRIPTION="Image editor with tiff, jpeg and png support" +HOMEPAGE="http://sf-xpaint.sourceforge.net/" +SRC_URI="mirror://sourceforge/sf-xpaint/${P}.tar.bz2" + +LICENSE="GPL-3" +SLOT="0" +KEYWORDS="amd64 x86" +IUSE="jpeg2k pgf tiff" + +RDEPEND=" + media-libs/fontconfig + media-libs/freetype + media-libs/libpng:0 + x11-libs/libICE + x11-libs/libX11 + >=x11-libs/libXaw3dXft-1.6.2c + x11-libs/libXext + x11-libs/libXft + x11-libs/libXmu + x11-libs/libXpm + x11-libs/libXt + sys-libs/zlib + virtual/jpeg:0 + jpeg2k? ( media-libs/openjpeg:0 ) + pgf? ( media-libs/libpgf ) + tiff? ( + media-libs/jbigkit:0 + media-libs/tiff:0 + )" +DEPEND="${RDEPEND} + sys-devel/flex + sys-devel/bison + virtual/pkgconfig" + +src_prepare() { + epatch "${FILESDIR}"/${PN}-2.9.9.4-{QA1,submake,parallel-make}.patch \ + "${FILESDIR}"/${PN}-2.9.10.2-{QA2,tiff}.patch + eautoreconf +} + +src_configure() { + econf \ + $(use_enable tiff) \ + $(use_enable jpeg2k libopenjpeg) +} + +src_compile() { + # clean up + emake clean + emake -C util clean + + # parallel make still fails sometimes + emake substads + emake xpaint.1 + + default + emake \ + WITH_PGF="$(usex pgf "yes" "no")" \ + CC="$(tc-getCC)" \ + CXX="$(tc-getCXX)" \ + -C util +} + +src_install() { + default + emake \ + WITH_PGF="$(usex pgf "yes" "no")" \ + DESTDIR="${ED}" \ + -C util install +} + +pkg_postinst() { + elog "optional dependencies:" + elog " app-text/gv (external viewer for PostScript output)" + elog " media-gfx/imagemagick (external viewer for pixel graphics)" + elog " net-print/cups (printing)" +} diff --git a/media-gfx/xpaint/xpaint-2.9.10.3-r1.ebuild b/media-gfx/xpaint/xpaint-2.9.10.3-r1.ebuild new file mode 100644 index 000000000000..00b7b44564af --- /dev/null +++ b/media-gfx/xpaint/xpaint-2.9.10.3-r1.ebuild @@ -0,0 +1,85 @@ +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=5 + +inherit autotools eutils + +DESCRIPTION="Image editor with tiff, jpeg and png support" +HOMEPAGE="http://sf-xpaint.sourceforge.net/" +SRC_URI="mirror://sourceforge/sf-xpaint/${P}.tar.bz2" + +LICENSE="GPL-3" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="jpeg2k pgf tiff" + +RDEPEND=" + media-libs/fontconfig + media-libs/freetype + media-libs/libpng:0 + x11-libs/libICE + x11-libs/libX11 + >=x11-libs/libXaw3dXft-1.6.2c + x11-libs/libXext + x11-libs/libXft + x11-libs/libXmu + x11-libs/libXpm + x11-libs/libXt + sys-libs/zlib + virtual/jpeg:0 + jpeg2k? ( media-libs/openjpeg:0 ) + pgf? ( media-libs/libpgf ) + tiff? ( + media-libs/jbigkit:0 + media-libs/tiff:0 + )" +DEPEND="${RDEPEND} + sys-devel/flex + sys-devel/bison + virtual/pkgconfig" + +src_prepare() { + epatch "${FILESDIR}"/${PN}-2.9.9.4-{QA1,submake,parallel-make}.patch \ + "${FILESDIR}"/${PN}-2.9.10.2-{QA2,tiff}.patch \ + "${FILESDIR}"/${PN}-2.9.10.3-Fix-build-with-clang.patch + eautoreconf +} + +src_configure() { + econf \ + $(use_enable tiff) \ + $(use_enable jpeg2k libopenjpeg) +} + +src_compile() { + # clean up + emake clean + emake -C util clean + + # parallel make still fails sometimes + emake substads + emake xpaint.1 + + default + emake \ + WITH_PGF="$(usex pgf "yes" "no")" \ + CC="$(tc-getCC)" \ + CXX="$(tc-getCXX)" \ + -C util +} + +src_install() { + default + emake \ + WITH_PGF="$(usex pgf "yes" "no")" \ + DESTDIR="${ED}" \ + -C util install +} + +pkg_postinst() { + elog "optional dependencies:" + elog " app-text/gv (external viewer for PostScript output)" + elog " media-gfx/imagemagick (external viewer for pixel graphics)" + elog " net-print/cups (printing)" +} |