This is the mail archive of the cygwin-xfree@cygwin.com mailing list for the Cygwin XFree86 project.


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]
Other format: [Raw text]

Re: gtk2-x11-devel is missing gdk/gdkwin32.h


-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Andrew Schulman wrote:

| I don't know if this file has been deliberately excluded from the package
| (version 2.4.4-1), but I needed it in order to build LablGtk2.  I had
to go
| and fetch it from http://www.gimp.org/~tml/gimp/win32/gtk+-dev-2.4.7.zip.

No, it's a problem with lablgtk2.  gdk/gdkwin32.h is only for the Win32
gdktarget; the Cygwin gtk2 packages use X11 and hence use gdk/gdkx.h.
For some reason, lablgtk2 assumes that Cygwin uses Win32.  The attached
patch will fix that and the install procedure.

Yaakov

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.2.4 (Cygwin)
Comment: Using GnuPG with Thunderbird - http://enigmail.mozdev.org

iD8DBQFBO5e/piWmPGlmQSMRAi3SAKD0zIMFgR3bZbi1JS/ypwE44Jrh/ACeJejc
WM3FyIdGPBzl3syzYq9rY94=
=ayHX
-----END PGP SIGNATURE-----
diff -urN -x .build -x .inst -x .sinst lablgtk-2.4.0-orig/src/Makefile lablgtk-2.4.0/src/Makefile
--- lablgtk-2.4.0-orig/src/Makefile	2004-07-15 04:43:35.000000000 -0400
+++ lablgtk-2.4.0/src/Makefile	2004-09-05 18:44:19.924500000 -0400
@@ -206,34 +206,34 @@
 
 install:
 	mkdir -p "$(INSTALLDIR)" "$(BINDIR)" "$(DLLDIR)"
-	cp $(ALLOBJS:.cmo=.cmi) $(THOBJS:.cmo=.cmi) "$(INSTALLDIR)"
-	cp -p *.mli "$(INSTALLDIR)"
-	cp -p $(ALLOBJS:.cmo=.ml) $(ALLTHOBJS:.cmo=.ml) "$(INSTALLDIR)"
-	cp $(MLLIBS) $(THOBJS) $(INITOBJS) $(THINITOBJS) "$(INSTALLDIR)"
-	cp $(CLIBS) "$(INSTALLDIR)"
+	install $(ALLOBJS:.cmo=.cmi) $(THOBJS:.cmo=.cmi) "$(INSTALLDIR)"
+	install *.mli "$(INSTALLDIR)"
+	install $(ALLOBJS:.cmo=.ml) $(ALLTHOBJS:.cmo=.ml) "$(INSTALLDIR)"
+	install $(MLLIBS) $(THOBJS) $(INITOBJS) $(THINITOBJS) "$(INSTALLDIR)"
+	install $(CLIBS) "$(INSTALLDIR)"
 	cd "$(INSTALLDIR)" && $(RANLIB) $(CLIBS)
-	cp varcc$(XE) propcc$(XE) "$(INSTALLDIR)"
+	install varcc$(XE) propcc$(XE) "$(INSTALLDIR)"
 	if test $(THREADS_LIB) != system || test $(HAS_DLL_SUPPORT) != yes; \
-	   then cp lablgtktop$(XE) "$(INSTALLDIR)"; \
+	   then install lablgtktop$(XE) "$(INSTALLDIR)"; \
 	fi
-	cp -p *.h "$(INSTALLDIR)"
+	install *.h "$(INSTALLDIR)"
 	@if test -f lablgtk.cmxa; then $(MAKE) installopt; fi
 	@if test -f dlllablgtk2$(XS); then $(MAKE) installdll; fi
-	cp lablgtk2$(XB) "$(BINDIR)"
+	install lablgtk2$(XB) "$(BINDIR)"
 	if test -f lablgladecc$(XE); then \
-	   cp lablgladecc$(XE) "$(BINDIR)/lablgladecc2$(XE)"; fi
+	   install lablgladecc$(XE) "$(BINDIR)/lablgladecc2$(XE)"; fi
 
 installdll:
-	cp $(CLIBS:lib%$(XA)=dll%$(XS)) "$(DLLDIR)" || \
+	install $(CLIBS:lib%$(XA)=dll%$(XS)) "$(DLLDIR)" || \
 	   echo "Couldn't install dlls in default location: $(DLLDIR)"
 
 installopt:
-	cp $(MLLIBS:.cma=.cmxa) $(MLLIBS:.cma=$(XA)) "$(INSTALLDIR)"
+	install $(MLLIBS:.cma=.cmxa) $(MLLIBS:.cma=$(XA)) "$(INSTALLDIR)"
 	cd "$(INSTALLDIR)" && $(RANLIB) $(MLLIBS:.cma=$(XA))
-	cp $(ALLOBJS:.cmo=.cmx) "$(INSTALLDIR)"
-	cp $(INITOBJS:.cmo=$(XO)) "$(INSTALLDIR)"
+	install $(ALLOBJS:.cmo=.cmx) "$(INSTALLDIR)"
+	install $(INITOBJS:.cmo=$(XO)) "$(INSTALLDIR)"
 	if test -f gtkThread.cmx; then \
-	   cp $(THOBJS:.cmo=.cmx) $(THOBJS:.cmo=$(XO)) "$(INSTALLDIR)"; fi
+	   install $(THOBJS:.cmo=.cmx) $(THOBJS:.cmo=$(XO)) "$(INSTALLDIR)"; fi
 
 ifeq ($(TOOLCHAIN),msvc)
 liblablgtk2$(XA): $(COBJS)
diff -urN -x .build -x .inst -x .sinst lablgtk-2.4.0-orig/src/ml_gdk.c lablgtk-2.4.0/src/ml_gdk.c
--- lablgtk-2.4.0-orig/src/ml_gdk.c	2004-06-15 17:42:30.000000000 -0400
+++ lablgtk-2.4.0/src/ml_gdk.c	2004-09-05 18:38:44.830750000 -0400
@@ -2,7 +2,7 @@
 
 #include <string.h>
 #include <gdk/gdk.h>
-#if defined(_WIN32) || defined(__CYGWIN__)
+#if defined(_WIN32)
 #include <gdk/gdkwin32.h>
 #else
 #include <gdk/gdkx.h>

Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]