Compare commits

...

2 Commits
c10s ... c10

Author SHA1 Message Date
d08a795900 import UBI libcupsfilters-2.0.0-11.el10 2025-11-11 21:54:46 +00:00
657efa9357 import UBI libcupsfilters-2.0.0-10.el10 2025-05-14 17:41:44 +00:00
8 changed files with 89 additions and 78 deletions

View File

@ -1 +0,0 @@
1

6
.gitignore vendored
View File

@ -1,5 +1 @@
/libcupsfilters-2.0b3.tar.gz
/libcupsfilters-2.0b4.tar.gz
/libcupsfilters-2.0rc1.tar.gz
/libcupsfilters-2.0rc2.tar.gz
/libcupsfilters-2.0.0.tar.gz
libcupsfilters-2.0.0.tar.gz

View File

@ -0,0 +1,80 @@
diff --git a/Makefile.am b/Makefile.am
index b338086..fb69410 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -21,7 +21,9 @@ EXTRA_DIST = \
$(doc_DATA) \
autogen.sh \
config.rpath \
- libcupsfilters.pc.in
+ libcupsfilters.pc.in \
+ pdf.utf-8.heavy.in \
+ pdf.utf-8.simple.in
EXTRA_DIST += \
data/makePDFfromPS.sh \
diff --git a/charset/pdf.utf-8.heavy b/charset/pdf.utf-8.heavy.in
similarity index 98%
rename from charset/pdf.utf-8.heavy
rename to charset/pdf.utf-8.heavy.in
index a610af0..6815388 100644
--- a/charset/pdf.utf-8.heavy
+++ b/charset/pdf.utf-8.heavy.in
@@ -36,5 +36,5 @@ charset utf8
1E00 1EFF ltor single CourierNew CourierNew:bold CourierNew:italic CourierNew:bold:italic
2000 21FF ltor single DejaVuSansMono DejaVuSansMono:bold DejaVuSansMono:oblique DejaVuSansMono:bold:oblique
2200 23FF ltor single Symbol
-3000 9FFF ltor double ARPLUMingCN
+3000 9FFF ltor double @CJKFONTS@
#0400 04FF ltor single FreeMono FreeMono:bold FreeMono:oblique FreeMono:bold:oblique
diff --git a/charset/pdf.utf-8.simple b/charset/pdf.utf-8.simple.in
similarity index 97%
rename from charset/pdf.utf-8.simple
rename to charset/pdf.utf-8.simple.in
index f7d3adf..d66aa29 100644
--- a/charset/pdf.utf-8.simple
+++ b/charset/pdf.utf-8.simple.in
@@ -30,4 +30,4 @@ charset utf8
0000 04FF ltor single monospace monospace:bold monospace:oblique monospace:bold:oblique
0500 05FF rtol single monospace
-3000 9FFF ltor double ARPLUmingCN
+3000 9FFF ltor double @CJKFONTS@
diff --git a/configure.ac b/configure.ac
index bdba43d..fa53548 100644
--- a/configure.ac
+++ b/configure.ac
@@ -408,12 +408,26 @@ CXXFLAGS="$CXXFLAGS -D_GNU_SOURCE -DPOINTERHOLDER_TRANSITION=0"
# See /usr/include/qpdf/PointerHolder.hh
CXXFLAGS="$CXXFLAGS -std=c++17"
+# =========
+# CJK FONTS
+# =========
+AC_ARG_WITH([cjk-fonts],
+ [AS_HELP_STRING([--with-cjk-fonts=value], [Set font name for CJK fonts (default: ARPLUmingCN).])],
+ [AS_IF([test "x$withval" != "x" -a "x$withval" != "xyes" -a "x$withval" != "xno"],
+ [CJKFONTS="$withval"],
+ [CJKFONTS="ARPLUmingCN"])],
+ [CJKFONTS="ARPLUmingCN"])
+
+AC_SUBST([CJKFONTS])
+
# =====================
# Prepare all .in files
# =====================
AC_CONFIG_FILES([
libcupsfilters.pc
Makefile
+ charset/pdf.utf-8.heavy
+ charset/pdf.utf-8.simple
])
AC_OUTPUT
@@ -442,5 +456,6 @@ Build configuration:
dbus: ${enable_dbus}
werror: ${enable_werror}
test-font: ${with_test_font_path}
+ cjk-fonts: ${CJKFONTS}
==============================================================================
])

