* [PR PATCH] cups-filters: update to 2.0.0.
@ 2023-11-06 13:00 mhmdanas
2023-11-06 13:04 ` [PR REVIEW] " mhmdanas
` (16 more replies)
0 siblings, 17 replies; 18+ messages in thread
From: mhmdanas @ 2023-11-06 13:00 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1383 bytes --]
There is a new pull request by mhmdanas against master on the void-packages repository
https://github.com/mhmdanas/void-packages cups-filters-2.0.0
https://github.com/void-linux/void-packages/pull/47087
cups-filters: update to 2.0.0.
- New package: libcupsfilters-2.0.0
- New package: libppd-2.0.0
- cups-filters: update to 2.0.0.
- New package: cups-browsed-2.0.0
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **YES**|**briefly**|**NO**
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/47087.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-cups-filters-2.0.0-47087.patch --]
[-- Type: text/x-diff, Size: 10089 bytes --]
From 500e06429a2ca023acb5a713918aab0ef10ddb54 Mon Sep 17 00:00:00 2001
From: Mohammed Anas <triallax@tutanota.com>
Date: Mon, 6 Nov 2023 12:54:48 +0000
Subject: [PATCH 1/4] New package: libcupsfilters-2.0.0
---
common/shlibs | 2 +-
srcpkgs/libcupsfilters-devel | 1 +
srcpkgs/libcupsfilters/template | 30 ++++++++++++++++++++++++++++++
3 files changed, 32 insertions(+), 1 deletion(-)
create mode 120000 srcpkgs/libcupsfilters-devel
create mode 100644 srcpkgs/libcupsfilters/template
diff --git a/common/shlibs b/common/shlibs
index 9036a675c1ae5..7c62bb21611f4 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1817,7 +1817,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..69909724239c8
--- /dev/null
+++ b/srcpkgs/libcupsfilters/template
@@ -0,0 +1,30 @@
+# 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 <triallax@tutanota.com>"
+license="Apache-2.0"
+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
+
+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 07df0ae3d115611221756cc000b327451e03b9f0 Mon Sep 17 00:00:00 2001
From: Mohammed Anas <triallax@tutanota.com>
Date: Mon, 6 Nov 2023 12:55:42 +0000
Subject: [PATCH 2/4] New package: libppd-2.0.0
---
common/shlibs | 1 +
srcpkgs/libppd-devel | 1 +
srcpkgs/libppd/template | 25 +++++++++++++++++++++++++
3 files changed, 27 insertions(+)
create mode 120000 srcpkgs/libppd-devel
create mode 100644 srcpkgs/libppd/template
diff --git a/common/shlibs b/common/shlibs
index 7c62bb21611f4..af6f48f2f236a 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1818,6 +1818,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..75df046563944
--- /dev/null
+++ b/srcpkgs/libppd/template
@@ -0,0 +1,25 @@
+# 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 <triallax@tutanota.com>"
+license="Apache-2.0"
+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
+
+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 7c757e21e37aeb2c158fd37eeb4ac61dc7128900 Mon Sep 17 00:00:00 2001
From: Mohammed Anas <triallax@tutanota.com>
Date: Mon, 6 Nov 2023 12:56:20 +0000
Subject: [PATCH 3/4] cups-filters: update to 2.0.0.
---
common/shlibs | 1 -
srcpkgs/cups-filters/template | 42 ++++++-----------------------------
srcpkgs/libcups-filters | 1 -
srcpkgs/libcups-filters-devel | 1 -
4 files changed, 7 insertions(+), 38 deletions(-)
delete mode 120000 srcpkgs/libcups-filters
delete mode 120000 srcpkgs/libcups-filters-devel
diff --git a/common/shlibs b/common/shlibs
index af6f48f2f236a..af06a1a59b707 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1819,7 +1819,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..c474b03a4dec1 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 <triallax@tutanota.com>"
-license="GPL-2.0-or-later, LGPL-2.1-or-later, MIT"
+license="Apache-2.0"
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 9caa8ea72072e56d95832020363c9cb3b7c6dac7 Mon Sep 17 00:00:00 2001
From: Mohammed Anas <triallax@tutanota.com>
Date: Mon, 6 Nov 2023 12:56:28 +0000
Subject: [PATCH 4/4] New package: cups-browsed-2.0.0
---
srcpkgs/cups-browsed/files/cups-browsed/run | 3 +++
srcpkgs/cups-browsed/template | 20 ++++++++++++++++++++
2 files changed, 23 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..693a7904f3128
--- /dev/null
+++ b/srcpkgs/cups-browsed/template
@@ -0,0 +1,20 @@
+# 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="t"
+maintainer="Mohammed Anas <triallax@tutanota.com>"
+license="GPL-3.0-or-later"
+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
+}
^ permalink raw reply [flat|nested] 18+ messages in thread
* Re: [PR REVIEW] cups-filters: update to 2.0.0.
2023-11-06 13:00 [PR PATCH] cups-filters: update to 2.0.0 mhmdanas
` (3 preceding siblings ...)
2023-11-06 13:04 ` mhmdanas
@ 2023-11-06 13:04 ` mhmdanas
2023-11-06 13:04 ` mhmdanas
` (11 subsequent siblings)
16 siblings, 0 replies; 18+ messages in thread
From: mhmdanas @ 2023-11-06 13:04 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 170 bytes --]
New review comment by mhmdanas on void-packages repository
https://github.com/void-linux/void-packages/pull/47087#discussion_r1383293039
Comment:
TODO: add description
^ permalink raw reply [flat|nested] 18+ messages in thread
* Re: [PR REVIEW] cups-filters: update to 2.0.0.
2023-11-06 13:00 [PR PATCH] cups-filters: update to 2.0.0 mhmdanas
2023-11-06 13:04 ` [PR REVIEW] " mhmdanas
@ 2023-11-06 13:04 ` mhmdanas
2023-11-06 13:04 ` mhmdanas
` (14 subsequent siblings)
16 siblings, 0 replies; 18+ messages in thread
From: mhmdanas @ 2023-11-06 13:04 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 184 bytes --]
New review comment by mhmdanas on void-packages repository
https://github.com/void-linux/void-packages/pull/47087#discussion_r1383293291
Comment:
Oops, forgot to set correct license
^ permalink raw reply [flat|nested] 18+ messages in thread
* Re: [PR REVIEW] cups-filters: update to 2.0.0.
2023-11-06 13:00 [PR PATCH] cups-filters: update to 2.0.0 mhmdanas
2023-11-06 13:04 ` [PR REVIEW] " mhmdanas
2023-11-06 13:04 ` mhmdanas
@ 2023-11-06 13:04 ` mhmdanas
2023-11-06 13:04 ` mhmdanas
` (13 subsequent siblings)
16 siblings, 0 replies; 18+ messages in thread
From: mhmdanas @ 2023-11-06 13:04 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 353 bytes --]
New review comment by mhmdanas on void-packages repository
https://github.com/void-linux/void-packages/pull/47087#discussion_r1383295218
Comment:
All of the packages updated/added in this PR (and `cups` itself) have some kind of [linking exception](https://github.com/OpenPrinting/cups-filters/blob/master/COPYING), how should I add it to this field?
^ permalink raw reply [flat|nested] 18+ messages in thread
* Re: [PR REVIEW] cups-filters: update to 2.0.0.
2023-11-06 13:00 [PR PATCH] cups-filters: update to 2.0.0 mhmdanas
` (2 preceding siblings ...)
2023-11-06 13:04 ` mhmdanas
@ 2023-11-06 13:04 ` mhmdanas
2023-11-06 13:04 ` mhmdanas
` (12 subsequent siblings)
16 siblings, 0 replies; 18+ messages in thread
From: mhmdanas @ 2023-11-06 13:04 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 168 bytes --]
New review comment by mhmdanas on void-packages repository
https://github.com/void-linux/void-packages/pull/47087#discussion_r1383293475
Comment:
Should use tab here
^ permalink raw reply [flat|nested] 18+ messages in thread
* Re: [PR REVIEW] cups-filters: update to 2.0.0.
2023-11-06 13:00 [PR PATCH] cups-filters: update to 2.0.0 mhmdanas
@ 2023-11-06 13:04 ` mhmdanas
2023-11-06 13:04 ` mhmdanas
` (15 subsequent siblings)
16 siblings, 0 replies; 18+ messages in thread
From: mhmdanas @ 2023-11-06 13:04 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 173 bytes --]
New review comment by mhmdanas on void-packages repository
https://github.com/void-linux/void-packages/pull/47087#discussion_r1383296203
Comment:
TODO: update description
^ permalink raw reply [flat|nested] 18+ messages in thread
* Re: [PR REVIEW] cups-filters: update to 2.0.0.
2023-11-06 13:00 [PR PATCH] cups-filters: update to 2.0.0 mhmdanas
` (4 preceding siblings ...)
2023-11-06 13:04 ` mhmdanas
@ 2023-11-06 13:04 ` mhmdanas
2023-11-10 23:27 ` [PR PATCH] [Updated] " mhmdanas
` (10 subsequent siblings)
16 siblings, 0 replies; 18+ messages in thread
From: mhmdanas @ 2023-11-06 13:04 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 233 bytes --]
New review comment by mhmdanas on void-packages repository
https://github.com/void-linux/void-packages/pull/47087#discussion_r1383295831
Comment:
I'm not quite sure why `lib32disabled=yes` was set here, is there any reason for it?
^ permalink raw reply [flat|nested] 18+ messages in thread
* Re: [PR PATCH] [Updated] cups-filters: update to 2.0.0.
2023-11-06 13:00 [PR PATCH] cups-filters: update to 2.0.0 mhmdanas
` (5 preceding siblings ...)
2023-11-06 13:04 ` mhmdanas
@ 2023-11-10 23:27 ` mhmdanas
2023-11-27 14:03 ` mhmdanas
` (9 subsequent siblings)
16 siblings, 0 replies; 18+ messages in thread
From: mhmdanas @ 2023-11-10 23:27 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1484 bytes --]
There is an updated pull request by mhmdanas against master on the void-packages repository
https://github.com/mhmdanas/void-packages cups-filters-2.0.0
https://github.com/void-linux/void-packages/pull/47087
cups-filters: update to 2.0.0.
- New package: libcupsfilters-2.0.0
- New package: libppd-2.0.0
- cups-filters: update to 2.0.0.
- New package: cups-browsed-2.0.0
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **YES**|**briefly**|**NO**
Still needs some cleanup, otherwise testing is very appreciated.
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/47087.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-cups-filters-2.0.0-47087.patch --]
[-- Type: text/x-diff, Size: 11771 bytes --]
From c39c10690f56cb7092a65b79d66bf219b7291572 Mon Sep 17 00:00:00 2001
From: Mohammed Anas <triallax@tutanota.com>
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 <triallax@tutanota.com>"
+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 <triallax@tutanota.com>
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 <triallax@tutanota.com>"
+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 <triallax@tutanota.com>
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 <triallax@tutanota.com>"
-license="GPL-2.0-or-later, LGPL-2.1-or-later, MIT"
+maintainer="triallax <triallax@tutanota.com>"
+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 <triallax@tutanota.com>
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 <triallax@tutanota.com>"
+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 <triallax@tutanota.com>
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 <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
@@ -63,6 +63,7 @@ post_install() {
vinstall ${FILESDIR}/client.conf 644 etc/cups client.conf
vsv cupsd
+ vlicense NOTICE
}
libcups_package() {
^ permalink raw reply [flat|nested] 18+ messages in thread
* Re: [PR PATCH] [Updated] cups-filters: update to 2.0.0.
2023-11-06 13:00 [PR PATCH] cups-filters: update to 2.0.0 mhmdanas
` (6 preceding siblings ...)
2023-11-10 23:27 ` [PR PATCH] [Updated] " mhmdanas
@ 2023-11-27 14:03 ` mhmdanas
2023-12-05 17:02 ` mhmdanas
` (8 subsequent siblings)
16 siblings, 0 replies; 18+ messages in thread
From: mhmdanas @ 2023-11-27 14:03 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1349 bytes --]
There is an updated pull request by mhmdanas against master on the void-packages repository
https://github.com/mhmdanas/void-packages cups-filters-2.0.0
https://github.com/void-linux/void-packages/pull/47087
cups-filters: update to 2.0.0.
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **YES**|**briefly**|**NO**
Still needs some cleanup, otherwise testing is very appreciated.
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/47087.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-cups-filters-2.0.0-47087.patch --]
[-- Type: text/x-diff, Size: 11788 bytes --]
From 746df8473a25c52a4687da830dfe7b0192f2ec14 Mon Sep 17 00:00:00 2001
From: Mohammed Anas <triallax@tutanota.com>
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 90018a5616f86..c439884dcc519 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1814,7 +1814,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..95a2f95522b3d
--- /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="--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 library"
+maintainer="triallax <triallax@tutanota.com>"
+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 83ee8ee270d8ee9edae3ebb542d9ea0c25bfa6e2 Mon Sep 17 00:00:00 2001
From: Mohammed Anas <triallax@tutanota.com>
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 c439884dcc519..1f4b75d282a94 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1815,6 +1815,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..59f9fdcf96efb
--- /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="Mohammed Anas <triallax@tutanota.com>"
+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 a92e2dab36ce48a31b3419ea997319753e573ff7 Mon Sep 17 00:00:00 2001
From: Mohammed Anas <triallax@tutanota.com>
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 1f4b75d282a94..5aebddfd6025f 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1816,7 +1816,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..cbf10192a61fe 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="--enable-avahi"
+hostmakedepends="pkg-config ghostscript mupdf-tools"
+makedepends="cups-devel libppd-devel libcupsfilters-devel"
short_desc="OpenPrinting CUPS Filters"
-maintainer="Mohammed Anas <triallax@tutanota.com>"
-license="GPL-2.0-or-later, LGPL-2.1-or-later, MIT"
+maintainer="triallax <triallax@tutanota.com>"
+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 f2bce25a77594235112d865fd6b8dd93e3d98982 Mon Sep 17 00:00:00 2001
From: Mohammed Anas <triallax@tutanota.com>
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..55d9fff4d64b1
--- /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="Daemon to browse network for remote CUPS queues and IPP network printers"
+maintainer="triallax <triallax@tutanota.com>"
+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 84942600e80fe7637e5137f8a5856bba6dc71ba5 Mon Sep 17 00:00:00 2001
From: Mohammed Anas <triallax@tutanota.com>
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 <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
@@ -63,6 +63,7 @@ post_install() {
vinstall ${FILESDIR}/client.conf 644 etc/cups client.conf
vsv cupsd
+ vlicense NOTICE
}
libcups_package() {
^ permalink raw reply [flat|nested] 18+ messages in thread
* Re: [PR PATCH] [Updated] cups-filters: update to 2.0.0.
2023-11-06 13:00 [PR PATCH] cups-filters: update to 2.0.0 mhmdanas
` (7 preceding siblings ...)
2023-11-27 14:03 ` mhmdanas
@ 2023-12-05 17:02 ` mhmdanas
2023-12-07 2:32 ` mhmdanas
` (7 subsequent siblings)
16 siblings, 0 replies; 18+ messages in thread
From: mhmdanas @ 2023-12-05 17:02 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1349 bytes --]
There is an updated pull request by mhmdanas against master on the void-packages repository
https://github.com/mhmdanas/void-packages cups-filters-2.0.0
https://github.com/void-linux/void-packages/pull/47087
cups-filters: update to 2.0.0.
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **YES**|**briefly**|**NO**
Still needs some cleanup, otherwise testing is very appreciated.
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/47087.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-cups-filters-2.0.0-47087.patch --]
[-- Type: text/x-diff, Size: 11792 bytes --]
From a877716d3bc59ec72eea2e66f244d20840902953 Mon Sep 17 00:00:00 2001
From: Mohammed Anas <triallax@tutanota.com>
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 1b25a12956eeb..f94391c89b393 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1814,7 +1814,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..95a2f95522b3d
--- /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="--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 library"
+maintainer="triallax <triallax@tutanota.com>"
+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 cd18e5a22628fb09f2fbfdc9e66542b3f90c8c2e Mon Sep 17 00:00:00 2001
From: Mohammed Anas <triallax@tutanota.com>
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 f94391c89b393..485190431ce7c 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1815,6 +1815,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..59f9fdcf96efb
--- /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="Mohammed Anas <triallax@tutanota.com>"
+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 18ef10b5c5baa17e332d193f8b7eec2b7a42dfae Mon Sep 17 00:00:00 2001
From: Mohammed Anas <triallax@tutanota.com>
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-browsed/template | 22 ++++++++++++++++++
srcpkgs/cups-filters/template | 44 +++++++----------------------------
srcpkgs/libcups-filters | 1 -
srcpkgs/libcups-filters-devel | 1 -
5 files changed, 30 insertions(+), 39 deletions(-)
create mode 100644 srcpkgs/cups-browsed/template
delete mode 120000 srcpkgs/libcups-filters
delete mode 120000 srcpkgs/libcups-filters-devel
diff --git a/common/shlibs b/common/shlibs
index 485190431ce7c..248768f3a6d33 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1816,7 +1816,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-browsed/template b/srcpkgs/cups-browsed/template
new file mode 100644
index 0000000000000..d12a2426615e2
--- /dev/null
+++ b/srcpkgs/cups-browsed/template
@@ -0,0 +1,22 @@
+# 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="Daemon to browse network for remote CUPS queues and IPP network printers"
+maintainer="triallax <triallax@tutanota.com>"
+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
+
+post_install() {
+ vsv cups-browsed
+ vlicense COPYING
+}
diff --git a/srcpkgs/cups-filters/template b/srcpkgs/cups-filters/template
index 3f592bdda585a..cbf10192a61fe 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="--enable-avahi"
+hostmakedepends="pkg-config ghostscript mupdf-tools"
+makedepends="cups-devel libppd-devel libcupsfilters-devel"
short_desc="OpenPrinting CUPS Filters"
-maintainer="Mohammed Anas <triallax@tutanota.com>"
-license="GPL-2.0-or-later, LGPL-2.1-or-later, MIT"
+maintainer="triallax <triallax@tutanota.com>"
+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 c3b942c16e23171516226a5b91d54c6d4d0185a4 Mon Sep 17 00:00:00 2001
From: Mohammed Anas <triallax@tutanota.com>
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 +++
1 file changed, 3 insertions(+)
create mode 100644 srcpkgs/cups-browsed/files/cups-browsed/run
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
From 96130521f934d20ff5402981dd752f0814459463 Mon Sep 17 00:00:00 2001
From: Mohammed Anas <triallax@tutanota.com>
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 <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
@@ -63,6 +63,7 @@ post_install() {
vinstall ${FILESDIR}/client.conf 644 etc/cups client.conf
vsv cupsd
+ vlicense NOTICE
}
libcups_package() {
^ permalink raw reply [flat|nested] 18+ messages in thread
* Re: [PR PATCH] [Updated] cups-filters: update to 2.0.0.
2023-11-06 13:00 [PR PATCH] cups-filters: update to 2.0.0 mhmdanas
` (8 preceding siblings ...)
2023-12-05 17:02 ` mhmdanas
@ 2023-12-07 2:32 ` mhmdanas
2023-12-11 15:04 ` mhmdanas
` (6 subsequent siblings)
16 siblings, 0 replies; 18+ messages in thread
From: mhmdanas @ 2023-12-07 2:32 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1349 bytes --]
There is an updated pull request by mhmdanas against master on the void-packages repository
https://github.com/mhmdanas/void-packages cups-filters-2.0.0
https://github.com/void-linux/void-packages/pull/47087
cups-filters: update to 2.0.0.
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **YES**|**briefly**|**NO**
Still needs some cleanup, otherwise testing is very appreciated.
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/47087.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-cups-filters-2.0.0-47087.patch --]
[-- Type: text/x-diff, Size: 12328 bytes --]
From 3d4e1268c5f10626cbe753940afca6a565a4b998 Mon Sep 17 00:00:00 2001
From: Mohammed Anas <triallax@tutanota.com>
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 f7046cbb6c206..a050a20d04330 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1814,7 +1814,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..95a2f95522b3d
--- /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="--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 library"
+maintainer="triallax <triallax@tutanota.com>"
+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 9a14c8e7517679ff16afa1e6cefa8cccad8fcef2 Mon Sep 17 00:00:00 2001
From: Mohammed Anas <triallax@tutanota.com>
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 a050a20d04330..08f4b6ba18843 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1815,6 +1815,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..59f9fdcf96efb
--- /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="Mohammed Anas <triallax@tutanota.com>"
+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 b0e3b3ccbe5a36506b7ccb3eb0caf705eb242a63 Mon Sep 17 00:00:00 2001
From: Mohammed Anas <triallax@tutanota.com>
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 -
srcpkgs/removed-packages/template | 2 ++
5 files changed, 10 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 08f4b6ba18843..d5b8a98825708 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1816,7 +1816,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..cbf10192a61fe 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="--enable-avahi"
+hostmakedepends="pkg-config ghostscript mupdf-tools"
+makedepends="cups-devel libppd-devel libcupsfilters-devel"
short_desc="OpenPrinting CUPS Filters"
-maintainer="Mohammed Anas <triallax@tutanota.com>"
-license="GPL-2.0-or-later, LGPL-2.1-or-later, MIT"
+maintainer="triallax <triallax@tutanota.com>"
+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
diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index 512d1bce049bc..3a76b770b8471 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 bc3d9a3bbc122f1d22403e763ee18879054dacc7 Mon Sep 17 00:00:00 2001
From: Mohammed Anas <triallax@tutanota.com>
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 | 22 +++++++++++++++++++++
2 files changed, 25 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..bcd6c51ca9716
--- /dev/null
+++ b/srcpkgs/cups-browsed/template
@@ -0,0 +1,22 @@
+# 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="triallax <triallax@tutanota.com>"
+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
+
+post_install() {
+ vsv cups-browsed
+ vlicense COPYING
+}
From df2a673fd227f96ca6899b375872b71823af8b99 Mon Sep 17 00:00:00 2001
From: Mohammed Anas <triallax@tutanota.com>
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 <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
@@ -63,6 +63,7 @@ post_install() {
vinstall ${FILESDIR}/client.conf 644 etc/cups client.conf
vsv cupsd
+ vlicense NOTICE
}
libcups_package() {
^ permalink raw reply [flat|nested] 18+ messages in thread
* Re: [PR PATCH] [Updated] cups-filters: update to 2.0.0.
2023-11-06 13:00 [PR PATCH] cups-filters: update to 2.0.0 mhmdanas
` (9 preceding siblings ...)
2023-12-07 2:32 ` mhmdanas
@ 2023-12-11 15:04 ` mhmdanas
2023-12-11 15:09 ` mhmdanas
` (5 subsequent siblings)
16 siblings, 0 replies; 18+ messages in thread
From: mhmdanas @ 2023-12-11 15:04 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1349 bytes --]
There is an updated pull request by mhmdanas against master on the void-packages repository
https://github.com/mhmdanas/void-packages cups-filters-2.0.0
https://github.com/void-linux/void-packages/pull/47087
cups-filters: update to 2.0.0.
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **YES**|**briefly**|**NO**
Still needs some cleanup, otherwise testing is very appreciated.
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/47087.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-cups-filters-2.0.0-47087.patch --]
[-- Type: text/x-diff, Size: 12384 bytes --]
From eb890a7f144da82d933b0c5843579e4051d5eb3f Mon Sep 17 00:00:00 2001
From: Mohammed Anas <triallax@tutanota.com>
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 | 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 863776568fb91..b869a93f91209 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1814,7 +1814,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..7422c7f4376e6
--- /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="triallax <triallax@tutanota.com>"
+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 849449064ba89db420374c0717cc157ed4ee391c Mon Sep 17 00:00:00 2001
From: Mohammed Anas <triallax@tutanota.com>
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 b869a93f91209..dc1038646115e 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1815,6 +1815,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..a9e2501341c94
--- /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="triallax <triallax@tutanota.com>"
+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 e029b9f9de4dc089a419de49431566a649e0e084 Mon Sep 17 00:00:00 2001
From: Mohammed Anas <triallax@tutanota.com>
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 | 45 +++++++------------------------
srcpkgs/libcups-filters | 1 -
srcpkgs/libcups-filters-devel | 1 -
srcpkgs/removed-packages/template | 2 ++
5 files changed, 11 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 dc1038646115e..caa0638583d87 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1816,7 +1816,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..ec16b79aaaa6d 100644
--- a/srcpkgs/cups-filters/template
+++ b/srcpkgs/cups-filters/template
@@ -1,47 +1,20 @@
# 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="--enable-avahi --disable-mutool"
+hostmakedepends="pkg-config ghostscript"
+makedepends="cups-devel libppd-devel libcupsfilters-devel"
+depends="bc ghostscript"
short_desc="OpenPrinting CUPS Filters"
-maintainer="Mohammed Anas <triallax@tutanota.com>"
-license="GPL-2.0-or-later, LGPL-2.1-or-later, MIT"
+maintainer="triallax <triallax@tutanota.com>"
+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
diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index 512d1bce049bc..3a76b770b8471 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 f599c35846407ae9821082d0347ca2afc6b93984 Mon Sep 17 00:00:00 2001
From: Mohammed Anas <triallax@tutanota.com>
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 | 22 +++++++++++++++++++++
2 files changed, 25 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..bcd6c51ca9716
--- /dev/null
+++ b/srcpkgs/cups-browsed/template
@@ -0,0 +1,22 @@
+# 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="triallax <triallax@tutanota.com>"
+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
+
+post_install() {
+ vsv cups-browsed
+ vlicense COPYING
+}
From e99001f43bdcda31613db1500c54132b45d68931 Mon Sep 17 00:00:00 2001
From: Mohammed Anas <triallax@tutanota.com>
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 <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
@@ -63,6 +63,7 @@ post_install() {
vinstall ${FILESDIR}/client.conf 644 etc/cups client.conf
vsv cupsd
+ vlicense NOTICE
}
libcups_package() {
^ permalink raw reply [flat|nested] 18+ messages in thread
* Re: [PR PATCH] [Updated] cups-filters: update to 2.0.0.
2023-11-06 13:00 [PR PATCH] cups-filters: update to 2.0.0 mhmdanas
` (10 preceding siblings ...)
2023-12-11 15:04 ` mhmdanas
@ 2023-12-11 15:09 ` mhmdanas
2023-12-11 15:36 ` [PR REVIEW] " ahesford
` (4 subsequent siblings)
16 siblings, 0 replies; 18+ messages in thread
From: mhmdanas @ 2023-12-11 15:09 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1349 bytes --]
There is an updated pull request by mhmdanas against master on the void-packages repository
https://github.com/mhmdanas/void-packages cups-filters-2.0.0
https://github.com/void-linux/void-packages/pull/47087
cups-filters: update to 2.0.0.
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **YES**|**briefly**|**NO**
Still needs some cleanup, otherwise testing is very appreciated.
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/47087.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-cups-filters-2.0.0-47087.patch --]
[-- Type: text/x-diff, Size: 12392 bytes --]
From eb890a7f144da82d933b0c5843579e4051d5eb3f Mon Sep 17 00:00:00 2001
From: Mohammed Anas <triallax@tutanota.com>
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 | 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 863776568fb91..b869a93f91209 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1814,7 +1814,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..7422c7f4376e6
--- /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="triallax <triallax@tutanota.com>"
+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 849449064ba89db420374c0717cc157ed4ee391c Mon Sep 17 00:00:00 2001
From: Mohammed Anas <triallax@tutanota.com>
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 b869a93f91209..dc1038646115e 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1815,6 +1815,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..a9e2501341c94
--- /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="triallax <triallax@tutanota.com>"
+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 1a1bbfa418d345b8a0c9bb358e5a85fbdd200a7d Mon Sep 17 00:00:00 2001
From: Mohammed Anas <triallax@tutanota.com>
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 | 45 +++++++------------------------
srcpkgs/libcups-filters | 1 -
srcpkgs/libcups-filters-devel | 1 -
srcpkgs/removed-packages/template | 2 ++
5 files changed, 11 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 dc1038646115e..caa0638583d87 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1816,7 +1816,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..aa1edf0cd79c2 100644
--- a/srcpkgs/cups-filters/template
+++ b/srcpkgs/cups-filters/template
@@ -1,47 +1,20 @@
# 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="--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="Mohammed Anas <triallax@tutanota.com>"
-license="GPL-2.0-or-later, LGPL-2.1-or-later, MIT"
+maintainer="triallax <triallax@tutanota.com>"
+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
diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index 512d1bce049bc..3a76b770b8471 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 56293803ee1db7b2a3b6557229fca2c02df776b9 Mon Sep 17 00:00:00 2001
From: Mohammed Anas <triallax@tutanota.com>
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 | 22 +++++++++++++++++++++
2 files changed, 25 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..bcd6c51ca9716
--- /dev/null
+++ b/srcpkgs/cups-browsed/template
@@ -0,0 +1,22 @@
+# 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="triallax <triallax@tutanota.com>"
+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
+
+post_install() {
+ vsv cups-browsed
+ vlicense COPYING
+}
From f1f059ebe8322b5c82e728f8f532e260426ded93 Mon Sep 17 00:00:00 2001
From: Mohammed Anas <triallax@tutanota.com>
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 <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
@@ -63,6 +63,7 @@ post_install() {
vinstall ${FILESDIR}/client.conf 644 etc/cups client.conf
vsv cupsd
+ vlicense NOTICE
}
libcups_package() {
^ permalink raw reply [flat|nested] 18+ messages in thread
* Re: [PR REVIEW] cups-filters: update to 2.0.0.
2023-11-06 13:00 [PR PATCH] cups-filters: update to 2.0.0 mhmdanas
` (11 preceding siblings ...)
2023-12-11 15:09 ` mhmdanas
@ 2023-12-11 15:36 ` ahesford
2023-12-11 16:05 ` mhmdanas
` (3 subsequent siblings)
16 siblings, 0 replies; 18+ messages in thread
From: ahesford @ 2023-12-11 15:36 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 576 bytes --]
New review comment by ahesford on void-packages repository
https://github.com/void-linux/void-packages/pull/47087#discussion_r1422664957
Comment:
The 32bit hook will copy all of the executables that this package installs in `/usr/lib`, then remove them because they don't have the expected suffixes. Keeping `lib32disabled=yes` does two things:
1. Avoids the copy and deletion
2. Ensures that, if the package ever does (or did) ship some pluggable modules for these filters in `/usr/lib`, they wouldn't accidentally trigger the generation of an unnecessary 32bit package.
^ permalink raw reply [flat|nested] 18+ messages in thread
* Re: [PR REVIEW] cups-filters: update to 2.0.0.
2023-11-06 13:00 [PR PATCH] cups-filters: update to 2.0.0 mhmdanas
` (12 preceding siblings ...)
2023-12-11 15:36 ` [PR REVIEW] " ahesford
@ 2023-12-11 16:05 ` mhmdanas
2023-12-16 17:02 ` [PR PATCH] [Updated] " mhmdanas
` (2 subsequent siblings)
16 siblings, 0 replies; 18+ messages in thread
From: mhmdanas @ 2023-12-11 16:05 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 339 bytes --]
New review comment by mhmdanas on void-packages repository
https://github.com/void-linux/void-packages/pull/47087#discussion_r1422732652
Comment:
Right, thanks for the explanation. So from what I understand, I should readd `lib32disabled=yes` for `cups-filters`, is that right? And do I add it for `libppd` and `libcupsfilters` as well?
^ permalink raw reply [flat|nested] 18+ messages in thread
* Re: [PR PATCH] [Updated] cups-filters: update to 2.0.0.
2023-11-06 13:00 [PR PATCH] cups-filters: update to 2.0.0 mhmdanas
` (13 preceding siblings ...)
2023-12-11 16:05 ` mhmdanas
@ 2023-12-16 17:02 ` mhmdanas
2023-12-16 17:07 ` [PR REVIEW] " mhmdanas
2024-02-14 11:01 ` [PR PATCH] [Closed]: " mhmdanas
16 siblings, 0 replies; 18+ messages in thread
From: mhmdanas @ 2023-12-16 17:02 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1477 bytes --]
There is an updated pull request by mhmdanas against master on the void-packages repository
https://github.com/mhmdanas/void-packages cups-filters-2.0.0
https://github.com/void-linux/void-packages/pull/47087
cups-filters: update to 2.0.0.
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **YES**
Testing is very appreciated, I had some initial issues adding my printer to CUPS (I changed my Wi-Fi network recently so I needed to add it again anyway), but it works now and I'm not quite sure if that was a fluke.
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/47087.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-cups-filters-2.0.0-47087.patch --]
[-- Type: text/x-diff, Size: 12841 bytes --]
From ae0be3b1c7891882fdc3f32d2624d62ef5d5588d Mon Sep 17 00:00:00 2001
From: Mohammed Anas <triallax@tutanota.com>
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 | 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 393b7436cefa2..f4f1ab1888a79 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1814,7 +1814,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..7422c7f4376e6
--- /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="triallax <triallax@tutanota.com>"
+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 11059f67115af649e18a98433f8de9bb130e2422 Mon Sep 17 00:00:00 2001
From: Mohammed Anas <triallax@tutanota.com>
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 f4f1ab1888a79..54211ce986201 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1815,6 +1815,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..a9e2501341c94
--- /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="triallax <triallax@tutanota.com>"
+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 ffb794082e115ac4bbcb2f081e0ab02944242d91 Mon Sep 17 00:00:00 2001
From: Mohammed Anas <triallax@tutanota.com>
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/INSTALL.msg | 2 ++
srcpkgs/cups-filters/template | 44 +++++++------------------------
srcpkgs/libcups-filters | 1 -
srcpkgs/libcups-filters-devel | 1 -
srcpkgs/removed-packages/template | 2 ++
6 files changed, 13 insertions(+), 38 deletions(-)
create mode 100644 srcpkgs/cups-filters/INSTALL.msg
delete mode 120000 srcpkgs/libcups-filters
delete mode 120000 srcpkgs/libcups-filters-devel
diff --git a/common/shlibs b/common/shlibs
index 54211ce986201..25ea02c72ff09 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1816,7 +1816,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 3f592bdda585a..9bdfab5f91727 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=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="--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="Mohammed Anas <triallax@tutanota.com>"
-license="GPL-2.0-or-later, LGPL-2.1-or-later, MIT"
+maintainer="triallax <triallax@tutanota.com>"
+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
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
diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index 512d1bce049bc..3a76b770b8471 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 48132449d082807fb8d1104585e5a52c909e1d7b Mon Sep 17 00:00:00 2001
From: Mohammed Anas <triallax@tutanota.com>
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 | 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..408f6218bc38b
--- /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="triallax <triallax@tutanota.com>"
+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 4bed042d2039f7b1e71cdc5c779cdb69f2598544 Mon Sep 17 00:00:00 2001
From: Mohammed Anas <triallax@tutanota.com>
Date: Sat, 16 Dec 2023 17:01:52 +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 <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
@@ -63,6 +63,7 @@ post_install() {
vinstall ${FILESDIR}/client.conf 644 etc/cups client.conf
vsv cupsd
+ vlicense NOTICE
}
libcups_package() {
^ permalink raw reply [flat|nested] 18+ messages in thread
* Re: [PR REVIEW] cups-filters: update to 2.0.0.
2023-11-06 13:00 [PR PATCH] cups-filters: update to 2.0.0 mhmdanas
` (14 preceding siblings ...)
2023-12-16 17:02 ` [PR PATCH] [Updated] " mhmdanas
@ 2023-12-16 17:07 ` mhmdanas
2024-02-14 11:01 ` [PR PATCH] [Closed]: " mhmdanas
16 siblings, 0 replies; 18+ messages in thread
From: mhmdanas @ 2023-12-16 17:07 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 363 bytes --]
New review comment by mhmdanas on void-packages repository
https://github.com/void-linux/void-packages/pull/47087#discussion_r1428863227
Comment:
Never mind, re-reading your comment again, I think I now grok what you were saying. I set `lib32disabled=yes` for `cups-browsed` as well since it has a binary (`/usr/lib/cups/backend/implicitclass`) in `/usr/lib`.
^ permalink raw reply [flat|nested] 18+ messages in thread
* Re: [PR PATCH] [Closed]: cups-filters: update to 2.0.0.
2023-11-06 13:00 [PR PATCH] cups-filters: update to 2.0.0 mhmdanas
` (15 preceding siblings ...)
2023-12-16 17:07 ` [PR REVIEW] " mhmdanas
@ 2024-02-14 11:01 ` mhmdanas
16 siblings, 0 replies; 18+ messages in thread
From: mhmdanas @ 2024-02-14 11:01 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1308 bytes --]
There's a closed pull request on the void-packages repository
cups-filters: update to 2.0.0.
https://github.com/void-linux/void-packages/pull/47087
Description:
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **YES**
Testing is very appreciated, I had some initial issues adding my printer to CUPS (I changed my Wi-Fi network recently so I needed to add it again anyway), but it works now and I'm not quite sure if that was a fluke.
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
^ permalink raw reply [flat|nested] 18+ messages in thread
end of thread, other threads:[~2024-02-14 11:01 UTC | newest]
Thread overview: 18+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2023-11-06 13:00 [PR PATCH] cups-filters: update to 2.0.0 mhmdanas
2023-11-06 13:04 ` [PR REVIEW] " mhmdanas
2023-11-06 13:04 ` mhmdanas
2023-11-06 13:04 ` mhmdanas
2023-11-06 13:04 ` mhmdanas
2023-11-06 13:04 ` mhmdanas
2023-11-06 13:04 ` mhmdanas
2023-11-10 23:27 ` [PR PATCH] [Updated] " mhmdanas
2023-11-27 14:03 ` mhmdanas
2023-12-05 17:02 ` mhmdanas
2023-12-07 2:32 ` mhmdanas
2023-12-11 15:04 ` mhmdanas
2023-12-11 15:09 ` mhmdanas
2023-12-11 15:36 ` [PR REVIEW] " ahesford
2023-12-11 16:05 ` mhmdanas
2023-12-16 17:02 ` [PR PATCH] [Updated] " mhmdanas
2023-12-16 17:07 ` [PR REVIEW] " mhmdanas
2024-02-14 11:01 ` [PR PATCH] [Closed]: " mhmdanas
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).