Skip to contentSkip to conversation

next series of fixes/updates

PATCH In review Andreas Müller 2 participants 12 messages Sep 8, 2015 – Sep 18, 2015

lore
Share & tools
lore
#0 lore raw

cover next series of fixes/updates

The following changes since commit d36e2d1066f50036080f978583a58fe79ecfac54:

libunique: add a recipe from oe-core (2015-09-08 16:30:24 +0200)

are available in the git repository at:

git://github.com/schnitzeltony/meta-openembedded.git patches

for you to fetch changes up to a879e4b3c1b8fefef6d9614efffcb7021e868a22:

libgtop: update to 2.30.0 (2015-09-08 17:35:03 +0200)

----------------------------------------------------------------
Andreas Müller (9):
xfce4-equake-plugin: update to 1.3.8
parole: initial add 0.8.0 packagegroup-xfce-multimedia: add parole
evolution-data-server: fix locale installation path
openbox: update to 3.6.1
openbox: add libcroco, librsvg and gdk-pixbuf to DEPENDS meta-xfce/README: mention meta-gnome in layers required
gnome-settings-daemon: fix build for libnotify > 0.7.x
libgtop: update to 2.30.0

 meta-gnome/recipes-gnome/eds/evolution-data-server/0006-configure.ac-do-not-overwrite-localedir.patch | 34 ++++++++++++++++++++++++++++++
 meta-gnome/recipes-gnome/eds/evolution-data-server_git.bb                                             |  1 +
 meta-gnome/recipes-gnome/gnome-settings-daemon/files/0001-Require-libnotify-0.6.0.patch               | 81 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 meta-gnome/recipes-gnome/gnome-settings-daemon/gnome-settings-daemon_2.32.1.bb                        |  5 ++++-
 meta-gnome/recipes-gnome/libgtop/{libgtop_2.28.2.bb => libgtop_2.30.0.bb}                             |  5 ++---
 meta-oe/recipes-graphics/openbox/{openbox_3.5.0.bb => openbox_3.6.1.bb}                               | 13 ++++++------
 meta-xfce/README                                                                                      |  2 +-
 meta-xfce/recipes-multimedia/packagegroups/packagegroup-xfce-multimedia.bb                            |  1 +
 meta-xfce/recipes-multimedia/parole/files/parole-0.8.0-appdata.patch                                  | 30 ++++++++++++++++++++++++++
 meta-xfce/recipes-multimedia/parole/parole_0.8.0.bb                                                   | 37 ++++++++++++++++++++++++++++++++
 meta-xfce/recipes-panel-plugins/equake/{xfce4-equake-plugin_1.3.7.bb => xfce4-equake-plugin_1.3.8.bb} |  4 ++--
 11 files changed, 200 insertions(+), 13 deletions(-)
 create mode 100644 meta-gnome/recipes-gnome/eds/evolution-data-server/0006-configure.ac-do-not-overwrite-localedir.patch
 create mode 100644 meta-gnome/recipes-gnome/gnome-settings-daemon/files/0001-Require-libnotify-0.6.0.patch
 rename meta-gnome/recipes-gnome/libgtop/{libgtop_2.28.2.bb => libgtop_2.30.0.bb} (52%)
 rename meta-oe/recipes-graphics/openbox/{openbox_3.5.0.bb => openbox_3.6.1.bb} (84%)
 create mode 100644 meta-xfce/recipes-multimedia/parole/files/parole-0.8.0-appdata.patch
 create mode 100644 meta-xfce/recipes-multimedia/parole/parole_0.8.0.bb
 rename meta-xfce/recipes-panel-plugins/equake/{xfce4-equake-plugin_1.3.7.bb => xfce4-equake-plugin_1.3.8.bb} (74%)
Signature · 1 line
2.1.0
#1 lore raw

PATCH 1/9 xfce4-equake-plugin: update to 1.3.8

