From d87262dd706fec50cd150aab3e93883b6337466d Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 14 Jul 2018 20:56:41 +0100 Subject: gentoo resync : 14.07.2018 --- app-editors/juffed/Manifest | 6 -- .../juffed/files/FindQtSingleApplication.cmake | 94 ---------------------- .../juffed-0.10_p20160323-qscintilla-2.10.patch | 11 --- .../files/juffed-0.10_p20160323-qt-5.11.patch | 28 ------- app-editors/juffed/juffed-0.10_p20160323-r1.ebuild | 65 --------------- app-editors/juffed/metadata.xml | 11 --- 6 files changed, 215 deletions(-) delete mode 100644 app-editors/juffed/Manifest delete mode 100644 app-editors/juffed/files/FindQtSingleApplication.cmake delete mode 100644 app-editors/juffed/files/juffed-0.10_p20160323-qscintilla-2.10.patch delete mode 100644 app-editors/juffed/files/juffed-0.10_p20160323-qt-5.11.patch delete mode 100644 app-editors/juffed/juffed-0.10_p20160323-r1.ebuild delete mode 100644 app-editors/juffed/metadata.xml (limited to 'app-editors/juffed') diff --git a/app-editors/juffed/Manifest b/app-editors/juffed/Manifest deleted file mode 100644 index 54d609664106..000000000000 --- a/app-editors/juffed/Manifest +++ /dev/null @@ -1,6 +0,0 @@ -AUX FindQtSingleApplication.cmake 4004 BLAKE2B e6c047be5112811430258e527a6d0ac5217838c9acbdbf6edf49909f3858c6fedb1c3da0471d4301cb918683b6194207650f9c4d06735e62993da3720b263356 SHA512 5ba7845f12a0e425fdeda180faab8b6e53ed3ae0ae291e5a33878a5f955f9295ea7058f1cce43ee4292fd00a6b8ddc45c71d050210ed4b26e1d3f4472df04f9e -AUX juffed-0.10_p20160323-qscintilla-2.10.patch 565 BLAKE2B 92ee287c1dd3321ba706ea01656037e87a27a5cb6f43695a043481a0c4231b5753d9b4af74f82f9d37f2b2c137871f52d37a310fa9f75188955e761a46279762 SHA512 6b3f70930a3f7f5a59687b8484d5356804cff478da63732e5af261de12ced6e93f71bc53b93b3e286bf54e0cae61090729ccc54b42b37e2f97ee5a9640c18bd3 -AUX juffed-0.10_p20160323-qt-5.11.patch 719 BLAKE2B d9790a4a6a515a41a988949f8a0d1f52a0b19b53578138acd9d5ce141898317ab1776373f688a5c6fec059e67f14dfb5842c6367f9596df581a673a22e38567b SHA512 04174f544f040ba0cb4f28e1aed8e593d18fd4d7f53f94a6c99c5246a4603a234285959a887ffa155b72ce17f056eadd5dd31a041541c463630dd33d2a2a8952 -DIST juffed-0.10_p20160323.tar.gz 1617451 BLAKE2B 497a117d587fb1d6eb819bdc1cc403a660b808fa07d03fbfa74362c195aafc98733653fa5d7e28803df2bd4d8acb34a3c0d979395c1a6122631cee40d37e2239 SHA512 a49837b199db35c5e7a7580aa4025a2c056b55cef6e98e22f239fc9e455cde3a451d6a0971fb02697c63f3f156d85aaf8021ea13ea3a9e6867ae419f772484b5 -EBUILD juffed-0.10_p20160323-r1.ebuild 1386 BLAKE2B e88936ebe034967e5a6b1eb3b2b1855c1cf1bfad3160e21c6498773a774d9f1fc89db8743ae1686400657f95cfe97c024f41b9d89c53b10c6a3b1489ec0cc5a3 SHA512 60d4c2a48a2c91c3ec1e57245d02da45f0dd021538c82809c9608d5e5916d0f86160f1dc644007b0e7ed4c4c933fc45b00e02826063ed3aa3fceda6787f632b6 -MISC metadata.xml 323 BLAKE2B d45bb12a8240e1b12594d50a1284b69b365e15f7a857b34b0ee12f4c9af0d7681ba22bbc959e7133780f682f6ae6dad53f6ecb2eb7db65cf1b6f4a64c742cdb3 SHA512 43f71ede8fa11b874c187d61b6f1c3949c10bd632e5a98f4094463f785be8f719a2d2205f3f0b7645047398e026fe71b1ef79366d762ff12f257d0a239e84a4d diff --git a/app-editors/juffed/files/FindQtSingleApplication.cmake b/app-editors/juffed/files/FindQtSingleApplication.cmake deleted file mode 100644 index eb56607e9480..000000000000 --- a/app-editors/juffed/files/FindQtSingleApplication.cmake +++ /dev/null @@ -1,94 +0,0 @@ -# - Try to find the QtSingleApplication includes and library -# which defines -# -# QTSINGLEAPPLICATION_FOUND - system has QtSingleApplication -# QTSINGLEAPPLICATION_INCLUDE_DIR - where to find header QtSingleApplication -# QTSINGLEAPPLICATION_LIBRARIES - the libraries to link against to use QtSingleApplication -# QTSINGLEAPPLICATION_LIBRARY - where to find the QtSingleApplication library (not for general use) - -# copyright (c) 2013 TI_Eugene ti.eugene@gmail.com -# -# Redistribution and use is allowed according to the terms of the FreeBSD license. - -SET(QTSINGLEAPPLICATION_FOUND FALSE) - -IF(QT4_FOUND) - message(STATUS "Looking for Qt4 single application library") - FIND_PATH(QTSINGLEAPPLICATION_INCLUDE_DIR QtSingleApplication - # standard locations - /usr/include - /usr/include/QtSolutions - # qt4 location except mac's frameworks - "${QT_INCLUDE_DIR}/QtSolutions" - # mac's frameworks - ${FRAMEWORK_INCLUDE_DIR}/QtSolutions - ) - - SET(QTSINGLEAPPLICATION_NAMES ${QTSINGLEAPPLICATION_NAMES} - QtSolutions_SingleApplication-2.6 libQtSolutions_SingleApplication-2.6) - FIND_LIBRARY(QTSINGLEAPPLICATION_LIBRARY - NAMES ${QTSINGLEAPPLICATION_NAMES} - PATHS ${QT_LIBRARY_DIR} - ) -ELSEIF(Qt5Widgets_FOUND) - message(STATUS "Looking for Qt5 single application library") - FOREACH(TOP_INCLUDE_PATH in ${Qt5Widgets_INCLUDE_DIRS} ${FRAMEWORK_INCLUDE_DIR}) - FIND_PATH(QTSINGLEAPPLICATION_INCLUDE_DIR QtSingleApplication ${TOP_INCLUDE_PATH}/QtSolutions) - - IF(QTSINGLEAPPLICATION_INCLUDE_DIR) - BREAK() - ENDIF() - ENDFOREACH() - - SET(QTSINGLEAPPLICATION_NAMES ${QTSINGLEAPPLICATION_NAMES} - Qt5Solutions_SingleApplication-2.6 libQt5Solutions_SingleApplication-2.6 - QtSolutions_SingleApplication-2.6 libQtSolutions_SingleApplication-2.6) - GET_TARGET_PROPERTY(QT5_WIDGETSLIBRARY Qt5::Widgets LOCATION) - GET_FILENAME_COMPONENT(QT5_WIDGETSLIBRARYPATH ${QT5_WIDGETSLIBRARY} PATH) - - FIND_LIBRARY(QTSINGLEAPPLICATION_LIBRARY - NAMES ${QTSINGLEAPPLICATION_NAMES} - PATHS ${QT5_WIDGETSLIBRARYPATH} - ) -ENDIF() - -IF (QTSINGLEAPPLICATION_LIBRARY AND QTSINGLEAPPLICATION_INCLUDE_DIR) - - SET(QTSINGLEAPPLICATION_LIBRARIES ${QTSINGLEAPPLICATION_LIBRARY}) - SET(QTSINGLEAPPLICATION_FOUND TRUE) - - IF (CYGWIN) - IF(BUILD_SHARED_LIBS) - # No need to define QTSINGLEAPPLICATION_USE_DLL here, because it's default for Cygwin. - ELSE(BUILD_SHARED_LIBS) - SET (QTSINGLEAPPLICATION_DEFINITIONS -DQTSINGLEAPPLICATION_STATIC) - ENDIF(BUILD_SHARED_LIBS) - ENDIF (CYGWIN) - -ENDIF (QTSINGLEAPPLICATION_LIBRARY AND QTSINGLEAPPLICATION_INCLUDE_DIR) - -IF (QTSINGLEAPPLICATION_FOUND) - IF (NOT QtSingleApplication_FIND_QUIETLY) - MESSAGE(STATUS "Found QtSingleApplication: ${QTSINGLEAPPLICATION_LIBRARY}") - MESSAGE(STATUS " includes: ${QTSINGLEAPPLICATION_INCLUDE_DIR}") - ENDIF (NOT QtSingleApplication_FIND_QUIETLY) -ELSE (QTSINGLEAPPLICATION_FOUND) - IF (QtSingleApplication_FIND_REQUIRED) - MESSAGE(FATAL_ERROR "Could not find QtSingleApplication library") - ENDIF (QtSingleApplication_FIND_REQUIRED) -ENDIF (QTSINGLEAPPLICATION_FOUND) - -MARK_AS_ADVANCED(QTSINGLEAPPLICATION_INCLUDE_DIR QTSINGLEAPPLICATION_LIBRARY) - -if(NOT TARGET QtSingleApplication::QtSingleApplication) - add_library(QtSingleApplication::QtSingleApplication UNKNOWN IMPORTED) - set_target_properties(QtSingleApplication::QtSingleApplication PROPERTIES - INTERFACE_INCLUDE_DIRECTORIES "${QTSINGLEAPPLICATION_INCLUDE_DIR}" - INTERFACE_SYSTEM_INCLUDE_DIRECTORIES "${QTSINGLEAPPLICATION_INCLUDE_DIR}" - ) - if(EXISTS "${QTSINGLEAPPLICATION_LIBRARY}") - set_target_properties(QtSingleApplication::QtSingleApplication PROPERTIES - IMPORTED_LINK_INTERFACE_LANGUAGES "CXX" - IMPORTED_LOCATION "${QTSINGLEAPPLICATION_LIBRARY}") - endif() -endif(NOT TARGET QtSingleApplication::QtSingleApplication) diff --git a/app-editors/juffed/files/juffed-0.10_p20160323-qscintilla-2.10.patch b/app-editors/juffed/files/juffed-0.10_p20160323-qscintilla-2.10.patch deleted file mode 100644 index fcfab7f4072f..000000000000 --- a/app-editors/juffed/files/juffed-0.10_p20160323-qscintilla-2.10.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/cmake/FindQScintilla2.cmake 2016-03-23 20:43:22.000000000 +0100 -+++ b/cmake/FindQScintilla2.cmake 2017-10-08 17:25:06.984464985 +0200 -@@ -52,7 +52,7 @@ - ENDIF() - ENDFOREACH() - -- SET(QSCINTILLA_NAMES ${QSCINTILLA_NAMES} qt5scintilla2 libqt5scintilla2 libqscintilla2-qt5 qscintilla2-qt5) -+ SET(QSCINTILLA_NAMES ${QSCINTILLA_NAMES} qscintilla2 libqscintilla2 libqscintilla2_qt5 qscintilla2_qt5) - GET_TARGET_PROPERTY(QT5_WIDGETSLIBRARY Qt5::Widgets LOCATION) - GET_FILENAME_COMPONENT(QT5_WIDGETSLIBRARYPATH ${QT5_WIDGETSLIBRARY} PATH) - diff --git a/app-editors/juffed/files/juffed-0.10_p20160323-qt-5.11.patch b/app-editors/juffed/files/juffed-0.10_p20160323-qt-5.11.patch deleted file mode 100644 index 4dfa7fae31f7..000000000000 --- a/app-editors/juffed/files/juffed-0.10_p20160323-qt-5.11.patch +++ /dev/null @@ -1,28 +0,0 @@ -From cb10c88a091c62c29054138a2da69d05cbf1e406 Mon Sep 17 00:00:00 2001 -From: Andreas Sturmlechner -Date: Tue, 10 Apr 2018 19:43:17 +0200 -Subject: [PATCH] Fix build with Qt 5.11 - ---- - plugins/keybindings/KeysPage.cpp | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/plugins/keybindings/KeysPage.cpp b/plugins/keybindings/KeysPage.cpp -index 6579e3e..e68b039 100644 ---- a/plugins/keybindings/KeysPage.cpp -+++ b/plugins/keybindings/KeysPage.cpp -@@ -1,9 +1,10 @@ - #include "KeysPage.h" - --#include -+#include - #include - #include - #include -+#include - - #include "KeySettings.h" - #include "Log.h" --- -2.17.0 - diff --git a/app-editors/juffed/juffed-0.10_p20160323-r1.ebuild b/app-editors/juffed/juffed-0.10_p20160323-r1.ebuild deleted file mode 100644 index 97e18f2d896c..000000000000 --- a/app-editors/juffed/juffed-0.10_p20160323-r1.ebuild +++ /dev/null @@ -1,65 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -COMMIT=5ba17f90ec173e773470bc80ea26bca9a3f093fd -inherit cmake-utils vcs-snapshot xdg-utils - -DESCRIPTION="QScintilla-based tabbed text editor with syntax highlighting" -HOMEPAGE="http://juffed.com/en/" -SRC_URI="https://github.com/Mezomish/${PN}/tarball/${COMMIT} -> ${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~ppc ~ppc64 ~x86" -IUSE="debug" - -RDEPEND=" - app-i18n/enca - dev-qt/qtcore:5 - dev-qt/qtgui:5 - dev-qt/qtprintsupport:5 - dev-qt/qtsingleapplication[qt5(+),X] - dev-qt/qtwidgets:5 - dev-qt/qtxml:5 - >=x11-libs/qscintilla-2.9.4:=[qt5(+)] -" -DEPEND="${RDEPEND}" - -DOCS=( ChangeLog README ) - -PATCHES=( - "${FILESDIR}/${P}-qscintilla-2.10.patch" - "${FILESDIR}/${P}-qt-5.11.patch" -) - -src_prepare() { - # Upstream version outdated/dysfunctional and CRLF terminated - cp "${FILESDIR}"/FindQtSingleApplication.cmake cmake/ || die - - cmake-utils_src_prepare - - sed -i -e '/set(CMAKE_CXX_FLAGS/d' CMakeLists.txt || die -} - -src_configure() { - local libdir=$(get_libdir) - local mycmakeargs=( - -DUSE_ENCA=ON - -DUSE_QT5=ON - -DUSE_SYSTEM_QTSINGLEAPPLICATION=ON - -DLIB_SUFFIX=${libdir/lib/} - ) - cmake-utils_src_configure -} - -pkg_postinst() { - xdg_mimeinfo_database_update - xdg_desktop_database_update -} - -pkg_postrm() { - xdg_mimeinfo_database_update - xdg_desktop_database_update -} diff --git a/app-editors/juffed/metadata.xml b/app-editors/juffed/metadata.xml deleted file mode 100644 index 5d63c46383a4..000000000000 --- a/app-editors/juffed/metadata.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - qt@gentoo.org - Gentoo Qt Project - - - juffed - - -- cgit v1.2.3