Skip to content

GitLab

H
hplip
Commit faeb85a4 authored by Vladimir Bashkirtsev's avatar Vladimir Bashkirtsev
Browse files
Options

Updated hplip to 3.20.6

parent b069764a
Hide whitespace changes
Inline Side-by-side
Showing with 27 additions and 27 deletions
Makefile
View file @ faeb85a4
all: all:
tar xf hplip-3.19.6.tar.gz tar xf hplip-3.20.6.tar.gz
patch -Np1 -d hplip-3.19.6 < hplip-3.19.6-arm64.patch patch -Np1 -d hplip-3.20.6 < hplip-3.20.6-arm64.patch
patch -Np1 -d hplip-3.19.6 < hplip-3.19.6-no_libImageProcessor.patch patch -Np1 -d hplip-3.20.6 < hplip-3.20.6-no_libImageProcessor.patch
cd hplip-3.19.6 && ./configure --prefix=/usr --disable-scan-build cd hplip-3.20.6 && ./configure --prefix=/usr --disable-scan-build
$(MAKE) -C hplip-3.19.6 $(MAKE) -C hplip-3.20.6
$(MAKE) -C hplip-3.19.6 install $(MAKE) -C hplip-3.20.6 install
rm -rf hplip-3.19.6 rm -rf hplip-3.20.6
hplip-3.19.6-arm64.patch → hplip-3.20.6-arm64.patch
View file @ faeb85a4
diff -uNr hplip-3.19.6/config.guess hplip-3.19.6-arm64/config.guess diff -uNr hplip-3.20.6/config.guess hplip-3.20.6-arm64/config.guess
--- hplip-3.19.6/config.guess 2018-11-05 19:17:06.000000000 +1030 --- hplip-3.20.6/config.guess 2011-05-12 17:26:51.000000000 +0930
+++ hplip-3.19.6-arm64/config.guess 2020-05-25 03:05:39.981801055 +0930 +++ hplip-3.20.6-arm64/config.guess 2021-07-29 11:08:49.403334723 +0930
@@ -1,14 +1,12 @@ @@ -1,14 +1,12 @@
#! /bin/sh #! /bin/sh
# Attempt to guess a canonical system name. # Attempt to guess a canonical system name.
...@@ -897,9 +897,9 @@ diff -uNr hplip-3.19.6/config.guess hplip-3.19.6-arm64/config.guess ...@@ -897,9 +897,9 @@ diff -uNr hplip-3.19.6/config.guess hplip-3.19.6-arm64/config.guess
config.guess timestamp = $timestamp config.guess timestamp = $timestamp
diff -uNr hplip-3.19.6/config.sub hplip-3.19.6-arm64/config.sub diff -uNr hplip-3.20.6/config.sub hplip-3.20.6-arm64/config.sub
--- hplip-3.19.6/config.sub 2018-11-05 19:17:06.000000000 +1030 --- hplip-3.20.6/config.sub 2011-05-12 17:26:51.000000000 +0930
+++ hplip-3.19.6-arm64/config.sub 2020-05-25 03:05:39.982801058 +0930 +++ hplip-3.20.6-arm64/config.sub 2021-07-29 11:08:49.403334723 +0930
@@ -1,38 +1,31 @@ @@ -1,38 +1,31 @@
#! /bin/sh #! /bin/sh
# Configuration validation subroutine script. # Configuration validation subroutine script.
......
hplip-3.19.6-no_libImageProcessor.patch → hplip-3.20.6-no_libImageProcessor.patch
View file @ faeb85a4
diff -uNr hplip-3.19.6/Makefile.am hplip-3.19.6-no_libImageProcessor/Makefile.am diff -uNr hplip-3.20.6/Makefile.am hplip-3.20.6-no_libImageProcessor/Makefile.am
--- hplip-3.19.6/Makefile.am 2019-06-26 22:37:10.000000000 +0930 --- hplip-3.20.6/Makefile.am 2020-06-18 22:37:43.000000000 +0930
+++ hplip-3.19.6-no_libImageProcessor/Makefile.am 2019-06-26 22:37:10.000000000 +0930 +++ hplip-3.20.6-no_libImageProcessor/Makefile.am 2021-07-29 11:09:37.147496375 +0930
@@ -166,7 +166,7 @@ @@ -166,7 +166,7 @@
dist_hplip_SCRIPTS = hpssd.py __init__.py hpdio.py dist_hplip_SCRIPTS = hpssd.py __init__.py hpdio.py
endif #HPLIP_CLASS_DRIVER endif #HPLIP_CLASS_DRIVER
...@@ -57,9 +57,9 @@ diff -uNr hplip-3.19.6/Makefile.am hplip-3.19.6-no_libImageProcessor/Makefile.am ...@@ -57,9 +57,9 @@ diff -uNr hplip-3.19.6/Makefile.am hplip-3.19.6-no_libImageProcessor/Makefile.am
rm -rf $(distdir)/hpijs-drv rm -rf $(distdir)/hpijs-drv
rm -rf $(distdir)/prnt/hpcups/ rm -rf $(distdir)/prnt/hpcups/
rm -rf $(distdir)/prnt/ps/ rm -rf $(distdir)/prnt/ps/
diff -uNr hplip-3.19.6/Makefile.in hplip-3.19.6-no_libImageProcessor/Makefile.in diff -uNr hplip-3.20.6/Makefile.in hplip-3.20.6-no_libImageProcessor/Makefile.in
--- hplip-3.19.6/Makefile.in 2019-06-26 22:39:27.000000000 +0930 --- hplip-3.20.6/Makefile.in 2020-06-18 22:39:56.000000000 +0930
+++ hplip-3.19.6-no_libImageProcessor/Makefile.in 2019-06-26 22:39:27.000000000 +0930 +++ hplip-3.20.6-no_libImageProcessor/Makefile.in 2021-07-29 11:09:37.149496382 +0930
@@ -103,7 +103,7 @@ @@ -103,7 +103,7 @@
# ip library # ip library
...@@ -89,7 +89,7 @@ diff -uNr hplip-3.19.6/Makefile.in hplip-3.19.6-no_libImageProcessor/Makefile.in ...@@ -89,7 +89,7 @@ diff -uNr hplip-3.19.6/Makefile.in hplip-3.19.6-no_libImageProcessor/Makefile.in
installer/text_install.py data/localization/hplip_de.ts \ installer/text_install.py data/localization/hplip_de.ts \
data/localization/hplip_es.ts data/localization/hplip_fr.ts \ data/localization/hplip_es.ts data/localization/hplip_fr.ts \
data/localization/hplip_it.ts data/localization/hplip_pt.ts \ data/localization/hplip_it.ts data/localization/hplip_pt.ts \
@@ -2001,11 +1999,6 @@ @@ -2030,11 +2028,6 @@
ppd/classppd/ps/hp-postscript-inkjet.ppd.gz \ ppd/classppd/ps/hp-postscript-inkjet.ppd.gz \
ppd/classppd/ps/hp-postscript-laserjet-pro.ppd.gz \ ppd/classppd/ps/hp-postscript-laserjet-pro.ppd.gz \
ppd/classppd/ps/hp-postscript-laserjet.ppd.gz ppd/classppd/ps/hp-postscript-laserjet.ppd.gz
...@@ -101,7 +101,7 @@ diff -uNr hplip-3.19.6/Makefile.in hplip-3.19.6-no_libImageProcessor/Makefile.in ...@@ -101,7 +101,7 @@ diff -uNr hplip-3.19.6/Makefile.in hplip-3.19.6-no_libImageProcessor/Makefile.in
am__dist_prnt_DATA_DIST = prnt/cups.py prnt/__init__.py prnt/ldl.py \ am__dist_prnt_DATA_DIST = prnt/cups.py prnt/__init__.py prnt/ldl.py \
prnt/pcl.py prnt/colorcal.py prnt/pcl.py prnt/colorcal.py
am__dist_rules_DATA_DIST = data/rules/56-hpmud.rules \ am__dist_rules_DATA_DIST = data/rules/56-hpmud.rules \
@@ -4784,11 +4777,10 @@ @@ -4850,11 +4843,10 @@
@HPCUPS_INSTALL_TRUE@ prnt/hpcups/flate_colorspace.h prnt/hpcups/RunLenEncoding.h prnt/hpcups/common_defines.h \ @HPCUPS_INSTALL_TRUE@ prnt/hpcups/flate_colorspace.h prnt/hpcups/RunLenEncoding.h prnt/hpcups/common_defines.h \
@HPCUPS_INSTALL_TRUE@ prnt/hpcups/genPCLm.h \ @HPCUPS_INSTALL_TRUE@ prnt/hpcups/genPCLm.h \
@HPCUPS_INSTALL_TRUE@ common/utils.c common/utils.h prnt/hpcups/Hbpl1_Wrapper.cpp prnt/hpcups/genPCLm.cpp \ @HPCUPS_INSTALL_TRUE@ common/utils.c common/utils.h prnt/hpcups/Hbpl1_Wrapper.cpp prnt/hpcups/genPCLm.cpp \
...@@ -115,7 +115,7 @@ diff -uNr hplip-3.19.6/Makefile.in hplip-3.19.6-no_libImageProcessor/Makefile.in ...@@ -115,7 +115,7 @@ diff -uNr hplip-3.19.6/Makefile.in hplip-3.19.6-no_libImageProcessor/Makefile.in
#else #else
#hpcupsdir = $(cupsfilterdir) #hpcupsdir = $(cupsfilterdir)
#hpcups_PROGRAMS = hpcups #hpcups_PROGRAMS = hpcups
@@ -4836,7 +4828,6 @@ @@ -4902,7 +4894,6 @@
@HPLIP_CLASS_DRIVER_TRUE@filterdir = $(cupsfilterdir) @HPLIP_CLASS_DRIVER_TRUE@filterdir = $(cupsfilterdir)
@HPLIP_CLASS_DRIVER_TRUE@printpluginsdir = $(cupsfilterdir) @HPLIP_CLASS_DRIVER_TRUE@printpluginsdir = $(cupsfilterdir)
@HPLIP_CLASS_DRIVER_TRUE@dist_filter_DATA = hpcups hpps dat2drv @HPLIP_CLASS_DRIVER_TRUE@dist_filter_DATA = hpcups hpps dat2drv
...@@ -123,7 +123,7 @@ diff -uNr hplip-3.19.6/Makefile.in hplip-3.19.6-no_libImageProcessor/Makefile.in ...@@ -123,7 +123,7 @@ diff -uNr hplip-3.19.6/Makefile.in hplip-3.19.6-no_libImageProcessor/Makefile.in
all: all-am all: all-am
.SUFFIXES: .SUFFIXES:
@@ -9559,16 +9550,6 @@ @@ -9625,16 +9616,6 @@
install-data-hook: install-data-hook:
...@@ -140,7 +140,7 @@ diff -uNr hplip-3.19.6/Makefile.in hplip-3.19.6-no_libImageProcessor/Makefile.in ...@@ -140,7 +140,7 @@ diff -uNr hplip-3.19.6/Makefile.in hplip-3.19.6-no_libImageProcessor/Makefile.in
# If scanner build, add hpaio entry to sane dll.conf. # If scanner build, add hpaio entry to sane dll.conf.
@HPLIP_BUILD_TRUE@@HPLIP_CLASS_DRIVER_FALSE@ if [ "$(scan_build)" = "yes" ]; then \ @HPLIP_BUILD_TRUE@@HPLIP_CLASS_DRIVER_FALSE@ if [ "$(scan_build)" = "yes" ]; then \
@HPLIP_BUILD_TRUE@@HPLIP_CLASS_DRIVER_FALSE@ $(mkinstalldirs) $(DESTDIR)/etc/sane.d; \ @HPLIP_BUILD_TRUE@@HPLIP_CLASS_DRIVER_FALSE@ $(mkinstalldirs) $(DESTDIR)/etc/sane.d; \
@@ -9735,10 +9716,6 @@ @@ -9801,10 +9782,6 @@
@HPLIP_CLASS_DRIVER_TRUE@ rm -rf $(distdir)/setup.py @HPLIP_CLASS_DRIVER_TRUE@ rm -rf $(distdir)/setup.py
@HPLIP_CLASS_DRIVER_TRUE@ rm -rf $(distdir)/systray.py @HPLIP_CLASS_DRIVER_TRUE@ rm -rf $(distdir)/systray.py
@HPLIP_CLASS_DRIVER_TRUE@ rm -rf $(distdir)/timedate.py @HPLIP_CLASS_DRIVER_TRUE@ rm -rf $(distdir)/timedate.py
...@@ -151,9 +151,9 @@ diff -uNr hplip-3.19.6/Makefile.in hplip-3.19.6-no_libImageProcessor/Makefile.in ...@@ -151,9 +151,9 @@ diff -uNr hplip-3.19.6/Makefile.in hplip-3.19.6-no_libImageProcessor/Makefile.in
@HPLIP_CLASS_DRIVER_TRUE@ rm -rf $(distdir)/hpijs-drv @HPLIP_CLASS_DRIVER_TRUE@ rm -rf $(distdir)/hpijs-drv
@HPLIP_CLASS_DRIVER_TRUE@ rm -rf $(distdir)/prnt/hpcups/ @HPLIP_CLASS_DRIVER_TRUE@ rm -rf $(distdir)/prnt/hpcups/
@HPLIP_CLASS_DRIVER_TRUE@ rm -rf $(distdir)/prnt/ps/ @HPLIP_CLASS_DRIVER_TRUE@ rm -rf $(distdir)/prnt/ps/
diff -uNr hplip-3.19.6/prnt/hpcups/HPCupsFilter.cpp hplip-3.19.6-no_libImageProcessor/prnt/hpcups/HPCupsFilter.cpp diff -uNr hplip-3.20.6/prnt/hpcups/HPCupsFilter.cpp hplip-3.20.6-no_libImageProcessor/prnt/hpcups/HPCupsFilter.cpp
--- hplip-3.19.6/prnt/hpcups/HPCupsFilter.cpp 2019-06-26 22:36:24.000000000 +0930 --- hplip-3.20.6/prnt/hpcups/HPCupsFilter.cpp 2020-06-18 22:37:39.000000000 +0930
+++ hplip-3.19.6-no_libImageProcessor/prnt/hpcups/HPCupsFilter.cpp 2019-06-26 22:36:24.000000000 +0930 +++ hplip-3.20.6-no_libImageProcessor/prnt/hpcups/HPCupsFilter.cpp 2021-07-29 11:09:37.149496382 +0930
@@ -31,8 +31,6 @@ @@ -31,8 +31,6 @@
\*****************************************************************************/ \*****************************************************************************/
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment