From: cvs2git Date: Mon, 12 Jul 2004 09:21:20 +0000 (+0000) Subject: This commit was manufactured by cvs2git to create branch 'GNOME_2_6'. X-Git-Url: http://git.pld-linux.org/?a=commitdiff_plain;h=39230148d41189dd939fec9ae08d2665a6b8abcf;hp=c47e96cbe2c2b283d6db5f6cdee5a0eeb1e03675;p=packages%2Feog.git This commit was manufactured by cvs2git to create branch 'GNOME_2_6'. Sprout from master 2004-07-12 09:21:20 UTC ankry '- fixed epoch issues for libexif/libpcd' Delete: eog-ac253.patch eog-am16.patch eog-am_ac.patch eog-disable_GConf_test.patch eog-sane-window-size.patch eog-zh_CN.patch --- diff --git a/eog-ac253.patch b/eog-ac253.patch deleted file mode 100644 index c5986c4..0000000 --- a/eog-ac253.patch +++ /dev/null @@ -1,134 +0,0 @@ ---- eog-0.6/configure.in~ Thu Feb 15 03:03:34 2001 -+++ eog-0.6/configure.in Sun Aug 25 18:47:50 2002 -@@ -8,7 +8,8 @@ - - AM_MAINTAINER_MODE - --AM_PROG_XML_I18N_TOOLS -+AC_PROG_XML_I18N_TOOLS -+AC_PROG_INTLTOOL - - AM_ACLOCAL_INCLUDE(macros) - -@@ -25,10 +25,6 @@ - ALL_LINGUAS="az ca cs da de el es et fi fr ga gl hu it ja ko lt nl no pl pt_BR ro ru sl sv tr uk zh_CN.GB2312 zh_TW.Big5" - AM_GNU_GETTEXT - --AC_SUBST(CFLAGS) --AC_SUBST(CPPFLAGS) --AC_SUBST(LDFLAGS) -- - AM_PATH_GDK_PIXBUF(0.9.0, ,AC_MSG_ERROR([Need gdk-pixbuf-0.9.0 or later!])) - - AM_PATH_GCONF(0.12,,,gconf-gtk) -@@ -141,9 +137,8 @@ - dnl Test for libjpeg - if test -z "$LIBJPEG"; then - AC_CHECK_LIB(jpeg, jpeg_destroy_decompress, -- jpeg_ok=yes, -- jpeg_ok=no -- AC_MSG_WARN(*** JPEG saving code will not be built (JPEG library not found) ***)) -+ [jpeg_ok=yes], -+ AC_MSG_WARN([*** JPEG saving code will not be built (JPEG library not found) ***])) - if test "$jpeg_ok" = yes; then - AC_MSG_CHECKING([for jpeglib.h]) - AC_TRY_CPP( -@@ -151,16 +146,15 @@ - #undef PACKAGE - #undef VERSION - #include ], -- jpeg_ok=yes, -- jpeg_ok=no) -+ [jpeg_ok=yes]) - AC_MSG_RESULT($jpeg_ok) - if test "$jpeg_ok" = yes; then - LIBJPEG='-ljpeg' - AC_CHECK_LIB(jpeg, jpeg_simple_progression, -- AC_DEFINE(HAVE_PROGRESSIVE_JPEG), -- AC_MSG_WARN(JPEG library does not support progressive saving.)) -+ [AC_DEFINE(HAVE_PROGRESSIVE_JPEG)], -+ [AC_MSG_WARN([JPEG library does not support progressive saving.])]) - else -- AC_MSG_WARN(*** JPEG saving code will not be built (JPEG header file not found) ***) -+ AC_MSG_WARN([*** JPEG saving code will not be built (JPEG header file not found) ***]) - fi - fi - fi -@@ -172,24 +166,23 @@ - dnl Test for libpng - if test -z "$LIBPNG"; then - AC_CHECK_LIB(png, png_read_info, -- AC_CHECK_HEADER(png.h, -- png_ok=yes, -- png_ok=no), -- AC_MSG_WARN(*** PNG saving code will not be built (PNG library not found) ***), -lz -lm) -+ [AC_CHECK_HEADER(png.h, -+ [png_ok=yes], -+ [png_ok=no])], -+ AC_MSG_WARN([*** PNG saving code will not be built (PNG library not found) ***])) - if test "$png_ok" = yes; then - AC_MSG_CHECKING([for png_structp in png.h]) - AC_TRY_COMPILE([#include ], - [png_structp pp; png_infop info; png_colorp cmap; png_create_read_struct;], -- png_ok=yes, -- png_ok=no) -+ [png_ok=yes]) - AC_MSG_RESULT($png_ok) - if test "$png_ok" = yes; then - PNG='png'; LIBPNG='-lpng -lz' - else -- AC_MSG_WARN(*** PNG saving code will not be built (PNG library is too old) ***) -+ AC_MSG_WARN([*** PNG saving code will not be built (PNG library is too old) ***]) - fi - else -- AC_MSG_WARN(*** PNG saving code will not be built (PNG header file not found) ***) -+ AC_MSG_WARN([*** PNG saving code will not be built (PNG header file not found) ***]) - fi - fi - if test "x$png_ok" = "xyes" ; then -@@ -199,44 +192,11 @@ - AC_SUBST(LIBJPEG) - AC_SUBST(LIBPNG) - -- - dnl ****************************** - dnl More compiler warnings - dnl ****************************** - --AC_ARG_ENABLE(more-warnings, --[ --enable-more-warnings Maximum compiler warnings], --set_more_warnings="$enableval",[set_more_warnings=no]) --warning_flags= --realsave_CFLAGS="$CFLAGS" --AC_MSG_CHECKING(for more warnings, including -Werror) --if test "$GCC" = "yes" -a "$set_more_warnings" != "no"; then -- AC_MSG_RESULT(yes) -- warning_flags="-Wall -Wchar-subscripts -Wmissing-declarations -Wmissing-prototypes -Wnested-externs -Wpointer-arith -Werror" -- CFLAGS="$warning_flags $CFLAGS" -- -- for option in -Wsign-promo -Wno-sign-compare; do -- SAVE_CFLAGS="$CFLAGS" -- CFLAGS="$CFLAGS $option" -- AC_MSG_CHECKING([whether gcc understands $option]) -- AC_TRY_COMPILE([], [], -- has_option=yes, -- has_option=no,) -- CFLAGS="$SAVE_CFLAGS" -- AC_MSG_RESULT($has_option) -- if test $has_option = yes; then -- warning_flags="$warning_flags $option" -- fi -- unset has_option -- unset SAVE_CFLAGS -- done -- unset option --else -- AC_MSG_RESULT(no) --fi --CFLAGS="$realsave_CFLAGS" --EXTRA_WARNING_CFLAGS="$warning_flags" --AC_SUBST(EXTRA_WARNING_CFLAGS) -+GNOME_COMPILE_WARNINGS - - AC_OUTPUT([ - Makefile diff --git a/eog-am16.patch b/eog-am16.patch deleted file mode 100644 index a24ceab..0000000 --- a/eog-am16.patch +++ /dev/null @@ -1,15 +0,0 @@ ---- eog-0.6/src/Makefile.am~ Tue May 28 11:45:06 2002 -+++ eog-0.6/src/Makefile.am Tue May 28 11:45:06 2002 -@@ -41,12 +41,6 @@ - full-screen.h \ - gnome-icon-list-model.c \ - gnome-icon-list-model.h \ -- gtkscrollframe.c \ -- gtkscrollframe.h \ -- image.h \ -- image.c \ -- image-view.c \ -- image-view.h \ - main.c \ - preferences.c \ - preferences.h \ diff --git a/eog-am_ac.patch b/eog-am_ac.patch deleted file mode 100644 index 4e7d551..0000000 --- a/eog-am_ac.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -urN eog-0.6.org/viewer/Makefile.am eog-0.6/viewer/Makefile.am ---- eog-0.6.org/viewer/Makefile.am Sat Jan 12 17:53:53 2002 -+++ eog-0.6/viewer/Makefile.am Sat Jan 12 17:54:08 2002 -@@ -77,7 +77,7 @@ - - BUILT_SOURCES=$(CORBA_SOURCE) - --CLEANFILES += $(BUILT_SOURCES) -+CLEANFILES = $(BUILT_SOURCES) - - oafdir = $(datadir)/oaf - oaf_in_files = GNOME_EOG.oaf.in diff --git a/eog-disable_GConf_test.patch b/eog-disable_GConf_test.patch deleted file mode 100644 index 16e458a..0000000 --- a/eog-disable_GConf_test.patch +++ /dev/null @@ -1,21 +0,0 @@ ---- eog-0.6/Makefile.in.org Fri Mar 9 20:04:11 2001 -+++ eog-0.6/Makefile.in Fri Mar 9 20:04:26 2001 -@@ -499,9 +499,6 @@ - - @XML_I18N_MERGE_DESKTOP_RULE@ - --install-data-local: -- GCONF_CONFIG_SOURCE=$(GCONF_CONFIG_SOURCE) gconftool --makefile-install-rule $(top_srcdir)/$(schema_DATA) -- - # 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: ---- eog-0.6/Makefile.am.org Fri Mar 9 20:03:43 2001 -+++ eog-0.6/Makefile.am Fri Mar 9 20:04:03 2001 -@@ -24,6 +24,3 @@ - - icondir = $(datadir)/pixmaps - icon_DATA = gnome-eog.png -- --install-data-local: -- GCONF_CONFIG_SOURCE=$(GCONF_CONFIG_SOURCE) gconftool --makefile-install-rule $(top_srcdir)/$(schema_DATA) diff --git a/eog-sane-window-size.patch b/eog-sane-window-size.patch deleted file mode 100644 index 09b9273..0000000 --- a/eog-sane-window-size.patch +++ /dev/null @@ -1,33 +0,0 @@ -diff -Nrc -x *~ eog-0.6.orig/src/window.c eog-0.6/src/window.c -*** eog-0.6.orig/src/window.c Wed Feb 7 11:13:37 2001 ---- eog-0.6/src/window.c Tue Apr 10 00:07:21 2001 -*************** -*** 785,790 **** ---- 785,791 ---- - char *fname; - gboolean free_fname; - GtkWidget *view; -+ int width; - - g_return_val_if_fail (window != NULL, FALSE); - g_return_val_if_fail (IS_WINDOW (window), FALSE); -*************** -*** 812,817 **** ---- 813,829 ---- - fname = _("Eye of Gnome"); - - gtk_window_set_title (GTK_WINDOW (window), fname); -+ -+ width = 45 + MIN (gdk_pixbuf_get_width (image->pixbuf), -+ ((gdk_screen_width () - 45) * 0.8)); -+ width = MAX (width, 261); -+ -+ gtk_widget_set_usize (GTK_WIDGET (window), -+ width, -+ 120 + MIN (gdk_pixbuf_get_height (image->pixbuf), -+ ((gdk_screen_height () - 120) * 0.8))); -+ /* printf ("%d %d\n", gdk_pixbuf_get_width (image->pixbuf), -+ gdk_pixbuf_get_height (image->pixbuf) ); */ - - if (free_fname) - g_free (fname); diff --git a/eog-zh_CN.patch b/eog-zh_CN.patch deleted file mode 100644 index 9642a5b..0000000 --- a/eog-zh_CN.patch +++ /dev/null @@ -1,22 +0,0 @@ ---- eog-0.6/configure.in.gbk Tue Jun 26 14:18:34 2001 -+++ eog-0.6/configure.in Tue Jun 26 14:19:00 2001 -@@ -22,7 +22,7 @@ - - GNOME_COMPILE_WARNINGS - --ALL_LINGUAS="az ca cs da de el es et fi fr ga gl hu it ja ko lt nl no pl pt_BR ro ru sl sv tr uk zh_CN.GB2312 zh_TW.Big5" -+ALL_LINGUAS="az ca cs da de el es et fi fr ga gl hu it ja ko lt nl no pl pt_BR ro ru sl sv tr uk zh_CN zh_TW.Big5" - AM_GNU_GETTEXT - - AC_SUBST(CFLAGS) ---- eog-0.6/configure.gbk Tue Jun 26 14:18:41 2001 -+++ eog-0.6/configure Tue Jun 26 14:18:51 2001 -@@ -2216,7 +2216,7 @@ - fi - - --ALL_LINGUAS="az ca cs da de el es et fi fr ga gl hu it ja ko lt nl no pl pt_BR ro ru sl sv tr uk zh_CN.GB2312 zh_TW.Big5" -+ALL_LINGUAS="az ca cs da de el es et fi fr ga gl hu it ja ko lt nl no pl pt_BR ro ru sl sv tr uk zh_CN zh_TW.Big5" - echo $ac_n "checking for working const""... $ac_c" 1>&6 - echo "configure:2222: checking for working const" >&5 - if eval "test \"`echo '$''{'ac_cv_c_const'+set}'`\" = set"; then