Hello community, here is the log from the commit of package mgp checked in at Thu Mar 6 01:28:45 CET 2008. -------- --- mgp/mgp.changes 2007-08-01 10:57:49.000000000 +0200 +++ mgp/mgp.changes 2008-03-05 13:55:00.000000000 +0100 @@ -1,0 +2,13 @@ +Wed Mar 5 13:08:49 CET 2008 - anosek@suse.cz + +- updated to version 1.13a + * m17n library support enhancement + * add new environment variable MGPRC for the path of the .mgprc file. + * add "psfont" directive to specify the font used by mgp2ps + * add -g option for mgp2ps to allow users to adjust line distanc + * add -zoomonclk option for newimage + * allow to handle gif format images by default + * many bug fixes +- dropped obsoleted patches (Xorg7.diff) (head.diff) + +------------------------------------------------------------------- Old: ---- magicpoint-1.12a-cflags.diff magicpoint-1.12a-compile-warning.diff magicpoint-1.12a-head.diff magicpoint-1.12a-imlib.diff magicpoint-1.12a-lib64.diff magicpoint-1.12a-nonvoid.diff magicpoint-1.12a-null.diff magicpoint-1.12a-sample.diff magicpoint-1.12a.tar.bz2 magicpoint-1.12a-tffonts.diff magicpoint-1.12a-warnings.patch magicpoint-1.12a-xft-rendering-fix.diff magicpoint-1.12a-Xorg7.diff New: ---- magicpoint-1.13a-cflags.diff magicpoint-1.13a-compile-warning.diff magicpoint-1.13a-imlib.diff magicpoint-1.13a-lib64.diff magicpoint-1.13a-nonvoid.diff magicpoint-1.13a-null.diff magicpoint-1.13a-sample.diff magicpoint-1.13a.tar.bz2 magicpoint-1.13a-tffonts.diff magicpoint-1.13a-warnings.patch magicpoint-1.13a-xft-rendering-fix.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ mgp.spec ++++++ --- /var/tmp/diff_new_pack.B12540/_old 2008-03-06 01:27:59.000000000 +0100 +++ /var/tmp/diff_new_pack.B12540/_new 2008-03-06 01:27:59.000000000 +0100 @@ -1,7 +1,7 @@ # -# spec file for package mgp (Version 1.12a) +# spec file for package mgp (Version 1.13a) # -# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine # package are under the same license as the package itself. # @@ -10,6 +10,7 @@ # norootforbuild + Name: mgp %define _prefix %(xft-config --prefix) %if "%{_prefix}" == "/usr/X11R6" @@ -20,17 +21,16 @@ Group: Productivity/Publishing/Presentation Provides: magicpoint Requires: perl freetype sharutils -Autoreqprov: on -Version: 1.12a +AutoReqProv: on +Version: 1.13a Release: 1 Summary: MagicPoint, an X Window System Presentation Tool -URL: http://member.wide.ad.jp/wg/mgp/ +Url: http://member.wide.ad.jp/wg/mgp/ Source: magicpoint-%{version}.tar.bz2 Source1: README.SuSE Patch1: magicpoint-ia64.diff Patch2: magicpoint-%{version}-imlib.diff Patch3: magicpoint-%{version}-tffonts.diff -Patch4: magicpoint-%{version}-head.diff Patch5: magicpoint-%{version}-sample.diff Patch6: magicpoint-%{version}-nonvoid.diff Patch7: magicpoint-%{version}-cflags.diff @@ -38,7 +38,6 @@ Patch9: magicpoint-%{version}-null.diff Patch10: magicpoint-%{version}-xft-rendering-fix.diff Patch11: magicpoint-%{version}-lib64.diff -Patch12: magicpoint-%{version}-Xorg7.diff Patch13: magicpoint-%{version}-warnings.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -63,7 +62,6 @@ %patch1 %patch2 # %patch3 -%patch4 %patch5 -p1 %patch6 %patch7 -p1 @@ -71,7 +69,6 @@ %patch9 #patch10 %patch11 -%patch12 %patch13 cp %{SOURCE1} . rm -rf sample/CVS @@ -118,7 +115,17 @@ /usr/share/emacs/site-lisp/mgp-mode20.* %changelog -* Wed Aug 01 2007 - anosek@suse.cz +* Wed Mar 05 2008 anosek@suse.cz +- updated to version 1.13a + * m17n library support enhancement + * add new environment variable MGPRC for the path of the .mgprc file. + * add "psfont" directive to specify the font used by mgp2ps + * add -g option for mgp2ps to allow users to adjust line distanc + * add -zoomonclk option for newimage + * allow to handle gif format images by default + * many bug fixes +- dropped obsoleted patches (Xorg7.diff) (head.diff) +* Wed Aug 01 2007 anosek@suse.cz - updated to version 1.12a * add %%tsystem directive which might be more stable than %%xsystem * add -rotate option for newimage @@ -126,111 +133,111 @@ * many bug fixes - disabled xft-rendering-fix.diff - fixed compiler warnings (warnings.patch) -* Fri Mar 30 2007 - rguenther@suse.de +* Fri Mar 30 2007 rguenther@suse.de - added bison and flex BuildRequires -* Thu Jan 04 2007 - anosek@suse.cz +* Thu Jan 04 2007 anosek@suse.cz - fixed x11.c:364: warning: operation on 'fullscreen' may be undefined (compile-warning.diff) -* Tue Jul 25 2006 - mmarek@suse.de +* Tue Jul 25 2006 mmarek@suse.de - fix build with modular Xorg - use even more RPM_OPT_FLAGS -* Mon Apr 03 2006 - mmarek@suse.cz +* Mon Apr 03 2006 mmarek@suse.cz - fix configure script to find libraries in .../lib64 on 64bit [#162810] (lib64.patch) -* Wed Jan 25 2006 - mls@suse.de +* Wed Jan 25 2006 mls@suse.de - converted neededforbuild to BuildRequires -* Tue Nov 15 2005 - mmarek@suse.cz +* Tue Nov 15 2005 mmarek@suse.cz - package emacs mode [#132365] -* Tue Oct 18 2005 - mmarek@suse.cz +* Tue Oct 18 2005 mmarek@suse.cz - applied xft-rendering chache patch from tiwai@suse.de - refreshed patches -* Wed Sep 28 2005 - meissner@suse.de +* Wed Sep 28 2005 meissner@suse.de - use more RPM_OPT_FLAGS. -* Fri Aug 05 2005 - ltinkl@suse.cz +* Fri Aug 05 2005 ltinkl@suse.cz - update to 1.11b - adapt patches, fix some compiler warnings -* Wed Apr 27 2005 - meissner@suse.de +* Wed Apr 27 2005 meissner@suse.de - fixed NULL termination. -* Mon Sep 27 2004 - tiwai@suse.de +* Tue Sep 28 2004 tiwai@suse.de - fixed the broken freetype support (bug #39335) - compile properly with XFT2 and libmng support - fixed sample truetype fonts to Sazanami fonts (default on SL9.2) - added README.SuSE for backward compatibility problem -* Wed May 19 2004 - ro@suse.de +* Wed May 19 2004 ro@suse.de - added return values to non-void functions -* Sat Jan 10 2004 - adrian@suse.de +* Sat Jan 10 2004 adrian@suse.de - add %%defattr -* Thu Oct 23 2003 - ltinkl@suse.cz +* Thu Oct 23 2003 ltinkl@suse.cz - update to 1.10a - build with freetype2 - remake patches, throw unused ones away -* Thu Jul 24 2003 - ltinkl@suse.cz +* Thu Jul 24 2003 ltinkl@suse.cz - build with imlib in /opt/gnome -* Fri Apr 11 2003 - ro@suse.de +* Fri Apr 11 2003 ro@suse.de - fix deprecated head calling syntax (-1) -* Wed Jan 29 2003 - ro@suse.de +* Wed Jan 29 2003 ro@suse.de - use stdarg -* Wed Jun 05 2002 - ro@suse.de +* Wed Jun 05 2002 ro@suse.de - added a "AC_ARG_WITH" for freetype lib to be able to specify dir to search the library in -* Thu May 02 2002 - mfabian@suse.de +* Thu May 02 2002 mfabian@suse.de - add configure options --disable-vflib --enable-freetype-charset16 to support CJK TrueType fonts via freetype. - edit default.mgp, mgprc-sample, sample-jp.mgp and sample.mgp a bit to use fonts available on SuSE Linux by default. -* Thu Mar 21 2002 - tcrhak@suse.cz +* Thu Mar 21 2002 tcrhak@suse.cz - Fixed: for(i=0; i<0; i++) was used instead of for(i=0; i<4; i++) by accident in the previous fix. -* Mon Mar 18 2002 - tcrhak@suse.cz +* Mon Mar 18 2002 tcrhak@suse.cz - fixed TrueType font pell-mell: iso8859-[234] coded characters where shown using different font then the other characters - fixed font caching -* Wed Mar 06 2002 - tcrhak@suse.cz +* Wed Mar 06 2002 tcrhak@suse.cz - added print-iso-8859-2 patch - linked with libmng and imlib -* Thu Oct 25 2001 - dan@suse.cz +* Thu Oct 25 2001 dan@suse.cz - update to version 1.09a, new features: * the "area" directive * enhance "prefix" directive - fix a seculity hole inherited from xloadimage -* Mon Aug 06 2001 - cihlar@suse.cz +* Mon Aug 06 2001 cihlar@suse.cz - update to version 1.08a -* Tue Jun 05 2001 - schwab@suse.de +* Tue Jun 05 2001 schwab@suse.de - Fix last change. - Add %%suse_update_config. - Fix invalid use of NULL. -* Mon May 28 2001 - pblaha@suse.cz +* Mon May 28 2001 pblaha@suse.cz - fix cast pointer on ia64 -* Mon Mar 26 2001 - uli@suse.de +* Mon Mar 26 2001 uli@suse.de - libungif now needs libX11, adapted configure* accordingly -* Thu Dec 14 2000 - tiwai@suse.de +* Thu Dec 14 2000 tiwai@suse.de - fixed requires. -* Wed Sep 13 2000 - tiwai@suse.de +* Wed Sep 13 2000 tiwai@suse.de - added sharutil to support mgpembed correctly. - added libungif for gif support. - changed to bzip2. -* Mon May 22 2000 - cihlar@suse.cz +* Mon May 22 2000 cihlar@suse.cz - added BuildRoot - update to 1.07a -* Wed Feb 16 2000 - grimmer@suse.de +* Thu Feb 17 2000 grimmer@suse.de - added group tag to spec file - added URL to spec file - use full URL to source package - use version macro in spec file -* Fri Jan 28 2000 - ro@suse.de +* Fri Jan 28 2000 ro@suse.de - freetype is in /usr/include/freetype, fixed configure.in - updated config.sub - man to /usr/share -* Mon Sep 13 1999 - bs@suse.de +* Mon Sep 13 1999 bs@suse.de - ran old prepare_spec on spec file to switch to new prepare_spec. -* Mon Aug 02 1999 - grimmer@suse.de +* Mon Aug 02 1999 grimmer@suse.de - update to 1.06a - added README.lang to docu -* Tue Jun 22 1999 - grimmer@suse.de +* Tue Jun 22 1999 grimmer@suse.de - update to 1.05a - now uses FreeType -* Mon Sep 28 1998 - grimmer@suse.de +* Mon Sep 28 1998 grimmer@suse.de - new version: 1.04a -* Wed Aug 12 1998 - grimmer@suse.de +* Wed Aug 12 1998 grimmer@suse.de - new package (Version 1.03a) ++++++ magicpoint-1.12a-cflags.diff -> magicpoint-1.13a-cflags.diff ++++++ ++++++ magicpoint-1.12a-compile-warning.diff -> magicpoint-1.13a-compile-warning.diff ++++++ --- mgp/magicpoint-1.12a-compile-warning.diff 2007-01-04 12:20:32.000000000 +0100 +++ mgp/magicpoint-1.13a-compile-warning.diff 2008-03-05 11:48:46.000000000 +0100 @@ -1,6 +1,6 @@ --- draw.c +++ draw.c -@@ -1068,7 +1068,7 @@ +@@ -1127,7 +1127,7 @@ u_int step, x, xoff, yoff; int i, sx, round; int root_x, root_y, use_copy; @@ -8,8 +8,8 @@ + Window cutinWin = 0, junkwin; XImage *copywin; static XWindowAttributes xa; - -@@ -2762,7 +2762,7 @@ + XWindowAttributes wa; +@@ -2884,7 +2884,7 @@ fprintf(stderr, "X11 font %s:%d:%s has bogus " "font metric for glyph 0x%04x\n" "\tcs->width=%d, source=%s, coffset=0x%04x\n", @@ -18,7 +18,7 @@ code, cs->width, metricsource, coffset); } cs = &xfontstruct->max_bounds; -@@ -2813,7 +2813,6 @@ +@@ -2935,7 +2935,6 @@ int hquality, vquality; Image *myimage, *image; @@ -26,7 +26,7 @@ XImageInfo *ximageinfo; byte *pic; int private = mgp_flag & FL_PRIVATE; -@@ -2937,7 +2936,7 @@ +@@ -3059,7 +3058,7 @@ xzoomrate, yzoomrate); fprintf(stderr, "background zoom mode %d: " "(%d, %d)->(%d, %d)[%d]\n", cg->ct_zoomflag, @@ -35,23 +35,7 @@ } if (xzoomrate != 100.0 || yzoomrate != 100.0) { -@@ -2979,15 +2978,12 @@ - int centerflag; - { - Image *image, *myimage; -- Pixmap mypixmap; - XImageInfo *ximageinfo; - u_int image_posx; - int width, height, yoffset; - float xzoomrate, yzoomrate; - int private = mgp_flag & FL_PRIVATE; - static Cursor curs; -- static char backfile[MAXPATHLEN]; -- static int backzoom, backnumcolor, backx, backy; - - if (!caching){ - if (!curs) -@@ -3063,7 +3059,7 @@ +@@ -3312,7 +3311,7 @@ image = myimage; myimage = zoom(image, xzoomrate, yzoomrate, verbose); if (!image) { @@ -60,7 +44,7 @@ xzoomrate, yzoomrate); exit(1); } -@@ -3779,7 +3775,6 @@ +@@ -4327,7 +4326,6 @@ char *cp; int scale = 1; struct stat stbuf; @@ -68,7 +52,7 @@ char geom[32], device[64], scalebuf[32]; static char imagefile[MAXPATHLEN]; void (*sigpipe_handler)(); -@@ -4524,7 +4519,7 @@ +@@ -5077,7 +5075,7 @@ Drawable target; { int i; @@ -77,7 +61,7 @@ XImage *xim; switch(bg_ctl->ct_op){ -@@ -4601,6 +4596,9 @@ +@@ -5154,6 +5152,9 @@ return 1; } @@ -87,7 +71,7 @@ static void obj_draw_anim(state, x, y, obj) struct render_state *state; -@@ -4715,7 +4713,7 @@ +@@ -5268,7 +5269,7 @@ if (!strncmp(registry, rtab[i], 3)) break; } if (i == 3) return NULL; /* cannot find codeset */ @@ -96,95 +80,9 @@ if (icv[i] == (iconv_t)0) icv[i] = iconv_open("UTF-8", etab[i]); if (icv[i] == (iconv_t)-1) { fprintf(stderr, "your iconv doesn't support %s\n", ---- image/compress.c -+++ image/compress.c -@@ -136,12 +136,13 @@ - lfree(pixel_table); - lfree(pixel_map); - -- if (badcount) -+ if (badcount) { - if (verbose) - fprintf(stderr, "%d out-of-range pixels, ", badcount); - else - fprintf(stderr, "Warning: %d out-of-range pixels were seen\n", - badcount); -+ } - if (verbose) { - if ((rgb.used == image->rgb.used) && !badcount) - fprintf(stderr, "no improvment\n"); ---- image/rlelib.c -+++ image/rlelib.c -@@ -714,12 +714,12 @@ - { - for ( ; *n != '\0' && *n != '=' && *n == *v; n++, v++ ) - ; -- if (*n == '\0' || *n == '=') -+ if (*n == '\0' || *n == '=') { - if ( *v == '\0' ) - return v; - else if ( *v == '=' ) - return ++v; -- -+ } - return NULL; - } - -@@ -1234,7 +1234,7 @@ - - scanc += nc; - scan_x += nc; -- if ( debug_f ) -+ if ( debug_f ) { - if ( SV_BIT( *globals, channel ) ) - { - rle_pixel * cp = scanc - nc; -@@ -1243,7 +1243,7 @@ - fprintf( stderr, "%02x", *cp++ ); - putc( '\n', stderr ); - } -- else -+ } else - fprintf( stderr, "Pixel data %d (to %d)\n", nc, scan_x ); - break; - ---- image/send.c -+++ image/send.c -@@ -299,7 +299,7 @@ - xcolor.red= *(image->rgb.red + a); - xcolor.green= *(image->rgb.green + a); - xcolor.blue= *(image->rgb.blue + a); -- if (! XAllocColor(disp, ximageinfo->cmap, &xcolor)) -+ if (! XAllocColor(disp, ximageinfo->cmap, &xcolor)) { - if ((visual->class == StaticColor) || - (visual->class == StaticGray)) { - fprintf(stderr, "imageToXImage: XAllocColor failed on a static visual\n"); -@@ -316,6 +316,7 @@ - newmap= 1; - break; - } -+ } - *(index + a)= xcolor.pixel; - } - } -@@ -422,12 +423,13 @@ - } - } - /* regist free_clr array */ -- if (private_cmap && ximageinfo->cmap == colormap) -+ if (private_cmap && ximageinfo->cmap == colormap) { - if (back) - regist_alloc_colors(&back_clr, index, b); - else - regist_alloc_colors(&image_clr, index, b); - } -+ } - break; - } - --- mgp.c +++ mgp.c -@@ -745,6 +745,8 @@ +@@ -764,6 +764,8 @@ XBell(display, 0); } @@ -193,20 +91,6 @@ static void main_loop(start_page) u_int start_page; -@@ -1088,11 +1090,12 @@ - break; - - case XK_c: -- if (verbose) -+ if (verbose) { - if (mgp_flag & FL_FRDCACHE) - printf("turn off forward cache\n"); - else - printf("turn on forward cache\n"); -+ } - - mgp_flag ^= FL_FRDCACHE; - break; --- mng.c +++ mng.c @@ -249,7 +249,7 @@ @@ -220,7 +104,7 @@ } --- parse.c +++ parse.c -@@ -1240,7 +1240,7 @@ +@@ -1254,7 +1254,7 @@ */ { int textseen; @@ -239,7 +123,7 @@ xsa.border_pixel = fore_color[0]; xsa.background_pixel = back_color[0]; -@@ -359,10 +358,11 @@ +@@ -355,10 +354,11 @@ void toggle_fullscreen() { @@ -253,7 +137,7 @@ memset(&xev, 0, sizeof(xev)); xev.type=ClientMessage; xev.message_type=XInternAtom(display, "_NET_WM_STATE", False); -@@ -461,8 +461,6 @@ +@@ -457,8 +457,6 @@ void reset_cache_pixmap() { ++++++ magicpoint-1.12a-imlib.diff -> magicpoint-1.13a-imlib.diff ++++++ --- mgp/magicpoint-1.12a-imlib.diff 2006-07-24 17:17:55.000000000 +0200 +++ mgp/magicpoint-1.13a-imlib.diff 2008-03-05 11:46:48.000000000 +0100 @@ -1,6 +1,6 @@ --- configure.in +++ configure.in -@@ -454,7 +454,7 @@ +@@ -471,7 +471,7 @@ echo 'FATAL: You need libImlib to use Imlib loading. pass proper LIBS to configure.' exit 1 fi @@ -9,14 +9,3 @@ if test -f $i/include/Imlib.h; then imlib_h_ok=yes OPTFLAGS="$OPTFLAGS -I$i/include" ---- image/Imakefile.in -+++ image/Imakefile.in -@@ -31,7 +31,7 @@ - SpecialObjectRule(gif.o,gif.c,$(DEFS) $(OPTFLAGS)) - SpecialObjectRule(imagetypes.o,imagetypes.c,$(DEFS)) - #SpecialObjectRule(png.o,png.c,$(DEFS) $(OPTFLAGS)) --SpecialObjectRule(imlib_loader.o,imlib_loader.c,$(DEFS)) -+SpecialObjectRule(imlib_loader.o,imlib_loader.c,$(DEFS) $(OPTFLAGS)) - - #ifndef NullParameter - #define NullParameter ++++++ magicpoint-1.12a-lib64.diff -> magicpoint-1.13a-lib64.diff ++++++ ++++++ magicpoint-1.12a-nonvoid.diff -> magicpoint-1.13a-nonvoid.diff ++++++ ++++++ magicpoint-1.12a-null.diff -> magicpoint-1.13a-null.diff ++++++ ++++++ magicpoint-1.12a-sample.diff -> magicpoint-1.13a-sample.diff ++++++ ++++++ magicpoint-1.12a.tar.bz2 -> magicpoint-1.13a.tar.bz2 ++++++ ++++ 12862 lines of diff (skipped) ++++++ magicpoint-1.12a-tffonts.diff -> magicpoint-1.13a-tffonts.diff ++++++ ++++++ magicpoint-1.12a-warnings.patch -> magicpoint-1.13a-warnings.patch ++++++ --- mgp/magicpoint-1.12a-warnings.patch 2007-08-01 10:06:03.000000000 +0200 +++ mgp/magicpoint-1.13a-warnings.patch 2008-03-05 11:51:39.000000000 +0100 @@ -1,6 +1,6 @@ --- draw.c +++ draw.c -@@ -2775,7 +2775,7 @@ +@@ -2846,7 +2846,7 @@ char *seed; char *registry; @@ -20,12 +20,12 @@ regid = get_regid(mgp_charset); } else regid = get_regid(registry); -@@ -594,7 +594,7 @@ +@@ -595,7 +595,7 @@ if (registry) - regid = get_regid(registry) -1; + tempregid = get_regid(registry) -1; else { - if (mgp_charset) + if (mgp_charset[0]) - regid = get_regid(mgp_charset) -1; + tempregid = get_regid(mgp_charset)-1; } - if (latin_unicode_map[regid][code]) + if (tempregid >= 0) { ++++++ magicpoint-1.12a-xft-rendering-fix.diff -> magicpoint-1.13a-xft-rendering-fix.diff ++++++ ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org