diff options
Diffstat (limited to 'net/netatalk3/files/patch-meson.build')
| -rw-r--r-- | net/netatalk3/files/patch-meson.build | 44 |
1 files changed, 22 insertions, 22 deletions
diff --git a/net/netatalk3/files/patch-meson.build b/net/netatalk3/files/patch-meson.build index 11f251e8fb08..0c04a21feaa1 100644 --- a/net/netatalk3/files/patch-meson.build +++ b/net/netatalk3/files/patch-meson.build @@ -1,6 +1,6 @@ ---- meson.build.orig 2024-07-18 15:25:55 UTC +--- meson.build.orig 2024-08-01 10:16:47 UTC +++ meson.build -@@ -35,6 +35,7 @@ libdir = prefix / get_option('libdir') +@@ -39,6 +39,7 @@ libdir = prefix / get_option('libdir') datadir = prefix / get_option('datadir') includedir = prefix / get_option('includedir') libdir = prefix / get_option('libdir') @@ -8,7 +8,7 @@ localstatedir = prefix / get_option('localstatedir') mandir = prefix / get_option('mandir') sbindir = prefix / get_option('sbindir') -@@ -74,7 +75,7 @@ statedir = '-D_PATH_STATEDIR="' + localstatedir + '/ne +@@ -78,7 +79,7 @@ statedir = '-D_PATH_STATEDIR="' + localstatedir + '/ne dversion = '-DVERSION="' + netatalk_version + '"' messagedir = '-DSERVERTEXT="' + localstatedir + '/netatalk/msg/"' statedir = '-D_PATH_STATEDIR="' + localstatedir + '/netatalk/"' @@ -17,15 +17,15 @@ ############ # Includes # -@@ -374,6 +375,7 @@ bdb_subdirs = [ +@@ -380,6 +381,7 @@ bdb_subdirs = [ '/usr', ] bdb_subdirs = [ -+ '%%DB_NAME%%', ++ 'db18', 'db4.6', 'db4.7', 'db4.8', -@@ -492,6 +494,11 @@ if crypt.found() +@@ -499,6 +501,11 @@ if crypt.found() if crypt.found() cdata.set('HAVE_CRYPT_H', 1) cdata.set('HAVE_LIBCRYPT', 1) @@ -37,7 +37,7 @@ endif des = cc.find_library('des', required: false) -@@ -724,12 +731,12 @@ dns_sd_libs = [] +@@ -731,12 +738,12 @@ dns_sd_libs = [] dns_sd_libs = [] @@ -52,7 +52,16 @@ if dns_sd.found() dns_sd_libs += system endif -@@ -755,6 +762,7 @@ else +@@ -753,6 +760,8 @@ have_dns = ( + ) + ) + ++threads = dependency('threads', required: true) ++ + if not enable_zeroconf + have_zeroconf = false + else +@@ -762,6 +771,7 @@ else cdata.set('HAVE_MDNS', 1) freebsd_zeroconf_daemon = 'mdnsd' zeroconf_provider += 'mDNS' @@ -60,7 +69,7 @@ else have_zeroconf = avahi.found() if avahi.found() -@@ -822,19 +830,7 @@ else +@@ -829,19 +839,7 @@ else required: false, ) @@ -81,7 +90,7 @@ cdata.set('HAVE_TRACKER3', 1) cdata.set( 'TRACKER_MANAGING_COMMAND', -@@ -875,7 +871,6 @@ else +@@ -882,7 +880,6 @@ else endif endif endif @@ -89,7 +98,7 @@ have_spotlight = ( tracker_sparql.found() -@@ -884,6 +879,8 @@ have_spotlight = ( +@@ -891,6 +888,8 @@ have_spotlight = ( and flex.found() and bison.found() ) @@ -98,16 +107,7 @@ if have_spotlight cdata.set('WITH_SPOTLIGHT', 1) endif -@@ -1375,7 +1372,7 @@ if iconv_path != '' - endif - iconv = declare_dependency( - link_args: libiconv_link_args, -- include_directories: include_directories(with_libiconv / 'include'), -+ include_directories: include_directories(iconv_path / 'include'), - ) - endif - -@@ -1578,6 +1575,7 @@ if not enable_pam +@@ -1592,6 +1591,7 @@ if not enable_pam if not enable_pam have_pam = false @@ -115,7 +115,7 @@ else if host_os != 'sunos' pam_paths = [ -@@ -1941,6 +1939,8 @@ int deny_severity = 0; +@@ -1955,6 +1955,8 @@ int deny_severity = 0; tcpwrap_code = ''' int allow_severity = 0; int deny_severity = 0; |