hplip/hplip-remove-imageprocessor.diff
Martin Wilck 054892e8bb Accepting request 930202 from home:gmbr3:Active
- Update to 3.21.10
  Added support for the following new printers:
  * HP ENVY Inspire 7200e series
  * HP ENVY Inspire 7900e series
  * HP LaserJet MFP M140a
  * HP LaserJet MFP M139a
  * HP LaserJet MFP M141a
  * HP LaserJet MFP M142a
  * HP LaserJet MFP M140w
  * HP LaserJet MFP M140we
  * HP LaserJet MFP M139w
  * HP LaserJet MFP M139we
  * HP LaserJet MFP M141w
  * HP LaserJet MFP M141we
  * HP LaserJet MFP M142we
  * HP LaserJet MFP M142w
  * HP LaserJet M109a
  * HP LaserJet M110a
  * HP LaserJet M111a
  * HP LaserJet M112a
  * HP LaserJet M109w
  * HP LaserJet M109we
  * HP LaserJet M110w
  * HP LaserJet M110we
  * HP LaserJet M111w
  * HP LaserJet M111we
  * HP LaserJet M112we
  * HP LaserJet M112w
  * HP DesignJet Z6 Pro 64in
  * HP DesignJet Z9 Pro 64in
  * HP PageWide XL Pro 5200 PS MFP series
  * HP PageWide XL Pro 8200 PS MFP series
  * HP PageWide XL 3920 MFP
  * HP PageWide XL 4200 Printer
  * HP PageWide XL 4200 Multifunction Printer
  * HP PageWide XL 4700 Printer
  * HP PageWide XL 4700 Multifunction Printer
  * HP PageWide XL 5200 Printer
  * HP PageWide XL 5200 Multifunction Printer
  * HP PageWide XL 8200 Printer
  * HP Smart Tank 500 series
  * HP Smart Tank 530 series
  * HP Smart Tank Plus 570 series
  * HP Smart Tank 7600
  * HP Smart Tank 750
  * HP Smart Tank 790
  * HP Smart Tank Plus 710-720
  * HP Smart Tank Plus 7000
  * HP Smart Tank Plus 660-670
  * HP Smart Tank Plus 6000
  * HP DeskJet Ink Advantage Ultra 4800 All-in-One Printer series
- Rebased hplip-missing-drivers.patch & don't edit Makefile.in
- Rebased hplip-remove-imageprocessor.diff
- Remove libtool archives
- Add drivers for hplip-missing-drivers.patch from Fedora
  (lp#1843592,rh#1739855,rh#1740132,rh#1742949)

OBS-URL: https://build.opensuse.org/request/show/930202
OBS-URL: https://build.opensuse.org/package/show/Printing/hplip?expand=0&rev=219
2021-11-08 15:41:33 +00:00

39 lines
1.9 KiB
Diff

diff -ur hplip-3.21.4.orig/Makefile.am hplip-3.21.4/Makefile.am
--- hplip-3.21.4.orig/Makefile.am 2021-05-06 10:39:14.000000000 +0200
+++ hplip-3.21.4/Makefile.am 2021-06-16 09:19:42.354489830 +0200
@@ -167,7 +167,7 @@
dist_hplip_SCRIPTS = hpssd.py __init__.py hpdio.py
endif #HPLIP_CLASS_DRIVER
-dist_noinst_DATA += prnt/drv/hpijs.drv.in.template prnt/drv/hpcups.drv.in.template prnt/hpcups/libImageProcessor-x86_64.so prnt/hpcups/libImageProcessor-x86_32.so
+dist_noinst_DATA += prnt/drv/hpijs.drv.in.template prnt/drv/hpcups.drv.in.template
dist_noinst_DATA += prnt/ipp-usb/HPLIP.conf
dist_noinst_SCRIPTS += dat2drv.py install.py hplip-install init-suse-firewall init-iptables-firewall class_rpm_build.sh hplipclassdriver.spec createPPD.sh Makefile_dat2drv hpijs-drv
@@ -595,7 +595,7 @@
prnt/hpcups/ImageProcessor.h
hpcups_CXXFLAGS = $(APDK_ENDIAN_FLAG) $(DBUS_CFLAGS)
-hpcups_LDADD = -L./prnt/hpcups/ -ljpeg -ldl -lImageProcessor -lcups -lcupsimage -lz $(DBUS_LIBS)
+hpcups_LDADD = -L./prnt/hpcups/ -ljpeg -ldl -lcups -lcupsimage -lz $(DBUS_LIBS)
#else
#hpcupsdir = $(cupsfilterdir)
#hpcups_PROGRAMS = hpcups
@@ -685,16 +685,6 @@
install-data-hook:
if HPLIP_BUILD
- if [ \( "$(UNAME)" = "x86_64" -a -d "$(libdir)/" \) ]; then \
- cp prnt/hpcups/libImageProcessor-x86_64.so $(libdir)/ ; \
- chmod 775 $(libdir)/libImageProcessor-x86_64.so ; \
- ln -sf $(libdir)/libImageProcessor-x86_64.so $(libdir)/libImageProcessor.so ; \
- fi; \
- if [ \( \( "$(UNAME)" = "i686" -o "$(UNAME)" = "i386" \) -a -d "$(libdir)/" \) ]; then \
- cp prnt/hpcups/libImageProcessor-x86_32.so $(libdir)/ ; \
- chmod 775 $(libdir)/libImageProcessor-x86_32.so ; \
- ln -sf $(libdir)/libImageProcessor-x86_32.so $(libdir)/libImageProcessor.so ; \
- fi
if [ -d "/usr/share/ipp-usb/quirks/" ]; then \
echo "ipp-usb directory exists"; \
cp prnt/ipp-usb/HPLIP.conf /usr/share/ipp-usb/quirks/ ; \