Github messages for voidlinux
 help / color / mirror / Atom feed
* [PR PATCH] cups-filters: update to 2.0.0, restructure
@ 2024-02-25 16:01 ahesford
  2024-02-25 16:28 ` [PR PATCH] [Updated] " ahesford
                   ` (3 more replies)
  0 siblings, 4 replies; 5+ messages in thread
From: ahesford @ 2024-02-25 16:01 UTC (permalink / raw)
  To: ml

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

There is a new pull request by ahesford against master on the void-packages repository

https://github.com/ahesford/void-packages cupsfilters
https://github.com/void-linux/void-packages/pull/48932

cups-filters: update to 2.0.0, restructure
Picking this up from #47087.

#### Testing the changes
- I tested the changes in this PR: **YES**, and still doing so

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

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

From 4725ab15d60baebe1a5bc40791e634c811a7fc59 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Sun, 25 Feb 2024 10:54:47 -0500
Subject: [PATCH 1/5] New package: libcupsfilters-2.0.0

---
 common/shlibs                   |  2 +-
 srcpkgs/libcupsfilters-devel    |  1 +
 srcpkgs/libcupsfilters/template | 36 +++++++++++++++++++++++++++++++++
 3 files changed, 38 insertions(+), 1 deletion(-)
 create mode 120000 srcpkgs/libcupsfilters-devel
 create mode 100644 srcpkgs/libcupsfilters/template

diff --git a/common/shlibs b/common/shlibs
index 695794c63daed..14296aa1eb16d 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1803,7 +1803,7 @@ libnetfilter_conntrack.so.3 libnetfilter_conntrack-1.0.4_1
 libmsgpack.so.4 msgpack-1.1.0_1
 libmsgpackc.so.2 msgpack-1.1.0_1
 libewf.so.3 libewf-20171104_1
-libcupsfilters.so.1 libcups-filters-1.0.67_3
+libcupsfilters.so.2 libcupsfilters-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
diff --git a/srcpkgs/libcupsfilters-devel b/srcpkgs/libcupsfilters-devel
new file mode 120000
index 0000000000000..eff3e3839ded0
--- /dev/null
+++ b/srcpkgs/libcupsfilters-devel
@@ -0,0 +1 @@
+libcupsfilters
\ No newline at end of file
diff --git a/srcpkgs/libcupsfilters/template b/srcpkgs/libcupsfilters/template
new file mode 100644
index 0000000000000..fc34df9d19c6c
--- /dev/null
+++ b/srcpkgs/libcupsfilters/template
@@ -0,0 +1,36 @@
+# Template file for 'libcupsfilters'
+pkgname=libcupsfilters
+version=2.0.0
+revision=1
+build_style=gnu-configure
+configure_args="--disable-mutool
+ --with-test-font-path=/usr/share/fonts/TTF/DejaVuSans.ttf"
+hostmakedepends="pkg-config ghostscript"
+makedepends="cups-devel poppler-cpp-devel lcms2-devel libqpdf-devel
+ ghostscript-devel libexif-devel libjpeg-turbo-devel libpng-devel tiff-devel
+ fontconfig-devel"
+depends="ghostscript"
+checkdepends="dejavu-fonts-ttf"
+short_desc="OpenPrinting CUPS Filters library"
+maintainer="Andrew J. Hesford <ajh@sideband.org>"
+license="Apache-2.0 WITH custom:GPL2-LGPL2-Exception"
+homepage="https://github.com/OpenPrinting/libcupsfilters"
+changelog="https://raw.githubusercontent.com/OpenPrinting/libcupsfilters/master/CHANGES.md"
+distfiles="https://github.com/OpenPrinting/libcupsfilters/releases/download/${version}/libcupsfilters-${version}.tar.xz"
+checksum=542f2bfbc58136a4743c11dc8c86cee03c9aca705612654e36ac34aa0d9aa601
+
+post_install() {
+	vlicense COPYING
+}
+
+libcupsfilters-devel_package() {
+	depends="${sourcepkg}>=${version}_${revision} cups-devel tiff-devel libpng-devel
+	 libqpdf-devel"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/pkgconfig
+		vmove "usr/lib/*.so"
+		vmove "usr/lib/*.a"
+	}
+}

From f1b3ce694ea2c4ae2591728f5e4ab1298ca9b45c Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Sun, 25 Feb 2024 10:55:18 -0500
Subject: [PATCH 2/5] New package: libppd-2.0.0

---
 common/shlibs           |  1 +
 srcpkgs/libppd-devel    |  1 +
 srcpkgs/libppd/template | 29 +++++++++++++++++++++++++++++
 3 files changed, 31 insertions(+)
 create mode 120000 srcpkgs/libppd-devel
 create mode 100644 srcpkgs/libppd/template

diff --git a/common/shlibs b/common/shlibs
index 14296aa1eb16d..7e02f2fe5d9a8 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1804,6 +1804,7 @@ libmsgpack.so.4 msgpack-1.1.0_1
 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
diff --git a/srcpkgs/libppd-devel b/srcpkgs/libppd-devel
new file mode 120000
index 0000000000000..9eccb5c7de6a9
--- /dev/null
+++ b/srcpkgs/libppd-devel
@@ -0,0 +1 @@
+libppd
\ No newline at end of file
diff --git a/srcpkgs/libppd/template b/srcpkgs/libppd/template
new file mode 100644
index 0000000000000..f650a84dc5e2b
--- /dev/null
+++ b/srcpkgs/libppd/template
@@ -0,0 +1,29 @@
+# Template file for 'libppd'
+pkgname=libppd
+version=2.0.0
+revision=1
+build_style=gnu-configure
+hostmakedepends="pkg-config ghostscript poppler mupdf-tools"
+makedepends="cups-devel libcupsfilters-devel"
+short_desc="OpenPrinting legacy support library for PPD files"
+maintainer="Andrew J. Hesford <ajh@sideband.org>"
+license="Apache-2.0 WITH custom:GPL2-LGPL2-Exception"
+homepage="https://github.com/OpenPrinting/libppd"
+changelog="https://github.com/OpenPrinting/libppd/blob/master/CHANGES.md"
+distfiles="https://github.com/OpenPrinting/libppd/releases/download/${version}/libppd-${version}.tar.xz"
+checksum=882d3c659a336e91559de8f3c76fc26197fe6e5539d9b484a596e29a5a4e0bc8
+
+post_install() {
+	vlicense COPYING
+}
+
+libppd-devel_package() {
+	depends="${sourcepkg}>=${version}_${revision} cups-devel"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/pkgconfig
+		vmove "usr/lib/*.so"
+		vmove "usr/lib/*.a"
+	}
+}

