forked from Lainports/freebsd-ports
982e968ef6
- 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
26 lines
601 B
C
26 lines
601 B
C
--- scan/sane/OrbliteScan/MacCommon.h.orig 2022-02-23 07:41:05 UTC
|
|
+++ scan/sane/OrbliteScan/MacCommon.h
|
|
@@ -1,12 +1,12 @@
|
|
#ifndef H_MacCommon
|
|
#define H_MacCommon
|
|
|
|
-#ifndef __linux__
|
|
+#ifdef __APPLE__
|
|
#include <CoreFoundation/CFPlugInCOM.h>
|
|
#define __CFPlugInCOM_Included__
|
|
#endif
|
|
|
|
-#ifdef __linux__
|
|
+#if defined(__linux__) || defined(__FreeBSD__)
|
|
# include "LinuxCommon.h"
|
|
#endif
|
|
|
|
@@ -257,7 +257,7 @@ typedef struct _GUID {
|
|
|
|
typedef GUID CLSID;
|
|
|
|
-#ifndef __linux__
|
|
+#if !defined(__linux__) && !defined(__FreeBSD__)
|
|
const extern CLSID CLSID_NULL;
|
|
const extern GUID GUID_NULL;
|
|
#else
|