From 4909fcd51cd106aca4c570eb7aee3d7f2a2f597c Mon Sep 17 00:00:00 2001
From: Richard Purdie <rpurdie@linux.intel.com>
Date: Mon, 27 Jul 2009 17:53:03 +0100
Subject: libsynthesis: Drop patch since upstream has made similar changes now

Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
---
 .../libsynthesis/libsynthesis/addpkgconfig.patch   | 38 ----------------------
 .../packages/libsynthesis/libsynthesis_git.bb      |  5 ++-
 2 files changed, 2 insertions(+), 41 deletions(-)
 delete mode 100644 meta-moblin/packages/libsynthesis/libsynthesis/addpkgconfig.patch

(limited to 'meta-moblin/packages')

diff --git a/meta-moblin/packages/libsynthesis/libsynthesis/addpkgconfig.patch b/meta-moblin/packages/libsynthesis/libsynthesis/addpkgconfig.patch
deleted file mode 100644
index 1f5bbbb0e..000000000
--- a/meta-moblin/packages/libsynthesis/libsynthesis/addpkgconfig.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-Index: git/configure.in
-===================================================================
---- git.orig/configure.in	2009-07-16 11:10:03.000000000 +0100
-+++ git/configure.in	2009-07-16 11:10:46.000000000 +0100
-@@ -106,5 +106,5 @@
- fi
- AM_CONDITIONAL([COND_STATIC], [test "$enable_shared" = "no"])
- 
--AC_CONFIG_FILES(Makefile src/Makefile)
-+AC_CONFIG_FILES(Makefile src/Makefile synthesis.pc)
- AC_OUTPUT
-Index: git/synthesis.pc.in
-===================================================================
---- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ git/synthesis.pc.in	2009-07-16 11:11:48.000000000 +0100
-@@ -0,0 +1,10 @@
-+prefix=@prefix@
-+exec_prefix=@exec_prefix@
-+libdir=@libdir@
-+includedir=@includedir@
-+
-+Name: synthesis
-+Description:  Synthesis SyncML Client Library
-+Version: @VERSION@
-+Libs: -L${libdir} -lsynthesis -lsynthesissdk
-+Cflags:
-Index: git/Makefile.am
-===================================================================
---- git.orig/Makefile.am	2009-07-16 11:13:34.000000000 +0100
-+++ git/Makefile.am	2009-07-16 11:14:02.000000000 +0100
-@@ -9,3 +9,6 @@
- MAINTAINERCLEANFILES = Makefile.in config.guess config.sub configure depcomp install-sh ltmain.sh missing mkinstalldirs
- 
- ACLOCAL_AMFLAGS = -I m4
-+
-+pkgconfigdir = $(libdir)/pkgconfig
-+pkgconfig_DATA = synthesis.pc
-\ No newline at end of file
diff --git a/meta-moblin/packages/libsynthesis/libsynthesis_git.bb b/meta-moblin/packages/libsynthesis/libsynthesis_git.bb
index e4fffc0cc..6a14af110 100644
--- a/meta-moblin/packages/libsynthesis/libsynthesis_git.bb
+++ b/meta-moblin/packages/libsynthesis/libsynthesis_git.bb
@@ -1,9 +1,8 @@
 DESCRIPTION = "Synthesis SyncML Engine"
-SRC_URI = "git://git.moblin.org/${PN}.git;protocol=git \
-           file://addpkgconfig.patch;patch=1"
+SRC_URI = "git://git.moblin.org/${PN}.git;protocol=git"
 LICENSE = "LGPLv2.1"
 PV = "0.0+git${SRCPV}"
-PR = "r0"
+PR = "r1"
 
 DEPENDS = "libpcre"
 
-- 
cgit v1.2.3