Patchwork [meta-oe/master,2/3] orbit2: update to latest stable / fix build with glib 2.36

login
register
mail settings
Submitter Andreas Müller
Date May 3, 2013, 10:56 a.m.
Message ID <1367578619-19890-3-git-send-email-schnitzeltony@googlemail.com>
Download mbox | patch
Permalink /patch/49281/
State Superseded
Headers show

Comments

Andreas Müller - May 3, 2013, 10:56 a.m.
license change of FSF address only

Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
---
 ...-src-Makefile.am-fix-build-with-glib-2.36.patch |   34 ++++++++++++++++++++
 .../configure-lossage.patch                        |    0
 .../{orbit2-2.14.17 => orbit2}/pkgconfig-fix.patch |    0
 .../{orbit2_2.14.17.bb => orbit2_2.14.19.bb}       |   16 +++++----
 4 files changed, 43 insertions(+), 7 deletions(-)
 create mode 100644 meta-gnome/recipes-gnome/orbit2/orbit2/0001-linc2-src-Makefile.am-fix-build-with-glib-2.36.patch
 rename meta-gnome/recipes-gnome/orbit2/{orbit2-2.14.17 => orbit2}/configure-lossage.patch (100%)
 rename meta-gnome/recipes-gnome/orbit2/{orbit2-2.14.17 => orbit2}/pkgconfig-fix.patch (100%)
 rename meta-gnome/recipes-gnome/orbit2/{orbit2_2.14.17.bb => orbit2_2.14.19.bb} (68%)
Otavio Salvador - May 3, 2013, 12:07 p.m.
On Fri, May 3, 2013 at 7:56 AM, Andreas Müller
<schnitzeltony@googlemail.com> wrote:
> license change of FSF address only
>
> Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>

Your commit log is not accurate when comparing with the code.

--
Otavio Salvador                             O.S. Systems
E-mail: otavio@ossystems.com.br  http://www.ossystems.com.br
Mobile: +55 53 9981-7854              http://projetos.ossystems.com.br
Andreas Müller - May 3, 2013, 12:14 p.m.
On Fri, May 3, 2013 at 2:07 PM, Otavio Salvador <otavio@ossystems.com.br> wrote:
> On Fri, May 3, 2013 at 7:56 AM, Andreas Müller
> <schnitzeltony@googlemail.com> wrote:
>> license change of FSF address only
>>
>> Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
>
> Your commit log is not accurate when comparing with the code.
>
Needs V2 anyway for minor fix of gnome-disk-utilty

Andreas

Patch

diff --git a/meta-gnome/recipes-gnome/orbit2/orbit2/0001-linc2-src-Makefile.am-fix-build-with-glib-2.36.patch b/meta-gnome/recipes-gnome/orbit2/orbit2/0001-linc2-src-Makefile.am-fix-build-with-glib-2.36.patch
new file mode 100644
index 0000000..daf7464
--- /dev/null
+++ b/meta-gnome/recipes-gnome/orbit2/orbit2/0001-linc2-src-Makefile.am-fix-build-with-glib-2.36.patch
@@ -0,0 +1,34 @@ 
+From 10bd8094e1d94e5c737791c7f4b6b844f535c120 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com>
+Date: Fri, 3 May 2013 10:00:16 +0200
+Subject: [PATCH] linc2/src/Makefile.am: fix build with glib 2.36
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Upstream-Status: Submitted [1]
+
+[1] https://bugzilla.gnome.org/show_bug.cgi?id=696900
+
+Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
+---
+ linc2/src/Makefile.am |    3 +--
+ 1 files changed, 1 insertions(+), 2 deletions(-)
+
+diff --git a/linc2/src/Makefile.am b/linc2/src/Makefile.am
+index 357a2dd..ba0e347 100644
+--- a/linc2/src/Makefile.am
++++ b/linc2/src/Makefile.am
+@@ -12,8 +12,7 @@ INCLUDES =                         \
+ 	-I$(top_builddir)/linc2/include  \
+ 	-I$(top_srcdir)/linc2/include    \
+ 	$(LINC_CFLAGS)             \
+-	$(WARN_CFLAGS)             \
+-	-DG_DISABLE_DEPRECATED
++	$(WARN_CFLAGS)
+ 
+ if OS_WIN32
+ else
+-- 
+1.7.6.5
+
diff --git a/meta-gnome/recipes-gnome/orbit2/orbit2-2.14.17/configure-lossage.patch b/meta-gnome/recipes-gnome/orbit2/orbit2/configure-lossage.patch
similarity index 100%
rename from meta-gnome/recipes-gnome/orbit2/orbit2-2.14.17/configure-lossage.patch
rename to meta-gnome/recipes-gnome/orbit2/orbit2/configure-lossage.patch
diff --git a/meta-gnome/recipes-gnome/orbit2/orbit2-2.14.17/pkgconfig-fix.patch b/meta-gnome/recipes-gnome/orbit2/orbit2/pkgconfig-fix.patch
similarity index 100%
rename from meta-gnome/recipes-gnome/orbit2/orbit2-2.14.17/pkgconfig-fix.patch
rename to meta-gnome/recipes-gnome/orbit2/orbit2/pkgconfig-fix.patch
diff --git a/meta-gnome/recipes-gnome/orbit2/orbit2_2.14.17.bb b/meta-gnome/recipes-gnome/orbit2/orbit2_2.14.19.bb
similarity index 68%
rename from meta-gnome/recipes-gnome/orbit2/orbit2_2.14.17.bb
rename to meta-gnome/recipes-gnome/orbit2/orbit2_2.14.19.bb
index 3b6342b..74b6c12 100644
--- a/meta-gnome/recipes-gnome/orbit2/orbit2_2.14.17.bb
+++ b/meta-gnome/recipes-gnome/orbit2/orbit2_2.14.19.bb
@@ -1,16 +1,18 @@ 
 DESCRIPTION = "CORBA ORB"
 SECTION = "x11/gnome/libs"
 LICENSE = "GPL-2.0"
-LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f"
+LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552"
 SRC_NAME = "ORBit2"
 SHRT_VER = "${@d.getVar('PV',1).split('.')[0]}.${@d.getVar('PV',1).split('.')[1]}"
-SRC_URI = "${GNOME_MIRROR}/${SRC_NAME}/${SHRT_VER}/${SRC_NAME}-${PV}.tar.bz2 \
-           file://configure-lossage.patch \
-           file://pkgconfig-fix.patch"
-SRC_URI[md5sum] = "10bfb957fa4a8935a0b4afaee7d71df7"
-SRC_URI[sha256sum] = "62bfce3f678f9347a19c766944e8aef7b89bc32b25ac23eb3e4c25929ce8974c"
+SRC_URI = " \
+    ${GNOME_MIRROR}/${SRC_NAME}/${SHRT_VER}/${SRC_NAME}-${PV}.tar.bz2 \
+    file://configure-lossage.patch \
+    file://pkgconfig-fix.patch \
+    file://0001-linc2-src-Makefile.am-fix-build-with-glib-2.36.patch \
+"
+SRC_URI[md5sum] = "7082d317a9573ab338302243082d10d1"
+SRC_URI[sha256sum] = "55c900a905482992730f575f3eef34d50bda717c197c97c08fa5a6eafd857550"
 
-PR = "r5"
 BBCLASSEXTEND = "native"
 
 IDL_COMPILER_DEPENDS = "orbit2-native"