bumped version number to 1.3.24. (AC_CONFIG_FILES): added files in

2003-12-08  Sven Neumann  <sven@gimp.org>

	* configure.in: bumped version number to 1.3.24.
        (AC_CONFIG_FILES): added files in devel-docs/libgimpthumb.

	* gimp.spec.in: added files from libgimpthumb.

2003-12-08  Sven Neumann  <sven@gimp.org>

	* Makefile.am
	* libgimpthumb/Makefile.am
	* libgimpthumb/libgimpthumb-docs.sgml
	* libgimpthumb/libgimpthumb-sections.txt
	* libgimpthumb/libgimpthumb.types
	* libgimpthumb/version.in
	* libgimpthumb/tmpl/gimpthumb-enums.sgml
	* libgimpthumb/tmpl/gimpthumb-error.sgml
	* libgimpthumb/tmpl/gimpthumb-utils.sgml
	* libgimpthumb/tmpl/gimpthumbnail.sgml: added framework for
	libgimpthumb documentation.
This commit is contained in:
Sven Neumann 2003-12-08 10:28:40 +00:00 committed by Sven Neumann
parent e5f0ed85e2
commit 9467ee7b59
16 changed files with 643 additions and 3 deletions

View file

@ -1,3 +1,10 @@
2003-12-08 Sven Neumann <sven@gimp.org>
* configure.in: bumped version number to 1.3.24.
(AC_CONFIG_FILES): added files in devel-docs/libgimpthumb.
* gimp.spec.in: added files from libgimpthumb.
2003-12-08 Sven Neumann <sven@gimp.org>
* app/tools/gimpcroptool.c (gimp_crop_tool_draw): an XOR line was

View file

@ -47,7 +47,7 @@ AC_SUBST(WMF_REQUIRED_VERSION)
#
GIMP_MAJOR_VERSION=1
GIMP_MINOR_VERSION=3
GIMP_MICRO_VERSION=23
GIMP_MICRO_VERSION=24
GIMP_INTERFACE_AGE=0
GIMP_BINARY_AGE=0
GIMP_VERSION=$GIMP_MAJOR_VERSION.$GIMP_MINOR_VERSION.$GIMP_MICRO_VERSION
@ -1452,6 +1452,8 @@ devel-docs/libgimpmath/Makefile
devel-docs/libgimpmath/version
devel-docs/libgimpmodule/Makefile
devel-docs/libgimpmodule/version
devel-docs/libgimpthumb/Makefile
devel-docs/libgimpthumb/version
devel-docs/libgimpwidgets/Makefile
devel-docs/libgimpwidgets/version
docs/Makefile

View file

@ -1,3 +1,17 @@
2003-12-08 Sven Neumann <sven@gimp.org>
* Makefile.am
* libgimpthumb/Makefile.am
* libgimpthumb/libgimpthumb-docs.sgml
* libgimpthumb/libgimpthumb-sections.txt
* libgimpthumb/libgimpthumb.types
* libgimpthumb/version.in
* libgimpthumb/tmpl/gimpthumb-enums.sgml
* libgimpthumb/tmpl/gimpthumb-error.sgml
* libgimpthumb/tmpl/gimpthumb-utils.sgml
* libgimpthumb/tmpl/gimpthumbnail.sgml: added framework for
libgimpthumb documentation.
2003-12-05 Michael Natterer <mitch@gimp.org>
* libgimp/libgimp-sections.txt

View file

@ -5,6 +5,7 @@ SUBDIRS = \
libgimpcolor \
libgimpmath \
libgimpmodule \
libgimpthumb \
libgimpwidgets \
libgimp

View file

@ -0,0 +1,16 @@
Makefile
Makefile.in
deprecated
libgimpthumb.args
libgimpthumb.hierarchy
libgimpthumb.interfaces
libgimpthumb.prerequisites
libgimpthumb.signals
libgimpthumb-decl.txt
libgimpthumb-decl-list.txt
libgimpthumb-unused.txt
libgimpthumb-undocumented.txt
html
xml
version
*.stamp

View file

@ -0,0 +1,194 @@
## Process this file with automake to produce Makefile.in
# The name of the module.
DOC_MODULE = libgimpthumb
# The top-level SGML file.
DOC_MAIN_SGML_FILE = $(DOC_MODULE)-docs.sgml
# The directory containing the source code.
DOC_SOURCE_DIR = $(top_srcdir)/$(DOC_MODULE)
# Extra options to pass to gtkdoc-scangobj
SCANGOBJ_OPTIONS =
# Extra options to supply to gtkdoc-scan
SCAN_OPTIONS =
# Extra options to supply to gtkdoc-mkdb
MKDB_OPTIONS = --sgml-mode --output-format=xml
# Extra options to supply to gtkdoc-fixref
FIXXREF_OPTIONS = --extra-dir=../libgimpbase/html --extra-dir=../libgimpcolor/html --extra-dir=../libgimpmath/html --extra-dir=../libgimp/html
# Used for dependencies
HFILE_GLOB = $(DOC_SOURCE_DIR)/*.h
CFILE_GLOB = $(DOC_SOURCE_DIR)/*.c
# Header files to ignore when scanning
IGNORE_HFILES = libgimpthumb.h
# Images to copy into HTML directory
HTML_IMAGES =
# Extra SGML files that are included by $(DOC_MAIN_SGML_FILE)
content_files =
# Other files to distribute
extra_files =
# CFLAGS and LDFLAGS for compiling scan program. Only needed
# if $(DOC_MODULE).types is non-empty.
GTKDOC_CFLAGS = \
@CFLAGS@ \
-I$(top_srcdir) \
-I$(top_builddir) \
@GDK_PIXBUF_CFLAGS@
GTKDOC_LIBS = \
$(top_builddir)/libgimpbase/libgimpbase-$(LT_RELEASE).la \
$(top_builddir)/libgimpmath/libgimpmath-$(LT_RELEASE).la \
$(top_builddir)/libgimpthumb/libgimpthumb-$(LT_RELEASE).la \
@GDK_PIXBUF_LIBS@
GTKDOC_CC = $(LIBTOOL) --mode=compile $(CC)
GTKDOC_LD = $(LIBTOOL) --mode=link $(CC)
####################################
# Everything below here is generic #
####################################
# We set GPATH here; this gives us semantics for GNU make
# which are more like other make's VPATH, when it comes to
# whether a source that is a target of one rule is then
# searched for in VPATH/GPATH.
#
GPATH = $(srcdir)
TARGET_DIR=$(HTML_DIR)/$(DOC_MODULE)
EXTRA_DIST = \
$(content_files) \
$(extra_files) \
$(HTML_IMAGES) \
$(DOC_MAIN_SGML_FILE) \
$(DOC_MODULE).types \
$(DOC_MODULE)-sections.txt
DOC_STAMPS=scan-build.stamp tmpl-build.stamp xml-build.stamp html-build.stamp \
$(srcdir)/tmpl.stamp $(srcdir)/sgml.stamp $(srcdir)/html.stamp
SCANOBJ_FILES = \
$(DOC_MODULE).args \
$(DOC_MODULE).hierarchy \
$(DOC_MODULE).signals
if ENABLE_GTK_DOC
all-local: html-build.stamp
#### scan ####
scan-build.stamp: $(HFILE_GLOB)
@echo '*** Scanning header files ***'
if grep -l '^..*$$' $(srcdir)/$(DOC_MODULE).types > /dev/null ; then \
CC="$(GTKDOC_CC)" LD="$(GTKDOC_LD)" CFLAGS="$(GTKDOC_CFLAGS)" LDFLAGS="$(GTKDOC_LIBS)" gtkdoc-scangobj $(SCANGOBJ_OPTIONS) --module=$(DOC_MODULE) --output-dir=$(srcdir) ; \
else \
cd $(srcdir) ; \
for i in $(SCANOBJ_FILES) ; do \
test -f $$i || touch $$i ; \
done \
fi
cd $(srcdir) && \
gtkdoc-scan --module=$(DOC_MODULE) --source-dir=$(DOC_SOURCE_DIR) --ignore-headers="$(IGNORE_HFILES)" $(SCAN_OPTIONS) $(EXTRA_HFILES)
touch scan-build.stamp
$(DOC_MODULE)-decl.txt $(SCANOBJ_FILES): scan-build.stamp
@true
#### templates ####
tmpl-build.stamp: $(DOC_MODULE)-decl.txt $(SCANOBJ_FILES) $(DOC_MODULE)-sections.txt
@echo '*** Rebuilding template files ***'
cd $(srcdir) && gtkdoc-mktmpl --module=$(DOC_MODULE)
touch tmpl-build.stamp
tmpl.stamp: tmpl-build.stamp
@true
#### xml ####
xml-build.stamp: tmpl.stamp $(CFILE_GLOB) $(srcdir)/tmpl/*.sgml
@echo '*** Building XML ***'
cd $(srcdir) && \
gtkdoc-mkdb --module=$(DOC_MODULE) --source-dir=$(DOC_SOURCE_DIR) $(MKDB_OPTIONS)
touch xml-build.stamp
sgml.stamp: xml-build.stamp
@true
#### html ####
html-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE) $(content_files)
@echo '*** Building HTML ***'
rm -rf $(srcdir)/html
mkdir $(srcdir)/html
cd $(srcdir)/html && gtkdoc-mkhtml $(DOC_MODULE) ../$(DOC_MAIN_SGML_FILE)
test "x$(HTML_IMAGES)" = "x" || ( cd $(srcdir) && cp $(HTML_IMAGES) html )
@echo '-- Fixing Crossreferences'
cd $(srcdir) && gtkdoc-fixxref --module-dir=html --html-dir=$(HTML_DIR) $(FIXXREF_OPTIONS)
touch html-build.stamp
else
all-local:
endif
##############
clean-local:
rm -f *~ *.bak $(SCANOBJ_FILES) *-unused.txt $(DOC_STAMPS)
maintainer-clean-local: clean
cd $(srcdir) && rm -rf xml html $(DOC_MODULE)-decl-list.txt $(DOC_MODULE)-decl.txt
install-data-local:
$(mkinstalldirs) $(DESTDIR)$(TARGET_DIR)
(installfiles=`echo $(srcdir)/html/*`; \
if test "$$installfiles" = '$(srcdir)/html/*'; \
then echo '-- Nothing to install' ; \
else \
for i in $$installfiles; do \
echo '-- Installing '$$i ; \
$(INSTALL_DATA) $$i $(DESTDIR)$(TARGET_DIR); \
done; \
echo '-- Installing $(srcdir)/html/index.sgml' ; \
$(INSTALL_DATA) $(srcdir)/html/index.sgml $(DESTDIR)$(TARGET_DIR); \
fi)
uninstall-local:
(installfiles=`echo $(srcdir)/html/*`; \
for i in $$installfiles; do \
rm -f $(DESTDIR)$(TARGET_DIR)/`basename $$i`; \
done; \
rm -f $(DESTDIR)$(TARGET_DIR)/index.sgml)
#
# Require gtk-doc when making dist
#
if ENABLE_GTK_DOC
dist-check-gtkdoc:
else
dist-check-gtkdoc:
@echo "*** gtk-doc must be installed and enabled in order to make dist"
@false
endif
dist-hook: dist-check-gtkdoc dist-hook-local
mkdir $(distdir)/tmpl
mkdir $(distdir)/xml
mkdir $(distdir)/html
-cp $(srcdir)/tmpl/*.sgml $(distdir)/tmpl
-cp $(srcdir)/xml/*.xml $(distdir)/xml
-cp $(srcdir)/html/* $(distdir)/html
.PHONY : dist-hook-local

View file

@ -0,0 +1,22 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.1.2//EN"
"http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd">
<book id="index" xmlns:xi="http://www.w3.org/2001/XInclude">
<bookinfo>
<title>GIMP Thumbnail Library Reference Manual</title>
<releaseinfo>
for GIMP <xi:include href="version" parse="text"/>
</releaseinfo>
</bookinfo>
<part id="libgimpthumb">
<title>GIMP Thumbnail Library</title>
<xi:include href="xml/gimpthumb-enums.xml" />
<xi:include href="xml/gimpthumb-error.xml" />
<xi:include href="xml/gimpthumb-utils.xml" />
<xi:include href="xml/gimpthumbnail.xml" />
</part>
</book>

View file

@ -0,0 +1,49 @@
<SECTION>
<FILE>gimpthumbnail</FILE>
<TITLE>GimpThumbnail</TITLE>
GimpThumbnail
gimp_thumbnail_new
gimp_thumbnail_set_uri
gimp_thumbnail_set_filename
gimp_thumbnail_peek_image
gimp_thumbnail_peek_thumb
gimp_thumbnail_load_thumb
gimp_thumbnail_save_thumb
gimp_thumbnail_save_failure
<SUBSECTION Standard>
GimpThumbnailClass
GIMP_THUMBNAIL
GIMP_IS_THUMBNAIL
GIMP_TYPE_THUMBNAIL
gimp_thumbnail_get_type
GIMP_THUMBNAIL_CLASS
GIMP_IS_THUMBNAIL_CLASS
GIMP_THUMBNAIL_GET_CLASS
</SECTION>
<SECTION>
<FILE>gimpthumb-utils</FILE>
gimp_thumb_init
gimp_thumb_name_from_uri
gimp_thumb_find_thumb
gimp_thumb_file_test
gimp_thumb_ensure_thumb_dirs
</SECTION>
<SECTION>
<FILE>gimpthumb-enums</FILE>
GIMP_TYPE_THUMB_SIZE
gimp_thumb_size_get_type
GimpThumbSize
GIMP_TYPE_THUMB_STATE
gimp_thumb_state_get_type
GimpThumbState
</SECTION>
<SECTION>
<FILE>gimpthumb-error</FILE>
GimpThumbError
GIMP_THUMB_ERROR
gimp_thumb_error_quark
</SECTION>

View file

@ -0,0 +1,4 @@
#include <gdk-pixbuf/gdk-pixbuf.h>
#include <libgimpthumb/gimpthumb.h>
gimp_thumbnail_get_type

View file

@ -0,0 +1 @@
libgimpthumb-unused.sgml

View file

@ -0,0 +1,68 @@
<!-- ##### SECTION Title ##### -->
gimpthumb-enums
<!-- ##### SECTION Short_Description ##### -->
<!-- ##### SECTION Long_Description ##### -->
<para>
</para>
<!-- ##### SECTION See_Also ##### -->
<para>
</para>
<!-- ##### MACRO GIMP_TYPE_THUMB_SIZE ##### -->
<para>
</para>
<!-- ##### FUNCTION gimp_thumb_size_get_type ##### -->
<para>
</para>
@Returns:
<!-- ##### ENUM GimpThumbSize ##### -->
<para>
</para>
@GIMP_THUMB_SIZE_FAIL:
@GIMP_THUMB_SIZE_NORMAL:
@GIMP_THUMB_SIZE_LARGE:
<!-- ##### MACRO GIMP_TYPE_THUMB_STATE ##### -->
<para>
</para>
<!-- ##### FUNCTION gimp_thumb_state_get_type ##### -->
<para>
</para>
@Returns:
<!-- ##### ENUM GimpThumbState ##### -->
<para>
</para>
@GIMP_THUMB_STATE_UNKNOWN:
@GIMP_THUMB_STATE_REMOTE:
@GIMP_THUMB_STATE_NOT_FOUND:
@GIMP_THUMB_STATE_EXISTS:
@GIMP_THUMB_STATE_OLD:
@GIMP_THUMB_STATE_FAILED:
@GIMP_THUMB_STATE_OK:

View file

@ -0,0 +1,40 @@
<!-- ##### SECTION Title ##### -->
gimpthumb-error
<!-- ##### SECTION Short_Description ##### -->
<!-- ##### SECTION Long_Description ##### -->
<para>
</para>
<!-- ##### SECTION See_Also ##### -->
<para>
</para>
<!-- ##### ENUM GimpThumbError ##### -->
<para>
</para>
@GIMP_THUMB_ERROR_OPEN:
@GIMP_THUMB_ERROR_OPEN_ENOENT:
@GIMP_THUMB_ERROR_MKDIR:
<!-- ##### MACRO GIMP_THUMB_ERROR ##### -->
<para>
</para>
<!-- ##### FUNCTION gimp_thumb_error_quark ##### -->
<para>
</para>
@Returns:

View file

@ -0,0 +1,66 @@
<!-- ##### SECTION Title ##### -->
gimpthumb-utils
<!-- ##### SECTION Short_Description ##### -->
<!-- ##### SECTION Long_Description ##### -->
<para>
</para>
<!-- ##### SECTION See_Also ##### -->
<para>
</para>
<!-- ##### FUNCTION gimp_thumb_init ##### -->
<para>
</para>
@creator:
@thumb_basedir:
@Returns:
<!-- ##### FUNCTION gimp_thumb_name_from_uri ##### -->
<para>
</para>
@uri:
@size:
@Returns:
<!-- ##### FUNCTION gimp_thumb_find_thumb ##### -->
<para>
</para>
@uri:
@size:
@Returns:
<!-- ##### FUNCTION gimp_thumb_file_test ##### -->
<para>
</para>
@filename:
@mtime:
@size:
@Returns:
<!-- ##### FUNCTION gimp_thumb_ensure_thumb_dirs ##### -->
<para>
</para>
@error:
@Returns:

View file

@ -0,0 +1,148 @@
<!-- ##### SECTION Title ##### -->
GimpThumbnail
<!-- ##### SECTION Short_Description ##### -->
<!-- ##### SECTION Long_Description ##### -->
<para>
</para>
<!-- ##### SECTION See_Also ##### -->
<para>
</para>
<!-- ##### STRUCT GimpThumbnail ##### -->
<para>
</para>
<!-- ##### FUNCTION gimp_thumbnail_new ##### -->
<para>
</para>
@Returns:
<!-- ##### FUNCTION gimp_thumbnail_set_uri ##### -->
<para>
</para>
@thumbnail:
@uri:
<!-- ##### FUNCTION gimp_thumbnail_set_filename ##### -->
<para>
</para>
@thumbnail:
@filename:
@error:
@Returns:
<!-- ##### FUNCTION gimp_thumbnail_peek_image ##### -->
<para>
</para>
@thumbnail:
@Returns:
<!-- ##### FUNCTION gimp_thumbnail_peek_thumb ##### -->
<para>
</para>
@thumbnail:
@size:
@Returns:
<!-- ##### FUNCTION gimp_thumbnail_load_thumb ##### -->
<para>
</para>
@thumbnail:
@size:
@error:
@Returns:
<!-- ##### FUNCTION gimp_thumbnail_save_thumb ##### -->
<para>
</para>
@thumbnail:
@pixbuf:
@software:
@error:
@Returns:
<!-- ##### FUNCTION gimp_thumbnail_save_failure ##### -->
<para>
</para>
@thumbnail:
@software:
@error:
@Returns:
<!-- ##### ARG GimpThumbnail:image-filesize ##### -->
<para>
</para>
<!-- ##### ARG GimpThumbnail:image-height ##### -->
<para>
</para>
<!-- ##### ARG GimpThumbnail:image-mtime ##### -->
<para>
</para>
<!-- ##### ARG GimpThumbnail:image-num-layers ##### -->
<para>
</para>
<!-- ##### ARG GimpThumbnail:image-state ##### -->
<para>
</para>
<!-- ##### ARG GimpThumbnail:image-type ##### -->
<para>
</para>
<!-- ##### ARG GimpThumbnail:image-uri ##### -->
<para>
</para>
<!-- ##### ARG GimpThumbnail:image-width ##### -->
<para>
</para>
<!-- ##### ARG GimpThumbnail:thumb-state ##### -->
<para>
</para>

View file

@ -0,0 +1 @@
@GIMP_VERSION@

View file

@ -171,10 +171,12 @@ cat gimp-plugin-files gimp-tips-files > gimp.files
%{prefix}/lib/libgimpcolor-%{subver}.so.%{microver}
%{prefix}/lib/libgimpmath-%{subver}.so.%{microver}.0.0
%{prefix}/lib/libgimpmath-%{subver}.so.%{microver}
%{prefix}/lib/libgimpwidgets-%{subver}.so.%{microver}.0.0
%{prefix}/lib/libgimpwidgets-%{subver}.so.%{microver}
%{prefix}/lib/libgimpmodule-%{subver}.so.%{microver}.0.0
%{prefix}/lib/libgimpmodule-%{subver}.so.%{microver}
%{prefix}/lib/libgimpthumb-%{subver}.so.%{microver}.0.0
%{prefix}/lib/libgimpthumb-%{subver}.so.%{microver}
%{prefix}/lib/libgimpwidgets-%{subver}.so.%{microver}.0.0
%{prefix}/lib/libgimpwidgets-%{subver}.so.%{microver}
%{prefix}/share/gimp/%{subver}/images
%{prefix}/share/gimp/%{subver}/misc
@ -204,6 +206,7 @@ cat gimp-plugin-files gimp-tips-files > gimp.files
#new stuff 1.3
%{prefix}/lib/pkgconfig/gimp-1.3.pc
%{prefix}/lib/pkgconfig/gimpui-1.3.pc
%{prefix}/lib/pkgconfig/gimpthumb-1.3.pc
%dir %{prefix}/include/gimp-%{subver}/libgimpbase
%{prefix}/include/gimp-%{subver}/libgimpbase/*
@ -214,6 +217,9 @@ cat gimp-plugin-files gimp-tips-files > gimp.files
%dir %{prefix}/include/gimp-%{subver}/libgimpmodule
%{prefix}/include/gimp-%{subver}/libgimpmodule/*
%dir %{prefix}/include/gimp-%{subver}/libgimpthumb
%{prefix}/include/gimp-%{subver}/libgimpthumb/*
%dir %{prefix}/include/gimp-%{subver}/libgimpwidgets
%{prefix}/include/gimp-%{subver}/libgimpwidgets/*
@ -233,6 +239,7 @@ cat gimp-plugin-files gimp-tips-files > gimp.files
%{prefix}/share/gtk-doc/html/libgimpcolor
%{prefix}/share/gtk-doc/html/libgimpmath
%{prefix}/share/gtk-doc/html/libgimpmodule
%{prefix}/share/gtk-doc/html/libgimpthumb
%{prefix}/share/gtk-doc/html/libgimpwidgets
%changelog