From 2d2e72dfd96bfba7a357c9b62ef46e9d4c23c17c Mon Sep 17 00:00:00 2001 From: branch-fixup Date: Fri, 16 Aug 2002 10:36:27 +0000 Subject: [PATCH] Add files from parent branch HEAD: print/cjk-lyx/patches/patch-ab print/cjk-lyx/patches/patch-ad print/cjk-lyx/patches/patch-ae print/cjk-lyx/patches/patch-af --- print/cjk-lyx/patches/patch-ab | 96 ++++++++++++++++++++++++++++++++++ print/cjk-lyx/patches/patch-ad | 41 +++++++++++++++ print/cjk-lyx/patches/patch-ae | 26 +++++++++ print/cjk-lyx/patches/patch-af | 68 ++++++++++++++++++++++++ 4 files changed, 231 insertions(+) create mode 100644 print/cjk-lyx/patches/patch-ab create mode 100644 print/cjk-lyx/patches/patch-ad create mode 100644 print/cjk-lyx/patches/patch-ae create mode 100644 print/cjk-lyx/patches/patch-af diff --git a/print/cjk-lyx/patches/patch-ab b/print/cjk-lyx/patches/patch-ab new file mode 100644 index 000000000000..27460a6398ae --- /dev/null +++ b/print/cjk-lyx/patches/patch-ab @@ -0,0 +1,96 @@ +$NetBSD: patch-ab,v 1.1.1.1 2002/07/19 12:32:32 agc Exp $ + +--- src/Makefile.in.orig Thu May 23 20:05:19 2002 ++++ src/Makefile.in +@@ -370,6 +370,8 @@ + lyx_main.h \ + lyx_sty.C \ + lyx_sty.h \ ++ lyxcodeconv.C \ ++ lyxcodeconv.h \ + lyxcursor.C \ + lyxcursor.h \ + lyxfont.C \ +@@ -380,6 +382,8 @@ + lyxfunc.h \ + lyxgluelength.C \ + lyxgluelength.h \ ++ lyxim.C \ ++ lyxim.h \ + lyxlayout.C \ + lyxlayout.h \ + lyxlength.C \ +@@ -476,6 +480,7 @@ + kbsequence.$(OBJEXT) language.$(OBJEXT) lastfiles.$(OBJEXT) \ + lengthcommon.$(OBJEXT) lyx_cb.$(OBJEXT) lyx_gui.$(OBJEXT) \ + lyx_main.$(OBJEXT) lyx_sty.$(OBJEXT) lyxcursor.$(OBJEXT) \ ++ lyxcodeconv.$(OBJEXT) lyxim.$(OBJEXT) \ + lyxfont.$(OBJEXT) lyxfind.$(OBJEXT) lyxfunc.$(OBJEXT) \ + lyxgluelength.$(OBJEXT) lyxlayout.$(OBJEXT) lyxlength.$(OBJEXT) \ + lyxlex.$(OBJEXT) lyxlex_pimpl.$(OBJEXT) lyxlookup.$(OBJEXT) \ +@@ -548,6 +548,11 @@ depcomp = $(SHELL) $(top_srcdir)/config/ + @AMDEP_TRUE@ $(DEPDIR)/undo_funcs.Po $(DEPDIR)/undostack.Po \ + @AMDEP_TRUE@ $(DEPDIR)/vc-backend.Po $(DEPDIR)/version.Po \ + @AMDEP_TRUE@ $(DEPDIR)/vspace.Po ++CXXCOMPILE_NOOPT = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ ++ $(AM_CPPFLAGS) $(CPPFLAGS_NOOPT) $(AM_CXXFLAGS) $(CXXFLAGS_NOOPT) ++LTCXXCOMPILE_NOOPT = $(LIBTOOL) --mode=compile $(CXX) $(DEFS) \ ++ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS_NOOPT) \ ++ $(AM_CXXFLAGS) $(CXXFLAGS_NOOPT) + CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ + $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) + LTCXXCOMPILE = $(LIBTOOL) --mode=compile $(CXX) $(DEFS) \ +@@ -558,6 +563,8 @@ CXXLINK = $(LIBTOOL) --mode=link $(CXXLD + $(AM_LDFLAGS) $(LDFLAGS) -o $@ + CXXFLAGS = @CXXFLAGS@ + CFLAGS = @CFLAGS@ ++CPPFLAGS_NOOPT = $(CPPFLAGS:C/-O[0-9]*//) ++CXXFLAGS_NOOPT = $(CXXFLAGS:C/-O[0-9]*//) + COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ + $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) + LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \ +@@ -579,8 +586,15 @@ SOURCES = $(lyx_SOURCES) + all: $(BUILT_SOURCES) config.h + $(MAKE) $(AM_MAKEFLAGS) all-recursive + ++buffer.o: buffer.cc ++buffer.lo: buffer.cc ++lyxfunc.o: lyxfunc.cc ++lyxfunc.lo: lyxfunc.cc ++tex-accent.o: tex-accent.cc ++tex-accent.lo: tex-accent.cc ++ + .SUFFIXES: +-.SUFFIXES: .C .lo .o .obj ++.SUFFIXES: .C .cc .lo .o .obj + + mostlyclean-libtool: + -rm -f *.lo +@@ -752,6 +766,14 @@ distclean-compile: + + distclean-depend: + -rm -rf $(DEPDIR) ++.C.cc: ++ cp -f $< $@ ++ ++.cc.o: ++@AMDEP_TRUE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ ++@AMDEP_TRUE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ ++@AMDEP_TRUE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ++ $(CXXCOMPILE_NOOPT) -c -o $@ `test -f $< || echo '$(srcdir)/'`$< + + .C.o: + @AMDEP_TRUE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@@ -764,6 +786,12 @@ distclean-depend: + @AMDEP_TRUE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ + @AMDEP_TRUE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ + $(CXXCOMPILE) -c -o $@ `cygpath -w $<` ++ ++.cc.lo: ++@AMDEP_TRUE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ ++@AMDEP_TRUE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@ ++@AMDEP_TRUE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ++ $(LTCXXCOMPILE_NOOPT) -c -o $@ `test -f $< || echo '$(srcdir)/'`$< + + .C.lo: + @AMDEP_TRUE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ diff --git a/print/cjk-lyx/patches/patch-ad b/print/cjk-lyx/patches/patch-ad new file mode 100644 index 000000000000..8478191e87a9 --- /dev/null +++ b/print/cjk-lyx/patches/patch-ad @@ -0,0 +1,41 @@ +$NetBSD: patch-ac,v 1.1 2002/08/11 02:34:26 dmcmahill Exp $ + +--- src/insets/Makefile.in.orig Thu May 23 08:05:22 2002 ++++ src/insets/Makefile.in +@@ -352,10 +352,17 @@ CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_IN + LTCXXCOMPILE = $(LIBTOOL) --mode=compile $(CXX) $(DEFS) \ + $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ + $(AM_CXXFLAGS) $(CXXFLAGS) ++CXXCOMPILE_NOOPT = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ ++ $(AM_CPPFLAGS) $(CPPFLAGS_NOOPT) $(AM_CXXFLAGS) $(CXXFLAGS_NOOPT) ++LTCXXCOMPILE_NOOPT = $(LIBTOOL) --mode=compile $(CXX) $(DEFS) \ ++ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS_NOOPT) \ ++ $(AM_CXXFLAGS) $(CXXFLAGS_NOOPT) + CXXLD = $(CXX) + CXXLINK = $(LIBTOOL) --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \ + $(AM_LDFLAGS) $(LDFLAGS) -o $@ + CXXFLAGS = @CXXFLAGS@ ++CPPFLAGS_NOOPT = $(CPPFLAGS:C/-O[1-9]*//) ++CXXFLAGS_NOOPT = $(CXXFLAGS:C/-O[1-9]*//) + CFLAGS = @CFLAGS@ + COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ + $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +@@ -369,6 +376,18 @@ DIST_COMMON = ChangeLog Makefile.am Make + SOURCES = $(libinsets_la_SOURCES) + + all: all-am ++ ++insetlatexaccent.o: insetlatexaccent.C ++@AMDEP_TRUE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ ++@AMDEP_TRUE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ ++@AMDEP_TRUE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ++ $(CXXCOMPILE_NOOPT) -c -o $@ `test -f $< || echo '$(srcdir)/'`$< ++ ++insetlatexaccent.lo: insetlatexaccent.C ++@AMDEP_TRUE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ ++@AMDEP_TRUE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@ ++@AMDEP_TRUE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ++ $(LTCXXCOMPILE_NOOPT) -c -o $@ `test -f $< || echo '$(srcdir)/'`$< + + .SUFFIXES: + .SUFFIXES: .C .lo .o .obj diff --git a/print/cjk-lyx/patches/patch-ae b/print/cjk-lyx/patches/patch-ae new file mode 100644 index 000000000000..67665300c3fa --- /dev/null +++ b/print/cjk-lyx/patches/patch-ae @@ -0,0 +1,26 @@ +$NetBSD: patch-ad,v 1.1 2002/08/11 02:34:26 dmcmahill Exp $ + +--- boost/boost/detail/limits.hpp.orig Wed Aug 29 18:33:34 2001 ++++ boost/boost/detail/limits.hpp +@@ -38,12 +38,21 @@ + #include // for WCHAR_MIN and WCHAR_MAX + #include + ++#ifdef __NetBSD__ ++#include ++#if BYTE_ORDER == BIG_ENDIAN ++#define BOOST_BIG_ENDIAN ++#else ++#define BOOST_LITTLE_ENDIAN ++#endif ++#else + #if defined(__sparc) || defined(__sparc__) || defined(__powerpc__) || defined(__ppc__) || defined(__hppa) || defined(_MIPSEB) + #define BOOST_BIG_ENDIAN + #elif defined(__i386__) + #define BOOST_LITTLE_ENDIAN + #else + #error The file boost/detail/limits.hpp needs to be set up for your CPU type. ++#endif + #endif + + namespace std { diff --git a/print/cjk-lyx/patches/patch-af b/print/cjk-lyx/patches/patch-af new file mode 100644 index 000000000000..b7f3f8617cff --- /dev/null +++ b/print/cjk-lyx/patches/patch-af @@ -0,0 +1,68 @@ +$NetBSD: patch-ae,v 1.1 2002/08/11 02:34:26 dmcmahill Exp $ + +--- src/frontends/xforms/Makefile.in.orig Sat Aug 10 00:22:18 2002 ++++ src/frontends/xforms/Makefile.in +@@ -656,10 +656,17 @@ CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_IN + LTCXXCOMPILE = $(LIBTOOL) --mode=compile $(CXX) $(DEFS) \ + $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ + $(AM_CXXFLAGS) $(CXXFLAGS) ++CXXCOMPILE_NOOPT = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ ++ $(AM_CPPFLAGS) $(CPPFLAGS_NOOPT) $(AM_CXXFLAGS) $(CXXFLAGS_NOOPT) ++LTCXXCOMPILE_NOOPT = $(LIBTOOL) --mode=compile $(CXX) $(DEFS) \ ++ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS_NOOPT) \ ++ $(AM_CXXFLAGS) $(CXXFLAGS_NOOPT) + CXXLD = $(CXX) + CXXLINK = $(LIBTOOL) --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \ + $(AM_LDFLAGS) $(LDFLAGS) -o $@ + CXXFLAGS = @CXXFLAGS@ ++CPPFLAGS_NOOPT = $(CPPFLAGS:C/-O[1-9]*//) ++CXXFLAGS_NOOPT = $(CXXFLAGS:C/-O[1-9]*//) + COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ + $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) + LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \ +@@ -678,10 +685,15 @@ DIST_COMMON = ChangeLog Makefile.am Make + DIST_SUBDIRS = $(SUBDIRS) + SOURCES = $(libxforms_la_SOURCES) + ++FormForks.o: FormForks.cc ++FormForks.lo: FormForks.cc ++FormPreferences.o: FormPreferences.cc ++FormPreferences.lo: FormPreferences.cc ++ + all: all-recursive + + .SUFFIXES: +-.SUFFIXES: .C .c .lo .o .obj ++.SUFFIXES: .C .c .cc .lo .o .obj + + mostlyclean-libtool: + -rm -f *.lo +@@ -813,6 +825,15 @@ distclean-compile: + distclean-depend: + -rm -rf $(DEPDIR) + ++.C.cc: ++ cp -f $< $@ ++ ++.cc.o: ++@AMDEP_TRUE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ ++@AMDEP_TRUE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ ++@AMDEP_TRUE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ++ $(CXXCOMPILE_NOOPT) -c -o $@ `test -f $< || echo '$(srcdir)/'`$< ++ + .C.o: + @AMDEP_TRUE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ + @AMDEP_TRUE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ +@@ -824,6 +845,12 @@ distclean-depend: + @AMDEP_TRUE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ + @AMDEP_TRUE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ + $(CXXCOMPILE) -c -o $@ `cygpath -w $<` ++ ++.cc.lo: ++@AMDEP_TRUE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ ++@AMDEP_TRUE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@ ++@AMDEP_TRUE@ $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ ++ $(LTCXXCOMPILE_NOOPT) -c -o $@ `test -f $< || echo '$(srcdir)/'`$< + + .C.lo: + @AMDEP_TRUE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ -- 2.41.0