git: aa4dabd93216 - main - x11/libxfce4windowing: fix build of generated C code for Vala files

Go to: [ bottom of page ] [ top of archives ] [ this month ]
From: Guido Falsi <madpilot_at_FreeBSD.org>
Date: Tue, 09 Sep 2025 07:30:23 UTC
The branch main has been updated by madpilot:

URL: https://cgit.FreeBSD.org/ports/commit/?id=aa4dabd93216f4df70210f424f7c6409e7696978

commit aa4dabd93216f4df70210f424f7c6409e7696978
Author:     Olivier Duchateau <duchateau.olivier@gmail.com>
AuthorDate: 2025-09-09 07:28:45 +0000
Commit:     Guido Falsi <madpilot@FreeBSD.org>
CommitDate: 2025-09-09 07:28:45 +0000

    x11/libxfce4windowing: fix build of generated C code for Vala files
    
    This patch removes some unneeded customizations from the port.
    
    PR:             289385
---
 x11/libxfce4windowing/Makefile                     |  1 +
 .../files/patch-libxfce4windowing_meson.build      | 20 --------------
 .../files/patch-libxfce4windowingui_meson.build    | 20 --------------
 x11/libxfce4windowing/pkg-plist                    | 32 +++++++++++-----------
 4 files changed, 17 insertions(+), 56 deletions(-)

diff --git a/x11/libxfce4windowing/Makefile b/x11/libxfce4windowing/Makefile
index 440db67f7047..6ef1eba9d4c1 100644
--- a/x11/libxfce4windowing/Makefile
+++ b/x11/libxfce4windowing/Makefile
@@ -1,5 +1,6 @@
 PORTNAME=	libxfce4windowing
 DISTVERSION=	4.20.4
+PORTREVISION=	1
 CATEGORIES=	x11 xfce
 MASTER_SITES=	XFCE
 DIST_SUBDIR=	xfce4