From fad27490a4a08a8865cca3e4e54a1f386583f857 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 3/5] 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/template     | 42 ++++++-------------------------
 srcpkgs/libcups-filters           |  2 +-
 srcpkgs/libcups-filters-devel     |  2 +-
 srcpkgs/libcupsfilters/template   | 12 +++++++++
 srcpkgs/removed-packages/template |  2 ++
 7 files changed, 26 insertions(+), 37 deletions(-)
 create mode 100644 srcpkgs/cups-filters/INSTALL.msg

diff --git a/common/shlibs b/common/shlibs
index 7e02f2fe5d9a8..363b157bd5fc9 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 0000000000000..d549fe9c818e2
--- /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 `cups-browsed` package instead.
diff --git a/srcpkgs/cups-filters/template b/srcpkgs/cups-filters/template
index 5a1c2d4473e86..7ba2e1e7e5b2f 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 4f1a5341b311a..eff3e3839ded0 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 4f1a5341b311a..eff3e3839ded0 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 fc34df9d19c6c..e85278861d468 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}"
+}
diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index e7f36da1c5030..f0cfed0af30d5 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -325,6 +325,8 @@ replaces="
  libbitcoin-system<=3.6.0_10
  libco-devel<=20_1
  libco<=20_1
+ libcups-filters-devel<=1.28.17_3
+ libcups-filters<=1.28.17_3
  libdbusmenu-qt<=0.9.2_4
  libechonest-qt5-devel<=2.3.1_2
  libechonest-qt5<=2.3.1_2

From f4fb6dcffabf712e8feeb2b96f765d60e6324d84 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Sun, 25 Feb 2024 11:00:22 -0500
Subject: [PATCH 4/5] New package: cups-browsed-2.0.0

---
 srcpkgs/cups-browsed/files/cups-browsed/run |  3 +++
 srcpkgs/cups-browsed/template               | 23 +++++++++++++++++++++
 2 files changed, 26 insertions(+)
 create mode 100644 srcpkgs/cups-browsed/files/cups-browsed/run
 create mode 100644 srcpkgs/cups-browsed/template

diff --git a/srcpkgs/cups-browsed/files/cups-browsed/run b/srcpkgs/cups-browsed/files/cups-browsed/run
new file mode 100644
index 0000000000000..2120dce7b0b6d
--- /dev/null
+++ b/srcpkgs/cups-browsed/files/cups-browsed/run
@@ -0,0 +1,3 @@
+#!/bin/sh
+exec 2>&1
+exec cups-browsed
diff --git a/srcpkgs/cups-browsed/template b/srcpkgs/cups-browsed/template
new file mode 100644
index 0000000000000..55a8cc6c02ec1
--- /dev/null
+++ b/srcpkgs/cups-browsed/template
@@ -0,0 +1,23 @@
+# Template file for 'cups-browsed'
+pkgname=cups-browsed
+version=2.0.0
+revision=1
+build_style=gnu-configure
+conf_files="/etc/cups/cups-browsed.conf"
+hostmakedepends="pkg-config glib-devel"
+makedepends="avahi-glib-libs-devel cups-devel libcupsfilters-devel libppd-devel
+ glib-devel"
+short_desc="Daemon to browse network for remote CUPS queues and IPP network printers"
+maintainer="Andrew J. Hesford <ajh@sideband.org>"
+license="Apache-2.0 WITH custom:GPL2-LGPL2-Exception"
+homepage="https://github.com/OpenPrinting/cups-browsed"
+changelog="https://github.com/OpenPrinting/cups-browsed/blob/master/CHANGES.md"
+distfiles="https://github.com/OpenPrinting/cups-browsed/releases/download/${version}/cups-browsed-${version}.tar.xz"
+checksum=3a63793213f302787357f520a09e4aaae47aad67cd030d9b29de20e51649b38b
+make_check=no # hangs
+lib32disabled=yes
+
+post_install() {
+	vsv cups-browsed
+	vlicense COPYING
+}

From 94906d62cc1a598eb09168aa50b5dcd883643a60 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Sun, 25 Feb 2024 10:52:49 -0500
Subject: [PATCH 5/5] cups: update license.

Closes: #47087 [via git-merge-pr]
---
 srcpkgs/cups/template | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/cups/template b/srcpkgs/cups/template
index 9844f83befabf..e6a72d0fb428b 100644
--- a/srcpkgs/cups/template
+++ b/srcpkgs/cups/template
@@ -1,7 +1,7 @@
 # Template file for 'cups'
 pkgname=cups
 version=2.4.7
-revision=4
+revision=5
 build_style=gnu-configure
 make_install_args="BUILDROOT=${DESTDIR}"
 hostmakedepends="gnutls-devel pkg-config
@@ -11,7 +11,7 @@ makedepends="acl-devel gnutls-devel libpaper-devel libusb-devel pam-devel
 depends="xdg-utils"
 short_desc="Common Unix Printing System"
 maintainer="Orphaned <orphan@voidlinux.org>"
-license="Apache-2.0"
+license="Apache-2.0 WITH custom:GPL2-LGPL2-Exception, Zlib"
 homepage="https://github.com/OpenPrinting/cups"
 distfiles="https://github.com/OpenPrinting/cups/releases/download/v${version}/cups-${version}-source.tar.gz"
 checksum=dd54228dd903526428ce7e37961afaed230ad310788141da75cebaa08362cf6c
