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/cairo/Makefile | 6 ++- package/cairo/patches/patch-build_ltmain_sh | 11 ----- package/cairo/patches/patch-configure | 11 ----- package/firefox/Makefile | 6 ++- package/firefox/patches/patch-configure | 11 ++++- package/fontconfig/Makefile | 6 +-- 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 ----- package/glib/Makefile | 10 ++-- package/libstdcxx/Makefile | 1 + package/pango/Makefile | 19 ++++---- package/pango/files/pango.modules | 45 ++++++------------ 18 files changed, 52 insertions(+), 302 deletions(-) delete mode 100644 package/cairo/patches/patch-build_ltmain_sh delete mode 100644 package/cairo/patches/patch-configure 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') diff --git a/package/cairo/Makefile b/package/cairo/Makefile index de4bad1ce..5cf30d57d 100644 --- a/package/cairo/Makefile +++ b/package/cairo/Makefile @@ -4,9 +4,9 @@ include ${TOPDIR}/rules.mk PKG_NAME:= cairo -PKG_VERSION:= 1.10.2 +PKG_VERSION:= 1.12.12 PKG_RELEASE:= 1 -PKG_MD5SUM:= f101a9e88b783337b20b2e26dfd26d5f +PKG_MD5SUM:= 9f7315e54885c735dcfdabe77f322d30 PKG_DESCR:= cairo graphics library PKG_SECTION:= libs PKG_DEPENDS:= fontconfig libfreetype libpng libx11 pixman @@ -14,6 +14,8 @@ PKG_BUILDDEP:= libpng pixman freetype fontconfig libX11 libXrender glib PKG_URL:= http://cairographics.org/ PKG_SITES:= http://cairographics.org/releases/ +DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.xz + PKG_SUBPKGS:= CAIRO CAIRO_DEV PKGSC_CAIRO_DEV:= devel PKGSD_CAIRO_DEV:= cairo headers diff --git a/package/cairo/patches/patch-build_ltmain_sh b/package/cairo/patches/patch-build_ltmain_sh deleted file mode 100644 index d79eba50b..000000000 --- a/package/cairo/patches/patch-build_ltmain_sh +++ /dev/null @@ -1,11 +0,0 @@ ---- cairo-1.8.10.orig/build/ltmain.sh 2010-02-20 00:39:43.000000000 +0100 -+++ cairo-1.8.10/build/ltmain.sh 2011-01-14 20:17:40.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" diff --git a/package/cairo/patches/patch-configure b/package/cairo/patches/patch-configure deleted file mode 100644 index 91e1f8cd4..000000000 --- a/package/cairo/patches/patch-configure +++ /dev/null @@ -1,11 +0,0 @@ ---- cairo-1.10.2.orig/configure 2010-12-25 15:22:57.000000000 +0100 -+++ cairo-1.10.2/configure 2011-07-23 14:58:11.293924415 +0200 -@@ -17236,7 +17236,7 @@ MAYBE_WARN="-Wall -Wextra \ - MAYBE_WARN="$MAYBE_WARN -erroff=E_ENUM_TYPE_MISMATCH_ARG \ - -erroff=E_ENUM_TYPE_MISMATCH_OP" - --MAYBE_WARN="$MAYBE_WARN -fno-strict-aliasing -fno-common -flto" -+MAYBE_WARN="$MAYBE_WARN -fno-strict-aliasing -fno-common" - - MAYBE_WARN="$MAYBE_WARN -Wp,-D_FORTIFY_SOURCE=2" - diff --git a/package/firefox/Makefile b/package/firefox/Makefile index 779e42dcc..ad8dc3a19 100644 --- a/package/firefox/Makefile +++ b/package/firefox/Makefile @@ -11,7 +11,8 @@ PKG_DESCR:= graphical webbrowser PKG_SECTION:= x11/apps PKG_DEPENDS:= libpthread alsa-lib dbus-glib glib libgtk libpng libtiff libxcursor libffi PKG_DEPENDS+= nspr nss libjpeg libatk pango cairo libxt libx11 libstdcxx hicolor-icon-theme -PKG_DEPENDS+= libxdamage libxfixes libidl libsqlite libxcomposite gdk-pixbuf libintl +PKG_DEPENDS+= libxdamage libxfixes libidl libsqlite libxcomposite gdk-pixbuf libintl librt libgcc +PKG_DEPENDS+= harfbuzz PKG_BUILDDEP:= alsa-lib dbus-glib glib gtk+ libIDL libX11 MesaLib libtiff gdk-pixbuf PKG_BUILDDEP+= nspr nss jpeg libXt fontconfig sqlite atk libpng hicolor-icon-theme PKG_URL:= http://www.mozilla.org/ @@ -21,7 +22,7 @@ PKG_NEED_CXX:= 1 PKG_ARCH_DEPENDS:= x86 x86_64 native mips PKG_HOST_DEPENDS:= !netbsd !freebsd !openbsd !cygwin -PKG_SYSTEM_DEPENDS:= tarox-pc ibm-x40 lemote-yeelong qemu-i686 +PKG_SYSTEM_DEPENDS:= tarox-pc ibm-x40 lemote-yeelong qemu-i686 qemu-x86_64 DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.source.tar.bz2 WRKDIST= ${WRKDIR}/mozilla-release @@ -79,6 +80,7 @@ CONFIGURE_ARGS+= --enable-application=browser \ --disable-jemalloc \ --disable-crashreporter \ --disable-updater \ + --disable-dtrace \ --disable-libjpeg-turbo \ --disable-elf-hack diff --git a/package/firefox/patches/patch-configure b/package/firefox/patches/patch-configure index 291e6fbc0..6fe7c4533 100644 --- a/package/firefox/patches/patch-configure +++ b/package/firefox/patches/patch-configure @@ -1,5 +1,14 @@ --- mozilla-release.orig/configure 2011-07-08 03:30:27.000000000 +0200 -+++ mozilla-release/configure 2011-07-29 15:50:35.000000000 +0200 ++++ mozilla-release/configure 2013-02-07 16:38:49.000000000 +0100 +@@ -10022,7 +10022,7 @@ cross_compiling=$ac_cv_prog_cc_cross + # Check whether --enable-dtrace or --disable-dtrace was given. + if test "${enable_dtrace+set}" = set; then + enableval="$enable_dtrace" +- enable_dtrace="yes" ++ enable_dtrace="no" + fi + + if test "x$enable_dtrace" = "xyes"; then @@ -23504,6 +23504,9 @@ fi fi fi diff --git a/package/fontconfig/Makefile b/package/fontconfig/Makefile index 449703864..a6aba2311 100644 --- a/package/fontconfig/Makefile +++ b/package/fontconfig/Makefile @@ -4,9 +4,9 @@ include ${TOPDIR}/rules.mk PKG_NAME:= fontconfig -PKG_VERSION:= 2.8.0 -PKG_RELEASE:= 2 -PKG_MD5SUM:= 77e15a92006ddc2adbb06f840d591c0e +PKG_VERSION:= 2.10.91 +PKG_RELEASE:= 1 +PKG_MD5SUM:= 0a8edc63aa79377b2bf44e469d5bbbb7 PKG_DESCR:= library for configuring and customizing font access PKG_SECTION:= libs PKG_DEPENDS:= libxml2 libiconv 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" diff --git a/package/glib/Makefile b/package/glib/Makefile index dded649aa..7f55e9f0f 100644 --- a/package/glib/Makefile +++ b/package/glib/Makefile @@ -4,10 +4,10 @@ include ${TOPDIR}/rules.mk PKG_NAME:= glib -PKG_VERSION:= 2.28.1 -PKG_EXTRAVER:= 2.28 -PKG_RELEASE:= 4 -PKG_MD5SUM:= 9f6e85e1e38490c3956f4415bcd33e6e +PKG_VERSION:= 2.35.7 +PKG_EXTRAVER:= 2.35 +PKG_RELEASE:= 1 +PKG_MD5SUM:= d9f36f01a24fcfd568c7e45ceabcec90 PKG_DESCR:= low-level core library that forms the basis of GTK+ PKG_SECTION:= libs PKG_DEPENDS:= libintl libiconv libpthread @@ -16,7 +16,7 @@ PKG_URL:= http://www.gtk.org/ PKG_SITES:= http://ftp.gnome.org/pub/gnome/sources/glib/${PKG_EXTRAVER}/ PKG_NOPARALLEL:= 1 -#DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.xz +DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.xz PKG_SUBPKGS:= GLIB GLIB_DEV PKGSC_GLIB_DEV:= devel diff --git a/package/libstdcxx/Makefile b/package/libstdcxx/Makefile index a84d85b3d..2ac8c9f31 100644 --- a/package/libstdcxx/Makefile +++ b/package/libstdcxx/Makefile @@ -33,6 +33,7 @@ ifeq ($(ADK_NATIVE),y) $(CP) /usr/lib/libstdc++.so* ${IDIR_LIBSTDCXX}/usr/lib else $(CP) ${STAGING_TARGET_DIR}/${ADK_TARGET_LIBC_PATH}/libstdc++.so* ${IDIR_LIBSTDCXX}/usr/${ADK_TARGET_LIBC_PATH} + (cd ${IDIR_LIBSTDCXX}/usr/${ADK_TARGET_LIBC_PATH}; ln -sf libstdc++.so.6.0.17 libstdc++.so.6) -@rm ${IDIR_LIBSTDCXX}/usr/${ADK_TARGET_LIBC_PATH}/libstdc++.so.*-gdb.py endif diff --git a/package/pango/Makefile b/package/pango/Makefile index 57f0b28d1..f5f4ba30a 100644 --- a/package/pango/Makefile +++ b/package/pango/Makefile @@ -4,17 +4,17 @@ include ${TOPDIR}/rules.mk PKG_NAME:= pango -PKG_VERSION:= 1.28.3 +PKG_VERSION:= 1.33.7 PKG_RELEASE:= 1 -PKG_MD5SUM:= 22ad1c8d3fda7e73b0798035f3dd96bc +PKG_MD5SUM:= 0dcdae60523229c20ee6551345206988 PKG_DESCR:= pango library PKG_SECTION:= libs -PKG_BUILDDEP:= libXft glib cairo +PKG_BUILDDEP:= libXft glib cairo libstdcxx harfbuzz fontconfig PKG_URL:= http://www.pango.org/ -PKG_SITES:= ${MASTER_SITE_GNOME:=pango/1.28/} +PKG_SITES:= ${MASTER_SITE_GNOME:=pango/1.33/} PKG_NEED_CXX:= 1 -#DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.xz +DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.xz PKG_SUBPKGS:= PANGO PANGO_DEV PKGSC_PANGO_DEV:= devel @@ -35,11 +35,14 @@ CONFIGURE_ENV+= ac_cv_path_EGREP="grep -E" pango-install: $(INSTALL_DIR) $(IDIR_PANGO)/etc/pango - $(INSTALL_DIR) $(IDIR_PANGO)/usr/lib $(IDIR_PANGO)/usr/lib/pango/1.6.0/modules + $(INSTALL_DIR) $(IDIR_PANGO)/usr/bin + $(INSTALL_DIR) $(IDIR_PANGO)/usr/lib $(IDIR_PANGO)/usr/lib/pango/1.8.0/modules $(INSTALL_DATA) ./files/pango.modules $(IDIR_PANGO)/etc/pango $(CP) $(WRKINST)/usr/lib/libpango*.so* $(IDIR_PANGO)/usr/lib - $(CP) $(WRKINST)/usr/lib/pango/1.6.0/modules/*.so \ - $(IDIR_PANGO)/usr/lib/pango/1.6.0/modules + $(CP) $(WRKINST)/usr/lib/pango/1.8.0/modules/*.so \ + $(IDIR_PANGO)/usr/lib/pango/1.8.0/modules + $(INSTALL_BIN) $(WRKINST)/usr/bin/pango-querymodules \ + $(IDIR_PANGO)/usr/bin pango-dev-install: $(INSTALL_DIR) $(IDIR_PANGO_DEV)/usr/include diff --git a/package/pango/files/pango.modules b/package/pango/files/pango.modules index dc8a6183f..2494e6cc1 100644 --- a/package/pango/files/pango.modules +++ b/package/pango/files/pango.modules @@ -1,35 +1,18 @@ # Pango Modules file # Automatically generated file, do not edit # -# ModulesPath = /usr/lib/pango/1.6.0/modules +# ModulesPath = /usr/lib/pango/1.8.0/modules # -/usr/lib/pango/1.6.0/modules/pango-arabic-fc.so ArabicScriptEngineFc PangoEngineShape PangoRenderFc arabic:* nko:* -/usr/lib/pango/1.6.0/modules/pango-arabic-lang.so ArabicScriptEngineLang PangoEngineLang PangoRenderNone arabic:* -/usr/lib/pango/1.6.0/modules/pango-basic-fc.so BasicScriptEngineFc PangoEngineShape PangoRenderFc latin:* cyrillic:* greek:* armenian:* georgian:* runic:* ogham:* bopomofo:* cherokee:* coptic:* deseret:* ethiopic:* gothic:* han:* hiragana:* katakana:* old-italic:* canadian-aboriginal:* yi:* braille:* cypriot:* limbu:* osmanya:* shavian:* linear-b:* ugaritic:* glagolitic:* cuneiform:* phoenician:* common: -/usr/lib/pango/1.6.0/modules/pango-basic-x.so BasicScriptEngineX PangoEngineShape PangoRenderX common: -/usr/lib/pango/1.6.0/modules/pango-hangul-fc.so HangulScriptEngineFc PangoEngineShape PangoRenderFc hangul:* -/usr/lib/pango/1.6.0/modules/pango-hebrew-fc.so HebrewScriptEngineFc PangoEngineShape PangoRenderFc hebrew:* -/usr/lib/pango/1.6.0/modules/pango-indic-fc.so devaScriptEngineFc PangoEngineShape PangoRenderFc devanagari:* -/usr/lib/pango/1.6.0/modules/pango-indic-fc.so bengScriptEngineFc PangoEngineShape PangoRenderFc bengali:* -/usr/lib/pango/1.6.0/modules/pango-indic-fc.so guruScriptEngineFc PangoEngineShape PangoRenderFc gurmukhi:* -/usr/lib/pango/1.6.0/modules/pango-indic-fc.so gujrScriptEngineFc PangoEngineShape PangoRenderFc gujarati:* -/usr/lib/pango/1.6.0/modules/pango-indic-fc.so oryaScriptEngineFc PangoEngineShape PangoRenderFc oriya:* -/usr/lib/pango/1.6.0/modules/pango-indic-fc.so tamlScriptEngineFc PangoEngineShape PangoRenderFc tamil:* -/usr/lib/pango/1.6.0/modules/pango-indic-fc.so teluScriptEngineFc PangoEngineShape PangoRenderFc telugu:* -/usr/lib/pango/1.6.0/modules/pango-indic-fc.so kndaScriptEngineFc PangoEngineShape PangoRenderFc kannada:* -/usr/lib/pango/1.6.0/modules/pango-indic-fc.so mlymScriptEngineFc PangoEngineShape PangoRenderFc malayalam:* -/usr/lib/pango/1.6.0/modules/pango-indic-fc.so sinhScriptEngineFc PangoEngineShape PangoRenderFc sinhala:* -/usr/lib/pango/1.6.0/modules/pango-indic-lang.so devaIndicScriptEngineLang PangoEngineLang PangoRenderNone devanagari:* -/usr/lib/pango/1.6.0/modules/pango-indic-lang.so bengIndicScriptEngineLang PangoEngineLang PangoRenderNone bengali:* -/usr/lib/pango/1.6.0/modules/pango-indic-lang.so guruIndicScriptEngineLang PangoEngineLang PangoRenderNone gurmukhi:* -/usr/lib/pango/1.6.0/modules/pango-indic-lang.so gujrIndicScriptEngineLang PangoEngineLang PangoRenderNone gujarati:* -/usr/lib/pango/1.6.0/modules/pango-indic-lang.so oryaIndicScriptEngineLang PangoEngineLang PangoRenderNone oriya:* -/usr/lib/pango/1.6.0/modules/pango-indic-lang.so tamlIndicScriptEngineLang PangoEngineLang PangoRenderNone tamil:* -/usr/lib/pango/1.6.0/modules/pango-indic-lang.so teluIndicScriptEngineLang PangoEngineLang PangoRenderNone telugu:* -/usr/lib/pango/1.6.0/modules/pango-indic-lang.so kndaIndicScriptEngineLang PangoEngineLang PangoRenderNone kannada:* -/usr/lib/pango/1.6.0/modules/pango-indic-lang.so mlymIndicScriptEngineLang PangoEngineLang PangoRenderNone malayalam:* -/usr/lib/pango/1.6.0/modules/pango-indic-lang.so sinhIndicScriptEngineLang PangoEngineLang PangoRenderNone sinhala:* -/usr/lib/pango/1.6.0/modules/pango-khmer-fc.so KhmerScriptEngineFc PangoEngineShape PangoRenderFc khmer:* -/usr/lib/pango/1.6.0/modules/pango-syriac-fc.so SyriacScriptEngineFc PangoEngineShape PangoRenderFc syriac:* -/usr/lib/pango/1.6.0/modules/pango-thai-fc.so ThaiScriptEngineFc PangoEngineShape PangoRenderFc thai:* lao:* -/usr/lib/pango/1.6.0/modules/pango-tibetan-fc.so TibetanScriptEngineFc PangoEngineShape PangoRenderFc tibetan:* +/usr/lib/pango/1.8.0/modules/pango-arabic-lang.so ArabicScriptEngineLang PangoEngineLang PangoRenderNone arabic:* +/usr/lib/pango/1.8.0/modules/pango-basic-fc.so BasicScriptEngineFc PangoEngineShape PangoRenderFc common: +/usr/lib/pango/1.8.0/modules/pango-indic-lang.so devaIndicScriptEngineLang PangoEngineLang PangoRenderNone devanagari:* +/usr/lib/pango/1.8.0/modules/pango-indic-lang.so bengIndicScriptEngineLang PangoEngineLang PangoRenderNone bengali:* +/usr/lib/pango/1.8.0/modules/pango-indic-lang.so guruIndicScriptEngineLang PangoEngineLang PangoRenderNone gurmukhi:* +/usr/lib/pango/1.8.0/modules/pango-indic-lang.so gujrIndicScriptEngineLang PangoEngineLang PangoRenderNone gujarati:* +/usr/lib/pango/1.8.0/modules/pango-indic-lang.so oryaIndicScriptEngineLang PangoEngineLang PangoRenderNone oriya:* +/usr/lib/pango/1.8.0/modules/pango-indic-lang.so tamlIndicScriptEngineLang PangoEngineLang PangoRenderNone tamil:* +/usr/lib/pango/1.8.0/modules/pango-indic-lang.so teluIndicScriptEngineLang PangoEngineLang PangoRenderNone telugu:* +/usr/lib/pango/1.8.0/modules/pango-indic-lang.so kndaIndicScriptEngineLang PangoEngineLang PangoRenderNone kannada:* +/usr/lib/pango/1.8.0/modules/pango-indic-lang.so mlymIndicScriptEngineLang PangoEngineLang PangoRenderNone malayalam:* +/usr/lib/pango/1.8.0/modules/pango-indic-lang.so sinhIndicScriptEngineLang PangoEngineLang PangoRenderNone sinhala:* + -- cgit v1.2.3