diff options
| author | Koen Kooi <koen@openembedded.org> | 2005-06-30 08:19:37 +0000 |
|---|---|---|
| committer | OpenEmbedded Project <openembedded-devel@lists.openembedded.org> | 2005-06-30 08:19:37 +0000 |
| commit | c8e5702127e507e82e6f68a4b8c546803accea9d (patch) | |
| tree | 00583491f40ecc640f2b28452af995e3a63a09d7 /packages/xqt/files | |
| parent | 87ec8ca4d2e2eb4d1c1e1e1a6b46a395d56805b9 (diff) | |
import clean BK tree at cset 1.3670
Diffstat (limited to 'packages/xqt/files')
| -rw-r--r-- | packages/xqt/files/.mtn2git_empty | 0 | ||||
| -rw-r--r-- | packages/xqt/files/imake-staging.patch | 38 | ||||
| -rw-r--r-- | packages/xqt/files/moc_call.patch | 16 |
3 files changed, 54 insertions, 0 deletions
diff --git a/packages/xqt/files/.mtn2git_empty b/packages/xqt/files/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/xqt/files/.mtn2git_empty diff --git a/packages/xqt/files/imake-staging.patch b/packages/xqt/files/imake-staging.patch index e69de29bb2..bf2e350830 100644 --- a/packages/xqt/files/imake-staging.patch +++ b/packages/xqt/files/imake-staging.patch @@ -0,0 +1,38 @@ +--- xc/config/cf/Imake.tmpl.orig 2004-07-28 04:24:29.000000000 +0100 ++++ xc/config/cf/Imake.tmpl 2004-09-14 21:03:06.000000000 +0100 +@@ -2038,11 +2038,11 @@ + */ + ALLINCLUDES = $(INCLUDES) $(EXTRA_INCLUDES) $(TOP_INCLUDES) $(INSTALLED_INCLUDES) $(STD_INCLUDES) + ALLDEFINES = $(ALLINCLUDES) $(STD_DEFINES) $(PROTO_DEFINES) $(THREADS_DEFINES) $(MODULE_DEFINES) $(DEFINES) $(EXTRA_DEFINES) +- CFLAGS = $(CDEBUGFLAGS) $(CCOPTIONS) $(THREADS_CFLAGS) $(MODULE_CFLAGS) $(ALLDEFINES) ++ CFLAGS = $(CDEBUGFLAGS) $(CCOPTIONS) $(THREADS_CFLAGS) $(MODULE_CFLAGS) $(ALLDEFINES) $(CC_STAGING) + LINTFLAGS = $(LINTOPTS) -DLINT $(ALLDEFINES) $(DEPEND_DEFINES) + LDPRELIB = LdPreLib $(INSTALLED_LIBS) + LDPOSTLIB = LdPostLib +- LDOPTIONS = $(CDEBUGFLAGS) $(CCOPTIONS) $(EXTRA_LDOPTIONS) $(THREADS_LDFLAGS) $(LOCAL_LDFLAGS) $(LDPRELIBS) ++ LDOPTIONS = $(CDEBUGFLAGS) $(CCOPTIONS) $(EXTRA_LDOPTIONS) $(THREADS_LDFLAGS) $(LOCAL_LDFLAGS) $(LDPRELIBS) $(LD_STAGING) + CXXLDOPTIONS = $(CXXDEBUGFLAGS) $(CXXOPTIONS) $(EXTRA_LDOPTIONS) $(THREADS_CXXLDFLAGS) $(LOCAL_LDFLAGS) $(LDPRELIBS) + + LDLIBS = $(LDPOSTLIBS) $(THREADS_LIBS) $(SYS_LIBRARIES) $(EXTRA_LIBRARIES) +--- xc/config/cf/Library.tmpl~ 2004-05-24 20:06:57.000000000 +0100 ++++ xc/config/cf/Library.tmpl 2004-09-14 21:10:29.000000000 +0100 +@@ -114,7 +114,7 @@ + STD_DEFINES = LibraryDefines $(PROJECT_DEFINES) + CDEBUGFLAGS = LibraryCDebugFlags + CLIBDEBUGFLAGS = LibraryDebugOpt +- CFLAGS = $(CDEBUGFLAGS) $(CLIBDEBUGFLAGS) $(CCOPTIONS) $(THREADS_CFLAGS) $(ALLDEFINES) ++ CFLAGS = $(CDEBUGFLAGS) $(CLIBDEBUGFLAGS) $(CCOPTIONS) $(THREADS_CFLAGS) $(ALLDEFINES) $(CC_STAGING) + # if defined(LargePICTable) && LargePICTable && defined(LargePositionIndependentCFlags) + PICFLAGS = LargePositionIndependentCFlags + # endif +--- xc/config/cf/X11.tmpl~ 2004-09-03 17:18:18.000000000 +0100 ++++ xc/config/cf/X11.tmpl 2004-09-14 21:30:30.000000000 +0100 +@@ -3359,7 +3359,7 @@ + FREETYPE2LIBDIR = Freetype2LibDir + FREETYPE2INCDIR = Freetype2IncDir + #if Freetype2LibDirStandard +-FREETYPE2LIB = -lfreetype ++FREETYPE2LIB = $(LD_STAGING) -lfreetype + #else + FREETYPE2LIB = -L$(FREETYPE2LIBDIR) LinkerRuntimeLibraryPathFlag($(FREETYPE2LIBDIR)) -lfreetype + #endif diff --git a/packages/xqt/files/moc_call.patch b/packages/xqt/files/moc_call.patch index e69de29bb2..bde386e2bc 100644 --- a/packages/xqt/files/moc_call.patch +++ b/packages/xqt/files/moc_call.patch @@ -0,0 +1,16 @@ + +# +# Patch managed by http://www.holgerschurig.de/patcher.html +# + +--- xc/programs/Xserver/hw/xqt/Imakefile~moc_call ++++ xc/programs/Xserver/hw/xqt/Imakefile +@@ -12,7 +12,7 @@ + + QTDIR = QtDir + +-MOC = QtDir/bin/moc ++MOC = MocBin + + INCLUDES = -I. \ + -I$(XBUILDINCDIR) -I$(FONTINCSRC) \ |