projects / gentoo.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: ecd206f)
Version bump wrt bug #538642.
authorMichael Palimaka <kensington@gentoo.org>
Fri, 3 Apr 2015 18:45:38 +0000 (18:45 +0000)
committerMichael Palimaka <kensington@gentoo.org>
Fri, 3 Apr 2015 18:45:38 +0000 (18:45 +0000)
Package-Manager: portage-2.2.18/cvs/Linux x86_64
Manifest-Sign-Key: 0x06B1F38DCA45A1EC!

media-gfx/kphotoalbum/ChangeLog patch | blob | history
media-gfx/kphotoalbum/Manifest patch | blob | history
media-gfx/kphotoalbum/files/kphotoalbum-4.6.1-include.patch [new file with mode: 0644] patch | blob
media-gfx/kphotoalbum/kphotoalbum-4.6.1.ebuild [new file with mode: 0644] patch | blob
media-gfx/kphotoalbum/metadata.xml patch | blob | history

diff --git a/media-gfx/kphotoalbum/ChangeLog b/media-gfx/kphotoalbum/ChangeLog
index 7c42f1b8dd06e1a342788cfbff68c78ad5cfba6e..921a7b99ca472567cd09f5deb4707efec6155577 100644 (file)
--- a/media-gfx/kphotoalbum/ChangeLog
+++ b/media-gfx/kphotoalbum/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-gfx/kphotoalbum
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/kphotoalbum/ChangeLog,v 1.68 2014/10/12 14:23:18 kensington Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/kphotoalbum/ChangeLog,v 1.69 2015/04/03 18:45:24 kensington Exp $
+
+*kphotoalbum-4.6.1 (03 Apr 2015)
+
+  03 Apr 2015; Michael Palimaka <kensington@gentoo.org>
+  +files/kphotoalbum-4.6.1-include.patch, +kphotoalbum-4.6.1.ebuild,
+  metadata.xml:
+  Version bump wrt bug #538642.
 
   12 Oct 2014; Michael Palimaka <kensington@gentoo.org> -kphotoalbum-4.4.ebuild:
   Remove old.
diff --git a/media-gfx/kphotoalbum/Manifest b/media-gfx/kphotoalbum/Manifest
index ca3a8aa296092b396e7c22916d5aa30334057602..49565b747381492249c1b0091b5b063081791627 100644 (file)
--- a/media-gfx/kphotoalbum/Manifest
+++ b/media-gfx/kphotoalbum/Manifest
@@ -1,25 +1,28 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
+AUX kphotoalbum-4.6.1-include.patch 1307 SHA256 fa7b53d118ab1dfdea83d43252358863eff910e90dd8e615d7c6a8a830fe8495 SHA512 cf0731ef9217aab4f87cbef89f44d487ebbc2e4430dbffc59f0d64dc9da54181f886defdb334b70f6a6bd2057ada37eebc2a001f9550fec9aa8ee45d69ee6de6 WHIRLPOOL c8d15a1e9276c91f826fe46677c4c07322253762f8fa6e23b7abbc718e26a031dbd19e46e221fa1003d20b79a44904669e857079cdfe5d4cea0cf09379941a9d
 DIST kphotoalbum-4.5.tar.xz 9415984 SHA256 0cdd4e02e9e4f840550a20cc8dca8a017777e4a55db19f0f8b15e903d2c342cd SHA512 57fe89ec55098312ed53b3ba934d42b84de6e5efcb7e30860deaa0162971ba9e2e9eb573268e2918492c79c2b739b5cf7e16bcb0c9a619c189b3b7ccadb9642d WHIRLPOOL 77f2a4c40b84c5e3406f16757d631aaf8968129d99506bed7528cc27216d34980aba246714629a1969a6625a72291596cf115f275d6fdb39ba4bd84cf93d74fe
+DIST kphotoalbum-4.6.1.tar.xz 9499004 SHA256 8d108d643409944e2a901acd1483e2304a7105842895ea7c72fb8701b6bd9632 SHA512 08d2deb6aeb8c50dee94faf759828753104c11f091868becdadd8009902b3d5d4f6600094d37d4a65a6a6da5f6f80b32d4bcfba2f7cae5b4c6ec96964886fbf4 WHIRLPOOL 3de7e490a748526370fc43de4236608edfdcfb4d48f98965b65fc0d85468d07ea54630671604f8c5b8f5447099148735b9ad83df6af412d8a19d810cf22fd6c7
 EBUILD kphotoalbum-4.5.ebuild 1318 SHA256 d2a550e040928a2b1881285971b7418e81f370f7ec54305fe355c0531bb1b46c SHA512 100d0afb7d615981777dcd4450add9609a80c7e3995275079340d406624efd138fa2b8d3751143c426fb58cf217183d1cf8188a6b3af7a76edce10764a3fa8fd WHIRLPOOL 0fdabe3ac77fdc55b881ab727f7e5565dbeb945cbd52478ed8aef886528ff97a90d6d06033152fa1f0be9127ccb31ab91cb21beaafef723e66025b4a92900b5e
