summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWaldemar Brodkorb <wbx@openadk.org>2011-04-03 16:32:50 +0200
committerWaldemar Brodkorb <wbx@openadk.org>2011-04-03 16:32:50 +0200
commit806cefae6dd3c23390e422277ee8068bf29c2fbd (patch)
treed6f037478119f160fb16d9858918cc4435a7dcc8
parent8052cea0c74434ce592a2b888e97d685d76b127f (diff)
update to latest upstream version
-rw-r--r--package/dbus/Makefile4
-rw-r--r--package/dbus/patches/patch-configure22
-rw-r--r--package/dbus/patches/patch-ltmain_sh39
3 files changed, 2 insertions, 63 deletions
diff --git a/package/dbus/Makefile b/package/dbus/Makefile
index fb4f05b67..1835e5a56 100644
--- a/package/dbus/Makefile
+++ b/package/dbus/Makefile
@@ -4,9 +4,9 @@
include ${TOPDIR}/rules.mk
PKG_NAME:= dbus
-PKG_VERSION:= 1.2.24
+PKG_VERSION:= 1.4.6
PKG_RELEASE:= 1
-PKG_MD5SUM:= 565346cecd9cfecf1463540c6086cc2c
+PKG_MD5SUM:= 99b165f727dd8a5c4b7e2c20a8bf5db6
PKG_DESCR:= DBUS library
PKG_SECTION:= libs
PKG_DEPENDS:= libexpat
diff --git a/package/dbus/patches/patch-configure b/package/dbus/patches/patch-configure
deleted file mode 100644
index 18acacbc8..000000000
--- a/package/dbus/patches/patch-configure
+++ /dev/null
@@ -1,22 +0,0 @@
---- dbus-1.2.24.orig/configure 2010-03-23 20:11:22.000000000 +0100
-+++ dbus-1.2.24/configure 2011-01-14 19:21:37.000000000 +0100
-@@ -25294,19 +25294,6 @@ if test "x$GCC" = "xyes"; then
- ;;
- esac
-
-- case " $CFLAGS " in
-- *[\ \ ]-fPIE[\ \ ]*) ;;
-- *) if cc_supports_flag -fPIE; then
-- PIE_CFLAGS="-fPIE"
-- if ld_supports_flag -z,relro; then
-- PIE_LDFLAGS="-pie -Wl,-z,relro"
-- else
-- PIE_LDFLAGS="-pie"
-- fi
-- fi
-- ;;
-- esac
--
- ### Disabled warnings, and compiler flag overrides
-
- # Let's just ignore unused for now
diff --git a/package/dbus/patches/patch-ltmain_sh b/package/dbus/patches/patch-ltmain_sh
deleted file mode 100644
index c594b88f2..000000000
--- a/package/dbus/patches/patch-ltmain_sh
+++ /dev/null
@@ -1,39 +0,0 @@
---- dbus-1.2.24.orig/ltmain.sh 2010-03-12 23:22:29.000000000 +0100
-+++ dbus-1.2.24/ltmain.sh 2011-01-14 19:22:39.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"
-@@ -5516,27 +5516,6 @@ func_mode_link ()
- esac
- fi
-
-- # Hardcode the library path.
-- # Skip directories that are in the system default run-time
-- # search path.
-- case " $sys_lib_dlsearch_path " in
-- *" $absdir "*) ;;
-- *)
-- case "$compile_rpath " in
-- *" $absdir "*) ;;
-- *) compile_rpath="$compile_rpath $absdir"
-- esac
-- ;;
-- esac
-- case " $sys_lib_dlsearch_path " in
-- *" $libdir "*) ;;
-- *)
-- case "$finalize_rpath " in
-- *" $libdir "*) ;;
-- *) finalize_rpath="$finalize_rpath $libdir"
-- esac
-- ;;
-- esac
- fi # $linkmode,$pass = prog,link...
-
- if test "$alldeplibs" = yes &&