@@ -67,6 +67,7 @@ post_install() {
 	vinstall ${FILESDIR}/client.conf 644 etc/cups client.conf
 
 	vsv cupsd
+	vlicense NOTICE
 }
 
 libcups_package() {

^ permalink raw reply	[flat|nested] 5+ messages in thread
* Re: [PR PATCH] [Updated] cups-filters: update to 2.0.0, restructure
  2024-02-25 16:01 [PR PATCH] cups-filters: update to 2.0.0, restructure ahesford
@ 2024-02-25 16:28 ` ahesford
  2024-02-25 20:20 ` ahesford
                   ` (2 subsequent siblings)
  3 siblings, 0 replies; 5+ messages in thread
From: ahesford @ 2024-02-25 16:28 UTC (permalink / raw)
  To: ml

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

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

https://github.com/ahesford/void-packages cupsfilters
https://github.com/void-linux/void-packages/pull/48932

cups-filters: update to 2.0.0, restructure
Picking this up from #47087.

#### Testing the changes
- I tested the changes in this PR: **YES**, and still doing so

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

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

From 4725ab15d60baebe1a5bc40791e634c811a7fc59 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Sun, 25 Feb 2024 10:54:47 -0500
Subject: [PATCH 1/5] New package: libcupsfilters-2.0.0

---
 common/shlibs                   |  2 +-
 srcpkgs/libcupsfilters-devel    |  1 +
 srcpkgs/libcupsfilters/template | 36 +++++++++++++++++++++++++++++++++
 3 files changed, 38 insertions(+), 1 deletion(-)
 create mode 120000 srcpkgs/libcupsfilters-devel
 create mode 100644 srcpkgs/libcupsfilters/template

diff --git a/common/shlibs b/common/shlibs
index 695794c63daed5..14296aa1eb16d4 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1803,7 +1803,7 @@ libnetfilter_conntrack.so.3 libnetfilter_conntrack-1.0.4_1
 libmsgpack.so.4 msgpack-1.1.0_1
 libmsgpackc.so.2 msgpack-1.1.0_1
 libewf.so.3 libewf-20171104_1
-libcupsfilters.so.1 libcups-filters-1.0.67_3
+libcupsfilters.so.2 libcupsfilters-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
diff --git a/srcpkgs/libcupsfilters-devel b/srcpkgs/libcupsfilters-devel
new file mode 120000
index 00000000000000..eff3e3839ded0a
--- /dev/null
+++ b/srcpkgs/libcupsfilters-devel
@@ -0,0 +1 @@
+libcupsfilters
\ No newline at end of file
diff --git a/srcpkgs/libcupsfilters/template b/srcpkgs/libcupsfilters/template
new file mode 100644
index 00000000000000..fc34df9d19c6cf
--- /dev/null
+++ b/srcpkgs/libcupsfilters/template
@@ -0,0 +1,36 @@
+# Template file for 'libcupsfilters'
+pkgname=libcupsfilters
+version=2.0.0
+revision=1
+build_style=gnu-configure
+configure_args="--disable-mutool
+ --with-test-font-path=/usr/share/fonts/TTF/DejaVuSans.ttf"
+hostmakedepends="pkg-config ghostscript"
+makedepends="cups-devel poppler-cpp-devel lcms2-devel libqpdf-devel
+ ghostscript-devel libexif-devel libjpeg-turbo-devel libpng-devel tiff-devel
+ fontconfig-devel"
+depends="ghostscript"
+checkdepends="dejavu-fonts-ttf"
+short_desc="OpenPrinting CUPS Filters library"
+maintainer="Andrew J. Hesford <ajh@sideband.org>"
+license="Apache-2.0 WITH custom:GPL2-LGPL2-Exception"
+homepage="https://github.com/OpenPrinting/libcupsfilters"
+changelog="https://raw.githubusercontent.com/OpenPrinting/libcupsfilters/master/CHANGES.md"
+distfiles="https://github.com/OpenPrinting/libcupsfilters/releases/download/${version}/libcupsfilters-${version}.tar.xz"
+checksum=542f2bfbc58136a4743c11dc8c86cee03c9aca705612654e36ac34aa0d9aa601
+
+post_install() {
+	vlicense COPYING
+}
+
+libcupsfilters-devel_package() {
+	depends="${sourcepkg}>=${version}_${revision} cups-devel tiff-devel libpng-devel
+	 libqpdf-devel"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/pkgconfig
+		vmove "usr/lib/*.so"
+		vmove "usr/lib/*.a"
+	}
+}

From f1b3ce694ea2c4ae2591728f5e4ab1298ca9b45c Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Sun, 25 Feb 2024 10:55:18 -0500
Subject: [PATCH 2/5] New package: libppd-2.0.0

---
 common/shlibs           |  1 +
 srcpkgs/libppd-devel    |  1 +
 srcpkgs/libppd/template | 29 +++++++++++++++++++++++++++++
 3 files changed, 31 insertions(+)
 create mode 120000 srcpkgs/libppd-devel
 create mode 100644 srcpkgs/libppd/template

diff --git a/common/shlibs b/common/shlibs
index 14296aa1eb16d4..7e02f2fe5d9a81 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1804,6 +1804,7 @@ libmsgpack.so.4 msgpack-1.1.0_1
 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
diff --git a/srcpkgs/libppd-devel b/srcpkgs/libppd-devel
new file mode 120000
index 00000000000000..9eccb5c7de6a95
--- /dev/null
+++ b/srcpkgs/libppd-devel
@@ -0,0 +1 @@
+libppd
\ No newline at end of file
diff --git a/srcpkgs/libppd/template b/srcpkgs/libppd/template
new file mode 100644
index 00000000000000..f650a84dc5e2b3
--- /dev/null
+++ b/srcpkgs/libppd/template
@@ -0,0 +1,29 @@
+# Template file for 'libppd'
+pkgname=libppd
+version=2.0.0
+revision=1
+build_style=gnu-configure
+hostmakedepends="pkg-config ghostscript poppler mupdf-tools"
+makedepends="cups-devel libcupsfilters-devel"
+short_desc="OpenPrinting legacy support library for PPD files"
+maintainer="Andrew J. Hesford <ajh@sideband.org>"
+license="Apache-2.0 WITH custom:GPL2-LGPL2-Exception"
+homepage="https://github.com/OpenPrinting/libppd"
+changelog="https://github.com/OpenPrinting/libppd/blob/master/CHANGES.md"
+distfiles="https://github.com/OpenPrinting/libppd/releases/download/${version}/libppd-${version}.tar.xz"
+checksum=882d3c659a336e91559de8f3c76fc26197fe6e5539d9b484a596e29a5a4e0bc8
+
+post_install() {
+	vlicense COPYING
+}
+
+libppd-devel_package() {
+	depends="${sourcepkg}>=${version}_${revision} cups-devel"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/pkgconfig
+		vmove "usr/lib/*.so"
+		vmove "usr/lib/*.a"
+	}
+}

From 4108f9bbf43e14b4625f05f165ceb75bf2808327 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 3/5] 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/template    | 42 ++++++--------------------------
 srcpkgs/libcups-filters          |  2 +-
 srcpkgs/libcups-filters-devel    |  2 +-
 srcpkgs/libcupsfilters/template  | 12 +++++++++
 6 files changed, 24 insertions(+), 37 deletions(-)
 create mode 100644 srcpkgs/cups-filters/INSTALL.msg

diff --git a/common/shlibs b/common/shlibs
index 7e02f2fe5d9a81..363b157bd5fc9c 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 00000000000000..d549fe9c818e25
--- /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 `cups-browsed` package instead.
diff --git a/srcpkgs/cups-filters/template b/srcpkgs/cups-filters/template
index 5a1c2d4473e863..7ba2e1e7e5b2f0 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 4f1a5341b311a9..eff3e3839ded0a 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 4f1a5341b311a9..eff3e3839ded0a 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 fc34df9d19c6cf..e85278861d4688 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}"
+}

From 2f1032af98acdabb893852309da3d569ba31b112 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Sun, 25 Feb 2024 11:00:22 -0500
Subject: [PATCH 4/5] New package: cups-browsed-2.0.0

---
 srcpkgs/cups-browsed/files/cups-browsed/run |  3 +++
 srcpkgs/cups-browsed/template               | 23 +++++++++++++++++++++
 2 files changed, 26 insertions(+)
 create mode 100644 srcpkgs/cups-browsed/files/cups-browsed/run
 create mode 100644 srcpkgs/cups-browsed/template

diff --git a/srcpkgs/cups-browsed/files/cups-browsed/run b/srcpkgs/cups-browsed/files/cups-browsed/run
new file mode 100644
index 00000000000000..2120dce7b0b6dc
--- /dev/null
+++ b/srcpkgs/cups-browsed/files/cups-browsed/run
@@ -0,0 +1,3 @@
+#!/bin/sh
+exec 2>&1
+exec cups-browsed
diff --git a/srcpkgs/cups-browsed/template b/srcpkgs/cups-browsed/template
new file mode 100644
index 00000000000000..55a8cc6c02ec1e
--- /dev/null
+++ b/srcpkgs/cups-browsed/template
@@ -0,0 +1,23 @@
+# Template file for 'cups-browsed'
+pkgname=cups-browsed
+version=2.0.0
+revision=1
+build_style=gnu-configure
+conf_files="/etc/cups/cups-browsed.conf"
+hostmakedepends="pkg-config glib-devel"
+makedepends="avahi-glib-libs-devel cups-devel libcupsfilters-devel libppd-devel
+ glib-devel"
+short_desc="Daemon to browse network for remote CUPS queues and IPP network printers"
+maintainer="Andrew J. Hesford <ajh@sideband.org>"
+license="Apache-2.0 WITH custom:GPL2-LGPL2-Exception"
+homepage="https://github.com/OpenPrinting/cups-browsed"
+changelog="https://github.com/OpenPrinting/cups-browsed/blob/master/CHANGES.md"
+distfiles="https://github.com/OpenPrinting/cups-browsed/releases/download/${version}/cups-browsed-${version}.tar.xz"
+checksum=3a63793213f302787357f520a09e4aaae47aad67cd030d9b29de20e51649b38b
+make_check=no # hangs
+lib32disabled=yes
+
+post_install() {
+	vsv cups-browsed
+	vlicense COPYING
+}

From efdf3ed7529c29aa8e6cda0a8ec81dc1cd13fcfb Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Sun, 25 Feb 2024 10:52:49 -0500
Subject: [PATCH 5/5] cups: update license.

Closes: #47087 [via git-merge-pr]
---
 srcpkgs/cups/template | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/cups/template b/srcpkgs/cups/template
index 9844f83befabf2..e6a72d0fb428b5 100644
--- a/srcpkgs/cups/template
+++ b/srcpkgs/cups/template
@@ -1,7 +1,7 @@
 # Template file for 'cups'
 pkgname=cups
 version=2.4.7
-revision=4
+revision=5
 build_style=gnu-configure
 make_install_args="BUILDROOT=${DESTDIR}"
 hostmakedepends="gnutls-devel pkg-config
@@ -11,7 +11,7 @@ makedepends="acl-devel gnutls-devel libpaper-devel libusb-devel pam-devel
 depends="xdg-utils"
 short_desc="Common Unix Printing System"
 maintainer="Orphaned <orphan@voidlinux.org>"
-license="Apache-2.0"
+license="Apache-2.0 WITH custom:GPL2-LGPL2-Exception, Zlib"
 homepage="https://github.com/OpenPrinting/cups"
 distfiles="https://github.com/OpenPrinting/cups/releases/download/v${version}/cups-${version}-source.tar.gz"
 checksum=dd54228dd903526428ce7e37961afaed230ad310788141da75cebaa08362cf6c
@@ -67,6 +67,7 @@ post_install() {
 	vinstall ${FILESDIR}/client.conf 644 etc/cups client.conf
 
 	vsv cupsd
+	vlicense NOTICE
 }
 
 libcups_package() {

^ permalink raw reply	[flat|nested] 5+ messages in thread
* Re: [PR PATCH] [Updated] cups-filters: update to 2.0.0, restructure
  2024-02-25 16:01 [PR PATCH] cups-filters: update to 2.0.0, restructure ahesford
  2024-02-25 16:28 ` [PR PATCH] [Updated] " ahesford
@ 2024-02-25 20:20 ` ahesford
  2024-02-25 20:21 ` ahesford
  2024-02-25 20:43 ` [PR PATCH] [Closed]: " ahesford
  3 siblings, 0 replies; 5+ messages in thread
From: ahesford @ 2024-02-25 20:20 UTC (permalink / raw)
  To: ml

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

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

https://github.com/ahesford/void-packages cupsfilters
https://github.com/void-linux/void-packages/pull/48932

cups-filters: update to 2.0.0, restructure
Picking this up from #47087.

#### Testing the changes
- I tested the changes in this PR: **YES**, and still doing so

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

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

From 4725ab15d60baebe1a5bc40791e634c811a7fc59 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Sun, 25 Feb 2024 10:54:47 -0500
Subject: [PATCH 1/5] New package: libcupsfilters-2.0.0

---
 common/shlibs                   |  2 +-
 srcpkgs/libcupsfilters-devel    |  1 +
 srcpkgs/libcupsfilters/template | 36 +++++++++++++++++++++++++++++++++
 3 files changed, 38 insertions(+), 1 deletion(-)
 create mode 120000 srcpkgs/libcupsfilters-devel
 create mode 100644 srcpkgs/libcupsfilters/template

diff --git a/common/shlibs b/common/shlibs
index 695794c63daed..14296aa1eb16d 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1803,7 +1803,7 @@ libnetfilter_conntrack.so.3 libnetfilter_conntrack-1.0.4_1
 libmsgpack.so.4 msgpack-1.1.0_1
 libmsgpackc.so.2 msgpack-1.1.0_1
 libewf.so.3 libewf-20171104_1
-libcupsfilters.so.1 libcups-filters-1.0.67_3
+libcupsfilters.so.2 libcupsfilters-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
diff --git a/srcpkgs/libcupsfilters-devel b/srcpkgs/libcupsfilters-devel
new file mode 120000
index 0000000000000..eff3e3839ded0
--- /dev/null
+++ b/srcpkgs/libcupsfilters-devel
@@ -0,0 +1 @@
+libcupsfilters
\ No newline at end of file
diff --git a/srcpkgs/libcupsfilters/template b/srcpkgs/libcupsfilters/template
new file mode 100644
index 0000000000000..fc34df9d19c6c
--- /dev/null
+++ b/srcpkgs/libcupsfilters/template
@@ -0,0 +1,36 @@
+# Template file for 'libcupsfilters'
+pkgname=libcupsfilters
+version=2.0.0
+revision=1
+build_style=gnu-configure
+configure_args="--disable-mutool
+ --with-test-font-path=/usr/share/fonts/TTF/DejaVuSans.ttf"
+hostmakedepends="pkg-config ghostscript"
+makedepends="cups-devel poppler-cpp-devel lcms2-devel libqpdf-devel
+ ghostscript-devel libexif-devel libjpeg-turbo-devel libpng-devel tiff-devel
+ fontconfig-devel"
+depends="ghostscript"
+checkdepends="dejavu-fonts-ttf"
+short_desc="OpenPrinting CUPS Filters library"
+maintainer="Andrew J. Hesford <ajh@sideband.org>"
+license="Apache-2.0 WITH custom:GPL2-LGPL2-Exception"
+homepage="https://github.com/OpenPrinting/libcupsfilters"
+changelog="https://raw.githubusercontent.com/OpenPrinting/libcupsfilters/master/CHANGES.md"
+distfiles="https://github.com/OpenPrinting/libcupsfilters/releases/download/${version}/libcupsfilters-${version}.tar.xz"
+checksum=542f2bfbc58136a4743c11dc8c86cee03c9aca705612654e36ac34aa0d9aa601
+
+post_install() {
+	vlicense COPYING
+}
+
+libcupsfilters-devel_package() {
+	depends="${sourcepkg}>=${version}_${revision} cups-devel tiff-devel libpng-devel
+	 libqpdf-devel"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/pkgconfig
+		vmove "usr/lib/*.so"
+		vmove "usr/lib/*.a"
+	}
+}

From f1b3ce694ea2c4ae2591728f5e4ab1298ca9b45c Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Sun, 25 Feb 2024 10:55:18 -0500
Subject: [PATCH 2/5] New package: libppd-2.0.0

---
 common/shlibs           |  1 +
 srcpkgs/libppd-devel    |  1 +
 srcpkgs/libppd/template | 29 +++++++++++++++++++++++++++++
 3 files changed, 31 insertions(+)
 create mode 120000 srcpkgs/libppd-devel
 create mode 100644 srcpkgs/libppd/template

diff --git a/common/shlibs b/common/shlibs
index 14296aa1eb16d..7e02f2fe5d9a8 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1804,6 +1804,7 @@ libmsgpack.so.4 msgpack-1.1.0_1
 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
diff --git a/srcpkgs/libppd-devel b/srcpkgs/libppd-devel
new file mode 120000
index 0000000000000..9eccb5c7de6a9
--- /dev/null
+++ b/srcpkgs/libppd-devel
@@ -0,0 +1 @@
+libppd
\ No newline at end of file
diff --git a/srcpkgs/libppd/template b/srcpkgs/libppd/template
new file mode 100644
index 0000000000000..f650a84dc5e2b
--- /dev/null
+++ b/srcpkgs/libppd/template
@@ -0,0 +1,29 @@
+# Template file for 'libppd'
+pkgname=libppd
+version=2.0.0
+revision=1
+build_style=gnu-configure
+hostmakedepends="pkg-config ghostscript poppler mupdf-tools"
+makedepends="cups-devel libcupsfilters-devel"
+short_desc="OpenPrinting legacy support library for PPD files"
+maintainer="Andrew J. Hesford <ajh@sideband.org>"
+license="Apache-2.0 WITH custom:GPL2-LGPL2-Exception"
+homepage="https://github.com/OpenPrinting/libppd"
+changelog="https://github.com/OpenPrinting/libppd/blob/master/CHANGES.md"
+distfiles="https://github.com/OpenPrinting/libppd/releases/download/${version}/libppd-${version}.tar.xz"
+checksum=882d3c659a336e91559de8f3c76fc26197fe6e5539d9b484a596e29a5a4e0bc8
+
+post_install() {
+	vlicense COPYING
+}
+
+libppd-devel_package() {
+	depends="${sourcepkg}>=${version}_${revision} cups-devel"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/pkgconfig
+		vmove "usr/lib/*.so"
+		vmove "usr/lib/*.a"
+	}
+}

From e07db67c7ceb7ec0b68b24b102d5bab737d1d1e4 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 3/5] 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/template    | 42 ++++++--------------------------
 srcpkgs/libcups-filters          |  2 +-
 srcpkgs/libcups-filters-devel    |  2 +-
 srcpkgs/libcupsfilters/template  | 12 +++++++++
 6 files changed, 24 insertions(+), 37 deletions(-)
 create mode 100644 srcpkgs/cups-filters/INSTALL.msg

diff --git a/common/shlibs b/common/shlibs
index 7e02f2fe5d9a8..363b157bd5fc9 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 0000000000000..31ff3ff63d04f
--- /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/template b/srcpkgs/cups-filters/template
index 5a1c2d4473e86..7ba2e1e7e5b2f 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 4f1a5341b311a..eff3e3839ded0 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 4f1a5341b311a..eff3e3839ded0 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 fc34df9d19c6c..e85278861d468 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}"
+}

From 3df4e1141195b3391ba0e2fa164a1ae3d3481b31 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Sun, 25 Feb 2024 11:00:22 -0500
Subject: [PATCH 4/5] New package: cups-browsed-2.0.0

---
 srcpkgs/cups-browsed/files/cups-browsed/run |  3 +++
 srcpkgs/cups-browsed/template               | 24 +++++++++++++++++++++
 2 files changed, 27 insertions(+)
 create mode 100644 srcpkgs/cups-browsed/files/cups-browsed/run
 create mode 100644 srcpkgs/cups-browsed/template

diff --git a/srcpkgs/cups-browsed/files/cups-browsed/run b/srcpkgs/cups-browsed/files/cups-browsed/run
new file mode 100644
index 0000000000000..2120dce7b0b6d
--- /dev/null
+++ b/srcpkgs/cups-browsed/files/cups-browsed/run
@@ -0,0 +1,3 @@
+#!/bin/sh
+exec 2>&1
+exec cups-browsed
diff --git a/srcpkgs/cups-browsed/template b/srcpkgs/cups-browsed/template
new file mode 100644
index 0000000000000..6b802b6b5e9c8
--- /dev/null
+++ b/srcpkgs/cups-browsed/template
@@ -0,0 +1,24 @@
+# Template file for 'cups-browsed'
+pkgname=cups-browsed
+version=2.0.0
+revision=1
+build_style=gnu-configure
+conf_files="/etc/cups/cups-browsed.conf"
+hostmakedepends="pkg-config glib-devel"
+makedepends="avahi-glib-libs-devel cups-devel libcupsfilters-devel libppd-devel
+ glib-devel"
+short_desc="Daemon to browse network for remote CUPS queues and IPP network printers"
+maintainer="Andrew J. Hesford <ajh@sideband.org>"
+license="Apache-2.0 WITH custom:GPL2-LGPL2-Exception"
+homepage="https://github.com/OpenPrinting/cups-browsed"
+changelog="https://github.com/OpenPrinting/cups-browsed/blob/master/CHANGES.md"
+distfiles="https://github.com/OpenPrinting/cups-browsed/releases/download/${version}/cups-browsed-${version}.tar.xz"
+checksum=3a63793213f302787357f520a09e4aaae47aad67cd030d9b29de20e51649b38b
+make_check=no # hangs
+lib32disabled=yes
+
+post_install() {
+	vsv cups-browsed
+	vlicense COPYING
+	rm -r "${DESTDIR}/etc/rc.d"
+}

From f310b161ef8e070e1df69893c40f4093f4b29538 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Sun, 25 Feb 2024 10:52:49 -0500
Subject: [PATCH 5/5] cups: update license.

Closes: #47087 [via git-merge-pr]
---
 srcpkgs/cups/template | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/cups/template b/srcpkgs/cups/template
index 9844f83befabf..e6a72d0fb428b 100644
--- a/srcpkgs/cups/template
+++ b/srcpkgs/cups/template
@@ -1,7 +1,7 @@
 # Template file for 'cups'
 pkgname=cups
 version=2.4.7
-revision=4
+revision=5
 build_style=gnu-configure
 make_install_args="BUILDROOT=${DESTDIR}"
 hostmakedepends="gnutls-devel pkg-config
@@ -11,7 +11,7 @@ makedepends="acl-devel gnutls-devel libpaper-devel libusb-devel pam-devel
 depends="xdg-utils"
 short_desc="Common Unix Printing System"
 maintainer="Orphaned <orphan@voidlinux.org>"
-license="Apache-2.0"
+license="Apache-2.0 WITH custom:GPL2-LGPL2-Exception, Zlib"
 homepage="https://github.com/OpenPrinting/cups"
 distfiles="https://github.com/OpenPrinting/cups/releases/download/v${version}/cups-${version}-source.tar.gz"
 checksum=dd54228dd903526428ce7e37961afaed230ad310788141da75cebaa08362cf6c
@@ -67,6 +67,7 @@ post_install() {
 	vinstall ${FILESDIR}/client.conf 644 etc/cups client.conf
 
 	vsv cupsd
+	vlicense NOTICE
 }
 
 libcups_package() {

^ permalink raw reply	[flat|nested] 5+ messages in thread
* Re: [PR PATCH] [Updated] cups-filters: update to 2.0.0, restructure
  2024-02-25 16:01 [PR PATCH] cups-filters: update to 2.0.0, restructure ahesford
  2024-02-25 16:28 ` [PR PATCH] [Updated] " ahesford
  2024-02-25 20:20 ` ahesford
@ 2024-02-25 20:21 ` ahesford
  2024-02-25 20:43 ` [PR PATCH] [Closed]: " ahesford
  3 siblings, 0 replies; 5+ messages in thread
From: ahesford @ 2024-02-25 20:21 UTC (permalink / raw)
  To: ml

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

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

https://github.com/ahesford/void-packages cupsfilters
https://github.com/void-linux/void-packages/pull/48932

cups-filters: update to 2.0.0, restructure
Picking this up from #47087.

#### Testing the changes
- I tested the changes in this PR: **YES**, and still doing so

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

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

From 4725ab15d60baebe1a5bc40791e634c811a7fc59 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Sun, 25 Feb 2024 10:54:47 -0500
Subject: [PATCH 1/5] New package: libcupsfilters-2.0.0

---
 common/shlibs                   |  2 +-
 srcpkgs/libcupsfilters-devel    |  1 +
 srcpkgs/libcupsfilters/template | 36 +++++++++++++++++++++++++++++++++
 3 files changed, 38 insertions(+), 1 deletion(-)
 create mode 120000 srcpkgs/libcupsfilters-devel
 create mode 100644 srcpkgs/libcupsfilters/template

diff --git a/common/shlibs b/common/shlibs
index 695794c63daed5..14296aa1eb16d4 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1803,7 +1803,7 @@ libnetfilter_conntrack.so.3 libnetfilter_conntrack-1.0.4_1
 libmsgpack.so.4 msgpack-1.1.0_1
 libmsgpackc.so.2 msgpack-1.1.0_1
 libewf.so.3 libewf-20171104_1
-libcupsfilters.so.1 libcups-filters-1.0.67_3
+libcupsfilters.so.2 libcupsfilters-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
diff --git a/srcpkgs/libcupsfilters-devel b/srcpkgs/libcupsfilters-devel
new file mode 120000
index 00000000000000..eff3e3839ded0a
--- /dev/null
+++ b/srcpkgs/libcupsfilters-devel
@@ -0,0 +1 @@
+libcupsfilters
\ No newline at end of file
diff --git a/srcpkgs/libcupsfilters/template b/srcpkgs/libcupsfilters/template
new file mode 100644
index 00000000000000..fc34df9d19c6cf
--- /dev/null
+++ b/srcpkgs/libcupsfilters/template
@@ -0,0 +1,36 @@
+# Template file for 'libcupsfilters'
+pkgname=libcupsfilters
+version=2.0.0
+revision=1
+build_style=gnu-configure
+configure_args="--disable-mutool
+ --with-test-font-path=/usr/share/fonts/TTF/DejaVuSans.ttf"
+hostmakedepends="pkg-config ghostscript"
+makedepends="cups-devel poppler-cpp-devel lcms2-devel libqpdf-devel
+ ghostscript-devel libexif-devel libjpeg-turbo-devel libpng-devel tiff-devel
+ fontconfig-devel"
+depends="ghostscript"
+checkdepends="dejavu-fonts-ttf"
+short_desc="OpenPrinting CUPS Filters library"
+maintainer="Andrew J. Hesford <ajh@sideband.org>"
+license="Apache-2.0 WITH custom:GPL2-LGPL2-Exception"
+homepage="https://github.com/OpenPrinting/libcupsfilters"
+changelog="https://raw.githubusercontent.com/OpenPrinting/libcupsfilters/master/CHANGES.md"
+distfiles="https://github.com/OpenPrinting/libcupsfilters/releases/download/${version}/libcupsfilters-${version}.tar.xz"
+checksum=542f2bfbc58136a4743c11dc8c86cee03c9aca705612654e36ac34aa0d9aa601
+
+post_install() {
+	vlicense COPYING
+}
+
+libcupsfilters-devel_package() {
+	depends="${sourcepkg}>=${version}_${revision} cups-devel tiff-devel libpng-devel
+	 libqpdf-devel"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/pkgconfig
+		vmove "usr/lib/*.so"
+		vmove "usr/lib/*.a"
+	}
+}

From f1b3ce694ea2c4ae2591728f5e4ab1298ca9b45c Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Sun, 25 Feb 2024 10:55:18 -0500
Subject: [PATCH 2/5] New package: libppd-2.0.0

---
 common/shlibs           |  1 +
 srcpkgs/libppd-devel    |  1 +
 srcpkgs/libppd/template | 29 +++++++++++++++++++++++++++++
 3 files changed, 31 insertions(+)
 create mode 120000 srcpkgs/libppd-devel
 create mode 100644 srcpkgs/libppd/template

diff --git a/common/shlibs b/common/shlibs
index 14296aa1eb16d4..7e02f2fe5d9a81 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1804,6 +1804,7 @@ libmsgpack.so.4 msgpack-1.1.0_1
 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
diff --git a/srcpkgs/libppd-devel b/srcpkgs/libppd-devel
new file mode 120000
index 00000000000000..9eccb5c7de6a95
--- /dev/null
+++ b/srcpkgs/libppd-devel
@@ -0,0 +1 @@
+libppd
\ No newline at end of file
diff --git a/srcpkgs/libppd/template b/srcpkgs/libppd/template
new file mode 100644
index 00000000000000..f650a84dc5e2b3
--- /dev/null
+++ b/srcpkgs/libppd/template
@@ -0,0 +1,29 @@
+# Template file for 'libppd'
+pkgname=libppd
+version=2.0.0
+revision=1
+build_style=gnu-configure
+hostmakedepends="pkg-config ghostscript poppler mupdf-tools"
+makedepends="cups-devel libcupsfilters-devel"
+short_desc="OpenPrinting legacy support library for PPD files"
+maintainer="Andrew J. Hesford <ajh@sideband.org>"
+license="Apache-2.0 WITH custom:GPL2-LGPL2-Exception"
+homepage="https://github.com/OpenPrinting/libppd"
+changelog="https://github.com/OpenPrinting/libppd/blob/master/CHANGES.md"
+distfiles="https://github.com/OpenPrinting/libppd/releases/download/${version}/libppd-${version}.tar.xz"
+checksum=882d3c659a336e91559de8f3c76fc26197fe6e5539d9b484a596e29a5a4e0bc8
+
+post_install() {
+	vlicense COPYING
+}
+
+libppd-devel_package() {
+	depends="${sourcepkg}>=${version}_${revision} cups-devel"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/pkgconfig
+		vmove "usr/lib/*.so"
+		vmove "usr/lib/*.a"
+	}
+}

From e07db67c7ceb7ec0b68b24b102d5bab737d1d1e4 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 3/5] 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/template    | 42 ++++++--------------------------
 srcpkgs/libcups-filters          |  2 +-
 srcpkgs/libcups-filters-devel    |  2 +-
 srcpkgs/libcupsfilters/template  | 12 +++++++++
 6 files changed, 24 insertions(+), 37 deletions(-)
 create mode 100644 srcpkgs/cups-filters/INSTALL.msg

diff --git a/common/shlibs b/common/shlibs
index 7e02f2fe5d9a81..363b157bd5fc9c 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 00000000000000..31ff3ff63d04fa
--- /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/template b/srcpkgs/cups-filters/template
index 5a1c2d4473e863..7ba2e1e7e5b2f0 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 4f1a5341b311a9..eff3e3839ded0a 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 4f1a5341b311a9..eff3e3839ded0a 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 fc34df9d19c6cf..e85278861d4688 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}"
+}

From 3df4e1141195b3391ba0e2fa164a1ae3d3481b31 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Sun, 25 Feb 2024 11:00:22 -0500
Subject: [PATCH 4/5] New package: cups-browsed-2.0.0

---
 srcpkgs/cups-browsed/files/cups-browsed/run |  3 +++
 srcpkgs/cups-browsed/template               | 24 +++++++++++++++++++++
 2 files changed, 27 insertions(+)
 create mode 100644 srcpkgs/cups-browsed/files/cups-browsed/run
 create mode 100644 srcpkgs/cups-browsed/template

diff --git a/srcpkgs/cups-browsed/files/cups-browsed/run b/srcpkgs/cups-browsed/files/cups-browsed/run
new file mode 100644
index 00000000000000..2120dce7b0b6dc
--- /dev/null
+++ b/srcpkgs/cups-browsed/files/cups-browsed/run
@@ -0,0 +1,3 @@
+#!/bin/sh
+exec 2>&1
+exec cups-browsed
diff --git a/srcpkgs/cups-browsed/template b/srcpkgs/cups-browsed/template
new file mode 100644
index 00000000000000..6b802b6b5e9c84
--- /dev/null
+++ b/srcpkgs/cups-browsed/template
@@ -0,0 +1,24 @@
+# Template file for 'cups-browsed'
+pkgname=cups-browsed
+version=2.0.0
+revision=1
+build_style=gnu-configure
+conf_files="/etc/cups/cups-browsed.conf"
+hostmakedepends="pkg-config glib-devel"
+makedepends="avahi-glib-libs-devel cups-devel libcupsfilters-devel libppd-devel
+ glib-devel"
+short_desc="Daemon to browse network for remote CUPS queues and IPP network printers"
+maintainer="Andrew J. Hesford <ajh@sideband.org>"
+license="Apache-2.0 WITH custom:GPL2-LGPL2-Exception"
+homepage="https://github.com/OpenPrinting/cups-browsed"
+changelog="https://github.com/OpenPrinting/cups-browsed/blob/master/CHANGES.md"
+distfiles="https://github.com/OpenPrinting/cups-browsed/releases/download/${version}/cups-browsed-${version}.tar.xz"
+checksum=3a63793213f302787357f520a09e4aaae47aad67cd030d9b29de20e51649b38b
+make_check=no # hangs
+lib32disabled=yes
+
+post_install() {
+	vsv cups-browsed
+	vlicense COPYING
+	rm -r "${DESTDIR}/etc/rc.d"
+}

From 4e979dd830321fa5eb4d3ad777eb104532a0b41f Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Sun, 25 Feb 2024 10:52:49 -0500
Subject: [PATCH 5/5] cups: update license

---
 srcpkgs/cups/template | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/cups/template b/srcpkgs/cups/template
index 9844f83befabf2..e6a72d0fb428b5 100644
--- a/srcpkgs/cups/template
+++ b/srcpkgs/cups/template
@@ -1,7 +1,7 @@
 # Template file for 'cups'
 pkgname=cups
 version=2.4.7
-revision=4
+revision=5
 build_style=gnu-configure
 make_install_args="BUILDROOT=${DESTDIR}"
 hostmakedepends="gnutls-devel pkg-config
@@ -11,7 +11,7 @@ makedepends="acl-devel gnutls-devel libpaper-devel libusb-devel pam-devel
 depends="xdg-utils"
 short_desc="Common Unix Printing System"
 maintainer="Orphaned <orphan@voidlinux.org>"
-license="Apache-2.0"
+license="Apache-2.0 WITH custom:GPL2-LGPL2-Exception, Zlib"
 homepage="https://github.com/OpenPrinting/cups"
 distfiles="https://github.com/OpenPrinting/cups/releases/download/v${version}/cups-${version}-source.tar.gz"
 checksum=dd54228dd903526428ce7e37961afaed230ad310788141da75cebaa08362cf6c
@@ -67,6 +67,7 @@ post_install() {
 	vinstall ${FILESDIR}/client.conf 644 etc/cups client.conf
 
 	vsv cupsd
+	vlicense NOTICE
 }
 
 libcups_package() {

^ permalink raw reply	[flat|nested] 5+ messages in thread
* Re: [PR PATCH] [Closed]: cups-filters: update to 2.0.0, restructure
  2024-02-25 16:01 [PR PATCH] cups-filters: update to 2.0.0, restructure ahesford
                   ` (2 preceding siblings ...)
  2024-02-25 20:21 ` ahesford
@ 2024-02-25 20:43 ` ahesford
  3 siblings, 0 replies; 5+ messages in thread
From: ahesford @ 2024-02-25 20:43 UTC (permalink / raw)
  To: ml

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

There's a closed pull request on the void-packages repository

cups-filters: update to 2.0.0, restructure
https://github.com/void-linux/void-packages/pull/48932

Description:
Picking this up from #47087.

#### Testing the changes
- I tested the changes in this PR: **YES**, and still doing so

^ permalink raw reply	[flat|nested] 5+ messages in thread
end of thread, other threads:[~2024-02-25 20:43 UTC | newest]

Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2024-02-25 16:01 [PR PATCH] cups-filters: update to 2.0.0, restructure ahesford
2024-02-25 16:28 ` [PR PATCH] [Updated] " ahesford
2024-02-25 20:20 ` ahesford
2024-02-25 20:21 ` ahesford
2024-02-25 20:43 ` [PR PATCH] [Closed]: " ahesford

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).