All of lore.kernel.org
 help / color / mirror / Atom feed
* gnome-panel: Compile idl files against STAGING_DIR_HOST.
@ 2009-04-09 16:00 Koen Kooi
  2009-04-09 16:11 ` [STABLE] " Koen Kooi
  2009-04-10  2:00 ` Denys Dmytriyenko
  0 siblings, 2 replies; 3+ messages in thread
From: Koen Kooi @ 2009-04-09 16:00 UTC (permalink / raw)
  To: openembedded-devel; +Cc: Koen Kooi

From: Stanislav Brabec <utx@penguin.cz>

Adapted from the .dev patch to gnome-panel 2.24 since 2.26 isn't in stable yet

Signed-off-by: Koen Kooi <koen@openembedded.org>

---
diff --git a/recipes/gnome/gnome-panel/idl-sysroot.patch b/recipes/gnome/gnome-panel/idl-sysroot.patch
new file mode 100644
index 0000000..07e5ded
--- a/dev/null
+++ b/recipes/gnome/gnome-panel/idl-sysroot.patch
@@ -0,0 +1,26 @@
+Index: gnome-panel-2.24.0/gnome-panel/Makefile.am
+===================================================================
+--- gnome-panel-2.24.0.orig/gnome-panel/Makefile.am	2009-03-16 22:37:12.000000000 +0000
++++ gnome-panel-2.24.0/gnome-panel/Makefile.am	2009-04-09 14:39:02.000000000 +0000
+@@ -43,7 +43,7 @@
+ 	$(NULL)
+ 
+ $(CORBA_SRCLIST): $(top_srcdir)/idl/GNOME_Panel.idl $(ORBIT_IDL)
+-	$(ORBIT_IDL) -I $(BONOBO_IDLDIR) -I $(BONOBO_ACT_IDLDIR) $(top_srcdir)/idl/GNOME_Panel.idl
++	$(ORBIT_IDL) -I $(SYSROOT)$(BONOBO_IDLDIR) -I $(SYSROOT)$(BONOBO_ACT_IDLDIR) $(top_srcdir)/idl/GNOME_Panel.idl
+ 
+ BUILT_SOURCES = \
+ 	$(CORBA_SRCLIST)	\
+Index: gnome-panel-2.24.0/libpanel-applet/Makefile.am
+===================================================================
+--- gnome-panel-2.24.0.orig/libpanel-applet/Makefile.am	2009-03-16 22:37:13.000000000 +0000
++++ gnome-panel-2.24.0/libpanel-applet/Makefile.am	2009-04-09 14:51:18.000000000 +0000
+@@ -45,7 +45,7 @@
+ 	GNOME_Panel.h
+ 
+ $(CORBA_SRCLIST): $(top_srcdir)/idl/GNOME_Panel.idl $(ORBIT_IDL)
+-	$(ORBIT_IDL) -I $(BONOBO_IDLDIR) -I $(BONOBO_ACT_IDLDIR) $(top_srcdir)/idl/GNOME_Panel.idl
++	$(ORBIT_IDL) -I $(SYSROOT)$(BONOBO_IDLDIR) -I $(SYSROOT)$(BONOBO_ACT_IDLDIR) $(top_srcdir)/idl/GNOME_Panel.idl
+ 
+ noinst_PROGRAMS = test-bonobo-applet
+ 
diff --git a/recipes/gnome/gnome-panel_2.24.0.bb b/recipes/gnome/gnome-panel_2.24.0.bb
index 743e0fa..473bea4 100644
--- a/recipes/gnome/gnome-panel_2.24.0.bb
+++ b/recipes/gnome/gnome-panel_2.24.0.bb
@@ -5,6 +5,8 @@ inherit gnome pkgconfig
 
 SRC_URI += "file://scrollkeeper.patch;patch=1"
 
+SRC_URI += "file://idl-sysroot.patch;patch=1"
+
 do_configure_prepend() {
         sed -i -e s:help:: ${S}/Makefile.am
 }
@@ -16,7 +18,8 @@ FILES_libpanel-applet = "${libdir}/libpanel-applet-2.so.*"
 FILES_${PN} =+ "${datadir}/gnome* \
                 ${datadir}/icons"
 