---
 .../{xfce4-equake-plugin_1.3.7.bb => xfce4-equake-plugin_1.3.8.bb}    | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
 rename meta-xfce/recipes-panel-plugins/equake/{xfce4-equake-plugin_1.3.7.bb => xfce4-equake-plugin_1.3.8.bb} (74%)
meta-xfce/recipes-panel-plugins/equake/xfce4-equake-plugin_1.3.8.bb renamed from meta-xfce/recipes-panel-plugins/equake/xfce4-equake-plugin_1.3.7.bb +2 -2
similarity index 74%
rename from meta-xfce/recipes-panel-plugins/equake/xfce4-equake-plugin_1.3.7.bb
rename to meta-xfce/recipes-panel-plugins/equake/xfce4-equake-plugin_1.3.8.bb
index 5969021..76d25f8 100644
@@ -6,7 +6,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504"
 
 inherit xfce-panel-plugin
 
-SRC_URI[md5sum] = "4f8b8fc85e9506f43c9343f3c3c99ae1"
-SRC_URI[sha256sum] = "6b9e14c2f54060d182b61e90b4c84a79b57aab1955e3ff877c757f26cefa23bf"
+SRC_URI[md5sum] = "c8f6cb2aec62513c343281eacc4fc395"
+SRC_URI[sha256sum] = "431575da3d49fea3afa60f02e83c8d74e20e9a229c9c4ec82c21d45e2c986925"
 
 FILES_${PN} += "${libdir}/xfce4/panel-plugins/xfce4-equake-plugin"
Signature · 1 line
2.1.0
#2 lore raw

PATCH 2/9 parole: initial add 0.8.0

In reply to Andreas Müller
---
 .../parole/files/parole-0.8.0-appdata.patch        | 30 ++++++++++++++++++
 .../recipes-multimedia/parole/parole_0.8.0.bb      | 37 ++++++++++++++++++++++
 2 files changed, 67 insertions(+)
 create mode 100644 meta-xfce/recipes-multimedia/parole/files/parole-0.8.0-appdata.patch
 create mode 100644 meta-xfce/recipes-multimedia/parole/parole_0.8.0.bb
