Re: [PR PATCH] [Updated] xournal: remove package

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

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

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

https://github.com/paper42/void-packages remove-xournal
https://github.com/void-linux/void-packages/pull/38440

xournal: remove package
gtk2, dead upstream, xournalpp is a modern replacement

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

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-remove-xournal-38440.patch --]
[-- Type: text/x-diff, Size: 2378 bytes --]

From 425aac1050a64a726b6cd6137de326c059c9e04d Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Tue, 2 Aug 2022 18:38:52 +0200
Subject: [PATCH] xournal: remove package

gtk2, dead upstream, replaced by xournalpp
---
 srcpkgs/xournal            |  1 +
 srcpkgs/xournal/template   | 22 ----------------------
 srcpkgs/xournalpp/template |  8 +++++++-
 3 files changed, 8 insertions(+), 23 deletions(-)
 create mode 120000 srcpkgs/xournal
 delete mode 100644 srcpkgs/xournal/template

diff --git a/srcpkgs/xournal b/srcpkgs/xournal
new file mode 120000
index 000000000000..f050a0a34269
--- /dev/null
+++ b/srcpkgs/xournal
@@ -0,0 +1 @@
+xournalpp
\ No newline at end of file
diff --git a/srcpkgs/xournal/template b/srcpkgs/xournal/template
deleted file mode 100644
index 36f11cead862..000000000000
--- a/srcpkgs/xournal/template
+++ /dev/null
@@ -1,22 +0,0 @@
-# Template file for 'xournal'
-pkgname=xournal
-version=0.4.8.2016
-revision=4
-build_style=gnu-configure
-make_install_args="desktop-install"
-hostmakedepends="autoconf automake pkg-config gettext"
-makedepends="gtk+-devel libgnomecanvas-devel poppler-glib-devel
- zlib-devel ghostscript-devel"
-depends="hicolor-icon-theme desktop-file-utils ghostscript"
-short_desc="GPL Notetaking, sketching, and journal-keeping"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="GPL-2.0-or-later"
-homepage="http://xournal.sourceforge.net/"
-distfiles="${SOURCEFORGE_SITE}/$pkgname/$pkgname-$version.tar.gz"
-checksum=b25898dbd7a149507f37a16769202d69fbebd4a000d766923bbd32c5c7462826
-
-post_patch() {
-	vsed -i -e "/DATADIRNAME=/s/=.*/=share/" configure
-	vsed -i -e "s,^localedir =.*,localedir = /usr/share/locale," \
-		po/Makefile.in.in
-}
diff --git a/srcpkgs/xournalpp/template b/srcpkgs/xournalpp/template
index e235dcfe40fb..769d103e6459 100644
--- a/srcpkgs/xournalpp/template
+++ b/srcpkgs/xournalpp/template
@@ -1,7 +1,7 @@
 # Template file for 'xournalpp'
 pkgname=xournalpp
 version=1.1.1
-revision=1
+revision=2
 build_style=cmake
 hostmakedepends="pkg-config gettext"
 makedepends="libxml2-devel libcppunit-devel poppler-glib-devel gtk+3-devel
@@ -21,3 +21,9 @@ fi
 case "$XBPS_TARGET_MACHINE" in
 	*-musl) makedepends+=" libexecinfo-devel";;
 esac
+
+xournal_package() {
+	depends="${sourcepkg}>=${version}_${revision}"
+	short_desc+=" - transitional dummy package"
+	build_style=meta
+}