From 10ba297103cedbe0e94c857aaeccac189014c9ad Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Fri, 8 Feb 2013 17:59:31 +0100 Subject: update pango and all dependencies --- package/fontconfig/patches/patch-Makefile_in | 0 package/fontconfig/patches/patch-configure | 18 ------- .../fontconfig/patches/patch-fc-arch_Makefile_in | 43 ----------------- .../fontconfig/patches/patch-fc-case_Makefile_in | 49 ------------------- .../patches/patch-fc-glyphname_Makefile_in | 43 ----------------- .../fontconfig/patches/patch-fc-lang_Makefile_in | 55 ---------------------- package/fontconfig/patches/patch-fontconfig_pc_in | 9 ---- package/fontconfig/patches/patch-ltmain_sh | 11 ----- 8 files changed, 228 deletions(-) delete mode 100644 package/fontconfig/patches/patch-Makefile_in delete mode 100644 package/fontconfig/patches/patch-configure delete mode 100644 package/fontconfig/patches/patch-fc-arch_Makefile_in delete mode 100644 package/fontconfig/patches/patch-fc-case_Makefile_in delete mode 100644 package/fontconfig/patches/patch-fc-glyphname_Makefile_in delete mode 100644 package/fontconfig/patches/patch-fc-lang_Makefile_in delete mode 100644 package/fontconfig/patches/patch-fontconfig_pc_in delete mode 100644 package/fontconfig/patches/patch-ltmain_sh (limited to 'package/fontconfig/patches') diff --git a/package/fontconfig/patches/patch-Makefile_in b/package/fontconfig/patches/patch-Makefile_in deleted file mode 100644 index e69de29bb..000000000 diff --git a/package/fontconfig/patches/patch-configure b/package/fontconfig/patches/patch-configure deleted file mode 100644 index 2c3e4162c..000000000 --- a/package/fontconfig/patches/patch-configure +++ /dev/null @@ -1,18 +0,0 @@ ---- fontconfig-2.8.0.orig/configure 2009-11-19 00:49:41.000000000 +0100 -+++ fontconfig-2.8.0/configure 2011-02-24 14:32:50.000000000 +0100 -@@ -817,6 +817,7 @@ ICONV_LIBS - ARCHITECTURE - EXEEXT_FOR_BUILD - CC_FOR_BUILD -+CFLAGS_FOR_BUILD - CROSS_COMPILING_FALSE - CROSS_COMPILING_TRUE - WARN_CFLAGS -@@ -11872,6 +11873,7 @@ if test "${ac_cv_prog_CC_FOR_BUILD+set}" - else - if test -n "$CC_FOR_BUILD"; then - ac_cv_prog_CC_FOR_BUILD="$CC_FOR_BUILD" # Let the user override the test. -+ ac_cv_prog_CFLAGS_FOR_BUILD="$CFLAGS_FOR_BUILD" # Let the user override the test. - else - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR - for as_dir in $PATH diff --git a/package/fontconfig/patches/patch-fc-arch_Makefile_in b/package/fontconfig/patches/patch-fc-arch_Makefile_in deleted file mode 100644 index 1544ea22e..000000000 --- a/package/fontconfig/patches/patch-fc-arch_Makefile_in +++ /dev/null @@ -1,43 +0,0 @@ ---- fontconfig-2.8.0.orig/fc-arch/Makefile.in 2009-11-19 00:49:37.000000000 +0100 -+++ fontconfig-2.8.0/fc-arch/Makefile.in 2011-02-24 14:37:06.000000000 +0100 -@@ -82,7 +82,7 @@ depcomp = $(SHELL) $(top_srcdir)/depcomp - am__depfiles_maybe = depfiles - am__mv = mv -f - COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ -- $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -+ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS_FOR_BUILD) - AM_V_CC = $(am__v_CC_$(V)) - am__v_CC_ = $(am__v_CC_$(AM_DEFAULT_VERBOSITY)) - am__v_CC_0 = @echo " CC " $@; -@@ -114,10 +114,11 @@ AWK = @AWK@ - CC = @CC_FOR_BUILD@ - CCDEPMODE = @CCDEPMODE@ - CC_FOR_BUILD = @CC_FOR_BUILD@ --CFLAGS = @CFLAGS@ -+CFLAGS_FOR_BUILD = @CFLAGS_FOR_BUILD@ -+CFLAGS = - CONFDIR = @CONFDIR@ - CPP = @CPP@ --CPPFLAGS = @CPPFLAGS@ -+CPPFLAGS = - CYGPATH_W = @CYGPATH_W@ - DEFS = @DEFS@ - DEPDIR = @DEPDIR@ -@@ -154,7 +155,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ - INSTALL_SCRIPT = @INSTALL_SCRIPT@ - INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ - LD = @LD@ --LDFLAGS = @LDFLAGS@ -+LDFLAGS = - LIBOBJS = @LIBOBJS@ - LIBS = @LIBS@ - LIBTOOL = @LIBTOOL@ -@@ -249,7 +250,7 @@ target_alias = @target_alias@ - top_build_prefix = @top_build_prefix@ - top_builddir = @top_builddir@ - top_srcdir = @top_srcdir@ --LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ -+LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS_FOR_BUILD) $(AM_LDFLAGS) $(LDFLAGS) -o $@ - INCLUDES = -I${top_srcdir}/src -I${top_srcdir} $(WARN_CFLAGS) - TMPL = fcarch.tmpl.h - STMPL = ${top_srcdir}/fc-arch/fcarch.tmpl.h diff --git a/package/fontconfig/patches/patch-fc-case_Makefile_in b/package/fontconfig/patches/patch-fc-case_Makefile_in deleted file mode 100644 index ed5a403ed..000000000 --- a/package/fontconfig/patches/patch-fc-case_Makefile_in +++ /dev/null @@ -1,49 +0,0 @@ ---- fontconfig-2.8.0.orig/fc-case/Makefile.in 2009-11-19 00:49:38.000000000 +0100 -+++ fontconfig-2.8.0/fc-case/Makefile.in 2011-02-24 14:30:29.000000000 +0100 -@@ -84,20 +84,20 @@ depcomp = $(SHELL) $(top_srcdir)/depcomp - am__depfiles_maybe = depfiles - am__mv = mv -f - COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ -- $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -+ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS_FOR_BUILD) - AM_V_CC = $(am__v_CC_$(V)) - am__v_CC_ = $(am__v_CC_$(AM_DEFAULT_VERBOSITY)) --am__v_CC_0 = @echo " CC " $@; -+am__v_CC_0 = echo " CC " $@; - AM_V_at = $(am__v_at_$(V)) - am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY)) - am__v_at_0 = @ - CCLD = $(CC) - AM_V_CCLD = $(am__v_CCLD_$(V)) - am__v_CCLD_ = $(am__v_CCLD_$(AM_DEFAULT_VERBOSITY)) --am__v_CCLD_0 = @echo " CCLD " $@; -+am__v_CCLD_0 = echo " CCLD " $@; - AM_V_GEN = $(am__v_GEN_$(V)) - am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY)) --am__v_GEN_0 = @echo " GEN " $@; -+am__v_GEN_0 = echo " GEN " $@; - SOURCES = fc-case.c - DIST_SOURCES = fc-case.c - HEADERS = $(noinst_HEADERS) -@@ -117,10 +117,10 @@ AWK = @AWK@ - CC = @CC_FOR_BUILD@ - CCDEPMODE = @CCDEPMODE@ - CC_FOR_BUILD = @CC_FOR_BUILD@ --CFLAGS = @CFLAGS@ -+CFLAGS_FOR_BUILD = @CFLAGS_FOR_BUILD@ - CONFDIR = @CONFDIR@ - CPP = @CPP@ --CPPFLAGS = @CPPFLAGS@ -+CPPFLAGS = - CYGPATH_W = @CYGPATH_W@ - DEFS = @DEFS@ - DEPDIR = @DEPDIR@ -@@ -252,7 +252,7 @@ target_alias = @target_alias@ - top_build_prefix = @top_build_prefix@ - top_builddir = @top_builddir@ - top_srcdir = @top_srcdir@ --LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ -+LINK = $(CCLD) $(AM_CFLAGS) $(AM_LDFLAGS) -o $@ - INCLUDES = -I${top_srcdir}/src -I${top_srcdir} $(WARN_CFLAGS) - TMPL = fccase.tmpl.h - STMPL = ${top_srcdir}/fc-case/${TMPL} diff --git a/package/fontconfig/patches/patch-fc-glyphname_Makefile_in b/package/fontconfig/patches/patch-fc-glyphname_Makefile_in deleted file mode 100644 index eed138f85..000000000 --- a/package/fontconfig/patches/patch-fc-glyphname_Makefile_in +++ /dev/null @@ -1,43 +0,0 @@ ---- fontconfig-2.8.0.orig/fc-glyphname/Makefile.in 2009-11-19 00:49:38.000000000 +0100 -+++ fontconfig-2.8.0/fc-glyphname/Makefile.in 2011-02-24 14:35:52.000000000 +0100 -@@ -82,7 +82,7 @@ depcomp = $(SHELL) $(top_srcdir)/depcomp - am__depfiles_maybe = depfiles - am__mv = mv -f - COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ -- $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -+ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS_FOR_BUILD) - AM_V_CC = $(am__v_CC_$(V)) - am__v_CC_ = $(am__v_CC_$(AM_DEFAULT_VERBOSITY)) - am__v_CC_0 = @echo " CC " $@; -@@ -114,10 +114,11 @@ AWK = @AWK@ - CC = @CC_FOR_BUILD@ - CCDEPMODE = @CCDEPMODE@ - CC_FOR_BUILD = @CC_FOR_BUILD@ --CFLAGS = @CFLAGS@ -+CFLAGS_FOR_BUILD = @CFLAGS_FOR_BUILD@ -+CFLAGS = - CONFDIR = @CONFDIR@ - CPP = @CPP@ --CPPFLAGS = @CPPFLAGS@ -+CPPFLAGS = - CYGPATH_W = @CYGPATH_W@ - DEFS = @DEFS@ - DEPDIR = @DEPDIR@ -@@ -154,7 +155,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ - INSTALL_SCRIPT = @INSTALL_SCRIPT@ - INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ - LD = @LD@ --LDFLAGS = @LDFLAGS@ -+LDFLAGS = - LIBOBJS = @LIBOBJS@ - LIBS = @LIBS@ - LIBTOOL = @LIBTOOL@ -@@ -249,7 +250,7 @@ target_alias = @target_alias@ - top_build_prefix = @top_build_prefix@ - top_builddir = @top_builddir@ - top_srcdir = @top_srcdir@ --LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ -+LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS_FOR_BUILD) $(AM_LDFLAGS) $(LDFLAGS) -o $@ - INCLUDES = -I${top_srcdir}/src -I${top_srcdir} $(WARN_CFLAGS) - TMPL = fcglyphname.tmpl.h - STMPL = ${top_srcdir}/fc-glyphname/${TMPL} diff --git a/package/fontconfig/patches/patch-fc-lang_Makefile_in b/package/fontconfig/patches/patch-fc-lang_Makefile_in deleted file mode 100644 index c557e64ab..000000000 --- a/package/fontconfig/patches/patch-fc-lang_Makefile_in +++ /dev/null @@ -1,55 +0,0 @@ ---- fontconfig-2.8.0.orig/fc-lang/Makefile.in 2009-11-19 00:49:38.000000000 +0100 -+++ fontconfig-2.8.0/fc-lang/Makefile.in 2011-02-24 14:34:36.000000000 +0100 -@@ -82,17 +82,17 @@ depcomp = $(SHELL) $(top_srcdir)/depcomp - am__depfiles_maybe = depfiles - am__mv = mv -f - COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ -- $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -+ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS_FOR_BUILD) - AM_V_CC = $(am__v_CC_$(V)) - am__v_CC_ = $(am__v_CC_$(AM_DEFAULT_VERBOSITY)) --am__v_CC_0 = @echo " CC " $@; -+am__v_CC_0 = echo " CC " $@; - AM_V_at = $(am__v_at_$(V)) - am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY)) - am__v_at_0 = @ - CCLD = $(CC) - AM_V_CCLD = $(am__v_CCLD_$(V)) - am__v_CCLD_ = $(am__v_CCLD_$(AM_DEFAULT_VERBOSITY)) --am__v_CCLD_0 = @echo " CCLD " $@; -+am__v_CCLD_0 = echo " CCLD " $@; - AM_V_GEN = $(am__v_GEN_$(V)) - am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY)) - am__v_GEN_0 = @echo " GEN " $@; -@@ -114,10 +114,11 @@ AWK = @AWK@ - CC = @CC_FOR_BUILD@ - CCDEPMODE = @CCDEPMODE@ - CC_FOR_BUILD = @CC_FOR_BUILD@ --CFLAGS = @CFLAGS@ -+CFLAGS_FOR_BUILD = @CFLAGS_FOR_BUILD@ -+CFLAGS = - CONFDIR = @CONFDIR@ - CPP = @CPP@ --CPPFLAGS = @CPPFLAGS@ -+CPPFLAGS = - CYGPATH_W = @CYGPATH_W@ - DEFS = @DEFS@ - DEPDIR = @DEPDIR@ -@@ -154,7 +155,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ - INSTALL_SCRIPT = @INSTALL_SCRIPT@ - INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ - LD = @LD@ --LDFLAGS = @LDFLAGS@ -+LDFLAGS = - LIBOBJS = @LIBOBJS@ - LIBS = @LIBS@ - LIBTOOL = @LIBTOOL@ -@@ -249,7 +250,7 @@ target_alias = @target_alias@ - top_build_prefix = @top_build_prefix@ - top_builddir = @top_builddir@ - top_srcdir = @top_srcdir@ --LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ -+LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS_FOR_BUILD) $(AM_LDFLAGS) $(LDFLAGS) -o $@ - INCLUDES = -I${top_srcdir}/src -I${top_srcdir} $(WARN_CFLAGS) - TMPL = fclang.tmpl.h - STMPL = ${top_srcdir}/fc-lang/fclang.tmpl.h diff --git a/package/fontconfig/patches/patch-fontconfig_pc_in b/package/fontconfig/patches/patch-fontconfig_pc_in deleted file mode 100644 index b2670b8df..000000000 --- a/package/fontconfig/patches/patch-fontconfig_pc_in +++ /dev/null @@ -1,9 +0,0 @@ ---- fontconfig-2.8.0.orig/fontconfig.pc.in 2009-11-16 18:24:52.000000000 +0100 -+++ fontconfig-2.8.0/fontconfig.pc.in 2011-04-25 18:08:32.487672440 +0200 -@@ -7,5 +7,5 @@ Name: Fontconfig - Description: Font configuration and customization library - Version: @VERSION@ - Libs: -L${libdir} -lfontconfig --Libs.private: @LIBXML2_LIBS@ @EXPAT_LIBS@ @FREETYPE_LIBS@ @ICONV_LIBS@ -+Libs.private: @LIBXML2_LIBS@ @EXPAT_LIBS@ -lfreetype -lz @ICONV_LIBS@ - Cflags: -I${includedir} diff --git a/package/fontconfig/patches/patch-ltmain_sh b/package/fontconfig/patches/patch-ltmain_sh deleted file mode 100644 index 97a052432..000000000 --- a/package/fontconfig/patches/patch-ltmain_sh +++ /dev/null @@ -1,11 +0,0 @@ ---- fontconfig-2.8.0.orig/ltmain.sh 2009-11-16 21:49:43.000000000 +0100 -+++ fontconfig-2.8.0/ltmain.sh 2011-01-14 00:39:50.000000000 +0100 -@@ -4765,7 +4765,7 @@ func_mode_link () - # -p, -pg, --coverage, -fprofile-* pass through profiling flag for GCC - # @file GCC response files - -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*| \ -- -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*) -+ -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*|-fstack-protector*|-flto) - func_quote_for_eval "$arg" - arg="$func_quote_for_eval_result" - func_append compile_command " $arg" -- cgit v1.2.3