Skip to contentSkip to conversation

gnome-panel3: move as-needed.patch to gnome-panel dir

PATCH New Martin Jansa 1 participant 4 messages Jul 17, 2012 – Jul 18, 2012

lore
Share & tools
lore
#0 lore raw

PATCH 1/2 gnome-panel3: move as-needed.patch to gnome-panel dir

* there is BPN changed to gnome-panel and SRC_URI checksuming code cannot find it, causing this warning:
WARNING: Unable to get checksum for gnome-panel3-native SRC_URI entry as-needed.patch: file could not be found

---
 .../{gnome-panel3 => gnome-panel}/as-needed.patch  |    0
 .../gnome-panel/gnome-panel3_3.0.2.bb              |    1 +
 2 files changed, 1 insertions(+), 0 deletions(-)
 rename meta-gnome/recipes-gnome/gnome-panel/{gnome-panel3 => gnome-panel}/as-needed.patch (100%)
meta-gnome/recipes-gnome/gnome-panel/gnome-panel/as-needed.patch renamed from meta-gnome/recipes-gnome/gnome-panel/gnome-panel3/as-needed.patch +0 -0
similarity index 100%
rename from meta-gnome/recipes-gnome/gnome-panel/gnome-panel3/as-needed.patch
rename to meta-gnome/recipes-gnome/gnome-panel/gnome-panel/as-needed.patch
meta-gnome/recipes-gnome/gnome-panel/gnome-panel3_3.0.2.bb +1 -0
index 37288e1..c7be8d0 100644
@@ -2,6 +2,7 @@ DESCRIPTION = "GNOME panel"
 LICENSE = "GPLv2 & LGPLv2 & GFDLv1.1"
 
 BPN = "gnome-panel"
+PR = "r1"
 
 DEFAULT_PREFERENCE = "-1"
 
Signature · 1 line
1.7.8.6
#1 lore raw

PATCH 2/2 gsettings-desktop-schemas: add SRC_URI checksums

---
 .../gsettings-desktop-schemas_3.0.1.bb             |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)
meta-gnome/recipes-gnome/gnome-desktop/gsettings-desktop-schemas_3.0.1.bb +2 -0
index ef9bc67..a830905 100644
@@ -13,3 +13,5 @@ fi
 glib-compile-schemas ${datadir}/glib-2.0/schemas
 }
 
+SRC_URI[archive.md5sum] = "d42f0d79d6449a0eb1bb502eee8eb709"
+SRC_URI[archive.sha256sum] = "6e72158a0e70ae50b8bb992e1486dd2fda43207f4ec4eb03a0d769f210363fd9"
Signature · 1 line
1.7.8.6
#2 lore raw

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

---
 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
#3 lore raw

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

---
 .../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