Patchwork [90/90] gcalctool: upgrade to 5.32.0

login
register
mail settings
Submitter Martin Jansa
Date Dec. 11, 2012, 1 a.m.
Message ID <f36e2e2ea4edcd4a0e65ed1c213bce388231214c.1355187290.git.Martin.Jansa@gmail.com>
Download mbox | patch
Permalink /patch/40719/
State Accepted
Commit f36e2e2ea4edcd4a0e65ed1c213bce388231214c
Headers show

Comments

Martin Jansa - Dec. 11, 2012, 1 a.m.
* 5.8.17 required scrollkeeper which we don't provide as scrollkeeper-native
* inherit gsettings to package glib-2.0/shemas and compile them on target
* add LICENSE version and LIC_FILES_CHKSUM
* use SHRT_VER
* replace local patch with sed (other chunk is already resolved upstream)

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
 meta-gnome/recipes-gnome/gcalctool/gcalctool_5.32.0.bb | 18 ++++++++++++++++++
 meta-gnome/recipes-gnome/gcalctool/gcalctool_5.8.17.bb | 15 ---------------
 2 files changed, 18 insertions(+), 15 deletions(-)
 create mode 100644 meta-gnome/recipes-gnome/gcalctool/gcalctool_5.32.0.bb
 delete mode 100644 meta-gnome/recipes-gnome/gcalctool/gcalctool_5.8.17.bb

Patch

diff --git a/meta-gnome/recipes-gnome/gcalctool/gcalctool_5.32.0.bb b/meta-gnome/recipes-gnome/gcalctool/gcalctool_5.32.0.bb
new file mode 100644
index 0000000..88cf1d6
--- /dev/null
+++ b/meta-gnome/recipes-gnome/gcalctool/gcalctool_5.32.0.bb
@@ -0,0 +1,18 @@ 
+DESCRIPTION = "gcalctool is a powerful calculator"
+SECTION = "x11"
+DEPENDS = "gtk+ gnome-doc-utils"
+
+LICENSE = "GPL-2.0"
+LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe"
+
+SHRT_VER = "${@d.getVar('PV',1).split('.')[0]}.${@d.getVar('PV',1).split('.')[1]}"
+SRC_URI = "http://download.gnome.org/sources/${PN}/${SHRT_VER}/${PN}-${PV}.tar.gz"
+
+SRC_URI[md5sum] = "48db927c6e7ee1d5395f953a8c184c98"
+SRC_URI[sha256sum] = "346f645c0fdef900642f6e9a2c18e7ba9a7ca9bc62fe2b08eb418f065a425c89"
+
+inherit autotools pkgconfig gsettings
+
+do_configure_prepend() {
+	sed -i -e "s: help: :g" ${S}/Makefile.am
+}
diff --git a/meta-gnome/recipes-gnome/gcalctool/gcalctool_5.8.17.bb b/meta-gnome/recipes-gnome/gcalctool/gcalctool_5.8.17.bb
deleted file mode 100644
index 61b28e4..0000000
--- a/meta-gnome/recipes-gnome/gcalctool/gcalctool_5.8.17.bb
+++ /dev/null
@@ -1,15 +0,0 @@ 
-LICENSE = "GPL"
-SECTION = "x11"
-DEPENDS = "gtk+ gnome-doc-utils"
-DESCRIPTION = "gcalctool is a powerful calculator"
-PR = "r0"
-
-SRC_URI = "http://download.gnome.org/sources/${PN}/5.8/${PN}-${PV}.tar.gz \
-	file://fix-includedir.patch"
-
-SRC_URI[md5sum] = "dd9d4f326d7d925a5ad9fbb1c5b32142"
-SRC_URI[sha256sum] = "8806e7696eeee62f2df21135fc488ba99f7d55dfd2a40bb9615e2edd95391589"
-
-inherit autotools pkgconfig
-
-EXTRA_OECONF = "--disable-gnome"