diff options
| author | marcus <marcus@FreeBSD.org> | 2004-03-31 15:12:32 +0800 |
|---|---|---|
| committer | marcus <marcus@FreeBSD.org> | 2004-03-31 15:12:32 +0800 |
| commit | 02e2e6dc936a3b62484b2e5a3813b4eefb2fd980 (patch) | |
| tree | 393b58c8db4f165603dd3d33df5b3327f654846b /x11-toolkits | |
| parent | 923b0bffb32eb50922e75efa52d17135692b9b0d (diff) | |
| download | freebsd-ports-gnome-02e2e6dc936a3b62484b2e5a3813b4eefb2fd980.tar.gz freebsd-ports-gnome-02e2e6dc936a3b62484b2e5a3813b4eefb2fd980.tar.zst freebsd-ports-gnome-02e2e6dc936a3b62484b2e5a3813b4eefb2fd980.zip | |
Add some more patches from Freedesktop to try and fix this ports compilation
problems.
Reported by: bento via kris
Diffstat (limited to 'x11-toolkits')
| -rw-r--r-- | x11-toolkits/libXt/files/patch-Makefile.in | 23 | ||||
| -rw-r--r-- | x11-toolkits/libXt/files/patch-include_Makefile.in | 17 |
2 files changed, 34 insertions, 6 deletions
diff --git a/x11-toolkits/libXt/files/patch-Makefile.in b/x11-toolkits/libXt/files/patch-Makefile.in index 41044d85d446..7eb8bbee5796 100644 --- a/x11-toolkits/libXt/files/patch-Makefile.in +++ b/x11-toolkits/libXt/files/patch-Makefile.in @@ -1,14 +1,21 @@ ---- Makefile.in.orig Mon Mar 22 13:52:13 2004 -+++ Makefile.in Mon Mar 22 13:59:02 2004 -@@ -163,7 +163,7 @@ +--- Makefile.in.orig Wed Mar 31 01:57:05 2004 ++++ Makefile.in Wed Mar 31 02:07:39 2004 +@@ -163,12 +163,12 @@ SUBDIRS = include util -AM_CFLAGS = $(RENDER_CFLAGS) $(X_CFLAGS) -I$(top_srcdir)/include/X11 -+AM_CFLAGS = $(RENDER_CFLAGS) $(X_CFLAGS) -I$(top_srcdir)/include -I$(top_srcdir)/include/X11 ++AM_CFLAGS = $(RENDER_CFLAGS) $(X_CFLAGS) $(SM_CFLAGS) -I$(top_srcdir)/include -I$(top_srcdir)/include/X11 lib_LTLIBRARIES = libXt.la +-BUILT_SOURCES = StringDefs.c StringDefs.h Shell.h +-CLEANFILES = StringDefs.c StringDefs.h Shell.h ++BUILT_SOURCES = StringDefs.c include/X11/StringDefs.h include/X11/Shell.h ++CLEANFILES=StringDefs.c StringDefs.h Shell.h include/X11/StringDefs.h include/X11/Shell.h + + nodist_libXt_la_SOURCES = StringDefs.c + @@ -210,7 +210,6 @@ Manage.c \ NextEvent.c \ @@ -17,3 +24,11 @@ PassivGraI.h \ PassivGrab.c \ Pointer.c \ +@@ -899,6 +898,7 @@ + $(top_builddir)/util/makestrs $(STRINGSABIOPTIONS) < $(STRING_LIST) > StringDefs.c + install -d include/X11/ + install -m644 $(top_builddir)/StringDefs.h include/X11/ ++ install -m644 $(top_builddir)/Shell.h include/X11/ + + $(top_builddir)/util/makestrs$(EXEEXT): force + cd util; $(MAKE) diff --git a/x11-toolkits/libXt/files/patch-include_Makefile.in b/x11-toolkits/libXt/files/patch-include_Makefile.in index 17a579a3fd58..1043ff8581da 100644 --- a/x11-toolkits/libXt/files/patch-include_Makefile.in +++ b/x11-toolkits/libXt/files/patch-include_Makefile.in @@ -1,5 +1,5 @@ ---- include/Makefile.in.orig Mon Mar 22 13:58:27 2004 -+++ include/Makefile.in Mon Mar 22 13:58:41 2004 +--- include/Makefile.in.orig Wed Mar 31 01:57:05 2004 ++++ include/Makefile.in Wed Mar 31 02:09:56 2004 @@ -148,6 +148,7 @@ X11/Intrinsic.h \ X11/IntrinsicP.h \ @@ -8,3 +8,16 @@ X11/RectObj.h \ X11/RectObjP.h \ X11/ShellP.h \ +@@ -155,9 +156,10 @@ + X11/VendorP.h + + nodist_xtinclude_HEADERS = \ +- X11/StringDefs.h ++ X11/StringDefs.h \ ++ X11/Shell.h + +-DISTCLEANFILES = X11/StringDefs.h ++DISTCLEANFILES = X11/StringDefs.h X11/Shell.h + subdir = include + ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 + mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs |