mirror
/
sane-project-frontends
kopia lustrzana https://gitlab.com/sane-project/frontends
1
0
Forkuj 0
Kod Zgłoszenia Projekty Wydania Wiki Aktywność

Fix for API-change in gimp 1.3.15 (patch from Julien BLACHE <jb@jblache.org>).

33-incorporate-downstream-patches
Henning Geinitz 2003-06-25 21:09:28 +00:00
rodzic 2b079afb15
commit 3e995a1037
4 zmienionych plików z 6744 dodań i 2535 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

6
Changelog
Wyświetl plik

@ -1,3 +1,9 @@
2003-06-25 Henning Meier-Geinitz <henning@meier-geinitz.de>
* configure configure.in src/xscanimage.c: Fix for API-change in
gimp 1.3.15 (patch from Julien BLACHE <jb@jblache.org>).
2003-05-15 Henning Meier-Geinitz <henning@meier-geinitz.de> 2003-05-15 Henning Meier-Geinitz <henning@meier-geinitz.de>
* INSTALL: Added information on dependency on devel packages for * INSTALL: Added information on dependency on devel packages for

9267
configure vendored
Wyświetl plik

Plik diff jest za duży Load Diff

2
configure.in
Wyświetl plik

@ -156,7 +156,7 @@ if test "${USE_GUI}" = "yes"; then
fi fi
if test "${USE_GIMP13}" = "yes"; then if test "${USE_GIMP13}" = "yes"; then
AM_PATH_GIMP_1_4(1.3.12, HAVE_GIMP13=yes) AM_PATH_GIMP_1_4(1.3.15, HAVE_GIMP13=yes)
if test "${HAVE_GIMP13}" = "yes"; then if test "${HAVE_GIMP13}" = "yes"; then
AC_DEFINE([ENABLE_GIMP_1_3], 1, [Define to 1 if GIMP 1.3 support wanted]) AC_DEFINE([ENABLE_GIMP_1_3], 1, [Define to 1 if GIMP 1.3 support wanted])
AC_DEFINE([HAVE_LIBGIMP_GIMP_H], 1, [Define to 1 if you have the <libgimp/gimp.h> header file.]) AC_DEFINE([HAVE_LIBGIMP_GIMP_H], 1, [Define to 1 if you have the <libgimp/gimp.h> header file.])

4
src/xscanimage.c
Wyświetl plik

@ -2026,7 +2026,11 @@ main (int argc, char **argv)
# ifdef HAVE_OS2_H # ifdef HAVE_OS2_H
set_gimp_PLUG_IN_INFO(&PLUG_IN_INFO); set_gimp_PLUG_IN_INFO(&PLUG_IN_INFO);
# endif # endif
# ifdef ENABLE_GIMP_1_3
result = gimp_main (&PLUG_IN_INFO, argc, argv);
# else
result = gimp_main (argc, argv); result = gimp_main (argc, argv);
# endif /* ENABLE_GIMP_1_3 */
g_set_print_handler (old_print_func); g_set_print_handler (old_print_func);
g_set_printerr_handler (old_printerr_func); g_set_printerr_handler (old_printerr_func);
if (result) if (result)