From c39c10690f56cb7092a65b79d66bf219b7291572 Mon Sep 17 00:00:00 2001 From: Mohammed Anas Date: Mon, 6 Nov 2023 12:54:48 +0000 Subject: [PATCH 1/5] New package: libcupsfilters-2.0.0 --- common/shlibs | 2 +- srcpkgs/libcupsfilters-devel | 1 + srcpkgs/libcupsfilters/template | 34 +++++++++++++++++++++++++++++++++ 3 files changed, 36 insertions(+), 1 deletion(-) create mode 120000 srcpkgs/libcupsfilters-devel create mode 100644 srcpkgs/libcupsfilters/template diff --git a/common/shlibs b/common/shlibs index 7e9cee83f8417..9ccca2908c482 100644 --- a/common/shlibs +++ b/common/shlibs @@ -1815,7 +1815,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..f444d913e4c64 --- /dev/null +++ b/srcpkgs/libcupsfilters/template @@ -0,0 +1,34 @@ +# Template file for 'libcupsfilters' +pkgname=libcupsfilters +version=2.0.0 +revision=1 +build_style=gnu-configure +configure_args="--disable-static + --with-test-font-path=/usr/share/fonts/TTF/DejaVuSans.ttf" +hostmakedepends="pkg-config ghostscript mupdf-tools" +makedepends="cups-devel poppler-cpp-devel lcms2-devel libqpdf-devel + ghostscript-devel libexif-devel libjpeg-turbo-devel libpng-devel tiff-devel + fontconfig-devel" +checkdepends="dejavu-fonts-ttf" +short_desc="OpenPrinting CUPS Filters" +maintainer="triallax " +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" + } +} From 3b143aed90da3da0911b4f8246177b508ddb349d Mon Sep 17 00:00:00 2001 From: Mohammed Anas Date: Mon, 6 Nov 2023 12:55:42 +0000 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 9ccca2908c482..fd669c6fe27a8 100644 --- a/common/shlibs +++ b/common/shlibs @@ -1816,6 +1816,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..2d13b8932967f --- /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 +configure_args="--disable-static" +hostmakedepends="pkg-config ghostscript poppler mupdf-tools" +makedepends="cups-devel libcupsfilters-devel" +short_desc="TODO" +maintainer="Mohammed Anas " +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" + } +} From 79189450b774330c24fb35399720771234a20646 Mon Sep 17 00:00:00 2001 From: Mohammed Anas Date: Mon, 6 Nov 2023 12:56:20 +0000 Subject: [PATCH 3/5] cups-filters: update to 2.0.0. --- common/shlibs | 1 - srcpkgs/cups-filters/template | 44 +++++++---------------------------- srcpkgs/libcups-filters | 1 - srcpkgs/libcups-filters-devel | 1 - 4 files changed, 8 insertions(+), 39 deletions(-) delete mode 120000 srcpkgs/libcups-filters delete mode 120000 srcpkgs/libcups-filters-devel diff --git a/common/shlibs b/common/shlibs index fd669c6fe27a8..276e02050fe0d 100644 --- a/common/shlibs +++ b/common/shlibs @@ -1817,7 +1817,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/template b/srcpkgs/cups-filters/template index 3f592bdda585a..edd862895142b 100644 --- a/srcpkgs/cups-filters/template +++ b/srcpkgs/cups-filters/template @@ -1,47 +1,19 @@ # Template file for 'cups-filters' pkgname=cups-filters -version=1.28.17 -revision=3 +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="--disable-static --enable-avahi" +hostmakedepends="pkg-config ghostscript mupdf-tools" +makedepends="cups-devel libppd-devel libcupsfilters-devel" short_desc="OpenPrinting CUPS Filters" -maintainer="Mohammed Anas " -license="GPL-2.0-or-later, LGPL-2.1-or-later, MIT" +maintainer="triallax " +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 -lib32disabled=yes - -# https://github.com/OpenPrinting/cups-filters/issues/512 -export CXXFLAGS="-std=c++17" +checksum=b5152e3dd148ed73835827ac2f219df7cf5808dbf9dbaec2aa0127b44de800d8 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 deleted file mode 120000 index 4f1a5341b311a..0000000000000 --- a/srcpkgs/libcups-filters +++ /dev/null @@ -1 +0,0 @@ -cups-filters \ No newline at end of file diff --git a/srcpkgs/libcups-filters-devel b/srcpkgs/libcups-filters-devel deleted file mode 120000 index 4f1a5341b311a..0000000000000 --- a/srcpkgs/libcups-filters-devel +++ /dev/null @@ -1 +0,0 @@ -cups-filters \ No newline at end of file From a5dc2482a26dc0d781f93e497f263f157bca00f3 Mon Sep 17 00:00:00 2001 From: Mohammed Anas Date: Mon, 6 Nov 2023 12:56:28 +0000 Subject: [PATCH 4/5] New package: cups-browsed-2.0.0 --- srcpkgs/cups-browsed/files/cups-browsed/run | 3 +++ srcpkgs/cups-browsed/template | 21 +++++++++++++++++++++ 2 files changed, 24 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..8c0a2517e4cca --- /dev/null +++ b/srcpkgs/cups-browsed/template @@ -0,0 +1,21 @@ +# 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" +makedepends="avahi-glib-libs-devel cups-devel libcupsfilters-devel libppd-devel + glib-devel" +short_desc="Helper daemon to browse the network for remote CUPS queues and IPP network printers" +maintainer="triallax " +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 + +post_install() { + vsv cups-browsed + vlicense COPYING +} From 7c7322b3057cb567e58dc8fbc06f416fc14de695 Mon Sep 17 00:00:00 2001 From: Mohammed Anas Date: Fri, 10 Nov 2023 23:17:23 +0000 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 510ef3dcbba4a..05db64d7d8071 100644 --- a/srcpkgs/cups/template +++ b/srcpkgs/cups/template @@ -1,7 +1,7 @@ # Template file for 'cups' pkgname=cups version=2.4.7 -revision=2 +revision=3 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 " -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 @@ -63,6 +63,7 @@ post_install() { vinstall ${FILESDIR}/client.conf 644 etc/cups client.conf vsv cupsd + vlicense NOTICE } libcups_package() {