Skip to contentSkip to conversation

glade3: initial add 3.8.2

PATCH In review Andreas Müller 1 participant 8 messages Sep 28, 2012 – Oct 21, 2012

lore
Share & tools
lore
#0 lore raw

PATCH 1/3 glade3: initial add 3.8.2

---
 ...gnome-doc-utils.make-sysrooted-pkg-config.patch |   51 ++++++++++++++++++++
 meta-oe/recipes-devtools/glade/glade3_3.8.2.bb     |   19 +++++++
 2 files changed, 70 insertions(+), 0 deletions(-)
 create mode 100644 meta-oe/recipes-devtools/glade/files/0001-gnome-doc-utils.make-sysrooted-pkg-config.patch
 create mode 100644 meta-oe/recipes-devtools/glade/glade3_3.8.2.bb
meta-oe/recipes-devtools/glade/files/0001-gnome-doc-utils.make-sysrooted-pkg-config.patch new file +51 -0
new file mode 100644
index 0000000..1b24c39
@@ -0,0 +1,51 @@
+From aed002cd9ff9e8f972120fbac33b4a65aba952e1 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Andreas=20M=C3=BCller?= <[email protected]>
+Date: Tue, 25 Sep 2012 10:28:33 +0200
+Subject: [PATCH] gnome-doc-utils.make: sysrooted pkg-config
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+same approach as used used in gnome-disk-utility:
+
+In cross environment we have to prepend the sysroot to the path found by
+pkgconfig since the path returned from pkgconfig does not have sysroot prefixed
+it ends up using the files from host system. Now usually people have gnome installed
+so the build succeeds but if you dont have gnome installed on build host then
+it wont find the files on host system and packages using gnome-doc-utils wont
+compile.
+
+This should work ok with non sysrooted builds too since in those cases PKG_CONFIG_SYSROOT_DIR
+will be empty
+
+Upstream-Status: pending
+
+Signed-off-by: Andreas Müller <[email protected]>
+---
+ gnome-doc-utils.make |   10 +++++-----
+ 1 files changed, 5 insertions(+), 5 deletions(-)
+
+diff --git a/gnome-doc-utils.make b/gnome-doc-utils.make
+index 42d9df3..f71bbfa 100644
+--- a/gnome-doc-utils.make
++++ b/gnome-doc-utils.make
+@@ -133,11 +133,11 @@ _DOC_ABS_SRCDIR = @abs_srcdir@
+ _xml2po ?= `which xml2po`
+ _xml2po_mode = $(if $(DOC_ID),mallard,docbook)
+ 
+-_db2html ?= `$(PKG_CONFIG) --variable db2html gnome-doc-utils`
+-_db2omf  ?= `$(PKG_CONFIG) --variable db2omf gnome-doc-utils`
+-_chunks  ?= `$(PKG_CONFIG) --variable xmldir gnome-doc-utils`/gnome/xslt/docbook/utils/chunks.xsl
+-_credits ?= `$(PKG_CONFIG) --variable xmldir gnome-doc-utils`/gnome/xslt/docbook/utils/credits.xsl
+-_ids ?= $(shell $(PKG_CONFIG) --variable xmldir gnome-doc-utils)/gnome/xslt/docbook/utils/ids.xsl
++_db2html ?= ${PKG_CONFIG_SYSROOT_DIR}`$(PKG_CONFIG) --variable db2html gnome-doc-utils`
++_db2omf  ?= ${PKG_CONFIG_SYSROOT_DIR}`$(PKG_CONFIG) --variable db2omf gnome-doc-utils`
++_chunks  ?= ${PKG_CONFIG_SYSROOT_DIR}`$(PKG_CONFIG) --variable xmldir gnome-doc-utils`/gnome/xslt/docbook/utils/chunks.xsl
++_credits ?= ${PKG_CONFIG_SYSROOT_DIR}`$(PKG_CONFIG) --variable xmldir gnome-doc-utils`/gnome/xslt/docbook/utils/credits.xsl
++_ids ?= ${PKG_CONFIG_SYSROOT_DIR}`$(PKG_CONFIG) --variable xmldir gnome-doc-utils`/gnome/xslt/docbook/utils/ids.xsl
+ 
+ if ENABLE_SK
+ _ENABLE_SK = true
+-- 
+1.7.6.5
+
meta-oe/recipes-devtools/glade/glade3_3.8.2.bb new file +19 -0
new file mode 100644
index 0000000..8cd6a0e
@@ -0,0 +1,19 @@
+DESCRIPTION = "Glade - A User Interface Designer"
+HOMEPAGE = "http://www.gnu.org/software/gnash"
+LICENSE = "GPLv2 & LGPLv2"
+LIC_FILES_CHKSUM = "file://COPYING;md5=aabe87591cb8ae0f3c68be6977bb5522 \
+                    file://COPYING.LGPL;md5=3bf50002aefd002f49e7bb854063f7e7"
+DEPENDS = "gtk+ gnome-doc-utils-native"
+
+inherit autotools pkgconfig pythonnative
+
+SRC_URI = "http://ftp.gnome.org/pub/GNOME/sources/glade3/3.8/glade3-${PV}.tar.xz \
+           file://0001-gnome-doc-utils.make-sysrooted-pkg-config.patch"
+SRC_URI[md5sum] = "b5da0ce717b2dc710e93a10b97c0f9ce"
+SRC_URI[sha256sum] = "f180a5018eee6e3fe574854cb025af897dd9962b01d17d5752e626876d388b19"
+
+EXTRA_OECONF += "--disable-scrollkeeper"
+
+FILES_${PN} += "${datadir}/icons"
+FILES_${PN}-dbg += "${libdir}/glade3/modules/.debug"
+FILES_${PN}-dev += "${libdir}/glade3/modules/*.la"
Signature · 1 line
1.7.4.4
#1 lore raw