-MISC ChangeLog 11301 SHA256 63bec25af706edc1570a689d55fbaddc3d05e96e3fad57eefbcc905f9db49340 SHA512 93fe7da6e4b8065c16091867c563a550a224d7e7117a96cba0ac9d0f87e61e93911d945f71d461c4204ab4c184a4834b362b38a70971b2e842b2237516c2b850 WHIRLPOOL 60bf168b10be5a06be9833555823ce7b3e6d731b1c3c2763b2f2ef08d19d9ee2a6a069c134b9115842ae82a68fa3ebbc7d3eef981c4b3e1df6e72b1f0e3f9f44
-MISC metadata.xml 319 SHA256 c63a0c378b3c05600f5c631758b1a8090d806f44906e9b07c4719f56be09ac75 SHA512 97dfcc0961012302a8eb27dcd3d4f9ee55ebcaf5acc5d7b47baf3882a503ca58162ca88466058ea70ce74ab268661f9f41d072da22e8a96a9c6206ea6ca6dd8b WHIRLPOOL 7f8825a699e69a48200e9d1b5b648c068a68a365e385421fc16201268dba60a5c23a6b59fc0719ee60df4e9cd2ac142b2bb89f7e09b569039bcb0a7ebf9cf267
+EBUILD kphotoalbum-4.6.1.ebuild 1671 SHA256 adcc8616c111ae6003b5c1d4eac4260a2dccd468b9ddac5525e74525a3aa6866 SHA512 60d206a7e7dfb651be267f8ec979d1089b7a1eedf45480253062df7568d621b2c06f7091930ba207cd73ac85806952850f16ecb1389014025816aa1c9f659666 WHIRLPOOL 97430ca60b34e53659de9da28ed03f31b4fcac7d643b480bc5b4904ec2e07432c5bbb8ae4bb5b992831deece68762d750b41c22c92f6a55738aa0dddc38e8187
+MISC ChangeLog 11509 SHA256 af829888c8d1619f4a8ff13ce5200f711306f6c9744634ced62c34a0765c19a4 SHA512 ee4cebe4cea19667fddf9920706274d5e54eb93ed4d8baea1b8737f8ab4903289b777bdc482df43bab04dace490649757bea9ced57529c5c8e397da10117f07f WHIRLPOOL 18413fbe7a850d0566d1beb7b88d4f6610ba65c505555530ab16c8796e366aaf4074292fd49ca70f5b73a4836b621409da173ff276af3f254b535a9f4a327e1d
+MISC metadata.xml 513 SHA256 e05beb1b6568def7155ad3ed5c7b01f09bf6f83699431a2b607549ace498e453 SHA512 d0778b04af60807b7269013d4918a7497f5fd12bc3be607563a4f59c90632aafe08d01e9bb8555d0674e7e3118334b219c739959690b2d66f3e7cf08ea714b5c WHIRLPOOL 17c273cd612d8e736620b2942b3c440c44d30a187dfd15a83c6a9ef86371075c715351d0c6b7ce647ee25b2d9a090c8fa92b7277c6198c5ef043111dbfabb62a
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0
 
-iQJiBAEBCABMBQJUOo7dRRSAAAAAABQAKGlzc3Vlci1mcHJAbm90YXRpb25zOTc5
+iQJiBAEBCABMBQJVHt/DRRSAAAAAABQAKGlzc3Vlci1mcHJAbm90YXRpb25zOTc5
 MTY5NkQ3RDM3NkRBN0U5QjZGMTUwMDZCMUYzOERDQTQ1QTFFQwAKCRAGsfONykWh