meta-xfce/recipes-multimedia/parole/files/parole-0.8.0-appdata.patch new file +30 -0
new file mode 100644
index 0000000..e076924
@@ -0,0 +1,30 @@
+Upstream-Status: submitted [1]
+Taken-From: [2]
+
+[1] https://bugzilla.xfce.org/show_bug.cgi?id=11653
+[2] http://pkgs.fedoraproject.org/cgit/parole.git/tree/parole-0.8.0-appdata.patch
+
+diff -Nur parole-0.8.0.orig/data/appdata/parole.appdata.xml.in parole-0.8.0/data/appdata/parole.appdata.xml.in
+--- parole-0.8.0.orig/data/appdata/parole.appdata.xml.in	2015-02-28 07:23:54.000000000 -0700
++++ parole-0.8.0/data/appdata/parole.appdata.xml.in	2015-03-07 08:25:01.940009844 -0700
+@@ -41,7 +41,7 @@
+   </provides>
+ 
+   <releases>
+-    <release version="0.7.0" timestamp="">
++    <release version="0.7.0" timestamp="1396146123">
+       <description>
+         <_p>This unstable development release adds the new clutter backend and cleans up
+         deprecated Gtk3 symbols. It also adds a "go to position" feature and several bugs
+diff -Nur parole-0.8.0.orig/po/es.po parole-0.8.0/po/es.po
+--- parole-0.8.0.orig/po/es.po	2015-02-28 07:23:54.000000000 -0700
++++ parole-0.8.0/po/es.po	2015-03-07 08:25:17.447726837 -0700
+@@ -514,7 +514,7 @@
+ "This unstable development release adds the new clutter backend and cleans up"
+ " deprecated Gtk3 symbols. It also adds a \"go to position\" feature and "
+ "several bugs have been addressed."
+-msgstr "Esta versión de desarrollo añade un nuevo motor de <i>clutter</i> y elimina símbolos GTK3 obsoletos. Además añade la funcionalidad «Ir a la posición» y corrige un sinnúmero de errores."
++msgstr "Esta versión de desarrollo añade un nuevo motor de clutter y elimina símbolos GTK3 obsoletos. Además añade la funcionalidad «Ir a la posición» y corrige un sinnúmero de errores."
+ 
+ #: ../data/appdata/parole.appdata.xml.in.h:4
+ msgid "This release fixes a problem with detecting DVD drive locations."
meta-xfce/recipes-multimedia/parole/parole_0.8.0.bb new file +37 -0
new file mode 100644
index 0000000..28bedaf
@@ -0,0 +1,37 @@
+DESCRIPTION = "Parole is a modern simple media player based on the GStreamer framework"
+HOMEPAGE = "http://goodies.xfce.org/projects/applications/parole"
+LICENSE = "GPLv2"
+LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552"
+
+inherit xfce-app gtk-doc mime
+
+DEPENDS = " \
+    glib-2.0 \
+    dbus-glib \
+    gtk+3 \
+    \
+    xfce4-dev-tools-native \
+    libxfce4util \
+    libxfce4ui \
+    xfconf \
+    \
+    gstreamer1.0-plugins-base \
+    taglib \
+"
+
+SRC_URI[md5sum] = "fffdc23d2aa22271f01410a9e27c3404"
+SRC_URI[sha256sum] = "2d966aeb426de81d992829e33b3f66185b19fd031a1891968b3a40d6d50239cc"
+SRC_URI += "file://parole-0.8.0-appdata.patch"
+
+RDEPENDS_${PN} += "gstreamer1.0-plugins-good"
+
+PACKAGECONFIG ??= "notify"
+PACKAGECONFIG[clutter] = "--enable-clutter, --disable-clutter, clutter"
+PACKAGECONFIG[notify] = "--enable-notify-plugin, --disable-notify-plugin, libnotify"
+
+FILES_${PN} += " \
+    ${datadir}/appdata \
+    ${libdir}/parole-0/*.so \
+"
+FILES_${PN}-dbg += "${libdir}/parole-0/.debug"
+FILES_${PN}-dev += "${libdir}/parole-0/*.la"
Signature · 1 line
2.1.0
#3 lore raw

PATCH 3/9 packagegroup-xfce-multimedia: add parole

In reply to Andreas Müller
---
 .../recipes-multimedia/packagegroups/packagegroup-xfce-multimedia.bb     | 1 +
 1 file changed, 1 insertion(+)
meta-xfce/recipes-multimedia/packagegroups/packagegroup-xfce-multimedia.bb +1 -0
index 00b0b91..72a96f3 100644
@@ -5,6 +5,7 @@ LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=4d92cd373abda3937c2bc47fbc49d
 inherit packagegroup
 
 RDEPENDS_${PN} = " \
+    parole \
     xfmpc \
     xfce4-mpc-plugin \
 "
Signature · 1 line
2.1.0
#4 lore raw

PATCH 4/9 evolution-data-server: fix locale installation path

In reply to Andreas Müller

fixes:

WARNING: QA Issue: evolution-data-server: Files/directories were installed but not shipped in any package:
/usr/locale
/usr/locale/xh
/usr/locale/hu
/usr/locale/nn
/usr/locale/fi
...

---
 ...6-configure.ac-do-not-overwrite-localedir.patch | 34 ++++++++++++++++++++++
 .../recipes-gnome/eds/evolution-data-server_git.bb |  1 +
 2 files changed, 35 insertions(+)
 create mode 100644 meta-gnome/recipes-gnome/eds/evolution-data-server/0006-configure.ac-do-not-overwrite-localedir.patch
meta-gnome/recipes-gnome/eds/evolution-data-server/0006-configure.ac-do-not-overwrite-localedir.patch new file +34 -0
new file mode 100644
index 0000000..741e5e9
@@ -0,0 +1,34 @@
+From 3feaea8e84b3ad8dc2d551e42224f3b4a9413e7d Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Andreas=20M=C3=BCller?= <[email protected]>
+Date: Thu, 3 Sep 2015 11:14:24 +0200
+Subject: [PATCH] configure.ac: do not overwrite localedir
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Upstream-Status: Backport [1]
+
+[1] https://git.gnome.org/browse/evolution-data-server/tree/configure.ac#n298
+
+Signed-off-by: Andreas Müller <[email protected]>
+---
+ configure.ac | 3 ---
+ 1 file changed, 3 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index f1d4ce8..cee847f 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -257,9 +257,6 @@ GETTEXT_PACKAGE=evolution-data-server-$BASE_VERSION
+ AC_SUBST(GETTEXT_PACKAGE)
+ AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE, "$GETTEXT_PACKAGE", [Package name for gettext])
+ 
+-localedir='$(prefix)/$(DATADIRNAME)/locale'
+-AC_SUBST(localedir)
+-
+ dnl ******************************
+ dnl Initialize libtool
+ dnl ******************************
+-- 
+2.1.0
+
meta-gnome/recipes-gnome/eds/evolution-data-server_git.bb +1 -0
index 7c935a3..426076f 100644
@@ -22,6 +22,7 @@ SRC_URI = " \
     file://0003-Disable-Werror-for-automake.patch \
     file://0004-configure-Fix-libical-pkg-config-trying-to-use-host-.patch \
     file://0005-soup-adapt-to-new-libxml2-API-from-2.9.0.patch \
+    file://0006-configure.ac-do-not-overwrite-localedir.patch \
     file://iconv-detect.h \
 "
 
Signature · 1 line
2.1.0
#5 lore raw

Re: [PATCH 4/9] evolution-data-server: fix locale installation path

Quoted 9 lines · Andreas Müller

fixes:

WARNING: QA Issue: evolution-data-server: Files/directories were installed but not shipped in any package:
/usr/locale
/usr/locale/xh
/usr/locale/hu
/usr/locale/nn
/usr/locale/fi
...

Can you check the same issue in gnome-themes-2.32.1 ? It would make my qa.log a lot shorter :).

Quoted 68 lines
---
 ...6-configure.ac-do-not-overwrite-localedir.patch | 34 ++++++++++++++++++++++
 .../recipes-gnome/eds/evolution-data-server_git.bb |  1 +
 2 files changed, 35 insertions(+)
 create mode 100644 meta-gnome/recipes-gnome/eds/evolution-data-server/0006-configure.ac-do-not-overwrite-localedir.patch
meta-gnome/recipes-gnome/eds/evolution-data-server/0006-configure.ac-do-not-overwrite-localedir.patch new file +34 -0
new file mode 100644
index 0000000..741e5e9
@@ -0,0 +1,34 @@
+From 3feaea8e84b3ad8dc2d551e42224f3b4a9413e7d Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Andreas=20M=C3=BCller?= <[email protected]>
+Date: Thu, 3 Sep 2015 11:14:24 +0200
+Subject: [PATCH] configure.ac: do not overwrite localedir
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Upstream-Status: Backport [1]
+
+[1] https://git.gnome.org/browse/evolution-data-server/tree/configure.ac#n298
+
+Signed-off-by: Andreas Müller <[email protected]>
+---
+ configure.ac | 3 ---
+ 1 file changed, 3 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index f1d4ce8..cee847f 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -257,9 +257,6 @@ GETTEXT_PACKAGE=evolution-data-server-$BASE_VERSION
+ AC_SUBST(GETTEXT_PACKAGE)
+ AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE, "$GETTEXT_PACKAGE", [Package name for gettext])
+ 
+-localedir='$(prefix)/$(DATADIRNAME)/locale'
+-AC_SUBST(localedir)
+-
+ dnl ******************************
+ dnl Initialize libtool
+ dnl ******************************
+-- 
+2.1.0
+
meta-gnome/recipes-gnome/eds/evolution-data-server_git.bb +1 -0
index 7c935a3..426076f 100644
@@ -22,6 +22,7 @@ SRC_URI = " \
     file://0003-Disable-Werror-for-automake.patch \
     file://0004-configure-Fix-libical-pkg-config-trying-to-use-host-.patch \
     file://0005-soup-adapt-to-new-libxml2-API-from-2.9.0.patch \
+    file://0006-configure.ac-do-not-overwrite-localedir.patch \
     file://iconv-detect.h \
 "
 
