rpms/galeon/devel galeon-2.0.7-gtkprint.patch, 1.1, 1.2 galeon-2.0.7-plugins.patch, 1.2, 1.3 galeon.spec, 1.72, 1.73
Yanko Kaneti
yaneti at fedoraproject.org
Sat Feb 13 18:27:30 UTC 2010
- Previous message: rpms/compiz/F-11 compiz-0.7.8-kde4-initialsize.patch, NONE, 1.1 compiz-0.7.8-kde43.patch, NONE, 1.1 compiz-0.7.8-kde44.patch, NONE, 1.1 compiz.spec, 1.163, 1.164
- Next message: rpms/blktrace/devel blktrace-1.0.1-explicit-libpthread.patch, NONE, 1.1 blktrace.spec, 1.11, 1.12
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: yaneti
Update of /cvs/pkgs/rpms/galeon/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29191
Modified Files:
galeon-2.0.7-gtkprint.patch galeon-2.0.7-plugins.patch
galeon.spec
Log Message:
- Declare the existing explicit upstream dependency on libX11
fixes FTBFS bug #564665
- Stop patching machine generated files - use autoreconf
galeon-2.0.7-gtkprint.patch:
configure.in | 45
embed/Makefile.am | 2
embed/galeon-embed-shell.c | 130 ++
embed/galeon-embed-shell.h | 16
embed/galeon-embed.c | 5
embed/galeon-embed.h | 6
galeon.schemas.in | 134 --
mozilla/GaleonUtils.cpp | 93 --
mozilla/GaleonWrapper.cpp | 38
mozilla/GaleonWrapper.h | 2
mozilla/GeckoPrintService.cpp | 567 ++++++++++++
mozilla/GeckoPrintService.h | 54 +
mozilla/GeckoPrintSession.cpp | 620 +++++++++++++
mozilla/GeckoPrintSession.h | 94 ++
mozilla/Makefile.am | 6
mozilla/MozRegisterComponents.cpp | 22
mozilla/MozillaPrivate.cpp | 91 -
mozilla/mozilla-embed-shell.cpp | 9
mozilla/mozilla-embed.cpp | 29
src/window-commands.c | 20
ui/Makefile.am | 2
ui/print-tab.xml | 431 +++++++++
ui/print.glade | 1746 --------------------------------------
utils/gul-gui.c | 18
utils/gul-gui.h | 2
25 files changed, 2044 insertions(+), 2138 deletions(-)
View full diff with command:
/usr/bin/cvs -n -f diff -kk -u -p -N -r 1.1 -r 1.2 galeon-2.0.7-gtkprint.patchIndex: galeon-2.0.7-gtkprint.patch
===================================================================
RCS file: /cvs/pkgs/rpms/galeon/devel/galeon-2.0.7-gtkprint.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- galeon-2.0.7-gtkprint.patch 15 Feb 2009 13:58:09 -0000 1.1
+++ galeon-2.0.7-gtkprint.patch 13 Feb 2010 18:27:29 -0000 1.2
@@ -1,18061 +1,3 @@
-diff -urN galeon-2.0.7.orig/aclocal.m4 galeon-2.0.7/aclocal.m4
---- galeon-2.0.7.orig/aclocal.m4 2008-09-27 05:16:08.000000000 +0200
-+++ galeon-2.0.7/aclocal.m4 2009-02-15 09:39:16.000000000 +0100
-@@ -1,7 +1,7 @@
--# generated automatically by aclocal 1.9.6 -*- Autoconf -*-
-+# generated automatically by aclocal 1.10.1 -*- Autoconf -*-
-
- # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
--# 2005 Free Software Foundation, Inc.
-+# 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
- # This file is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -11,6 +11,14 @@
- # even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- # PARTICULAR PURPOSE.
-
-+m4_ifndef([AC_AUTOCONF_VERSION],
-+ [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
-+m4_if(AC_AUTOCONF_VERSION, [2.63],,
-+[m4_warning([this file was generated for autoconf 2.63.
-+You have another version of autoconf. It may work, but is not guaranteed to.
-+If you have problems, you may need to regenerate the build system entirely.
-+To do so, use the procedure documented by the package, typically `autoreconf'.])])
-+
- dnl AM_GCONF_SOURCE_2
- dnl Defines GCONF_SCHEMA_CONFIG_SOURCE which is where you should install schemas
- dnl (i.e. pass to gconftool-2
-@@ -26,8 +34,10 @@
- GCONF_SCHEMA_CONFIG_SOURCE=$GCONF_SCHEMA_INSTALL_SOURCE
- fi
-
-- AC_ARG_WITH(gconf-source,
-- [ --with-gconf-source=sourceaddress Config database for installing schema files.],GCONF_SCHEMA_CONFIG_SOURCE="$withval",)
-+ AC_ARG_WITH([gconf-source],
-+ AC_HELP_STRING([--with-gconf-source=sourceaddress],
-+ [Config database for installing schema files.]),
-+ [GCONF_SCHEMA_CONFIG_SOURCE="$withval"],)
-
- AC_SUBST(GCONF_SCHEMA_CONFIG_SOURCE)
- AC_MSG_RESULT([Using config source $GCONF_SCHEMA_CONFIG_SOURCE for schema installation])
-@@ -36,8 +46,10 @@
- GCONF_SCHEMA_FILE_DIR='$(sysconfdir)/gconf/schemas'
- fi
-
-- AC_ARG_WITH(gconf-schema-file-dir,
-- [ --with-gconf-schema-file-dir=dir Directory for installing schema files.],GCONF_SCHEMA_FILE_DIR="$withval",)
-+ AC_ARG_WITH([gconf-schema-file-dir],
-+ AC_HELP_STRING([--with-gconf-schema-file-dir=dir],
-+ [Directory for installing schema files.]),
-+ [GCONF_SCHEMA_FILE_DIR="$withval"],)
-
- AC_SUBST(GCONF_SCHEMA_FILE_DIR)
- AC_MSG_RESULT([Using $GCONF_SCHEMA_FILE_DIR as install directory for schema files])
-@@ -535,8 +547,9 @@
-
- dnl IT_PROG_INTLTOOL([MINIMUM-VERSION], [no-xml])
- # serial 40 IT_PROG_INTLTOOL
--AC_DEFUN([IT_PROG_INTLTOOL],
--[AC_PREREQ([2.50])dnl
-+AC_DEFUN([IT_PROG_INTLTOOL], [
-+AC_PREREQ([2.50])dnl
-+AC_REQUIRE([AM_NLS])dnl
-
- case "$am__api_version" in
- 1.[01234])
-@@ -609,6 +622,7 @@
- AC_PATH_PROG(XGETTEXT, xgettext)
- AC_PATH_PROG(MSGMERGE, msgmerge)
- AC_PATH_PROG(MSGFMT, msgfmt)
-+AC_PATH_PROG(GMSGFMT, gmsgfmt, $MSGFMT)
- if test -z "$XGETTEXT" -o -z "$MSGMERGE" -o -z "$MSGFMT"; then
- AC_MSG_ERROR([GNU gettext tools not found; required for intltool])
- fi
-@@ -680,6 +694,9 @@
- dnl of config.status.
- AC_CONFIG_COMMANDS_PRE([
- AC_CONFIG_COMMANDS([$1/stamp-it], [
-+ if [ ! grep "^# INTLTOOL_MAKEFILE$" "$1/Makefile.in" ]; then
-+ AC_MSG_ERROR([$1/Makefile.in.in was not created by intltoolize.])
-+ fi
- rm -f "$1/stamp-it" "$1/stamp-it.tmp" "$1/POTFILES" "$1/Makefile.tmp"
- >"$1/stamp-it.tmp"
- [sed '/^#/d
-@@ -688,22 +705,17 @@
- '"s|^| $ac_top_srcdir/|" \
- "$srcdir/$1/POTFILES.in" | sed '$!s/$/ \\/' >"$1/POTFILES"
- ]
-- if test ! -f "$1/Makefile"; then
-- AC_MSG_ERROR([$1/Makefile is not ready.])
-- fi
-- mv "$1/Makefile" "$1/Makefile.tmp"
- [sed '/^POTFILES =/,/[^\\]$/ {
- /^POTFILES =/!d
- r $1/POTFILES
- }
-- ' "$1/Makefile.tmp" >"$1/Makefile"]
-+ ' "$1/Makefile.in" >"$1/Makefile"]
- rm -f "$1/Makefile.tmp"
- mv "$1/stamp-it.tmp" "$1/stamp-it"
- ])
- ])dnl
- ])
-
--
- # deprecated macros
- AU_ALIAS([AC_PROG_INTLTOOL], [IT_PROG_INTLTOOL])
- # A hint is needed for aclocal from Automake <= 1.9.4:
-@@ -712,7 +724,7 @@
-
- # libtool.m4 - Configure libtool for the host system. -*-Autoconf-*-
-
--# serial 51 AC_PROG_LIBTOOL
-+# serial 52 AC_PROG_LIBTOOL
-
-
- # AC_PROVIDE_IFELSE(MACRO-NAME, IF-PROVIDED, IF-NOT-PROVIDED)
-@@ -800,7 +812,6 @@
- AC_REQUIRE([AC_OBJEXT])dnl
- AC_REQUIRE([AC_EXEEXT])dnl
- dnl
--
- AC_LIBTOOL_SYS_MAX_CMD_LEN
- AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE
- AC_LIBTOOL_OBJDIR
-@@ -902,6 +913,8 @@
- ;;
- esac
-
-+_LT_REQUIRED_DARWIN_CHECKS
-+
- AC_PROVIDE_IFELSE([AC_LIBTOOL_DLOPEN], enable_dlopen=yes, enable_dlopen=no)
- AC_PROVIDE_IFELSE([AC_LIBTOOL_WIN32_DLL],
- enable_win32_dll=yes, enable_win32_dll=no)
-@@ -981,9 +994,80 @@
- echo "$lt_simple_link_test_code" >conftest.$ac_ext
- eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
- _lt_linker_boilerplate=`cat conftest.err`
--$rm conftest*
-+$rm -r conftest*
- ])# _LT_LINKER_BOILERPLATE
-
-+# _LT_REQUIRED_DARWIN_CHECKS
-+# --------------------------
-+# Check for some things on darwin
-+AC_DEFUN([_LT_REQUIRED_DARWIN_CHECKS],[
-+ case $host_os in
-+ rhapsody* | darwin*)
-+ AC_CHECK_TOOL([DSYMUTIL], [dsymutil], [:])
-+ AC_CHECK_TOOL([NMEDIT], [nmedit], [:])
-+
-+ AC_CACHE_CHECK([for -single_module linker flag],[lt_cv_apple_cc_single_mod],
-+ [lt_cv_apple_cc_single_mod=no
-+ if test -z "${LT_MULTI_MODULE}"; then
-+ # By default we will add the -single_module flag. You can override
-+ # by either setting the environment variable LT_MULTI_MODULE
-+ # non-empty at configure time, or by adding -multi_module to the
-+ # link flags.
-+ echo "int foo(void){return 1;}" > conftest.c
-+ $LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \
-+ -dynamiclib ${wl}-single_module conftest.c
-+ if test -f libconftest.dylib; then
-+ lt_cv_apple_cc_single_mod=yes
-+ rm -rf libconftest.dylib*
-+ fi
-+ rm conftest.c
-+ fi])
-+ AC_CACHE_CHECK([for -exported_symbols_list linker flag],
-+ [lt_cv_ld_exported_symbols_list],
-+ [lt_cv_ld_exported_symbols_list=no
-+ save_LDFLAGS=$LDFLAGS
-+ echo "_main" > conftest.sym
-+ LDFLAGS="$LDFLAGS -Wl,-exported_symbols_list,conftest.sym"
-+ AC_LINK_IFELSE([AC_LANG_PROGRAM([],[])],
-+ [lt_cv_ld_exported_symbols_list=yes],
-+ [lt_cv_ld_exported_symbols_list=no])
-+ LDFLAGS="$save_LDFLAGS"
-+ ])
-+ case $host_os in
-+ rhapsody* | darwin1.[[0123]])
-+ _lt_dar_allow_undefined='${wl}-undefined ${wl}suppress' ;;
-+ darwin1.*)
-+ _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;;
-+ darwin*)
-+ # if running on 10.5 or later, the deployment target defaults
-+ # to the OS version, if on x86, and 10.4, the deployment
-+ # target defaults to 10.4. Don't you love it?
-+ case ${MACOSX_DEPLOYMENT_TARGET-10.0},$host in
-+ 10.0,*86*-darwin8*|10.0,*-darwin[[91]]*)
-+ _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;;
-+ 10.[[012]]*)
[...22880 lines suppressed...]
- build_cpu = @build_cpu@
- build_os = @build_os@
- build_vendor = @build_vendor@
-+builddir = @builddir@
- datadir = @datadir@
- datarootdir = @datarootdir@
- docdir = @docdir@
-@@ -301,8 +283,12 @@
- psdir = @psdir@
- sbindir = @sbindir@
- sharedstatedir = @sharedstatedir@
-+srcdir = @srcdir@
- sysconfdir = @sysconfdir@
- target_alias = @target_alias@
-+top_build_prefix = @top_build_prefix@
-+top_builddir = @top_builddir@
-+top_srcdir = @top_srcdir@
- INCLUDES = \
- -I$(top_srcdir)/bookmarks \
- -I$(top_srcdir)/embed \
-@@ -443,7 +429,7 @@
- rm -f "$${dir}/so_locations"; \
- done
- libutils.la: $(libutils_la_OBJECTS) $(libutils_la_DEPENDENCIES)
-- $(LINK) $(libutils_la_LDFLAGS) $(libutils_la_OBJECTS) $(libutils_la_LIBADD) $(LIBS)
-+ $(LINK) $(libutils_la_OBJECTS) $(libutils_la_LIBADD) $(LIBS)
-
- clean-noinstPROGRAMS:
- @list='$(noinst_PROGRAMS)'; for p in $$list; do \
-@@ -495,22 +481,22 @@
- @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/stroke.Plo at am__quote@
-
- .c.o:
-- at am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-- at am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
-+ at am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@ $(COMPILE) -c $<
-
- .c.obj:
-- at am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
-- at am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
-+ at am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
-+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'`
-
- .c.lo:
-- at am__fastdepCC_TRUE@ if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-- at am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
-+ at am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-+ at am__fastdepCC_TRUE@ mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $<
-@@ -521,17 +507,13 @@
- clean-libtool:
- -rm -rf .libs _libs
-
--distclean-libtool:
-- -rm -f libtool
--uninstall-info-am:
--
- ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
-- $(AWK) ' { files[$$0] = 1; } \
-- END { for (i in files) print i; }'`; \
-+ $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
-+ END { if (nonempty) { for (i in files) print i; }; }'`; \
- mkid -fID $$unique
- tags: TAGS
-
-@@ -543,8 +525,8 @@
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
-- $(AWK) ' { files[$$0] = 1; } \
-- END { for (i in files) print i; }'`; \
-+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-+ END { if (nonempty) { for (i in files) print i; }; }'`; \
- if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
- test -n "$$unique" || unique=$$empty_fix; \
- $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-@@ -554,13 +536,12 @@
- CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
- $(TAGS_FILES) $(LISP)
- tags=; \
-- here=`pwd`; \
- list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
- unique=`for i in $$list; do \
- if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
- done | \
-- $(AWK) ' { files[$$0] = 1; } \
-- END { for (i in files) print i; }'`; \
-+ $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
-+ END { if (nonempty) { for (i in files) print i; }; }'`; \
- test -z "$(CTAGS_ARGS)$$tags$$unique" \
- || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
- $$tags $$unique
-@@ -574,23 +555,21 @@
- -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
-
- distdir: $(DISTFILES)
-- $(mkdir_p) $(distdir)/$(top_srcdir)/idl
-- @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-- list='$(DISTFILES)'; for file in $$list; do \
-- case $$file in \
-- $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-- $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-- esac; \
-+ @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-+ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
-+ list='$(DISTFILES)'; \
-+ dist_files=`for file in $$list; do echo $$file; done | \
-+ sed -e "s|^$$srcdirstrip/||;t" \
-+ -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
-+ case $$dist_files in \
-+ */*) $(MKDIR_P) `echo "$$dist_files" | \
-+ sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
-+ sort -u` ;; \
-+ esac; \
-+ for file in $$dist_files; do \
- if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-- dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-- if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-- dir="/$$dir"; \
-- $(mkdir_p) "$(distdir)$$dir"; \
-- else \
-- dir=''; \
-- fi; \
- if test -d $$d/$$file; then \
-+ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
- if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
- cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
- fi; \
-@@ -642,7 +621,7 @@
- -rm -rf ./$(DEPDIR)
- -rm -f Makefile
- distclean-am: clean-am distclean-compile distclean-generic \
-- distclean-libtool distclean-tags
-+ distclean-tags
-
- dvi: dvi-am
-
-@@ -656,12 +635,20 @@
-
- install-data-am:
-
-+install-dvi: install-dvi-am
-+
- install-exec-am:
-
-+install-html: install-html-am
-+
- install-info: install-info-am
-
- install-man:
-
-+install-pdf: install-pdf-am
-+
-+install-ps: install-ps-am
-+
- installcheck-am:
-
- maintainer-clean: maintainer-clean-am
-@@ -682,19 +669,23 @@
-
- ps-am:
-
--uninstall-am: uninstall-info-am
-+uninstall-am:
-+
-+.MAKE: install-am install-strip
-
- .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
- clean-libtool clean-noinstLTLIBRARIES clean-noinstPROGRAMS \
- ctags distclean distclean-compile distclean-generic \
- distclean-libtool distclean-tags distdir dvi dvi-am html \
- html-am info info-am install install-am install-data \
-- install-data-am install-exec install-exec-am install-info \
-- install-info-am install-man install-strip installcheck \
-+ install-data-am install-dvi install-dvi-am install-exec \
-+ install-exec-am install-html install-html-am install-info \
-+ install-info-am install-man install-pdf install-pdf-am \
-+ install-ps install-ps-am install-strip installcheck \
- installcheck-am installdirs maintainer-clean \
- maintainer-clean-generic mostlyclean mostlyclean-compile \
- mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
-- tags uninstall uninstall-am uninstall-info-am
-+ tags uninstall uninstall-am
-
-
- galeon-marshal.c: galeon-marshal.list
galeon-2.0.7-plugins.patch:
Makefile.am | 1 +
mozilla-embed-shell.cpp | 20 +++++++++++++++++++-
2 files changed, 20 insertions(+), 1 deletion(-)
Index: galeon-2.0.7-plugins.patch
===================================================================
RCS file: /cvs/pkgs/rpms/galeon/devel/galeon-2.0.7-plugins.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- galeon-2.0.7-plugins.patch 13 Oct 2009 07:21:42 -0000 1.2
+++ galeon-2.0.7-plugins.patch 13 Feb 2010 18:27:29 -0000 1.3
@@ -1,14 +1,13 @@
---- galeon-2.0.7/mozilla/Makefile.in.orig 2008-09-27 15:08:28.000000000 +0200
-+++ galeon-2.0.7/mozilla/Makefile.in 2008-09-27 15:08:43.000000000 +0200
-@@ -401,7 +401,7 @@
- -I$(MOZILLA_INCLUDE_ROOT)/xpcom \
- -I$(MOZILLA_INCLUDE_ROOT)/xpconnect \
- -I$(MOZILLA_INCLUDE_ROOT)/xulapp $(GCONF_CFLAGS) \
-- $(GALEON_DEPENDENCY_CFLAGS) -DLIB_DIR=\"$(pkglibdir)\" \
-+ $(GALEON_DEPENDENCY_CFLAGS) -DTOP_LIB_DIR=\"$(libdir)\" -DLIB_DIR=\"$(pkglibdir)\" \
- -DSHARE_DIR=\"$(pkgdatadir)\" -D_GNU_SOURCE=1 -include \
- mozilla-config.h $(am__append_1)
- noinst_LTLIBRARIES = libmozillaembed.la
+--- galeon-2.0.7/mozilla/Makefile.am.orig
++++ galeon-2.0.7/mozilla/Makefile.am
+@@ -60,6 +60,7 @@
+ $(GALEON_DEPENDENCY_CFLAGS) \
+ -DLIB_DIR=\"$(pkglibdir)\" \
+ -DSHARE_DIR=\"$(pkgdatadir)\" \
++ -DTOP_LIB_DIR=\"$(libdir)\" \
+ -D_GNU_SOURCE=1 \
+ -include mozilla-config.h
+
--- galeon-2.0.7/mozilla/mozilla-embed-shell.cpp~ 2008-09-03 06:58:17.000000000 +0200
+++ galeon-2.0.7/mozilla/mozilla-embed-shell.cpp 2009-10-13 08:41:18.127313055 +0200
@@ -230,6 +230,17 @@
Index: galeon.spec
===================================================================
RCS file: /cvs/pkgs/rpms/galeon/devel/galeon.spec,v
retrieving revision 1.72
retrieving revision 1.73
diff -u -p -r1.72 -r1.73
--- galeon.spec 18 Jan 2010 06:48:40 -0000 1.72
+++ galeon.spec 13 Feb 2010 18:27:29 -0000 1.73
@@ -3,13 +3,12 @@
Summary: GNOME2 Web browser based on Mozilla
Name: galeon
Version: 2.0.7
-Release: 23%{?dist}
+Release: 24%{?dist}
License: GPLv2+
Group: Applications/Internet
URL: http://galeon.sourceforge.net/
Source0: http://downloads.sourceforge.net/galeon/%{name}-%{version}%{?extraversion}.tar.bz2
-Patch0: galeon-2.0.7-plugins.patch
-Patch1: galeon-2.0.7-confignspr.patch
+Patch0: galeon-2.0.7-plugins.patch
Patch2: galeon-2.0.7-gtkprint.patch
Patch3: galeon-2.0.7-dfltfont.patch
Patch4: galeon-2.0.7-warnings.patch
@@ -21,10 +20,12 @@ Patch9: galeon-2.0.7-dockcrash.p
Patch10: galeon-2.0.7-moz192.patch
Patch12: galeon-2.0.7-nojavaconsole.patch
Patch13: galeon-2.0.7-spinnericon.patch
+Patch14: galeon-2.0.7-libX11.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot-%(%{__id_u} -n)
BuildRequires: gettext desktop-file-utils
BuildRequires: gtk2-devel >= 2.12.0
+BuildRequires: libX11-devel
BuildRequires: gnome-desktop-devel
BuildRequires: gecko-devel = %{gecko_ver}
BuildRequires: gecko-devel-unstable = %{gecko_ver}
@@ -32,6 +33,8 @@ BuildRequires: libgnomeui-devel >= 2.5.2
BuildRequires: perl(XML::Parser) scrollkeeper
BuildRequires: intltool
BuildRequires: nspr-devel
+# For the autoreconf and libtoolize
+BuildRequires: autoconf automake libtool
Requires: gecko-libs = %{gecko_ver}
@@ -54,7 +57,6 @@ makes sense. Galeon was written to do ju
%setup -q -n %{name}-%{version}%{?extraversion}
%patch0 -p1 -b .plugins
%patch2 -p1 -b .gtkprint
-%patch1 -p1 -b .confignspr
%patch3 -p1 -b .dfltfont
%patch4 -p1 -b .warnings
%patch5 -p1 -b .moz191
@@ -65,6 +67,9 @@ makes sense. Galeon was written to do ju
%patch10 -p1 -b .moz192
%patch12 -p1 -b .nojavaconsole
%patch13 -p1 -b .spinnericon
+%patch14 -p1 -b .libX11
+libtoolize --force
+autoreconf -f
%build
@@ -139,6 +144,11 @@ update-desktop-database > /dev/null 2>&1
%changelog
+* Sat Feb 13 2010 Yanko Kaneti <yaneti at declera.com> - 2.0.7-24
+- Declare the existing explicit upstream dependency on libX11
+ fixes FTBFS bug #564665
+- Stop patching machine generated files - use autoreconf
+
* Mon Jan 18 2010 Yanko Kaneti <yaneti at declera.com> - 2.0.7-23
- Rebuild for gnome-desktop bump
- Previous message: rpms/compiz/F-11 compiz-0.7.8-kde4-initialsize.patch, NONE, 1.1 compiz-0.7.8-kde43.patch, NONE, 1.1 compiz-0.7.8-kde44.patch, NONE, 1.1 compiz.spec, 1.163, 1.164
- Next message: rpms/blktrace/devel blktrace-1.0.1-explicit-libpthread.patch, NONE, 1.1 blktrace.spec, 1.11, 1.12
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the scm-commits
mailing list