mirror of
git://slackware.nl/current.git
synced 2024-12-26 09:58:59 +01:00
590c390ae3
a/dcron-4.5-x86_64-17.txz: Rebuilt. run-parts.8: document skiping *.orig files. Thanks to metaed. a/etc-15.1-x86_64-6.txz: Rebuilt. Add support for nss-mdns to /etc/nsswitch.conf. a/kernel-firmware-20240220_97b693d-noarch-1.txz: Upgraded. a/kernel-generic-6.6.18-x86_64-1.txz: Upgraded. a/kernel-huge-6.6.18-x86_64-1.txz: Upgraded. a/kernel-modules-6.6.18-x86_64-1.txz: Upgraded. ap/cups-filters-1.28.17-x86_64-5.txz: Rebuilt. Don't specify --with-browseremoteprotocols=cups in order to get the default values of cups and dnssd, which should enable discovering shared printers on the network. We'll refrain from sharing your printer -- you'll need to change that setting yourself. ;-) Thanks to TurboBlaze. ap/hplip-3.23.12-x86_64-2.txz: Rebuilt. The new --disable-imageProcessor-build option doesn't do squat, so we'll hit it with the good old patch again. Thanks to Petri Kaukasoina and Stuart Winter. d/kernel-headers-6.6.18-x86-1.txz: Upgraded. k/kernel-source-6.6.18-noarch-1.txz: Upgraded. l/gvfs-1.52.2-x86_64-2.txz: Rebuilt. Added -Ddnssd=true option and recompiled against avahi. l/libsecret-0.21.4-x86_64-1.txz: Upgraded. n/c-ares-1.27.0-x86_64-1.txz: Upgraded. n/libgpg-error-1.48-x86_64-1.txz: Upgraded. n/nss-mdns-0.15.1-x86_64-1.txz: Added. Needed for .local lookups. Thanks to Lockywolf. xap/pidgin-2.14.13-x86_64-1.txz: Upgraded. isolinux/initrd.img: Rebuilt. kernels/*: Upgraded. usb-and-pxe-installers/usbboot.img: Rebuilt.
39 lines
1.9 KiB
Diff
39 lines
1.9 KiB
Diff
diff --git a/Makefile.am b/Makefile.am
|
|
index f65afea..12317dc 100644
|
|
--- a/Makefile.am
|
|
+++ b/Makefile.am
|
|
@@ -167,7 +167,7 @@ if !HPLIP_CLASS_DRIVER
|
|
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
|
|
@@ -597,7 +597,7 @@ hpcups_SOURCES = prnt/hpcups/HPCupsFilter.cpp prnt/hpcups/HPCupsFilter.h prnt/hp
|
|
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
|
|
@@ -687,16 +687,6 @@ endif #HPLIP_CLASS_DRIVER
|
|
|
|
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/ ; \
|