Re: [PR PATCH] [Updated] New packages: bibutils-7.2, kbibtex-0.9.2

[classabbyamp <classabbyamp@users.noreply.github.com>]

[-- Attachment #1: Type: text/plain, Size: 667 bytes --]

There is an updated pull request by classabbyamp against master on the void-packages repository

https://github.com/classabbyamp/void-packages new/kbibtex
https://github.com/void-linux/void-packages/pull/38102

New packages: bibutils-7.2, kbibtex-0.9.2
- New package: bibutils-7.2
- New package: kbibtex-0.9.2

#### Testing the changes
- I tested the changes in this PR: **YES**

#### New package
- This new package conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements): **YES**

closes #21514

A patch file from https://github.com/void-linux/void-packages/pull/38102.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-new/kbibtex-38102.patch --]
[-- Type: text/x-diff, Size: 7320 bytes --]

From 12f0ad1ea3c38242a29c29e2e174a789749b10c4 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Sun, 17 Jul 2022 02:17:50 -0400
Subject: [PATCH 1/2] New package: bibutils-7.2

---
 common/shlibs                                 |  1 +
 srcpkgs/bibutils-devel                        |  1 +
 .../bibutils/patches/generate-manpages.patch  | 38 ++++++++++++++
 srcpkgs/bibutils/template                     | 49 +++++++++++++++++++
 4 files changed, 89 insertions(+)
 create mode 120000 srcpkgs/bibutils-devel
 create mode 100644 srcpkgs/bibutils/patches/generate-manpages.patch
 create mode 100644 srcpkgs/bibutils/template

diff --git a/common/shlibs b/common/shlibs
index c0e56e217047..dde1ba877c39 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4174,3 +4174,4 @@ liblowdown.so lowdown-0.11.2_1
 libjaylink.so.0 libjaylink-0.2.0_1
 libnvidia-container.so.1 libnvidia-container-1.10.0_1
 libnvidia-container-go.so.1 libnvidia-container-1.10.0_1
+libbibutils.so.7 bibutils-7.2_1
diff --git a/srcpkgs/bibutils-devel b/srcpkgs/bibutils-devel
new file mode 120000
index 000000000000..fe74d1a04abe
--- /dev/null
+++ b/srcpkgs/bibutils-devel
@@ -0,0 +1 @@
+bibutils
\ No newline at end of file
diff --git a/srcpkgs/bibutils/patches/generate-manpages.patch b/srcpkgs/bibutils/patches/generate-manpages.patch
new file mode 100644
index 000000000000..140d362bc726
--- /dev/null
+++ b/srcpkgs/bibutils/patches/generate-manpages.patch
@@ -0,0 +1,38 @@
+from arch's package: https://github.com/archlinux/svntogit-community/blob/packages/bibutils/trunk/generate-man-pages.patch
+
+--- a/bibutils.dbk
++++ b/bibutils.dbk
+@@ -45,12 +45,12 @@
+     <refmiscinfo class='version'> &version; </refmiscinfo>
+     <refmiscinfo class='manual'> User Commands </refmiscinfo>
+   </refmeta>
+-  <!-- Uncomment this division to have .so manpages generated for all
+-  commands
+     <refnamediv>
+     <refname>bibutils</refname>
+     <refname>bib2xml</refname>
++    <refname>biblatex2xml</refname>
+     <refname>copac2xml</refname>
++    <refname>ebi2xml</refname>
+     <refname>end2xml</refname>
+     <refname>endx2xml</refname>
+     <refname>isi2xml</refname>
+@@ -58,15 +58,17 @@
+     <refname>modsclean</refname>
+     <refname>nbib2xml</refname>
+     <refname>ris2xml</refname>
++    <refname>wordbib2xml</refname>
+     <refname>xml2ads</refname>
+     <refname>xml2bib</refname>
++    <refname>xml2biblatex</refname>
+     <refname>xml2end</refname>
+     <refname>xml2isi</refname>
++    <refname>xml2nbib</refname>
+     <refname>xml2ris</refname>
+     <refname>xml2wordbib</refname>
+       <refpurpose>bibliography conversion utilities</refpurpose>
+   </refnamediv>
+-  -->
+     <refnamediv>
+     <refname>bibutils</refname>
+       <refpurpose>bibliography conversion utilities</refpurpose>
diff --git a/srcpkgs/bibutils/template b/srcpkgs/bibutils/template
new file mode 100644
index 000000000000..4dda60eff405
--- /dev/null
+++ b/srcpkgs/bibutils/template
@@ -0,0 +1,49 @@
+# Template file for 'bibutils'
+pkgname=bibutils
+version=7.2
+revision=1
+wrksrc="${pkgname}_${version}"
+hostmakedepends="docbook-xsl libxslt"
+short_desc="Bibliography format interconversion"
+maintainer="classabbyamp <void@placeviolette.net>"
+license="GPL-2.0-only"
+homepage="https://sourceforge.net/projects/bibutils"
+distfiles="${SOURCEFORGE_SITE}/bibutils/bibutils_${version}_src.tgz"
+checksum=6e028aef1e8a6b3e5acef098584a7bb68708f35cfe74011b341c11fea5e4b5c3
+
+post_patch() {
+	# remove unnecessary backslashes in pc file
+	vsed -e 's/\\//g' -i packageconfig_start
+}
+
+do_configure() {
+	./configure --dynamic --install-dir ${DESTDIR}/usr/bin --install-lib ${DESTDIR}/usr/lib
+}
+
+do_build() {
+	make CC="${CC}" DISTRO_CFLAGS="${CFLAGS}" LDFLAGSIN="${LDFLAGS}"
+	xsltproc --output bibutils.1 --nonet /usr/share/xsl/docbook/manpages/docbook.xsl bibutils.dbk
+}
+
+do_check() {
+	make DISTRO_CFLAGS="${CFLAGS}" LDFLAGSIN="${LDFLAGS}" test
+}
+
+do_install() {
+	make install
+	vdoc ChangeLog
+	for page in $(find ${wrksrc} -name '*.1'); do
+		vman $page
+	done
+}
+
+bibutils-devel_package() {
+	depends="${sourcepkg}>=${version}_${revision}"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove "usr/lib/*.so"
+		vinstall lib/bibutils.pc 644 usr/lib/pkgconfig
+		vmkdir usr/include/${sourcepkg}
+		vcopy "lib/*.h" usr/include/${sourcepkg}
+	}
+}