-7K2gD/sEC/9V4G6N4bqGKDIc44ydryqxLEbPOAlqMVFUoJaXaDNtHAnZvsMBP6EQ
-f5ttHd8S3iJb7laPMTzpTqmca+gqBUqo9lUWyeLbSBm5nB1xED9qpC7nywLmAm1P
-ao1OyaZDDPiuI1zUf+egCMy8nhVYpCwfZynEsSIXFvewP97ojm2CycxHEjn8Dz5D
-2OCy285Ez6ogZw7EN6enZAXXtiTKJs4vtxaeEac5b4oGFd+1lx7tHVeP3BDKOEvo
-2Ktz2tdwE4CJSEVJZgsQdhW4ZCQXSb6AghlXjXpkI5PJ+QoVUL5jl3qpfwi9S1V4
-GHOq1Cb7rKkpx6YaBKNAvAtq/9nrhIJ8QRvwWPR+oofKqXcdSLPzeZDMi5eoEMAp
-o22d9t921+eaKxcvFDTa740rpwcgoow4ZcSMksVSEfZV1/qxPaDvp2kZQLQyQC5c
-Wai/JyAOjAORb+535sy/12HzbZVO5C4PKvBL1Z6Ni7lFpX+xy9RSqZkCn7Q9hnbk
-XHcbYoOz/NOB3aLhi0IKx0A49KFQo1H1d26AMHniLZjaAFS5SmWFwHQ3dCEAwJ7J
-rgP5zb2uCiD7RWy5f4mIaASlz7rHCMulRpyj+UzjJ4nTtdSgtlxJlTvQN0Y5CGIT
-mhSWEpOF2gNmjjGqu3mYg307qmyhSBgbHPsWFXKhT+AO6FXaTw==
-=Ewi/
+7PCMEACsLOF77mDlAPxDmBgGr794jSG5MrKQYHsEHWCLBFCohFWd89YmJsRFn4NY
+fmPmrHbYIjCzyS4imiZZuL4SuPQ3RC20yj9AaQdT8riSimKRdadUdttOGL8y5MMB
+T11QEVEQ4XhnEoAb/NxAVwztPMw1OZYyFqfP+2kdOMj2KqPM74L0VEK7Ev5Acit2
+VGvdGOGvL/JWC1u92zuP+dmsOHax+5yiKat4z5BlUv66hrhJwP7d4vYiocSjCeYG
+5YMnOKq9gpTy0TtyMr898kSNzsssakgfVYUGTiednoOQIoKI0R7jrVTY5ATPrGwk
+s/ZK1WT7s6KSKe1AJg9pHtMutuYeba7lJsjlRIJGkKyFb71ufffC3Px2FBZKe1Wr
+Oj2Cgo23okFGVQf/BDX2yOVp12gYYr3MQLZuSQSQZjXhI38/YQN+tzgAR5GsjTCO
+VMcr+xQ4DWtw3/0sewbGNhRuJLUtoXP7VGyI8+pe2g5VfJT75NBaVIs8yEWiubBs
+1sHoY75Fddt9A7YFS98N2tJrfdWAU7GEUy4KvPIkeOEB+YcVbAXXa0V9phHikM8R
++Y3fdX1vkiOSNrWsviSQ6+NOAM5kRZxHEkPJqaFeuqMYU7tMLKmiPV0Q1soctgpu
+s/JedODZ6GapeE4rLw+hwPRsSWbwvyJO9P1Q6vcMpJMc0XDH8w==
+=32on
 -----END PGP SIGNATURE-----
diff --git a/media-gfx/kphotoalbum/files/kphotoalbum-4.6.1-include.patch b/media-gfx/kphotoalbum/files/kphotoalbum-4.6.1-include.patch
new file mode 100644 (file)
index 0000000..6ca4830
--- /dev/null
+++ b/media-gfx/kphotoalbum/files/kphotoalbum-4.6.1-include.patch
@@ -0,0 +1,47 @@
+From cd1235b9f5b15be4b87d3dc1c147510efc0c6728 Mon Sep 17 00:00:00 2001
+From: Tobias Leupold <tobias.leupold@web.de>
+Date: Wed, 18 Mar 2015 18:25:51 +0100
+Subject: [PATCH] Includes cleanup and missing KLocale include added (thanks to
+ Michael Palimaka for the hint!)
+
+---
+ ThumbnailView/GridResizeSlider.cpp | 13 +++++++++----
+ 1 file changed, 9 insertions(+), 4 deletions(-)
+
+diff --git a/ThumbnailView/GridResizeSlider.cpp b/ThumbnailView/GridResizeSlider.cpp
+index 85b4a97..3e84f24 100644
+--- a/ThumbnailView/GridResizeSlider.cpp
++++ b/ThumbnailView/GridResizeSlider.cpp
+@@ -15,20 +15,25 @@
+    the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+    Boston, MA 02110-1301, USA.
+ */
+-#include "GridResizeSlider.h"
+ 
++// Qt includes
+ #include <QScrollBar>
+ #include <QTimer>
+-#include <KSharedConfig>
+ #include <QDebug>
++
++// KDE includes
++#include <KSharedConfig>
+ #include <KMessageBox>
++#include <KLocale>
+ 
++// Local includes
++#include "MainWindow/Window.h"
++#include "Settings/SettingsData.h"
++#include "GridResizeSlider.h"
+ #include "CellGeometry.h"
+ #include "ThumbnailModel.h"
+ #include "ThumbnailWidget.h"
+-#include "Settings/SettingsData.h"
+ #include "ImageManager/ThumbnailBuilder.h"
+-#include "MainWindow/Window.h"
+ 
+ #ifdef DEBUG_ResizeSlider
+ #define Debug qDebug
+-- 
+2.0.5
+
diff --git a/media-gfx/kphotoalbum/kphotoalbum-4.6.1.ebuild b/media-gfx/kphotoalbum/kphotoalbum-4.6.1.ebuild
new file mode 100644 (file)
index 0000000..d56cd63
--- /dev/null
+++ b/media-gfx/kphotoalbum/kphotoalbum-4.6.1.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/kphotoalbum/kphotoalbum-4.6.1.ebuild,v 1.1 2015/04/03 18:45:24 kensington Exp $
+
+EAPI=5
+
+KDE_LINGUAS="ar be bg bs ca ca@valencia cs da de el en_GB eo es et eu fi fr ga
+gl hi hne hr hu is it ja km lt mai mr nb nds nl nn pa pl pt pt_BR ro ru se sk
+sv tr ug uk vi zh_CN zh_TW"
+KDE_HANDBOOK="optional"
+inherit kde4-base
+
+DESCRIPTION="KDE Photo Album is a tool for indexing, searching, and viewing images"
+HOMEPAGE="http://www.kphotoalbum.org/"
+SRC_URI="mirror://kde/stable/${PN}/${PV}/src/${P}.tar.xz"
+
+LICENSE="GPL-2 FDL-1.2"
+SLOT="4"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug +exif +face +geolocation +kipi +map +raw"
+
+REQUIRED_USE="map? ( exif )"
+
+COMMON_DEPEND="
+       >=dev-qt/qtsql-4.4:4[sqlite]
+       media-libs/phonon[qt4]
+       virtual/jpeg:0
+       exif? ( >=media-gfx/exiv2-0.17 )
+       face? ( >=media-libs/libkface-4.7.0 )
+       geolocation? ( $(add_kdebase_dep marble) )
+       kipi? ( $(add_kdebase_dep libkipi '' 4.9.58) )
+       map? ( >=media-libs/libkgeomap-4.7.0 )
+       raw? ( $(add_kdebase_dep libkdcraw '' 4.9.58) )
+"
+DEPEND="${COMMON_DEPEND}
+       sys-devel/gettext
+"
+RDEPEND="${COMMON_DEPEND}
+       || ( media-video/mplayer2 media-video/mplayer )
+       kipi? ( >=media-plugins/kipi-plugins-4.7.0 )
+"
+
+PATCHES=( "${FILESDIR}/${P}-include.patch" )
+DOCS=( ChangeLog README )
+
+src_configure() {
+       local mycmakeargs=(
+               $(cmake-utils_use_with exif Exiv2)
+               $(cmake-utils_use_with face Kface)
+               $(cmake-utils_use_with geolocation Marble)
+               $(cmake-utils_use_with kipi)
+               $(cmake-utils_use_with map KGeoMap)
+               $(cmake-utils_use_with raw Kdcraw)
+       )
+
+       kde4-base_src_configure
+}
diff --git a/media-gfx/kphotoalbum/metadata.xml b/media-gfx/kphotoalbum/metadata.xml
index a0a436ef97041f0020eadb1ee9ce2b64a85b5e8f..252b28e01eb5a8c1094824542eeb6b613a1ce9ac 100644 (file)
--- a/media-gfx/kphotoalbum/metadata.xml
+++ b/media-gfx/kphotoalbum/metadata.xml
@@ -3,7 +3,9 @@
 <pkgmetadata>
        <herd>kde</herd>
        <use>
+               <flag name="face">Enable face detection and recognition using <pkg>media-libs/libkface</pkg></flag>
                <flag name="geolocation">Add support for <pkg>kde-base/marble</pkg></flag>
                <flag name="kipi">Support for the KDE Image Plugin Interface</flag>
+               <flag name="map">Enable map display support using <pkg>media-libs/libkgeomap</pkg></flag>
        </use>
 </pkgmetadata>
Unnamed repository; edit this file 'description' to name the repository.