Commit eb64e4bf authored by Ramiro Estrugo's avatar Ramiro Estrugo

Port to GNOME2.

	* .cvsignore:
	* Makefile.am:
	* README:
	* autogen.sh:
	* configure.in:
	* librsvg-1.0.pc.in:
	* librsvg-2.0.pc.in:
	* librsvg-config.in:
	* librsvg.spec.in:
	* librsvgConf.sh.in:
	* rsvg.c: (rsvg_entity_decl):
	* test-ft-gtk.c: (main):
	* test-ft.c: (main):
	* test-rsvg.c: (main):
	Port to GNOME2.
parent c22a76f2
......@@ -2,6 +2,7 @@
*.lo
.deps
.libs
ABOUT-NLS
Makefile
Makefile.in
aclocal.m4
......@@ -13,9 +14,10 @@ config.log
config.status
config.sub
configure
intl
librsvg-*.tar.gz
librsvg-1.0.pc
librsvg-config
librsvg-2.0.pc
librsvg-features.h
librsvg.spec
librsvgConf.sh
......@@ -33,6 +35,4 @@ xml-i18n-merge
xml-i18n-merge.in
xml-i18n-update
xml-i18n-update.in
intl
ABOUT-NLS
po
2001-07-09 Ramiro Estrugo <ramiro@fateware.com>
* .cvsignore:
* Makefile.am:
* README:
* autogen.sh:
* configure.in:
* librsvg-1.0.pc.in:
* librsvg-2.0.pc.in:
* librsvg-config.in:
* librsvg.spec.in:
* librsvgConf.sh.in:
* rsvg.c: (rsvg_entity_decl):
* test-ft-gtk.c: (main):
* test-ft.c: (main):
* test-rsvg.c: (main):
Port to GNOME2.
==== librsvg 1.0.1 ====
2001-07-05 Darin Adler <darin@bentspoon.com>
......
noinst_PROGRAMS = test-ft-gtk test-ft test-rsvg
bin_SCRIPTS = \
librsvg-config
EXTRA_DIST =\
COPYING.LIB \
librsvg.spec.in \
librsvg.m4 \
librsvgConf.sh.in \
librsvg-config.in \
librsvg-1.0.pc.in
librsvg-2.0.pc.in
lib_LTLIBRARIES = librsvg.la
......@@ -92,24 +87,8 @@ m4data_DATA = librsvg.m4
## Put `exec' in the name because this should be installed by
## `install-exec', not `install-data'.
confexecdir=$(libdir)
confexec_DATA = librsvgConf.sh
pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = librsvg-1.0.pc
## We create librsvgConf.sh here and not from configure because we want
## to get the paths expanded correctly. Macros like srcdir are given
## the value NONE in configure if the user doesn't specify them (this
## is an autoconf feature, not a bug).
librsvgConf.sh: librsvgConf.sh.in Makefile
## Use sed and then mv to avoid problems if the user interrupts.
sed -e 's?\@LIBRSVG_LIBDIR\@?$(LIBRSVG_LIBDIR)?g' \
-e 's?\@LIBRSVG_INCLUDEDIR\@?$(LIBRSVG_INCLUDEDIR)?g' \
-e 's?\@LIBRSVG_LIBS\@?$(LIBRSVG_LIBS)?g' \
< $(srcdir)/librsvgConf.sh.in > librsvgConf.tmp \
&& mv librsvgConf.tmp librsvgConf.sh
pkgconfig_DATA = librsvg-2.0.pc
dist-hook: librsvg.spec
cp librsvg.spec $(distdir)
Writeme.
README for librsvg 1.1.
This is librsvg 1.1 - the GNOME 2.0 platform development version
librsvg.
If you are looking for the stable version to use with the GNOME
1.4 platform, please obtain librsvg from GNOME CVS as follows:
cvs co -r librsvg-1-0 librsvg
If you have questions or comments about librsvg, please send
email to nautilus-list@lists.eazel.com
......@@ -4,104 +4,21 @@
srcdir=`dirname $0`
test -z "$srcdir" && srcdir=.
ORIGDIR=`pwd`
cd $srcdir
PROJECT=librsvg
TEST_TYPE=-f
FILE=rsvg.c
DIE=0
(autoconf --version) < /dev/null > /dev/null 2>&1 || {
echo
echo "You must have autoconf installed to compile $PROJECT."
echo "Download the appropriate package for your distribution,"
echo "or get the source tarball at ftp://ftp.gnu.org/pub/gnu/"
DIE=1
}
(libtool --version) < /dev/null > /dev/null 2>&1 || {
echo
echo "You must have libtool installed to compile $PROJECT."
echo "Get ftp://alpha.gnu.org/gnu/libtool-1.0h.tar.gz"
echo "(or a newer version if it is available)"
DIE=1
}
(automake --version) < /dev/null > /dev/null 2>&1 || {
echo
echo "You must have automake installed to compile $PROJECT."
echo "Get ftp://ftp.cygnus.com/pub/home/tromey/automake-1.2d.tar.gz"
echo "(or a newer version if it is available)"
DIE=1
PKG_NAME="librsvg"
(test -f $srcdir/configure.in \
&& test -f $srcdir/README \
&& test -f $srcdir/rsvg.h) || {
echo -n "**Error**: Directory "\`$srcdir\'" does not look like the"
echo " top-level $PKG_NAME directory"
exit 1
}
(xml-i18n-toolize --version) < /dev/null > /dev/null 2>&1 || {
echo
echo "You must have xml-i18n-tools installed to compile $PROJECT."
}
if test "$DIE" -eq 1; then
exit 1
fi
test $TEST_TYPE $FILE || {
echo "You must run this script in the top-level $PROJECT directory"
exit 1
}
if test -z "$*"; then
echo "I am going to run ./configure with no arguments - if you wish "
echo "to pass any to it, please specify them on the $0 command line."
fi
case $CC in
*lcc | *lcc\ *) am_opt=--include-deps;;
esac
echo "Running gettextize... Ignore non-fatal messages."
# Hmm, we specify --force here, since otherwise things don't
# get added reliably, but we don't want to overwrite intl
# while making dist.
echo "no" | gettextize --copy --force
echo "Running xml-i18n-toolize"
xml-i18n-toolize --copy --force --automake
echo "Running libtoolize"
libtoolize --copy --force
if test -z "$GNOME_INTERFACE_VERSION"; then
ACLOCAL_FLAGS="-I hack-macros $ACLOCAL_FLAGS"
fi
ACLOCAL_FLAGS="-I hack-macros $ACLOCAL_FLAGS"
aclocal $ACLOCAL_FLAGS
# optionally feature autoheader
(autoheader --version) < /dev/null > /dev/null 2>&1 && autoheader
automake -a $am_opt
autoconf
cd $ORIGDIR
if [ "`whoami`" = "sopwith" ]; then
SOPWITH_FLAGS_HACK="--enable-fatal-warnings=no --enable-more-warnings=no"
fi
$srcdir/configure --enable-maintainer-mode "$@" $SOPWITH_FLAGS_HACK
rv=$?
if [ $rv -eq 0 ]
then
echo
echo "Now type 'make' to compile $PROJECT."
exit 0
fi
echo
echo "There was a problem running $srcdir/configure for $PROJECT."
exit 1
which gnome-autogen.sh || {
echo "You need to install gnome-common from the GNOME CVS"
exit 1
}
USE_GNOME2_MACROS=1 . gnome-autogen.sh
AC_INIT(rsvg.h)
LIBXML_REQUIRED=1.8.10
LIBART_REQUIRED=2.2.0
GLIB_REQUIRED=1.2.9
GTK_REQUIRED=1.2.9
FREETYPE_REQUIRED=2.0.1
FREETYPE_LIBRARY_REQUIRED=6.1.0
GDK_PIXBUF_REQUIRED=0.10.0
POPT_REQUIRED=1.5
dnl ====================================
AM_CONFIG_HEADER(config.h)
LIBRSVG_MAJOR_VERSION=1
LIBRSVG_MINOR_VERSION=0
LIBRSVG_MICRO_VERSION=1
LIBRSVG_MINOR_VERSION=1
LIBRSVG_MICRO_VERSION=0
LIBRSVG_VERSION=$LIBRSVG_MAJOR_VERSION.$LIBRSVG_MINOR_VERSION.$LIBRSVG_MICRO_VERSION
LIBRSVG_VERSION_INFO=`expr $LIBRSVG_MAJOR_VERSION + $LIBRSVG_MINOR_VERSION`:$LIBRSVG_MICRO_VERSION:$LIBRSVG_MINOR_VERSION
......@@ -28,22 +16,64 @@ AC_SUBST(LIBRSVG_VERSION_INFO)
VERSION=$LIBRSVG_VERSION
AM_INIT_AUTOMAKE(librsvg, $VERSION)
GNOME_COMMON_INIT
AM_MAINTAINER_MODE
AM_PROG_XML_I18N_TOOLS
AC_ISC_POSIX
AC_PROG_CC
AC_PROG_CPP
AC_STDC_HEADERS
AC_ARG_PROGRAM
AC_PROG_AWK
AM_PROG_LIBTOOL
AC_STDC_HEADERS
GNOME_REQUIRE_PKGCONFIG
GNOME_PLATFORM_GNOME_2(yes)
GLIB_REQUIRED=1.3.1
XML_REQUIRED=2.2.8
ART_REQUIRED=2.3.4
GTK_REQUIRED=1.3.7
GDK_PIXBUF_REQUIRED=1.3.7
FREETYPE_REQUIRED=2.0.1
FREETYPE_LIBRARY_REQUIRED=6.1.0
POPT_REQUIRED=1.5
AC_SUBST(LIBXML_REQUIRED)
AC_SUBST(LIBART_REQUIRED)
AC_SUBST(GLIB_REQUIRED)
AC_SUBST(XML_REQUIRED)
AC_SUBST(ART_REQUIRED)
AC_SUBST(GTK_REQUIRED)
AC_SUBST(GDK_PIXBUF_REQUIRED)
AC_SUBST(FREETYPE_REQUIRED)
AC_SUBST(POPT_REQUIRED)
GNOME_PKGCONFIG_CHECK_MODULES(GLIB, glib-2.0:$GLIB_REQUIRED gmodule-2.0:$GLIB_REQUIRED gthread-2.0:$GLIB_REQUIRED gtk+-2.0:$GLIB_REQUIRED)
GNOME_PKGCONFIG_CHECK_MODULES(GTK, gtk+-2.0:$GTK_REQUIRED)
GNOME_PKGCONFIG_CHECK_MODULES(GDK_PIXBUF, gdk-pixbuf-2.0:$GDK_PIXBUF_REQUIRED)
GNOME_PKGCONFIG_CHECK_MODULES(XML, libxml-2.0:$XML_REQUIRED)
GNOME_PKGCONFIG_CHECK_MODULES(ART, libart-2.0:$ART_REQUIRED)
dnl AC_DEFINE(GNOME_PLATFORM_VERSION, 1095000)
AC_SUBST(GLIB_LIBS)
AC_SUBST(GLIB_CFLAGS)
AC_SUBST(GMODULE_LIBS)
AC_SUBST(GMODULE_CFLAGS)
AC_SUBST(GTHREAD_LIBS)
AC_SUBST(GTHREAD_CFLAGS)
AC_SUBST(GTK_LIBS)
AC_SUBST(GTK_CFLAGS)
AC_SUBST(GDK_PIXBUF_LIBS)
AC_SUBST(GDK_PIXBUF_CFLAGS)
AC_SUBST(XML_LIBS)
AC_SUBST(XML_CFLAGS)
AC_SUBST(ART_LIBS)
AC_SUBST(ART_CFLAGS)
dnl ====================================
dnl = Begin tests for popt
dnl ====================================
......@@ -84,71 +114,6 @@ dnl =======================
dnl = End tests for libpng
dnl =======================
dnl ====================================
dnl = Begin tests for glib
dnl ====================================
AC_PATH_PROG(GLIB_CONFIG,glib-config,no)
if test x$GLIB_CONFIG = xno; then
AC_MSG_ERROR(Couldn't find glib-config please install the glib package)
fi
GLIB_VERSION="`$GLIB_CONFIG --version`"
case "$GLIB_VERSION" in
1.2.*)
:
;;
*)
AC_ERROR(librsvg needs glib version 1.2.x not $GLIB_VERSION)
;;
esac
GLIB_LIBS=`$GLIB_CONFIG --libs`
GLIB_CFLAGS=`$GLIB_CONFIG --cflags`
AC_SUBST(GLIB_LIBS)
AC_SUBST(GLIB_CFLAGS)
dnl ====================================
dnl = End tests for glib
dnl ====================================
dnl ====================================
dnl = Begin tests for gtk
dnl ====================================
AC_PATH_PROG(GTK_CONFIG,gtk-config,no)
if test x$GTK_CONFIG = xno; then
AC_MSG_ERROR(Couldn't find gtk-config please install the gtk package)
fi
GTK_VERSION="`$GTK_CONFIG --version`"
case "$GTK_VERSION" in
1.2.*)
:
;;
*)
AC_ERROR(librsvg needs gtk version 1.2.x not $GTK_VERSION)
;;
esac
GTK_LIBS=`$GTK_CONFIG --libs`
GTK_CFLAGS=`$GTK_CONFIG --cflags`
AC_SUBST(GTK_LIBS)
AC_SUBST(GTK_CFLAGS)
dnl ====================================
dnl = End tests for gtk
dnl ====================================
dnl ====================================
dnl = begin gdk-pixbuf checks
dnl ====================================
AM_PATH_GDK_PIXBUF($GDK_PIXBUF_REQUIRED,,
AC_MSG_ERROR([*** gdk_pixbuf $GDK_PIXBUF_REQUIRED or better is required.]))
AC_SUBST(GDK_PIXBUF_REQUIRED)
dnl ====================================
dnl = end gdk-pixbuf checks
dnl ====================================
dnl =======================
dnl = begin tests for FreeType2
dnl =======================
......@@ -165,70 +130,6 @@ dnl =======================
dnl = End tests for FreeType2
dnl =======================
dnl ====================================
dnl = Begin tests for libxml
dnl ====================================
AC_PATH_PROG(XML_CONFIG,xml-config,no)
if test x$XML_CONFIG = xno; then
AC_MSG_ERROR(Couldn't find xml-config please install the gnome-xml package)
fi
XML_VERSION="`$XML_CONFIG --version`"
case "$XML_VERSION" in
1.*)
:
;;
*)
AC_ERROR(librsvg needs gnome-xml version 1.x not $XML_VERSION)
;;
esac
XML_LIBS=`$XML_CONFIG --libs`
XML_CFLAGS=`$XML_CONFIG --cflags`
AC_SUBST(XML_LIBS)
AC_SUBST(XML_CFLAGS)
dnl ====================================
dnl = End tests for libxml
dnl ====================================
dnl ====================================
dnl = Begin tests for libart
dnl ====================================
AC_PATH_PROG(ART_CONFIG,libart-config,no)
if test x$ART_CONFIG = xno; then
AC_MSG_ERROR(Couldn't find libart-config please install the gnome-libs package)
fi
ART_VERSION="`$ART_CONFIG --version`"
case "$ART_VERSION" in
2.2.*)
:
;;
*)
AC_ERROR(librsvg needs libart version 2.2.x not $ART_VERSION)
;;
esac
ART_LIBS=`$ART_CONFIG --libs`
ART_CFLAGS=`$ART_CONFIG --cflags`
AC_SUBST(ART_LIBS)
AC_SUBST(ART_CFLAGS)
dnl ====================================
dnl = End tests for libxml
dnl ====================================
dnl AM_PROG_XML_I18N_TOOLS
dnl GNOME_INIT
dnl GNOME_COMPILE_WARNINGS
dnl GNOME_X_CHECKS
dnl GNOME_XML_CHECK
LIBRSVG_LIBDIR='-L${libdir}'
LIBRSVG_INCLUDEDIR='-I${includedir} ${FREETYPE2_CFLAGS}'
LIBRSVG_LIBS='-lrsvg -lart_lgpl ${FREETYPE2_LIBS}'
......@@ -243,5 +144,4 @@ AC_OUTPUT([
librsvg.spec
librsvg-features.h
Makefile
librsvg-config
librsvg-1.0.pc], [case "$CONFIG_FILES" in *librsvg-config*) chmod +x librsvg-config;; esac])
librsvg-2.0.pc])
#!/bin/sh
prefix=@prefix@
exec_prefix=@exec_prefix@
exec_prefix_set=no
usage="\
Usage: librsvg-config [--prefix[=DIR]] [--exec-prefix[=DIR]] [--version] [--libs] [--cflags]"
if test $# -eq 0; then
echo "${usage}" 1>&2
exit 1
fi
while test $# -gt 0; do
case "$1" in
-*=*) optarg=`echo "$1" | sed 's/[-_a-zA-Z0-9]*=//'` ;;
*) optarg= ;;
esac
case $1 in
--prefix=*)
prefix=$optarg
if test $exec_prefix_set = no ; then
exec_prefix=$optarg
fi
;;
--prefix)
echo $prefix
;;
--exec-prefix=*)
exec_prefix=$optarg
exec_prefix_set=yes
;;
--exec-prefix)
echo $exec_prefix
;;
--version)
echo @LIBRSVG_VERSION@
;;
--cflags)
if test @includedir@ != /usr/include ; then
includes=-I@includedir@
fi
echo $includes
;;
--libs)
libdirs=-L@libdir@
echo $libdirs -lrsvg -lart_lgpl -lm
;;
*)
echo "${usage}" 1>&2
exit 1
;;
esac
shift
done
......@@ -96,7 +96,6 @@ fi
%defattr(0555, bin, bin)
%{prefix}/lib/*.la
%{prefix}/lib/*.sh
%{prefix}/bin/librsvg-config
%defattr(0444, bin, bin)
%{prefix}/include/librsvg/*.h
#
# Configuration file for using the LIBRSVG library in GNOME applications
#
LIBRSVG_LIBDIR="@LIBRSVG_LIBDIR@"
LIBRSVG_LIBS="@LIBRSVG_LIBS@"
LIBRSVG_INCLUDEDIR="@LIBRSVG_INCLUDEDIR@"
......@@ -49,8 +49,8 @@
#include "art_render_svp.h"
#include "art_render_mask.h"
#include <gnome-xml/SAX.h>
#include <gnome-xml/xmlmemory.h>
#include <libxml/SAX.h>
#include <libxml/xmlmemory.h>
#include "rsvg-bpath-util.h"
#include "rsvg-defs.h"
......@@ -1366,7 +1366,7 @@ rsvg_entity_decl (void *data, const xmlChar *name, int type,
entity = g_new (xmlEntity, 1);
entity->type = type;
entity->len = strlen (name);
entity->length = strlen (name);
dupname = g_strdup (name);
entity->name = dupname;
entity->ExternalID = g_strdup (publicId);
......
......@@ -439,9 +439,6 @@ int main(int argc, char **argv)
gdk_rgb_init ();
gtk_widget_set_default_colormap (gdk_rgb_get_cmap ());
gtk_widget_set_default_visual (gdk_rgb_get_visual ());
optCtx =
poptGetContext("test-ft", argc, (const char **) argv,
optionsTable, 0);
......
......@@ -367,6 +367,8 @@ int main(int argc, char **argv)
art_affine_identity (affine);
#endif
g_type_init ();
optCtx =
poptGetContext("test-ft", argc, (const char **) argv,
optionsTable, 0);
......@@ -379,6 +381,7 @@ int main(int argc, char **argv)
else
out_fn = (char *) args[0];
ctx = rsvg_ft_ctx_new ();
fh = rsvg_ft_intern (ctx, font_file_name);
......
......@@ -182,6 +182,8 @@ main (int argc, char **argv)
const char * const *args;
int i;
g_type_init ();
optCtx = poptGetContext ("test-rsvg", argc, (const char **)argv, optionsTable, 0);
c = poptGetNextOpt (optCtx);
......
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