Commit 15045ef6 authored by Sven Neumann's avatar Sven Neumann Committed by Sven Neumann

removed intltool version check, it is broken :-( Updated dependencies to

2002-03-09  Sven Neumann  <sven@gimp.org>

	* configure.in: removed intltool version check, it is broken :-(
	Updated dependencies to glib-2.0.0, pango-1.0.0 and gtk+-2.0.0.

	* HACKING
	* INSTALL: updated.

2002-03-09  Sven Neumann  <sven@gimp.org>

	* Makefile.am: added update-po rule, improved dist-hook rule.
	Removed the the old gimp_tips.*.txt files from EXTRA_DIST.

	* gimp-tips.dtd: improved.

	* update.sh: validate gimp-tips.xml after regeneration.
parent 99f371d1
2002-03-09 Sven Neumann <sven@gimp.org>
* configure.in: removed intltool version check, it is broken :-(
Updated dependencies to glib-2.0.0, pango-1.0.0 and gtk+-2.0.0.
* HACKING
* INSTALL: updated.
2002-03-08 Michael Natterer <mitch@gimp.org> 2002-03-08 Michael Natterer <mitch@gimp.org>
* app/widgets/gimpbrushfactoryview.c: forgot some casts. * app/widgets/gimpbrushfactoryview.c: forgot some casts.
......
...@@ -18,6 +18,9 @@ Available from http://www.freedesktop.org/software/pkgconfig/. ...@@ -18,6 +18,9 @@ Available from http://www.freedesktop.org/software/pkgconfig/.
Available from ftp://ftp.gnome.org/pub/GNOME/stable/sources/intltool/. Available from ftp://ftp.gnome.org/pub/GNOME/stable/sources/intltool/.
These are the additional requirements if you want to compile from CVS.
The file INSTALL lists the various libraries we depend on.
Compilation Compilation
----------- -----------
...@@ -51,32 +54,29 @@ autogen.sh and they will be passed on to configure. ...@@ -51,32 +54,29 @@ autogen.sh and they will be passed on to configure.
CVS CVS
--- ---
If at all possible, please use CVS to get the latest development GIMP is available from GNOME CVS. You can also grab glib, pango, atk,
version of gimp, as well as the CVS version of gtk-doc, glib, pango, libart, gtk+ as well as intltool and gtk-doc from the same CVS server.
atk and gtk+. You can do the following to get them all from cvs: You can use the following commands to get them from the anonymous CVS
server:
$ export CVSROOT=':pserver:anonymous@anoncvs.gimp.org:/cvs/gnome' $ export CVSROOT=':pserver:anonymous@anoncvs.gimp.org:/cvs/gnome'
$ cvs login $ cvs login
(there is no password, just hit return) (there is no password, just hit return)
$ cvs -z3 checkout gtk-doc glib pango atk gtk+ gimp $ cvs -z3 checkout <module>
We will try our best to keep the GIMP CVS tree compileable against The interesting module are: glib, atk, pango, gtk+, libart_lgpl,
the latest development releases of glib, pango, atk and gtk+. Since intltool, gtk-doc
it is sometimes difficult to get a working state out of CVS, you may
prefer to use these releases instead. Get them from
ftp://ftp.gtk.org/pub/gtk/v1.3/. We don't expect the API of these
modules to change anymore. If it does nevertheless, we will adapt
GIMP in CVS. This means, GIMP from CVS is supposed to compile against
glib, pango, atk and gtk+ from CVS. Most probably however, the latest
releases will do also.
Patches Patches
------- -------
Please submit patches to the gimp-developer@lists.xcf.berkeley.edu Please submit patches to the gimp-developer@lists.xcf.berkeley.edu
mailing list. All kinds of contributions are appreciated. Larger mailing list. It's also a good idea to file a bug-report at
patches should be uploaded to ftp://ftp.gimp.org/incoming/. Follow http://bugzilla.gnome.org/ and attach your patch to it. All kinds
the rules there for naming your patches. of contributions are appreciated.
Large patches can also be uploaded to ftp://ftp.gimp.org/incoming/
Follow the rules there for naming your patches.
Autogenerated Files Autogenerated Files
......
...@@ -6,22 +6,28 @@ There are some basic steps to building and installing the GIMP: ...@@ -6,22 +6,28 @@ There are some basic steps to building and installing the GIMP:
1. You need to have installed a recent version of pkg-config available 1. You need to have installed a recent version of pkg-config available
from http://www.freedesktop.org/software/pkgconfig/. from http://www.freedesktop.org/software/pkgconfig/.
2. You need to have installed GTK version 1.3.12 or better. Do not try
to use the stable GTK+ versions 1.2.x, it will not work. GTK+-1.3.x 2. You need to have installed GTK version 2.0.0 or better. Do not try
are development releases of the upcoming GTK+-2.0 release. GTK+-2.0 to use an older GTK+ version (1.2.x), it will not work. GTK+-2.0
itself needs recent versions of GLib-2.0, Pango and ATK. Grab them itself needs recent versions of GLib-2.0, Pango and ATK. Grab them
from ftp://ftp.gtk.org/. GTK+-2.0 and friends can be installed side from ftp://ftp.gtk.org/. GTK+-2.0 and friends can be installed side
by side with GTK+-1.2. by side with GTK+-1.2.
3. We require PangoFT2, a Pango backend that uses FreeType2. Make sure 3. We require PangoFT2, a Pango backend that uses FreeType2. Make sure
you have FreeType2 installed before you compile Pango. you have FreeType2 installed before you compile Pango.
4. We use libart2, grab the module libart_lgpl out of GNOME CVS or
4. We use libart2. Grab the module libart_lgpl out of GNOME CVS or
fetch the tarball from fetch the tarball from
ftp://ftp.gnome.org/pub/gnome/pre-gnome2/sources/libart_lgpl/ ftp://ftp.gnome.org/pub/gnome/pre-gnome2/sources/libart_lgpl/
5. You may want to install other third party libraries or programs that 5. You may want to install other third party libraries or programs that
are needed for some of the available plugins: TIFF, PNG, JPEG. are needed for some of the available plugins: TIFF, PNG, JPEG.
6. Configure the GIMP by running the `configure' script. 6. Configure the GIMP by running the `configure' script.
You may want to pass some options to it, see below. You may want to pass some options to it, see below.
7. Build the GIMP by running `make'. 7. Build the GIMP by running `make'.
8. Install the GIMP by running `make install'. In order to avoid clashes 8. Install the GIMP by running `make install'. In order to avoid clashes
with an installed stable version of The GIMP, we install a binary with an installed stable version of The GIMP, we install a binary
called gimp-1.3. called gimp-1.3.
......
...@@ -2,9 +2,10 @@ dnl Process this file with autoconf to produce a configure script. ...@@ -2,9 +2,10 @@ dnl Process this file with autoconf to produce a configure script.
AC_INIT(etc/gimprc.in) AC_INIT(etc/gimprc.in)
GLIB_REQUIRED_VERSION=1.3.15 GLIB_REQUIRED_VERSION=2.0.0
GTK_REQUIRED_VERSION=$GLIB_REQUIRED_VERSION GTK_REQUIRED_VERSION=$GLIB_REQUIRED_VERSION
PANGOFT2_REQUIRED_VERSION=0.26 PANGOFT2_REQUIRED_VERSION=1.0.0
GTKDOC_REQUIRED_VERSION=0.9 GTKDOC_REQUIRED_VERSION=0.9
# #
...@@ -120,7 +121,7 @@ AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE,"$GETTEXT_PACKAGE") ...@@ -120,7 +121,7 @@ AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE,"$GETTEXT_PACKAGE")
ALL_LINGUAS="ca cs da de el en_GB es fi fr ga gl hu hr it ja ko nl no pl pt_BR ro ru sk sv tr uk zh_CN zh_TW" ALL_LINGUAS="ca cs da de el en_GB es fi fr ga gl hu hr it ja ko nl no pl pt_BR ro ru sk sv tr uk zh_CN zh_TW"
AC_PROG_INTLTOOL(0.17) AC_PROG_INTLTOOL
AM_GLIB_GNU_GETTEXT AM_GLIB_GNU_GETTEXT
......
2002-03-09 Sven Neumann <sven@gimp.org> 2002-03-09 Sven Neumann <sven@gimp.org>
* Makefile.am: fixed the dist-hook rule. * Makefile.am: added update-po rule, improved dist-hook rule.
Removed the the old gimp_tips.*.txt files from EXTRA_DIST.
* gimp-tips.dtd: improved.
* update.sh: validate gimp-tips.xml after regeneration.
2002-03-08 Sven Neumann <sven@gimp.org> 2002-03-08 Sven Neumann <sven@gimp.org>
* gimp-tips.dtd: new file defining the GIMP tips document type. * gimp-tips.dtd: new file defining the GIMP tips document type.
* Makefile.am: added a dist-hook that attempts to validate * Makefile.am: added a dist-hook that attempts to validate
gimp-tips.xml using xmllint when building a tarball. gimp-tips.xml using xmllint.
* gimp-tips.xml.in: specify the DTD. Removed <i> markup tags I * gimp-tips.xml.in: specify the DTD. Removed <i> markup tags I
accidentally left in there. accidentally left in there.
......
...@@ -6,11 +6,37 @@ tips_in_files = gimp-tips.xml.in ...@@ -6,11 +6,37 @@ tips_in_files = gimp-tips.xml.in
tipsdata_DATA = $(tips_in_files:.xml.in=.xml) tipsdata_DATA = $(tips_in_files:.xml.in=.xml)
tips_POFILES = \
da.po \
de.po \
pt.po \
sv.po
EXTRA_DIST = \
ChangeLog \
POTFILES.in \
$(GETTEXT_PACKAGE)-tips.pot \
$(tips_POFILES) \
$(tipsdata_DATA) \
$(tips_in_files) \
gimp-tips.dtd \
makefile.mingw \
update.sh
CLEANFILES = $(GETTEXT_PACKAGE)-tips.po
DISTCLEANFILES = POTFILES
MAINTAINERCLEANFILES = $(tipsdata_DATA)
%.xml: %.xml.in $(srcdir)/$(GETTEXT_PACKAGE)-tips.pot $(wildcard $(srcdir)/*.po) %.xml: %.xml.in $(srcdir)/$(GETTEXT_PACKAGE)-tips.pot $(wildcard $(srcdir)/*.po)
$(INTLTOOL_MERGE) $(srcdir) $< $(@) -x -u -c .intltool-merge-cache $(INTLTOOL_MERGE) $(srcdir) $< $(@) -x -u -c .intltool-merge-cache
GENPOT = INTLTOOL_EXTRACT=$(INTLTOOL_EXTRACT) $(INTLTOOL_UPDATE) --gettext-package $(GETTEXT_PACKAGE)-tips --pot GENPOT = INTLTOOL_EXTRACT=$(INTLTOOL_EXTRACT) $(INTLTOOL_UPDATE) --gettext-package $(GETTEXT_PACKAGE)-tips --pot
MSGMERGE = INTLTOOL_EXTRACT=$(INTLTOOL_EXTRACT) $(INTLTOOL_UPDATE) --gettext-package $(GETTEXT_PACKAGE)-tips --dist
# POTFILES is created from POTFILES.in by stripping comments, empty lines # POTFILES is created from POTFILES.in by stripping comments, empty lines
# and Intltool tags (enclosed in square brackets), and appending a full # and Intltool tags (enclosed in square brackets), and appending a full
# relative path to them # relative path to them
...@@ -32,9 +58,24 @@ POTFILES: POTFILES.in ...@@ -32,9 +58,24 @@ POTFILES: POTFILES.in
$(srcdir)/$(GETTEXT_PACKAGE)-tips.pot: $(POTFILES) $(srcdir)/$(GETTEXT_PACKAGE)-tips.pot: $(POTFILES)
$(GENPOT) $(GENPOT)
CLEANFILES = $(GETTEXT_PACKAGE)-tips.po update-po: $(srcdir)/$(GETTEXT_PACKAGE)-tips.pot
PATH=`pwd`/../src:$$PATH; \
cd $(srcdir); \
pofiles='$(tips_POFILES)'; \
for po in $$pofiles; do \
lang=`basename $$po .po`; \
cp $$lang.po $$lang.old.po; \
echo "$$lang:"; \
if $(MSGMERGE) $$lang; then \
rm -f $$lang.old.po; \
else \
echo "msgmerge for $$cat failed!"; \
rm -f $$lang.po; \
mv $$lang.old.po $$lang.po; \
fi; \
done
dist-hook: dist-hook: update-po gimp-tips.xml
( xmllint=`which xmllint`; \ ( xmllint=`which xmllint`; \
if test x$$xmllint != x && test -x $$xmllint; then \ if test x$$xmllint != x && test -x $$xmllint; then \
$$xmllint --noout --valid gimp-tips.xml || \ $$xmllint --noout --valid gimp-tips.xml || \
...@@ -42,27 +83,3 @@ dist-hook: ...@@ -42,27 +83,3 @@ dist-hook:
else \ else \
echo "Can't find xmllint to validate gimp-tips.xml; proceed with fingers crossed..."; \ echo "Can't find xmllint to validate gimp-tips.xml; proceed with fingers crossed..."; \
fi ) fi )
oldtips = \
gimp_tips.cs.txt \
gimp_tips.es.txt \
gimp_tips.fr.txt \
gimp_tips.hu.txt \
gimp_tips.it.txt \
gimp_tips.ja.txt \
gimp_tips.ko.txt \
gimp_tips.pl.txt \
gimp_tips.ru.txt \
gimp_tips.tr.txt \
gimp_tips.uk.txt \
gimp_tips.zh_CN.txt \
gimp_tips.zh_TW.txt
EXTRA_DIST = \
POTFILES.in \
$(tips_in_files) \
$(oldtips) \
gimp-tips.dtd \
ChangeLog \
makefile.mingw \
update.sh
...@@ -5,12 +5,14 @@ ...@@ -5,12 +5,14 @@
<!ELEMENT tip (welcome*, thetip+)> <!ELEMENT tip (welcome*, thetip+)>
<!ATTLIST tip level (start|beginner|intermediate|advanced) #REQUIRED> <!ATTLIST tip level (start|beginner|intermediate|advanced) #REQUIRED>
<!ELEMENT welcome (#PCDATA|b|big|tt)*> <!ENTITY % markup "(#PCDATA|b|big|tt)*">
<!ELEMENT b %markup;>
<!ELEMENT big %markup;>
<!ELEMENT tt %markup;>
<!ELEMENT welcome %markup;>
<!ATTLIST welcome xml:lang CDATA #IMPLIED> <!ATTLIST welcome xml:lang CDATA #IMPLIED>
<!ELEMENT thetip (#PCDATA|b|big|tt)*> <!ELEMENT thetip %markup;>
<!ATTLIST thetip xml:lang CDATA #IMPLIED> <!ATTLIST thetip xml:lang CDATA #IMPLIED>
<!ELEMENT b (#PCDATA|big|tt)*>
<!ELEMENT big (#PCDATA|b|tt)*>
<!ELEMENT tt (#PCDATA|b|big)*>
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment