From a1c55a7e2f400a6170fd3df167bfdc299c05e2db Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Fri, 24 Feb 2023 21:49:24 +0000 Subject: gentoo auto-resync : 24:02:2023 - 21:49:24 --- app-text/xiphos/Manifest | 4 +- app-text/xiphos/files/xiphos-4.2.1-webkit41.patch | 20 +++++++ app-text/xiphos/metadata.xml | 2 +- app-text/xiphos/xiphos-4.2.1-r2.ebuild | 73 +++++++++++++++++++++++ 4 files changed, 97 insertions(+), 2 deletions(-) create mode 100644 app-text/xiphos/files/xiphos-4.2.1-webkit41.patch create mode 100644 app-text/xiphos/xiphos-4.2.1-r2.ebuild (limited to 'app-text/xiphos') diff --git a/app-text/xiphos/Manifest b/app-text/xiphos/Manifest index c7f3597f6ea2..8364a13bc610 100644 --- a/app-text/xiphos/Manifest +++ b/app-text/xiphos/Manifest @@ -1,6 +1,8 @@ AUX xiphos-4.2.1-appdata_metainfo.patch 312 BLAKE2B 9d08588d0cce33f56b45a882246528afcf36fd9b24bbf7fadeec270a24d230bec5a0ef2436b7a70358aff9946e19ed3bd60304bb786f4920f389ce2389bb146f SHA512 59d9ea167ccdbdbc7b90eedbe58e12fe9b11043b48442143d6bff67f2853d717597e7023c7898936a63e6e9def599b6309330e31a394dfb4c807ae95fdc63d52 AUX xiphos-4.2.1-glib_version_min_required.patch 223 BLAKE2B f31b00632ce8dcb1df5e91c3e878318690cb159a7ab83dca134d3e536edb3e9c5462f25bcdebbd25a617b0811e6175ad9bb62583ca588907f14d4b89304eeca7 SHA512 6641739c9f3fa195321f16a1d5d7ed844a0a99c6d65ceba5367270d82c0701a6c906de7c1e430ca010fcd8c35a247bb11f3fccbbfdf80c1ee28b21af2a7a2bd3 +AUX xiphos-4.2.1-webkit41.patch 426 BLAKE2B 373d93182db65e5dccb8588658d713961461f49f64170abed279c7158ccf8292fafd44b041ff7cd9ea7bdcb52af34284cba5a7cb0ccd9c5dae6e5d30046d3ea8 SHA512 8a8e8bcb34d257b07eee48249fb46db928fd358765ed3fb35b5f2b5aba6280414fcf25bef3866dbca99bbef90464257409a091e7319f79833c461e23173a2f97 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 EBUILD xiphos-4.2.1-r1.ebuild 1681 BLAKE2B 4b8661873c0959c5bd265608ad677c374310eaa651984e3a864088a4d8232f18d8c00ba295e72022be7676264ef8340d3d14ae4621fb19ade211831eef57ef1d SHA512 5956b27da6610fb8c17df3d51993847842360653e4eb78cdae14585f5a2e1f43de33b6278ea1de90335b9b856cef835182f52ca12280eb9dbb1a8d09e18b8cca -MISC metadata.xml 326 BLAKE2B 6e99d7d8c95e9bfa87837796634393c1ebf086accebfaa22345c6c262c66ab90761576acec3f90424285b9109b80a46d45b80e877a0159331a52676501eb1882 SHA512 bfafd9d630dc1419404e6fddef05f8de268b3130bb6cc34dc77233e7d05e292b7ab50eab1727d1815ece71cef6aaec881e03e30a0345b38e9252a433092efd7c +EBUILD xiphos-4.2.1-r2.ebuild 1726 BLAKE2B b656c1c9fdb322d5d372c9cb24b480cce5cee7df3142185fc1c01b3f5c7b599c4b89b1bf9cfd8117a802bbe0e23d8a1ea8e72a24b157716b0bbb18db14475634 SHA512 ae8f4bf28e20f906da0f42204f172e0455fb494fc8c1d813f9d282be22b5d59d56514573b1e8b689aa2d9657631ca0d87b4f50a035e3ec3340106f0d8b755873 +MISC metadata.xml 327 BLAKE2B 0925684efe71dfe03c6f3aaed9bc07b49594eed7edefaeb0b47c15fc67ddfaa5e5e4f8f1ec752e5c08c8770960e4ff5732f43e36c081c75e6c9265b77ef68e10 SHA512 a8c931bd1d0c7250c51d7b9bfb684a1433422604ea992d4c26fe3fd5b871f4dd92032b1907a9cceca4a7c7c87437cf3f26e0790e7f6adb27610f13b0b17b1cc2 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/metadata.xml b/app-text/xiphos/metadata.xml index b844aa2c06ed..e8dbfb149a17 100644 --- a/app-text/xiphos/metadata.xml +++ b/app-text/xiphos/metadata.xml @@ -6,6 +6,6 @@ Marek Szuba - gnomesword + crosswire/xiphos 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 +} -- cgit v1.2.3