PATCH 2/3 libxfce4ui: add glade package

* To edit glade files for xfce-packages it needs libxfce4ui's catalog [1].
* Unfortunately some host distributions do not supply a libxfce4ui-glade package.
* By installing glade3 + libxfce4ui-glade it is now possible to edit xfce's glade-files on target machine.

[1] http://comments.gmane.org/gmane.comp.desktop.xfce.devel.version4/20021

---
 .../recipes-xfce/libxfce4ui/libxfce4ui_4.10.0.bb   |   10 ++++++++--
 1 files changed, 8 insertions(+), 2 deletions(-)
meta-xfce/recipes-xfce/libxfce4ui/libxfce4ui_4.10.0.bb +8 -2
index 32505de..b5eb604 100644
@@ -2,12 +2,18 @@ DESCRIPTION = "Xfce4 Widget library and X Window System interaction"
 SECTION = "x11/libs"
 LICENSE = "GPLv2"
 LIC_FILES_CHKSUM = "file://COPYING;md5=252890d9eee26aab7b432e8b8a616475"
-DEPENDS = "gtk+ intltool libxfce4util startup-notification xfconf"
+PR = "r1"
+DEPENDS = "gtk+ intltool libxfce4util startup-notification xfconf glade3"
 
 inherit xfce
 
 SRC_URI += "file://0001-libxfce4kbd-private-xfce4-keyboard-shortcuts.xml-fix.patch"
-
 SRC_URI[md5sum] = "6df1ce474a3d4885aee31cda9dbc9192"
 SRC_URI[sha256sum] = "a2b9fa288ccb5f16fa13264e507ba3f7b8da0176da259a11239f21538c0ea3e2"
 
+FILES_${PN}-dbg += "${libdir}/glade3/modules/.debug"
+FILES_${PN}-dev += "${libdir}/glade3/modules/*.la \
+                   ${datadir}/glade3/catalogs/*.in"
+PACKAGES += "${PN}-glade"
+FILES_${PN}-glade = "${libdir}/glade3 \
+                     ${datadir}/glade3"
Signature · 1 line
1.7.4.4
#2 lore raw

PATCH 3/3 lighttpd: move systemd appends since recipe is in oe-core

In reply to Andreas Müller
---
 .../lighttpd/lighttpd/lighttpd.service             |    0
 .../lighttpd/lighttpd_1.4.31.bbappend              |    0
 2 files changed, 0 insertions(+), 0 deletions(-)
 rename meta-systemd/{meta-oe => oe-core}/recipes-extended/lighttpd/lighttpd/lighttpd.service (100%)
 rename meta-systemd/{meta-oe => oe-core}/recipes-extended/lighttpd/lighttpd_1.4.31.bbappend (100%)
meta-systemd/oe-core/recipes-extended/lighttpd/lighttpd/lighttpd.service renamed from meta-systemd/meta-oe/recipes-extended/lighttpd/lighttpd/lighttpd.service +0 -0
similarity index 100%
rename from meta-systemd/meta-oe/recipes-extended/lighttpd/lighttpd/lighttpd.service
rename to meta-systemd/oe-core/recipes-extended/lighttpd/lighttpd/lighttpd.service
meta-systemd/oe-core/recipes-extended/lighttpd/lighttpd_1.4.31.bbappend renamed from meta-systemd/meta-oe/recipes-extended/lighttpd/lighttpd_1.4.31.bbappend +0 -0
similarity index 100%
rename from meta-systemd/meta-oe/recipes-extended/lighttpd/lighttpd_1.4.31.bbappend
rename to meta-systemd/oe-core/recipes-extended/lighttpd/lighttpd_1.4.31.bbappend
Signature · 1 line
1.7.4.4
#3 lore raw

