diff options
author | Robert Schwebel <r.schwebel@pengutronix.de> | 2009-06-23 20:12:10 +0200 |
---|---|---|
committer | Michael Olbrich <m.olbrich@pengutronix.de> | 2009-10-26 14:13:03 +0100 |
commit | 8f06dc4fb2d38183fca773d8209e3c4340d4de3e (patch) | |
tree | 4dee5853182c87bfbd5ce1b29e3206c08e8e5e01 | |
parent | f42c0259fcc2bf666773e51ebeb8cd27b98bcf2b (diff) | |
download | ptxdist-8f06dc4fb2d38183fca773d8209e3c4340d4de3e.tar.gz ptxdist-8f06dc4fb2d38183fca773d8209e3c4340d4de3e.tar.xz |
[glademm] use automatic autogen instead of autogen patch
Signed-off-by: Robert Schwebel <r.schwebel@pengutronix.de>
l--------- | patches/glademm-2.6.0/autogen.sh | 1 | ||||
-rw-r--r-- | patches/glademm-2.6.0/autoreconf.diff | 126 | ||||
-rw-r--r-- | patches/glademm-2.6.0/series | 7 |
3 files changed, 4 insertions, 130 deletions
diff --git a/patches/glademm-2.6.0/autogen.sh b/patches/glademm-2.6.0/autogen.sh new file mode 120000 index 000000000..9f8a4cb7d --- /dev/null +++ b/patches/glademm-2.6.0/autogen.sh @@ -0,0 +1 @@ +../autogen.sh
\ No newline at end of file diff --git a/patches/glademm-2.6.0/autoreconf.diff b/patches/glademm-2.6.0/autoreconf.diff deleted file mode 100644 index 49dc7b308..000000000 --- a/patches/glademm-2.6.0/autoreconf.diff +++ /dev/null @@ -1,126 +0,0 @@ ---- - src/writers/Makefile.in | 24 ++++++++++++++++-------- - 1 file changed, 16 insertions(+), 8 deletions(-) - -Index: b/src/writers/Makefile.in -=================================================================== ---- a/src/writers/Makefile.in -+++ b/src/writers/Makefile.in -@@ -1,8 +1,8 @@ --# Makefile.in generated by automake 1.9.3 from Makefile.am. -+# Makefile.in generated by automake 1.9.6 from Makefile.am. - # @configure_input@ - - # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, --# 2003, 2004 Free Software Foundation, Inc. -+# 2003, 2004, 2005 Free Software Foundation, Inc. - # This Makefile.in 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. -@@ -22,8 +22,6 @@ - # libwriters.o is now 1M1 - - --SOURCES = $(libwriters_a_SOURCES) -- - srcdir = @srcdir@ - top_srcdir = @top_srcdir@ - VPATH = @srcdir@ -@@ -61,7 +59,7 @@ ARFLAGS = cru - libwriters_a_AR = $(AR) $(ARFLAGS) - libwriters_a_LIBADD = - am_libwriters_a_OBJECTS = WriterBase.$(OBJEXT) \ -- WriterBase_matches.$(OBJEXT) Class.$(OBJEXT) \ -+ WriterBase_matches.$(OBJEXT) Class.$(OBJEXT) gwt.$(OBJEXT) \ - accellabel.$(OBJEXT) accelgroup.$(OBJEXT) adjustment.$(OBJEXT) \ - alignment.$(OBJEXT) arrow.$(OBJEXT) aspectframe.$(OBJEXT) \ - bbox.$(OBJEXT) bonobo_dock.$(OBJEXT) bonobo_dockitem.$(OBJEXT) \ -@@ -139,6 +137,7 @@ CXXFLAGS = @CXXFLAGS@ - CYGPATH_W = @CYGPATH_W@ - DEFS = @DEFS@ - DEPDIR = @DEPDIR@ -+DSYMUTIL = @DSYMUTIL@ - ECHO = @ECHO@ - ECHO_C = @ECHO_C@ - ECHO_N = @ECHO_N@ -@@ -147,6 +146,7 @@ EGREP = @EGREP@ - EXEEXT = @EXEEXT@ - F77 = @F77@ - FFLAGS = @FFLAGS@ -+GREP = @GREP@ - INSTALL_DATA = @INSTALL_DATA@ - INSTALL_PROGRAM = @INSTALL_PROGRAM@ - INSTALL_SCRIPT = @INSTALL_SCRIPT@ -@@ -158,6 +158,7 @@ LIBTOOL = @LIBTOOL@ - LN_S = @LN_S@ - LTLIBOBJS = @LTLIBOBJS@ - MAKEINFO = @MAKEINFO@ -+NMEDIT = @NMEDIT@ - OBJEXT = @OBJEXT@ - PACKAGE = @PACKAGE@ - PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ -@@ -167,16 +168,14 @@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ - PACKAGE_VERSION = @PACKAGE_VERSION@ - PATH_SEPARATOR = @PATH_SEPARATOR@ - RANLIB = @RANLIB@ -+SED = @SED@ - SET_MAKE = @SET_MAKE@ - SHELL = @SHELL@ - STRIP = @STRIP@ - VERSION = @VERSION@ --ac_ct_AR = @ac_ct_AR@ - ac_ct_CC = @ac_ct_CC@ - ac_ct_CXX = @ac_ct_CXX@ - ac_ct_F77 = @ac_ct_F77@ --ac_ct_RANLIB = @ac_ct_RANLIB@ --ac_ct_STRIP = @ac_ct_STRIP@ - am__fastdepCC_FALSE = @am__fastdepCC_FALSE@ - am__fastdepCC_TRUE = @am__fastdepCC_TRUE@ - am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@ -@@ -193,23 +192,30 @@ build_cpu = @build_cpu@ - build_os = @build_os@ - build_vendor = @build_vendor@ - datadir = @datadir@ -+datarootdir = @datarootdir@ -+docdir = @docdir@ -+dvidir = @dvidir@ - exec_prefix = @exec_prefix@ - host = @host@ - host_alias = @host_alias@ - host_cpu = @host_cpu@ - host_os = @host_os@ - host_vendor = @host_vendor@ -+htmldir = @htmldir@ - includedir = @includedir@ - infodir = @infodir@ - install_sh = @install_sh@ - libdir = @libdir@ - libexecdir = @libexecdir@ -+localedir = @localedir@ - localstatedir = @localstatedir@ - mandir = @mandir@ - mkdir_p = @mkdir_p@ - oldincludedir = @oldincludedir@ -+pdfdir = @pdfdir@ - prefix = @prefix@ - program_transform_name = @program_transform_name@ -+psdir = @psdir@ - sbindir = @sbindir@ - sharedstatedir = @sharedstatedir@ - sysconfdir = @sysconfdir@ -@@ -230,6 +236,7 @@ noinst_HEADERS = WriterBase.hh adjustmen - togglebutton.hh toolitem.hh widget.hh window.hh safemap.hh - - libwriters_a_SOURCES = WriterBase.cc WriterBase_matches.cc Class.cc \ -+ gwt.cc \ - accellabel.cc \ - accelgroup.cc adjustment.cc alignment.cc arrow.cc \ - aspectframe.cc bbox.cc bonobo_dock.cc bonobo_dockitem.cc \ -@@ -360,6 +367,7 @@ distclean-compile: - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gnome_numberentry.Po@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gnome_pixmap.Po@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gnome_propertybox.Po@am__quote@ -+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gwt.Po@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/handlebox.Po@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/image.Po@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/imagemenuitem.Po@am__quote@ diff --git a/patches/glademm-2.6.0/series b/patches/glademm-2.6.0/series index 29b0a3a1a..8334c1b2b 100644 --- a/patches/glademm-2.6.0/series +++ b/patches/glademm-2.6.0/series @@ -1,10 +1,9 @@ -fix_double_qualification.diff -configurable_pkgconfig.diff -box_pack_child_with_responseid.diff +fix_double_qualification.diff +configurable_pkgconfig.diff +box_pack_child_with_responseid.diff fix-glade-only.diff fix-table-attach.diff fix-alignment-writer.diff gettext-param.diff gwt-support.diff -autoreconf.diff fix-for-new-gcc.diff |