summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-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"
93SRCREV_pn-qemugl ?= "d888bbc723c00d197d34a39b5b7448660ec1b1c0" 93SRCREV_pn-qemugl ?= "d888bbc723c00d197d34a39b5b7448660ec1b1c0"
94SRCREV_pn-syncevolution ?= "29972357bf6582c318258b7bdf1feb13c0fef824" 94SRCREV_pn-syncevolution ?= "29972357bf6582c318258b7bdf1feb13c0fef824"
95SRCREV_pn-tasks ?= "ea52d46d691c5fce4473ea4e24a35411381f3a65" 95SRCREV_pn-tasks ?= "ea52d46d691c5fce4473ea4e24a35411381f3a65"
96SRCREV_pn-twitter-glib ?= "9dfca7cf38e3dddbda6dc82d0164f65814b8783e" 96SRCREV_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 @@
1Index: git/configure.ac
2===================================================================
3--- git.orig/configure.ac 2010-02-02 00:12:36.409039458 +0000
4+++ git/configure.ac 2010-02-02 00:12:52.027791491 +0000
5@@ -141,7 +141,7 @@
6 [],
7 [enable_maintainer_flags=maintainer_flags_default])
8
9-AS_IF([test "x$enable_maintainer_flags" = "xyes" && test "x$GCC" = "xyes"]
10+AS_IF([test "x$enable_maintainer_flags" = "xyes" && test "x$GCC" = "xyes"],
11 [TWITTER_MAINTAINER_CFLAGS="-Werror -Wall -Wshadow -Wcast-align -Wno-uninitialized -Wempty-body -Wformat-security -Winit-self"]
12 )
13
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 @@
1HOMEPAGE = "http://live.gnome.org/TwitterGlib" 1HOMEPAGE = "http://live.gnome.org/TwitterGlib"
2SRC_URI = "git://github.com/ebassi/${PN}.git;protocol=git \ 2SRC_URI = "git://github.com/ebassi/${PN}.git;protocol=git \
3 file://missingcomma.patch;patch=1 \
4 file://nodolt.patch;patch=1" 3 file://nodolt.patch;patch=1"
5PV = "0.1+git${SRCPV}" 4PV = "0.1+git${SRCPV}"
6PR = "r1" 5PR = "r1"