summaryrefslogtreecommitdiff
path: root/app-editors/juffed/files
diff options
context:
space:
mode:
authorV3n3RiX <venerix@redcorelinux.org>2018-07-14 20:56:41 +0100
committerV3n3RiX <venerix@redcorelinux.org>2018-07-14 20:56:41 +0100
commitd87262dd706fec50cd150aab3e93883b6337466d (patch)
tree246b44c33ad7a57550430b0a60fa0df86a3c9e68 /app-editors/juffed/files
parent71bc00c87bba1ce31de0dac6c3b7fd1aee6917fc (diff)
gentoo resync : 14.07.2018
Diffstat (limited to 'app-editors/juffed/files')
-rw-r--r--app-editors/juffed/files/FindQtSingleApplication.cmake94
-rw-r--r--app-editors/juffed/files/juffed-0.10_p20160323-qscintilla-2.10.patch11
-rw-r--r--app-editors/juffed/files/juffed-0.10_p20160323-qt-5.11.patch28
3 files changed, 0 insertions, 133 deletions
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 <asturm@gentoo.org>
-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 <QPushButton>
-+#include <QAction>
- #include <QHeaderView>
- #include <QKeyEvent>
- #include <QMessageBox>
-+#include <QPushButton>
-
- #include "KeySettings.h"
- #include "Log.h"
---
-2.17.0
-