Re: [meta-oe, meta-xfce 3/3] lighttpd: move systemd appends since recipe is in oe-core

Quoted 17 lines · Andreas Müller
---
 .../lighttpd/lighttpd/lighttpd.service             |    0
 .../lighttpd/lighttpd_1.4.31.bbappend              |    0
 2 files changed, 0 insertions(+), 0 deletions(-)
 rename meta-systemd/{meta-oe => oe-core}/recipes-extended/lighttpd/lighttpd/lighttpd.service (100%)
 rename meta-systemd/{meta-oe => oe-core}/recipes-extended/lighttpd/lighttpd_1.4.31.bbappend (100%)
meta-systemd/oe-core/recipes-extended/lighttpd/lighttpd/lighttpd.service renamed from meta-systemd/meta-oe/recipes-extended/lighttpd/lighttpd/lighttpd.service +0 -0
similarity index 100%
rename from meta-systemd/meta-oe/recipes-extended/lighttpd/lighttpd/lighttpd.service
rename to meta-systemd/oe-core/recipes-extended/lighttpd/lighttpd/lighttpd.service
meta-systemd/oe-core/recipes-extended/lighttpd/lighttpd_1.4.31.bbappend renamed from meta-systemd/meta-oe/recipes-extended/lighttpd/lighttpd_1.4.31.bbappend +0 -1
similarity index 100%
rename from meta-systemd/meta-oe/recipes-extended/lighttpd/lighttpd_1.4.31.bbappend
rename to meta-systemd/oe-core/recipes-extended/lighttpd/lighttpd_1.4.31.bbappend
--
Quoted 2 lines

1.7.4.4

ping. This one got lost for patchwork ignoring pure renames. It can be cherry picked from

git://gitorious.org/schnitzeltony-oe-meta/meta-openembedded.git branch patches

Andreas

#4 lore raw
In reply to Andreas Müller
Quoted 91 lines · Andreas Müller
---
 ...gnome-doc-utils.make-sysrooted-pkg-config.patch |   51 ++++++++++++++++++++
 meta-oe/recipes-devtools/glade/glade3_3.8.2.bb     |   19 +++++++
 2 files changed, 70 insertions(+), 0 deletions(-)
 create mode 100644 meta-oe/recipes-devtools/glade/files/0001-gnome-doc-utils.make-sysrooted-pkg-config.patch
 create mode 100644 meta-oe/recipes-devtools/glade/glade3_3.8.2.bb
