78 lines
2.4 KiB
Diff
78 lines
2.4 KiB
Diff
|
From 5f5fd77f096174c45f8335afe6efd6745796d9a5 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Kalev Lember <klember@redhat.com>
|
||
|
|
Date: Mon, 25 Jul 2022 16:21:50 +0200
|
||
|
|
Subject: [PATCH] Revert "Meson: Simplify pkgconfig file generator"
|
||
|
|
|
||
|
|
Temporarily revert this until we figure out how to best restore
|
||
|
|
private requires that are needed for rpm automatic dep extraction.
|
||
|
|
|
||
|
|
https://gitlab.gnome.org/GNOME/gtk/-/merge_requests/4756
|
||
|
|
|
||
|
|
This reverts commit 802bf4199911c811938b0454a876089bafa97dba.
|
||
|
|
---
|
||
|
|
meson.build | 47 +++++++++++++++++++++++++++++++++--------------
|
||
|
|
1 file changed, 33 insertions(+), 14 deletions(-)
|
||
|
|
|
||
|
|
Index: gtk-4.12.1/meson.build
|
||
|
|
===================================================================
|
||
|
|
--- gtk-4.12.1.orig/meson.build
|
||
|
|
+++ gtk-4.12.1/meson.build
|
||
|
|
@@ -430,6 +430,9 @@ if not os_win32
|
||
|
|
endif
|
||
|
|
endif
|
||
|
|
|
||
|
|
+
|
||
|
|
+pc_gdk_extra_libs = []
|
||
|
|
+
|
||
|
|
cairo_backends = []
|
||
|
|
foreach backend: [ ['cairo-xlib', cairo_req, x11_enabled],
|
||
|
|
['cairo-win32', cairo_req, win32_enabled],
|
||
|
|
@@ -562,14 +565,26 @@ if x11_enabled
|
||
|
|
cdata.set('HAVE_RANDR15', xrandr15_dep.found())
|
||
|
|
endif
|
||
|
|
|
||
|
|
+if broadway_enabled
|
||
|
|
+ pc_gdk_extra_libs += ['-lz']
|
||
|
|
+endif
|
||
|
|
+
|
||
|
|
+if macos_enabled
|
||
|
|
+ pc_gdk_extra_libs += ['-framework Cocoa', '-framework Carbon']
|
||
|
|
+endif
|
||
|
|
+
|
||
|
|
extra_demo_ldflags = []
|
||
|
|
if win32_enabled
|
||
|
|
+ pc_gdk_extra_libs += ['-lgdi32', '-limm32', '-lshell32', '-lole32']
|
||
|
|
if cc.get_id() == 'msvc'
|
||
|
|
# Since the demo programs are now built as pure GUI programs, we
|
||
|
|
# need to pass in /entry:mainCRTStartup so that they will properly
|
||
|
|
# link on Visual Studio builds
|
||
|
|
extra_demo_ldflags = ['/entry:mainCRTStartup']
|
||
|
|
+ else
|
||
|
|
+ pc_gdk_extra_libs += ['-Wl,-luuid']
|
||
|
|
endif
|
||
|
|
+ pc_gdk_extra_libs += ['-lwinmm', '-ldwmapi', '-lsetupapi', '-lcfgmgr32', '-lhid']
|
||
|
|
|
||
|
|
# Check whether libepoxy is built with EGL support on Windows
|
||
|
|
endif
|
||
|
|
@@ -837,6 +852,7 @@ pkg_config.generate(libgtk,
|
||
|
|
name: 'GTK',
|
||
|
|
description: 'GTK Graphical UI Library',
|
||
|
|
requires: gdk_packages + gsk_packages + gtk_packages,
|
||
|
|
+ requires_private: wayland_pkgs,
|
||
|
|
subdirs: ['gtk-@0@'.format(gtk_api_version)],
|
||
|
|
)
|
||
|
|
meson.override_dependency('gtk4', libgtk_dep)
|
||
|
|
@@ -859,10 +875,10 @@ if os_unix
|
||
|
|
unescaped_variables: common_pc_variables,
|
||
|
|
name: 'GTK',
|
||
|
|
description: 'GTK Unix print support',
|
||
|
|
- requires: 'gtk4',
|
||
|
|
+ requires: ['gtk4'] + gtk_packages,
|
||
|
|
+ libraries: [],
|
||
|
|
subdirs: ['gtk-@0@/unix-print'.format(gtk_api_version)],
|
||
|
|
)
|
||
|
|
- meson.override_dependency('gtk4-unix-print', libgtk_dep)
|
||
|
|
endif
|
||
|
|
|
||
|
|
subdir('po')
|