Patchwork [11/13] makedepend: upgrade to 1.0.5

login
register
mail settings
Submitter Laurentiu Palcu
Date July 31, 2013, 1:09 p.m.
Message ID <e6cfe16293d346aa034c7d13202a99a03b90e9bf.1375275560.git.laurentiu.palcu@intel.com>
Download mbox | patch
Permalink /patch/54853/
State Accepted
Commit d4e26f999490886c50587a6ce002181d3cac266c
Headers show

Comments

Laurentiu Palcu - July 31, 2013, 1:09 p.m.
Removed patch since it included upstream.

Signed-off-by: Laurentiu Palcu <laurentiu.palcu@intel.com>
---
 .../obsolete_automake_macros.patch                 |   15 ---------------
 .../{makedepend_1.0.4.bb => makedepend_1.0.5.bb}   |    7 ++-----
 2 files changed, 2 insertions(+), 20 deletions(-)
 delete mode 100644 meta/recipes-graphics/xorg-util/makedepend-1.0.4/obsolete_automake_macros.patch
 rename meta/recipes-graphics/xorg-util/{makedepend_1.0.4.bb => makedepend_1.0.5.bb} (76%)

Patch

diff --git a/meta/recipes-graphics/xorg-util/makedepend-1.0.4/obsolete_automake_macros.patch b/meta/recipes-graphics/xorg-util/makedepend-1.0.4/obsolete_automake_macros.patch
deleted file mode 100644
index 1356f8d..0000000
--- a/meta/recipes-graphics/xorg-util/makedepend-1.0.4/obsolete_automake_macros.patch
+++ /dev/null
@@ -1,15 +0,0 @@ 
-Upstream-Status: Accepted [https://bugs.freedesktop.org/show_bug.cgi?id=59005]
-
-Signed-off-by: Marko Lindqvist <cazfi74@gmail.com>
-diff -Nurd makedepend-1.0.4/configure.ac makedepend-1.0.4/configure.ac
---- makedepend-1.0.4/configure.ac	2012-03-08 07:54:20.000000000 +0200
-+++ makedepend-1.0.4/configure.ac	2013-01-02 16:28:21.920132502 +0200
-@@ -2,7 +2,7 @@
- AC_INIT([makedepend], [1.0.4],
-         [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg])
- AM_INIT_AUTOMAKE([foreign dist-bzip2])
--AM_CONFIG_HEADER([makedepend-config.h])
-+AC_CONFIG_HEADERS([makedepend-config.h])
-
- # Require X.Org macros 1.8 or later for MAN_SUBSTS set by XORG_MANPAGE_SECTIONS
- m4_ifndef([XORG_MACROS_VERSION],
diff --git a/meta/recipes-graphics/xorg-util/makedepend_1.0.4.bb b/meta/recipes-graphics/xorg-util/makedepend_1.0.5.bb
similarity index 76%
rename from meta/recipes-graphics/xorg-util/makedepend_1.0.4.bb
rename to meta/recipes-graphics/xorg-util/makedepend_1.0.5.bb
index 899391d..84a967a 100644
--- a/meta/recipes-graphics/xorg-util/makedepend_1.0.4.bb
+++ b/meta/recipes-graphics/xorg-util/makedepend_1.0.5.bb
@@ -11,14 +11,11 @@  can reference files having other #include directives, and parsing will \
 occur in these files as well."
 
 DEPENDS = "xproto util-macros"
-PR = "r1"
 PE = "1"
 
 BBCLASSEXTEND = "native"
 
 LIC_FILES_CHKSUM = "file://COPYING;md5=43a6eda34b48ee821b3b66f4f753ce4f"
 
-SRC_URI += "file://obsolete_automake_macros.patch"
-
-SRC_URI[md5sum] = "bf1c54028427829c9c3193bef710dbee"
-SRC_URI[sha256sum] = "f53b8ce5dec02a05f8994036a8ebac485a96324143ff2382e29578fdc096b04f"
+SRC_URI[md5sum] = "efb2d7c7e22840947863efaedc175747"
+SRC_URI[sha256sum] = "503903d41fb5badb73cb70d7b3740c8b30fe1cc68c504d3b6a85e6644c4e5004"