app-text/kbibtex: Drop slot 4

Bug: https://bugs.gentoo.org/642446
Package-Manager: Portage-2.3.19, Repoman-2.3.6
This commit is contained in:
Andreas Sturmlechner
2017-12-29 20:34:04 +01:00
parent 982a9a8a7b
commit dbf18dc158
3 changed files with 0 additions and 147 deletions

View File

@@ -1,2 +1 @@
DIST kbibtex-0.6.2.tar.xz 3081364 BLAKE2B 8f52c4afea73dae10d3277aabd78a010c0bd2e0437084a87c5b8f5f2d99b40bf63ea4eb04b80699af2e7324e2436a38597394d4aabb076444c1f175327e3f77b SHA512 aa23e80cb273c0ae721ecc917f540070deea520fea2d7ca7ee97fde2c6918dba84769ad083fed93b9d0260539273c20c214b92c94269b413f46cb644d16dc270
DIST kbibtex-0.8_pre20171110.tar.gz 11423893 BLAKE2B 78bcd72da35775d9927f35b865aba1e5ee88fd6391e5b354dd23d319a17a18c5aa521d32f58f1827a86bf33d1a42e7bef19940fdd1b83e67124b7335520bb1cd SHA512 719c40e78e22dc936a5395bf299962b4ec657df89877df78f17139dcd9b45a7ed98ff213a7c8a0cf0eeb4960a3b10cafaf7521e334a3269f96e2abdcdd67c913

View File

@@ -1,109 +0,0 @@
commit 2cd09d41ed559461a0f0a346ebec3dea82c06947
Author: Andreas Sturmlechner <andreas.sturmlechner@gmail.com>
Date: Sat Jan 21 18:26:46 2017 +0100
Add option to disable Qt4WebKit even if present
- Link against Qt4WebKit only if(HAVE_WEBKIT)
- Remove Qt4WebKit linking from tests
REVIEW: 129863
diff --git a/CMakeLists.txt b/CMakeLists.txt
index ee3d810..1acbf8a 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -48,6 +48,12 @@ set(
)
option(
+ WITH_QTWEBKIT
+ "Enable QtWebkit support"
+ ON
+)
+
+option(
UNITY_BUILD
"Compile multiple C++ files in one big, merged file (\"Unity build\")\nSee also http://t-fischer.dreamwidth.org/3054.html"
)
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 04222a7..0b7be01 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -37,24 +37,41 @@ include(
# check if QtWebKit is available, which seems to be not available
# on e.g. RedHat Enterprise Linux 6 or Scientific Linux 6
if(
- QT_QTWEBKIT_FOUND
+ WITH_QTWEBKIT
)
- message(
- STATUS
- "Found QtWebKit, enabling WebKit support"
+ if(
+ QT_QTWEBKIT_FOUND
+ )
+ message(
+ STATUS
+ "Found QtWebKit, enabling WebKit support"
+ )
+ add_definitions(
+ -DHAVE_QTWEBKIT
+ )
+ set(
+ OPTIONAL_QTWEBKIT_LIBRARIES
+ ${QT_QTWEBKIT_LIBRARIES}
+ )
+ else(
+ QT_QTWEBKIT_FOUND
)
- add_definitions(
- -DHAVE_QTWEBKIT
+ message(
+ STATUS
+ "QtWebKit not found, disabling WebKit support"
+ )
+ endif(
+ QT_QTWEBKIT_FOUND
)
else(
- QT_QTWEBKIT_FOUND
+ WITH_QTWEBKIT
)
message(
STATUS
- "QtWebKit not found, disabling WebKit support"
+ "QtWebKit support disabled by configure"
)
endif(
- QT_QTWEBKIT_FOUND
+ WITH_QTWEBKIT
)
add_definitions(
diff --git a/src/networking/CMakeLists.txt b/src/networking/CMakeLists.txt
index efa14f4..f7ade08 100644
--- a/src/networking/CMakeLists.txt
+++ b/src/networking/CMakeLists.txt
@@ -131,7 +131,7 @@ target_link_libraries(
kbibtexnetworking
LINK_PRIVATE
${QT_QTCORE_LIBRARY}
- ${QT_QTWEBKIT_LIBRARY}
+ ${OPTIONAL_QTWEBKIT_LIBRARIES}
${KDE4_KDECORE_LIBS}
${KDE4_KIO_LIBS}
${POPPLER_QT4_LIBRARIES}
diff --git a/src/program/CMakeLists.txt b/src/program/CMakeLists.txt
index a9fe213..fa57506 100644
--- a/src/program/CMakeLists.txt
+++ b/src/program/CMakeLists.txt
@@ -65,7 +65,7 @@ kde4_add_executable(
target_link_libraries(
kbibtex
LINK_PRIVATE
- ${QT_QTWEBKIT_LIBRARIES}
+ ${OPTIONAL_QTWEBKIT_LIBRARIES}
${KDE4_KIO_LIBS}
${KDE4_KPARTS_LIBS}
${KDE4_KFILE_LIBS}

View File

@@ -1,37 +0,0 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=6
inherit kde4-base
DESCRIPTION="BibTeX editor by KDE to edit bibliographies used with LaTeX"
HOMEPAGE="https://userbase.kde.org/KBibTeX"
SRC_URI="mirror://kde/stable/KBibTeX/${P}.tar.xz"
LICENSE="GPL-2"
SLOT="4"
KEYWORDS="amd64 x86"
IUSE="debug"
DEPEND="
app-text/poppler[qt4]
dev-libs/libxml2
dev-libs/libxslt
dev-libs/qoauth:0
virtual/tex-base
x11-libs/libqxt
"
RDEPEND="${DEPEND}
dev-tex/bibtex2html
"
PATCHES=( "${FILESDIR}/${P}-webkit.patch" )
src_configure() {
local mycmakeargs=(
-DWITH_QTWEBKIT=OFF
)
kde4-base_src_configure
}