diff options
author | Johannes Huber <johu@gentoo.org> | 2016-10-31 20:03:48 +0100 |
---|---|---|
committer | Johannes Huber <johu@gentoo.org> | 2016-10-31 20:03:48 +0100 |
commit | bab43b50276c5123416de84fdce994ad3a89a7cd (patch) | |
tree | ad0f218d7e00118c51e7011b5c44ecf7837bb42b /media-gfx/digikam | |
parent | media-gfx/digikam: Restore application style support (diff) | |
download | gentoo-bab43b50276c5123416de84fdce994ad3a89a7cd.tar.gz gentoo-bab43b50276c5123416de84fdce994ad3a89a7cd.tar.bz2 gentoo-bab43b50276c5123416de84fdce994ad3a89a7cd.zip |
media-gfx/digikam: Remove 5.1.0 (r1)
Package-Manager: portage-2.3.2
Diffstat (limited to 'media-gfx/digikam')
-rw-r--r-- | media-gfx/digikam/Manifest | 1 | ||||
-rw-r--r-- | media-gfx/digikam/digikam-5.1.0-r1.ebuild | 172 | ||||
-rw-r--r-- | media-gfx/digikam/files/digikam-5.1.0-albums-crashfix.patch | 35 | ||||
-rw-r--r-- | media-gfx/digikam/files/digikam-5.1.0-i386-gcc61.patch | 41 | ||||
-rw-r--r-- | media-gfx/digikam/files/digikam-5.1.0-memalloc-crash.patch | 95 |
5 files changed, 0 insertions, 344 deletions
diff --git a/media-gfx/digikam/Manifest b/media-gfx/digikam/Manifest index 32c254bb680a..f67754b10b30 100644 --- a/media-gfx/digikam/Manifest +++ b/media-gfx/digikam/Manifest @@ -1,4 +1,3 @@ DIST digikam-4.14.0.tar.bz2 59805228 SHA256 9d7bcb689d8c29be2e81976f0a043220f442a24f2071284044e7f1a799a7fdad SHA512 3029e9b67d9d055bd9aee0d6d01e87950702e026f9f44b513155946ba087ec58b300f945a035a418afae45365ed007d8db6a1a90ed1d391e5e0e4cb679168ccf WHIRLPOOL 35a3caedc9a4799f161b26b3b4df51da18a31be50a8a6da5b12a339a353755d73a47f103099087e3dc8e6926f65ae19638efea3585c86f72173a086056bf48ce DIST digikam-4.4.0.tar.bz2 68871203 SHA256 5c68a2d200f5b502706128ea64839319aad333fb79548f49ecc92594e280d4e9 SHA512 4992fad1e574fc44eac53f3ac8d4ab78ccbf8e04beb54a211a9afc20af1efb6f8bacedea07e403f490e7f70a74ed5ac02d4f9b939dfaf25f64a4a9bda0a7d94a WHIRLPOOL 7a05ab9926227232a1cf52bf68da45b849b982e840b171f702610acce85a1ce8e59967a02e845a0ef19c316daee835861573aca40dc7b28422cf7d6d56119e2c -DIST digikam-5.1.0.tar.xz 68259780 SHA256 47915e2e41ded21071309c0b387495bd66f6cc488acbfa647d2d8d57595127f1 SHA512 aa6b6b2a2f40dc6e1e90549d3b1cdcd2e886d16cfa4bb140093b67366b4aeaa3ebab96f0a28b1aeb969dca1fa64f8377bb8af44da4feeb4356e1f884357aaa86 WHIRLPOOL c09afdcc67fa0643f84f4b026227eb6f6c651369b1452e670d4c4451d967a78c968ec56a39f724d726f251d5fb51411214aa723860a23e936ce282a7285d89bc DIST digikam-5.2.0.tar.xz 143583460 SHA256 cf243fc1518b5bb6e289573c76d89b5fdcc50be89f6312b276af3320763c9260 SHA512 483c2331f8f1a145ffd04bfdfe3f3e7e68f7ac4458b8b1698339dc89433d7820548fc461a5acf163997bab086b5faed6dd635af996f2503213a6207603603b4d WHIRLPOOL 9df54368afa4c31791102211a334568c9301082899fa7970b88dcec2047ded299c0a4dc92ccc1d6db3c2efc71be7e78349d6289b68414b6cfbe76bcc0c6fb930 diff --git a/media-gfx/digikam/digikam-5.1.0-r1.ebuild b/media-gfx/digikam/digikam-5.1.0-r1.ebuild deleted file mode 100644 index 55270340c354..000000000000 --- a/media-gfx/digikam/digikam-5.1.0-r1.ebuild +++ /dev/null @@ -1,172 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=6 - -if [[ ${KDE_BUILD_TYPE} != live ]]; then - KDE_HANDBOOK="true" - KDE_TEST="true" -fi -CMAKE_MAKEFILE_GENERATOR="emake" -CMAKE_MIN_VERSION="3.0" -inherit kde5 toolchain-funcs - -DESCRIPTION="Digital photo management application" -HOMEPAGE="https://www.digikam.org/" - -LICENSE="GPL-2" -KEYWORDS="~amd64 ~x86" -IUSE="addressbook gphoto2 jpeg2k +kipi +lensfun marble semantic-desktop mysql opengl openmp +panorama scanner video X" - -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/${MY_P}.tar.xz" - - S="${WORKDIR}/${MY_P}/core" - -fi - -COMMON_DEPEND=" - $(add_frameworks_dep kcompletion) - $(add_frameworks_dep kconfig) - $(add_frameworks_dep kconfigwidgets) - $(add_frameworks_dep kcoreaddons) - $(add_frameworks_dep kiconthemes) - $(add_frameworks_dep ki18n) - $(add_frameworks_dep kio) - $(add_frameworks_dep kjobwidgets) - $(add_frameworks_dep knotifications) - $(add_frameworks_dep knotifyconfig) - $(add_frameworks_dep kservice) - $(add_frameworks_dep ktextwidgets) - $(add_frameworks_dep kwidgetsaddons) - $(add_frameworks_dep kwindowsystem) - $(add_frameworks_dep kxmlgui) - $(add_frameworks_dep solid) - $(add_kdeapps_dep libkexiv2) - $(add_qt_dep qtconcurrent) - $(add_qt_dep qtdbus) - $(add_qt_dep qtgui) - $(add_qt_dep qtprintsupport) - $(add_qt_dep qtscript) - $(add_qt_dep qtsql 'mysql?') - $(add_qt_dep qtwebkit) - $(add_qt_dep qtwidgets) - $(add_qt_dep qtxml) - dev-libs/boost[threads] - dev-libs/expat - media-gfx/exiv2:= - media-libs/lcms:2 - media-libs/liblqr - >=media-libs/libpgf-6.12.27 - media-libs/libpng:0= - media-libs/opencv:=[-qt4] - || ( <media-libs/opencv-3.0.0 >=media-libs/opencv-3.1.0 ) - media-libs/tiff:0 - virtual/jpeg:0 - addressbook? ( - $(add_kdeapps_dep akonadi-contacts) - $(add_kdeapps_dep kcontacts) - ) - gphoto2? ( media-libs/libgphoto2:= ) - jpeg2k? ( media-libs/jasper ) - kipi? ( $(add_kdeapps_dep libkipi '' '16.03.80') ) - lensfun? ( media-libs/lensfun ) - marble? ( - $(add_frameworks_dep kbookmarks) - $(add_frameworks_dep kitemmodels) - $(add_kdeapps_dep marble) - ) - mysql? ( virtual/mysql ) - opengl? ( - $(add_qt_dep qtopengl) - virtual/opengl - ) - panorama? ( $(add_frameworks_dep threadweaver) ) - scanner? ( $(add_kdeapps_dep libksane) ) - semantic-desktop? ( $(add_frameworks_dep kfilemetadata) ) - video? ( $(add_qt_dep qtmultimedia 'widgets') ) - X? ( - $(add_qt_dep qtx11extras) - x11-libs/libX11 - ) -" -DEPEND="${COMMON_DEPEND} - dev-cpp/eigen:3 - sys-devel/gettext - panorama? ( - sys-devel/bison - sys-devel/flex - ) -" -RDEPEND="${COMMON_DEPEND} - media-plugins/kipi-plugins:5 - panorama? ( media-gfx/hugin ) - !media-gfx/digikam:4 -" - -RESTRICT=test -# bug 366505 - -PATCHES=( - "${FILESDIR}/${P}-i386-gcc61.patch" - "${FILESDIR}/${P}-albums-crashfix.patch" - "${FILESDIR}/${P}-memalloc-crash.patch" -) - -# FIXME: Unbundle libraw (libs/rawengine/libraw) -pkg_pretend() { - if use openmp ; then - tc-has-openmp || die "Please switch to an openmp compatible compiler" - fi - kde5_pkg_pretend -} - -src_prepare() { - if [[ ${KDE_BUILD_TYPE} != live ]]; then - # prepare the translations - mv "${WORKDIR}/${MY_P}/po" po || die - find po -name "*.po" -and -not -name "digikam.po" -delete || die - echo "set_property(GLOBAL PROPERTY ALLOW_DUPLICATE_CUSTOM_TARGETS 1)" >> CMakeLists.txt || die - echo "find_package(Gettext REQUIRED)" >> CMakeLists.txt || die - echo "add_subdirectory( po )" >> CMakeLists.txt || die - - if use handbook; then - # subdirs need to be preserved b/c relative paths... - # doc-translated is, in fact, broken, and ignored - mv "${WORKDIR}/${MY_P}/doc/${PN}" doc-default || die - echo "add_subdirectory( doc-default )" >> CMakeLists.txt || die - fi - fi - - kde5_src_prepare -} - -src_configure() { - # LQR = only allows to choose between bundled/external - local mycmakeargs=( - -DENABLE_AKONADICONTACTSUPPORT=$(usex addressbook) - -DENABLE_KFILEMETADATASUPPORT=$(usex semantic-desktop) - -DENABLE_MYSQLSUPPORT=$(usex mysql) - -DENABLE_MEDIAPLAYER=$(usex video) - -DENABLE_OPENCV3=$(has_version ">=media-libs/opencv-3" && echo yes || echo no) - $(cmake-utils_use_find_package gphoto2 Gphoto2) - $(cmake-utils_use_find_package jpeg2k Jasper) - $(cmake-utils_use_find_package kipi KF5Kipi) - $(cmake-utils_use_find_package lensfun LensFun) - $(cmake-utils_use_find_package marble Marble) - $(cmake-utils_use_find_package opengl OpenGL) - $(cmake-utils_use_find_package openmp OpenMP) - $(cmake-utils_use_find_package panorama KF5ThreadWeaver) - $(cmake-utils_use_find_package scanner KF5Sane) - $(cmake-utils_use_find_package X X11) - ) - - kde5_src_configure -} diff --git a/media-gfx/digikam/files/digikam-5.1.0-albums-crashfix.patch b/media-gfx/digikam/files/digikam-5.1.0-albums-crashfix.patch deleted file mode 100644 index e22e8dfb0e82..000000000000 --- a/media-gfx/digikam/files/digikam-5.1.0-albums-crashfix.patch +++ /dev/null @@ -1,35 +0,0 @@ -From: Gilles Caulier <caulier.gilles@gmail.com> -Date: Thu, 11 Aug 2016 11:41:08 +0000 -Subject: Fix CR #1368976 -X-Git-Url: http://quickgit.kde.org/?p=digikam.git&a=commitdiff&h=7c628bac74afe24dbc4ca66b1bd5d513e46f6377 ---- -Fix CR #1368976 -BUGS: 366630 -FIXED-IN: 5.2.0 ---- - - ---- a/libs/album/albumtreeview.cpp -+++ b/libs/album/albumtreeview.cpp -@@ -1089,6 +1089,11 @@ - - Album* const album = albumFilterModel()->albumForIndex(indexAt(event->pos())); - -+ if (!album) -+ { -+ return; -+ } -+ - if (album->isTrashAlbum()) - { - // For the moment, disabling context menu for trash. -@@ -1102,7 +1107,7 @@ - } - - // switch to the selected album if need -- if (d->selectOnContextMenu && album) -+ if (d->selectOnContextMenu) - { - setCurrentAlbums(QList<Album*>() << album); - } - diff --git a/media-gfx/digikam/files/digikam-5.1.0-i386-gcc61.patch b/media-gfx/digikam/files/digikam-5.1.0-i386-gcc61.patch deleted file mode 100644 index 710c147ea06a..000000000000 --- a/media-gfx/digikam/files/digikam-5.1.0-i386-gcc61.patch +++ /dev/null @@ -1,41 +0,0 @@ -From: Gilles Caulier <caulier.gilles@gmail.com> -Date: Tue, 09 Aug 2016 18:41:17 +0000 -Subject: apply patch #100514 to fix broken compilation under 32 bits platform with GCC 6.1 -X-Git-Url: http://quickgit.kde.org/?p=digikam.git&a=commitdiff&h=067a88d8c84a5149469961d54b1d5c93df6a3167 ---- -apply patch #100514 to fix broken compilation under 32 bits platform with GCC 6.1 -BUGS: 366542 -FIXED-IN: 5.2.0 ---- - - ---- a/libs/rawengine/libraw/libraw/libraw_types.h -+++ b/libs/rawengine/libraw/libraw/libraw_types.h -@@ -612,10 +612,10 @@ - #elif defined(__INTEL__) - #define LibRawBigEndian 0 - --#elif defined(_M_IX86) -+#elif defined(_M_IX86) || defined(__i386__) - #define LibRawBigEndian 0 - --#elif defined(_M_X64) || defined(__amd64__) -+#elif defined(_M_X64) || defined(__amd64__) || defined(__x86_64__) - #define LibRawBigEndian 0 - - #elif defined(__LITTLE_ENDIAN__) -@@ -625,6 +625,13 @@ - #define LibRawBigEndian 1 - #elif defined(_ARM_) - #define LibRawBigEndian 0 -+ -+#elif __BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__ -+#define LibRawBigEndian 0 -+ -+#elif __BYTE_ORDER__ == __ORDER_BIG_ENDIAN__ -+#define LibRawBigEndian 1 -+ - #else - #ifndef qXCodeRez - #error Unable to figure out byte order. - diff --git a/media-gfx/digikam/files/digikam-5.1.0-memalloc-crash.patch b/media-gfx/digikam/files/digikam-5.1.0-memalloc-crash.patch deleted file mode 100644 index 1a68f27909bd..000000000000 --- a/media-gfx/digikam/files/digikam-5.1.0-memalloc-crash.patch +++ /dev/null @@ -1,95 +0,0 @@ -From: Maik Qualmann <metzpinguin@gmail.com> -Date: Thu, 11 Aug 2016 19:43:46 +0000 -Subject: fix check of maximum addressable memory on 64bits -X-Git-Url: http://quickgit.kde.org/?p=digikam.git&a=commitdiff&h=90f31456779f4aeb9ac06a385f398827fd35c985 ---- -fix check of maximum addressable memory on 64bits -CCBUGS: 366621 ---- - - ---- a/libs/dimg/loaders/dimgloader.cpp -+++ b/libs/dimg/loaders/dimgloader.cpp -@@ -163,7 +163,7 @@ - - qint64 DImgLoader::checkAllocation(qint64 fullSize) - { -- if (fullSize > std::numeric_limits<int>::max()) -+ if (fullSize > std::numeric_limits<size_t>::max()) - { - qCWarning(DIGIKAM_DIMG_LOG) << "Cannot allocate buffer of size" << fullSize; - return 0; - -From: Maik Qualmann <metzpinguin@gmail.com> -Date: Fri, 12 Aug 2016 19:29:50 +0000 -Subject: fix crash by big memory allocation for DImg on 64bit -X-Git-Url: http://quickgit.kde.org/?p=digikam.git&a=commitdiff&h=65fa04ca097d4ff695690886a9f2be459b4279a9 ---- -fix crash by big memory allocation for DImg on 64bit -CCBUGS: 366621 ---- - - ---- a/libs/dimg/dimg.cpp -+++ b/libs/dimg/dimg.cpp -@@ -211,7 +211,7 @@ - - if (old->data) - { -- int size = allocateData(); -+ size_t size = allocateData(); - memcpy(m_priv->data, old->data, size); - } - } -@@ -234,7 +234,7 @@ - } - else if (copyData) - { -- int size = allocateData(); -+ size_t size = allocateData(); - - if (data) - { -@@ -303,7 +303,7 @@ - setImageData(src->null, src->width, src->height, src->sixteenBit, src->alpha); - } - --int DImg::allocateData() -+size_t DImg::allocateData() - { - size_t size = m_priv->width * m_priv->height * (m_priv->sixteenBit ? 8 : 4); - m_priv->data = DImgLoader::new_failureTolerant(size); -@@ -2231,7 +2231,7 @@ - - void DImg::resize(int w, int h) - { -- if (w <= 0 || h <= 0) -+ if (isNull() || w <= 0 || h <= 0) - { - return; - } - ---- a/libs/dimg/dimg.h -+++ b/libs/dimg/dimg.h -@@ -655,7 +655,7 @@ - void copyImageData(const Private* const src); - void setImageData(bool null, uint width, uint height, bool sixteenBit, bool alpha); - void setImageDimension(uint width, uint height); -- int allocateData(); -+ size_t allocateData(); - - static void bitBlt(const uchar* const src, uchar* const dest, - int sx, int sy, int w, int h, int dx, int dy, - ---- a/libs/dimg/loaders/dimgloader.cpp -+++ b/libs/dimg/loaders/dimgloader.cpp -@@ -163,7 +163,7 @@ - - qint64 DImgLoader::checkAllocation(qint64 fullSize) - { -- if (fullSize > std::numeric_limits<size_t>::max()) -+ if ((quint64)fullSize > std::numeric_limits<size_t>::max()) - { - qCWarning(DIGIKAM_DIMG_LOG) << "Cannot allocate buffer of size" << fullSize; - return 0; - |