diff options
author | 2005-09-30 21:26:05 +0000 | |
---|---|---|
committer | 2005-09-30 21:26:05 +0000 | |
commit | 90ab80b0aa7fd305d462b84797ce262ee3e7856d (patch) | |
tree | 5d2aacf4434ecac6d863c8878a962a56a26e7663 /app-emulation/pose/files | |
parent | Stable on sh wrt #106105. (diff) | |
download | historical-90ab80b0aa7fd305d462b84797ce262ee3e7856d.tar.gz historical-90ab80b0aa7fd305d462b84797ce262ee3e7856d.tar.bz2 historical-90ab80b0aa7fd305d462b84797ce262ee3e7856d.zip |
Remove old ebuild. Bundled up patches in one file and sent them to mirrors. Use epatch instead of patch and emake instead of make.
Package-Manager: portage-2.0.52-r1
Diffstat (limited to 'app-emulation/pose/files')
-rw-r--r-- | app-emulation/pose/files/choose-gl.diff | 24 | ||||
-rw-r--r-- | app-emulation/pose/files/detect-fluid.diff | 48 | ||||
-rw-r--r-- | app-emulation/pose/files/digest-pose-3.5-r1 | 2 | ||||
-rw-r--r-- | app-emulation/pose/files/digest-pose-3.5-r4 | 1 | ||||
-rw-r--r-- | app-emulation/pose/files/gcc-3.3_fix.diff.bz2 | bin | 5023 -> 0 bytes | |||
-rw-r--r-- | app-emulation/pose/files/init-clipwidget.diff | 18 | ||||
-rw-r--r-- | app-emulation/pose/files/separate-builddir.diff | 62 |
7 files changed, 1 insertions, 154 deletions
diff --git a/app-emulation/pose/files/choose-gl.diff b/app-emulation/pose/files/choose-gl.diff deleted file mode 100644 index f174c0ab8f5f..000000000000 --- a/app-emulation/pose/files/choose-gl.diff +++ /dev/null @@ -1,24 +0,0 @@ ---- Emulator_Src_3.4/BuildUnix/configure.in.orig Thu Feb 21 23:06:38 2002 -+++ Emulator_Src_3.4/BuildUnix/configure.in Thu Feb 21 23:05:57 2002 -@@ -321,6 +321,13 @@ - - GLLIB= - -+dnl When we go to FLTK 1.1 this will get easier: we will be able to ask -+dnl FLTK whether it needs GL via fltk-config -+ -+AC_ARG_ENABLE(gl, -+ [ --disable-gl use OpenGL (default yes)]) -+ -+if test x$enable_gl != xno; then - AC_CHECK_HEADER(GL/gl.h, - AC_CHECK_LIB(GL, glXMakeCurrent, AC_DEFINE(HAVE_GL) GLLIB="-lGL", \ - AC_CHECK_LIB(MesaGL, glXMakeCurrent, AC_DEFINE(HAVE_GL) GLLIB=" -lMesaGL",,\ -@@ -337,6 +344,7 @@ - GLLIB="-lMesaGLU $GLLIB" - fi - ) -+fi - - AC_SUBST(GLLIB) - diff --git a/app-emulation/pose/files/detect-fluid.diff b/app-emulation/pose/files/detect-fluid.diff deleted file mode 100644 index 5d2795d2b039..000000000000 --- a/app-emulation/pose/files/detect-fluid.diff +++ /dev/null @@ -1,48 +0,0 @@ -diff -urNp orig-Emulator_Src_3.4/BuildUnix/Makefile.am Emulator_Src_3.4/BuildUnix/Makefile.am ---- orig-Emulator_Src_3.4/BuildUnix/Makefile.am Thu Jan 31 02:55:31 2002 -+++ Emulator_Src_3.4/BuildUnix/Makefile.am Mon Feb 18 10:48:21 2002 -@@ -415,7 +415,7 @@ ResStrings.cpp: $(srcdir)/../SrcShared/S - perl -x $(srcdir)/../SrcShared/Strings.txt - - EmDlgFltkFactory.h EmDlgFltkFactory.cpp : $(srcdir)/../SrcUnix/EmDlgFltkFactory.fl -- fluid -c $(srcdir)/../SrcUnix/EmDlgFltkFactory.fl -+ $(FLUID) -c $(srcdir)/../SrcUnix/EmDlgFltkFactory.fl - - EmDlgFltk.o : EmDlgFltkFactory.h - -diff -urNp orig-Emulator_Src_3.4/BuildUnix/configure.in Emulator_Src_3.4/BuildUnix/configure.in ---- orig-Emulator_Src_3.4/BuildUnix/configure.in Thu Jan 31 02:55:25 2002 -+++ Emulator_Src_3.4/BuildUnix/configure.in Mon Feb 18 10:48:21 2002 -@@ -34,6 +34,9 @@ AC_ARG_WITH(fltk, - [ --with-fltk=DIR use FLTK in DIR], [ - CPPFLAGS="${CPPFLAGS} -I$withval/include" - LDFLAGS="${LDFLAGS} -L$withval/lib" -+ if test "${FLUID+set}" != set; then -+ test -r $withval/bin/fluid && FLUID=$withval/bin/fluid -+ fi - ]) - - -@@ -340,7 +343,8 @@ AC_SUBST(GLLIB) - - dnl ======================================================== - dnl Make sure FLTK is available. It must be installed on --dnl a standard path, or on $x_libraries. -+dnl a standard path, or on $x_libraries. Also check that -+dnl fluid is available (in PATH, or via --with-fltk). - dnl ======================================================== - - AC_CACHE_SAVE -@@ -355,8 +359,11 @@ AC_CACHE_CHECK([for 'int fl_height (void - pose_cv_lib_fltk_found=yes, pose_cv_lib_fltk_found=no)) - - LIBS="$save_LIBS" -+ -+dnl $FLUID may have already been set by --with-fltk, above -+AC_CHECK_PROG(FLUID, fluid, fluid, no) - --if test $pose_cv_lib_fltk_found = yes; then -+if test $pose_cv_lib_fltk_found = yes && test $FLUID != no; then - AC_DEFINE(HAVE_LIBFLTK) - else - AC_MSG_ERROR(*** FLTK *must* be installed before running configure. ***) diff --git a/app-emulation/pose/files/digest-pose-3.5-r1 b/app-emulation/pose/files/digest-pose-3.5-r1 deleted file mode 100644 index 662101a539e1..000000000000 --- a/app-emulation/pose/files/digest-pose-3.5-r1 +++ /dev/null @@ -1,2 +0,0 @@ -MD5 c69b10798e524b999739bf1950125655 emulator_src_3.5.tar.gz 3162363 -MD5 e917767d012bcd8953a5d811e68134ff fltk-1.0.11-source.tar.bz2 999099 diff --git a/app-emulation/pose/files/digest-pose-3.5-r4 b/app-emulation/pose/files/digest-pose-3.5-r4 index 6f7eb38e3cc3..de259cfc3bc2 100644 --- a/app-emulation/pose/files/digest-pose-3.5-r4 +++ b/app-emulation/pose/files/digest-pose-3.5-r4 @@ -1 +1,2 @@ MD5 c69b10798e524b999739bf1950125655 emulator_src_3.5.tar.gz 3162363 +MD5 6befe71b018db9d1384ad75b84b71e21 pose-3.5-genpatches.tar.bz2 8024 diff --git a/app-emulation/pose/files/gcc-3.3_fix.diff.bz2 b/app-emulation/pose/files/gcc-3.3_fix.diff.bz2 Binary files differdeleted file mode 100644 index b0a6f6d717ec..000000000000 --- a/app-emulation/pose/files/gcc-3.3_fix.diff.bz2 +++ /dev/null diff --git a/app-emulation/pose/files/init-clipwidget.diff b/app-emulation/pose/files/init-clipwidget.diff deleted file mode 100644 index ef99aeafd7f6..000000000000 --- a/app-emulation/pose/files/init-clipwidget.diff +++ /dev/null @@ -1,18 +0,0 @@ ---- SrcUnix/EmApplicationFltk.cpp.orig Tue Apr 16 12:51:13 2002 -+++ SrcUnix/EmApplicationFltk.cpp Tue Apr 16 12:51:28 2002 -@@ -115,6 +115,7 @@ - - EmApplicationFltk::EmApplicationFltk (void) : - EmApplication (), -+ fClipboardWidget (NULL), - fAppWindow (NULL) - { - EmAssert (gHostApplication == NULL); -@@ -138,6 +139,7 @@ - EmApplicationFltk::~EmApplicationFltk (void) - { - delete fAppWindow; -+ delete fClipboardWidget; - - EmAssert (gHostApplication == this); - gHostApplication = NULL; diff --git a/app-emulation/pose/files/separate-builddir.diff b/app-emulation/pose/files/separate-builddir.diff deleted file mode 100644 index aa8292b2da12..000000000000 --- a/app-emulation/pose/files/separate-builddir.diff +++ /dev/null @@ -1,62 +0,0 @@ -diff -urNp orig-Emulator_Src_3.4/BuildUnix/Gzip/Makefile.am Emulator_Src_3.4/BuildUnix/Gzip/Makefile.am ---- orig-Emulator_Src_3.4/BuildUnix/Gzip/Makefile.am Thu Jan 31 02:55:25 2002 -+++ Emulator_Src_3.4/BuildUnix/Gzip/Makefile.am Mon Feb 18 10:55:27 2002 -@@ -8,7 +8,7 @@ - ## - SUFFIXES = .cpp - --VPATH = $(srcdir)/../../SrcShared/Gzip: -+VPATH = $(srcdir):$(srcdir)/../../SrcShared/Gzip: - - ## no subdir specific flags needed -- just go with globals - LOCAL_CFLAGS = -diff -urNp orig-Emulator_Src_3.4/BuildUnix/Makefile.am Emulator_Src_3.4/BuildUnix/Makefile.am ---- orig-Emulator_Src_3.4/BuildUnix/Makefile.am Thu Jan 31 02:55:31 2002 -+++ Emulator_Src_3.4/BuildUnix/Makefile.am Mon Feb 18 10:55:27 2002 -@@ -8,7 +8,8 @@ SUBDIRS = Gzip jpeg espws-2.0 - - SUFFIXES = .cpp - --VPATH = $(srcdir)/../SrcUnix: \ -+VPATH = $(srcdir): \ -+ $(srcdir)/../SrcUnix: \ - $(srcdir)/../SrcShared: \ - $(srcdir)/../SrcShared/Hardware: \ - $(srcdir)/../SrcShared/Hardware/TRG: \ -@@ -402,9 +403,9 @@ endif - - bin_PROGRAMS = pose - --pose_LDADD = $(srcdir)/Gzip/libposergzip.a --pose_LDADD += $(srcdir)/jpeg/libposerjpeg.a --pose_LDADD += $(srcdir)/espws-2.0/libposerespws.a -+pose_LDADD = Gzip/libposergzip.a -+pose_LDADD += jpeg/libposerjpeg.a -+pose_LDADD += espws-2.0/libposerespws.a - pose_LDADD += -lfltk - pose_LDADD += -L/usr/local/lib $(X_LIBS) -lXext -lX11 $(THREAD_LIBS) $(GLLIB) -lm - -diff -urNp orig-Emulator_Src_3.4/BuildUnix/espws-2.0/Makefile.am Emulator_Src_3.4/BuildUnix/espws-2.0/Makefile.am ---- orig-Emulator_Src_3.4/BuildUnix/espws-2.0/Makefile.am Thu Jan 31 02:55:25 2002 -+++ Emulator_Src_3.4/BuildUnix/espws-2.0/Makefile.am Mon Feb 18 10:55:27 2002 -@@ -9,7 +9,7 @@ - ## - SUFFIXES = .cxx - --VPATH = $(srcdir)/../../SrcUnix/espws-2.0: -+VPATH = $(srcdir):$(srcdir)/../../SrcUnix/espws-2.0: - - CFLAGS = $(POSER_CFLAGS) $(LOCAL_CFLAGS) $(X_CFLAGS) - CXXFLAGS = $(POSER_CXXFLAGS) $(LOCAL_CFLAGS) $(X_CFLAGS) -diff -urNp orig-Emulator_Src_3.4/BuildUnix/jpeg/Makefile.am Emulator_Src_3.4/BuildUnix/jpeg/Makefile.am ---- orig-Emulator_Src_3.4/BuildUnix/jpeg/Makefile.am Thu Jan 31 02:55:25 2002 -+++ Emulator_Src_3.4/BuildUnix/jpeg/Makefile.am Mon Feb 18 10:55:27 2002 -@@ -9,7 +9,7 @@ - ## - SUFFIXES = .cpp - --VPATH = $(srcdir)/../../SrcShared/jpeg: -+VPATH = $(srcdir):$(srcdir)/../../SrcShared/jpeg: - - ## no subdir specific flags needed -- just go with globals - LOCAL_CFLAGS = |