summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--package/dillo/Makefile7
-rw-r--r--package/dillo/patches/patch-configure20
-rw-r--r--package/e2fsprogs/Makefile4
-rw-r--r--package/glib/Makefile11
-rw-r--r--package/glib/patches/patch-gio_Makefile_in47
-rw-r--r--package/glib/patches/patch-gio_gdbus-2_0_codegen_config_py9
-rw-r--r--package/glib/patches/patch-glib_gatomic_c10
-rw-r--r--package/glib/patches/patch-glib_gconvert_c16
-rw-r--r--package/glib/patches/patch-ltmain_sh6
-rw-r--r--package/glibc/Makefile20
-rw-r--r--package/libtool/Makefile4
-rw-r--r--package/libtool/patches/patch-configure149
12 files changed, 97 insertions, 206 deletions
diff --git a/package/dillo/Makefile b/package/dillo/Makefile
index fd30af5c2..42e806fc8 100644
--- a/package/dillo/Makefile
+++ b/package/dillo/Makefile
@@ -4,9 +4,9 @@
include $(TOPDIR)/rules.mk
PKG_NAME:= dillo
-PKG_VERSION:= 3.0
+PKG_VERSION:= 3.0.2
PKG_RELEASE:= 1
-PKG_MD5SUM:= 448f44a923222270cb0c84e55adc1be1
+PKG_MD5SUM:= 81b82112cefcc7d54fe2972a21f42930
PKG_DESCR:= small graphical web browser
PKG_SECTION:= x11/apps
PKG_DEPENDS:= libfltk libxi libiconv libpng zlib libjpeg
@@ -25,7 +25,8 @@ include $(TOPDIR)/mk/package.mk
$(eval $(call PKG_template,DILLO,$(PKG_NAME),$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
-TARGET_LDFLAGS+= -liconv -lpng
+TARGET_LDFLAGS+= -liconv -lpng15
+CONFIGURE_ARGS+= --disable-xft
post-install:
$(INSTALL_DIR) $(IDIR_DILLO)/usr/bin
diff --git a/package/dillo/patches/patch-configure b/package/dillo/patches/patch-configure
new file mode 100644
index 000000000..6cf0ffc92
--- /dev/null
+++ b/package/dillo/patches/patch-configure
@@ -0,0 +1,20 @@
+--- dillo-3.0.2.orig/configure 2011-11-30 12:08:21.000000000 +0100
++++ dillo-3.0.2/configure 2012-09-22 19:06:27.000000000 +0200
+@@ -5690,7 +5690,7 @@ if test "x$enable_png" = "xyes"; then
+ $as_echo_n "checking for libpng-config... " >&6; }
+
+ if test -z "$PNG_CONFIG"; then
+- PNG_CONFIG=`which libpng14-config`
++ PNG_CONFIG=`which libpng-config`
+ if test -z "$PNG_CONFIG"; then
+ PNG_CONFIG=`which libpng12-config`
+ fi
+@@ -5717,7 +5717,7 @@ $as_echo "missing" >&6; }
+ $as_echo_n "checking for libpng version... " >&6; }
+ png_version=`$PNG_CONFIG --version`
+ case $png_version in
+- 1.4.*) { $as_echo "$as_me:${as_lineno-$LINENO}: result: $png_version (newer version)" >&5
++ 1.5.*) { $as_echo "$as_me:${as_lineno-$LINENO}: result: $png_version (newer version)" >&5
+ $as_echo "$png_version (newer version)" >&6; } ;;
+ 1.2.*) { $as_echo "$as_me:${as_lineno-$LINENO}: result: $png_version (newer version)" >&5
+ $as_echo "$png_version (newer version)" >&6; } ;;
diff --git a/package/e2fsprogs/Makefile b/package/e2fsprogs/Makefile
index 0d855ac99..0d88b11fc 100644
--- a/package/e2fsprogs/Makefile
+++ b/package/e2fsprogs/Makefile
@@ -4,9 +4,9 @@
include ${TOPDIR}/rules.mk
PKG_NAME:= e2fsprogs
-PKG_VERSION:= 1.42.4
+PKG_VERSION:= 1.42.5
PKG_RELEASE:= 1
-PKG_MD5SUM:= b6e296f210d642361b7394437ff0f318
+PKG_MD5SUM:= aca828bb4bcca20991a442deb950b670
PKG_DESCR:= Ext2/3/4 filesystem utilities
PKG_SECTION:= fs
PKG_DEPENDS:= libcom-err libuuid libblkid libpthread
diff --git a/package/glib/Makefile b/package/glib/Makefile
index 3afdc4e13..81874a534 100644
--- a/package/glib/Makefile
+++ b/package/glib/Makefile
@@ -4,16 +4,19 @@
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.33.14
+PKG_EXTRAVER:= 2.33
+PKG_RELEASE:= 1
+PKG_MD5SUM:= 294304bc64a3e22b9278f49c04530aaa
PKG_DESCR:= low-level core library that forms the basis of GTK+
PKG_SECTION:= libs
PKG_DEPENDS:= libintl libiconv libpthread
PKG_BUILDDEP:= gettext libiconv dbus
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
PKG_SUBPKGS:= GLIB GLIB_DEV
PKGSC_GLIB_DEV:= devel
diff --git a/package/glib/patches/patch-gio_Makefile_in b/package/glib/patches/patch-gio_Makefile_in
new file mode 100644
index 000000000..9132e4b29
--- /dev/null
+++ b/package/glib/patches/patch-gio_Makefile_in
@@ -0,0 +1,47 @@
+--- glib-2.33.14.orig/gio/Makefile.in 2012-09-17 23:50:14.000000000 +0200
++++ glib-2.33.14/gio/Makefile.in 2012-09-23 11:49:44.000000000 +0200
+@@ -430,7 +430,7 @@ am_glib_compile_resources_OBJECTS = gvdb
+ glib-compile-resources.$(OBJEXT)
+ glib_compile_resources_OBJECTS = $(am_glib_compile_resources_OBJECTS)
+ glib_compile_resources_DEPENDENCIES = \
+- $(top_builddir)/glib/libglib-2.0.la \
++ $(top_builddir)/glib/libglib-2.0.la $(top_builddir)/gthread/libgthread-2.0.la $(top_builddir)/gmodule/libgmodule-2.0.la \
+ $(top_builddir)/gobject/libgobject-2.0.la libgio-2.0.la
+ am_glib_compile_schemas_OBJECTS = gvdb-builder.$(OBJEXT) \
+ glib-compile-schemas.$(OBJEXT)
+@@ -1277,6 +1277,8 @@ BUILT_EXTRA_DIST = \
+ CLEANFILES = gdbus-daemon-generated.c gdbus-daemon-generated.h gio-public-headers.txt gconstructor_as_data.h
+ glib_compile_resources_LDADD = \
+ $(top_builddir)/glib/libglib-2.0.la \
++ $(top_builddir)/gthread/libgthread-2.0.la \
++ $(top_builddir)/gmodule/libgmodule-2.0.la \
+ $(top_builddir)/gobject/libgobject-2.0.la \
+ libgio-2.0.la
+
+@@ -1304,6 +1306,8 @@ glib_compile_schemas_SOURCES = \
+
+ gsettings_LDADD = \
+ $(top_builddir)/glib/libglib-2.0.la \
++ $(top_builddir)/gthread/libgthread-2.0.la \
++ $(top_builddir)/gmodule/libgmodule-2.0.la \
+ $(top_builddir)/gobject/libgobject-2.0.la \
+ libgio-2.0.la
+
+@@ -1313,6 +1317,8 @@ dist_schema_DATA = gschema.dtd
+ gdbus_SOURCES = gdbus-tool.c
+ gdbus_LDADD = libgio-2.0.la \
+ $(top_builddir)/glib/libglib-2.0.la \
++ $(top_builddir)/gthread/libgthread-2.0.la \
++ $(top_builddir)/gmodule/libgmodule-2.0.la \
+ $(top_builddir)/gobject/libgobject-2.0.la
+
+ completiondir = $(datadir)/bash-completion/completions
+@@ -1325,6 +1331,8 @@ gresource_SOURCES = gresource-tool.c
+ gresource_CPPFLAGS = $(LIBELF_CFLAGS) $(AM_CPPFLAGS)
+ gresource_LDADD = libgio-2.0.la \
+ $(top_builddir)/glib/libglib-2.0.la \
++ $(top_builddir)/gthread/libgthread-2.0.la \
++ $(top_builddir)/gmodule/libgmodule-2.0.la \
+ $(top_builddir)/gobject/libgobject-2.0.la \
+ $(LIBELF_LIBS)
+
diff --git a/package/glib/patches/patch-gio_gdbus-2_0_codegen_config_py b/package/glib/patches/patch-gio_gdbus-2_0_codegen_config_py
new file mode 100644
index 000000000..d9642d91e
--- /dev/null
+++ b/package/glib/patches/patch-gio_gdbus-2_0_codegen_config_py
@@ -0,0 +1,9 @@
+--- glib-2.33.14.orig/gio/gdbus-2.0/codegen/config.py 2012-09-17 23:50:37.000000000 +0200
++++ glib-2.33.14/gio/gdbus-2.0/codegen/config.py 2012-09-23 11:08:10.000000000 +0200
+@@ -23,5 +23,5 @@
+
+ DATADIR = "${prefix}/share"
+ DATADIR = DATADIR.replace(
+- "${prefix}", "/usr/local")
++ "${prefix}", "/usr")
+ VERSION = "2.33.14"
diff --git a/package/glib/patches/patch-glib_gatomic_c b/package/glib/patches/patch-glib_gatomic_c
deleted file mode 100644
index 42d41196b..000000000
--- a/package/glib/patches/patch-glib_gatomic_c
+++ /dev/null
@@ -1,10 +0,0 @@
---- glib-2.27.5.orig/glib/gatomic.c 2010-09-05 06:20:56.000000000 +0200
-+++ glib-2.27.5/glib/gatomic.c 2011-02-18 20:52:37.703561782 +0100
-@@ -882,6 +882,7 @@ g_atomic_pointer_compare_and_exchange (v
-
- #ifdef DEFINE_WITH_MUTEXES
- /* We have to use the slow, but safe locking method */
-+#include "gthread.h"
- static GMutex *g_atomic_mutex;
-
- /**
diff --git a/package/glib/patches/patch-glib_gconvert_c b/package/glib/patches/patch-glib_gconvert_c
deleted file mode 100644
index bd9db0404..000000000
--- a/package/glib/patches/patch-glib_gconvert_c
+++ /dev/null
@@ -1,16 +0,0 @@
---- glib-2.27.5.orig/glib/gconvert.c 2010-09-13 15:40:53.000000000 +0200
-+++ glib-2.27.5/glib/gconvert.c 2011-01-14 17:17:40.000000000 +0100
-@@ -58,13 +58,6 @@
-
- #include "glibintl.h"
-
--#if defined(USE_LIBICONV_GNU) && !defined (_LIBICONV_H)
--#error GNU libiconv in use but included iconv.h not from libiconv
--#endif
--#if !defined(USE_LIBICONV_GNU) && defined (_LIBICONV_H)
--#error GNU libiconv not in use but included iconv.h is from libiconv
--#endif
--
-
- /**
- * SECTION:conversions
diff --git a/package/glib/patches/patch-ltmain_sh b/package/glib/patches/patch-ltmain_sh
index 559afa25c..16078c020 100644
--- a/package/glib/patches/patch-ltmain_sh
+++ b/package/glib/patches/patch-ltmain_sh
@@ -1,6 +1,6 @@
---- glib-2.27.5.orig/ltmain.sh 2010-12-06 15:06:25.000000000 +0100
-+++ glib-2.27.5/ltmain.sh 2011-01-14 17:22:21.000000000 +0100
-@@ -5840,7 +5840,7 @@ func_mode_link ()
+--- glib-2.33.14.orig/ltmain.sh 2012-09-17 23:25:27.000000000 +0200
++++ glib-2.33.14/ltmain.sh 2012-09-23 11:07:23.000000000 +0200
+@@ -5853,7 +5853,7 @@ func_mode_link ()
# -O*, -flto*, -fwhopr*, -fuse-linker-plugin GCC link-time optimization
-64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*| \
-t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*|-tp=*|--sysroot=*| \
diff --git a/package/glibc/Makefile b/package/glibc/Makefile
index 1b05d0886..91ebc1f77 100644
--- a/package/glibc/Makefile
+++ b/package/glibc/Makefile
@@ -23,6 +23,7 @@ $(eval $(call PKG_template,GLIBC_DEV,glibc-dev,$(PKG_VERSION)-${PKG_RELEASE},${P
TARGET_CFLAGS:= $(filter-out -fstack-protector,$(TARGET_CFLAGS))
TARGET_CFLAGS:= $(filter-out -flto,$(TARGET_CFLAGS))
+XAKE_FLAGS+= GCC_HONOUR_COPTS=s
CONFIG_STYLE:= manual
BUILD_STYLE:= manual
@@ -30,23 +31,7 @@ INSTALL_STYLE:= manual
# compile nothing, glibc is already build in toolchain directory
do-install:
- ${INSTALL_DIR} $(IDIR_GLIBC)/lib $(IDIR_GLIBC)/etc
- #cd ${STAGING_TARGET_DIR} && for f in UTC ${ADK_RUNTIME_TIMEZONE}; do \
- # test -s usr/share/zoneinfo/"$$f" || continue; \
- # echo usr/share/zoneinfo/"$$f" | \
- # ${TOOLS_DIR}/cpio -pdu ${IDIR_GLIBC}/; \
- #done
- #tz=; cd ${IDIR_GLIBC}/usr/share/zoneinfo || exit 1; \
- # for f in UTC ${ADK_RUNTIME_TIMEZONE}; do \
- # test -s "$$f" || continue; \
- # tz=$$f; \
- #done; if test x"$$tz" = x""; then \
- # echo >&2 Error during timezone installation; \
- # exit 1; \
- #else \
- # ln -sf "../usr/share/zoneinfo/$$tz" \
- # ${IDIR_GLIBC}/etc/localtime; \
- #fi
+ ${INSTALL_DIR} ${IDIR_GLIBC}/lib ${IDIR_GLIBC}/etc
${CP} ${STAGING_TARGET_DIR}/etc/gai.conf ${IDIR_GLIBC}/etc
${CP} ${STAGING_TARGET_DIR}/etc/nscd.conf ${IDIR_GLIBC}/etc
${CP} ${STAGING_TARGET_DIR}/etc/nsswitch.conf ${IDIR_GLIBC}/etc
@@ -76,6 +61,7 @@ glibc-dev-install:
headers_install
(cd $(WRKBUILD); \
$(GLIBC_ENV) \
+ GCC_HONOUR_COPTS=s \
$(TOOLCHAIN_BUILD_DIR)/w-$(PKG_NAME)-$(PKG_VERSION)-$(PKG_RELEASE)/$(PKG_NAME)-$(PKG_VERSION)/configure \
--prefix=$(IDIR_GLIBC_DEV)/usr \
--with-sysroot=$(IDIR_GLIBC_DEV) \
diff --git a/package/libtool/Makefile b/package/libtool/Makefile
index 940cf91a3..83eae4e0b 100644
--- a/package/libtool/Makefile
+++ b/package/libtool/Makefile
@@ -4,9 +4,9 @@
include ${TOPDIR}/rules.mk
PKG_NAME:= libtool
-PKG_VERSION:= 2.4
+PKG_VERSION:= 2.4.2
PKG_RELEASE:= 1
-PKG_MD5SUM:= b32b04148ecdd7344abc6fe8bd1bb021
+PKG_MD5SUM:= d2f3b7d4627e69e13514a40e72a24d50
PKG_DESCR:= a generic dynamic object loading library
PKG_SECTION:= lang
PKG_URL:= http://www.gnu.org/software/libtool/
diff --git a/package/libtool/patches/patch-configure b/package/libtool/patches/patch-configure
deleted file mode 100644
index 16d6fe958..000000000
--- a/package/libtool/patches/patch-configure
+++ /dev/null
@@ -1,149 +0,0 @@
---- libtool-2.4.orig/configure 2010-09-22 16:44:17.000000000 +0200
-+++ libtool-2.4/configure 2011-02-18 13:44:57.000000000 +0100
-@@ -13473,135 +13473,6 @@ func_stripname_cnf ()
- esac
- } # func_stripname_cnf
-
-- if test -n "$CXX" && ( test "X$CXX" != "Xno" &&
-- ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) ||
-- (test "X$CXX" != "Xg++"))) ; then
-- ac_ext=cpp
--ac_cpp='$CXXCPP $CPPFLAGS'
--ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
--ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
--ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
--{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to run the C++ preprocessor" >&5
--$as_echo_n "checking how to run the C++ preprocessor... " >&6; }
--if test -z "$CXXCPP"; then
-- if test "${ac_cv_prog_CXXCPP+set}" = set; then :
-- $as_echo_n "(cached) " >&6
--else
-- # Double quotes because CXXCPP needs to be expanded
-- for CXXCPP in "$CXX -E" "/lib/cpp"
-- do
-- ac_preproc_ok=false
--for ac_cxx_preproc_warn_flag in '' yes
--do
-- # Use a header file that comes with gcc, so configuring glibc
-- # with a fresh cross-compiler works.
-- # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-- # <limits.h> exists even on freestanding compilers.
-- # On the NeXT, cc -E runs the code through the compiler's parser,
-- # not just through cpp. "Syntax error" is here to catch this case.
-- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
--/* end confdefs.h. */
--#ifdef __STDC__
--# include <limits.h>
--#else
--# include <assert.h>
--#endif
-- Syntax error
--_ACEOF
--if ac_fn_cxx_try_cpp "$LINENO"; then :
--
--else
-- # Broken: fails on valid input.
--continue
--fi
--rm -f conftest.err conftest.i conftest.$ac_ext
--
-- # OK, works on sane cases. Now check whether nonexistent headers
-- # can be detected and how.
-- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
--/* end confdefs.h. */
--#include <ac_nonexistent.h>
--_ACEOF
--if ac_fn_cxx_try_cpp "$LINENO"; then :
-- # Broken: success on invalid input.
--continue
--else
-- # Passes both tests.
--ac_preproc_ok=:
--break
--fi
--rm -f conftest.err conftest.i conftest.$ac_ext
--
--done
--# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
--rm -f conftest.i conftest.err conftest.$ac_ext
--if $ac_preproc_ok; then :
-- break
--fi
--
-- done
-- ac_cv_prog_CXXCPP=$CXXCPP
--
--fi
-- CXXCPP=$ac_cv_prog_CXXCPP
--else
-- ac_cv_prog_CXXCPP=$CXXCPP
--fi
--{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $CXXCPP" >&5
--$as_echo "$CXXCPP" >&6; }
--ac_preproc_ok=false
--for ac_cxx_preproc_warn_flag in '' yes
--do
-- # Use a header file that comes with gcc, so configuring glibc
-- # with a fresh cross-compiler works.
-- # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-- # <limits.h> exists even on freestanding compilers.
-- # On the NeXT, cc -E runs the code through the compiler's parser,
-- # not just through cpp. "Syntax error" is here to catch this case.
-- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
--/* end confdefs.h. */
--#ifdef __STDC__
--# include <limits.h>
--#else
--# include <assert.h>
--#endif
-- Syntax error
--_ACEOF
--if ac_fn_cxx_try_cpp "$LINENO"; then :
--
--else
-- # Broken: fails on valid input.
--continue
--fi
--rm -f conftest.err conftest.i conftest.$ac_ext
--
-- # OK, works on sane cases. Now check whether nonexistent headers
-- # can be detected and how.
-- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
--/* end confdefs.h. */
--#include <ac_nonexistent.h>
--_ACEOF
--if ac_fn_cxx_try_cpp "$LINENO"; then :
-- # Broken: success on invalid input.
--continue
--else
-- # Passes both tests.
--ac_preproc_ok=:
--break
--fi
--rm -f conftest.err conftest.i conftest.$ac_ext
--
--done
--# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
--rm -f conftest.i conftest.err conftest.$ac_ext
--if $ac_preproc_ok; then :
--
--else
-- { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
--$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
--as_fn_error $? "C++ preprocessor \"$CXXCPP\" fails sanity check
--See \`config.log' for more details" "$LINENO" 5; }
--fi
-
- ac_ext=c
- ac_cpp='$CPP $CPPFLAGS'
-@@ -13609,10 +13480,6 @@ ac_compile='$CC -c $CFLAGS $CPPFLAGS con
- ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
- ac_compiler_gnu=$ac_cv_c_compiler_gnu
-
--else
-- _lt_caught_CXX_error=yes
--fi
--
- ac_ext=cpp
- ac_cpp='$CXXCPP $CPPFLAGS'
- ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-23 14:22:17 +0000