From 054d7010de72dba8073088bbee3b095ba6cac721 Mon Sep 17 00:00:00 2001 From: Andreas Müller Date: Tue, 30 Apr 2013 17:46:25 +0200 Subject: gnome-terminal: move out of nonworking MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Andreas Müller Signed-off-by: Martin Jansa --- .../30f29e7d8e1b67c40cd18a7155ba30c4382692d5.patch | 20 ++++++++++++++++++++ .../recipes-gnome/gnome/gnome-terminal_2.26.3.bb | 19 +++++++++++++++++++ .../30f29e7d8e1b67c40cd18a7155ba30c4382692d5.patch | 20 -------------------- .../nonworking/gnome/gnome-terminal_2.26.3.bb | 19 ------------------- 4 files changed, 39 insertions(+), 39 deletions(-) create mode 100644 meta-gnome/recipes-gnome/gnome/gnome-terminal/30f29e7d8e1b67c40cd18a7155ba30c4382692d5.patch create mode 100644 meta-gnome/recipes-gnome/gnome/gnome-terminal_2.26.3.bb delete mode 100644 meta-gnome/recipes-gnome/nonworking/gnome/gnome-terminal/30f29e7d8e1b67c40cd18a7155ba30c4382692d5.patch delete mode 100644 meta-gnome/recipes-gnome/nonworking/gnome/gnome-terminal_2.26.3.bb diff --git a/meta-gnome/recipes-gnome/gnome/gnome-terminal/30f29e7d8e1b67c40cd18a7155ba30c4382692d5.patch b/meta-gnome/recipes-gnome/gnome/gnome-terminal/30f29e7d8e1b67c40cd18a7155ba30c4382692d5.patch new file mode 100644 index 0000000000..0358ed8a64 --- /dev/null +++ b/meta-gnome/recipes-gnome/gnome/gnome-terminal/30f29e7d8e1b67c40cd18a7155ba30c4382692d5.patch @@ -0,0 +1,20 @@ +From 30f29e7d8e1b67c40cd18a7155ba30c4382692d5 Mon Sep 17 00:00:00 2001 +From: Seán de Búrca +Date: Fri, 07 Aug 2009 00:38:52 +0000 +Subject: Remove useless Plural-Forms line which breaks build with gnome-doc-utils master + +--- +diff --git a/help/el/el.po b/help/el/el.po +index ab77264..635b68f 100644 +--- a/help/el/el.po ++++ b/help/el/el.po +@@ -10,7 +10,6 @@ msgstr "" + "MIME-Version: 1.0\n" + "Content-Type: text/plain; charset=UTF-8\n" + "Content-Transfer-Encoding: 8bit\n" +-"Plural-Forms: 2\n" + "X-Poedit-Language: Greek\n" + "X-Poedit-Country: GREECE\n" + "X-Generator: Lokalize 0.2\n" +-- +cgit v0.8.3.1 diff --git a/meta-gnome/recipes-gnome/gnome/gnome-terminal_2.26.3.bb b/meta-gnome/recipes-gnome/gnome/gnome-terminal_2.26.3.bb new file mode 100644 index 0000000000..9bf6b6de59 --- /dev/null +++ b/meta-gnome/recipes-gnome/gnome/gnome-terminal_2.26.3.bb @@ -0,0 +1,19 @@ +DESCRIPTION = "GNOME Terminal" +LICENSE = "GPL-2.0" +LIC_FILES_CHKSUM = "file://COPYING;md5=5b51eba4ba4cafe64073227530c061ed" +DEPENDS = "gtk+ glib-2.0 startup-notification dbus-glib vte" +PR = "r2" + +inherit gnome + +SRC_URI += "file://30f29e7d8e1b67c40cd18a7155ba30c4382692d5.patch;patch=1" + +EXTRA_OECONF += "--disable-scrollkeeper" + +# Remove an autogenerated file that needs to be rebuilt +do_configure_prepend () { + rm -f ${S}/src/terminal-type-builtins.c +} + +SRC_URI[archive.md5sum] = "0395af0d444ed4fbfabf65d3583119c8" +SRC_URI[archive.sha256sum] = "ecddbf523700820524b2646451c307c5b55078b9cebe5fa464ef626b4b4cbda2" diff --git a/meta-gnome/recipes-gnome/nonworking/gnome/gnome-terminal/30f29e7d8e1b67c40cd18a7155ba30c4382692d5.patch b/meta-gnome/recipes-gnome/nonworking/gnome/gnome-terminal/30f29e7d8e1b67c40cd18a7155ba30c4382692d5.patch deleted file mode 100644 index 0358ed8a64..0000000000 --- a/meta-gnome/recipes-gnome/nonworking/gnome/gnome-terminal/30f29e7d8e1b67c40cd18a7155ba30c4382692d5.patch +++ /dev/null @@ -1,20 +0,0 @@ -From 30f29e7d8e1b67c40cd18a7155ba30c4382692d5 Mon Sep 17 00:00:00 2001 -From: Seán de Búrca -Date: Fri, 07 Aug 2009 00:38:52 +0000 -Subject: Remove useless Plural-Forms line which breaks build with gnome-doc-utils master - ---- -diff --git a/help/el/el.po b/help/el/el.po -index ab77264..635b68f 100644 ---- a/help/el/el.po -+++ b/help/el/el.po -@@ -10,7 +10,6 @@ msgstr "" - "MIME-Version: 1.0\n" - "Content-Type: text/plain; charset=UTF-8\n" - "Content-Transfer-Encoding: 8bit\n" --"Plural-Forms: 2\n" - "X-Poedit-Language: Greek\n" - "X-Poedit-Country: GREECE\n" - "X-Generator: Lokalize 0.2\n" --- -cgit v0.8.3.1 diff --git a/meta-gnome/recipes-gnome/nonworking/gnome/gnome-terminal_2.26.3.bb b/meta-gnome/recipes-gnome/nonworking/gnome/gnome-terminal_2.26.3.bb deleted file mode 100644 index 9bf6b6de59..0000000000 --- a/meta-gnome/recipes-gnome/nonworking/gnome/gnome-terminal_2.26.3.bb +++ /dev/null @@ -1,19 +0,0 @@ -DESCRIPTION = "GNOME Terminal" -LICENSE = "GPL-2.0" -LIC_FILES_CHKSUM = "file://COPYING;md5=5b51eba4ba4cafe64073227530c061ed" -DEPENDS = "gtk+ glib-2.0 startup-notification dbus-glib vte" -PR = "r2" - -inherit gnome - -SRC_URI += "file://30f29e7d8e1b67c40cd18a7155ba30c4382692d5.patch;patch=1" - -EXTRA_OECONF += "--disable-scrollkeeper" - -# Remove an autogenerated file that needs to be rebuilt -do_configure_prepend () { - rm -f ${S}/src/terminal-type-builtins.c -} - -SRC_URI[archive.md5sum] = "0395af0d444ed4fbfabf65d3583119c8" -SRC_URI[archive.sha256sum] = "ecddbf523700820524b2646451c307c5b55078b9cebe5fa464ef626b4b4cbda2" -- cgit v1.2.3-54-g00ecf