From aabbcea7ccc981b31e1f644ef24f8a1da456120f Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Sun, 25 Feb 2024 10:55:55 -0500
Subject: [PATCH] cups-filters: update to 2.0.0.

The libcups-filters and libcups-filters-devel subpackages are now
transitional dummies provided by the libcupsfilters package.
---
 common/shlibs                               |  1 -
 srcpkgs/cups-filters/INSTALL.msg            |  2 +
 srcpkgs/cups-filters/files/cups-browsed/run |  3 --
 srcpkgs/cups-filters/template               | 42 ++++-----------------
 srcpkgs/libcups-filters                     |  2 +-
 srcpkgs/libcups-filters-devel               |  2 +-
 srcpkgs/libcupsfilters/template             | 12 ++++++
 7 files changed, 24 insertions(+), 40 deletions(-)
 create mode 100644 srcpkgs/cups-filters/INSTALL.msg
 delete mode 100644 srcpkgs/cups-filters/files/cups-browsed/run

diff --git a/common/shlibs b/common/shlibs
index 7e02f2fe5d9..363b157bd5f 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1805,7 +1805,6 @@ libmsgpackc.so.2 msgpack-1.1.0_1
 libewf.so.3 libewf-20171104_1
 libcupsfilters.so.2 libcupsfilters-2.0.0_1
 libppd.so.2 libppd-2.0.0_1
-libfontembed.so.1 libcups-filters-1.17.5_1
 libjemalloc.so.2 jemalloc-4.0.0_1
 liblucene++.so.0 Lucene++-3.0.6_1
 liblucene++-contrib.so.0 Lucene++-3.0.6_1
diff --git a/srcpkgs/cups-filters/INSTALL.msg b/srcpkgs/cups-filters/INSTALL.msg
new file mode 100644
index 00000000000..31ff3ff63d0
--- /dev/null
+++ b/srcpkgs/cups-filters/INSTALL.msg
@@ -0,0 +1,2 @@
+The `cups-browsed` service that used to be installed with this package
+is now provided by the separate `cups-browsed` package.
diff --git a/srcpkgs/cups-filters/files/cups-browsed/run b/srcpkgs/cups-filters/files/cups-browsed/run
deleted file mode 100644
index 2120dce7b0b..00000000000
--- a/srcpkgs/cups-filters/files/cups-browsed/run
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh
-exec 2>&1
-exec cups-browsed
diff --git a/srcpkgs/cups-filters/template b/srcpkgs/cups-filters/template
index 5a1c2d4473e..7ba2e1e7e5b 100644
--- a/srcpkgs/cups-filters/template
+++ b/srcpkgs/cups-filters/template
@@ -1,47 +1,21 @@
 # Template file for 'cups-filters'
 pkgname=cups-filters
-version=1.28.17
-revision=4
+version=2.0.0
+revision=1
 build_style=gnu-configure
-configure_args="--disable-static --with-rcdir=no --enable-avahi
- --with-browseremoteprotocols=DNSSD,CUPS
- --with-test-font-path=/usr/share/fonts/TTF/DejaVuSans.ttf"
-hostmakedepends="ghostscript glib-devel mupdf-tools pkg-config poppler liblouis"
-makedepends="avahi-glib-libs-devel cups-devel fontconfig-devel liblouis-devel
- ghostscript-devel lcms2-devel libqpdf-devel poppler-cpp-devel libexif-devel"
-depends="bc ghostscript libcups-filters-${version}_${revision} poppler"
-checkdepends="dejavu-fonts-ttf"
-conf_files="/etc/cups/cups-browsed.conf"
+configure_args="--enable-avahi --disable-mutool"
+hostmakedepends="pkg-config ghostscript"
+makedepends="cups-devel libppd-devel libcupsfilters-devel"
+depends="bc ghostscript poppler"
 short_desc="OpenPrinting CUPS Filters"
 maintainer="Orphaned <orphan@voidlinux.org>"
-license="GPL-2.0-or-later, LGPL-2.1-or-later, MIT"
+license="Apache-2.0 WITH custom:GPL2-LGPL2-Exception"
 homepage="https://wiki.linuxfoundation.org/openprinting/cups-filters"
 changelog="https://github.com/OpenPrinting/cups-filters/releases"
 distfiles="https://github.com/OpenPrinting/cups-filters/releases/download/${version}/cups-filters-${version}.tar.xz"
-checksum=270a3752a960368aa99d431fb5d34f4039b2ac943c576d840612d1d8185c9bb9
+checksum=b5152e3dd148ed73835827ac2f219df7cf5808dbf9dbaec2aa0127b44de800d8
 lib32disabled=yes
 
-# https://github.com/OpenPrinting/cups-filters/issues/512
-export CXXFLAGS="-std=c++17"
-
 post_install() {
-	vsv cups-browsed
 	vlicense COPYING
 }
-
-libcups-filters_package() {
-	short_desc+=" - shared library"
-	pkg_install() {
-		vmove "usr/lib/*.so.*"
-	}
-}
-
-libcups-filters-devel_package() {
-	short_desc+=" - development files"
-	depends="libcups-filters-${version}_${revision}"
-	pkg_install() {
-		vmove usr/include
-		vmove "usr/lib/*.so"
-		vmove usr/lib/pkgconfig
-	}
-}
diff --git a/srcpkgs/libcups-filters b/srcpkgs/libcups-filters
index 4f1a5341b31..eff3e3839de 120000
--- a/srcpkgs/libcups-filters
+++ b/srcpkgs/libcups-filters
@@ -1 +1 @@
-cups-filters
\ No newline at end of file
+libcupsfilters
\ No newline at end of file
diff --git a/srcpkgs/libcups-filters-devel b/srcpkgs/libcups-filters-devel
index 4f1a5341b31..eff3e3839de 120000
--- a/srcpkgs/libcups-filters-devel
+++ b/srcpkgs/libcups-filters-devel
@@ -1 +1 @@
-cups-filters
\ No newline at end of file
+libcupsfilters
\ No newline at end of file
diff --git a/srcpkgs/libcupsfilters/template b/srcpkgs/libcupsfilters/template
index a673d869c78..8feffca7914 100644
--- a/srcpkgs/libcupsfilters/template
+++ b/srcpkgs/libcupsfilters/template
@@ -34,3 +34,15 @@ libcupsfilters-devel_package() {
 		vmove "usr/lib/*.a"
 	}
 }
+
+libcups-filters_package() {
+	build_style=meta
+	short_desc+=" (transitional dummy package)"
+	depends="${sourcepkg}>=${version}_${revision}"
+}
+
+libcups-filters-devel_package() {
+	build_style=meta
+	short_desc+=" - development files (transitional dummy package)"
+	depends="${sourcepkg}-devel>=${version}_${revision}"
+}