Pending changes

PATCH New Martin Jansa 1 participant 5 messages Jul 19, 2012

lore

Share & tools

lore

Martin Jansa

author

2012-07-19 07:25 UTC #0 lore raw

cover Pending changes

The following changes since commit df741a297e1190d2dc23a133bc4a0a41118019c6:

gsettings-desktop-schemas: add SRC_URI checksums (2012-07-18 09:23:08 +0200)

are available in the git repository at:
git://git.openembedded.org/meta-openembedded-contrib jansa/pull
http://cgit.openembedded.org/cgit.cgi/meta-openembedded-contrib/log/?h=jansa/pull

Elvis Dowson (1):
python_numpy: Fix SRC_URI warnings.

Martin Jansa (3):
gnome-panel3: add dconf to DEPENDS
dconf: fix unpackaged /usr/lib/gio/modules/.debug/libdconfsettings.so gtk+3: fix build with automake-1.12.x

 meta-gnome/recipes-gnome/dconf/dconf_0.7.5.bb      |    3 ++
 .../gnome-panel/gnome-panel3_3.0.2.bb              |    2 +-
 .../gtk+/gtk+3/fix.build.automake-1.12.x.patch     |   27 ++++++++++++++++++++
 meta-gnome/recipes-gnome/gtk+/gtk+3_3.2.3.bb       |    6 +++-
 .../recipes-devtools/python/python-numpy_1.4.1.bb  |    9 ++++++-
 5 files changed, 44 insertions(+), 3 deletions(-)
 create mode 100644 meta-gnome/recipes-gnome/gtk+/gtk+3/fix.build.automake-1.12.x.patch

Signature · 1 line

1.7.8.6

Martin Jansa

author

2012-07-19 07:25 UTC #1 lore raw

PATCH 1/4 gnome-panel3: add dconf to DEPENDS

* fixes:
| configure:14455: error: Package requirements (gdk-pixbuf-2.0 >= 2.7.1 pango >= 1.15.4 gtk+-3.0 >= 3.0 cairo-xlib glib-2.0 >= 2.25.12 gio-2.0 >= 2.25.12 gio-unix-2.0 >= 2.25.12 gnome-desktop-3.0 >= 2.91.0 gconf-2.0 >= 2.6.1 libgnome-menu >= 2.27.92 dconf) were not met:
|
| No package 'dconf' found

Signed-off-by Martin Jansa <[email protected]>

---
 .../gnome-panel/gnome-panel3_3.0.2.bb              |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

meta-gnome/recipes-gnome/gnome-panel/gnome-panel3_3.0.2.bb +1 -1

index c7be8d0..bd21ca1 100644
@@ -12,7 +12,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
 
 SECTION = "x11/gnome"
 
-DEPENDS = "gnome-doc-utils-native gtk+3 gconf glib-2.0 gnome-desktop3 gtk+ pango libwnck3 gnome-menus cairo libgweather3 dbus-glib librsvg libcanberra" 
+DEPENDS = "gnome-doc-utils-native gtk+3 dconf gconf glib-2.0 gnome-desktop3 gtk+ pango libwnck3 gnome-menus cairo libgweather3 dbus-glib librsvg libcanberra" 
 
 inherit gtk-doc gnome gettext pkgconfig

Signature · 1 line

1.7.8.6

Martin Jansa

author

2012-07-19 07:25 UTC #2 lore raw

PATCH 2/4 dconf: fix unpackaged /usr/lib/gio/modules/.debug/libdconfsettings.so

In reply to Martin Jansa

Signed-off-by Martin Jansa <[email protected]>

---
 meta-gnome/recipes-gnome/dconf/dconf_0.7.5.bb |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)

meta-gnome/recipes-gnome/dconf/dconf_0.7.5.bb +3 -0

index 39d68cb..af9a83a 100644
@@ -12,12 +12,15 @@ DEPENDS = "glib-2.0 gtk+3"
 
 inherit vala
 
+PR = "r1"
+
 PACKAGES =+ "dconf-editor"
 
 FILES_dconf-editor = "${bindir}/dconf-editor ${datadir}/dconf-editor/"
 FILES_${PN} += "${datadir}/dbus-1/ \
                 ${libdir}/gio/modules/*.so \
                "
