public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] repo/gentoo:master commit in: app-text/kbibtex/, app-text/kbibtex/files/
@ 2017-03-25 13:04 Andreas Sturmlechner
  0 siblings, 0 replies; 6+ messages in thread
From: Andreas Sturmlechner @ 2017-03-25 13:04 UTC (permalink / raw
  To: gentoo-commits

commit:     8ba59612407c0b9907aef7d8cd151b27dc18d755
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Jan 21 17:22:28 2017 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Mar 25 13:01:21 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8ba59612

app-text/kbibtex: 0.6.2 version bump, add USE=webkit

Package-Manager: portage-2.3.0

 app-text/kbibtex/Manifest                         |   1 +
 app-text/kbibtex/files/kbibtex-0.6.2-webkit.patch | 109 ++++++++++++++++++++++
 app-text/kbibtex/kbibtex-0.6.2.ebuild             |  39 ++++++++
 3 files changed, 149 insertions(+)

diff --git a/app-text/kbibtex/Manifest b/app-text/kbibtex/Manifest
index e3bcf817f8c..538c38f09a1 100644
--- a/app-text/kbibtex/Manifest
+++ b/app-text/kbibtex/Manifest
@@ -1 +1,2 @@
+DIST kbibtex-0.6.2.tar.xz 3081364 SHA256 d99e419aec1d3af0a57eba6d7498de4e6be25ddbd5a5e56fc9de09e7e17dcdf3 SHA512 aa23e80cb273c0ae721ecc917f540070deea520fea2d7ca7ee97fde2c6918dba84769ad083fed93b9d0260539273c20c214b92c94269b413f46cb644d16dc270 WHIRLPOOL 4ab308a8a44df4f3e3a485a67b265ecaf28d2c4a9e4e126d5ab4b95eac12ecacdd3b49bd03f67167a358d86b8359d758e3c4cbc72bd5eed8c10873d181f7e32e
 DIST kbibtex-0.6.tar.xz 2430176 SHA256 fc67a376f05105f14a0bee595bfd073a1ef2c7f9fc6be35dc620bb34f3bd9656 SHA512 a6943271df529c15be8a3112ccbe2c64ccff4cc942c846f00447f7a40bb3e6a6408af12fafe201143a8cf0288ec5ea13da1abab5d870fea6d0516bf5c4543b60 WHIRLPOOL e679f3907fb3041e0680aee1f3f7e0a299fce648c5c1b81663de49ce9d77351dfde8165048cd92c2a5ba7139f8d67d5a9a4eb5f37c393e19006fba4bd5dcd98e

diff --git a/app-text/kbibtex/files/kbibtex-0.6.2-webkit.patch b/app-text/kbibtex/files/kbibtex-0.6.2-webkit.patch
new file mode 100644
index 00000000000..c59a7fb9caf
--- /dev/null
+++ b/app-text/kbibtex/files/kbibtex-0.6.2-webkit.patch
@@ -0,0 +1,109 @@
+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}

diff --git a/app-text/kbibtex/kbibtex-0.6.2.ebuild b/app-text/kbibtex/kbibtex-0.6.2.ebuild
new file mode 100644
index 00000000000..7c6d5003ddb
--- /dev/null
+++ b/app-text/kbibtex/kbibtex-0.6.2.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+WEBKIT_REQUIRED="optional"
+inherit kde4-base
+
+DESCRIPTION="BibTeX editor by KDE to edit bibliographies used with LaTeX"
+HOMEPAGE="http://home.gna.org/kbibtex/"
+SRC_URI="http://download.gna.org/${PN}/0.6/${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=$(usex webkit)
+	)
+
+	kde4-base_src_configure
+}


^ permalink raw reply related	[flat|nested] 6+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: app-text/kbibtex/, app-text/kbibtex/files/
@ 2023-01-24 19:29 Andreas Sturmlechner
  0 siblings, 0 replies; 6+ messages in thread