Signature · 7 lines
2.1.0

-- 
_______________________________________________
Openembedded-devel mailing list
[email protected]
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
Signature · 1 line
Martin 'JaMa' Jansa     jabber: [email protected]
#6 lore raw

PATCH 1/1 gnome-themes: drop localedir override from configure to fix locale installation

---
 .../gnome-themes/drop-localedir-override.patch     | 22 ++++++++++++++++++++++
 .../recipes-gnome/themes/gnome-themes_2.32.1.bb    |  4 +++-
 2 files changed, 25 insertions(+), 1 deletion(-)
 create mode 100644 meta-gnome/recipes-gnome/themes/gnome-themes/drop-localedir-override.patch
meta-gnome/recipes-gnome/themes/gnome-themes/drop-localedir-override.patch new file +22 -0
new file mode 100644
index 0000000..e37482b
@@ -0,0 +1,22 @@
+Causes locale file to be installed in /usr/locale instead of /usr/share/locale
+
+Apply the same fix as in evolution-data-server:
+https://git.gnome.org/browse/evolution-data-server/commit/configure.ac?id=ec46c763e9342f604b7228c660623d271dfeb101
+
+Upstream-Status: Pending
+
+diff -uNr gnome-themes-2.32.1.orig/configure.in gnome-themes-2.32.1/configure.in
+--- gnome-themes-2.32.1.orig/configure.in	2015-09-18 15:01:25.152055729 +0200
++++ gnome-themes-2.32.1/configure.in	2015-09-18 15:09:03.312072156 +0200
+@@ -19,11 +19,6 @@
+ 
+ AM_GLIB_GNU_GETTEXT
+ 
+-# AM_GLIB_GNU_GETTEXT above subst. $DATADIRNAME
+-# this is the directory where the *.{mo,gmo} files are installed
+-localedir='${prefix}/${DATADIRNAME}/locale'
+-AC_SUBST(localedir)
+-
+ # Workaround to make aclocal get the right flags
+ AC_SUBST(ACLOCAL_AMFLAGS, "\${ACLOCAL_FLAGS}")
+ 
meta-gnome/recipes-gnome/themes/gnome-themes_2.32.1.bb +3 -1
index 2da92b6..e9e1b50 100644
@@ -25,7 +25,9 @@ FILES_gnome-theme-mist = "${datadir}/themes/Mist ${datadir}/icons/Mist"
 
 FILES_${PN} += "${datadir}/themes ${datadir}/icons"
 
-SRC_URI += "file://iconpath-option.patch" 
+SRC_URI += "file://iconpath-option.patch \
+    file://drop-localedir-override.patch \
+" 
 SRC_URI[archive.md5sum] = "41db9e3cb25d35af2675c599e67944d1"
 SRC_URI[archive.sha256sum] = "8601ee24c2e096593221cbd6ebdb6686042225a03c02a01c0d67c163f9febd1a"
 GNOME_COMPRESS_TYPE="bz2"
Signature · 1 line
2.5.1
#7 lore raw

PATCH 5/9 openbox: update to 3.6.1

In reply to Andreas Müller

run tested with lxqt on raspi2