+FILES_${PN}-dbg += "${libdir}/gio/modules/.debug/libdconfsettings.so"
 
 pkg_postinst_${PN} () {
 if [ -n "$D" ]; then

Signature · 1 line

1.7.8.6

Martin Jansa

author

2012-07-19 07:25 UTC #3 lore raw

PATCH 3/4 gtk+3: fix build with automake-1.12.x

In reply to Martin Jansa

Signed-off-by Martin Jansa <[email protected]>

---
 .../gtk+/gtk+3/fix.build.automake-1.12.x.patch     |   27 ++++++++++++++++++++
 meta-gnome/recipes-gnome/gtk+/gtk+3_3.2.3.bb       |    6 +++-
 2 files changed, 32 insertions(+), 1 deletions(-)
 create mode 100644 meta-gnome/recipes-gnome/gtk+/gtk+3/fix.build.automake-1.12.x.patch

meta-gnome/recipes-gnome/gtk+/gtk+3/fix.build.automake-1.12.x.patch new file +27 -0

new file mode 100644
index 0000000..3cbf7dd
@@ -0,0 +1,27 @@
+diff -uNr gtk+-3.2.3.orig/gtk/Makefile.am gtk+-3.2.3/gtk/Makefile.am
+--- gtk+-3.2.3.orig/gtk/Makefile.am	2011-12-19 14:58:28.000000000 +0100
++++ gtk+-3.2.3/gtk/Makefile.am	2012-07-18 02:01:59.042628402 +0200
+@@ -942,7 +942,7 @@
+ 
+ if USE_QUARTZ
+ install-mac-key-theme:
+-	$(mkdir_p) $(DESTDIR)$(datadir)/themes/Mac/gtk-3.0
++	$(MKDIR_P) $(DESTDIR)$(datadir)/themes/Mac/gtk-3.0
+ 	$(INSTALL_DATA) $(srcdir)/gtk-keys.css.mac $(DESTDIR)$(datadir)/themes/Mac/gtk-3.0/gtk-keys.css
+ uninstall-mac-key-theme:
+ 	rm -f $(DESTDIR)$(datadir)/themes/Mac/gtk-3.0/gtk-keys.css
+@@ -985,11 +985,11 @@
+ 
+ # Install a RC file for the default GTK+ theme, and key themes
+ install-data-local: install-ms-lib install-def-file install-mac-key-theme
+-	$(mkdir_p) $(DESTDIR)$(datadir)/themes/Raleigh/gtk-3.0
++	$(MKDIR_P) $(DESTDIR)$(datadir)/themes/Raleigh/gtk-3.0
+ 	$(INSTALL_DATA) $(srcdir)/gtk.css.raleigh $(DESTDIR)$(datadir)/themes/Raleigh/gtk-3.0/gtk.css
+-	$(mkdir_p) $(DESTDIR)$(datadir)/themes/Default/gtk-3.0
++	$(MKDIR_P) $(DESTDIR)$(datadir)/themes/Default/gtk-3.0
+ 	$(INSTALL_DATA) $(srcdir)/gtk-keys.css.default $(DESTDIR)$(datadir)/themes/Default/gtk-3.0/gtk-keys.css
+-	$(mkdir_p) $(DESTDIR)$(datadir)/themes/Emacs/gtk-3.0
++	$(MKDIR_P) $(DESTDIR)$(datadir)/themes/Emacs/gtk-3.0
+ 	$(INSTALL_DATA) $(srcdir)/gtk-keys.css.emacs $(DESTDIR)$(datadir)/themes/Emacs/gtk-3.0/gtk-keys.css
+ 
+ uninstall-local: uninstall-ms-lib uninstall-def-file uninstall-mac-key-theme

meta-gnome/recipes-gnome/gtk+/gtk+3_3.2.3.bb +5 -1

index 2dc4c64..8553eb8 100644
@@ -16,10 +16,14 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=3bf50002aefd002f49e7bb854063f7e7 \
                     file://gdk/gdk.h;endline=27;md5=07db285ec208fb3e0bf7d861b0614202 \
                     file://tests/testgtk.c;endline=27;md5=ac85be7b810a1e9b00479af8e2018053"
 
-SRC_URI = "http://download.gnome.org/sources/gtk+/3.2/gtk+-${PV}.tar.xz"
+SRC_URI = "http://download.gnome.org/sources/gtk+/3.2/gtk+-${PV}.tar.xz \
+  file://fix.build.automake-1.12.x.patch \
+"
 SRC_URI[md5sum] = "b4edcc69e39159dd7be17828249afb46"
 SRC_URI[sha256sum] = "e2cf20f2510ebbc7be122a1a33dd1f472a7d06aaf16b4f2a63eb048cd9141d3d"
 
+PR = "r1"
+
 inherit autotools pkgconfig
 
 S = "${WORKDIR}/gtk+-${PV}"

Signature · 1 line

1.7.8.6

Martin Jansa

author

2012-07-19 07:25 UTC #4 lore raw

PATCH 4/4 python_numpy: Fix SRC_URI warnings.

In reply to Martin Jansa

From: Elvis Dowson <[email protected]>

This commit fixes the following warnings:
WARNING: Unable to get checksum for python-numpy SRC_URI entry config.h: file could not be found
WARNING: Unable to get checksum for python-numpy SRC_URI entry numpyconfig.h: file could not be found

Signed-off-by Elvis Dowson <[email protected]>

Signed-off-by Martin Jansa <[email protected]>

---
 .../recipes-devtools/python/python-numpy_1.4.1.bb  |    9 ++++++++-
 1 files changed, 8 insertions(+), 1 deletions(-)

meta-oe/recipes-devtools/python/python-numpy_1.4.1.bb +8 -1

index a67bf8b..c1923f7 100644
@@ -5,7 +5,14 @@ LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=3c42211d73c3faa1026e671dd39883fa"
 PR = "r3"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/numpy/numpy-${PV}.tar.gz \
-	   file://config.h \
+           ${CONFIGFILESURI} \
+	  "
+CONFIGFILESURI ?= ""
+
+CONFIGFILESURI_arm = "file://config.h \
+	   file://numpyconfig.h \
+	  "
+CONFIGFILESURI_mipsel = "file://config.h \
 	   file://numpyconfig.h \
 	  "

Signature · 1 line

1.7.8.6