rpms/w3m/devel w3m-cvs-20050328.patch,NONE,1.1 w3m.spec,1.22,1.23
fedora-cvs-commits at redhat.com
fedora-cvs-commits at redhat.com
Mon Mar 28 08:52:24 UTC 2005
- Previous message (by thread): rpms/mozilla/FC-2 mozilla.spec,1.21,1.22
- Next message (by thread): rpms/valgrind/devel .cvsignore, 1.4, 1.5 sources, 1.4, 1.5 valgrind.spec, 1.14, 1.15 valgrind-2.0.0-pthread-stacksize.patch, 1.1, NONE valgrind-2.2.0-unnest.patch, 1.1, NONE valgrind-2.2.0-valgrind_h.patch, 1.1, NONE valgrind-2.2.0-warnings.patch, 1.1, NONE valgrind-2.2.0.ioctls.patch, 1.1, NONE
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Update of /cvs/dist/rpms/w3m/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv17728
Modified Files:
w3m.spec
Added Files:
w3m-cvs-20050328.patch
Log Message:
* Mon Mar 28 2005 Akira TAGOH <tagoh at redhat.com> - 0.5.1-8
- w3m-cvs-20050328.patch: updated to CVS snapshot to support gtk2.
w3m-cvs-20050328.patch:
ChangeLog | 162 +++++++++++++++++++++++++++++
Makefile.in | 6 -
acinclude.m4 | 60 ++++++++---
aclocal.m4 | 60 ++++++++---
config.guess | 184 +++++++++++++++++++++------------
config.h.in | 9 +
config.sub | 128 ++++++++++++++++++-----
configure | 166 +++++++++++++++++++++++++++---
display.c | 6 -
doc-jp/FAQ.html | 2
doc/FAQ.html | 2
file.c | 256 +++++++++++++++++++++++++++++++++++------------
fm.h | 9 -
islang.c | 2
libwc/Makefile.in | 2
libwc/charset.c | 10 +
main.c | 29 ++---
menu.c | 6 -
po/ja.po | 46 ++++++++
po/w3m.pot | 46 ++++++++
rc.c | 50 +++++----
scripts/w3mmail.cgi.in | 3
terms.c | 37 +++---
terms.h | 6 -
version.c.in | 4
w3mbookmark.c | 20 ++-
w3mimg/fb/fb_gdkpixbuf.c | 112 ++++++++++++++++++--
w3mimg/fb/fb_img.h | 3
w3mimg/fb/fb_imlib2.c | 8 +
w3mimg/fb/fb_w3mimg.c | 6 -
w3mimg/x11/x11_w3mimg.c | 124 +++++++++++++++++++++-
31 files changed, 1262 insertions(+), 302 deletions(-)
--- NEW FILE w3m-cvs-20050328.patch ---
Index: ChangeLog
===================================================================
RCS file: /cvsroot/w3m/w3m/ChangeLog,v
retrieving revision 1.924
retrieving revision 1.946
diff -u -r1.924 -r1.946
--- ChangeLog 28 Apr 2004 18:19:22 -0000 1.924
+++ ChangeLog 26 Feb 2005 17:13:58 -0000 1.946
@@ -1,3 +1,163 @@
+2005-02-27 Fumitoshi UKAI <ukai at debian.or.jp>
+
+ * configure.ac: rename from configure.in. this is for autoconf2.50
+
+2005-02-27 NOMIYA Masaru <nomiya at ttmy.ne.jp>
+
+ * [w3m-dev 04143] Patch for OS/2
+ * config.h.in: ifdef HAVE_SETPGRP
+ * configure.in: define USE_BINMODE_STREAM for *os2-emx*
+ * islang.c: ULONG -> unsigned long
+ * main.c: ULONG -> unsigned long
+
+2005-02-15 Fumitoshi UKAI <ukai at debian.or.jp>
+
+ * [w3m-dev-en 01045] From newbie: problem with w3m-0.5.1 installation
+ * acinclude.m4 (AC_W3M_SSL): define USE_SSL after ssl library found
+
+2005-01-19 Kiyokazu SUTO <suto at ks-and-ks.ne.jp>
+
+ * [w3m-dev 04133] mouse_end() should preced reset_tty()?
+ * terms.c (reset_exit): mouse_end() should precede reset_tty()
+
+2005-01-05 Kiyokazu SUTO <suto at ks-and-ks.ne.jp>
+
+ * [w3m-dev 04130] [w3m-dev 04131] [w3m-dev 04132] Multiple challeges in *-Authenticate header
+ * file.c (skip_auth_token): added
+ (extract_auth_val): ',' is end of token
+ (extract_auth_param): use skip_auth_token
+ (AuthDigestCred): parse qop and calc cnonce correctly
+ (findAuthentication): use skip_auth_token
+
+2004-11-09 Fumitoshi UKAI <ukai at debian.or.jp>
+
+ * w3mimg/fb/fb_gdkpixbuf.c (fb_image_load):
+ fix unused variable `i'
+ * w3mimg/x11/x11_w3mimg.c (x11_load_image):
+ ditto
+
+2004-11-09 Hiroyuki Ito <ZXB01226 at nifty.com>
+
+ * [w3m-dev 04128] Re: w3mimgdisplay
+ * acinclude.m4 (AC_W3M_IMAGE): check not yes
+ * aclocal.m4, configure: regen
+ * w3mimg/fb/fb_gdkpixbuf.c (fb_image_load):
+ fb_image_fill in case GDK_PIXBUF_FRAME_DISPOSE
+ * w3mimg/x11/x11_w3mimg.c (get_animation_size):
+ return n
+ (x11_load_image):
+ fill in case GDK_PIXBUF_FRAME_DISPOSE
+
+2004-11-05 Hiroyuki Ito <ZXB01226 at nifty.com>
+
+ * [w3m-dev 04117] Re: start attribute and value attribute on ordered lists
+ * file.c (HTMLtagproc1): allow negative value for start attr
+
+2004-10-14 Fumitoshi UKAI <ukai at debian.or.jp>
+
+ * Bug#276246: w3m's locale parsing should at least see '@euro' modifier
+ * config.h (HAVE_LANGINFO_CODESET): added
+ * configure.in (AM_LANGINFO_CODESET): added
+ * libwc/charset.c: #include <langinfo.h>
+ (wc_charset_to_ces): use nl_langinfo(CODESET)
+
+2004-09-30 Hiroyuki Ito <ZXB01226 at nifty.com>
+
+ * [w3m-dev 04108] PIPE_BUF
+ * main.c (pipeBuf): set buf->currentURL.file to prevent
+ segfault by "PIPE_BUF cat;VIEW SOURCE;"
+
+2004-08-31 SAKAI Kiyotaka <ksakai at kso.netwk.ntt-at.co.jp>
+
+ * [w3m-dev 04104] w3mmail.cgi
+ * scripts/w3mmail.cgi.in: strip ^M
+
+2004-08-17 Hiroyuki Ito <ZXB01226 at nifty.com>
+
+ * [w3m-dev 04099] Re: w3m-img gtk2
+ * w3mimg/fb/fb_gdkpixbuf.c (fb_image_load): fix resize bug
+
+2004-08-06 Hiroyuki Ito <ZXB01226 at nifty.com>
+
+ * [w3m-dev 04097] Re: w3m-img gtk2
+ * w3mimg/fb/fb_gdkpixbuf.c (draw): no need bg
+ (get_animation_size): use GTimeVal
+ (fb_image_load): use GTimeVal
+ fix for animation
+ * w3mimg/x11/x11_w3mimg.c (get_animation_size): use GTimeVal
+ (x11_load_image): use GTimeVal
+ fix for animation
+
+2004-08-05 Fumitoshi UKAI <ukai at debian.or.jp>
+
+ * [w3m-dev 04096] w3m-img gtk2
+ * acinclude.m4 (AC_W3M_IMAGE): add USE_GTK2
+ add --with-imagelib=gtk2
+ * aclocal.m4 config.guess config.sub configure: regen
+ * config.h.in: add USE_GTK2
+ * w3mimg/fb/fb_gdkpixbuf.c: support USE_GTK2
+ * w3mimg/fb/fb_img.h: add fb_image_init()
+ * w3mimg/fb/fb_imlib2.h: fb_image_init() stub
+ * w3mimg/fb/fb_w3mimg.c: call fb_image_init()
+ * w3mimg/x11/x11_w3mimg.c: support USE_GTK2
+
+2004-08-03 WATANABE Katsuyuki <knabe at sannet.ne.jp>
+
+ * [w3m-dev 04095] build fix when configure with --enable-messagel10n
+ * main.c (main): locale and textdomain initialization if ENABLE_NLS
+ * menu.c (initMenu): use _() instead of gettext()
+ * rc.c (show_params): use _() instead of gettext()
+
+2004-07-18 WATANABE Katsuyuki <knabe at sannet.ne.jp>
+
+ * [w3m-dev 04094] Re: option panel: gettextize select list
+ * rc.c (load_option_panel): don't gettext&wc_conv colorstr
+ several times
+
+2004-07-16 WATANABE Katsuyuki <knabe at sannet.ne.jp>
+
+ * [w3m-dev 04093] bookmark charset
+ * add global variable: BookmarkCharset.
+ * main.c:adBmark(): remove condition LANG = JA.
+ * main.c: buffername encode by BookmarkCharset when add bookmark.
+ * main.c: BookmarkCharset pass to w3mbookmark.
+ * w3mbookmark.c: ditto.
+
+2004-07-16 WATANABE Katsuyuki <knabe at sannet.ne.jp>
+
+ * [w3m-dev 04092] remove __CYGWIN__ && LANG == JA
+ * remove condition LANG == JA && __CYGWIN__
+ * cygwin_mouse_btn_swapped enabled when before 1.5.x
+
+2004-07-16 WATANABE Katsuyuki <knabe at sannet.ne.jp>
+
+ * [w3m-dev 04091] option panel: gettextize select list
+ * rc.c: gettextize option select list.
+ * rc.c: add gettextize message.
+ * po/w3m.pot: ditto.
+ * po/ja.po: ditto.
+
+2004-07-14 Fumitoshi UKAI <ukai at debian.or.jp>
+
+ * Debian Bug#259053
+ * doc/FAQ.html, doc-jp/FAQ.html: ~/.mailcap -> ~/.w3m/mailcap
+
+2004-05-11 Fumitoshi UKAI <ukai at debian.or.jp>
+
+ * based on [w3m-dev 04079]
+ SAKAI Kiyotaka <ksakai at kso.netwk.ntt-at.co.jp>
+ * Makefile.in: (libwc/libwc.a): always make in libwc subdir
+ (w3mimg/w3mimg.a): always make in w3mimg subdir
+
+2004-05-03 Fumitoshi UKAI <ukai at debian.or.jp>
+
+ * [w3m-dev-en 01007]
+ * libwc/Makefile.in (CFLAGS): need @CPPFLAGS@
+
+2004-05-03 Fumitoshi UKAI <ukai at debian.or.jp>
+
+ * version.c.in: cvs version
+
2004-04-29 Fumitoshi UKAI <ukai at debian.or.jp>
* w3m 0.5.1
@@ -8483,4 +8643,4 @@
* release-0-2-1
* import w3m-0.2.1
-$Id: ChangeLog,v 1.924 2004/04/28 18:19:22 ukai Exp $
+$Id: ChangeLog,v 1.946 2005/02/26 17:13:58 ukai Exp $
Index: Makefile.in
===================================================================
RCS file: /cvsroot/w3m/w3m/Makefile.in,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- Makefile.in 26 Apr 2004 17:04:48 -0000 1.39
+++ Makefile.in 10 May 2004 17:45:06 -0000 1.40
@@ -182,7 +182,8 @@
inflate.o: inflate.c
$(CC) $(CFLAGS) -o $@ -c $(srcdir)/inflate.c
-libwc/libwc.a:
+libwc/libwc.a: libwc
+libwc:
(cd libwc && $(MAKE) CC='$(CC0)' OPTS='$(OPTS)')
dummy.o: entity.c
@@ -194,7 +195,8 @@
w3mimgdisplay.o: w3mimgdisplay.c w3mimg/w3mimg.h
$(CC) $(CFLAGS) $(IMGCFLAGS) -o $@ -c $(srcdir)/w3mimgdisplay.c
[...2962 lines suppressed...]
-static void
+#if defined(USE_GTK2)
+static int
+get_animation_size(GdkPixbufAnimation * animation, int *w, int *h, int *delay)
+{
+ GdkPixbufAnimationIter *iter;
+ int n, i, d = -1;
+ GTimeVal time;
+
+ g_get_current_time(&time);
+ iter = gdk_pixbuf_animation_get_iter(animation, &time);
+ *w = gdk_pixbuf_animation_get_width(animation);
+ *h = gdk_pixbuf_animation_get_height(animation);
+ for (i = 1;
+ gdk_pixbuf_animation_iter_on_currently_loading_frame(iter) != TRUE;
+ i++) {
+ int tmp;
+ tmp = gdk_pixbuf_animation_iter_get_delay_time(iter);
+ g_time_val_add(&time, tmp * 1000);
+ if (tmp > d)
+ d = tmp;
+ gdk_pixbuf_animation_iter_advance(iter, &time);
+ }
+ if (delay)
+ *delay = d;
+ g_object_unref(G_OBJECT(iter));
+ n = i;
+ return n;
+}
+#else
+static int
get_animation_size(GdkPixbufAnimation * animation, int *w, int *h, int *delay)
{
GList *frames;
@@ -73,8 +109,9 @@
}
if (delay)
*delay = d;
+ return n;
}
-
+#endif
#endif
static int
@@ -94,6 +131,9 @@
}
#elif defined(USE_GDKPIXBUF)
if (!xi->init_flag) {
+#if defined(USE_GTK2)
+ g_type_init();
+#endif
gdk_pixbuf_xlib_init(xi->display, 0);
xi->init_flag = TRUE;
}
@@ -290,11 +330,17 @@
Imlib_Image im;
#elif defined(USE_GDKPIXBUF)
GdkPixbufAnimation *animation;
- GList *frames;
- int i, j, iw, ih, n, frame_num, delay, max_anim;
+ int j, iw, ih, n, frame_num, delay = -1, max_anim;
double ratio_w, ratio_h;
struct x11_image *ximg;
Pixmap tmp_pixmap;
+#if defined(USE_GTK2)
+ GdkPixbufAnimationIter *iter;
+ GTimeVal time;
+#else
+ int i;
+ GList *frames;
+#endif
#endif
if (self == NULL)
@@ -342,13 +388,14 @@
imlib_free_image();
#elif defined(USE_GDKPIXBUF)
max_anim = self->max_anim;
+#if defined(USE_GTK2)
+ animation = gdk_pixbuf_animation_new_from_file(fname, NULL);
+#else
animation = gdk_pixbuf_animation_new_from_file(fname);
+#endif
if (!animation)
return 0;
- frames = gdk_pixbuf_animation_get_frames(animation);
- frame_num = n = gdk_pixbuf_animation_get_num_frames(animation);
-
- get_animation_size(animation, &iw, &ih, &delay);
+ frame_num = n = get_animation_size(animation, &iw, &ih, &delay);
if (delay <= 0)
max_anim = -1;
@@ -370,17 +417,64 @@
}
tmp_pixmap = XCreatePixmap(xi->display, xi->parent, w, h,
DefaultDepth(xi->display, 0));
+ XSetForeground(xi->display, xi->imageGC, xi->background_pixel);
XFillRectangle(xi->display, (Pixmap) tmp_pixmap, xi->imageGC, 0, 0, w, h);
if (!tmp_pixmap) {
+#if defined(USE_GTK2)
+ g_object_unref(G_OBJECT(animation));
+#else
gdk_pixbuf_animation_unref(animation);
+#endif
return 0;
}
ximg = x11_img_new(xi, w, h, frame_num);
if (!ximg) {
XFreePixmap(xi->display, tmp_pixmap);
+#if defined(USE_GTK2)
+ g_object_unref(G_OBJECT(animation));
+#else
gdk_pixbuf_animation_unref(animation);
+#endif
return 0;
}
+#if defined(USE_GTK2)
+ g_get_current_time(&time);
+ iter = gdk_pixbuf_animation_get_iter(animation, &time);
+
+ if (max_anim < 0 && n > -max_anim) {
+ max_anim = n + max_anim;
+ for (j = 0; j < max_anim; j++) {
+ delay = gdk_pixbuf_animation_iter_get_delay_time(iter);
+ g_time_val_add(&time, delay * 1000);
+ gdk_pixbuf_animation_iter_advance(iter, &time);
+ }
+ }
+ for (j = 0; j < frame_num; j++) {
+ GdkPixbuf *org_pixbuf, *pixbuf;
+
+ org_pixbuf = gdk_pixbuf_animation_iter_get_pixbuf(iter);
+ delay = gdk_pixbuf_animation_iter_get_delay_time(iter);
+ pixbuf = resize_image(org_pixbuf, w, h);
+
+ if (delay > ximg->delay)
+ ximg->delay = delay;
+
+ gdk_pixbuf_xlib_render_to_drawable_alpha(pixbuf,
+ (Drawable) ximg->pixmap[j], 0,
+ 0, 0, 0, w, h,
+ GDK_PIXBUF_ALPHA_BILEVEL, 1,
+ XLIB_RGB_DITHER_NORMAL, 0, 0);
+ if (org_pixbuf != pixbuf)
+ g_object_unref(G_OBJECT(pixbuf));
+ g_time_val_add(&time, delay * 1000);
+ gdk_pixbuf_animation_iter_advance(iter, &time);
+ }
+ XFreePixmap(xi->display, tmp_pixmap);
+ g_object_unref(G_OBJECT(animation));
+
+#else
+ frames = gdk_pixbuf_animation_get_frames(animation);
+
for (j = 0; j < n; j++) {
GdkPixbufFrame *frame;
GdkPixbuf *org_pixbuf, *pixbuf;
@@ -430,6 +524,9 @@
xi->imageGC, 0, 0, w, h, 0, 0);
break;
case GDK_PIXBUF_FRAME_DISPOSE:
+ XSetForeground(xi->display, xi->imageGC, xi->background_pixel);
+ XFillRectangle(xi->display, tmp_pixmap, xi->imageGC,
+ 0, 0, w, h);
break;
case GDK_PIXBUF_FRAME_REVERT:
XCopyArea(xi->display, ximg->pixmap[0], tmp_pixmap,
@@ -448,6 +545,7 @@
}
XFreePixmap(xi->display, tmp_pixmap);
gdk_pixbuf_animation_unref(animation);
+#endif
img->pixmap = ximg;
#endif
@@ -577,13 +675,21 @@
*h = imlib_image_get_height();
imlib_free_image();
#elif defined(USE_GDKPIXBUF)
+#if defined(USE_GTK2)
+ animation = gdk_pixbuf_animation_new_from_file(fname, NULL);
+#else
animation = gdk_pixbuf_animation_new_from_file(fname);
+#endif
if (!animation)
return 0;
get_animation_size(animation, w, h, NULL);
+#if defined(USE_GTK2)
+ g_object_unref(G_OBJECT(animation));
+#else
gdk_pixbuf_animation_unref(animation);
#endif
+#endif
return 1;
}
Index: w3m.spec
===================================================================
RCS file: /cvs/dist/rpms/w3m/devel/w3m.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- w3m.spec 17 Mar 2005 14:37:15 -0000 1.22
+++ w3m.spec 28 Mar 2005 08:52:21 -0000 1.23
@@ -4,7 +4,7 @@
Name: w3m
Version: 0.5.1
-Release: 7
+Release: 8
License: BSD
URL: http://w3m.sourceforge.net/
BuildRoot: %{_tmppath}/%{name}-%{version}-buildroot
@@ -12,7 +12,7 @@
BuildRequires: openssl-devel
BuildRequires: pkgconfig
BuildRequires: imlib-devel >= 1.9.13-9
-BuildPreReq: gdk-pixbuf-devel >= 0.18.0-4
+BuildPreReq: gtk2-devel
%ifnarch s390 s390x
BuildRequires: gpm-devel
%endif
@@ -32,6 +32,7 @@
Patch17: w3m-0.5-static-libgc.patch
Patch20: gc6.2-fix-prelink.patch
Patch21: w3m-0.5.1-gcc4.patch
+Patch22: w3m-cvs-20050328.patch
Summary: A pager with Web browsing abilities.
@@ -68,6 +69,7 @@
%patch15 -p1
%patch17 -p1
%patch21 -p1
+%patch22 -p0
rm -rf gc
tar xfz %{SOURCE20}
@@ -89,7 +91,7 @@
%{?_without_gopher:--disable-gopher} \
%{!?_without_gopher:--enable-gopher} \
%{?_without_image:--disable-image} \
- %{!?_without_image:--enable-image --with-imagelib=gdk-pixbuf} \
+ %{!?_without_image:--enable-image --with-imagelib=gtk2} \
%{?_with_lynx_keymap:--enable-keymap=lynx} \
%{!?_with_lynx_keymap:--enable-keymap=w3m}
@@ -131,6 +133,9 @@
%{_libexecdir}/w3m/w3mimgdisplay
%changelog
+* Mon Mar 28 2005 Akira TAGOH <tagoh at redhat.com> - 0.5.1-8
+- w3m-cvs-20050328.patch: updated to CVS snapshot to support gtk2.
+
* Thu Mar 17 2005 Akira TAGOH <tagoh at redhat.com> - 0.5.1-7
- rebuilt
- w3m-0.5.1-gcc4.patch: applied to fix the build fails with gcc4.
- Previous message (by thread): rpms/mozilla/FC-2 mozilla.spec,1.21,1.22
- Next message (by thread): rpms/valgrind/devel .cvsignore, 1.4, 1.5 sources, 1.4, 1.5 valgrind.spec, 1.14, 1.15 valgrind-2.0.0-pthread-stacksize.patch, 1.1, NONE valgrind-2.2.0-unnest.patch, 1.1, NONE valgrind-2.2.0-valgrind_h.patch, 1.1, NONE valgrind-2.2.0-warnings.patch, 1.1, NONE valgrind-2.2.0.ioctls.patch, 1.1, NONE
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-cvs-commits
mailing list