Update of /cvsroot/fink/dists/10.4/stable/main/finkinfo/editors
In directory sc8-pr-cvs5.sourceforge.net:/tmp/cvs-serv23718
Modified Files:
tea.info tea.patch
Log Message:
Fixed call to gdk_pixbuf_new_from_file_at_scale not available in gtk+2 2.4 and
buggy anyway
Index: tea.patch
===================================================================
RCS file: /cvsroot/fink/dists/10.4/stable/main/finkinfo/editors/tea.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- tea.patch 20 Jun 2006 00:06:52 -0000 1.1
+++ tea.patch 30 Oct 2006 15:52:15 -0000 1.2
@@ -1,60 +1,99 @@
-diff -Nurd tea-13.1-orig/Makefile.in tea-13.1/Makefile.in
---- tea-13.1-orig/Makefile.in 2006-04-28 22:24:25.000000000 +0200
-+++ tea-13.1/Makefile.in 2006-05-03 09:51:50.000000000 +0200
-@@ -17,6 +17,7 @@
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-+pkgdocdir = $(datadir)/doc/@PACKAGE@
- pkgdatadir = $(datadir)/@PACKAGE@
- pkglibdir = $(libdir)/@PACKAGE@
- pkgincludedir = $(includedir)/@PACKAGE@
-@@ -543,17 +544,17 @@
+diff -Nurd tea-14.2.3-orig/configure tea-14.2.3/configure
+--- tea-14.2.3-orig/configure 2006-08-19 22:14:33.000000000 +0200
++++ tea-14.2.3/configure 2006-08-20 05:58:55.000000000 +0200
+@@ -4887,10 +4887,14 @@
- @[EMAIL PROTECTED]:
- @DEB_TRUE@ @$(NORMAL_INSTALL)
[EMAIL PROTECTED]@ $(mkinstalldirs) $(DESTDIR)$(pkgdatadir)/doc;
[EMAIL PROTECTED]@ $(mkinstalldirs) $(DESTDIR)$(pkgdocdir);
- @[EMAIL PROTECTED]:
- @DEB_FALSE@ @$(NORMAL_INSTALL)
[EMAIL PROTECTED]@ $(mkinstalldirs) $(DESTDIR)$(pkgdatadir)/doc; \
[EMAIL PROTECTED]@ cp -r $(srcdir)/doc $(DESTDIR)$(pkgdatadir); \
[EMAIL PROTECTED]@ cp $(srcdir)/AUTHORS $(DESTDIR)$(pkgdatadir)/doc; \
[EMAIL PROTECTED]@ cp $(srcdir)/ChangeLog $(DESTDIR)$(pkgdatadir)/doc; \
[EMAIL PROTECTED]@ cp $(srcdir)/README $(DESTDIR)$(pkgdatadir)/doc; \
[EMAIL PROTECTED]@ cp $(srcdir)/NEWS $(DESTDIR)$(pkgdatadir)/doc; \
[EMAIL PROTECTED]@ cp $(srcdir)/COPYING $(DESTDIR)$(pkgdatadir)/doc; \
[EMAIL PROTECTED]@ cp $(srcdir)/TODO $(DESTDIR)$(pkgdatadir)/doc; \
[EMAIL PROTECTED]@ $(mkinstalldirs) $(DESTDIR)$(pkgdocdir); \
[EMAIL PROTECTED]@ cp -r $(srcdir)/doc/* $(DESTDIR)$(pkgdocdir); \
[EMAIL PROTECTED]@ cp $(srcdir)/AUTHORS $(DESTDIR)$(pkgdocdir); \
[EMAIL PROTECTED]@ cp $(srcdir)/ChangeLog $(DESTDIR)$(pkgdocdir); \
[EMAIL PROTECTED]@ cp $(srcdir)/README $(DESTDIR)$(pkgdocdir); \
[EMAIL PROTECTED]@ cp $(srcdir)/NEWS $(DESTDIR)$(pkgdocdir); \
[EMAIL PROTECTED]@ cp $(srcdir)/COPYING $(DESTDIR)$(pkgdocdir); \
[EMAIL PROTECTED]@ cp $(srcdir)/TODO $(DESTDIR)$(pkgdocdir); \
- @DEB_FALSE@ if test -d $(srcdir)/pixmaps; then \
- @DEB_FALSE@ $(mkinstalldirs) $(DESTDIR)$(pkgdatadir)/pixmaps; \
- @DEB_FALSE@ for pixmap in $(srcdir)/pixmaps/*; do \
-@@ -574,7 +575,8 @@
+
+ echo -n "checking for gtksourceview-1.0..."
+-if pkg-config --exists "gtksourceview-1.0 >= 1.0" ; then
+- LIBS="$LIBS `pkg-config --libs gtksourceview-1.0`"
+- CFLAGS="$CFLAGS `pkg-config --cflags gtksourceview-1.0`"
+- echo "yes"
++ if pkg-config --exists gtksourceview-1.0 ; then
++ if pkg-config gtksourceview-1.0 --atleast-version=1.0 ; then
++ LIBS="$LIBS `pkg-config --libs gtksourceview-1.0`"
++ CFLAGS="$CFLAGS `pkg-config --cflags gtksourceview-1.0`"
++ echo "yes"
++ else
++ echo "no"
++ fi
+ else
+ echo "no"
fi
+diff -Nurd tea-14.2.3-orig/configure.in tea-14.2.3/configure.in
+--- tea-14.2.3-orig/configure.in 2006-08-19 22:14:28.000000000 +0200
++++ tea-14.2.3/configure.in 2006-08-20 05:57:32.000000000 +0200
+@@ -78,11 +78,14 @@
+ AC_DEFINE(CHAI_MODE, 1, [chai mode])
- uninstall-local:
-- rm -f -r -d $(DESTDIR)$(pkgdatadir);
-+ rm -f -r -d $(DESTDIR)$(pkgdatadir); \
-+ rm -f -r -d $(DESTDIR)$(pkgdocdir);
- # Tell versions [3.59,3.63) of GNU make to not export all variables.
- # Otherwise a system limit (for SysV at least) may be exceeded.
- .NOEXPORT:
-diff -Nurd tea-13.1-orig/src/tea_defs.h tea-13.1/src/tea_defs.h
---- tea-13.1-orig/src/tea_defs.h 2006-04-13 11:32:01.000000000 +0200
-+++ tea-13.1/src/tea_defs.h 2006-05-03 09:24:46.000000000 +0200
-@@ -119,7 +119,7 @@
+ echo -n "checking for gtksourceview-1.0..."
+-if pkg-config --exists "gtksourceview-1.0 >= 1.0" ; then
+-dnl if pkg-config --exists gtksourceview-1.0 ; then
+- LIBS="$LIBS `pkg-config --libs gtksourceview-1.0`"
+- CFLAGS="$CFLAGS `pkg-config --cflags gtksourceview-1.0`"
+- echo "yes"
++ if pkg-config --exists gtksourceview-1.0 ; then
++ if pkg-config gtksourceview-1.0 --atleast-version=1.0 ; then
++ LIBS="$LIBS `pkg-config --libs gtksourceview-1.0`"
++ CFLAGS="$CFLAGS `pkg-config --cflags gtksourceview-1.0`"
++ echo "yes"
++ else
++ echo "no"
++ fi
+ else
+ echo "no"
+ fi
+diff -Nurd tea-14.2.3-orig/src/interface.c tea-14.2.3/src/interface.c
+--- tea-14.2.3-orig/src/interface.c 2006-08-19 15:20:22.000000000 +0200
++++ tea-14.2.3/src/interface.c 2006-08-20 09:27:10.000000000 +0200
+@@ -1053,11 +1053,11 @@
+
+ #ifdef CHAI_MODE
+
+-log_to_memo ("TEA 14.2.2 @ http://tea-editor.sourceforge.net";, NULL,
LM_GREET);
++log_to_memo ("TEA 14.2.3 @ http://tea-editor.sourceforge.net";, NULL,
LM_GREET);
#else
--#define TEA_DOC_DIR PACKAGE_DATA_DIR"/tea/doc/"
-+#define TEA_DOC_DIR PACKAGE_DATA_DIR"/doc/tea/"
- #define TEA_PIX_MAINLOGO PACKAGE_DATA_DIR"/tea/pixmaps/tea_logo.jpg"
- #define TEA_PIX_MAINICON PACKAGE_DATA_DIR"/tea/pixmaps/tea_icon_v2.png"
- #define TEA_PIX_DIR PACKAGE_DATA_DIR"/tea/pixmaps/"
+-log_to_memo ("TEA (original) 14.2.2 @ http://tea-editor.sourceforge.net";,
NULL, LM_GREET);
++log_to_memo ("TEA (original) 14.2.3 @ http://tea-editor.sourceforge.net";,
NULL, LM_GREET);
+
+ #endif
+
+diff -Nurd tea-14.2.3-orig/src/image_browser.c tea-14.2.3/src/image_browser.c
+--- tea-14.2.3-orig/src/image_browser.c 2006-08-15 13:35:38.000000000
+0200
++++ tea-14.2.3/src/image_browser.c 2006-10-28 09:33:03.000000000 +0200
+@@ -25,6 +25,7 @@
+ #include <string.h>
+ #include <sys/stat.h>
+ #include <gdk/gdkkeysyms.h>
++#include <gdk-pixbuf/gdk-pixbuf.h>
+
+ #include <stddef.h>
+ #include <stdlib.h>
+@@ -73,9 +74,10 @@
+ {
+ GdkPixbuf *x = gtk_image_get_pixbuf (instance->image);
+ gint w = gdk_pixbuf_get_width (x);
++ gint h = gdk_pixbuf_get_height (x);
+
+- GdkPixbuf *p = gdk_pixbuf_new_from_file_at_scale (instance->filename, w
+ 50,
+- -1, TRUE, NULL);
++ GdkPixbuf *p = gdk_pixbuf_new_from_file_at_size (instance->filename, w +
50,
++ h+50, NULL);
+
+ gtk_image_set_from_pixbuf (instance->image, p);
+ }
+@@ -84,9 +86,10 @@
+ {
+ GdkPixbuf *x = gtk_image_get_pixbuf (instance->image);
+ gint w = gdk_pixbuf_get_width (x);
++ gint h = gdk_pixbuf_get_height (x);
+
+- GdkPixbuf *p = gdk_pixbuf_new_from_file_at_scale (instance->filename, w
- 50,
+- -1, TRUE, NULL);
++ GdkPixbuf *p = gdk_pixbuf_new_from_file_at_size (instance->filename, w -
50,
++ h + 50, NULL);
+
+ gtk_image_set_from_pixbuf (instance->image, p);
+
Index: tea.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/stable/main/finkinfo/editors/tea.info,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- tea.info 18 Aug 2006 11:36:46 -0000 1.2
+++ tea.info 30 Oct 2006 15:52:15 -0000 1.3
@@ -1,25 +1,26 @@
Package: tea
-Version: 14.1.0
-Revision: 1001
+Version: 14.2.3
+Revision: 1021
Source: mirror:sourceforge:tea-editor/%n-%v.tar.bz2
-Source-MD5: 1c8a75f707e16f4e283a2ecde6b476b9
+Source-MD5: 810de44cdbef34d17bf7b956cf3ef60f
SourceDirectory: %n-%v
Depends: <<
aspell-shlibs (>= 0.50.5-1002), atk1-shlibs, gconf2-shlibs, glib2-shlibs,
- gnome-vfs2-ssl-shlibs | gnome-vfs2-shlibs, gtk+2-shlibs (>= 2.4.0-1),
gtksourceview-shlibs,
- libart2-shlibs, libbonobo2-shlibs, libgettext3-shlibs,
- libgnomeprint2.2-shlibs, libiconv, libxml2-shlibs,
- orbit2-shlibs, pango1-xft2-shlibs, x11-shlibs
+ gnome-vfs2-ssl-shlibs | gnome-vfs2-shlibs, gtk+2-shlibs (>= 2.4.0-1),
+ gtk+2 (>= 2.4.0-1), gtksourceview, gtksourceview-shlibs, libart2-shlibs,
+ libbonobo2-shlibs, libgettext3-shlibs, libgnomeprint2.2-shlibs, libiconv,
+ libxml2-shlibs, orbit2-shlibs, pango1-xft2-shlibs, x11-shlibs
<<
BuildDepends: <<
pkgconfig, aspell-dev (>= 0.50.5-1002), atk1, gconf2-dev, glib2-dev,
- gnome-vfs2-ssl-dev | gnome-vfs2-dev, gtk+2-dev (>= 2.4.0-1),
gtksourceview-dev, libart2,
- libbonobo2-dev, libgettext3-dev, libgnomeprint2.2-dev, gettext-tools,
gettext-bin,
- libiconv-dev, libxml2, orbit2-dev, pango1-xft2-dev,
- x11-dev
+ gnome-vfs2-ssl-dev | gnome-vfs2-dev, gtk+2-dev (>= 2.4.0-1),
+ gtksourceview-dev, libart2, libbonobo2-dev, libgettext3-dev,
+ libgnomeprint2.2-dev, gettext-tools, gettext-bin, libiconv-dev, libxml2,
+ orbit2-dev, pango1-xft2-dev, x11-dev
<<
Patch: %n.patch
ConfigureParams: --disable-dependency-tracking
+SetCFLAGS: -g -O2 -w -s
SetCPPFLAGS: -no-cpp-precomp
Description: Small text editor
DescDetail: <<
@@ -31,6 +32,8 @@
First of all, read the manual located in %p/share/doc/tea.
You need to install the desired aspell dictionnaries to
benefit of the checkspell tool.
+ If you want to open MSWord documents, install antiword.
+ If you want to decompress ZIP or GZ files, install gunzip.
You may have to change the default browser to view the
documentation via the help menu.
To add an icon to the gnome panel, go to preferences,
@@ -38,6 +41,17 @@
drag it to the top panel and click it to launch tea.
You may delete it once it is in the panel.
<<
+DescPort: <<
+Use of pkgconfig
+<<
+DescPackaging: <<
+Changed part of configure to recognize correctly version
+of gtksourceview
+Patched version number in log memo
+Patched image_browser.c because
+gdk_pixbuf_new_from_file_at_scale is buggy and does not
+exist in gtk+-2.4
+<<
Homepage: http://tea-editor.sourceforge.net/
License: GPL
Maintainer: Michele Garoche <[EMAIL PROTECTED]>
-------------------------------------------------------------------------
Using Tomcat but need to do more? Need to support web services, security?
Get stuff done quickly with pre-integrated technology to make your job easier
Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=120709&bid=263057&dat=121642
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/fink-commits
