From 0bb5fc8aa71229f77bb0c0c6b637aaa284243d8f Mon Sep 17 00:00:00 2001 From: Matthieu CRAPET Date: Mon, 19 May 2014 13:27:05 +0200 Subject: [PATCH] open-vcdiff: update to 0.8.4 wget is ignoring "Content-Disposition" http header, that's why I've added 'downloadfilename' in SRC_URI. Note: Googlecode discarded their download section and moved to Googledrive. http://google-opensource.blogspot.fr/2013/05/a-change-to-google-code-download-service.html (From meta-openembedded rev: 8fed52de716dabde6cc9cdac9eef4d73a49d437a) Signed-off-by: Matthieu Crapet Signed-off-by: Martin Jansa Signed-off-by: Patrick Ohly --- .../open-vcdiff/files/aclocal-amflags-fix.patch | 33 ---------------------- .../{open-vcdiff_0.8.3.bb => open-vcdiff_0.8.4.bb} | 9 +++--- 2 files changed, 4 insertions(+), 38 deletions(-) delete mode 100644 meta-openembedded/meta-oe/recipes-support/open-vcdiff/files/aclocal-amflags-fix.patch rename meta-openembedded/meta-oe/recipes-support/open-vcdiff/{open-vcdiff_0.8.3.bb => open-vcdiff_0.8.4.bb} (63%) diff --git a/meta-openembedded/meta-oe/recipes-support/open-vcdiff/files/aclocal-amflags-fix.patch b/meta-openembedded/meta-oe/recipes-support/open-vcdiff/files/aclocal-amflags-fix.patch deleted file mode 100644 index cd1efd7..0000000 --- a/meta-openembedded/meta-oe/recipes-support/open-vcdiff/files/aclocal-amflags-fix.patch +++ /dev/null @@ -1,33 +0,0 @@ -Fix this error: - -| aclocal: error: non-option arguments are not accepted: '\'. - -Starting from commit v1.11-662-g52246cc, when given non-option arguments, aclocal rejects them, instead of silently ignoring them. - -Declare ACLOCAL_AMFLAGS as a single line because autoreconf can't handle multiline. - -Notice that ACLOCAL_AMFLAGS is deprecated. -In configure.ac, AC_CONFIG_MACRO_DIRS should be used (instead of AC_CONFIG_MACRO_DIR) but requires automake 1.13+. - -Signed-off-by: Matthieu Crapet ---- - Makefile.am | 3 +-- - 1 file changed, 1 insertion(+), 2 deletions(-) - -diff --git a/Makefile.am b/Makefile.am -index 5c765c7..f4295a6 100644 ---- a/Makefile.am -+++ b/Makefile.am -@@ -1,8 +1,7 @@ - ## Process this file with automake to produce Makefile.in - - # Make sure that when we re-make ./configure, we get the macros we need --ACLOCAL_AMFLAGS = -I m4 \ -- -I gflags/m4 -+ACLOCAL_AMFLAGS = -I m4 -I gflags/m4 - - # This is so we can #include or - AM_CPPFLAGS = -I$(top_srcdir)/src \ --- -1.8.5.4 - diff --git a/meta-openembedded/meta-oe/recipes-support/open-vcdiff/open-vcdiff_0.8.3.bb b/meta-openembedded/meta-oe/recipes-support/open-vcdiff/open-vcdiff_0.8.4.bb similarity index 63% rename from meta-openembedded/meta-oe/recipes-support/open-vcdiff/open-vcdiff_0.8.3.bb rename to meta-openembedded/meta-oe/recipes-support/open-vcdiff/open-vcdiff_0.8.4.bb index c6af25d..e6942d0 100644 --- a/meta-openembedded/meta-oe/recipes-support/open-vcdiff/open-vcdiff_0.8.3.bb +++ b/meta-openembedded/meta-oe/recipes-support/open-vcdiff/open-vcdiff_0.8.4.bb @@ -9,11 +9,10 @@ HOMEPAGE = "http://code.google.com/p/open-vcdiff/" SECTION = "console/utils" LICENSE = "Apache-2.0" -LIC_FILES_CHKSUM = "file://COPYING;md5=b2c8309843bc5297cfb4dc84f43f3ccc" +LIC_FILES_CHKSUM = "file://COPYING;md5=ff820d4ddc1ba05b6fd37b41a21506f9" -SRC_URI = "http://open-vcdiff.googlecode.com/files/${BPN}-${PV}.tar.gz \ - file://aclocal-amflags-fix.patch" -SRC_URI[md5sum] = "5f848e4916b407879f55e0ca74c3f6af" -SRC_URI[sha256sum] = "b7e47db78866082e9e8b5782f5491092c8414f0acc0440aea03b14c7d1d3c371" +SRC_URI = "https://drive.google.com/uc?id=0B5WpIi2fQU1aNGJwVE9hUjU5clU&export=download;downloadfilename=${BP}.tar.gz" +SRC_URI[md5sum] = "5c0d378d907bebc38b51c3d7e4117011" +SRC_URI[sha256sum] = "2b142b1027fb0a62c41347600e01a53fa274dad15445a7da48083c830c3138b3" inherit autotools -- 2.7.4