From: Andreas Sturmlechner @ 2023-01-24 19:29 UTC (permalink / raw
  To: gentoo-commits

commit:     862f45d424a2f0ddab7a82a7f45b86af102890a7
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Tue Jan 24 19:25:02 2023 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Tue Jan 24 19:29:25 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=862f45d4

app-text/kbibtex: add 0.9.3.1

Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 app-text/kbibtex/Manifest                          |  1 +
 .../kbibtex/files/kbibtex-0.9.3.1-bogus-dep.patch  | 34 +++++++++
 app-text/kbibtex/kbibtex-0.9.3.1.ebuild            | 81 ++++++++++++++++++++++
 3 files changed, 116 insertions(+)

diff --git a/app-text/kbibtex/Manifest b/app-text/kbibtex/Manifest
index 776ec0507801..5dfa9ac206d7 100644
--- a/app-text/kbibtex/Manifest
+++ b/app-text/kbibtex/Manifest
@@ -1 +1,2 @@
 DIST kbibtex-0.9.2.tar.xz 4196896 BLAKE2B 198b9a44f1aa19aa0f33f5abe6bcd135e5367ccacbc1d947fcdca531259d8b0ff3f1a53dacd8ce660691ea0ca709e5873adfbd79d01fe318fdfa273234d97938 SHA512 b733339f21fac0be3125e375d59f9060514107532372504902240e4e744e2f62cdff73ef0ea267e96f1e58e15ce917d1d1fdd7a3811a89493e0caedc877ca63a
+DIST kbibtex-0.9.3.1.tar.xz 4219496 BLAKE2B dc57f8f54ec6cbadc1b0b529387a47524f3ceb9e69a79e777a9b69c14c8cd2f240a6153bf9f95f5f5c57483a93c84505d6673625ccb38233c3a3b177bc20b4c4 SHA512 2e7406c16e1e520973166d6a4d27f4e3d51a4276ea25de611d09010ca40e3b0ea56fce6c29589ae51c58096c362cab11b439df0d80ff1b6951d4b92d46262e27

diff --git a/app-text/kbibtex/files/kbibtex-0.9.3.1-bogus-dep.patch b/app-text/kbibtex/files/kbibtex-0.9.3.1-bogus-dep.patch
new file mode 100644
index 000000000000..2235498bbe7a
--- /dev/null
+++ b/app-text/kbibtex/files/kbibtex-0.9.3.1-bogus-dep.patch
@@ -0,0 +1,34 @@
+From f12d17d38011fd8b432ed4ba8952eb9241b152a6 Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner <asturm@gentoo.org>
+Date: Tue, 24 Jan 2023 20:17:55 +0100
+Subject: [PATCH] Revert "Fixing minore build system issues"
+
+This reverts commit 6860474d423c47f0633d537851b793fda76ae223.
+---
+ CMakeLists.txt | 3 ---
+ 1 file changed, 3 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index c375a34b..48196146 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -43,8 +43,6 @@ include(KDECMakeSettings)
+ include(ECMInstallIcons)
+ include(ECMSetupVersion)
+ include(ECMAddAppIcon)
+-include(ECMQtDeclareLoggingCategory)
+-include(ECMGenerateHeaders)
+ include(GenerateExportHeader)
+ 
+ find_package(
+@@ -54,7 +52,6 @@ find_package(
+     Core
+     Widgets
+     Network
+-    NetworkAuth
+     XmlPatterns
+     Concurrent
+ )
+-- 
+2.39.1
+

diff --git a/app-text/kbibtex/kbibtex-0.9.3.1.ebuild b/app-text/kbibtex/kbibtex-0.9.3.1.ebuild
new file mode 100644
index 000000000000..0e5ab051d168
--- /dev/null
+++ b/app-text/kbibtex/kbibtex-0.9.3.1.ebuild
@@ -0,0 +1,81 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_HANDBOOK="optional"
+ECM_TEST="true"
+KFMIN=5.82.0
+QTMIN=5.15.5
+inherit ecm kde.org optfeature
+
+DESCRIPTION="BibTeX editor to edit bibliographies used with LaTeX"
+HOMEPAGE="https://apps.kde.org/kbibtex/ https://userbase.kde.org/KBibTeX"
+
+if [[ ${KDE_BUILD_TYPE} != live ]]; then
+	SRC_URI="mirror://kde/stable/KBibTeX/$(ver_cut 1-3)/${P}.tar.xz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+LICENSE="GPL-2"
+SLOT="5"
+IUSE="webengine zotero"
+
+RESTRICT="test"
+
+DEPEND="
+	app-text/poppler[qt5]
+	dev-libs/icu:=
+	>=dev-qt/qtconcurrent-${QTMIN}:5
+	>=dev-qt/qtdbus-${QTMIN}:5
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtnetwork-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	>=dev-qt/qtxml-${QTMIN}:5
+	>=dev-qt/qtxmlpatterns-${QTMIN}:5
+	>=kde-frameworks/kcompletion-${KFMIN}:5
+	>=kde-frameworks/kconfig-${KFMIN}:5
+	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
+	>=kde-frameworks/kcoreaddons-${KFMIN}:5
+	>=kde-frameworks/kcrash-${KFMIN}:5
+	>=kde-frameworks/ki18n-${KFMIN}:5
+	>=kde-frameworks/kiconthemes-${KFMIN}:5
+	>=kde-frameworks/kio-${KFMIN}:5
+	>=kde-frameworks/kitemviews-${KFMIN}:5
+	>=kde-frameworks/kjobwidgets-${KFMIN}:5
+	>=kde-frameworks/kparts-${KFMIN}:5
+	>=kde-frameworks/kservice-${KFMIN}:5
+	>=kde-frameworks/ktexteditor-${KFMIN}:5
+	>=kde-frameworks/ktextwidgets-${KFMIN}:5
+	>=kde-frameworks/kwallet-${KFMIN}:5
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
+	>=kde-frameworks/kxmlgui-${KFMIN}:5
+	virtual/tex-base
+	webengine? ( >=dev-qt/qtwebengine-${QTMIN}:5[widgets] )
+	zotero? (
+		>=app-crypt/qca-2.3.0:2[qt5(+)]
+		dev-libs/qoauth:5
+	)
+"
+RDEPEND="${DEPEND}
+	dev-tex/bibtex2html
+"
+
+PATCHES=( "${FILESDIR}/${P}-bogus-dep.patch" )
+
+src_configure() {
+	local mycmakeargs=(
+		-DCMAKE_DISABLE_FIND_PACKAGE_Qt5WebKitWidgets=ON
+		$(cmake_use_find_package webengine Qt5WebEngineWidgets)
+		$(cmake_use_find_package zotero Qca-qt5)
+	)
+
+	ecm_src_configure
+}
+
+pkg_postinst() {
+	if [[ -z "${REPLACING_VERSIONS}" ]]; then
+		optfeature "PDF or PostScript document previews" "kde-apps/okular:${SLOT}"
+	fi
+	ecm_pkg_postinst
+}


^ permalink raw reply related	[flat|nested] 6+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: app-text/kbibtex/, app-text/kbibtex/files/
@ 2023-02-27 19:29 Andreas Sturmlechner
  0 siblings, 0 replies; 6+ messages in thread
From: Andreas Sturmlechner @ 2023-02-27 19:29 UTC (permalink / raw
  To: gentoo-commits

commit:     91735b2832c54524b25b1ee3813bc00e8832f141
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Mon Feb 27 19:27:35 2023 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Mon Feb 27 19:29:22 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=91735b28

app-text/kbibtex: drop 0.9.2-r1

Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 app-text/kbibtex/Manifest                          |  1 -
 .../files/kbibtex-0.9.2-fix-crash-w-newer-Qt.patch | 28 --------
 ...-0.9.2-fix-creation-w-url-from-user-input.patch | 28 --------
 app-text/kbibtex/kbibtex-0.9.2-r1.ebuild           | 84 ----------------------
 4 files changed, 141 deletions(-)

diff --git a/app-text/kbibtex/Manifest b/app-text/kbibtex/Manifest
index 5dfa9ac206d7..682a1a0e30d6 100644
--- a/app-text/kbibtex/Manifest
+++ b/app-text/kbibtex/Manifest
@@ -1,2 +1 @@
-DIST kbibtex-0.9.2.tar.xz 4196896 BLAKE2B 198b9a44f1aa19aa0f33f5abe6bcd135e5367ccacbc1d947fcdca531259d8b0ff3f1a53dacd8ce660691ea0ca709e5873adfbd79d01fe318fdfa273234d97938 SHA512 b733339f21fac0be3125e375d59f9060514107532372504902240e4e744e2f62cdff73ef0ea267e96f1e58e15ce917d1d1fdd7a3811a89493e0caedc877ca63a
 DIST kbibtex-0.9.3.1.tar.xz 4219496 BLAKE2B dc57f8f54ec6cbadc1b0b529387a47524f3ceb9e69a79e777a9b69c14c8cd2f240a6153bf9f95f5f5c57483a93c84505d6673625ccb38233c3a3b177bc20b4c4 SHA512 2e7406c16e1e520973166d6a4d27f4e3d51a4276ea25de611d09010ca40e3b0ea56fce6c29589ae51c58096c362cab11b439df0d80ff1b6951d4b92d46262e27

diff --git a/app-text/kbibtex/files/kbibtex-0.9.2-fix-crash-w-newer-Qt.patch b/app-text/kbibtex/files/kbibtex-0.9.2-fix-crash-w-newer-Qt.patch
deleted file mode 100644
index 91cc51f9303c..000000000000
--- a/app-text/kbibtex/files/kbibtex-0.9.2-fix-crash-w-newer-Qt.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From 84b0551eb141b3a7904ceec158d040200c995023 Mon Sep 17 00:00:00 2001
-From: Albert Astals Cid <aacid@kde.org>
-Date: Thu, 8 Apr 2021 22:07:15 +0200
-Subject: [PATCH] Fix crash with newer Qt versions
-
-Assign m_internalModel before calling into
-QSortFilterProxyModel::setSourceModel since that can end up calling filterAcceptsRow
----
- src/gui/file/sortfilterfilemodel.cpp | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/gui/file/sortfilterfilemodel.cpp b/src/gui/file/sortfilterfilemodel.cpp
-index 73707cec..87657aa2 100644
---- a/src/gui/file/sortfilterfilemodel.cpp
-+++ b/src/gui/file/sortfilterfilemodel.cpp
-@@ -40,8 +40,8 @@ SortFilterFileModel::SortFilterFileModel(QObject *parent)
- 
- void SortFilterFileModel::setSourceModel(QAbstractItemModel *model)
- {
--    QSortFilterProxyModel::setSourceModel(model);
-     m_internalModel = dynamic_cast<FileModel *>(model);
-+    QSortFilterProxyModel::setSourceModel(model);
- }
- 
- FileModel *SortFilterFileModel::fileSourceModel() const
--- 
-GitLab
-

diff --git a/app-text/kbibtex/files/kbibtex-0.9.2-fix-creation-w-url-from-user-input.patch b/app-text/kbibtex/files/kbibtex-0.9.2-fix-creation-w-url-from-user-input.patch
deleted file mode 100644
index fdc42d97810b..000000000000
--- a/app-text/kbibtex/files/kbibtex-0.9.2-fix-creation-w-url-from-user-input.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From 1153930536abe9f0331acef67dc40b18210eb07e Mon Sep 17 00:00:00 2001
-From: Thomas Fischer <fischer@unix-ag.uni-kl.de>
-Date: Sat, 1 Oct 2022 23:15:52 +0200
-Subject: [PATCH] Fix creation of URL from user input
-
-... when opening a document associated with a bibliographic entry.
-
-BUG: 459150
----
- src/parts/part.cpp | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/parts/part.cpp b/src/parts/part.cpp
-index 5324647f..9dc35d1c 100644
---- a/src/parts/part.cpp
-+++ b/src/parts/part.cpp
-@@ -914,7 +914,7 @@ void KBibTeXPart::elementViewDocumentMenu(QObject *obj)
-     QString text = static_cast<QAction *>(obj)->data().toString(); ///< only a QAction will be passed along
- 
-     /// Guess mime type for url to open
--    QUrl url(text);
-+    QUrl url{QUrl::fromUserInput(text)};
-     QMimeType mimeType = FileInfo::mimeTypeForUrl(url);
-     const QString mimeTypeName = mimeType.name();
-     /// Ask KDE subsystem to open url in viewer matching mime type
--- 
-GitLab
-

diff --git a/app-text/kbibtex/kbibtex-0.9.2-r1.ebuild b/app-text/kbibtex/kbibtex-0.9.2-r1.ebuild
deleted file mode 100644
index 7d15539e9748..000000000000
--- a/app-text/kbibtex/kbibtex-0.9.2-r1.ebuild
+++ /dev/null
@@ -1,84 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-ECM_HANDBOOK="optional"
-ECM_TEST="true"
-KFMIN=5.82.0
-QTMIN=5.15.5
-inherit ecm kde.org optfeature
-
-DESCRIPTION="BibTeX editor to edit bibliographies used with LaTeX"
-HOMEPAGE="https://apps.kde.org/kbibtex/ https://userbase.kde.org/KBibTeX"
-
-if [[ ${KDE_BUILD_TYPE} != live ]]; then
-	SRC_URI="mirror://kde/stable/KBibTeX/${PV}/${P}.tar.xz"
-	KEYWORDS="amd64 x86"
-fi
-
-LICENSE="GPL-2"
-SLOT="5"
-IUSE="webengine zotero"
-
-RESTRICT="test"
-
-DEPEND="
-	app-text/poppler[qt5]
-	dev-libs/icu:=
-	>=dev-qt/qtconcurrent-${QTMIN}:5
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtnetwork-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=dev-qt/qtxml-${QTMIN}:5
-	>=dev-qt/qtxmlpatterns-${QTMIN}:5
-	>=kde-frameworks/kcompletion-${KFMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/kcrash-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kiconthemes-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-	>=kde-frameworks/kitemviews-${KFMIN}:5
-	>=kde-frameworks/kjobwidgets-${KFMIN}:5
-	>=kde-frameworks/kparts-${KFMIN}:5
-	>=kde-frameworks/kservice-${KFMIN}:5
-	>=kde-frameworks/ktexteditor-${KFMIN}:5
-	>=kde-frameworks/ktextwidgets-${KFMIN}:5
-	>=kde-frameworks/kwallet-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-	virtual/tex-base
-	webengine? ( >=dev-qt/qtwebengine-${QTMIN}:5[widgets] )
-	zotero? (
-		>=app-crypt/qca-2.3.0:2[qt5(+)]
-		dev-libs/qoauth:5
-	)
-"
-RDEPEND="${DEPEND}
-	dev-tex/bibtex2html
-"
-
-PATCHES=(
-	"${FILESDIR}/${P}-fix-crash-w-newer-Qt.patch"
-	"${FILESDIR}/${P}-fix-creation-w-url-from-user-input.patch" # KDE-bug 459150
-)
-
-src_configure() {
-	local mycmakeargs=(
-		-DCMAKE_DISABLE_FIND_PACKAGE_Qt5WebKitWidgets=ON
-		$(cmake_use_find_package webengine Qt5WebEngineWidgets)
-		$(cmake_use_find_package zotero Qca-qt5)
-	)
-
-	ecm_src_configure
-}
-
-pkg_postinst() {
-	if [[ -z "${REPLACING_VERSIONS}" ]]; then
-		optfeature "PDF or PostScript document previews" "kde-apps/okular:${SLOT}"
-	fi
-	ecm_pkg_postinst
-}


^ permalink raw reply related	[flat|nested] 6+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: app-text/kbibtex/, app-text/kbibtex/files/
@ 2024-05-23 18:51 Andreas Sturmlechner
  0 siblings, 0 replies; 6+ messages in thread
From: Andreas Sturmlechner @ 2024-05-23 18:51 UTC (permalink / raw
  To: gentoo-commits

commit:     ebb1f06afdaddc59825847948e1237fdc4421678
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Thu May 23 18:40:12 2024 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Thu May 23 18:49:36 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ebb1f06a

app-text/kbibtex: Fix build w/ ICU-75

Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 app-text/kbibtex/files/kbibtex-0.10.0-cxx17.patch | 11 +++++++++++
 app-text/kbibtex/kbibtex-0.10.0.ebuild            |  2 ++
 2 files changed, 13 insertions(+)

diff --git a/app-text/kbibtex/files/kbibtex-0.10.0-cxx17.patch b/app-text/kbibtex/files/kbibtex-0.10.0-cxx17.patch
new file mode 100644
index 000000000000..33fb8ebb4542
--- /dev/null
+++ b/app-text/kbibtex/files/kbibtex-0.10.0-cxx17.patch
@@ -0,0 +1,11 @@
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -10,7 +10,7 @@
+     LANGUAGES CXX
+ )
+ 
+-set(CMAKE_CXX_STANDARD 11)
++set(CMAKE_CXX_STANDARD 17)
+ set(QT_MIN_VERSION 5.9.0)
+ # Somewhat arbitrary chosen version number ...
+ set(KF5_MIN_VERSION 5.51)

diff --git a/app-text/kbibtex/kbibtex-0.10.0.ebuild b/app-text/kbibtex/kbibtex-0.10.0.ebuild
index 11a10b600ce5..aa8b9929c2d5 100644
--- a/app-text/kbibtex/kbibtex-0.10.0.ebuild
+++ b/app-text/kbibtex/kbibtex-0.10.0.ebuild
@@ -60,6 +60,8 @@ DEPEND="${COMMON_DEPEND}
 	>=dev-qt/qtconcurrent-${QTMIN}:5
 "
 
+PATCHES=( "${FILESDIR}"/${P}-cxx17.patch )
+
 src_configure() {
 	local mycmakeargs=(
 		-DCMAKE_DISABLE_FIND_PACKAGE_Qt5WebKitWidgets=ON


^ permalink raw reply related	[flat|nested] 6+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: app-text/kbibtex/, app-text/kbibtex/files/
@ 2025-02-06 22:41 Andreas Sturmlechner
  0 siblings, 0 replies; 6+ messages in thread
From: Andreas Sturmlechner @ 2025-02-06 22:41 UTC (permalink / raw
  To: gentoo-commits

commit:     69250a9c00f7bcd58d645caf4863121972aac99f
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Thu Feb  6 22:30:16 2025 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Thu Feb  6 22:40:48 2025 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=69250a9c

app-text/kbibtex: add 0.10.50_pre20250205, re-add KDocTools

Shortlog over previous snapshot:

Nicolas Fella (1):
      Fix build with Qt 6.9

Thomas Fischer (8):
      Using QCheckBox::checkStateChanged instead of QCheckBox::stateChanged
      Removing unnecessary include of .moc file
      Various improvements in C++ code formatting script
      Search engines can be called separately
      Removed features from Springer Nature Link search
      Removing support for Qt Webkit
      Fixing ScienceDirect search
      Adding tests for 'InternalNetworkAccessManager::reverseObfuscate'

Pending upstream commit:
https://invent.kde.org/office/kbibtex/-/merge_requests/33

Closes: https://bugs.gentoo.org/949362
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 app-text/kbibtex/Manifest                          |  1 +
 .../files/kbibtex-0.10.50_pre20250205-cmake.patch  | 29 +++++++++
 .../kbibtex/kbibtex-0.10.50_pre20250205.ebuild     | 75 ++++++++++++++++++++++
 3 files changed, 105 insertions(+)

diff --git a/app-text/kbibtex/Manifest b/app-text/kbibtex/Manifest
index 79e591e2d74e..88ccc4cc1b26 100644
--- a/app-text/kbibtex/Manifest
+++ b/app-text/kbibtex/Manifest
@@ -1,2 +1,3 @@
 DIST kbibtex-0.10.0.tar.xz 3885328 BLAKE2B c417cc3628739e1f3ed3231e9ba5387834a65b4ef78517273b53876ecc89e72194cdbbe14a5a479c5948beb5219d0345b1c22daa6f394b6ad7d664e260c8124d SHA512 37f4e9eb0bd7be8a64bae4076be20a6e59b33f17d59de35dec8833bce027172388aa3a49a8cbdac84c56686ad287a39e0c6f13665ed9e9b696c9ce3a6ec7de1d
 DIST kbibtex-0.10.50_pre20250113-3b5dcb59.tar.gz 5612866 BLAKE2B 1e338432fdc0ee9119127bd73df14e45d77a07d259c81802d614e8e42785fa4dd91676708bd8178f9833cf848149acf07d2997485afb71821b9966e98f663f30 SHA512 9981cd4af9a89c5b500bf30b30f0d54e18fbe2822cd90aee4191872874370b1d0823d8753419b89b3287923f449d942ed21e2a60f8d8bf0fdd97fa25e8840e08
+DIST kbibtex-0.10.50_pre20250205-b76e7904.tar.gz 5618097 BLAKE2B 1bb8623c725471e298ce070d3a9cc19bd7ff31b2d5a1b9c8508ef4edd668b9763645fb7a6993d8217a020af51fe1673fbbd38dd2c2f7d1ba16d86a96951f7441 SHA512 44c15c7b9cc18b8b43557b89c194d431128af5dcbe98bc511fb41534b17d578bfe20caf3bc8050bd14b8b3298ba903b4dbeec8396d0de2cf40750096736c2195

diff --git a/app-text/kbibtex/files/kbibtex-0.10.50_pre20250205-cmake.patch b/app-text/kbibtex/files/kbibtex-0.10.50_pre20250205-cmake.patch
new file mode 100644
index 000000000000..7b96a9a07caf
--- /dev/null
+++ b/app-text/kbibtex/files/kbibtex-0.10.50_pre20250205-cmake.patch
@@ -0,0 +1,29 @@
+From fa79e2682a51ec1920ea80af5dcc4fd9f9af320a Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner <asturm@gentoo.org>
+Date: Thu, 6 Feb 2025 22:46:40 +0100
+Subject: CMake: Re-add lookup of KDocTools
+
+Commented out in commit 11f6daece7d1d3d9c84db5b8aea25017aaba1c9d and
+further cleaned up in commit c0988c00d04012c2767f59149dd954b34599742e
+without comment.
+
+Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
+---
+ CMakeLists.txt | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 47df2bae..a160ebfe 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -180,6 +180,8 @@ find_package(
+     MODULE
+     REQUIRED
+     Config
++    OPTIONAL_COMPONENTS
++    DocTools
+ )
+ if(BUILD_KPART OR BUILD_TESTING)
+     find_package(
+-- 
+2.48.1

diff --git a/app-text/kbibtex/kbibtex-0.10.50_pre20250205.ebuild b/app-text/kbibtex/kbibtex-0.10.50_pre20250205.ebuild
new file mode 100644
index 000000000000..9eb0b4ff1951
--- /dev/null
+++ b/app-text/kbibtex/kbibtex-0.10.50_pre20250205.ebuild
@@ -0,0 +1,75 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+KDE_ORG_COMMIT=b76e7904b8288f001beb4fc0a60a5c66448de85d
+ECM_HANDBOOK="optional"
+ECM_TEST="true"
+PYTHON_COMPAT=( python3_{10..13} )
+KFMIN=6.9.0
+QTMIN=6.7.2
+inherit ecm kde.org optfeature python-any-r1 xdg
+
+DESCRIPTION="BibTeX editor to edit bibliographies used with LaTeX"
+HOMEPAGE="https://apps.kde.org/kbibtex/ https://userbase.kde.org/KBibTeX"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="webengine"
+
+RESTRICT="test"
+
+COMMON_DEPEND="
+	app-text/poppler[qt6]
+	dev-libs/icu:=
+	>=dev-qt/qt5compat-${QTMIN}:6
+	>=dev-qt/qtbase-${QTMIN}:6[dbus,gui,network,widgets,xml]
+	>=dev-qt/qtnetworkauth-${QTMIN}:6
+	>=kde-frameworks/kcompletion-${KFMIN}:6
+	>=kde-frameworks/kconfig-${KFMIN}:6
+	>=kde-frameworks/kconfigwidgets-${KFMIN}:6
+	>=kde-frameworks/kcoreaddons-${KFMIN}:6
+	>=kde-frameworks/kcrash-${KFMIN}:6
+	>=kde-frameworks/ki18n-${KFMIN}:6
+	>=kde-frameworks/kiconthemes-${KFMIN}:6
+	>=kde-frameworks/kio-${KFMIN}:6
+	>=kde-frameworks/kitemviews-${KFMIN}:6
+	>=kde-frameworks/kjobwidgets-${KFMIN}:6
+	>=kde-frameworks/kparts-${KFMIN}:6
+	>=kde-frameworks/kservice-${KFMIN}:6
+	>=kde-frameworks/ktexteditor-${KFMIN}:6
+	>=kde-frameworks/ktextwidgets-${KFMIN}:6
+	>=kde-frameworks/kwallet-${KFMIN}:6
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:6
+	>=kde-frameworks/kxmlgui-${KFMIN}:6
+	virtual/tex-base
+	webengine? ( >=dev-qt/qtwebengine-${QTMIN}:6[widgets] )
+"
+RDEPEND="${COMMON_DEPEND}
+	!${CATEGORY}/${PN}:5
+	dev-tex/bibtex2html
+"
+DEPEND="${COMMON_DEPEND}
+	${PYTHON_DEPS}
+	>=dev-qt/qtbase-${QTMIN}:6[concurrent]
+"
+
+PATCHES=( "${FILESDIR}"/${P}-cmake.patch ) # bug 949362, pending upstream
+
+src_configure() {
+	local mycmakeargs=(
+		-DQT_MAJOR_VERSION=6
+		$(cmake_use_find_package webengine Qt6WebEngineWidgets)
+	)
+
+	ecm_src_configure
+}
+
+pkg_postinst() {
+	if [[ -z "${REPLACING_VERSIONS}" ]]; then
+		optfeature "PDF or PostScript document previews" "kde-apps/okular:6"
+	fi
+	xdg_pkg_postinst
+}


^ permalink raw reply related	[flat|nested] 6+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: app-text/kbibtex/, app-text/kbibtex/files/
@ 2025-02-16 11:32 Andreas Sturmlechner
  0 siblings, 0 replies; 6+ messages in thread
From: Andreas Sturmlechner @ 2025-02-16 11:32 UTC (permalink / raw
  To: gentoo-commits

commit:     b2d8827a1000d5741ff8adf5ef0bbbcc5ebf6466
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Feb 16 11:24:50 2025 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Feb 16 11:32:05 2025 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b2d8827a

app-text/kbibtex: drop 0.10.0

Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 app-text/kbibtex/Manifest                         |  1 -
 app-text/kbibtex/files/kbibtex-0.10.0-cxx17.patch | 11 ----
 app-text/kbibtex/kbibtex-0.10.0.ebuild            | 79 -----------------------
 3 files changed, 91 deletions(-)

diff --git a/app-text/kbibtex/Manifest b/app-text/kbibtex/Manifest
index 47d60055e6cd..3809604beee9 100644
--- a/app-text/kbibtex/Manifest
+++ b/app-text/kbibtex/Manifest
@@ -1,2 +1 @@
-DIST kbibtex-0.10.0.tar.xz 3885328 BLAKE2B c417cc3628739e1f3ed3231e9ba5387834a65b4ef78517273b53876ecc89e72194cdbbe14a5a479c5948beb5219d0345b1c22daa6f394b6ad7d664e260c8124d SHA512 37f4e9eb0bd7be8a64bae4076be20a6e59b33f17d59de35dec8833bce027172388aa3a49a8cbdac84c56686ad287a39e0c6f13665ed9e9b696c9ce3a6ec7de1d
 DIST kbibtex-0.10.50_pre20250205-b76e7904.tar.gz 5618097 BLAKE2B 1bb8623c725471e298ce070d3a9cc19bd7ff31b2d5a1b9c8508ef4edd668b9763645fb7a6993d8217a020af51fe1673fbbd38dd2c2f7d1ba16d86a96951f7441 SHA512 44c15c7b9cc18b8b43557b89c194d431128af5dcbe98bc511fb41534b17d578bfe20caf3bc8050bd14b8b3298ba903b4dbeec8396d0de2cf40750096736c2195

diff --git a/app-text/kbibtex/files/kbibtex-0.10.0-cxx17.patch b/app-text/kbibtex/files/kbibtex-0.10.0-cxx17.patch
deleted file mode 100644
index 33fb8ebb4542..000000000000
--- a/app-text/kbibtex/files/kbibtex-0.10.0-cxx17.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -10,7 +10,7 @@
-     LANGUAGES CXX
- )
- 
--set(CMAKE_CXX_STANDARD 11)
-+set(CMAKE_CXX_STANDARD 17)
- set(QT_MIN_VERSION 5.9.0)
- # Somewhat arbitrary chosen version number ...
- set(KF5_MIN_VERSION 5.51)

diff --git a/app-text/kbibtex/kbibtex-0.10.0.ebuild b/app-text/kbibtex/kbibtex-0.10.0.ebuild
deleted file mode 100644
index aa8b9929c2d5..000000000000
--- a/app-text/kbibtex/kbibtex-0.10.0.ebuild
+++ /dev/null
@@ -1,79 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-ECM_HANDBOOK="optional"
-ECM_TEST="optional"
-KFMIN=5.82.0
-QTMIN=5.15.5
-inherit ecm kde.org optfeature
-
-DESCRIPTION="BibTeX editor to edit bibliographies used with LaTeX"
-HOMEPAGE="https://apps.kde.org/kbibtex/ https://userbase.kde.org/KBibTeX"
-
-if [[ ${KDE_BUILD_TYPE} != live ]]; then
-	SRC_URI="mirror://kde/stable/KBibTeX/${PV}/${P}.tar.xz"
-	KEYWORDS="amd64 x86"
-fi
-
-LICENSE="GPL-2"
-SLOT="5"
-IUSE="webengine"
-
-RESTRICT="test"
-
-COMMON_DEPEND="
-	app-text/poppler[qt5]
-	dev-libs/icu:=
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtnetwork-${QTMIN}:5
-	>=dev-qt/qtnetworkauth-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=dev-qt/qtxml-${QTMIN}:5
-	>=dev-qt/qtxmlpatterns-${QTMIN}:5
-	>=kde-frameworks/kcompletion-${KFMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/kcrash-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kiconthemes-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-	>=kde-frameworks/kitemviews-${KFMIN}:5
-	>=kde-frameworks/kjobwidgets-${KFMIN}:5
-	>=kde-frameworks/kparts-${KFMIN}:5
-	>=kde-frameworks/kservice-${KFMIN}:5
-	>=kde-frameworks/ktexteditor-${KFMIN}:5
-	>=kde-frameworks/ktextwidgets-${KFMIN}:5
-	>=kde-frameworks/kwallet-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-	virtual/tex-base
-	webengine? ( >=dev-qt/qtwebengine-${QTMIN}:5[widgets] )
-"
-RDEPEND="${COMMON_DEPEND}
-	dev-tex/bibtex2html
-"
-DEPEND="${COMMON_DEPEND}
-	>=dev-qt/qtconcurrent-${QTMIN}:5
-"
-
-PATCHES=( "${FILESDIR}"/${P}-cxx17.patch )
-
-src_configure() {
-	local mycmakeargs=(
-		-DCMAKE_DISABLE_FIND_PACKAGE_Qt5WebKitWidgets=ON
-		$(cmake_use_find_package webengine Qt5WebEngineWidgets)
-	)
-
-	ecm_src_configure
-}
-
-pkg_postinst() {
-	if [[ -z "${REPLACING_VERSIONS}" ]]; then
-		optfeature "PDF or PostScript document previews" "media-gfx/okularpart:5" "kde-apps/okular:5"
-	fi
-	ecm_pkg_postinst
-}


^ permalink raw reply related	[flat|nested] 6+ messages in thread

end of thread, other threads:[~2025-02-16 11:33 UTC | newest]

Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2023-02-27 19:29 [gentoo-commits] repo/gentoo:master commit in: app-text/kbibtex/, app-text/kbibtex/files/ Andreas Sturmlechner
  -- strict thread matches above, loose matches on Subject: below --
2025-02-16 11:32 Andreas Sturmlechner
2025-02-06 22:41 Andreas Sturmlechner
2024-05-23 18:51 Andreas Sturmlechner
2023-01-24 19:29 Andreas Sturmlechner
2017-03-25 13:04 Andreas Sturmlechner

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox