From 5423d2fabade45974f20948a6d90a663eead209a Mon Sep 17 00:00:00 2001 From: Dmitry Eremin-Solenikov Date: Tue, 15 Nov 2011 12:58:46 -0800 Subject: screenshot: rename to sato-screenshot To remove a name conflict with e17's screenshot tool (and possibly other screenshot tools, as screenshot is a generic term), rename screenshot to sato-screenshot. Signed-off-by: Dmitry Eremin-Solenikov Signed-off-by: Richard Purdie --- .../sato-screenshot/files/fix_ldadd_order.patch | 15 ++++++++++++++ .../sato-screenshot/sato-screenshot_git.bb | 23 ++++++++++++++++++++++ .../screenshot/files/fix_ldadd_order.patch | 15 -------------- meta/recipes-sato/screenshot/screenshot_git.bb | 23 ---------------------- meta/recipes-sato/tasks/task-core-x11.bb | 2 +- 5 files changed, 39 insertions(+), 39 deletions(-) create mode 100644 meta/recipes-sato/sato-screenshot/files/fix_ldadd_order.patch create mode 100644 meta/recipes-sato/sato-screenshot/sato-screenshot_git.bb delete mode 100644 meta/recipes-sato/screenshot/files/fix_ldadd_order.patch delete mode 100644 meta/recipes-sato/screenshot/screenshot_git.bb diff --git a/meta/recipes-sato/sato-screenshot/files/fix_ldadd_order.patch b/meta/recipes-sato/sato-screenshot/files/fix_ldadd_order.patch new file mode 100644 index 0000000000..7d9689e893 --- /dev/null +++ b/meta/recipes-sato/sato-screenshot/files/fix_ldadd_order.patch @@ -0,0 +1,15 @@ +Fix the ordering of LDADD options to fix a compilation failure. + +Signed-off-by: Scott Garman + +Upstream-Status: Inappropriate [configuration] + +diff -urN screenshot.orig//Makefile.am screenshot/Makefile.am +--- screenshot.orig//Makefile.am 2010-06-29 11:55:00.000000000 -0700 ++++ screenshot/Makefile.am 2011-03-01 11:09:01.215813968 -0800 +@@ -23,4 +23,4 @@ + # A standalone tool for running from a terminal and scripts + bin_PROGRAMS = screenshot + screenshot_SOURCES = main.c +-screenshot_LDADD = $(GTK_LIBS) libshot.la ++screenshot_LDADD = libshot.la $(GTK_LIBS) diff --git a/meta/recipes-sato/sato-screenshot/sato-screenshot_git.bb b/meta/recipes-sato/sato-screenshot/sato-screenshot_git.bb new file mode 100644 index 0000000000..5e51d3dfd9 --- /dev/null +++ b/meta/recipes-sato/sato-screenshot/sato-screenshot_git.bb @@ -0,0 +1,23 @@ +DESCRIPTION = "An ultra-simple screen capture utility, aimed at handheld devices" +HOMEPAGE = "http://www.o-hand.com" +BUGTRACKER = "http://bugzilla.openedhand.com/" + +LICENSE = "GPLv2 & GPLv2+" +LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \ + file://main.c;endline=9;md5=023e14d6404d0a961eb97cbd011fc141 \ + file://screenshot-ui.h;endline=9;md5=638d9ffa83e9325a36df224166ed6ad0" + +DEPENDS = "matchbox-panel-2" +SRCREV = "c792e4edc758bab21e0b01814979eacf0b1af945" +PV = "0.1+git${SRCPV}" +PR = "r0" + +SRC_URI = "git://git.yoctoproject.org/screenshot;protocol=git \ + file://fix_ldadd_order.patch" + +S = "${WORKDIR}/git" + +inherit autotools pkgconfig + +FILES_${PN} += "${libdir}/matchbox-panel/*.so" +FILES_${PN}-dbg += "${libdir}/matchbox-panel/.debug" diff --git a/meta/recipes-sato/screenshot/files/fix_ldadd_order.patch b/meta/recipes-sato/screenshot/files/fix_ldadd_order.patch deleted file mode 100644 index 7d9689e893..0000000000 --- a/meta/recipes-sato/screenshot/files/fix_ldadd_order.patch +++ /dev/null @@ -1,15 +0,0 @@ -Fix the ordering of LDADD options to fix a compilation failure. - -Signed-off-by: Scott Garman - -Upstream-Status: Inappropriate [configuration] - -diff -urN screenshot.orig//Makefile.am screenshot/Makefile.am ---- screenshot.orig//Makefile.am 2010-06-29 11:55:00.000000000 -0700 -+++ screenshot/Makefile.am 2011-03-01 11:09:01.215813968 -0800 -@@ -23,4 +23,4 @@ - # A standalone tool for running from a terminal and scripts - bin_PROGRAMS = screenshot - screenshot_SOURCES = main.c --screenshot_LDADD = $(GTK_LIBS) libshot.la -+screenshot_LDADD = libshot.la $(GTK_LIBS) diff --git a/meta/recipes-sato/screenshot/screenshot_git.bb b/meta/recipes-sato/screenshot/screenshot_git.bb deleted file mode 100644 index 917a27dc22..0000000000 --- a/meta/recipes-sato/screenshot/screenshot_git.bb +++ /dev/null @@ -1,23 +0,0 @@ -DESCRIPTION = "An ultra-simple screen capture utility, aimed at handheld devices" -HOMEPAGE = "http://www.o-hand.com" -BUGTRACKER = "http://bugzilla.openedhand.com/" - -LICENSE = "GPLv2 & GPLv2+" -LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \ - file://main.c;endline=9;md5=023e14d6404d0a961eb97cbd011fc141 \ - file://screenshot-ui.h;endline=9;md5=638d9ffa83e9325a36df224166ed6ad0" - -DEPENDS = "matchbox-panel-2" -SRCREV = "c792e4edc758bab21e0b01814979eacf0b1af945" -PV = "0.1+git${SRCPV}" -PR = "r0" - -SRC_URI = "git://git.yoctoproject.org/${BPN};protocol=git \ - file://fix_ldadd_order.patch" - -S = "${WORKDIR}/git" - -inherit autotools pkgconfig - -FILES_${PN} += "${libdir}/matchbox-panel/*.so" -FILES_${PN}-dbg += "${libdir}/matchbox-panel/.debug" diff --git a/meta/recipes-sato/tasks/task-core-x11.bb b/meta/recipes-sato/tasks/task-core-x11.bb index 106bc0f7fb..f1b06f9a12 100644 --- a/meta/recipes-sato/tasks/task-core-x11.bb +++ b/meta/recipes-sato/tasks/task-core-x11.bb @@ -61,7 +61,7 @@ RDEPENDS_task-core-apps-x11-core = "\ leafpad \ ${FILEMANAGER} \ matchbox-terminal \ - screenshot" + sato-screenshot" RDEPENDS_task-core-apps-x11-games = "\ -- cgit v1.2.3