Github messages for voidlinux
 help / color / mirror / Atom feed
* [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
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).