From 91cd19237f53b75ebb0c6269068c16fb0a5d6ee5 Mon Sep 17 00:00:00 2001 From: "Erich E. Hoover" Date: Fri, 25 Jul 2014 18:37:27 -0600 Subject: [PATCH] Move 04-XEMBED to winex11-XEMBED. --- patches/Makefile | 40 +++++++++---------- ...ate-gl_drawable-for-embedded-windows.patch | 0 ...able-windows-when-they-are-un-mapped.patch | 0 .../{04-XEMBED => winex11-XEMBED}/definition | 0 4 files changed, 20 insertions(+), 20 deletions(-) rename patches/{04-XEMBED => winex11-XEMBED}/0001-winex11-Update-gl_drawable-for-embedded-windows.patch (100%) rename patches/{04-XEMBED => winex11-XEMBED}/0002-winex11-Enable-disable-windows-when-they-are-un-mapped.patch (100%) rename patches/{04-XEMBED => winex11-XEMBED}/definition (100%) diff --git a/patches/Makefile b/patches/Makefile index 10e9fc83..00b79da0 100644 --- a/patches/Makefile +++ b/patches/Makefile @@ -5,8 +5,7 @@ CURDIR ?= ${.CURDIR} PATCH := $(CURDIR)/../debian/tools/gitapply.sh -d $(DESTDIR) -PATCHLIST := 04-XEMBED.ok \ - 06-winepulse.ok \ +PATCHLIST := 06-winepulse.ok \ 07-GetVolumePathName.ok \ 08-Junction_Points.ok \ 09-TransmitFile.ok \ @@ -27,7 +26,8 @@ PATCHLIST := 04-XEMBED.ok \ server-Address_Change_Notification.ok \ server-Inherited_ACLs.ok \ server-Stored_ACLs.ok \ - shell32-Default_Folder_ACLs.ok + shell32-Default_Folder_ACLs.ok \ + winex11-XEMBED.ok .PHONY: install install: @@ -48,23 +48,6 @@ clean: .NOTPARALLEL: -# Patchset 04-XEMBED -# | -# | Included patches: -# | * Enable/disable windows when they are (un)mapped by foreign applications. [by Sebastian Lackner] -# | * Update gl_drawable for embedded windows. [by Sebastian Lackner] -# | -# | Modified files: -# | * dlls/winex11.drv/event.c, dlls/winex11.drv/window.c -# | -04-XEMBED.ok: - $(PATCH) < 04-XEMBED/0001-winex11-Update-gl_drawable-for-embedded-windows.patch - $(PATCH) < 04-XEMBED/0002-winex11-Enable-disable-windows-when-they-are-un-mapped.patch - ( \ - echo "+ { \"04-XEMBED\", \"Sebastian Lackner\", \"Enable/disable windows when they are (un)mapped by foreign applications.\" },"; \ - echo "+ { \"04-XEMBED\", \"Sebastian Lackner\", \"Update gl_drawable for embedded windows.\" },"; \ - ) > 04-XEMBED.ok - # Patchset 06-winepulse # | # | Included patches: @@ -503,3 +486,20 @@ shell32-Default_Folder_ACLs.ok: echo "+ { \"shell32-Default_Folder_ACLs\", \"Erich E. Hoover\", \"Generate default ACLs for user shell folders. [rev 6]\" },"; \ ) > shell32-Default_Folder_ACLs.ok +# Patchset winex11-XEMBED +# | +# | Included patches: +# | * Enable/disable windows when they are (un)mapped by foreign applications. [by Sebastian Lackner] +# | * Update gl_drawable for embedded windows. [by Sebastian Lackner] +# | +# | Modified files: +# | * dlls/winex11.drv/event.c, dlls/winex11.drv/window.c +# | +winex11-XEMBED.ok: + $(PATCH) < winex11-XEMBED/0001-winex11-Update-gl_drawable-for-embedded-windows.patch + $(PATCH) < winex11-XEMBED/0002-winex11-Enable-disable-windows-when-they-are-un-mapped.patch + ( \ + echo "+ { \"winex11-XEMBED\", \"Sebastian Lackner\", \"Enable/disable windows when they are (un)mapped by foreign applications.\" },"; \ + echo "+ { \"winex11-XEMBED\", \"Sebastian Lackner\", \"Update gl_drawable for embedded windows.\" },"; \ + ) > winex11-XEMBED.ok + diff --git a/patches/04-XEMBED/0001-winex11-Update-gl_drawable-for-embedded-windows.patch b/patches/winex11-XEMBED/0001-winex11-Update-gl_drawable-for-embedded-windows.patch similarity index 100% rename from patches/04-XEMBED/0001-winex11-Update-gl_drawable-for-embedded-windows.patch rename to patches/winex11-XEMBED/0001-winex11-Update-gl_drawable-for-embedded-windows.patch diff --git a/patches/04-XEMBED/0002-winex11-Enable-disable-windows-when-they-are-un-mapped.patch b/patches/winex11-XEMBED/0002-winex11-Enable-disable-windows-when-they-are-un-mapped.patch similarity index 100% rename from patches/04-XEMBED/0002-winex11-Enable-disable-windows-when-they-are-un-mapped.patch rename to patches/winex11-XEMBED/0002-winex11-Enable-disable-windows-when-they-are-un-mapped.patch diff --git a/patches/04-XEMBED/definition b/patches/winex11-XEMBED/definition similarity index 100% rename from patches/04-XEMBED/definition rename to patches/winex11-XEMBED/definition