From 23348c30d9a1ae7bf49fc6870f881b485cf6a84a Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Sun, 17 Jul 2022 02:17:30 -0400
Subject: [PATCH 2/2] New package: kbibtex-0.9.2

fixes #21514
---
 .../patches/qsortfilterproxymodel-crash.patch | 28 +++++++++++++++++++
 srcpkgs/kbibtex/template                      | 21 ++++++++++++++
 2 files changed, 49 insertions(+)
 create mode 100644 srcpkgs/kbibtex/patches/qsortfilterproxymodel-crash.patch
 create mode 100644 srcpkgs/kbibtex/template

diff --git a/srcpkgs/kbibtex/patches/qsortfilterproxymodel-crash.patch b/srcpkgs/kbibtex/patches/qsortfilterproxymodel-crash.patch
new file mode 100644
index 000000000000..91cc51f9303c
--- /dev/null
+++ b/srcpkgs/kbibtex/patches/qsortfilterproxymodel-crash.patch
@@ -0,0 +1,28 @@
+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/srcpkgs/kbibtex/template b/srcpkgs/kbibtex/template
new file mode 100644
index 000000000000..2ac39c554a93
--- /dev/null
+++ b/srcpkgs/kbibtex/template
@@ -0,0 +1,21 @@
+# Template file for 'kbibtex'
+pkgname=kbibtex
+version=0.9.2
+revision=1
+wrksrc="${pkgname}-v${version}"
+build_style=cmake
+hostmakedepends="extra-cmake-modules kdoctools gettext pkg-config qt5-host-tools
+ qt5-qmake kcoreaddons kparts"
+makedepends="poppler-qt5-devel qt5-webengine-devel qt5-xmlpatterns qoauth-qt5-devel
+ ktexteditor-devel qt5-webchannel-devel qt5-location-devel"
+depends="bibutils"
+conf_files="/etc/xdg/kbibtexrc"
+short_desc="Editor for bibliographies used with LaTeX"
+maintainer="classabbyamp <void@placeviolette.net>"
+license="GPL-2.0-or-later"
+homepage="https://apps.kde.org/kbibtex/"
+changelog="https://invent.kde.org/office/kbibtex/-/raw/master/ChangeLog"
+distfiles="https://invent.kde.org/office/kbibtex/-/archive/v${version}/kbibtex-v${version}.tar.gz"
+checksum=055e5485fa872bf4679fad0a4b8b05d67a63439b620b0002c56e9a35f907ac81
+# various failures both locally and in CI
+make_check=no