* [gentoo-commits] repo/gentoo:master commit in: app-text/xiphos/files/, app-text/xiphos/
@ 2023-02-24 16:50 Marek Szuba
0 siblings, 0 replies; 2+ messages in thread
From: Marek Szuba @ 2023-02-24 16:50 UTC (permalink / raw
To: gentoo-commits
commit: cdf8988f51efe0c097a3f9b48c90698032b76371
Author: Marek Szuba <marecki <AT> gentoo <DOT> org>
AuthorDate: Fri Feb 24 16:38:09 2023 +0000
Commit: Marek Szuba <marecki <AT> gentoo <DOT> org>
CommitDate: Fri Feb 24 16:50:00 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cdf8988f
app-text/xiphos: migrate to net-libs/webkit-gtk:4.1
Builds without errors against this version.
Closes: https://bugs.gentoo.org/893684
Signed-off-by: Marek Szuba <marecki <AT> gentoo.org>
app-text/xiphos/files/xiphos-4.2.1-webkit41.patch | 20 +++++++
app-text/xiphos/xiphos-4.2.1-r2.ebuild | 73 +++++++++++++++++++++++
2 files changed, 93 insertions(+)
diff --git a/app-text/xiphos/files/xiphos-4.2.1-webkit41.patch b/app-text/xiphos/files/xiphos-4.2.1-webkit41.patch
new file mode 100644
index 000000000000..8de40e28c64e
--- /dev/null
+++ b/app-text/xiphos/files/xiphos-4.2.1-webkit41.patch
@@ -0,0 +1,20 @@
+--- a/cmake/XiphosDependencies.cmake
++++ b/cmake/XiphosDependencies.cmake
+@@ -84,7 +84,7 @@
+ "gdk-pixbuf-2.0"
+ "gio-2.0"
+ "gobject-2.0"
+- "libsoup-2.4"
++ "libsoup-3.0"
+ "pango"
+ "minizip"
+ "zlib"
+@@ -144,7 +144,7 @@
+ # Gtk+-3.0 + Webkit2 + GtkHtml-editor
+ pkg_check_modules(Gtk REQUIRED IMPORTED_TARGET
+ "gtk+-3.0"
+- "webkit2gtk-4.0"
++ "webkit2gtk-4.1"
+ )
+ endif()
+ endif (GTK2)
diff --git a/app-text/xiphos/xiphos-4.2.1-r2.ebuild b/app-text/xiphos/xiphos-4.2.1-r2.ebuild
new file mode 100644
index 000000000000..04e20aca65b1
--- /dev/null
+++ b/app-text/xiphos/xiphos-4.2.1-r2.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake xdg-utils
+
+DESCRIPTION="A Gtk+-based Bible-study frontend for SWORD"
+HOMEPAGE="https://xiphos.org/"
+SRC_URI="https://github.com/crosswire/${PN}/releases/download/${PV}/${P}.tar.xz
+ https://dev.gentoo.org/~marecki/dists/${CATEGORY}/${PN}/${PN}-4.2.1-disable_webkit_editor.patch.xz"
+
+LICENSE="GPL-2 FDL-1.1 LGPL-2 MIT MPL-1.1"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="dbus debug"
+
+COMMON="sys-apps/util-linux
+ dev-libs/libxml2
+ dev-libs/libxslt
+ dbus? ( dev-libs/dbus-glib )"
+RDEPEND="${COMMON}
+ >=app-text/sword-1.8.1
+ dev-libs/glib:2
+ dev-libs/icu
+ >=net-libs/biblesync-1.2.0
+ net-libs/webkit-gtk:4.1
+ sys-libs/zlib[minizip]
+ x11-libs/gtk+:3"
+DEPEND="${RDEPEND}"
+BDEPEND="${COMMON}
+ app-arch/zip
+ app-text/yelp-tools
+ dev-libs/appstream-glib
+ dev-util/desktop-file-utils
+ dev-util/glib-utils
+ dev-util/itstool
+ virtual/pkgconfig"
+
+PATCHES=(
+ "${WORKDIR}"/${PN}-4.2.1-disable_webkit_editor.patch
+ "${FILESDIR}"/${PN}-4.2.1-appdata_metainfo.patch
+ "${FILESDIR}"/${PN}-4.2.1-glib_version_min_required.patch
+ "${FILESDIR}"/${PN}-4.2.1-webkit41.patch
+)
+
+src_configure() {
+ local mycmakeargs=(
+ -DDBUS=$(usex dbus)
+ -DDEBUG=$(usex debug)
+ -DPOSTINST=off
+ )
+ cmake_src_configure
+}
+
+pkg_postinst() {
+ xdg_icon_cache_update
+
+ if [[ -n "${REPLACING_VERSIONS}" ]]; then
+ local rver
+ for rver in ${REPLACING_VERSIONS}; do
+ if ver_test "${rver}" -le "4.2.1"; then
+ ewarn "Please note that ${PN} no longer provides an editor due to its dependency on outdated libraries."
+ ewarn "Studypad and the personal commentary will no longer work."
+ break
+ fi
+ done
+ fi
+}
+
+pkg_postrm() {
+ xdg_icon_cache_update
+}
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-text/xiphos/files/, app-text/xiphos/
@ 2025-09-07 11:58 Petr Vaněk
0 siblings, 0 replies; 2+ messages in thread
From: Petr Vaněk @ 2025-09-07 11:58 UTC (permalink / raw
To: gentoo-commits
commit: ea5409f84a0c2d6ada447f5e1615301b934f2913
Author: Petr Vaněk <arkamar <AT> gentoo <DOT> org>
AuthorDate: Sun Sep 7 11:54:05 2025 +0000
Commit: Petr Vaněk <arkamar <AT> gentoo <DOT> org>
CommitDate: Sun Sep 7 11:56:38 2025 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ea5409f8
app-text/xiphos: drop 4.2.1-r3
Signed-off-by: Petr Vaněk <arkamar <AT> gentoo.org>
app-text/xiphos/Manifest | 2 -
.../files/xiphos-4.2.1-appdata_metainfo.patch | 11 ----
.../xiphos-4.2.1-glib_version_min_required.patch | 10 ----
app-text/xiphos/files/xiphos-4.2.1-webkit41.patch | 20 -------
app-text/xiphos/xiphos-4.2.1-r3.ebuild | 67 ----------------------
5 files changed, 110 deletions(-)
diff --git a/app-text/xiphos/Manifest b/app-text/xiphos/Manifest
index 678d5aec00fd..034b41406b74 100644
--- a/app-text/xiphos/Manifest
+++ b/app-text/xiphos/Manifest
@@ -1,3 +1 @@
-DIST xiphos-4.2.1-disable_webkit_editor.patch.xz 7432 BLAKE2B b1dd9db675a34433f4979247d57936920e178cf83cbcfa0fc2a4b9491855d064ecccdb8805a5615b9c91490c3ff2c24f7d951dad009e83952e5d6aa28c8a0730 SHA512 ae0d9b526143445529fa467bdd1b90015812a5d81396619e64a701962a608413c5875c137970d2b70dbac28085e7f40dc6049d591efaf96df7ddfb2cc64854da
-DIST xiphos-4.2.1.tar.xz 21586484 BLAKE2B 7529f770766dfc5bae6cb04bfeb3d3cc0714c4ebbd2282aca549e50b8a9ca4c74cdb8cb69667f1036ee33ee1c5d90e562cff80d520ce72651736e1f5f4274ba1 SHA512 624bd2e931c15e1665724918e756706f048e824dc13c2f1d5a05c32a93697137e75012564a14b7d2d0aa90c6a109c52ead51901e657d35a457ccf5f42204a0fe
DIST xiphos-4.3.2.tar.xz 21383548 BLAKE2B faf5d830bfddfb531ca24c9073f54a9405dd256e2c23c211e4e1c91027d00ea61928214d7da61244097f0327ee50769e5b27ef78f3d242a8640e2a6ec2c67ddc SHA512 b954a5c2d34defc6d472341d612a6dd53eabc3801091c2cbb81c567d6fcc55545a63425f6e22a3649f4436aa4ab9a7cacf91a8630d41224782b62d59b41f5fe4
diff --git a/app-text/xiphos/files/xiphos-4.2.1-appdata_metainfo.patch b/app-text/xiphos/files/xiphos-4.2.1-appdata_metainfo.patch
deleted file mode 100644
index fddfd2eca957..000000000000
--- a/app-text/xiphos/files/xiphos-4.2.1-appdata_metainfo.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/desktop/CMakeLists.txt
-+++ b/desktop/CMakeLists.txt
-@@ -96,7 +96,7 @@
- )
- # install file
- install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}.appdata.xml
-- DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/appdata
-+ DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/metainfo
- COMPONENT data
- )
-
diff --git a/app-text/xiphos/files/xiphos-4.2.1-glib_version_min_required.patch b/app-text/xiphos/files/xiphos-4.2.1-glib_version_min_required.patch
deleted file mode 100644
index 10bca560fb03..000000000000
--- a/app-text/xiphos/files/xiphos-4.2.1-glib_version_min_required.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/cmake/config.h.cmake.in
-+++ b/cmake/config.h.cmake.in
-@@ -63,5 +63,7 @@
- // strcasestr
- #cmakedefine HAVE_STRCASESTR 1
-
-+// glib-2.68.0+ compatibility
-+#define GLIB_VERSION_MIN_REQUIRED (GLIB_VERSION_2_26)
-
- #endif
diff --git a/app-text/xiphos/files/xiphos-4.2.1-webkit41.patch b/app-text/xiphos/files/xiphos-4.2.1-webkit41.patch
deleted file mode 100644
index 8de40e28c64e..000000000000
--- a/app-text/xiphos/files/xiphos-4.2.1-webkit41.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- a/cmake/XiphosDependencies.cmake
-+++ b/cmake/XiphosDependencies.cmake
-@@ -84,7 +84,7 @@
- "gdk-pixbuf-2.0"
- "gio-2.0"
- "gobject-2.0"
-- "libsoup-2.4"
-+ "libsoup-3.0"
- "pango"
- "minizip"
- "zlib"
-@@ -144,7 +144,7 @@
- # Gtk+-3.0 + Webkit2 + GtkHtml-editor
- pkg_check_modules(Gtk REQUIRED IMPORTED_TARGET
- "gtk+-3.0"
-- "webkit2gtk-4.0"
-+ "webkit2gtk-4.1"
- )
- endif()
- endif (GTK2)
diff --git a/app-text/xiphos/xiphos-4.2.1-r3.ebuild b/app-text/xiphos/xiphos-4.2.1-r3.ebuild
deleted file mode 100644
index 6ec1f2d8b69c..000000000000
--- a/app-text/xiphos/xiphos-4.2.1-r3.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2025 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake eapi9-ver xdg-utils
-
-DESCRIPTION="A Gtk+-based Bible-study frontend for SWORD"
-HOMEPAGE="https://xiphos.org/"
-SRC_URI="https://github.com/crosswire/${PN}/releases/download/${PV}/${P}.tar.xz
- https://dev.gentoo.org/~marecki/dists/${CATEGORY}/${PN}/${PN}-4.2.1-disable_webkit_editor.patch.xz"
-
-LICENSE="GPL-2 FDL-1.1 LGPL-2 MIT MPL-1.1"
-SLOT="0"
-KEYWORDS="amd64"
-IUSE="dbus debug"
-
-COMMON="sys-apps/util-linux
- dev-libs/libxml2:=
- dev-libs/libxslt
- dbus? ( dev-libs/dbus-glib )"
-RDEPEND="${COMMON}
- >=app-text/sword-1.8.1
- dev-libs/glib:2
- dev-libs/icu
- >=net-libs/biblesync-1.2.0
- net-libs/webkit-gtk:4.1
- sys-libs/zlib[minizip]
- x11-libs/gtk+:3"
-DEPEND="${RDEPEND}"
-BDEPEND="${COMMON}
- app-arch/zip
- app-text/yelp-tools
- dev-libs/appstream-glib
- dev-util/desktop-file-utils
- dev-util/glib-utils
- dev-util/itstool
- virtual/pkgconfig"
-
-PATCHES=(
- "${WORKDIR}"/${PN}-4.2.1-disable_webkit_editor.patch
- "${FILESDIR}"/${PN}-4.2.1-appdata_metainfo.patch
- "${FILESDIR}"/${PN}-4.2.1-glib_version_min_required.patch
- "${FILESDIR}"/${PN}-4.2.1-webkit41.patch
-)
-
-src_configure() {
- local mycmakeargs=(
- -DDBUS=$(usex dbus)
- -DDEBUG=$(usex debug)
- -DPOSTINST=off
- )
- cmake_src_configure
-}
-
-pkg_postinst() {
- xdg_icon_cache_update
-
- if ver_replacing -le "4.2.1"; then
- ewarn "Please note that ${PN} no longer provides an editor due to its dependency on outdated libraries."
- ewarn "Studypad and the personal commentary will no longer work."
- fi
-}
-
-pkg_postrm() {
- xdg_icon_cache_update
-}
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2025-09-07 11:58 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2025-09-07 11:58 [gentoo-commits] repo/gentoo:master commit in: app-text/xiphos/files/, app-text/xiphos/ Petr Vaněk
-- strict thread matches above, loose matches on Subject: below --
2023-02-24 16:50 Marek Szuba
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox