diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2018-12-31 13:43:35 +0000 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2018-12-31 13:43:35 +0000 |
commit | 2891d29af8907ce881662f4a02844926d7a293c7 (patch) | |
tree | 56979d96839d0827aa52008b81b746b4934d88df /kde-misc | |
parent | de49812990871e1705b64051c35161d5e6400269 (diff) |
gentoo resync : 31.12.2018
Diffstat (limited to 'kde-misc')
-rw-r--r-- | kde-misc/Manifest.gz | bin | 5798 -> 5802 bytes | |||
-rw-r--r-- | kde-misc/krename/Manifest | 2 | ||||
-rw-r--r-- | kde-misc/krename/files/krename-5.0.0-exiv2-0.27.patch | 188 | ||||
-rw-r--r-- | kde-misc/krename/krename-5.0.0-r1.ebuild | 55 | ||||
-rw-r--r-- | kde-misc/latte-dock/Manifest | 2 | ||||
-rw-r--r-- | kde-misc/latte-dock/latte-dock-0.8.4.ebuild | 51 |
6 files changed, 298 insertions, 0 deletions
diff --git a/kde-misc/Manifest.gz b/kde-misc/Manifest.gz Binary files differindex f35313abe719..ad847c2802f3 100644 --- a/kde-misc/Manifest.gz +++ b/kde-misc/Manifest.gz diff --git a/kde-misc/krename/Manifest b/kde-misc/krename/Manifest index 5c7925a452de..cf2842ed4ffb 100644 --- a/kde-misc/krename/Manifest +++ b/kde-misc/krename/Manifest @@ -1,3 +1,5 @@ +AUX krename-5.0.0-exiv2-0.27.patch 5106 BLAKE2B 756e29fe3bdc0d83d3612ec9af7fe0936d70eda023c64bafb198c9b0d29bb69e4978fd5c2eaa7606e41b2d730ae1566217983f7fb2dba72c996b11982beaef49 SHA512 98a917db7212f120f1cab3fdf89e9e09d05205da386df2f838b770ac378ec3b71d5a25bd022740569a34c39cb20b3ced0c489b7945c4ed3d85fd4442988b8f4f DIST krename-5.0.0.tar.xz 279968 BLAKE2B fefbcb4ba1bac3f505db9392c3407af780ae7669f6bf105dd9faca32b0527e64b0a9a8590ac7df429d2cdbc2fe0028eca1215c056f895038f1c02685e42636a6 SHA512 9a52d921342f81990236aecb260beebca04f65578b34704c338f94214117d0e18d8b39e9832ddb5fed39a8f1d9f58f05a445e7dec3631e7cac062f30fce09597 +EBUILD krename-5.0.0-r1.ebuild 1349 BLAKE2B 7602cc5f2c0b2ffa357dcc55d3c8a159ae36241b5fc1a41fe1bbefef1d4eed9a69dcf328f2f84a6418477980b4af0260534e129025586959f382f3f449b3ea57 SHA512 61859c1b16d5c0d7e59019a49c4cd770fb065ead5dbe2ca472c07443d1955b94c302de1d2971b3d51ff5504fa8afa56f10a5c954c1056e84cd98a834e3002843 EBUILD krename-5.0.0.ebuild 1330 BLAKE2B 97c1d917a35a9fdbbb3942ba18d38369fc3a30c63f01d1a29a7fb6006f4d87e28d8d07e9407354adb645af0df44fda34f65812f374362a0402910e07beae85f0 SHA512 b13a603b11173fa252b9bb3b04d5c4298a75c4432d12cf8a82d8562b478d4a3ad3342d39fb4f72dcb56aef02446b29971b822cc865ddfc657048b6fe07a2c007 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3 diff --git a/kde-misc/krename/files/krename-5.0.0-exiv2-0.27.patch b/kde-misc/krename/files/krename-5.0.0-exiv2-0.27.patch new file mode 100644 index 000000000000..fdc13a1815e3 --- /dev/null +++ b/kde-misc/krename/files/krename-5.0.0-exiv2-0.27.patch @@ -0,0 +1,188 @@ +From ec90823494f5ec9bb2e8098f44209f383ef8c22a Mon Sep 17 00:00:00 2001 +From: Heiko Becker <heirecka@exherbo.org> +Date: Tue, 20 Nov 2018 18:24:29 +0100 +Subject: Use #cmakedefine01 instead of macro_bool_to_01 + +--- + CMakeLists.txt | 13 +++++-------- + config-krename.h.cmake | 10 +++++----- + 3 files changed, 10 insertions(+), 33 deletions(-) + delete mode 100644 cmake/modules/MacroBoolTo01.cmake + +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -80,13 +80,10 @@ set_package_properties(Freetype PROPERTIES + + feature_summary(WHAT ALL INCLUDE_QUIET_PACKAGES FATAL_ON_MISSING_REQUIRED_PACKAGES) + +- +-# Update configuration +-include(MacroBoolTo01) +-macro_bool_to_01(TAGLIB_FOUND HAVE_TAGLIB) +-macro_bool_to_01(EXIV2_FOUND HAVE_EXIV2) +-macro_bool_to_01(PoDoFo_FOUND HAVE_PODOFO) +-macro_bool_to_01(FREETYPE_FOUND HAVE_FREETYPE) ++set(HAVE_TAGLIB ${TAGLIB_FOUND}) ++set(HAVE_EXIV2 ${LibExiv2_FOUND}) ++set(HAVE_PODOFO ${PoDoFo_FOUND}) ++set(HAVE_FREETYPE ${FREETYPE_FOUND}) + configure_file(config-krename.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-krename.h) + + # Directories +--- a/config-krename.h.cmake ++++ b/config-krename.h.cmake +@@ -1,15 +1,15 @@ + /* config.h. Generated by cmake from config.h.cmake */ + + /* have TagLib */ +-#define HAVE_TAGLIB ${HAVE_TAGLIB} ++#cmakedefine01 HAVE_TAGLIB + + /* have Exiv2 */ +-#define HAVE_EXIV2 ${HAVE_EXIV2} ++#cmakedefine01 HAVE_EXIV2 + + /* have PoDoFo */ +-#define HAVE_PODOFO ${HAVE_PODOFO} ++#cmakedefine01 HAVE_PODOFO + + /* have Freetype */ +-#define HAVE_FREETYPE ${HAVE_FREETYPE} ++#cmakedefine01 HAVE_FREETYPE + +-#define VERSION "${KRENAME_VERSION}" ++#define VERSION "${krename_VERSION}" +-- +cgit v1.1 + +From b22de9135ba2a5abdbd2b275a60933a50f074010 Mon Sep 17 00:00:00 2001 +From: Heiko Becker <heirecka@exherbo.org> +Date: Tue, 20 Nov 2018 18:26:47 +0100 +Subject: Fix building against exiv2-0.27 + +One neeeded part is to copy over the new FindLibExiv2 module from +ECM which has not appeared in a release yet (it will with 5.53.0). +I'll probably add that version as a requirement and remove the copy +again in the near future. +The other part includes raising the cmake version requirement to +3.7.0, which was released over 2 years ago. (The version comparison +could be easily solved differently and less elegantly, but let's see +if people with ancient cmakes complain). +--- + CMakeLists.txt | 15 ++--- + config-krename.h.cmake | 3 + + src/CMakeLists.txt | 8 +-- + src/exiv2plugin.cpp | 8 ++- + 6 files changed, 137 insertions(+), 91 deletions(-) + delete mode 100644 cmake/modules/FindExiv2.cmake + create mode 100644 cmake/modules/FindLibExiv2.cmake + +diff --git a/CMakeLists.txt b/CMakeLists.txt +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -1,4 +1,5 @@ +-project(krename) + +-cmake_minimum_required(VERSION 2.8.12 FATAL_ERROR) ++cmake_minimum_required(VERSION 3.7) ++ ++project(krename VERSION "5.0.0") + +@@ -39,10 +40,6 @@ add_definitions( + -DQT_STRICT_ITERATORS + ) + +-set(KRENAME_VERSION "5.0.0") +- +-include(FindGettext) +- + # Find taglib + set(TAGLIB_MIN_VERSION "1.5") + find_package(Taglib ${TAGLIB_MIN_VERSION}) +@@ -58,11 +55,12 @@ set_package_properties(Taglib PROPERTIES + TYPE OPTIONAL) + + # Find exiv2 +-find_package(Exiv2 0.13) # AccessMode was added in 0.13 +-set_package_properties(Exiv2 PROPERTIES +- DESCRIPTION "A library to access image metadata" +- URL "http://www.exiv2.org" +- TYPE OPTIONAL) ++find_package(LibExiv2 0.13) # AccessMode was added in 0.13 ++set_package_properties(LibExiv2 PROPERTIES TYPE OPTIONAL) ++ ++if (LibExiv2_VERSION VERSION_GREATER_EQUAL "0.27") ++ set(HAVE_LIBEXIV2_0_27 TRUE) ++endif() + + # Find podofo + find_package(PoDoFo) +--- a/config-krename.h.cmake ++++ b/config-krename.h.cmake +@@ -6,6 +6,9 @@ + /* have Exiv2 */ + #cmakedefine01 HAVE_EXIV2 + ++/* Defined if we have libexiv2 >= 0.27 */ ++#cmakedefine HAVE_LIBEXIV2_0_27 ++ + /* have PoDoFo */ + #cmakedefine01 HAVE_PODOFO + +--- a/src/CMakeLists.txt ++++ b/src/CMakeLists.txt +@@ -23,7 +23,7 @@ if(FREETYPE_FOUND) + include_directories(${FREETYPE_INCLUDE_DIRS}) + endif() + +-add_definitions(${TAGLIB_CFLAGS} ${EXIV2_CFLAGS}) ++add_definitions(${TAGLIB_CFLAGS}) + # Exiv2 needs exceptions + kde_enable_exceptions() + +@@ -67,7 +67,7 @@ set(krename_SRCS + snumplugin.cpp + ) + +-if(EXIV2_FOUND) ++if(LibExiv2_FOUND) + set(krename_SRCS ${krename_SRCS} + exiv2plugin.cpp + ) +@@ -137,9 +137,9 @@ if(TAGLIB_FOUND) + ${TAGLIB_LIBRARIES} + ) + endif() +-if(EXIV2_FOUND) ++if(LibExiv2_FOUND) + target_link_libraries(krename +- ${EXIV2_LIBRARIES} ++ LibExiv2::LibExiv2 + ) + endif() + if(PoDoFo_FOUND) +--- a/src/exiv2plugin.cpp ++++ b/src/exiv2plugin.cpp +@@ -17,13 +17,19 @@ + + #include "exiv2plugin.h" + ++#include "../config-krename.h" ++ + #include <KLocalizedString> + + #include <exiv2/error.hpp> + #include <exiv2/exif.hpp> + #include <exiv2/image.hpp> + #include <exiv2/iptc.hpp> +-#include <exiv2/xmp.hpp> ++#ifdef HAVE_LIBEXIV2_0_27 ++ #include <exiv2/xmp_exiv2.hpp> ++#else ++ #include <exiv2/xmp.hpp> ++#endif + #include <exiv2/tags.hpp> + + #include "batchrenamer.h" +-- +cgit v1.1 diff --git a/kde-misc/krename/krename-5.0.0-r1.ebuild b/kde-misc/krename/krename-5.0.0-r1.ebuild new file mode 100644 index 000000000000..b0d09e4cb5cd --- /dev/null +++ b/kde-misc/krename/krename-5.0.0-r1.ebuild @@ -0,0 +1,55 @@ +# Copyright 1999-2018 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +FRAMEWORKS_MINIMAL="5.53.0" +KDE_TEST="true" +inherit kde5 + +DESCRIPTION="Powerful batch file renamer" +HOMEPAGE="http://www.krename.net/" +SRC_URI="mirror://kde/stable/${PN}/${PV}/src/${P}.tar.xz" + +LICENSE="GPL-2" +KEYWORDS="~amd64 ~x86" +IUSE="exif pdf taglib truetype" + +DEPEND=" + $(add_frameworks_dep kcompletion) + $(add_frameworks_dep kconfig) + $(add_frameworks_dep kcoreaddons) + $(add_frameworks_dep kcrash) + $(add_frameworks_dep ki18n) + $(add_frameworks_dep kiconthemes) + $(add_frameworks_dep kio) + $(add_frameworks_dep kitemviews) + $(add_frameworks_dep kjobwidgets) + $(add_frameworks_dep kjs) + $(add_frameworks_dep kservice) + $(add_frameworks_dep kwidgetsaddons) + $(add_frameworks_dep kxmlgui) + $(add_qt_dep qtgui) + $(add_qt_dep qtwidgets) + $(add_qt_dep qtxml) + exif? ( media-gfx/exiv2:= ) + pdf? ( app-text/podofo ) + taglib? ( media-libs/taglib ) + truetype? ( media-libs/freetype:2 ) +" +RDEPEND="${DEPEND} + !kde-misc/krename:4 +" + +PATCHES=( "${FILESDIR}/${P}-exiv2-0.27.patch" ) + +src_configure() { + local mycmakeargs=( + $(cmake-utils_use_find_package exif LibExiv2) + $(cmake-utils_use_find_package taglib Taglib) + $(cmake-utils_use_find_package pdf PoDoFo) + $(cmake-utils_use_find_package truetype Freetype) + ) + + kde5_src_configure +} diff --git a/kde-misc/latte-dock/Manifest b/kde-misc/latte-dock/Manifest index 64564ebf5c14..c8b1e8c6c3b2 100644 --- a/kde-misc/latte-dock/Manifest +++ b/kde-misc/latte-dock/Manifest @@ -1,5 +1,7 @@ DIST latte-dock-0.8.2.tar.xz 654976 BLAKE2B c2078821ff0a3c431fe3563f8a68d1ccbd1d74694c883d3da923a28922e00e51378b48b2bcf5348e0bbf3c5c4a5224ebc06fb2c8dacfdf7418b601ef108fb683 SHA512 342bb68c371eb4d5a4587888c1d273cd47521e1ab3584449a76fd046fb0e3203bc0f36a9d46e8299e2f520c76473df832ccfe2a957260986a4202ecf996b2228 DIST latte-dock-0.8.3.tar.xz 656396 BLAKE2B 00fece3abe4c259da212f7d0f2ddca7aa4926c6378aa986d4f6f7777842b7c9966f78798b106239e2d63af7af822d872f0f19fcb4686ce0ebad1086089022720 SHA512 e49ea9aca28bcae202e5f4832484f579233ea220a7eb7dcdaea128d68185d7bc0ec6df88eaa543c6267b00fe0a0b060bf533816bd196210e18c6ac56186e018e +DIST latte-dock-0.8.4.tar.xz 656528 BLAKE2B 200bf01ea489f2c7486291623ca6b0518e04ca4d607c9d42294abc3f13f1fd13d5a9da7dd16f7ced7d786e729bda12e80666283d3dfad32cb49be5731118ac84 SHA512 6a3fd4223316cc2e17934c1e7220cfe4b23ac5a06070f22ff26dcc2f312f73a666230aa612cdefd650e320ad09dd3456e44d253a2eab31e7c9c5d2f52343acc2 EBUILD latte-dock-0.8.2.ebuild 1266 BLAKE2B cb04c1b03c2e8023399cfcff150a19bd98d730f53570237b4298b23bf72fc9cd25c9fac3af21c69b8c12764a9b9a865860caeada2c7198dfaf011da3d6ebca17 SHA512 0fa5688a80b0c2e932774401fcbd22483358eb4de39445ac5cae776e83f8cf945650fbb121778ac90095f3d6ae0cbacc8b14052c1d94f2e9b3777cd3030900ad EBUILD latte-dock-0.8.3.ebuild 1268 BLAKE2B 165fef170da3dc66404be7ef812119d565998af53d9ec9ba668f52e45c3803890f28a334c509f6b9c17fa1e1ffcfc699a0bcaee396fb39895d75cfee6b82dd96 SHA512 a3ed2f7fde3633ecfc20009f1cdf30fed1a8228e37dd735da518da26593f385716dfaf7ee0767393b47fdda31f2004c6415be997c6206a827a53336c73b72950 +EBUILD latte-dock-0.8.4.ebuild 1268 BLAKE2B 165fef170da3dc66404be7ef812119d565998af53d9ec9ba668f52e45c3803890f28a334c509f6b9c17fa1e1ffcfc699a0bcaee396fb39895d75cfee6b82dd96 SHA512 a3ed2f7fde3633ecfc20009f1cdf30fed1a8228e37dd735da518da26593f385716dfaf7ee0767393b47fdda31f2004c6415be997c6206a827a53336c73b72950 MISC metadata.xml 453 BLAKE2B a49e759f4ce30c2730a4bf082b8f953e0e93f95f2de3b567798d4bea8229558ed72cd774c5d9b1356bd066dc92400d17f05d830746d87386c8c2921fcc484c80 SHA512 5fd22fbf848fbbc76422a4002e5efdddb8a387c406fc45b580e1ec93c36cd2407582770d5d842367fa0d7dd7fceaec196cf0202f56bd5144f89b4f573c2d9c35 diff --git a/kde-misc/latte-dock/latte-dock-0.8.4.ebuild b/kde-misc/latte-dock/latte-dock-0.8.4.ebuild new file mode 100644 index 000000000000..476f28f5fdaa --- /dev/null +++ b/kde-misc/latte-dock/latte-dock-0.8.4.ebuild @@ -0,0 +1,51 @@ +# Copyright 1999-2018 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +inherit kde5 + +if [[ ${KDE_BUILD_TYPE} = release ]]; then + SRC_URI="mirror://kde/stable/${PN}/${P}.tar.xz" + KEYWORDS="~amd64 ~x86" +fi + +DESCRIPTION="Elegant dock, based on KDE Frameworks" +HOMEPAGE="https://store.kde.org/p/1169519/ + https://github.com/psifidotos/Latte-Dock" + +LICENSE="GPL-2+" +SLOT="0" +IUSE="" + +DEPEND=" + $(add_frameworks_dep kactivities) + $(add_frameworks_dep karchive) + $(add_frameworks_dep kconfig) + $(add_frameworks_dep kcoreaddons) + $(add_frameworks_dep kcrash) + $(add_frameworks_dep kdbusaddons) + $(add_frameworks_dep kdeclarative) + $(add_frameworks_dep kglobalaccel) + $(add_frameworks_dep ki18n) + $(add_frameworks_dep kiconthemes) + $(add_frameworks_dep knewstuff) + $(add_frameworks_dep knotifications) + $(add_frameworks_dep kpackage) + $(add_frameworks_dep kwayland) + $(add_frameworks_dep kwindowsystem) + $(add_frameworks_dep kxmlgui) + $(add_frameworks_dep plasma X) + $(add_qt_dep qtdbus) + $(add_qt_dep qtdeclarative) + $(add_qt_dep qtgraphicaleffects) + $(add_qt_dep qtgui 'xcb') + $(add_qt_dep qtwidgets) + $(add_qt_dep qtx11extras) + x11-libs/libSM + x11-libs/libX11 + x11-libs/libxcb +" +RDEPEND="${DEPEND}" + +DOCS=( CHANGELOG.md README.md ) |