1.0.30: CUPS browsing and broadcasting in cups-browsed
This commit is contained in:
Jiri Popelka
parent
12f499fa58
commit
16c7d32951
1
.gitignore
vendored
1
.gitignore
vendored
@ -5,3 +5,4 @@
|
||||
/cups-filters-1.0.25.tar.xz
|
||||
/cups-filters-1.0.28.tar.xz
|
||||
/cups-filters-1.0.29.tar.xz
|
||||
/cups-filters-1.0.30.tar.xz
|
||||
|
||||
@ -1,58 +0,0 @@
|
||||
diff -urbB cups-filters-1.0.29/filter/pdftoopvp/oprs/OPRS.cxx cups-filters-1.0-20130119/filter/pdftoopvp/oprs/OPRS.cxx
|
||||
--- cups-filters-1.0.29/filter/pdftoopvp/oprs/OPRS.cxx 2012-09-10 14:52:00.000000000 -0500
|
||||
+++ cups-filters-1.0-20130119/filter/pdftoopvp/oprs/OPRS.cxx 2013-01-18 18:40:36.000000000 -0600
|
||||
@@ -5,6 +5,9 @@
|
||||
//========================================================================
|
||||
|
||||
#include <config.h>
|
||||
+#ifdef HAVE_CPP_POPPLER_VERSION_H
|
||||
+#include "cpp/poppler-version.h"
|
||||
+#endif
|
||||
|
||||
#ifdef USE_GCC_PRAGMAS
|
||||
#pragma implementation
|
||||
@@ -235,7 +238,11 @@
|
||||
SplashColorMode srcMode, GBool srcAlpha,
|
||||
int w, int h, SplashCoord *mat) {
|
||||
if (rasterMode) {
|
||||
+#if POPPLER_VERSION_MAJOR <= 0 && (POPPLER_VERSION_MINOR <= 20 || (POPPLER_VERSION_MINOR == 21 && POPPLER_VERSION_MICRO <= 2))
|
||||
return splash->drawImage(src,srcData,srcMode,srcAlpha,w,h,mat);
|
||||
+#else
|
||||
+ return splash->drawImage(src,srcData,srcMode,srcAlpha,w,h,mat,gFalse);
|
||||
+#endif
|
||||
} else {
|
||||
return opvpSplash->drawImage(src,srcData,srcMode,srcAlpha,w,h,mat);
|
||||
}
|
||||
diff -urbB cups-filters-1.0.29/filter/pdftoopvp/OPVPOutputDev.cxx cups-filters-1.0-20130119/filter/pdftoopvp/OPVPOutputDev.cxx
|
||||
--- cups-filters-1.0.29/filter/pdftoopvp/OPVPOutputDev.cxx 2012-07-20 03:22:23.000000000 -0500
|
||||
+++ cups-filters-1.0-20130119/filter/pdftoopvp/OPVPOutputDev.cxx 2013-01-18 18:40:36.000000000 -0600
|
||||
@@ -1804,8 +1804,14 @@
|
||||
maskSplash = new Splash(maskBitmap, gFalse);
|
||||
maskColor[0] = 0;
|
||||
maskSplash->clear(maskColor);
|
||||
+#if POPPLER_VERSION_MAJOR <= 0 && (POPPLER_VERSION_MINOR <= 20 || (POPPLER_VERSION_MINOR == 21 && POPPLER_VERSION_MICRO <= 2))
|
||||
maskSplash->drawImage(&imageSrc, &imgMaskData,
|
||||
splashModeMono8, gFalse, maskWidth, maskHeight, mat);
|
||||
+#else
|
||||
+ maskSplash->drawImage(&imageSrc, &imgMaskData,
|
||||
+ splashModeMono8, gFalse, maskWidth, maskHeight,
|
||||
+ mat,gFalse);
|
||||
+#endif
|
||||
delete imgMaskData.imgStr;
|
||||
maskStr->close();
|
||||
gfree(imgMaskData.lookup);
|
||||
diff -urbB cups-filters-1.0.29/NEWS cups-filters-1.0-20130119/NEWS
|
||||
--- cups-filters-1.0.29/NEWS 2013-01-02 12:23:13.000000000 -0600
|
||||
+++ cups-filters-1.0-20130119/NEWS 2013-01-18 18:40:36.000000000 -0600
|
||||
@@ -1,6 +1,11 @@
|
||||
NEWS - OpenPrinting CUPS Filters v1.0.29 - 2013-01-02
|
||||
-----------------------------------------------------
|
||||
|
||||
+CHANGES IN V1.0.30
|
||||
+
|
||||
+ - pdftoopvp: Let it build with Poppler 0.22.x. Thanks to Koji Otani
|
||||
+ from BBR Inc. (Bug #1089).
|
||||
+
|
||||
CHANGES IN V1.0.29
|
||||
|
||||
- Fixed ./configure option "--with-rcdir=no". Thanks to Jiri
|
||||
@ -3,8 +3,8 @@
|
||||
|
||||
Summary: OpenPrinting CUPS filters and backends
|
||||
Name: cups-filters
|
||||
Version: 1.0.29
|
||||
Release: 4%{?dist}
|
||||
Version: 1.0.30
|
||||
Release: 1%{?dist}
|
||||
|
||||
# For a breakdown of the licensing, see COPYING file
|
||||
# GPLv2: filters: commandto*, imagetoraster, pdftops, rasterto*,
|
||||
@ -22,9 +22,6 @@ Url: http://www.linuxfoundation.org/collaborate/workgroups/openprinting/pdf_
|
||||
Source0: http://www.openprinting.org/download/cups-filters/cups-filters-%{version}.tar.xz
|
||||
Source1: cups-browsed.service
|
||||
|
||||
# backport upstream fix(es) for poppler-0.22.x
|
||||
Patch1: cups-filters-1.0.29-poppler_022.patch
|
||||
|
||||
Requires: cups-filters-libs%{?_isa} = %{version}-%{release}
|
||||
|
||||
BuildRequires: cups-devel
|
||||
@ -44,7 +41,7 @@ BuildRequires: freetype-devel
|
||||
BuildRequires: fontconfig-devel
|
||||
BuildRequires: lcms2-devel
|
||||
# cups-browsed
|
||||
BuildRequires: avahi-devel
|
||||
BuildRequires: avahi-devel avahi-glib-devel
|
||||
BuildRequires: systemd
|
||||
|
||||
# Make sure we get postscriptdriver tags.
|
||||
@ -92,8 +89,6 @@ This is the development package for OpenPrinting CUPS filters and backends.
|
||||
%prep
|
||||
%setup -q
|
||||
|
||||
%patch1 -p1 -b .poppler_022
|
||||
|
||||
%build
|
||||
# work-around Rpath
|
||||
./autogen.sh
|
||||
@ -103,6 +98,7 @@ This is the development package for OpenPrinting CUPS filters and backends.
|
||||
%configure --disable-static \
|
||||
--disable-silent-rules \
|
||||
--with-pdftops=pdftops \
|
||||
--with-browseremoteprotocols=DNSSD,CUPS \
|
||||
--with-rcdir=no
|
||||
|
||||
make %{?_smp_mflags}
|
||||
@ -141,6 +137,7 @@ install -p -m 644 %{SOURCE1} %{buildroot}%{_unitdir}
|
||||
|
||||
%files
|
||||
%doc __doc/README __doc/AUTHORS __doc/NEWS
|
||||
%config(noreplace) %{_sysconfdir}/cups/cups-browsed.conf
|
||||
%config(noreplace) %{_sysconfdir}/fonts/conf.d/99pdftoopvp.conf
|
||||
%attr(0755,root,root) %{_cups_serverbin}/filter/*
|
||||
%attr(0755,root,root) %{_cups_serverbin}/backend/parallel
|
||||
@ -170,6 +167,9 @@ install -p -m 644 %{SOURCE1} %{buildroot}%{_unitdir}
|
||||
%{_libdir}/libfontembed.so
|
||||
|
||||
%changelog
|
||||
* Fri Mar 08 2013 Jiri Popelka <jpopelka@redhat.com> - 1.0.30-1
|
||||
- 1.0.30: CUPS browsing and broadcasting in cups-browsed
|
||||
|
||||
* Wed Feb 13 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.0.29-4
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user