[oe] [PATCH][meta-oe 4/8] Revert "gcalctool: move to nonworking"
Martin Jansa
martin.jansa at gmail.com
Tue Oct 6 22:30:38 UTC 2015
* use PNBLACKLIST instead
This reverts commit 84e8fee8b8631138ef52ef3dcf0ab7c8ce2925d0.
Signed-off-by: Martin Jansa <Martin.Jansa at gmail.com>
---
.../gcalctool/gcalctool/fix-includedir.patch | 31 ++++++++++++++++++++++
.../recipes-gnome/gcalctool/gcalctool_5.32.0.bb | 20 ++++++++++++++
.../gcalctool/gcalctool/fix-includedir.patch | 31 ----------------------
.../nonworking/gcalctool/gcalctool_5.32.0.bb | 18 -------------
4 files changed, 51 insertions(+), 49 deletions(-)
create mode 100644 meta-gnome/recipes-gnome/gcalctool/gcalctool/fix-includedir.patch
create mode 100644 meta-gnome/recipes-gnome/gcalctool/gcalctool_5.32.0.bb
delete mode 100644 meta-gnome/recipes-gnome/nonworking/gcalctool/gcalctool/fix-includedir.patch
delete mode 100644 meta-gnome/recipes-gnome/nonworking/gcalctool/gcalctool_5.32.0.bb
diff --git a/meta-gnome/recipes-gnome/gcalctool/gcalctool/fix-includedir.patch b/meta-gnome/recipes-gnome/gcalctool/gcalctool/fix-includedir.patch
new file mode 100644
index 0000000..aeb02ab
--- /dev/null
+++ b/meta-gnome/recipes-gnome/gcalctool/gcalctool/fix-includedir.patch
@@ -0,0 +1,31 @@
+---
+ Makefile.am | 2 +-
+ gcalctool/Makefile.am | 2 --
+ 2 files changed, 1 insertion(+), 3 deletions(-)
+
+Index: gcalctool-5.8.17/gcalctool/Makefile.am
+===================================================================
+--- gcalctool-5.8.17.orig/gcalctool/Makefile.am 2005-12-19 15:46:57.000000000 +0000
++++ gcalctool-5.8.17/gcalctool/Makefile.am 2007-05-16 16:03:26.000000000 +0100
+@@ -1,8 +1,6 @@
+ ## Process this file with automake to produce Makefile.in
+
+ INCLUDES = \
+- -I$(includedir) \
+- -DG_DISABLE_DEPRECATED \
+ -DGDK_PIXBUF_DISABLE_DEPRECATED \
+ -DGDK_DISABLE_DEPRECATED \
+ -DGNOME_DISABLE_DEPRECATED \
+Index: gcalctool-5.8.17/Makefile.am
+===================================================================
+--- gcalctool-5.8.17.orig/Makefile.am 2007-05-16 15:35:44.000000000 +0100
++++ gcalctool-5.8.17/Makefile.am 2007-05-16 16:06:46.000000000 +0100
+@@ -29,7 +29,7 @@ DISTCLEANFILES = \
+ gnome-doc-utils.make \
+ gcalctool.desktop
+
+-SUBDIRS = po gcalctool help
++SUBDIRS = po gcalctool
+
+ SCHEMAS_FILE = gcalctool.schemas
+
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..d391bba
--- /dev/null
+++ b/meta-gnome/recipes-gnome/gcalctool/gcalctool_5.32.0.bb
@@ -0,0 +1,20 @@
+SUMMARY = "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/${BPN}/${SHRT_VER}/${BP}.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
+}
+
+PNBLACKLIST[gcalctool] ?= "broken at least since April 2013 http://permalink.gmane.org/gmane.comp.handhelds.openembedded/57920 and nobody complained, it's also replaced by gnome calculator"
diff --git a/meta-gnome/recipes-gnome/nonworking/gcalctool/gcalctool/fix-includedir.patch b/meta-gnome/recipes-gnome/nonworking/gcalctool/gcalctool/fix-includedir.patch
deleted file mode 100644
index aeb02ab..0000000
--- a/meta-gnome/recipes-gnome/nonworking/gcalctool/gcalctool/fix-includedir.patch
+++ /dev/null
@@ -1,31 +0,0 @@
----
- Makefile.am | 2 +-
- gcalctool/Makefile.am | 2 --
- 2 files changed, 1 insertion(+), 3 deletions(-)
-
-Index: gcalctool-5.8.17/gcalctool/Makefile.am
-===================================================================
---- gcalctool-5.8.17.orig/gcalctool/Makefile.am 2005-12-19 15:46:57.000000000 +0000
-+++ gcalctool-5.8.17/gcalctool/Makefile.am 2007-05-16 16:03:26.000000000 +0100
-@@ -1,8 +1,6 @@
- ## Process this file with automake to produce Makefile.in
-
- INCLUDES = \
-- -I$(includedir) \
-- -DG_DISABLE_DEPRECATED \
- -DGDK_PIXBUF_DISABLE_DEPRECATED \
- -DGDK_DISABLE_DEPRECATED \
- -DGNOME_DISABLE_DEPRECATED \
-Index: gcalctool-5.8.17/Makefile.am
-===================================================================
---- gcalctool-5.8.17.orig/Makefile.am 2007-05-16 15:35:44.000000000 +0100
-+++ gcalctool-5.8.17/Makefile.am 2007-05-16 16:06:46.000000000 +0100
-@@ -29,7 +29,7 @@ DISTCLEANFILES = \
- gnome-doc-utils.make \
- gcalctool.desktop
-
--SUBDIRS = po gcalctool help
-+SUBDIRS = po gcalctool
-
- SCHEMAS_FILE = gcalctool.schemas
-
diff --git a/meta-gnome/recipes-gnome/nonworking/gcalctool/gcalctool_5.32.0.bb b/meta-gnome/recipes-gnome/nonworking/gcalctool/gcalctool_5.32.0.bb
deleted file mode 100644
index 4812fe3..0000000
--- a/meta-gnome/recipes-gnome/nonworking/gcalctool/gcalctool_5.32.0.bb
+++ /dev/null
@@ -1,18 +0,0 @@
-SUMMARY = "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/${BPN}/${SHRT_VER}/${BP}.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
-}
--
2.6.0
More information about the Openembedded-devel
mailing list