cups-filters: update to 2.0.0.

The libcups-filters and libcups-filters-devel subpackages are now transitional dummies provided by the libcupsfilters package.
ahesford · Feb 25, 2024 · 4108f9b · 4108f9b
1 parent f1b3ce6
commit 4108f9b
Show file tree

Hide file tree

Showing 6 changed files with 24 additions and 37 deletions.
diff --git 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
@@ -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
@@ -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 <[email protected]>"
-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
@@ -1 +1 @@
-cups-filters
+libcupsfilters
diff --git a/srcpkgs/libcups-filters-devel b/srcpkgs/libcups-filters-devel
@@ -1 +1 @@
-cups-filters
+libcupsfilters
diff --git 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}"
+}
Original file line number	Diff line number	Diff line change
		@@ -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.