---
 .../openbox/{openbox_3.5.0.bb => openbox_3.6.1.bb}            | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)
 rename meta-oe/recipes-graphics/openbox/{openbox_3.5.0.bb => openbox_3.6.1.bb} (88%)
meta-oe/recipes-graphics/openbox/openbox_3.6.1.bb renamed from meta-oe/recipes-graphics/openbox/openbox_3.5.0.bb +6 -5
similarity index 88%
rename from meta-oe/recipes-graphics/openbox/openbox_3.5.0.bb
rename to meta-oe/recipes-graphics/openbox/openbox_3.6.1.bb
index d9e58f1..de4d9f8 100644
@@ -6,10 +6,8 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f"
 
 SRC_URI = "http://icculus.org/openbox/releases/openbox-${PV}.tar.gz"
 
-SRC_URI[md5sum] = "00441b53cf14c03566c8e82643544ff9"
-SRC_URI[sha256sum] = "6fa90016530b3aa6102e254079461977439398531fb23e7ec076ff2c140fea0a"
-
-PR = "r2"
+SRC_URI[md5sum] = "b72794996c6a3ad94634727b95f9d204"
+SRC_URI[sha256sum] = "8b4ac0760018c77c0044fab06a4f0c510ba87eae934d9983b10878483bde7ef7"
 
 inherit autotools gettext update-alternatives pkgconfig distro_features_check
 # depends on virtual/libx11
@@ -44,6 +42,9 @@ FILES_${PN}-lxde += "${datadir}/lxde/ \
                      ${datadir}/xsessions \
                      ${datadir}/icons"
 
-FILES_${PN}-gnome += "${datadir}/gnome/"
+FILES_${PN}-gnome += " \
+    ${datadir}/gnome \
+    ${datadir}/gnome-session \
+"
 
 FILES_${PN}-config += "${sysconfdir}"
Signature · 1 line
2.1.0
#8 lore raw

PATCH 6/9 openbox: add libcroco, librsvg and gdk-pixbuf to DEPENDS

In reply to Andreas Müller

fixes:

WARNING: QA Issue: openbox-core rdepends on libcroco, but it isn't a build dependency? [build-deps]
WARNING: QA Issue: openbox-core rdepends on librsvg, but it isn't a build dependency? [build-deps]
WARNING: QA Issue: openbox-core rdepends on gdk-pixbuf, but it isn't a build dependency? [build-deps]

why no PACKAGECONFIG?

* libcroco and gdk-pixbuf are not configurable
* librsvg is required to display svg icons which is a basic requirement

---
 meta-oe/recipes-graphics/openbox/openbox_3.6.1.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
meta-oe/recipes-graphics/openbox/openbox_3.6.1.bb +1 -1
index de4d9f8..44afed2 100644
@@ -1,6 +1,6 @@
 SUMMARY = "openbox Window Manager"
 SECTION = "x11/wm"
-DEPENDS = "glib-2.0 pango libxml2 virtual/libx11"
+DEPENDS = "glib-2.0 pango libxml2 virtual/libx11 libcroco librsvg gdk-pixbuf"
 LICENSE = "GPLv2+"
 LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f"
 
Signature · 1 line
2.1.0
#9 lore raw

PATCH 7/9 meta-xfce/README: mention meta-gnome in layers required

In reply to Andreas Müller

form a quick glance meta-xfce at least requires libwnck and gvfs to build an run properly.

---
 meta-xfce/README | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
meta-xfce/README +1 -1
index e346888..33ef509 100644
@@ -7,7 +7,7 @@ revision: HEAD
 URI: git://github.com/openembedded/meta-oe.git
 branch: master
 revision: HEAD
-meta-xfce depends on meta-oe and meta-multimedia in this repository.
+meta-xfce depends on meta-oe, meta-gnome and meta-multimedia in this repository.
 
 To avoid dependencies on meta-multimedia you need to mask recipes by adding
 this to local.conf:
