diff options
22 files changed, 738 insertions, 345 deletions
diff --git a/eclass/cmake-multilib.eclass b/eclass/cmake-multilib.eclass index 7c65e11536b3..9d617900b736 100644 --- a/eclass/cmake-multilib.eclass +++ b/eclass/cmake-multilib.eclass @@ -6,7 +6,7 @@ # gx86-multilib team <multilib@gentoo.org> # @AUTHOR: # Author: Michał Górny <mgorny@gentoo.org> -# @SUPPORTED_EAPIS: 6 +# @SUPPORTED_EAPIS: 6 7 # @BLURB: cmake-utils wrapper for multilib builds # @DESCRIPTION: # The cmake-multilib.eclass provides a glue between cmake-utils.eclass(5) @@ -20,7 +20,7 @@ # phase rather than 'default'. case ${EAPI:-0} in - 6) ;; + [67]) ;; *) die "EAPI=${EAPI} is not supported" ;; esac diff --git a/kde-apps/konsole/files/konsole-18.12.0-fix-cursor.patch b/kde-apps/konsole/files/konsole-18.12.0-fix-cursor.patch new file mode 100644 index 000000000000..36aabaaccc54 --- /dev/null +++ b/kde-apps/konsole/files/konsole-18.12.0-fix-cursor.patch @@ -0,0 +1,58 @@ +From b48ecb5712037027e6385515c9eced7fabfc3dc3 Mon Sep 17 00:00:00 2001 +From: "Martin T. H. Sandsmark" <martin.sandsmark@kde.org> +Date: Mon, 10 Dec 2018 10:09:35 -0500 +Subject: fix cursor when anti aliasing is enabled + +Summary: +When there is a margin of 1 pixel, but some of the anti-aliasing +"blur" leaks to 0,0. so it is fixed with a full update() (e. g. when +it regains focus), but not when just some content updates in the +window. Without this it draws outside the content rect, most +visible as a vertical line if the cursor is completely to the left and +then moves. + +Reviewers: #konsole, hindenburg + +Reviewed By: #konsole, hindenburg + +Subscribers: pbraun, konsole-devel, #konsole + +Tags: #konsole + +Differential Revision: https://phabricator.kde.org/D17414 + +(cherry picked from commit e7085310d6d594823d0ed491fa8bdbd99dec4932) +--- + src/TerminalDisplay.cpp | 10 +++++----- + 1 file changed, 5 insertions(+), 5 deletions(-) + +diff --git a/src/TerminalDisplay.cpp b/src/TerminalDisplay.cpp +index 6e8b262..64c831c 100644 +--- a/src/TerminalDisplay.cpp ++++ b/src/TerminalDisplay.cpp +@@ -933,7 +933,7 @@ void TerminalDisplay::drawCursor(QPainter& painter, + + // shift rectangle top down one pixel to leave some space + // between top and bottom +- QRect cursorRect = rect.adjusted(0, 1, 0, 0); ++ QRectF cursorRect = rect.adjusted(0, 1, 0, 0); + + QColor cursorColor = _cursorColor.isValid() ? _cursorColor : foregroundColor; + painter.setPen(cursorColor); +@@ -942,10 +942,10 @@ void TerminalDisplay::drawCursor(QPainter& painter, + // draw the cursor outline, adjusting the area so that + // it is draw entirely inside 'rect' + int penWidth = qMax(1, painter.pen().width()); +- painter.drawRect(cursorRect.adjusted(penWidth / 2, +- penWidth / 2, +- - penWidth / 2 - penWidth % 2, +- - penWidth / 2 - penWidth % 2)); ++ painter.drawRect(cursorRect.adjusted(penWidth / 2 + 0.5, ++ penWidth / 2 + 0.5, ++ - penWidth / 2 - penWidth % 2 + 0.5, ++ - penWidth / 2 - penWidth % 2 + 0.5)); + + // draw the cursor body only when the widget has focus + if (hasFocus()) { +-- +cgit v1.1 diff --git a/kde-apps/konsole/konsole-18.12.0-r1.ebuild b/kde-apps/konsole/konsole-18.12.0-r2.ebuild index 63fec0b9fa7e..abc36ad9309f 100644 --- a/kde-apps/konsole/konsole-18.12.0-r1.ebuild +++ b/kde-apps/konsole/konsole-18.12.0-r2.ebuild @@ -48,7 +48,10 @@ DEPEND=" " RDEPEND="${DEPEND}" -PATCHES=( "${FILESDIR}/${P}-fix-drawing-box-chars.patch" ) # fixed in 18.12.1 +PATCHES=( + "${FILESDIR}/${P}-fix-drawing-box-chars.patch" # fixed in 18.12.1 + "${FILESDIR}/${P}-fix-cursor.patch" # fixed in 18.12.1 +) src_configure() { local mycmakeargs=( diff --git a/kde-apps/libkexiv2/files/libkexiv2-18.12.0-exiv2-0.27.patch b/kde-apps/libkexiv2/files/libkexiv2-18.12.0-exiv2-0.27.patch new file mode 100644 index 000000000000..65bb8f4a4aa7 --- /dev/null +++ b/kde-apps/libkexiv2/files/libkexiv2-18.12.0-exiv2-0.27.patch @@ -0,0 +1,253 @@ +From 27c6834e4e984c34a55fad313c26fe08d9dd35b0 Mon Sep 17 00:00:00 2001 +From: Andreas Sturmlechner <andreas.sturmlechner@gmail.com> +Date: Tue, 25 Dec 2018 16:52:26 +0100 +Subject: [PATCH] Fix building against exiv2-0.27 + +Summary: +Copied FindLibExiv2.cmake from ECM 5.53.0 until we raise min version. +Bumped cmake to 3.7 minimum for VERSION_GREATER_EQUAL. + +Test Plan: Tested build with exiv2-0.26 and 0.27 + +Reviewers: #kde_applications, cgilles + +Subscribers: heikobecker + +Differential Revision: https://phabricator.kde.org/D17799 +--- + CMakeLists.txt | 36 ++++---- + cmake/modules/FindExiv2.cmake | 80 ------------------ + cmake/modules/FindLibExiv2.cmake | 115 ++++++++++++++++++++++++++ + cmake/templates/libkexiv2.pc.cmake.in | 2 +- + config-kexiv2.h.cmake | 4 + + src/CMakeLists.txt | 3 +- + src/kexiv2.cpp | 2 +- + src/kexiv2.h | 1 + + src/kexiv2_p.cpp | 17 +--- + src/kexiv2_p.h | 1 + + src/kexiv2exif.cpp | 4 + + 11 files changed, 147 insertions(+), 118 deletions(-) + delete mode 100644 cmake/modules/FindExiv2.cmake + create mode 100644 cmake/modules/FindLibExiv2.cmake + create mode 100644 config-kexiv2.h.cmake + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index d13ef27..fcda905 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -4,14 +4,14 @@ + # Redistribution and use is allowed according to the terms of the BSD license. + # For details see the accompanying COPYING-CMAKE-SCRIPTS file. + +-set(CMAKE_MIN_VERSION "3.0.0") ++set(CMAKE_MIN_VERSION "3.7.0") + set(ECM_MIN_VERSION "1.1.0") + set(REQUIRED_QT_VERSION "5.2.0") + set(EXIV2_MIN_VERSION "0.24") + + cmake_minimum_required(VERSION ${CMAKE_MIN_VERSION}) + +-project(libkexiv2) ++project(libkexiv2 VERSION "5.0.0") + + message(STATUS "----------------------------------------------------------------------------------") + message(STATUS "Starting CMake configuration for: ${PROJECT_NAME}") +@@ -47,18 +47,12 @@ message(STATUS "Starting CMake configuration for: ${PROJECT_NAME}") + # 2.4.0 => 11.3.0 - Add new method to access on text edit widget from AltLangStrEdit + # 5.0.0 => 15.0.0 (Released with KDE 5.x) + +-# Library API version +-set(KEXIV2_LIB_MAJOR_VERSION "5") +-set(KEXIV2_LIB_MINOR_VERSION "0") +-set(KEXIV2_LIB_PATCH_VERSION "0") +- + # Library ABI version used by linker. + # For details : http://www.gnu.org/software/libtool/manual/libtool.html#Updating-version-info + set(KEXIV2_LIB_SO_CUR_VERSION "15") + set(KEXIV2_LIB_SO_REV_VERSION "0") + set(KEXIV2_LIB_SO_AGE_VERSION "0") + +-set(LIBKEXIV2_LIB_VERSION "${KEXIV2_LIB_MAJOR_VERSION}.${KEXIV2_LIB_MINOR_VERSION}.${KEXIV2_LIB_PATCH_VERSION}") + set(LIBKEXIV2_SO_VERSION "${KEXIV2_LIB_SO_CUR_VERSION}.${KEXIV2_LIB_SO_REV_VERSION}.${KEXIV2_LIB_SO_AGE_VERSION}") + + ############## ECM setup ###################### +@@ -77,6 +71,13 @@ include(KDEFrameworkCompilerSettings NO_POLICY_SCOPE) + include(GenerateExportHeader) + include(FeatureSummary) + ++ecm_setup_version(${libkexiv2_VERSION} ++ VARIABLE_PREFIX KEXIV2 ++ VERSION_HEADER "src/libkexiv2_version.h" ++ PACKAGE_VERSION_FILE "KF5KExiv2ConfigVersion.cmake" ++ SOVERSION ${LIBKEXIV2_SO_VERSION} ++) ++ + ############## Find Packages ################### + + find_package(Qt5 ${REQUIRED_QT_VERSION} REQUIRED NO_MODULE COMPONENTS +@@ -84,20 +85,13 @@ find_package(Qt5 ${REQUIRED_QT_VERSION} REQUIRED NO_MODULE COMPONENTS + Gui + ) + +-find_package(Exiv2 ${EXIV2_MIN_VERSION} REQUIRED) +-set_package_properties("Exiv2" PROPERTIES +- DESCRIPTION "Required to build libkexiv2" +- URL "http://www.exiv2.org" +- TYPE RECOMMENDED +- PURPOSE "Library to manage image metadata" +-) ++find_package(LibExiv2 ${EXIV2_MIN_VERSION} REQUIRED) + +-ecm_setup_version(${LIBKEXIV2_LIB_VERSION} +- VARIABLE_PREFIX KEXIV2 +- VERSION_HEADER "src/libkexiv2_version.h" +- PACKAGE_VERSION_FILE "KF5KExiv2ConfigVersion.cmake" +- SOVERSION ${LIBKEXIV2_SO_VERSION} +-) ++if (LibExiv2_VERSION VERSION_GREATER_EQUAL "0.27") ++ set(HAVE_LIBEXIV2_0_27 TRUE) ++endif() ++ ++configure_file(config-kexiv2.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-kexiv2.h) + + ############## Targets ######################### + +diff --git a/cmake/templates/libkexiv2.pc.cmake.in b/cmake/templates/libkexiv2.pc.cmake.in +index 1df60df..e80e0ec 100644 +--- a/cmake/templates/libkexiv2.pc.cmake.in ++++ b/cmake/templates/libkexiv2.pc.cmake.in +@@ -7,6 +7,6 @@ Name: ${PROJECT_NAME} + Description: A C++ library to manipulate EXIF/IPTC/XMP metadata using Exiv2 library. + URL: https://cgit.kde.org/libkexiv2.git/ + Requires: +-Version: ${KEXIV2_LIB_VERSION_STRING} ++Version: ${libkexiv2_VERSION} + Libs: -L${LIB_INSTALL_DIR} -lkexiv2 + Cflags: -I${INCLUDE_INSTALL_DIR} +diff --git a/config-kexiv2.h.cmake b/config-kexiv2.h.cmake +new file mode 100644 +index 0000000..40992bd +--- /dev/null ++++ b/config-kexiv2.h.cmake +@@ -0,0 +1,4 @@ ++/* config-kexiv2.h. Generated by cmake from config-kexiv2.h.cmake */ ++ ++/* Defined if we have libexiv2 >= 0.27 */ ++#cmakedefine HAVE_LIBEXIV2_0_27 +diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt +index 2b2df03..8ac18f5 100644 +--- a/src/CMakeLists.txt ++++ b/src/CMakeLists.txt +@@ -6,7 +6,6 @@ + + kde_enable_exceptions() + +-include_directories(${EXIV2_INCLUDE_DIR}) + include_directories(${CMAKE_CURRENT_BINARY_DIR}/..) + + add_definitions(${EXIV2_DEFINITIONS}) +@@ -55,7 +54,7 @@ target_include_directories(KF5KExiv2 INTERFACE + + target_link_libraries(KF5KExiv2 + PRIVATE +- ${EXIV2_LIBRARIES} ++ LibExiv2::LibExiv2 + PUBLIC + Qt5::Core + Qt5::Gui +diff --git a/src/kexiv2.cpp b/src/kexiv2.cpp +index 04c4aa4..b7bbc1a 100644 +--- a/src/kexiv2.cpp ++++ b/src/kexiv2.cpp +@@ -153,7 +153,7 @@ QString KExiv2::Exiv2Version() + // Since 0.14.0 release, we can extract run-time version of Exiv2. + // else we return make version. + +- return QString::fromLatin1(Exiv2::version()); ++ return QString::fromStdString(Exiv2::versionString()); + } + + QString KExiv2::version() +diff --git a/src/kexiv2.h b/src/kexiv2.h +index bebddb5..02a5c9c 100644 +--- a/src/kexiv2.h ++++ b/src/kexiv2.h +@@ -51,6 +51,7 @@ + + #include "libkexiv2_export.h" + #include "kexiv2data.h" ++#include "../config-kexiv2.h" + + namespace KExiv2Iface + { +diff --git a/src/kexiv2_p.cpp b/src/kexiv2_p.cpp +index cb6b134..2a287ab 100644 +--- a/src/kexiv2_p.cpp ++++ b/src/kexiv2_p.cpp +@@ -124,19 +124,15 @@ bool KExiv2::Private::saveToFile(const QFileInfo& finfo) const + + QStringList rawTiffBasedSupported, rawTiffBasedNotSupported; + +- // Raw files supported by Exiv2 0.21 ++ // Raw files supported by Exiv2 0.23 + rawTiffBasedSupported << QString::fromLatin1("dng") + << QString::fromLatin1("nef") + << QString::fromLatin1("pef") + << QString::fromLatin1("orf") +- << QString::fromLatin1("srw"); ++ << QString::fromLatin1("srw") ++ << QString::fromLatin1("cr2"); + +- if (Exiv2::testVersion(0,23,0)) +- { +- rawTiffBasedSupported << QString::fromLatin1("cr2"); +- } +- +- // Raw files not supported by Exiv2 0.21 ++ // Raw files not supported by Exiv2 0.23 + rawTiffBasedNotSupported << QString::fromLatin1("3fr") + << QString::fromLatin1("arw") + << QString::fromLatin1("dcr") +@@ -149,11 +145,6 @@ bool KExiv2::Private::saveToFile(const QFileInfo& finfo) const + << QString::fromLatin1("srf") + << QString::fromLatin1("rw2"); + +- if (!Exiv2::testVersion(0,23,0)) +- { +- rawTiffBasedNotSupported << QString::fromLatin1("cr2"); +- } +- + QString ext = finfo.suffix().toLower(); + + if (!writeRawFiles && (rawTiffBasedSupported.contains(ext) || rawTiffBasedNotSupported.contains(ext)) ) +diff --git a/src/kexiv2_p.h b/src/kexiv2_p.h +index ddf8f6d..c73fbbf 100644 +--- a/src/kexiv2_p.h ++++ b/src/kexiv2_p.h +@@ -71,6 +71,7 @@ + #include <exiv2/properties.hpp> + #include <exiv2/types.hpp> + #include <exiv2/exif.hpp> ++#include <exiv2/exiv2.hpp> + #include <exiv2/xmpsidecar.hpp> + + // Check if Exiv2 support XMP +diff --git a/src/kexiv2exif.cpp b/src/kexiv2exif.cpp +index 11c8948..3093b70 100644 +--- a/src/kexiv2exif.cpp ++++ b/src/kexiv2exif.cpp +@@ -987,7 +987,11 @@ bool KExiv2::setTiffThumbnail(const QImage& thumbImage, bool setProgramName) con + + if (pos == d->exifMetadata().end() || pos->count() != 1 || pos->toLong() != 0) + { ++#ifdef HAVE_LIBEXIV2_0_27 ++ throw Exiv2::Error(Exiv2::kerErrorMessage, "Exif.Image.NewSubfileType missing or not set as main image"); ++#else + throw Exiv2::Error(1, "Exif.Image.NewSubfileType missing or not set as main image"); ++#endif + } + + // Remove sub-IFD tags +-- +2.20.1 + diff --git a/kde-apps/libkexiv2/libkexiv2-18.12.0.ebuild b/kde-apps/libkexiv2/libkexiv2-18.12.0.ebuild index d1c1eda8fde7..286798e5a355 100644 --- a/kde-apps/libkexiv2/libkexiv2-18.12.0.ebuild +++ b/kde-apps/libkexiv2/libkexiv2-18.12.0.ebuild @@ -3,6 +3,7 @@ EAPI=6 +FRAMEWORKS_MINIMAL="5.53.0" KDE_BLOCK_SLOT4="false" inherit kde5 @@ -16,3 +17,5 @@ DEPEND=" >=media-gfx/exiv2-0.25:=[xmp=] " RDEPEND="${DEPEND}" + +PATCHES=( "${FILESDIR}/${P}-exiv2-0.27.patch" ) diff --git a/kde-frameworks/kinit/files/kinit-5.53.0-systemd-240-soft-rlimit.patch b/kde-frameworks/kinit/files/kinit-5.53.0-systemd-240-soft-rlimit.patch new file mode 100644 index 000000000000..3f8823d5b2d5 --- /dev/null +++ b/kde-frameworks/kinit/files/kinit-5.53.0-systemd-240-soft-rlimit.patch @@ -0,0 +1,27 @@ +From 26620aef0bd6d01b543e7523dd15dddc1bb871df Mon Sep 17 00:00:00 2001 +From: Oswald Buddenhagen <ossi@kde.org> +Date: Mon, 24 Dec 2018 14:43:23 +0100 +Subject: use soft rlimit for number of open handles + +systemd 240 bumped the hard limit from the previous 4k (?) to 1G, which +makes kdeinit essentially lock up at startup. +to get around that, use the soft limit, which matches fd_setsize (1k). +--- + src/kdeinit/kinit.cpp | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/kdeinit/kinit.cpp b/src/kdeinit/kinit.cpp +index 748bfca..02ab794 100644 +--- a/src/kdeinit/kinit.cpp ++++ b/src/kdeinit/kinit.cpp +@@ -165,7 +165,7 @@ static void cleanup_fds() + int maxfd = FD_SETSIZE; + struct rlimit rl; + if (getrlimit(RLIMIT_NOFILE, &rl) == 0) { +- maxfd = rl.rlim_max; ++ maxfd = rl.rlim_cur; + } + for (int fd = 3; fd < maxfd; ++fd) { + #if KDEINIT_OOM_PROTECT +-- +cgit v1.1 diff --git a/kde-frameworks/kinit/kinit-5.53.0.ebuild b/kde-frameworks/kinit/kinit-5.53.0-r1.ebuild index 92301f9b5f00..910c3df5286b 100644 --- a/kde-frameworks/kinit/kinit-5.53.0.ebuild +++ b/kde-frameworks/kinit/kinit-5.53.0-r1.ebuild @@ -33,6 +33,8 @@ DEPEND="${RDEPEND} X? ( x11-base/xorg-proto ) " +PATCHES=( "${FILESDIR}/${P}-systemd-240-soft-rlimit.patch" ) + src_configure() { local mycmakeargs=( $(cmake-utils_use_find_package caps Libcap) 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/media-gfx/exiv2/Manifest b/media-gfx/exiv2/Manifest index 017a87d6e8b3..2a0cbfc60290 100644 --- a/media-gfx/exiv2/Manifest +++ b/media-gfx/exiv2/Manifest @@ -1 +1,2 @@ DIST exiv2-0.26_p20180811d.tar.xz 1722216 BLAKE2B 9e1c8307eb923c340894c82c37e9f6c31d82ff1b1de3c79d4ec9b0ec9428ad1d05f945e9a4e440028335857e7fc32d50cdc5245842d743e017037bd641b654db SHA512 5453650888440028acb139a02b387eab0232551c97256ce88dd626fa4cc8800ec02ad66e093c314bbfdc60726995b6c8482572d1ffaec73a265209c98c901780 +DIST exiv2-0.27.0-Source.tar.gz 27222970 BLAKE2B a935f6a41e322dda14d11400801f6b98fd3254af45a44d9d6e9f90d955cc58bb6f7477c49f1f99612a519216cdc954bacea74c68f76545c662db37849e99367e SHA512 3037d8e84b414e3915b807c5bea39f903668c0774f9dbc1367e23c595d5abaf318c746009e994234bcaf0088ad32a820ea42c9c77c9a53c65a7b5d7781a2c6d4 diff --git a/media-gfx/exiv2/exiv2-0.27.0.ebuild b/media-gfx/exiv2/exiv2-0.27.0.ebuild new file mode 100644 index 000000000000..c45a92101c25 --- /dev/null +++ b/media-gfx/exiv2/exiv2-0.27.0.ebuild @@ -0,0 +1,107 @@ +# Copyright 1999-2018 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +if [[ ${PV} = *9999 ]]; then + EGIT_REPO_URI="https://github.com/Exiv2/exiv2.git" + inherit git-r3 +else + SRC_URI="http://exiv2.dyndns.org/builds/${P}-Source.tar.gz" + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris" +fi + +PYTHON_COMPAT=( python2_7 python3_{5,6,7} ) +inherit cmake-multilib python-any-r1 + +DESCRIPTION="EXIF, IPTC and XMP metadata C++ library and command line utility" +HOMEPAGE="http://www.exiv2.org/" + +LICENSE="GPL-2" +SLOT="0/27" +IUSE="doc examples nls +png webready +xmp" + +RDEPEND=" + >=virtual/libiconv-0-r1[${MULTILIB_USEDEP}] + nls? ( >=virtual/libintl-0-r1[${MULTILIB_USEDEP}] ) + png? ( sys-libs/zlib[${MULTILIB_USEDEP}] ) + webready? ( + net-libs/libssh[${MULTILIB_USEDEP}] + net-misc/curl[${MULTILIB_USEDEP}] + ) + xmp? ( dev-libs/expat[${MULTILIB_USEDEP}] ) +" +DEPEND="${RDEPEND} + doc? ( + ${PYTHON_DEPS} + app-doc/doxygen + dev-libs/libxslt + media-gfx/graphviz + virtual/pkgconfig + ) + nls? ( sys-devel/gettext ) +" + +DOCS=( README.md doc/ChangeLog doc/cmd.txt ) + +S="${S}-Source" + +PATCHES=( + # pending upstream + "${FILESDIR}"/${P}-png-broken-icc-profile.patch +) + +pkg_setup() { + use doc && python-any-r1_pkg_setup +} + +src_prepare() { + # FIXME @upstream: + einfo "Converting doc/cmd.txt to UTF-8" + iconv -f LATIN1 -t UTF-8 doc/cmd.txt > doc/cmd.txt.tmp || die + mv -f doc/cmd.txt.tmp doc/cmd.txt || die + + if use doc; then + einfo "Updating doxygen config" + doxygen &>/dev/null -u config/Doxyfile || die + fi + + cmake-utils_src_prepare +} + +multilib_src_configure() { + local mycmakeargs=( + -DEXIV2_BUILD_SAMPLES=NO + -DEXIV2_BUILD_PO=$(usex nls) + -DEXIV2_ENABLE_NLS=$(usex nls) + -DEXIV2_ENABLE_PNG=$(usex png) + -DEXIV2_ENABLE_CURL=$(usex webready) + -DEXIV2_ENABLE_SSH=$(usex webready) + -DEXIV2_ENABLE_WEBREADY=$(usex webready) + -DEXIV2_ENABLE_XMP=$(usex xmp) + $(multilib_is_native_abi || echo -DEXIV2_BUILD_EXIV2_COMMAND=NO) + ) + + cmake-utils_src_configure +} + +multilib_src_compile() { + cmake-utils_src_compile + + if multilib_is_native_abi; then + use doc && emake -j1 doc + fi +} + +multilib_src_install_all() { + use xmp && DOCS+=( doc/{COPYING-XMPSDK,README-XMP,cmdxmp.txt} ) + use doc && HTML_DOCS=( "${S}"/doc/html/. ) + + einstalldocs + find "${D}" -name '*.la' -delete || die + + if use examples; then + docinto examples + dodoc samples/*.cpp + fi +} diff --git a/media-gfx/exiv2/files/exiv2-0.27.0-png-broken-icc-profile.patch b/media-gfx/exiv2/files/exiv2-0.27.0-png-broken-icc-profile.patch new file mode 100644 index 000000000000..ae0a0ee30dce --- /dev/null +++ b/media-gfx/exiv2/files/exiv2-0.27.0-png-broken-icc-profile.patch @@ -0,0 +1,34 @@ +diff --git a/src/pngimage.cpp b/src/pngimage.cpp +index 90844d09..b5b0cd24 100644 +--- a/src/pngimage.cpp ++++ b/src/pngimage.cpp +@@ -501,7 +501,20 @@ namespace Exiv2 { + } + else if (!memcmp(cheaderBuf.pData_ + 4, "iCCP", 4)) + { +- zlibToDataBuf(cdataBuf.pData_ +12+1,dataOffset-13,iccProfile_); // +1 = 'compressed' flag ++ // The ICC profile name can vary from 1-79 characters. ++ uint32_t iccOffset = 0; ++ while (iccOffset < 80 && iccOffset < dataOffset) { ++ ++ const byte* profileName = cdataBuf.pData_ + iccOffset; ++ ++iccOffset; ++ ++ if (*profileName == 0x00) ++ break; ++ } ++ ++ ++iccOffset; // +1 = 'compressed' flag ++ ++ zlibToDataBuf(cdataBuf.pData_ +iccOffset,dataOffset-iccOffset,iccProfile_); + #ifdef DEBUG + std::cout << "Exiv2::PngImage::readMetadata: Found iCCP chunk length: " << dataOffset << std::endl; + std::cout << "Exiv2::PngImage::readMetadata: iccProfile.size_ : " << iccProfile_.size_ << std::endl; +@@ -662,6 +675,7 @@ namespace Exiv2 { + + // calculate CRC + uLong tmp = crc32(0L, Z_NULL, 0); ++ tmp = crc32(tmp, (const Bytef*)type ,typeLen); + tmp = crc32(tmp, (const Bytef*)header ,headerLen); + tmp = crc32(tmp, (const Bytef*)compressed.pData_,compressed.size_); + byte crc[4]; diff --git a/profiles/package.mask b/profiles/package.mask index df7266ee9da1..2304129fc133 100644 --- a/profiles/package.mask +++ b/profiles/package.mask @@ -29,6 +29,10 @@ #--- END OF EXAMPLES --- +# Andreas Sturmlechner <asturm@gentoo.org> (25 Dec 2018) +# Everything breaks. Tracker bug #673720 +=media-gfx/exiv2-0.27* + # Andreas K. Hüttel <dilfridge@gentoo.org> (25 Dec 2018) # Included in dev-tex/texlive-publishers-2017; there is no # need for a separate package anymore. Removal in 30 days. diff --git a/x11-misc/tint2/Manifest b/x11-misc/tint2/Manifest index 6995713920a1..ae9affc21a60 100644 --- a/x11-misc/tint2/Manifest +++ b/x11-misc/tint2/Manifest @@ -1,7 +1,3 @@ -DIST tint2-0.12.12.tar.gz 469724 BLAKE2B cfb9eb702680e23f7f9c9b98c8853d1e059a4d189347496eaa9e667bb91852b66dfc451d310d0194971b03c8a68ba60a596b380cae046e3d34a75a65523f2bf6 SHA512 10a1f42df6a66f6e092d69cd0ea3d900dcef57b06391206d950a1d7f576a880829bb44d00828a030d3172184db238a22f205169c12cc32cf42c6321d61929a8c -DIST tint2-0.14.6.tar.gz 466533 BLAKE2B c7308771e8a5a7d49410d99779ee54fd19b7d5b71d6c04eb3835100f74df5c12d692b50ce57a2a31f4956c09e404acd8cfd2bd1ef87e6fc55f21f583f5a13977 SHA512 eb1505bef932aa0cd0291dc762d3c9cbe760e3fea0684fc604aa3cae3f5ddf63e5b791db745eb29384e4732e6de09a01084f3ce2a92931b431cdf69a59b1f6da -DIST tint2-15.3.tar.gz 500301 BLAKE2B b8b405f1c56c3de41f672dc02acef893b0650fadca9a4823c7b249661e8675e01c92c9c1588d32c2836596f34c4dbc1e5d2608cff3c75590d7eeac9e925eb874 SHA512 41ae8f8e3aac6fe55539c531889ec2883534072ad398f0693e4bfd39c80dd4c64d635a36e063f741fe89fd461f66f92adf6acdde553e0f8b169992d94dc0e344 -DIST tint2-16.1.tar.gz 534354 BLAKE2B 540287bd952ba8b54372d45055efe216dc4d9d192e33d6f83f2c734e97b9e350c7be0cb3e19d414f4e11c0bb7b505307899dea9c10ac382737a2507f7df4fdcc SHA512 c6319d5692d53e56c150906c32c794ee4237e06455efb68527b379b4ae00c48d996c63ea02ee6aefc70266335eb4cb08b4731556075c46d435b7861de6eefd3c DIST tint2-16.2.tar.gz 537236 BLAKE2B b8ff236f4c21465603c3cdf1e3d9f62e238cfbd05fbb7976e4f90ac054566eb433d8be78ee657421b94465dceeb8461ace202090b08585693f13003d401e4faf SHA512 0e267d59aef3d812ab41c1e5904e3e96162afd8d98c76dc697fe8c2815707f34a31e392f68260311bdc66fcb4c0b1766ad549ff30d4314e6ab2e2debf069cafe DIST tint2-16.6.1.tar.gz 546590 BLAKE2B 0e970293b09ba766d795b7bc454f06c7a9e95a7c3534144583f5739fd275d3fee2568677f24b5d9b0809ebbc466351cfa17f91dbb726f5cdae3a0bdc9b9df16f SHA512 ae3b8c7b1573f7bb993a587a125341e4018ace605b4b357a7d633beb02e7622443b92cd11b95028d4704e94211ae9f2e13e89cd3bca91474e7daba2fb9fc2b46 DIST tint2-16.6.tar.gz 546960 BLAKE2B 083e29d754c1faa9eff50dc480d18df99d64f44a2f88673f06e659d55de13c074eacf4614a57211d5b5aeec3a10f3d68471212d24a7280020b52fe91777d305d SHA512 f81770f330d3f2462292f726a6a90ac0182c518b2db7d79f098babe52863e5ceaf4293f975708f83fbc26735c79fdfefd110102ef0f4be45ae242b4f664d72b1 diff --git a/x11-misc/tint2/files/0.12.12-fix-compilation-without-svg.patch b/x11-misc/tint2/files/0.12.12-fix-compilation-without-svg.patch deleted file mode 100644 index c6da687baca8..000000000000 --- a/x11-misc/tint2/files/0.12.12-fix-compilation-without-svg.patch +++ /dev/null @@ -1,18 +0,0 @@ -From 2c42a787257e0801b8454fd8960d6794831cedea Mon Sep 17 00:00:00 2001 -From: o9000 <mrovi9000@gmail.com> -Date: Sat, 8 Oct 2016 15:02:28 +0200 -Subject: Fix compilation with ENABLE_RSVG=OFF (fixes issue #602) - - -diff --git a/src/launcher/launcher.c b/src/launcher/launcher.c -index 0b4172f..0052e90 100644 ---- a/src/launcher/launcher.c -+++ b/src/launcher/launcher.c -@@ -30,7 +30,6 @@ - #include <glib/gi18n.h> - #include <glib.h> - #include <glib/gstdio.h> --#include <gdk-pixbuf/gdk-pixbuf.h> - #include <sys/types.h> - - #include "window.h" diff --git a/x11-misc/tint2/files/0.12.12-no-hardcode-update-icon-cache.patch b/x11-misc/tint2/files/0.12.12-no-hardcode-update-icon-cache.patch deleted file mode 100644 index 21a80eb36d43..000000000000 --- a/x11-misc/tint2/files/0.12.12-no-hardcode-update-icon-cache.patch +++ /dev/null @@ -1,34 +0,0 @@ -From 6306f9920f639cf092ca3f1935ac7aa202f78c86 Mon Sep 17 00:00:00 2001 -From: Yuri Konotopov <ykonotopov@gnome.org> -Date: Fri, 13 Jan 2017 19:06:43 +0400 -Subject: [PATCH] cmake: do not hardcode icon cache update - ---- - CMakeLists.txt | 1 - - src/tint2conf/CMakeLists.txt | 1 - - 2 files changed, 2 deletions(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index b4a1089..ef06393 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -241,7 +241,6 @@ set_target_properties( tint2 PROPERTIES LINK_FLAGS "-pthread -fno-strict-aliasin - install( TARGETS tint2 DESTINATION bin ) - install( FILES tint2.svg DESTINATION ${DATADIR}/icons/hicolor/scalable/apps ) - install( FILES tint2.desktop DESTINATION ${DATADIR}/applications ) --install( CODE "execute_process(COMMAND gtk-update-icon-cache -f -t ${DATADIR}/icons/hicolor WORKING_DIRECTORY ${CMAKE_INSTALL_PREFIX})" ) - install( FILES themes/tint2rc DESTINATION ${SYSCONFDIR}/xdg/tint2 ) - install( FILES default_icon.png DESTINATION ${DATADIR}/tint2 ) - install( FILES AUTHORS ChangeLog README.md doc/tint2.md doc/manual.html doc/readme.html DESTINATION ${DOCDIR} ) -diff --git a/src/tint2conf/CMakeLists.txt b/src/tint2conf/CMakeLists.txt -index 9595f6a..fd616fa 100644 ---- a/src/tint2conf/CMakeLists.txt -+++ b/src/tint2conf/CMakeLists.txt -@@ -72,4 +72,3 @@ add_subdirectory(po) - install( TARGETS tint2conf DESTINATION bin ) - install( FILES tint2conf.svg DESTINATION ${DATADIR}/icons/hicolor/scalable/apps ) - install( FILES tint2conf.desktop DESTINATION ${DATADIR}/applications ) --install( CODE "execute_process(COMMAND gtk-update-icon-cache -f -t ${DATADIR}/icons/hicolor WORKING_DIRECTORY ${CMAKE_INSTALL_PREFIX})" ) --- -2.10.2 - diff --git a/x11-misc/tint2/files/0.12.12-relax-pango-includes.patch b/x11-misc/tint2/files/0.12.12-relax-pango-includes.patch deleted file mode 100644 index e9e40f305b34..000000000000 --- a/x11-misc/tint2/files/0.12.12-relax-pango-includes.patch +++ /dev/null @@ -1,26 +0,0 @@ -From c3a86e185d548e11bb12bc766a58fd3b617c1c46 Mon Sep 17 00:00:00 2001 -From: o9000 <mrovi9000@gmail.com> -Date: Sun, 18 Sep 2016 12:53:59 +0200 -Subject: [PATCH] Fix include (fixes issue #596) - ---- - src/config.c | 3 +-- - 1 file changed, 1 insertion(+), 2 deletions(-) - -diff --git a/src/config.c b/src/config.c -index a831ece..13f3b7b 100644 ---- a/src/config.c -+++ b/src/config.c -@@ -31,8 +31,7 @@ - #include <string.h> - #include <ctype.h> - #include <glib/gstdio.h> --#include <pango/pangocairo.h> --#include <pango/pangoxft.h> -+#include <pango/pango-font.h> - #include <Imlib2.h> - - #include "config.h" --- -libgit2 0.24.0 - diff --git a/x11-misc/tint2/files/0.14.6-sysconfdir-xdg2.patch b/x11-misc/tint2/files/0.14.6-sysconfdir-xdg2.patch deleted file mode 100644 index 6b29b49aaf72..000000000000 --- a/x11-misc/tint2/files/0.14.6-sysconfdir-xdg2.patch +++ /dev/null @@ -1,12 +0,0 @@ ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -257,7 +257,7 @@ - install( TARGETS tint2 DESTINATION bin ) - install( FILES tint2.svg DESTINATION ${CMAKE_INSTALL_DATADIR}/icons/hicolor/scalable/apps ) - install( FILES tint2.desktop DESTINATION ${CMAKE_INSTALL_DATADIR}/applications ) --install( FILES themes/tint2rc DESTINATION /etc/xdg/tint2 ) -+install( FILES themes/tint2rc DESTINATION ${CMAKE_INSTALL_FULL_SYSCONFDIR}/xdg/tint2 ) - install( FILES default_icon.png DESTINATION ${CMAKE_INSTALL_DATADIR}/tint2 ) - install( FILES AUTHORS ChangeLog README.md doc/tint2.md DESTINATION ${docdir} ) - install( FILES doc/manual.html doc/readme.html DESTINATION ${htmldir} ) - diff --git a/x11-misc/tint2/tint2-0.12.12.ebuild b/x11-misc/tint2/tint2-0.12.12.ebuild deleted file mode 100644 index 8f0b0b56d984..000000000000 --- a/x11-misc/tint2/tint2-0.12.12.ebuild +++ /dev/null @@ -1,65 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit cmake-utils gnome2-utils vcs-snapshot - -DESCRIPTION="tint2 is a lightweight panel/taskbar for Linux." -HOMEPAGE="https://gitlab.com/o9000/tint2" -SRC_URI="https://gitlab.com/o9000/${PN}/repository/archive.tar.gz?ref=v${PV} -> ${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64 x86" -IUSE="battery svg startup-notification tint2conf" - -DEPEND=" - dev-libs/glib:2 - svg? ( gnome-base/librsvg:2 ) - >=media-libs/imlib2-1.4.2[X,png] - x11-libs/cairo[X] - x11-libs/pango - tint2conf? ( x11-libs/gtk+:2 ) - x11-libs/libX11 - x11-libs/libXcomposite - x11-libs/libXdamage - x11-libs/libXinerama - >=x11-libs/libXrandr-1.3 - x11-libs/libXrender - startup-notification? ( x11-libs/startup-notification ) -" -RDEPEND="${DEPEND}" - -PATCHES=( - "${FILESDIR}/${PV}-fix-compilation-without-svg.patch" - "${FILESDIR}/${PV}-no-hardcode-update-icon-cache.patch" - "${FILESDIR}/${PV}-relax-pango-includes.patch" -) - -src_configure() { - local mycmakeargs=( - -DENABLE_BATTERY="$(usex battery)" - -DENABLE_TINT2CONF="$(usex tint2conf)" - -DENABLE_SN="$(usex startup-notification)" - -DENABLE_RSVG="$(usex svg)" - ) - - cmake-utils_src_configure -} - -src_install() { - cmake-utils_src_install -} - -pkg_preinst() { - gnome2_icon_savelist -} - -pkg_postinst() { - gnome2_icon_cache_update -} - -pkg_postrm() { - gnome2_icon_cache_update -} diff --git a/x11-misc/tint2/tint2-0.14.6-r2.ebuild b/x11-misc/tint2/tint2-0.14.6-r2.ebuild deleted file mode 100644 index bc7cd9da3b23..000000000000 --- a/x11-misc/tint2/tint2-0.14.6-r2.ebuild +++ /dev/null @@ -1,63 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit cmake-utils gnome2-utils vcs-snapshot - -DESCRIPTION="tint2 is a lightweight panel/taskbar for Linux." -HOMEPAGE="https://gitlab.com/o9000/tint2" -SRC_URI="https://gitlab.com/o9000/${PN}/repository/archive.tar.gz?ref=v${PV} -> ${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="battery svg startup-notification tint2conf" - -DEPEND=" - dev-libs/glib:2 - svg? ( gnome-base/librsvg:2 ) - >=media-libs/imlib2-1.4.2[X,png] - x11-libs/cairo[X] - x11-libs/pango - tint2conf? ( x11-libs/gtk+:2 ) - x11-libs/libX11 - x11-libs/libXcomposite - x11-libs/libXdamage - x11-libs/libXinerama - >=x11-libs/libXrandr-1.3 - x11-libs/libXrender - startup-notification? ( x11-libs/startup-notification ) -" -RDEPEND="${DEPEND}" - -# bug 629312 -PATCHES=( "${FILESDIR}/${PV}-sysconfdir-xdg2.patch" ) - -src_configure() { - local mycmakeargs=( - -Ddocdir="${EPREFIX}/usr/share/doc/${PF}" - -DENABLE_BATTERY="$(usex battery)" - -DENABLE_TINT2CONF="$(usex tint2conf)" - -DENABLE_SN="$(usex startup-notification)" - -DENABLE_RSVG="$(usex svg)" - ) - - cmake-utils_src_configure -} - -src_install() { - cmake-utils_src_install -} - -pkg_preinst() { - gnome2_icon_savelist -} - -pkg_postinst() { - gnome2_icon_cache_update -} - -pkg_postrm() { - gnome2_icon_cache_update -} diff --git a/x11-misc/tint2/tint2-15.3.ebuild b/x11-misc/tint2/tint2-15.3.ebuild deleted file mode 100644 index c34f97885496..000000000000 --- a/x11-misc/tint2/tint2-15.3.ebuild +++ /dev/null @@ -1,60 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit cmake-utils gnome2-utils vcs-snapshot - -DESCRIPTION="tint2 is a lightweight panel/taskbar for Linux." -HOMEPAGE="https://gitlab.com/o9000/tint2" -SRC_URI="https://gitlab.com/o9000/${PN}/repository/archive.tar.gz?ref=v${PV} -> ${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="battery svg startup-notification tint2conf" - -DEPEND=" - dev-libs/glib:2 - svg? ( gnome-base/librsvg:2 ) - >=media-libs/imlib2-1.4.2[X,png] - x11-libs/cairo[X] - x11-libs/pango - tint2conf? ( x11-libs/gtk+:2 ) - x11-libs/libX11 - x11-libs/libXcomposite - x11-libs/libXdamage - x11-libs/libXinerama - >=x11-libs/libXrandr-1.3 - x11-libs/libXrender - startup-notification? ( x11-libs/startup-notification ) -" -RDEPEND="${DEPEND}" - -src_configure() { - local mycmakeargs=( - -Ddocdir="${EPREFIX}/usr/share/doc/${PF}" - -DENABLE_BATTERY="$(usex battery)" - -DENABLE_TINT2CONF="$(usex tint2conf)" - -DENABLE_SN="$(usex startup-notification)" - -DENABLE_RSVG="$(usex svg)" - ) - - cmake-utils_src_configure -} - -src_install() { - cmake-utils_src_install -} - -pkg_preinst() { - gnome2_icon_savelist -} - -pkg_postinst() { - gnome2_icon_cache_update -} - -pkg_postrm() { - gnome2_icon_cache_update -} diff --git a/x11-misc/tint2/tint2-16.1.ebuild b/x11-misc/tint2/tint2-16.1.ebuild deleted file mode 100644 index f7cbd25ca6f4..000000000000 --- a/x11-misc/tint2/tint2-16.1.ebuild +++ /dev/null @@ -1,60 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit cmake-utils gnome2-utils vcs-snapshot - -DESCRIPTION="tint2 is a lightweight panel/taskbar for Linux." -HOMEPAGE="https://gitlab.com/o9000/tint2" -SRC_URI="https://gitlab.com/o9000/${PN}/repository/archive.tar.gz?ref=v${PV} -> ${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="battery svg startup-notification tint2conf" - -DEPEND=" - dev-libs/glib:2 - svg? ( gnome-base/librsvg:2 ) - >=media-libs/imlib2-1.4.2[X,png] - x11-libs/cairo[X] - x11-libs/pango - tint2conf? ( x11-libs/gtk+:2 ) - x11-libs/libX11 - x11-libs/libXcomposite - x11-libs/libXdamage - x11-libs/libXinerama - >=x11-libs/libXrandr-1.3 - x11-libs/libXrender - startup-notification? ( x11-libs/startup-notification ) -" -RDEPEND="${DEPEND}" - -src_configure() { - local mycmakeargs=( - -Ddocdir="${EPREFIX}/usr/share/doc/${PF}" - -DENABLE_BATTERY="$(usex battery)" - -DENABLE_TINT2CONF="$(usex tint2conf)" - -DENABLE_SN="$(usex startup-notification)" - -DENABLE_RSVG="$(usex svg)" - ) - - cmake-utils_src_configure -} - -src_install() { - cmake-utils_src_install -} - -pkg_preinst() { - gnome2_icon_savelist -} - -pkg_postinst() { - gnome2_icon_cache_update -} - -pkg_postrm() { - gnome2_icon_cache_update -} |