rpms/MagicPoint/devel MagicPoint.spec, NONE, 1.1 magicpoint-1.08a-redhat.patch, NONE, 1.1 magicpoint-1.09a-rpath.patch, NONE, 1.1 magicpoint-1.10a-fix-gcc34.patch, NONE, 1.1 magicpoint-1.10a-fix-usleep.patch, NONE, 1.1 magicpoint-1.10a-longline.patch, NONE, 1.1 magicpoint-1.11a-fix-gcc-warnings.patch, NONE, 1.1 magicpoint-1.11b-fix-undefined-operation.patch, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Colin Charles (byte)
fedora-extras-commits at redhat.com
Mon Jun 27 05:48:42 UTC 2005
Author: byte
Update of /cvs/extras/rpms/MagicPoint/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26172/devel
Modified Files:
.cvsignore sources
Added Files:
MagicPoint.spec magicpoint-1.08a-redhat.patch
magicpoint-1.09a-rpath.patch magicpoint-1.10a-fix-gcc34.patch
magicpoint-1.10a-fix-usleep.patch
magicpoint-1.10a-longline.patch
magicpoint-1.11a-fix-gcc-warnings.patch
magicpoint-1.11b-fix-undefined-operation.patch
Log Message:
auto-import MagicPoint-1.11b-2 on branch devel from MagicPoint-1.11b-2.src.rpm
initial import of MagicPoint
--- NEW FILE MagicPoint.spec ---
%define x11dir %{_prefix}/X11R6
%define x11bindir %{x11dir}/bin
%define x11datadir %{x11dir}/lib
%define x11mandir %{x11dir}/man
Summary: X based presentation software.
Name: MagicPoint
Version: 1.11b
Release: 2
License: BSD
Group: Applications/Productivity
URL: http://www.mew.org/mgp
Source: ftp://ftp.mew.org/pub/MagicPoint/magicpoint-%{version}.tar.gz
Patch1: magicpoint-1.08a-redhat.patch
Patch2: magicpoint-1.09a-rpath.patch
Patch3: magicpoint-1.11a-fix-gcc-warnings.patch
Patch6: magicpoint-1.10a-longline.patch
Patch10: magicpoint-1.10a-fix-usleep.patch
Patch11: magicpoint-1.10a-fix-gcc34.patch
Patch12: magicpoint-1.11b-fix-undefined-operation.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-root
BuildPrereq: freetype-devel VFlib2-devel
BuildRequires: fontconfig-devel xorg-x11-devel libungif-devel libpng-devel libmng-devel
Requires: VFlib2 >= 2.25.6-8 VFlib2-conf-ja >= 2.25.6-8
Obsoletes: mgp,magicpoint
%description
MagicPoint is an X11 based presentation tool. MagicPoint's
presentation files (typically .mgp files) are plain text so you can
create presentation files quickly with your favorite editor.
%prep
%setup -q -n magicpoint-%{version}
%patch1 -p1 -b .rh
%patch2 -p1 -b .rpath
%patch3 -p1 -b .warnings
%patch6 -p1 -b .longline
%patch10 -p1 -b .usleep
%patch11 -p1 -b .gcc34
%patch12 -p1 -b .undef-op
%build
CFLAGS=-I/usr/include/freetype1/freetype
autoconf
cp /usr/share/libtool/config.{sub,guess} .
%configure --prefix=/usr/X11R6 --enable-gif
xmkmf -a
make
rm -rf $RPM_BUILD_DIR/magicpoint-%{version}/sample/.cvsignore
%install
[ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != / ] && rm -rf $RPM_BUILD_ROOT
make install install.man DESTDIR=$RPM_BUILD_ROOT
%clean
[ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != / ] && rm -rf $RPM_BUILD_ROOT
%files
%defattr(-,root,root)
%doc COPYRIGHT README SYNTAX USAGE
%doc sample
%{x11bindir}/*
%{x11datadir}/X11/mgp
%{x11mandir}/*/*
%changelog
* Thu Nov 11 2004 Akira TAGOH <tagoh at redhat.com> - 1.11b-2
- magicpoint-1.11b-fix-undefined-operation.patch: applied to fix a gcc warning.
(#137527)
* Mon Sep 27 2004 Akira TAGOH <tagoh at redhat.com> - 1.11b-1
- New upstream release.
* Wed Sep 15 2004 Akira TAGOH <tagoh at redhat.com> - 1.11a-1
- New upstream release.
- magicpoint-1.11a-fix-gcc-warnings.patch: updated from 1.10a.
- magicpoint-1.10a-fixtypo-opaque.patch: removed, it's no lnger needed.
- magicpoint-1.10a-fix-ft2build.patch: removed, it's no longer needed.
- magicpoint-1.10a-png.patch: removed, it's no longer needed.
- XFree4.0-freetype.patch: removed, freetype1 is no longer available.
* Mon Jun 21 2004 Akira TAGOH <tagoh at redhat.com> 1.10a-10
- magicpoint-1.10a-fix-gcc34.patch: applied to build with gcc 3.4.
* Tue Jun 15 2004 Elliot Lee <sopwith at redhat.com>
- rebuilt
* Wed Feb 18 2004 Akira TAGOH <tagoh at redhat.com> 1.10a-8
- fix wrong license description. (#115947: Miloslav Trmac)
- included COPYRIGHT file.
* Fri Feb 13 2004 Elliot Lee <sopwith at redhat.com>
- rebuilt
* Mon Feb 09 2004 Akira TAGOH <tagoh at redhat.com> 1.10a-6
- magicpoint-1.10a-fix-gcc-warnings2.patch: applied to fix gcc warnings (#115161)
- magicpoint-1.10a-fix-ft2build.patch: applied to fix build error for freetype.
- magicpoint-1.10a-fix-usleep.patch: applied to fix missing compile options.
* Fri Nov 28 2003 Akira TAGOH <tagoh at redhat.com> 1.10a-5
- magicpoint-1.10a-fix-gcc-warnings.patch: updated for more gcc3 compliant. (#110773)
* Fri Sep 19 2003 Akira TAGOH <tagoh at redhat.com> 1.10a-4
- added some missing BuildRequires.
* Tue Sep 02 2003 Akira TAGOH <tagoh at redhat.com> 1.10a-3
- magicpoint-1.10a-fixtypo-opaque.patch: applied a patch to work the opaque.
* Wed Aug 20 2003 Akira TAGOH <tagoh at redhat.com> 1.10a-2
- magicpoint-1.10a-longline.patch: fixed the freeze if the line is too long. (#100736)
* Wed Jun 25 2003 Akira TAGOH <tagoh at redhat.com> 1.10a-1
- New upstream release.
- removed the dependency of watanabe-vf due to the copyright issue.
- add fontconfig-devel and XFree86-devel to BuildReqruies.
* Wed Jun 04 2003 Elliot Lee <sopwith at redhat.com>
- rebuilt
* Thu May 22 2003 Jeremy Katz <katzj at redhat.com> 1.09a-12
- gcc 3.3 doesn't implement varargs.h, include stdarg.h instead
* Fri Apr 18 2003 Akira TAGOH <tagoh at redhat.com> 1.09a-11
- rebuild.
* Fri Apr 18 2003 Akira TAGOH <tagoh at redhat.com> 1.09a-10
- magicpoint-1.09a-rpath.patch: don't specify -rpath. (#65966)
- magicpoint-1.09a-fix-gcc-warnings.patch: applied to fix gcc warnings. (#79642)
* Wed Jan 22 2003 Tim Powers <timp at redhat.com>
- rebuilt
* Wed Dec 11 2002 Tim Powers <timp at redhat.com> 1.09a-8
- add VFlib2-conf-ja >=2.25.6-8 as a requirement to fix bug 74105
* Wed Nov 20 2002 Tim Powers <timp at redhat.com>
- rebuild on all arches
* Tue Jun 25 2002 Owen Taylor <otaylor at redhat.com>
- Remove extraneous ttfonts dependency; VFlib already has that dependency
* Fri Jun 21 2002 Tim Powers <timp at redhat.com>
- automated rebuild
* Mon May 27 2002 Yukihiro Nakai <ynakai at redhat.com>
- Remove .cvsignore file(#65241)
* Thu May 23 2002 Tim Powers <timp at redhat.com>
- automated rebuild
* Tue Mar 26 2002 Yukihiro Nakai <ynakai at redhat.com>
- Update to 1.09a
* Tue Mar 5 2002 Jeremy Katz <katzj at redhat.com>
- Add ttfonts to Requires (#24868)
- rebuild in new environment
* Thu Jan 31 2002 Bill Nottingham <notting at redhat.com>
- rebuild in new environment
* Wed Sep 05 2001 Yukihiro Nakai <ynakai at redhat.com>
- Add magicpoint to Obsoletes.
* Tue Sep 04 2001 Yukihiro Nakai <ynakai at redhat.com>
- Add --enable-gif
- Add watanabe-vf to Requires.
* Wed Jul 18 2001 Yukihiro Nakai <ynakai at redhat.com>
- Delete require ttfont-ja
* Mon Jul 9 2001 Yukihiro Nakai <ynakai at redhat.com>
- Rebuild against RHL7.2
- Rename to MagicPoint
- Update to 1.08a
- Enable vflib
* Wed Jan 24 2001 Tim Powers <timp at redhat.com>
- fixed bug 24868
* Mon Aug 7 2000 Tim Powers <timp at redhat.com>
- disable vflib to fix bug #15607
* Wed Aug 2 2000 Tim Powers <timp at redhat.com>
- rebuilt against libpng-1.0.8
* Mon Jul 24 2000 Prospector <prospector at redhat.com>
- rebuilt
* Thu Jul 13 2000 Nalin Dahyabhai <nalin at redhat.com>
- stop disabling freetype support
* Mon Jul 10 2000 Tim Powers <timp at redhat.com>
- rebuilt
* Mon Jul 03 2000 Prospector <bugzilla at redhat.com>
- automatic rebuild
* Wed May 24 2000 Tim Powers <timp at redhat.com>
- updated to 1.07a
- cleaned up files list
- using %configure
- fixed to use XFree86 4.0
* Mon Jul 19 1999 Tim Powers <timp at redhat.com>
- updated source to 1.05a
- built for 6.1
* Thu Apr 15 1999 Michael Maher <mike at redhat.com>
- built package for 6.0
* Fri Oct 08 1998 Michael Maher <mike at redhat.com>
- updated source to 1.04a
- built for 5.2
* Fri May 22 1998 Cristian Gafton <gafton at redhat.com>
- built for PowerTools
magicpoint-1.08a-redhat.patch:
--- NEW FILE magicpoint-1.08a-redhat.patch ---
--- magicpoint-1.08a/Imakefile.in.orig Wed Jul 11 15:25:11 2001
+++ magicpoint-1.08a/Imakefile.in Wed Jul 11 15:26:09 2001
@@ -19,7 +19,7 @@
LEX= @LEX@
# NOTE: we must not define CC here, since imake may assume other CC to be used.
-OPTFLAGS= @OPTFLAGS@
+OPTFLAGS= @OPTFLAGS@ -I/usr/include/freetype1/freetype
DEFS= @DEFS@ -DMGPLIBDIR=\"$(LIBDIR)/mgp\"
#DEFS+= -DGLYPHEDGE
magicpoint-1.09a-rpath.patch:
--- NEW FILE magicpoint-1.09a-rpath.patch ---
diff -ruN magicpoint-1.09a.orig/configure.in magicpoint-1.09a/configure.in
--- magicpoint-1.09a.orig/configure.in 2003-04-18 16:49:30.000000000 +0900
+++ magicpoint-1.09a/configure.in 2003-04-18 17:14:12.000000000 +0900
@@ -277,7 +277,7 @@
LIBS="$LIBS -L$i/lib"
OPTFLAGS="$OPTFLAGS -I$i/include"
AC_CHECK_LIB(mng, mng_initialize,
- [LIBS="$LIBS -Wl,-rpath,$i/lib -lmng"
+ [LIBS="$LIBS -lmng"
AC_DEFINE(MNG)],
[AC_CHECK_LIB(mng, mng_readdisplay,
[LIBS="$LIBS -lmng -ljpeg"
magicpoint-1.10a-fix-gcc34.patch:
--- NEW FILE magicpoint-1.10a-fix-gcc34.patch ---
diff -ruN magicpoint-1.10a.orig/contrib/xwintoppm/dsimple.c magicpoint-1.10a/contrib/xwintoppm/dsimple.c
--- magicpoint-1.10a.orig/contrib/xwintoppm/dsimple.c 2004-06-21 22:05:39.870925000 +0900
+++ magicpoint-1.10a/contrib/xwintoppm/dsimple.c 2004-06-21 22:05:32.567891488 +0900
@@ -35,6 +35,7 @@
#include <X11/Xutil.h>
#include <X11/cursorfont.h>
#include <stdio.h>
+#include <stdarg.h>
/*
* Other_stuff.h: Definitions of routines in other_stuff.
*
@@ -55,6 +56,7 @@
void blip();
Window Window_With_Name();
void Fatal_Error();
+void outl(char *msg, ...);
/*
* Just_display: A group of routines designed to make the writting of simple
@@ -496,12 +498,16 @@
*/
/* VARARGS1 */
void
-outl(msg, arg0,arg1,arg2,arg3,arg4,arg5,arg6)
- char *msg;
- char *arg0, *arg1, *arg2, *arg3, *arg4, *arg5, *arg6;
+outl(char *msg, ...)
{
+ va_list args;
+
fflush(stdout);
- fprintf(stderr, msg, arg0, arg1, arg2, arg3, arg4, arg5, arg6);
+
+ va_start(args, msg);
+ vfprintf(stderr, msg, args);
+ va_end(args);
+
fprintf(stderr, "\n");
fflush(stderr);
}
diff -ruN magicpoint-1.10a.orig/contrib/xwintoppm/xwintoppm.c magicpoint-1.10a/contrib/xwintoppm/xwintoppm.c
--- magicpoint-1.10a.orig/contrib/xwintoppm/xwintoppm.c 2004-06-21 22:05:39.871924000 +0900
+++ magicpoint-1.10a/contrib/xwintoppm/xwintoppm.c 2004-06-21 22:05:32.568891356 +0900
@@ -138,6 +138,7 @@
extern int (*_XErrorFunction)();
extern int _XDefaultError();
+void Window_Dump(Window window, FILE *out);
static long parse_long (s)
char *s;
magicpoint-1.10a-fix-usleep.patch:
--- NEW FILE magicpoint-1.10a-fix-usleep.patch ---
diff -ruN magicpoint-1.10a.orig/image/Imakefile.in magicpoint-1.10a/image/Imakefile.in
--- magicpoint-1.10a.orig/image/Imakefile.in 2001-01-18 18:07:14.000000000 +0900
+++ magicpoint-1.10a/image/Imakefile.in 2004-02-09 11:10:02.127523603 +0900
@@ -32,6 +32,7 @@
SpecialObjectRule(imagetypes.o,imagetypes.c,$(DEFS))
#SpecialObjectRule(png.o,png.c,$(DEFS) $(OPTFLAGS))
SpecialObjectRule(imlib_loader.o,imlib_loader.c,$(DEFS))
+SpecialObjectRule(send.o,send.c,$(DEFS) $(OPTFLAGS))
#ifndef NullParameter
#define NullParameter
magicpoint-1.10a-longline.patch:
--- NEW FILE magicpoint-1.10a-longline.patch ---
diff -ruN magicpoint-1.10a.orig/draw.c magicpoint-1.10a/draw.c
--- magicpoint-1.10a.orig/draw.c 2003-05-14 16:45:35.000000000 +0900
+++ magicpoint-1.10a/draw.c 2003-08-20 19:02:19.000000000 +0900
@@ -4504,6 +4504,7 @@
char buf16[1024], *p16;
char out16[1024], *o16;
int ileft, oleft;
+ int forcefolding = 0;
#ifdef HAVE_ICONV
static iconv_t icv[3];
#endif
@@ -4569,6 +4570,29 @@
if (isspace(*(p + len -1))) {
XftTextExtents8(display, xft_font, (XftChar8 *)p, len -1, &extents);
if (state->width - state->leftfillpos / 2 - state->linewidth >= extents.xOff) goto nofolding;
+ } else {
+ /* the specified line might be too long. enforce to split the line in order to avoid the freeze. */
+ wchar_t *wcstr;
+ char *mbstr;
+ int wclength, mblength, i;
+
+ /* converting the strings to wchar to handle the multibyte characters correctly */
+ wcstr = (wchar_t *) malloc (sizeof (wchar_t) * (strlen (p) + 1));
+ wclength = mbstowcs (wcstr, p, len);
+ for (i = wclength - 1; i >= 1; i--) {
+ mbstr = (char *) malloc (sizeof (char) * (i + 1));
+ mblength = wcstombs (mbstr, wcstr, i);
+ XftTextExtents8 (display, xft_font, (XftChar8 *)p, mblength, &extents);
+ if (state->width - state->leftfillpos / 2 - state->linewidth < extents.xOff) {
+ free (mbstr);
+ free (wcstr);
+ len = mblength;
+ forcefolding = 1;
+ goto nofolding;
+ }
+ free (mbstr);
+ }
+ free (wcstr);
}
draw_line_end(state);
@@ -4588,9 +4612,20 @@
if (obj_new_xftfont(state, state->linewidth, 0, p, len,
fontname, registry, char_size[caching], charset16, xft_font)){
state->linewidth += extents.xOff;
+ if (forcefolding == 1) {
+ draw_line_end (state);
+ draw_line_start (state);
+ state->linewidth = state->leftfillpos;
+ }
return p + len;
- } else
+ } else {
+ if (forcefolding == 1) {
+ draw_line_end (state);
+ draw_line_start (state);
+ state->linewidth = state->leftfillpos;
+ }
return NULL;
+ }
}
static int
obj_new_xftfont(state, x, y, p, len, fontname, registry, size, charset16, xft_font)
magicpoint-1.11a-fix-gcc-warnings.patch:
--- NEW FILE magicpoint-1.11a-fix-gcc-warnings.patch ---
diff -ruN magicpoint-1.11a.orig/contrib/xwintoppm/dsimple.c magicpoint-1.11a/contrib/xwintoppm/dsimple.c
--- magicpoint-1.11a.orig/contrib/xwintoppm/dsimple.c 1998-02-13 16:48:29.000000000 +0900
+++ magicpoint-1.11a/contrib/xwintoppm/dsimple.c 2004-09-15 21:09:10.000000000 +0900
@@ -495,6 +495,7 @@
* printf with up to 7 arguments.
*/
/* VARARGS1 */
+void
outl(msg, arg0,arg1,arg2,arg3,arg4,arg5,arg6)
char *msg;
char *arg0, *arg1, *arg2, *arg3, *arg4, *arg5, *arg6;
diff -ruN magicpoint-1.11a.orig/contrib/xwintoppm/xwintoppm.c magicpoint-1.11a/contrib/xwintoppm/xwintoppm.c
--- magicpoint-1.11a.orig/contrib/xwintoppm/xwintoppm.c 1998-08-26 14:30:16.000000000 +0900
+++ magicpoint-1.11a/contrib/xwintoppm/xwintoppm.c 2004-09-15 21:09:10.000000000 +0900
@@ -281,6 +281,7 @@
* writting.
*/
+void
Window_Dump(window, out)
Window window;
FILE *out;
@@ -716,9 +717,9 @@
return ncolors ;
}
-_swapshort (bp, n)
- register char *bp;
- register unsigned n;
+void
+_swapshort (register char *bp,
+ register unsigned n)
{
register char c;
register char *ep = bp + n;
@@ -731,9 +732,9 @@
}
}
-_swaplong (bp, n)
- register char *bp;
- register unsigned n;
+void
+_swaplong (register char *bp,
+ register unsigned n)
{
register char c;
register char *ep = bp + n;
diff -ruN magicpoint-1.11a.orig/image/gif.c magicpoint-1.11a/image/gif.c
--- magicpoint-1.11a.orig/image/gif.c 2000-03-07 15:59:56.000000000 +0900
+++ magicpoint-1.11a/image/gif.c 2004-09-15 21:09:11.000000000 +0900
@@ -103,7 +103,7 @@
if (GifFile->Image.Left + GifFile->Image.Width > GifFile->SWidth ||
GifFile->Image.Top + GifFile->Image.Height > GifFile->SHeight) {
fprintf(stderr,
-"Image %d is not confined to screen dimension, aborted.\n");
+"Image %d is not confined to screen dimension, aborted.\n", GifFile->ImageCount);
exit(-2);
}
if (GifFile->Image.Interlace) {
@@ -200,8 +200,8 @@
if (gifp == NULL)
ret = 0;
else {
+ tellAboutImage(name, gifp);
DGifCloseFile(gifp);
- tellAboutImage(name);
ret = 1;
}
return ret;
diff -ruN magicpoint-1.11a.orig/image/pbm.c magicpoint-1.11a/image/pbm.c
--- magicpoint-1.11a.orig/image/pbm.c 1998-12-28 17:23:14.000000000 +0900
+++ magicpoint-1.11a/image/pbm.c 2004-09-15 21:05:27.000000000 +0900
@@ -359,8 +359,10 @@
*/
destptr = image->data;
- for (y = 0; y < size; y++)
- *(destptr++) = PM_SCALE(*destptr, maxval, 0xff);
+ for (y = 0; y < size; y++) {
+ *destptr = PM_SCALE(*destptr, maxval, 0xff);
+ destptr++;
+ }
break;
case ITRUE:
diff -ruN magicpoint-1.11a.orig/image/png.c magicpoint-1.11a/image/png.c
--- magicpoint-1.11a.orig/image/png.c 2001-04-11 17:37:00.000000000 +0900
+++ magicpoint-1.11a/image/png.c 2004-09-15 21:09:11.000000000 +0900
@@ -44,7 +44,7 @@
#define PNG_CHECK_BYTES 4
int
-pngIdent(char *fullname, char *name) {}
+pngIdent(char *fullname, char *name) {return 0;}
Image *
pngLoad(fullname, name, verbose)
magicpoint-1.11b-fix-undefined-operation.patch:
--- NEW FILE magicpoint-1.11b-fix-undefined-operation.patch ---
diff -ruN magicpoint-1.11b.orig/x11.c magicpoint-1.11b/x11.c
--- magicpoint-1.11b.orig/x11.c 2004-07-08 15:09:54.000000000 +0900
+++ magicpoint-1.11b/x11.c 2004-11-11 15:32:32.446013165 +0900
@@ -362,7 +362,7 @@
static fullscreen = 0;
XClientMessageEvent xev;
- fullscreen = ++fullscreen % 2;
+ fullscreen = (fullscreen + 1) % 2;
memset(&xev, 0, sizeof(xev));
xev.type=ClientMessage;
xev.message_type=XInternAtom(display, "_NET_WM_STATE", False);
Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/MagicPoint/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore 27 Jun 2005 05:45:52 -0000 1.1
+++ .cvsignore 27 Jun 2005 05:48:40 -0000 1.2
@@ -0,0 +1 @@
+magicpoint-1.11b.tar.gz
Index: sources
===================================================================
RCS file: /cvs/extras/rpms/MagicPoint/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources 27 Jun 2005 05:45:52 -0000 1.1
+++ sources 27 Jun 2005 05:48:40 -0000 1.2
@@ -0,0 +1 @@
+2b627f17443842eb5009304864577a4c magicpoint-1.11b.tar.gz
More information about the fedora-extras-commits
mailing list