diff --git a/x11/libxfce4windowing/files/patch-libxfce4windowing_meson.build b/x11/libxfce4windowing/files/patch-libxfce4windowing_meson.build
deleted file mode 100644
index 30183be21f87..000000000000
--- a/x11/libxfce4windowing/files/patch-libxfce4windowing_meson.build
+++ /dev/null
@@ -1,20 +0,0 @@
---- libxfce4windowing/meson.build.orig	2025-05-01 07:24:40 UTC
-+++ libxfce4windowing/meson.build
-@@ -93,7 +93,7 @@ windowing_config_h = configure_file(
-   input: 'libxfce4windowing-config.h.in',
-   output: 'libxfce4windowing-config.h',
-   install: true,
--  install_dir: get_option('prefix') / get_option('includedir') / 'xfce4' / libxfce4windowing_pkgname / 'libxfce4windowing',
-+  install_dir: get_option('prefix') / get_option('includedir') / 'xfce4' / 'libxfce4windowing',
- )
- windowing_public_sources += windowing_config_h
- windowing_sources += windowing_config_h
-@@ -135,7 +135,7 @@ install_headers(
- 
- install_headers(
-   windowing_headers,
--  subdir: 'xfce4' / libxfce4windowing_pkgname / 'libxfce4windowing',
-+  subdir: 'xfce4' / 'libxfce4windowing',
- )
- 
- pkgconfig.generate(
diff --git a/x11/libxfce4windowing/files/patch-libxfce4windowingui_meson.build b/x11/libxfce4windowing/files/patch-libxfce4windowingui_meson.build
deleted file mode 100644
index 7d24900cfc55..000000000000
--- a/x11/libxfce4windowing/files/patch-libxfce4windowingui_meson.build
+++ /dev/null
@@ -1,20 +0,0 @@
---- libxfce4windowingui/meson.build.orig	2025-05-01 07:24:40 UTC
-+++ libxfce4windowingui/meson.build
-@@ -24,7 +24,7 @@ windowingui_public_sources += configure_file(
-   input: 'libxfce4windowingui-config.h.in',
-   output: 'libxfce4windowingui-config.h',
-   install: true,
--  install_dir: get_option('prefix') / get_option('includedir') / 'xfce4' / libxfce4windowing_pkgname / 'libxfce4windowingui',
-+  install_dir: get_option('prefix') / get_option('includedir') / 'xfce4' / 'libxfce4windowingui',
- )
- 
- windowingui_sources = windowingui_public_sources
-@@ -64,7 +64,7 @@ install_headers(
- 
- install_headers(
-   windowingui_headers,
--  subdir: 'xfce4' / libxfce4windowing_pkgname / 'libxfce4windowingui',
-+  subdir: 'xfce4' / 'libxfce4windowingui',
- )
- 
- pkgconfig.generate(
diff --git a/x11/libxfce4windowing/pkg-plist b/x11/libxfce4windowing/pkg-plist
index df8892973d5e..4b8f61eb1696 100644
--- a/x11/libxfce4windowing/pkg-plist
+++ b/x11/libxfce4windowing/pkg-plist
@@ -1,19 +1,19 @@
-include/xfce4/libxfce4windowing/libxfce4windowing-config.h
-include/xfce4/libxfce4windowing/libxfce4windowing.h
-include/xfce4/libxfce4windowing/xfw-application.h
-include/xfce4/libxfce4windowing/xfw-monitor.h
-include/xfce4/libxfce4windowing/xfw-screen.h
-include/xfce4/libxfce4windowing/xfw-seat.h
-include/xfce4/libxfce4windowing/xfw-util.h
-include/xfce4/libxfce4windowing/xfw-window.h
-include/xfce4/libxfce4windowing/xfw-workspace-group.h
-include/xfce4/libxfce4windowing/xfw-workspace-manager.h
-include/xfce4/libxfce4windowing/xfw-workspace.h
-include/xfce4/libxfce4windowing/xfw-x11.h
-include/xfce4/libxfce4windowingui/libxfce4windowingui-config.h
-include/xfce4/libxfce4windowingui/libxfce4windowingui.h
-include/xfce4/libxfce4windowingui/xfw-window-action-menu.h
-include/xfce4/libxfce4windowingui/xfw-window-list-menu.h
+include/xfce4/libxfce4windowing-0/libxfce4windowing/libxfce4windowing-config.h
+include/xfce4/libxfce4windowing-0/libxfce4windowing/libxfce4windowing.h
+include/xfce4/libxfce4windowing-0/libxfce4windowing/xfw-application.h
+include/xfce4/libxfce4windowing-0/libxfce4windowing/xfw-monitor.h
+include/xfce4/libxfce4windowing-0/libxfce4windowing/xfw-screen.h
+include/xfce4/libxfce4windowing-0/libxfce4windowing/xfw-seat.h
+include/xfce4/libxfce4windowing-0/libxfce4windowing/xfw-util.h
+include/xfce4/libxfce4windowing-0/libxfce4windowing/xfw-window.h
+include/xfce4/libxfce4windowing-0/libxfce4windowing/xfw-workspace-group.h
+include/xfce4/libxfce4windowing-0/libxfce4windowing/xfw-workspace-manager.h
+include/xfce4/libxfce4windowing-0/libxfce4windowing/xfw-workspace.h
+include/xfce4/libxfce4windowing-0/libxfce4windowing/xfw-x11.h
+include/xfce4/libxfce4windowing-0/libxfce4windowingui/libxfce4windowingui-config.h
+include/xfce4/libxfce4windowing-0/libxfce4windowingui/libxfce4windowingui.h
+include/xfce4/libxfce4windowing-0/libxfce4windowingui/xfw-window-action-menu.h
+include/xfce4/libxfce4windowing-0/libxfce4windowingui/xfw-window-list-menu.h
 %%GIR%%lib/girepository-1.0/Libxfce4windowing-0.0.typelib
 %%GIR%%lib/girepository-1.0/Libxfce4windowingui-0.0.typelib
 lib/libxfce4windowing-0.so