View File

@ -1,3 +0,0 @@
# libcupsfilters
The libcupsfilters package

1
ci.fmf
View File

@ -1 +0,0 @@
resultsdb-testcase: separate

View File

@ -1,25 +0,0 @@
--- !Policy
product_versions:
- fedora-*
decision_context: bodhi_update_push_testing
subject_type: koji_build
rules:
- !PassingTestCaseRule {test_case_name: fedora-ci.koji-build./plans/tier1-public.functional}
#Rawhide
--- !Policy
product_versions:
- fedora-*
decision_context: bodhi_update_push_stable
subject_type: koji_build
rules:
- !PassingTestCaseRule {test_case_name: fedora-ci.koji-build./plans/tier1-public.functional}
#gating rhel
--- !Policy
product_versions:
- rhel-*
decision_context: osci_compose_gate
rules:
- !PassingTestCaseRule {test_case_name: osci.brew-build./plans/tier1-internal.functional}
- !PassingTestCaseRule {test_case_name: osci.brew-build./plans/tier1-public.functional}

View File

@ -4,7 +4,7 @@
Name: libcupsfilters
Epoch: 1
Version: 2.0.0
Release: 10%{?dist}
Release: 11%{?dist}
Summary: Library for developing printing filters
# the CUPS exception text is the same as LLVM exception, so using that name with
# agreement from legal team
@ -26,6 +26,8 @@ Patch003: 0001-cfgetprinterattributes5-validate-response-attributes.patch
Patch004: 0001-Fix-issues-reported-by-OpenScanHub-79.patch
# https://github.com/OpenPrinting/libcupsfilters/pull/80
Patch005: 0001-bannertopdf.c-Fix-segfault-when-printing-banners-tes.patch
# RHEL-68430 texttopdf omits Chinese characters when creating PDF documents
Patch0006: 0001-configure.ac-Make-CJK-fonts-name-configurable.patch
# for generating configure and Makefile scripts in autogen.h
@ -127,7 +129,8 @@ Development files for OpenPrinting cupsfilters library.
--disable-rpath\
--disable-silent-rules\
--disable-static\
--enable-dbus
--enable-dbus \
--with-cjk-fonts=droidsansfallback
# fix rpmlint error about linking to libraries, but not actually using their functions
# it happens when the required libraries uses pkgconfig - pkgconfig file doesn't know
@ -203,6 +206,9 @@ rm -f %{buildroot}%{_pkgdocdir}/{LICENSE,COPYING,NOTICE}
%changelog
* Mon Aug 04 2025 Zdenek Dohnal <zdohnal@redhat.com> - 1:2.0.0-11
- RHEL-68430 texttopdf omits Chinese characters when creating PDF documents
* Wed Feb 12 2025 Zdenek Dohnal <zdohnal@redhat.com> - 1:2.0.0-10
- RHEL-71935 Fix several important issues reported by OSH

View File

@ -1,41 +0,0 @@
/tier1-internal:
plan:
import:
url: https://src.fedoraproject.org/tests/libcupsfilters.git
name: /plans/tier1/internal
/tier1-public:
plan:
import:
url: https://src.fedoraproject.org/tests/libcupsfilters.git
name: /plans/tier1/public
/tier2-tier3-internal:
plan:
import:
url: https://src.fedoraproject.org/tests/libcupsfilters.git
name: /plans/tier2-tier3/internal
/tier2-tier3-public:
plan:
import:
url: https://src.fedoraproject.org/tests/libcupsfilters.git
name: /plans/tier2-tier3/public
/others-internal:
plan:
import:
url: https://src.fedoraproject.org/tests/libcupsfilters.git
name: /plans/others/internal
/others-public:
plan:
import:
url: https://src.fedoraproject.org/tests/libcupsfilters.git
name: /plans/others/public
/fips-internal:
plan:
import:
url: https://src.fedoraproject.org/tests/cups-filters.git
name: /plans/others/fips