summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRichard Purdie <rpurdie@linux.intel.com>2010-02-03 14:52:15 +0000
committerRichard Purdie <rpurdie@linux.intel.com>2010-02-03 14:52:15 +0000
commit0b52537f5ce39a6025a2a8de381792accc333b8e (patch)
treedb82c16b1c36703bebe7d92db6c9c1a188f09ff8
parentd19b1145aa14fc0d8e3ba97268b70d6c6810b5e9 (diff)
downloadopenembedded-core-0b52537f5ce39a6025a2a8de381792accc333b8e.tar.gz
openembedded-core-0b52537f5ce39a6025a2a8de381792accc333b8e.tar.bz2
openembedded-core-0b52537f5ce39a6025a2a8de381792accc333b8e.zip
twitter-glib: Drop merged patch and update revision
Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
-rw-r--r--meta-moblin/conf/distro/include/moblin-fixed-revisions.inc2
-rw-r--r--meta-moblin/packages/twitter-glib/twitter-glib/missingcomma.patch13
-rw-r--r--meta-moblin/packages/twitter-glib/twitter-glib_git.bb1
3 files changed, 1 insertions, 15 deletions
diff --git a/meta-moblin/conf/distro/include/moblin-fixed-revisions.inc b/meta-moblin/conf/distro/include/moblin-fixed-revisions.inc
index 6e98e89f05..adb3a8ef96 100644
--- a/meta-moblin/conf/distro/include/moblin-fixed-revisions.inc
+++ b/meta-moblin/conf/distro/include/moblin-fixed-revisions.inc
@@ -93,4 +93,4 @@ SRCREV_pn-mtpfs = "17"
SRCREV_pn-qemugl ?= "d888bbc723c00d197d34a39b5b7448660ec1b1c0"
SRCREV_pn-syncevolution ?= "29972357bf6582c318258b7bdf1feb13c0fef824"
SRCREV_pn-tasks ?= "ea52d46d691c5fce4473ea4e24a35411381f3a65"
-SRCREV_pn-twitter-glib ?= "9dfca7cf38e3dddbda6dc82d0164f65814b8783e"
+SRCREV_pn-twitter-glib ?= "62b262bf7892b629f7de67498d58f549ffeb704e"
diff --git a/meta-moblin/packages/twitter-glib/twitter-glib/missingcomma.patch b/meta-moblin/packages/twitter-glib/twitter-glib/missingcomma.patch
deleted file mode 100644
index 212e0096c0..0000000000
--- a/meta-moblin/packages/twitter-glib/twitter-glib/missingcomma.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: git/configure.ac
-===================================================================
---- git.orig/configure.ac 2010-02-02 00:12:36.409039458 +0000
-+++ git/configure.ac 2010-02-02 00:12:52.027791491 +0000
-@@ -141,7 +141,7 @@
- [],
- [enable_maintainer_flags=maintainer_flags_default])
-
--AS_IF([test "x$enable_maintainer_flags" = "xyes" && test "x$GCC" = "xyes"]
-+AS_IF([test "x$enable_maintainer_flags" = "xyes" && test "x$GCC" = "xyes"],
- [TWITTER_MAINTAINER_CFLAGS="-Werror -Wall -Wshadow -Wcast-align -Wno-uninitialized -Wempty-body -Wformat-security -Winit-self"]
- )
-
diff --git a/meta-moblin/packages/twitter-glib/twitter-glib_git.bb b/meta-moblin/packages/twitter-glib/twitter-glib_git.bb
index cc39c2cb5a..8a18517d79 100644
--- a/meta-moblin/packages/twitter-glib/twitter-glib_git.bb
+++ b/meta-moblin/packages/twitter-glib/twitter-glib_git.bb
@@ -1,6 +1,5 @@
HOMEPAGE = "http://live.gnome.org/TwitterGlib"
SRC_URI = "git://github.com/ebassi/${PN}.git;protocol=git \
- file://missingcomma.patch;patch=1 \
file://nodolt.patch;patch=1"
PV = "0.1+git${SRCPV}"
PR = "r1"