diff options
| author | Tijl Coosemans <tijl@FreeBSD.org> | 2021-08-25 15:29:51 +0200 |
|---|---|---|
| committer | Tijl Coosemans <tijl@FreeBSD.org> | 2022-03-11 15:49:48 +0100 |
| commit | 982e968ef61a94e0de75d733e9036e5c60afca34 (patch) | |
| tree | 6beacb77eeac3d323af5c7e168890caa5c1fa2c8 /print/hplip/files/patch-scan_sane_OrbliteScan_MacCommon.h | |
| parent | deskutils/virt-manager: update to 4.0.0 (diff) | |
print/hplip(-plugin): update to 3.22.2
- Convert post-patch to real patches because they are easier to
maintain.
- Fix a NULL dereference in the scanner backend when D-Bus isn't
running.
- Depend on sysutils/py-distro to make hp-toolbox (Device Manager) work
again.
- Upstream switched to Avahi for mDNS support. Rename the SNMP option
to NETWORK because it's not just SNMP now.
- Don't install some programs related to uninstalling and upgrading of
HPLIP and the installation of firmware plugins because they circumvent
the package system.
- Install icons in share/icons so desktops can choose an appropriate
resolution.
Portions taken from a patch by Oleg Sidorkin <osidorkin@gmail.com>.
PR: 255586, 257034, 257512
Diffstat (limited to 'print/hplip/files/patch-scan_sane_OrbliteScan_MacCommon.h')
| -rw-r--r-- | print/hplip/files/patch-scan_sane_OrbliteScan_MacCommon.h | 19 |
1 files changed, 7 insertions, 12 deletions
diff --git a/print/hplip/files/patch-scan_sane_OrbliteScan_MacCommon.h b/print/hplip/files/patch-scan_sane_OrbliteScan_MacCommon.h index b14dd9819687..7e45e1bdd98b 100644 --- a/print/hplip/files/patch-scan_sane_OrbliteScan_MacCommon.h +++ b/print/hplip/files/patch-scan_sane_OrbliteScan_MacCommon.h @@ -1,26 +1,21 @@ ---- scan/sane/OrbliteScan/MacCommon.h.orig 2019-10-22 06:21:36 UTC +--- scan/sane/OrbliteScan/MacCommon.h.orig 2022-02-23 07:41:05 UTC +++ scan/sane/OrbliteScan/MacCommon.h -@@ -1,7 +1,7 @@ +@@ -1,12 +1,12 @@ #ifndef H_MacCommon #define H_MacCommon -#ifndef __linux__ -+#if !defined(__linux__) && !defined(__FreeBSD__) ++#ifdef __APPLE__ #include <CoreFoundation/CFPlugInCOM.h> #define __CFPlugInCOM_Included__ #endif -@@ -10,6 +10,10 @@ + +-#ifdef __linux__ ++#if defined(__linux__) || defined(__FreeBSD__) # include "LinuxCommon.h" #endif -+#if defined(__FreeBSD__) -+# include "BSDCommon.h" -+#endif -+ - #include <stdio.h> - #include <string.h> - #include <stdlib.h> -@@ -257,7 +261,7 @@ typedef struct _GUID { +@@ -257,7 +257,7 @@ typedef struct _GUID { typedef GUID CLSID; |