- added meson support to papi patch, reenabled

diff --git a/gtk+3-papi.patch b/gtk+3-papi.patch
index 52d79037093c1fd11190495a075fc3833a3275a9..c7197c5f611165715a45b36720848a44e03e3932 100644 (file)
--- a/gtk+3-papi.patch
+++ b/gtk+3-papi.patch
@@ -67,3 +67,34 @@
  
  }
  
+--- gtk+-3.24.36/modules/printbackends/meson.build.orig        2022-12-22 15:01:18.000000000 +0100
++++ gtk+-3.24.36/modules/printbackends/meson.build     2022-12-25 12:15:51.137673110 +0100
+@@ -51,9 +51,9 @@ if enabled_print_backends.contains('test
+ endif
+ 
+ if enabled_print_backends.contains('papi')
+-  # TODO
+-  if print_strict_deps
+-    error('\'papi\' backend not supported with meson yet')
++  papi_dep = cc.find_library('papi', required: print_strict_deps)
++  if papi_dep.found()
++    print_backends += ['papi']
+   endif
+ endif
+ 
+@@ -138,4 +138,15 @@ if print_backends.contains('cups')
+                 install_dir: printbackends_install_dir,
+                 name_suffix: module_suffix,
+                 install : true)
++endif
++
++if print_backends.contains('papi')
++  shared_module('printbackend-papi',
++                'papi/gtkprintbackendpapi.c',
++                'papi/gtkprinterpapi.c',
++                c_args: printbackends_args,
++                dependencies: [libgtk_dep, papi_dep],
++                install_dir: printbackends_install_dir,
++                name_suffix: module_suffix,
++                install : true)
+ endif

diff --git a/gtk+3.spec b/gtk+3.spec
index c7db42fdafbbb37ed2b458fdc952f5c05508c571..dd72ab7c12d6d407a0fe93ede8ce0ee297bb05b8 100644 (file)
--- a/gtk+3.spec
+++ b/gtk+3.spec
@@ -2,7 +2,7 @@
 # Conditional build:
 %bcond_without apidocs         # gtk-doc build
 %bcond_without cups            # CUPS print backend
-%bcond_with    papi            # PAPI print backend
+%bcond_without papi            # PAPI print backend
 %bcond_without broadway        # Broadway target
 %bcond_with    sysprof         # sysprof profiler support
 %bcond_with    typeahead       # Typeahead in open dialog