meta-oe/recipes-devtools/glade/files/0001-gnome-doc-utils.make-sysrooted-pkg-config.patch new file +51 -0
new file mode 100644
index 0000000..1b24c39
@@ -0,0 +1,51 @@
+From aed002cd9ff9e8f972120fbac33b4a65aba952e1 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Andreas=20M=C3=BCller?= <[email protected]>
+Date: Tue, 25 Sep 2012 10:28:33 +0200
+Subject: [PATCH] gnome-doc-utils.make: sysrooted pkg-config
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+same approach as used used in gnome-disk-utility:
+
+In cross environment we have to prepend the sysroot to the path found by
+pkgconfig since the path returned from pkgconfig does not have sysroot prefixed
+it ends up using the files from host system. Now usually people have gnome installed
+so the build succeeds but if you dont have gnome installed on build host then
+it wont find the files on host system and packages using gnome-doc-utils wont
+compile.
+
+This should work ok with non sysrooted builds too since in those cases PKG_CONFIG_SYSROOT_DIR
+will be empty
+
+Upstream-Status: pending
+
+Signed-off-by: Andreas Müller <[email protected]>
+---
+ gnome-doc-utils.make |   10 +++++-----
+ 1 files changed, 5 insertions(+), 5 deletions(-)
+
+diff --git a/gnome-doc-utils.make b/gnome-doc-utils.make
+index 42d9df3..f71bbfa 100644
+--- a/gnome-doc-utils.make
++++ b/gnome-doc-utils.make
+@@ -133,11 +133,11 @@ _DOC_ABS_SRCDIR = @abs_srcdir@
+ _xml2po ?= `which xml2po`
+ _xml2po_mode = $(if $(DOC_ID),mallard,docbook)
+
+-_db2html ?= `$(PKG_CONFIG) --variable db2html gnome-doc-utils`
+-_db2omf  ?= `$(PKG_CONFIG) --variable db2omf gnome-doc-utils`
+-_chunks  ?= `$(PKG_CONFIG) --variable xmldir gnome-doc-utils`/gnome/xslt/docbook/utils/chunks.xsl
+-_credits ?= `$(PKG_CONFIG) --variable xmldir gnome-doc-utils`/gnome/xslt/docbook/utils/credits.xsl
+-_ids ?= $(shell $(PKG_CONFIG) --variable xmldir gnome-doc-utils)/gnome/xslt/docbook/utils/ids.xsl
++_db2html ?= ${PKG_CONFIG_SYSROOT_DIR}`$(PKG_CONFIG) --variable db2html gnome-doc-utils`
++_db2omf  ?= ${PKG_CONFIG_SYSROOT_DIR}`$(PKG_CONFIG) --variable db2omf gnome-doc-utils`
++_chunks  ?= ${PKG_CONFIG_SYSROOT_DIR}`$(PKG_CONFIG) --variable xmldir gnome-doc-utils`/gnome/xslt/docbook/utils/chunks.xsl
++_credits ?= ${PKG_CONFIG_SYSROOT_DIR}`$(PKG_CONFIG) --variable xmldir gnome-doc-utils`/gnome/xslt/docbook/utils/credits.xsl
++_ids ?= ${PKG_CONFIG_SYSROOT_DIR}`$(PKG_CONFIG) --variable xmldir gnome-doc-utils`/gnome/xslt/docbook/utils/ids.xsl
+
+ if ENABLE_SK
+ _ENABLE_SK = true
+--
+1.7.6.5
+
meta-oe/recipes-devtools/glade/glade3_3.8.2.bb new file +19 -1
new file mode 100644
index 0000000..8cd6a0e
@@ -0,0 +1,19 @@
+DESCRIPTION = "Glade - A User Interface Designer"
+HOMEPAGE = "http://www.gnu.org/software/gnash"
+LICENSE = "GPLv2 & LGPLv2"
+LIC_FILES_CHKSUM = "file://COPYING;md5=aabe87591cb8ae0f3c68be6977bb5522 \
+                    file://COPYING.LGPL;md5=3bf50002aefd002f49e7bb854063f7e7"
+DEPENDS = "gtk+ gnome-doc-utils-native"
+
+inherit autotools pkgconfig pythonnative
+
+SRC_URI = "http://ftp.gnome.org/pub/GNOME/sources/glade3/3.8/glade3-${PV}.tar.xz \
+           file://0001-gnome-doc-utils.make-sysrooted-pkg-config.patch"
+SRC_URI[md5sum] = "b5da0ce717b2dc710e93a10b97c0f9ce"
+SRC_URI[sha256sum] = "f180a5018eee6e3fe574854cb025af897dd9962b01d17d5752e626876d388b19"
+
+EXTRA_OECONF += "--disable-scrollkeeper"
+
+FILES_${PN} += "${datadir}/icons"
+FILES_${PN}-dbg += "${libdir}/glade3/modules/.debug"
+FILES_${PN}-dev += "${libdir}/glade3/modules/*.la"
--
Quoted 2 lines

1.7.4.4

Patchwork does not like the third of this series. So this series can be found at

git://gitorious.org/schnitzeltony-oe-meta/meta-openembedded.git
branch patches

Andreas

#5 lore raw
Quoted 6 lines · Andreas Müller

Patchwork does not like the third of this series. So this series can be found at

git://gitorious.org/schnitzeltony-oe-meta/meta-openembedded.git
branch patches

Andreas

ping

#6 lore raw
Quoted 9 lines · Andreas Müller
Quoted 6 lines · Andreas Müller

Patchwork does not like the third of this series. So this series can be found at

git://gitorious.org/schnitzeltony-oe-meta/meta-openembedded.git
branch patches

Andreas

ping

Sorry to bug here again but is there something wrong with this series? I have 1+2 in daily use since I am writing an xfce-panel-plugin and the libxfce4ui-glade stuff is not available in my build machine's distro.

If there are objections on these patches I will put 1+2 in my meta-devel. So please let me know so I can close this.

Andreas

#7 lore raw
Quoted 16 lines · Andreas Müller
Quoted 9 lines · Andreas Müller
Quoted 6 lines · Andreas Müller

Patchwork does not like the third of this series. So this series can be found at

git://gitorious.org/schnitzeltony-oe-meta/meta-openembedded.git
branch patches

Andreas

ping

Sorry to bug here again but is there something wrong with this series? I have 1+2 in daily use since I am writing an xfce-panel-plugin and the libxfce4ui-glade stuff is not available in my build machine's distro.

Quoted 4 lines

If there are objections on these patches I will put 1+2 in my meta-devel. So please let me know so I can close this.

Andreas

Don't we share the same README?

Andreas