-EXTRA_OEMAKE = "ORBIT_IDL=${STAGING_BINDIR_NATIVE}/orbit-idl-2"
+export SYSROOT = "${STAGING_DIR_HOST}"
+EXTRA_OEMAKE = "ORBIT_IDL=${STAGING_BINDIR_NATIVE}/orbit-idl-2 SYSROOT=${SYSROOT}"
 EXTRA_OECONF = "--disable-scrollkeeper"
 
 do_stage() {



^ permalink raw reply related	[flat|nested] 3+ messages in thread
* [STABLE] Re: gnome-panel: Compile idl files against STAGING_DIR_HOST.
  2009-04-09 16:00 gnome-panel: Compile idl files against STAGING_DIR_HOST Koen Kooi
@ 2009-04-09 16:11 ` Koen Kooi
  2009-04-10  2:00 ` Denys Dmytriyenko
  1 sibling, 0 replies; 3+ messages in thread
From: Koen Kooi @ 2009-04-09 16:11 UTC (permalink / raw)
  To: openembedded-devel

forgot the [STABLE] tag, sorry

On 09-04-09 18:00, Koen Kooi wrote:
> From: Stanislav Brabec<utx@penguin.cz>
>
> Adapted from the .dev patch to gnome-panel 2.24 since 2.26 isn't in stable yet
>
> Signed-off-by: Koen Kooi<koen@openembedded.org>
>
> ---
> diff --git a/recipes/gnome/gnome-panel/idl-sysroot.patch b/recipes/gnome/gnome-panel/idl-sysroot.patch
> new file mode 100644
> index 0000000..07e5ded
> --- a/dev/null
> +++ b/recipes/gnome/gnome-panel/idl-sysroot.patch
> @@ -0,0 +1,26 @@
> +Index: gnome-panel-2.24.0/gnome-panel/Makefile.am
> +===================================================================
> +--- gnome-panel-2.24.0.orig/gnome-panel/Makefile.am	2009-03-16 22:37:12.000000000 +0000
> ++++ gnome-panel-2.24.0/gnome-panel/Makefile.am	2009-04-09 14:39:02.000000000 +0000
> +@@ -43,7 +43,7 @@
> + 	$(NULL)
> +
> + $(CORBA_SRCLIST): $(top_srcdir)/idl/GNOME_Panel.idl $(ORBIT_IDL)
> +-	$(ORBIT_IDL) -I $(BONOBO_IDLDIR) -I $(BONOBO_ACT_IDLDIR) $(top_srcdir)/idl/GNOME_Panel.idl
> ++	$(ORBIT_IDL) -I $(SYSROOT)$(BONOBO_IDLDIR) -I $(SYSROOT)$(BONOBO_ACT_IDLDIR) $(top_srcdir)/idl/GNOME_Panel.idl
> +
> + BUILT_SOURCES = \
> + 	$(CORBA_SRCLIST)	\
> +Index: gnome-panel-2.24.0/libpanel-applet/Makefile.am
> +===================================================================
> +--- gnome-panel-2.24.0.orig/libpanel-applet/Makefile.am	2009-03-16 22:37:13.000000000 +0000
> ++++ gnome-panel-2.24.0/libpanel-applet/Makefile.am	2009-04-09 14:51:18.000000000 +0000
> +@@ -45,7 +45,7 @@
> + 	GNOME_Panel.h
> +
> + $(CORBA_SRCLIST): $(top_srcdir)/idl/GNOME_Panel.idl $(ORBIT_IDL)
> +-	$(ORBIT_IDL) -I $(BONOBO_IDLDIR) -I $(BONOBO_ACT_IDLDIR) $(top_srcdir)/idl/GNOME_Panel.idl
> ++	$(ORBIT_IDL) -I $(SYSROOT)$(BONOBO_IDLDIR) -I $(SYSROOT)$(BONOBO_ACT_IDLDIR) $(top_srcdir)/idl/GNOME_Panel.idl
> +
> + noinst_PROGRAMS = test-bonobo-applet
> +
> diff --git a/recipes/gnome/gnome-panel_2.24.0.bb b/recipes/gnome/gnome-panel_2.24.0.bb
> index 743e0fa..473bea4 100644
> --- a/recipes/gnome/gnome-panel_2.24.0.bb
> +++ b/recipes/gnome/gnome-panel_2.24.0.bb
> @@ -5,6 +5,8 @@ inherit gnome pkgconfig
>
>   SRC_URI += "file://scrollkeeper.patch;patch=1"
>
> +SRC_URI += "file://idl-sysroot.patch;patch=1"
> +
>   do_configure_prepend() {
>           sed -i -e s:help:: ${S}/Makefile.am
>   }
> @@ -16,7 +18,8 @@ FILES_libpanel-applet = "${libdir}/libpanel-applet-2.so.*"
>   FILES_${PN} =+ "${datadir}/gnome* \
>                   ${datadir}/icons"
>
> -EXTRA_OEMAKE = "ORBIT_IDL=${STAGING_BINDIR_NATIVE}/orbit-idl-2"
> +export SYSROOT = "${STAGING_DIR_HOST}"
> +EXTRA_OEMAKE = "ORBIT_IDL=${STAGING_BINDIR_NATIVE}/orbit-idl-2 SYSROOT=${SYSROOT}"
>   EXTRA_OECONF = "--disable-scrollkeeper"
>
>   do_stage() {





^ permalink raw reply	[flat|nested] 3+ messages in thread
* Re: gnome-panel: Compile idl files against STAGING_DIR_HOST.
  2009-04-09 16:00 gnome-panel: Compile idl files against STAGING_DIR_HOST Koen Kooi
  2009-04-09 16:11 ` [STABLE] " Koen Kooi
@ 2009-04-10  2:00 ` Denys Dmytriyenko
  1 sibling, 0 replies; 3+ messages in thread
From: Denys Dmytriyenko @ 2009-04-10  2:00 UTC (permalink / raw)
  To: openembedded-devel; +Cc: Koen Kooi

On Thu, Apr 09, 2009 at 06:00:03PM +0200, Koen Kooi wrote:
> From: Stanislav Brabec <utx@penguin.cz>
> 
> Adapted from the .dev patch to gnome-panel 2.24 since 2.26 isn't in stable yet
> 
> Signed-off-by: Koen Kooi <koen@openembedded.org>

Acked-by: Denys Dmytriyenko <denis@denix.org>

BTW, should tested patches get Tested-by: instead of Acked-by:?

> ---
> diff --git a/recipes/gnome/gnome-panel/idl-sysroot.patch b/recipes/gnome/gnome-panel/idl-sysroot.patch
> new file mode 100644
> index 0000000..07e5ded
> --- a/dev/null

The above had to be changed to "--- /dev/null" instead to satisfy git-am and 
git-apply. How was this patch generated? I wonder what went wrong...


> +++ b/recipes/gnome/gnome-panel/idl-sysroot.patch
> @@ -0,0 +1,26 @@
> +Index: gnome-panel-2.24.0/gnome-panel/Makefile.am
> +===================================================================
> +--- gnome-panel-2.24.0.orig/gnome-panel/Makefile.am	2009-03-16 22:37:12.000000000 +0000
> ++++ gnome-panel-2.24.0/gnome-panel/Makefile.am	2009-04-09 14:39:02.000000000 +0000
> +@@ -43,7 +43,7 @@
> + 	$(NULL)
> + 
> + $(CORBA_SRCLIST): $(top_srcdir)/idl/GNOME_Panel.idl $(ORBIT_IDL)
> +-	$(ORBIT_IDL) -I $(BONOBO_IDLDIR) -I $(BONOBO_ACT_IDLDIR) $(top_srcdir)/idl/GNOME_Panel.idl
> ++	$(ORBIT_IDL) -I $(SYSROOT)$(BONOBO_IDLDIR) -I $(SYSROOT)$(BONOBO_ACT_IDLDIR) $(top_srcdir)/idl/GNOME_Panel.idl
> + 
> + BUILT_SOURCES = \
> + 	$(CORBA_SRCLIST)	\
> +Index: gnome-panel-2.24.0/libpanel-applet/Makefile.am
> +===================================================================
> +--- gnome-panel-2.24.0.orig/libpanel-applet/Makefile.am	2009-03-16 22:37:13.000000000 +0000
> ++++ gnome-panel-2.24.0/libpanel-applet/Makefile.am	2009-04-09 14:51:18.000000000 +0000
> +@@ -45,7 +45,7 @@
> + 	GNOME_Panel.h
> + 
> + $(CORBA_SRCLIST): $(top_srcdir)/idl/GNOME_Panel.idl $(ORBIT_IDL)
> +-	$(ORBIT_IDL) -I $(BONOBO_IDLDIR) -I $(BONOBO_ACT_IDLDIR) $(top_srcdir)/idl/GNOME_Panel.idl
> ++	$(ORBIT_IDL) -I $(SYSROOT)$(BONOBO_IDLDIR) -I $(SYSROOT)$(BONOBO_ACT_IDLDIR) $(top_srcdir)/idl/GNOME_Panel.idl
> + 
> + noinst_PROGRAMS = test-bonobo-applet
> + 
> diff --git a/recipes/gnome/gnome-panel_2.24.0.bb b/recipes/gnome/gnome-panel_2.24.0.bb
> index 743e0fa..473bea4 100644
> --- a/recipes/gnome/gnome-panel_2.24.0.bb
> +++ b/recipes/gnome/gnome-panel_2.24.0.bb
> @@ -5,6 +5,8 @@ inherit gnome pkgconfig
>  
>  SRC_URI += "file://scrollkeeper.patch;patch=1"
>  
> +SRC_URI += "file://idl-sysroot.patch;patch=1"
> +
>  do_configure_prepend() {
>          sed -i -e s:help:: ${S}/Makefile.am
>  }
> @@ -16,7 +18,8 @@ FILES_libpanel-applet = "${libdir}/libpanel-applet-2.so.*"
>  FILES_${PN} =+ "${datadir}/gnome* \
>                  ${datadir}/icons"
>  
> -EXTRA_OEMAKE = "ORBIT_IDL=${STAGING_BINDIR_NATIVE}/orbit-idl-2"
> +export SYSROOT = "${STAGING_DIR_HOST}"
> +EXTRA_OEMAKE = "ORBIT_IDL=${STAGING_BINDIR_NATIVE}/orbit-idl-2 SYSROOT=${SYSROOT}"
>  EXTRA_OECONF = "--disable-scrollkeeper"
>  
>  do_stage() {
> 
> _______________________________________________
> Openembedded-devel mailing list
> Openembedded-devel@lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel



^ permalink raw reply	[flat|nested] 3+ messages in thread
end of thread, other threads:[~2009-04-10  2:04 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2009-04-09 16:00 gnome-panel: Compile idl files against STAGING_DIR_HOST Koen Kooi
2009-04-09 16:11 ` [STABLE] " Koen Kooi
2009-04-10  2:00 ` Denys Dmytriyenko

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.