Signature · 1 line
2.1.0
#10 lore raw

PATCH 8/9 gnome-settings-daemon: fix build for libnotify > 0.7.x

In reply to Andreas Müller
---
 .../files/0001-Require-libnotify-0.6.0.patch       | 81 ++++++++++++++++++++++
 .../gnome-settings-daemon_2.32.1.bb                |  5 +-
 2 files changed, 85 insertions(+), 1 deletion(-)
 create mode 100644 meta-gnome/recipes-gnome/gnome-settings-daemon/files/0001-Require-libnotify-0.6.0.patch
meta-gnome/recipes-gnome/gnome-settings-daemon/files/0001-Require-libnotify-0.6.0.patch new file +81 -0
new file mode 100644
index 0000000..6dd33f3
@@ -0,0 +1,81 @@
+From e1ab570b0dce479ba235e5542ea07d1b5bafc4c9 Mon Sep 17 00:00:00 2001
+From: William Jon McCann <[email protected]>
+Date: Mon, 11 Oct 2010 23:35:45 -0400
+Subject: [PATCH] Require libnotify 0.6.0
+
+Signed-off-by: Andreas Müller <[email protected]>
+
+Upstream-Status: Backport
+
+---
+ configure.ac                                      |  2 +-
+ plugins/a11y-keyboard/gsd-a11y-keyboard-manager.c |  8 ++------
+ plugins/xrandr/gsd-xrandr-manager.c               | 13 +++----------
+ 3 files changed, 6 insertions(+), 17 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 8a90053..8624b2a 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -54,7 +54,7 @@ GTK_REQUIRED_VERSION=2.91.0
+ GCONF_REQUIRED_VERSION=2.6.1
+ GIO_REQUIRED_VERSION=2.17.3
+ GNOME_DESKTOP_REQUIRED_VERSION=2.29.92
+-LIBNOTIFY_REQUIRED_VERSION=0.4.3
++LIBNOTIFY_REQUIRED_VERSION=0.6.1
+ 
+ EXTRA_COMPILE_WARNINGS(yes)
+ 
+diff --git a/plugins/a11y-keyboard/gsd-a11y-keyboard-manager.c b/plugins/a11y-keyboard/gsd-a11y-keyboard-manager.c
+index 9ca820a..f5964b9 100644
+--- a/plugins/a11y-keyboard/gsd-a11y-keyboard-manager.c
++++ b/plugins/a11y-keyboard/gsd-a11y-keyboard-manager.c
+@@ -608,9 +608,7 @@ ax_slowkeys_warning_post_bubble (GsdA11yKeyboardManager *manager,
+         gsd_a11y_keyboard_manager_ensure_status_icon (manager);
+         manager->priv->notification = notify_notification_new (title,
+                                                                message,
+-                                                               "preferences-desktop-accessibility",
+-                                                               NULL);
+-        notify_notification_attach_to_status_icon (manager->priv->notification, manager->priv->status_icon);
++                                                               "preferences-desktop-accessibility");
+         notify_notification_set_timeout (manager->priv->notification, NOTIFICATION_TIMEOUT * 1000);
+ 
+         notify_notification_add_action (manager->priv->notification,
+@@ -747,9 +745,7 @@ ax_stickykeys_warning_post_bubble (GsdA11yKeyboardManager *manager,
+         gsd_a11y_keyboard_manager_ensure_status_icon (manager);
+         manager->priv->notification = notify_notification_new (title,
+                                                                message,
+-                                                               "preferences-desktop-accessibility",
+-                                                               NULL);
+-        notify_notification_attach_to_status_icon (manager->priv->notification, manager->priv->status_icon);
++                                                               "preferences-desktop-accessibility");
+         notify_notification_set_timeout (manager->priv->notification, NOTIFICATION_TIMEOUT * 1000);
+ 
+         notify_notification_add_action (manager->priv->notification,
+diff --git a/plugins/xrandr/gsd-xrandr-manager.c b/plugins/xrandr/gsd-xrandr-manager.c
+index 02536a3..ef57d5b 100644
+--- a/plugins/xrandr/gsd-xrandr-manager.c
++++ b/plugins/xrandr/gsd-xrandr-manager.c
+@@ -1084,16 +1084,9 @@ error_message (GsdXrandrManager *mgr, const char *primary_text, GError *error_to
+ 
+         g_assert (error_to_display == NULL || secondary_text == NULL);
+ 
+-        if (priv->status_icon)
+-                notification = notify_notification_new_with_status_icon (primary_text,
+-                                                                         error_to_display ? error_to_display->message : secondary_text,
+-                                                                         GSD_XRANDR_ICON_NAME,
+-                                                                         priv->status_icon);
+-        else
+-                notification = notify_notification_new (primary_text,
+-                                                        error_to_display ? error_to_display->message : secondary_text,
+-                                                        GSD_XRANDR_ICON_NAME,
+-                                                        NULL);
++        notification = notify_notification_new (primary_text,
++                                                error_to_display ? error_to_display->message : secondary_text,
++                                                GSD_XRANDR_ICON_NAME);
+ 
+         notify_notification_show (notification, NULL); /* NULL-GError */
+ #else
+-- 
+2.1.0
+
meta-gnome/recipes-gnome/gnome-settings-daemon/gnome-settings-daemon_2.32.1.bb +4 -1
index e06c5f9..f8ece37 100644
@@ -8,7 +8,10 @@ DEPENDS = "intltool libxxf86misc libsndfile1 libxtst glib-2.0 polkit gtk+ gconf
 
 inherit gnome
 
-SRC_URI = "git://git.gnome.org/gnome-settings-daemon;branch=gnome-2-32"
+SRC_URI = " \
+    git://git.gnome.org/gnome-settings-daemon;branch=gnome-2-32 \
+    file://0001-Require-libnotify-0.6.0.patch \
+"
 SRCREV = "0160f6725cfb872e017f3958f108792c3b882872"
 
 S = "${WORKDIR}/git"
Signature · 1 line
2.1.0
#11 lore raw

PATCH 9/9 libgtop: update to 2.30.0

In reply to Andreas Müller
---
 .../recipes-gnome/libgtop/{libgtop_2.28.2.bb => libgtop_2.30.0.bb}   | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)
 rename meta-gnome/recipes-gnome/libgtop/{libgtop_2.28.2.bb => libgtop_2.30.0.bb} (52%)
meta-gnome/recipes-gnome/libgtop/libgtop_2.30.0.bb renamed from meta-gnome/recipes-gnome/libgtop/libgtop_2.28.2.bb +2 -3
similarity index 52%
rename from meta-gnome/recipes-gnome/libgtop/libgtop_2.28.2.bb
rename to meta-gnome/recipes-gnome/libgtop/libgtop_2.30.0.bb
index 2816e00..51c51d4 100644
@@ -3,8 +3,7 @@ LICENSE = "GPLv2+"
 LIC_FILES_CHKSUM = "file://copyright.txt;md5=dbc839bf158d19a20e661db14db7a58c"
 
 inherit gnomebase lib_package gtk-doc
-SRC_URI[archive.md5sum] = "ed44d736efd97d062b77621de6aff439"
-SRC_URI[archive.sha256sum] = "49958d7da1f76b257bfd0d557d8ed2b218a5ab0d31b59fed1c32ddf2a1529f5d"
-GNOME_COMPRESS_TYPE="bz2"
+SRC_URI[archive.md5sum] = "ee29a9ef60659ebf4b075ac281f71cb2"
+SRC_URI[archive.sha256sum] = "463bcbe5737b1b93f3345ee34abf601e8eb864f507c49ff1921c2737abafc1e5"
 
 DEPENDS = "glib-2.0 intltool-native libxau"
Signature · 1 line
2.1.0