[gentoo-commits] repo/gentoo:master commit in: app-editors/juffed/, app-editors/juffed/files/
commit: 56d213fa951b11c0bbb574b9391ff3c0f9fbb575
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Sun Oct 29 16:30:36 2017 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Sun Oct 29 16:32:25 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=56d213fa
app-editors/juffed: Drop old, qscintilla[qt4]-rdep
A snapshot remains, at ~arch.
Closes: https://bugs.gentoo.org/527562
Package-Manager: Portage-2.3.13, Repoman-2.3.4
app-editors/juffed/Manifest| 1 -
.../files/0.10-link-libjuff-against-libenca.patch | 24
app-editors/juffed/juffed-0.10-r1.ebuild | 44 --
3 files changed, 69 deletions(-)
diff --git a/app-editors/juffed/Manifest b/app-editors/juffed/Manifest
index 17ac4b5aa2a..3e3176cc412 100644
--- a/app-editors/juffed/Manifest
+++ b/app-editors/juffed/Manifest
@@ -1,2 +1 @@
-DIST juffed-0.10-1054.tar.bz2 1657118 SHA256
ac58d32acaf9d60e4758e9ae05b1a6b7fc0cb7ecd3b207db769dbb9c747be16c SHA512
023e9fca1f02fdb39645bd41700c7481fe8d6ae08ec62b0bf5ba58f627eb6872f96d27f05eae4bc92d90fd204dd0c30f868c858de873ab6511ac21748254b47c
WHIRLPOOL
ceb9e0dc9100dd5f2578abc14fff336adf664726d8e347f9832ffc4942c36e6e28aaff931fd528e6f572bcb29e4027ee486a82ee93d216d0751b5d8aa4233f6c
DIST juffed-0.10_p20160323.tar.gz 1617451 SHA256
15d84bbda71cc8f44f7e0f2c114609859ca90602e86e40f00394d372ab87b5cf SHA512
a49837b199db35c5e7a7580aa4025a2c056b55cef6e98e22f239fc9e455cde3a451d6a0971fb02697c63f3f156d85aaf8021ea13ea3a9e6867ae419f772484b5
WHIRLPOOL
1aac9f820fd842890784979436a7e5afe706af62bcbaf6d5d837749ab26bae79ed5b4d10bc833351f8b2eafd1760f86e3f7f1ca51774a282ffdd85482152c68b
diff --git a/app-editors/juffed/files/0.10-link-libjuff-against-libenca.patch
b/app-editors/juffed/files/0.10-link-libjuff-against-libenca.patch
deleted file mode 100644
index 5bd3882309a..000
--- a/app-editors/juffed/files/0.10-link-libjuff-against-libenca.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index ccad5d1..304c0aa 100644
a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -190,6 +190,9 @@ add_library ( ${JUFFLIB} SHARED
- target_link_libraries ( ${JUFFLIB}
- ${QT_LIBRARIES}
- )
-+if (ENCA_FOUND)
-+ target_link_libraries( ${JUFFLIB} ${ENCA_LIBRARIES} )
-+endif (ENCA_FOUND)
-
- add_library ( ${QSCI_ENGINE} SHARED
- ${juffed_qsci_SRCS}
-@@ -277,9 +280,6 @@ target_link_libraries ( ${JUFFED}
- ${QT_LIBRARIES}
- ${QT_QTNETWORK_LIBRARY}
- )
--if (ENCA_FOUND)
-- target_link_libraries( ${JUFFED} ${ENCA_LIBRARIES} )
--endif (ENCA_FOUND)
-
- if ( UNIX )
- set(CMAKE_CXX_FLAGS "-Wall -Werror -Wextra")
diff --git a/app-editors/juffed/juffed-0.10-r1.ebuild
b/app-editors/juffed/juffed-0.10-r1.ebuild
deleted file mode 100644
index 66870bccf3c..000
--- a/app-editors/juffed/juffed-0.10-r1.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit cmake-utils
-
-DESCRIPTION="QScintilla-based tabbed text editor with syntax highlighting"
-HOMEPAGE="http://juffed.com/en/;
-SRC_URI="mirror://sourceforge/${PN}/${P}-1054.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~ppc ~ppc64 x86"
-IUSE="debug"
-
-RDEPEND="
- app-i18n/enca
- dev-qt/qtcore:4
- dev-qt/qtgui:4
- dev-qt/qtsingleapplication[qt4(+),X]
- x11-libs/qscintilla:=[qt4(-)]
-"
-DEPEND="${RDEPEND}"
-
-DOCS=( ChangeLog README )
-
-PATCHES=(
- # bug 540554
- "${FILESDIR}/0.10-link-libjuff-against-libenca.patch"
-)
-
-src_prepare() {
- cmake-utils_src_prepare
-
- sed -i -e '/set(CMAKE_CXX_FLAGS/d' CMakeLists.txt || die
-}
-
-src_configure() {
- local mycmakeargs=(
- -DUSE_SYSTEM_QTSINGLEAPPLICATION=ON
- )
- cmake-utils_src_configure
-}
[gentoo-commits] repo/gentoo:master commit in: app-editors/juffed/, app-editors/juffed/files/
commit: d58a4c8329db9fe9398adfefa1f76b82d2f8a099
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Sun Oct 8 15:53:47 2017 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Sun Oct 8 16:42:22 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d58a4c83
app-editors/juffed: Add Qt5-based snapshot 0.10_p20160323
Gentoo-bug: 620382
Package-Manager: Portage-2.3.11, Repoman-2.3.3
app-editors/juffed/Manifest| 1 +
.../juffed/files/FindQtSingleApplication.cmake | 94 ++
.../juffed-0.10_p20160323-qscintilla-2.10.patch| 11 +++
app-editors/juffed/juffed-0.10-r1.ebuild | 2 +-
app-editors/juffed/juffed-0.10_p20160323.ebuild| 62 ++
5 files changed, 169 insertions(+), 1 deletion(-)
diff --git a/app-editors/juffed/Manifest b/app-editors/juffed/Manifest
index 7a99c7f300e..17ac4b5aa2a 100644
--- a/app-editors/juffed/Manifest
+++ b/app-editors/juffed/Manifest
@@ -1 +1,2 @@
DIST juffed-0.10-1054.tar.bz2 1657118 SHA256
ac58d32acaf9d60e4758e9ae05b1a6b7fc0cb7ecd3b207db769dbb9c747be16c SHA512
023e9fca1f02fdb39645bd41700c7481fe8d6ae08ec62b0bf5ba58f627eb6872f96d27f05eae4bc92d90fd204dd0c30f868c858de873ab6511ac21748254b47c
WHIRLPOOL
ceb9e0dc9100dd5f2578abc14fff336adf664726d8e347f9832ffc4942c36e6e28aaff931fd528e6f572bcb29e4027ee486a82ee93d216d0751b5d8aa4233f6c
+DIST juffed-0.10_p20160323.tar.gz 1617451 SHA256
15d84bbda71cc8f44f7e0f2c114609859ca90602e86e40f00394d372ab87b5cf SHA512
a49837b199db35c5e7a7580aa4025a2c056b55cef6e98e22f239fc9e455cde3a451d6a0971fb02697c63f3f156d85aaf8021ea13ea3a9e6867ae419f772484b5
WHIRLPOOL
1aac9f820fd842890784979436a7e5afe706af62bcbaf6d5d837749ab26bae79ed5b4d10bc833351f8b2eafd1760f86e3f7f1ca51774a282ffdd85482152c68b
diff --git a/app-editors/juffed/files/FindQtSingleApplication.cmake
b/app-editors/juffed/files/FindQtSingleApplication.cmake
new file mode 100644
index 000..eb56607e948
--- /dev/null
+++ b/app-editors/juffed/files/FindQtSingleApplication.cmake
@@ -0,0 +1,94 @@
+# - 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.eug...@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
