[mingw-gtk3/f15] Install missing gdk/win32/ headers, patch by Greg Hellings (#718802)

Fri Jul 8 21:31:45 UTC 2011

commit a8a08955e7c5e35b2cc347001ff48a7e30da880b
Author: Kalev Lember <kalevlember at gmail.com>
Date:   Fri Jul 8 21:16:00 2011 +0300

    Install missing gdk/win32/ headers, patch by Greg Hellings (#718802)

 mingw-gtk3.spec                |    4 +
 mingw32-gtk3-gdk_headers.patch |  173 ++++++++++++++++++++++++++++++++++++++++
 2 files changed, 177 insertions(+), 0 deletions(-)
---

diff --git a/mingw-gtk3.spec b/mingw-gtk3.spec
index 7452d37..128e8e5 100644
--- a/mingw-gtk3.spec
+++ b/mingw-gtk3.spec
@@ -26,6 +26,8 @@ Patch1:         mingw32-gtk3-manifest.patch
 # Fix linking with libuuid
 # https://bugzilla.gnome.org/show_bug.cgi?id=642214
 Patch2:         mingw32-gtk3-libuuid.patch
+# Install missing gdk/win32/ headers
+Patch3:         mingw32-gtk3-gdk_headers.patch
 
 BuildArch:      noarch
 
@@ -83,6 +85,7 @@ This package contains the MinGW Windows cross compiled GTK+ 3 library.
 %patch0 -p1 -b .perf_marshal
 %patch1 -p1 -b .manifest
 %patch2 -p1 -b .libuuid
+%patch3 -p1 -b .gdk_headers
 
 
 %build
@@ -168,6 +171,7 @@ install -m 0644 %{SOURCE1} $RPM_BUILD_ROOT%{_mingw32_sysconfdir}/gtk-3.0/
 %changelog
 * Fri Jul 08 2011 Kalev Lember <kalevlember at gmail.com> - 3.0.11-1
 - Update to 3.0.11
+- Install missing gdk/win32/ headers, patch by Greg Hellings (#718802)
 
 * Mon May 23 2011 Kalev Lember <kalev at smartlink.ee> - 3.0.10-1
 - Update to 3.0.10
diff --git a/mingw32-gtk3-gdk_headers.patch b/mingw32-gtk3-gdk_headers.patch
new file mode 100644
index 0000000..ba87072
--- /dev/null
+++ b/mingw32-gtk3-gdk_headers.patch
@@ -0,0 +1,173 @@
+diff -uNrp gtk+-3.0.10/gdk/win32/Makefile.am gtk+-3.0.10-greg/gdk/win32/Makefile.am
+--- gtk+-3.0.10/gdk/win32/Makefile.am	2011-01-16 09:41:33.000000000 -0600
++++ gtk+-3.0.10-greg/gdk/win32/Makefile.am	2011-07-04 07:31:25.488158548 -0500
+@@ -2,6 +2,7 @@
+ include $(top_srcdir)/Makefile.decl
+ 
+ libgdkincludedir = $(includedir)/gtk-3.0/gdk
++libgdkwin32includedir = $(includedir)/gtk-3.0/gdk/win32
+ 
+ INCLUDES = \
+ 	-DG_LOG_DOMAIN=\"Gdk\"	\
+@@ -65,4 +66,22 @@ libgdk_win32_la_SOURCES = \
+ libgdkinclude_HEADERS =		\
+ 	gdkwin32.h
+ 
++libgdkwin32include_HEADERS =	\
++	gdkdevicemanager-win32.h\
++	gdkdevice-win32.h	\
++	gdkdevice-wintab.h	\
++	gdkprivate-win32.h	\
++	gdkwin32cursor.h	\
++	gdkwin32display.h	\
++	gdkwin32displaymanager.h\
++	gdkwin32dnd.h		\
++	gdkwin32.h		\
++	gdkwin32keys.h		\
++	gdkwin32screen.h	\
++	gdkwin32window.h	\
++	gdkwindow-win32.h	\
++	pktdef.h		\
++	wintab.h		\
++	xcursors.h
++
+ -include $(top_srcdir)/git.mk
+diff -uNrp gtk+-3.0.10/gdk/win32/Makefile.in gtk+-3.0.10-greg/gdk/win32/Makefile.in
+--- gtk+-3.0.10/gdk/win32/Makefile.in	2011-05-22 21:32:10.000000000 -0500
++++ gtk+-3.0.10-greg/gdk/win32/Makefile.in	2011-07-04 07:36:02.713158691 -0500
+@@ -37,8 +37,9 @@ PRE_UNINSTALL = :
+ POST_UNINSTALL = :
+ build_triplet = @build@
+ host_triplet = @host@
+-DIST_COMMON = $(libgdkinclude_HEADERS) $(srcdir)/Makefile.am \
+-	$(srcdir)/Makefile.in $(top_srcdir)/Makefile.decl
++DIST_COMMON = $(libgdkinclude_HEADERS) $(libgdkwin32include_HEADERS) \
++	$(srcdir)/Makefile.am $(srcdir)/Makefile.in \
++	$(top_srcdir)/Makefile.decl
+ subdir = gdk/win32
+ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+ am__aclocal_m4_deps = $(top_srcdir)/m4/gtk-doc.m4 \
+@@ -122,8 +123,9 @@ am__nobase_list = $(am__nobase_strip_set
+ am__base_list = \
+   sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
+   sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
+-am__installdirs = "$(DESTDIR)$(libgdkincludedir)"
+-HEADERS = $(libgdkinclude_HEADERS)
++am__installdirs = "$(DESTDIR)$(libgdkincludedir)" \
++	"$(DESTDIR)$(libgdkwin32includedir)"
++HEADERS = $(libgdkinclude_HEADERS) $(libgdkwin32include_HEADERS)
+ RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive	\
+   distclean-recursive maintainer-clean-recursive
+ AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \
+@@ -425,6 +427,7 @@ XVFB_START = \
+ 	&& DISPLAY=:$$XID && export DISPLAY
+ 
+ libgdkincludedir = $(includedir)/gtk-3.0/gdk
++libgdkwin32includedir = $(includedir)/gtk-3.0/gdk/win32
+ INCLUDES = \
+ 	-DG_LOG_DOMAIN=\"Gdk\"	\
+ 	-DINSIDE_GDK_WIN32	\
+@@ -480,6 +483,24 @@ libgdk_win32_la_SOURCES = \
+ libgdkinclude_HEADERS = \
+ 	gdkwin32.h
+ 
++libgdkwin32include_HEADERS = \
++	gdkdevicemanager-win32.h\
++	gdkdevice-win32.h	\
++	gdkdevice-wintab.h	\
++	gdkprivate-win32.h	\
++	gdkwin32cursor.h	\
++	gdkwin32display.h	\
++	gdkwin32displaymanager.h\
++	gdkwin32dnd.h		\
++	gdkwin32.h		\
++	gdkwin32keys.h		\
++	gdkwin32screen.h	\
++	gdkwin32window.h	\
++	gdkwindow-win32.h	\
++	pktdef.h		\
++	wintab.h		\
++	xcursors.h
++
+ all: all-recursive
+ 
+ .SUFFIXES:
+@@ -602,6 +623,26 @@ uninstall-libgdkincludeHEADERS:
+ 	test -n "$$files" || exit 0; \
+ 	echo " ( cd '$(DESTDIR)$(libgdkincludedir)' && rm -f" $$files ")"; \
+ 	cd "$(DESTDIR)$(libgdkincludedir)" && rm -f $$files
++install-libgdkwin32includeHEADERS: $(libgdkwin32include_HEADERS)
++	@$(NORMAL_INSTALL)
++	test -z "$(libgdkwin32includedir)" || $(MKDIR_P) "$(DESTDIR)$(libgdkwin32includedir)"
++	@list='$(libgdkwin32include_HEADERS)'; test -n "$(libgdkwin32includedir)" || list=; \
++	for p in $$list; do \
++	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
++	  echo "$$d$$p"; \
++	done | $(am__base_list) | \
++	while read files; do \
++	  echo " $(INSTALL_HEADER) $$files '$(DESTDIR)$(libgdkwin32includedir)'"; \
++	  $(INSTALL_HEADER) $$files "$(DESTDIR)$(libgdkwin32includedir)" || exit $$?; \
++	done
++
++uninstall-libgdkwin32includeHEADERS:
++	@$(NORMAL_UNINSTALL)
++	@list='$(libgdkwin32include_HEADERS)'; test -n "$(libgdkwin32includedir)" || list=; \
++	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
++	test -n "$$files" || exit 0; \
++	echo " ( cd '$(DESTDIR)$(libgdkwin32includedir)' && rm -f" $$files ")"; \
++	cd "$(DESTDIR)$(libgdkwin32includedir)" && rm -f $$files
+ 
+ # This directory's subdirectories are mostly independent; you can cd
+ # into them and run `make' without going through this Makefile.
+@@ -802,7 +843,7 @@ check: check-recursive
+ all-am: Makefile $(LTLIBRARIES) $(HEADERS)
+ installdirs: installdirs-recursive
+ installdirs-am:
+-	for dir in "$(DESTDIR)$(libgdkincludedir)"; do \
++	for dir in "$(DESTDIR)$(libgdkincludedir)" "$(DESTDIR)$(libgdkwin32includedir)"; do \
+ 	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
+ 	done
+ install: install-recursive
+@@ -853,7 +894,8 @@ info: info-recursive
+ 
+ info-am:
+ 
+-install-data-am: install-libgdkincludeHEADERS
++install-data-am: install-libgdkincludeHEADERS \
++	install-libgdkwin32includeHEADERS
+ 
+ install-dvi: install-dvi-recursive
+ 
+@@ -899,7 +941,8 @@ ps: ps-recursive
+ 
+ ps-am:
+ 
+-uninstall-am: uninstall-libgdkincludeHEADERS
++uninstall-am: uninstall-libgdkincludeHEADERS \
++	uninstall-libgdkwin32includeHEADERS
+ 
+ .MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) check-am \
+ 	ctags-recursive install-am install-strip tags-recursive
+@@ -912,13 +955,15 @@ uninstall-am: uninstall-libgdkincludeHEA
+ 	html-am info info-am install install-am install-data \
+ 	install-data-am install-dvi install-dvi-am install-exec \
+ 	install-exec-am install-html install-html-am install-info \
+-	install-info-am install-libgdkincludeHEADERS install-man \
+-	install-pdf install-pdf-am install-ps install-ps-am \
+-	install-strip installcheck installcheck-am installdirs \
+-	installdirs-am maintainer-clean maintainer-clean-generic \
+-	mostlyclean mostlyclean-compile mostlyclean-generic \
+-	mostlyclean-libtool pdf pdf-am ps ps-am tags tags-recursive \
+-	uninstall uninstall-am uninstall-libgdkincludeHEADERS
++	install-info-am install-libgdkincludeHEADERS \
++	install-libgdkwin32includeHEADERS install-man install-pdf \
++	install-pdf-am install-ps install-ps-am install-strip \
++	installcheck installcheck-am installdirs installdirs-am \
++	maintainer-clean maintainer-clean-generic mostlyclean \
++	mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
++	pdf pdf-am ps ps-am tags tags-recursive uninstall uninstall-am \
++	uninstall-libgdkincludeHEADERS \
++	uninstall-libgdkwin32includeHEADERS
+ 
+ # call as: $(XVFB_START) && someprogram
+ 
