From: Grazvydas Ignotas <notasas@gmail.com>
Date: Sat, 11 Oct 2014 01:54:01 +0000 (+0300)
Subject: bump more recipes for glib update
X-Git-Tag: sz_173~95
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=81349911a761026153c3338707d661659df86a10;p=openembedded.git

bump more recipes for glib update
---

diff --git a/recipes/gnome/gvfs_1.6.0.bb b/recipes/gnome/gvfs_1.6.0.bb
index d03ce8754f..8d50e7e2b0 100644
--- a/recipes/gnome/gvfs_1.6.0.bb
+++ b/recipes/gnome/gvfs_1.6.0.bb
@@ -4,6 +4,8 @@ DEPENDS = "gawk-native libimobiledevice gnome-keyring glib-2.0 obexftp fuse avah
 
 inherit gnome
 
+PR = "r1"
+
 SRC_URI[archive.md5sum] = "fb533047ddd894ec5c811b005cb88a07"
 SRC_URI[archive.sha256sum] = "2e4c973e75c7af8d2d88232cd7742971f655fdbd7f5b687450b858484d88a0d3"
 
diff --git a/recipes/hal/files/newer_glib.patch b/recipes/hal/files/newer_glib.patch
new file mode 100644
index 0000000000..c9920bb0bf
--- /dev/null
+++ b/recipes/hal/files/newer_glib.patch
@@ -0,0 +1,256 @@
+diff -urp git_/hald/hald_dbus.c git/hald/hald_dbus.c
+--- git_/hald/hald_dbus.c	2014-10-11 04:26:01.697811062 +0300
++++ git/hald/hald_dbus.c	2014-10-11 04:35:40.340332288 +0300
+@@ -36,7 +36,6 @@
+ #include <stdint.h>
+ #include <sys/time.h>
+ #include <glib.h>
+-#include <glib/gprintf.h>
+ #include <dbus/dbus.h>
+ #include <dbus/dbus-glib-lowlevel.h>
+ 
+diff -urp git_/hald/linux/addons/addon-acpi-buttons-toshiba.c git/hald/linux/addons/addon-acpi-buttons-toshiba.c
+--- git_/hald/linux/addons/addon-acpi-buttons-toshiba.c	2014-10-11 04:26:01.709810638 +0300
++++ git/hald/linux/addons/addon-acpi-buttons-toshiba.c	2014-10-11 04:36:01.859533542 +0300
+@@ -40,7 +40,7 @@ else
+ #include <string.h>
+ #include <unistd.h>
+ 
+-#include <glib/gmain.h>
++#include <glib.h>
+ 
+ #include "libhal/libhal.h"
+ #include "../../logger.h"
+diff -urp git_/hald/linux/addons/addon-cpufreq.c git/hald/linux/addons/addon-cpufreq.c
+--- git_/hald/linux/addons/addon-cpufreq.c	2014-10-11 04:26:01.709810638 +0300
++++ git/hald/linux/addons/addon-cpufreq.c	2014-10-11 04:36:09.763240131 +0300
+@@ -32,7 +32,6 @@
+ #include <unistd.h>
+ #include <signal.h>
+ #include <getopt.h>
+-#include <glib/gprintf.h>
+ 
+ #include "addon-cpufreq.h"
+ #include "addon-cpufreq-userspace.h"
+diff -urp git_/hald/linux/addons/addon-dell-backlight.cpp git/hald/linux/addons/addon-dell-backlight.cpp
+--- git_/hald/linux/addons/addon-dell-backlight.cpp	2014-10-11 04:26:01.709810638 +0300
++++ git/hald/linux/addons/addon-dell-backlight.cpp	2014-10-11 04:36:22.846754514 +0300
+@@ -29,7 +29,7 @@
+ 
+ #include <string.h>
+ 
+-#include <glib/gmain.h>
++#include <glib.h>
+ #include <dbus/dbus-glib.h>
+ #include <dbus/dbus-glib-lowlevel.h>
+ 
+diff -urp git_/hald/linux/addons/addon-generic-backlight.c git/hald/linux/addons/addon-generic-backlight.c
+--- git_/hald/linux/addons/addon-generic-backlight.c	2014-10-11 04:26:01.709810638 +0300
++++ git/hald/linux/addons/addon-generic-backlight.c	2014-10-11 04:34:30.122938747 +0300
+@@ -35,7 +35,7 @@
+ #include <sys/stat.h>
+ #include <unistd.h> 
+ 
+-#include <glib/gmain.h>
++#include <glib.h>
+ #include <dbus/dbus-glib.h>
+ #include <dbus/dbus-glib-lowlevel.h>
+ 
+diff -urp git_/hald/linux/addons/addon-imac-backlight.c git/hald/linux/addons/addon-imac-backlight.c
+--- git_/hald/linux/addons/addon-imac-backlight.c	2014-10-11 04:26:01.709810638 +0300
++++ git/hald/linux/addons/addon-imac-backlight.c	2014-10-11 04:36:35.126298634 +0300
+@@ -29,7 +29,7 @@
+ #include <stdlib.h>
+ #include <sys/io.h>
+ 
+-#include <glib/gmain.h>
++#include <glib.h>
+ #include <dbus/dbus-glib.h>
+ #include <dbus/dbus-glib-lowlevel.h>
+ 
+diff -urp git_/hald/linux/addons/addon-input.c git/hald/linux/addons/addon-input.c
+--- git_/hald/linux/addons/addon-input.c	2014-10-11 04:26:01.709810638 +0300
++++ git/hald/linux/addons/addon-input.c	2014-10-11 04:36:42.066041141 +0300
+@@ -41,8 +41,7 @@
+ #else
+   #include <linux/input.h>
+ #endif
+-#include <glib/gmain.h>
+-#include <glib/gprintf.h>
++#include <glib.h>
+ #include <dbus/dbus-glib-lowlevel.h>
+ 
+ #include "libhal/libhal.h"
+diff -urp git_/hald/linux/addons/addon-ipw-killswitch.c git/hald/linux/addons/addon-ipw-killswitch.c
+--- git_/hald/linux/addons/addon-ipw-killswitch.c	2014-10-11 04:26:01.709810638 +0300
++++ git/hald/linux/addons/addon-ipw-killswitch.c	2014-10-11 04:36:47.761829682 +0300
+@@ -36,8 +36,6 @@
+ #include <unistd.h> 
+ 
+ #include <glib.h>
+-#include <glib/gmain.h>
+-#include <glib/gstdio.h>
+ #include <dbus/dbus-glib.h>
+ #include <dbus/dbus-glib-lowlevel.h>
+ 
+diff -urp git_/hald/linux/addons/addon-leds.c git/hald/linux/addons/addon-leds.c
+--- git_/hald/linux/addons/addon-leds.c	2014-10-11 04:26:01.709810638 +0300
++++ git/hald/linux/addons/addon-leds.c	2014-10-11 04:36:55.109556974 +0300
+@@ -36,8 +36,6 @@
+ #include <unistd.h> 
+ 
+ #include <glib.h>
+-#include <glib/gmain.h>
+-#include <glib/gstdio.h>
+ #include <dbus/dbus-glib.h>
+ #include <dbus/dbus-glib-lowlevel.h>
+ 
+diff -urp git_/hald/linux/addons/addon-macbookpro-backlight.c git/hald/linux/addons/addon-macbookpro-backlight.c
+--- git_/hald/linux/addons/addon-macbookpro-backlight.c	2014-10-11 04:26:01.709810638 +0300
++++ git/hald/linux/addons/addon-macbookpro-backlight.c	2014-10-11 04:37:04.857719948 +0300
+@@ -39,7 +39,7 @@
+ #include <pci/pci.h>
+ #include <unistd.h> 
+ 
+-#include <glib/gmain.h>
++#include <glib.h>
+ #include <dbus/dbus-glib.h>
+ #include <dbus/dbus-glib-lowlevel.h>
+ 
+diff -urp git_/hald/linux/addons/addon-omap-backlight.c git/hald/linux/addons/addon-omap-backlight.c
+--- git_/hald/linux/addons/addon-omap-backlight.c	2014-10-11 04:26:01.709810638 +0300
++++ git/hald/linux/addons/addon-omap-backlight.c	2014-10-11 04:37:11.510111615 +0300
+@@ -41,7 +41,7 @@
+ #include <fcntl.h>
+ #include <unistd.h> 
+ 
+-#include <glib/gmain.h>
++#include <glib.h>
+ #include <dbus/dbus-glib.h>
+ #include <dbus/dbus-glib-lowlevel.h>
+ 
+diff -urp git_/hald/linux/addons/addon-rfkill-killswitch.c git/hald/linux/addons/addon-rfkill-killswitch.c
+--- git_/hald/linux/addons/addon-rfkill-killswitch.c	2014-10-11 04:26:01.709810638 +0300
++++ git/hald/linux/addons/addon-rfkill-killswitch.c	2014-10-11 04:37:17.662774232 +0300
+@@ -36,8 +36,6 @@
+ #include <unistd.h> 
+ 
+ #include <glib.h>
+-#include <glib/gmain.h>
+-#include <glib/gstdio.h>
+ #include <dbus/dbus-glib.h>
+ #include <dbus/dbus-glib-lowlevel.h>
+ 
+diff -urp git_/hald/linux/addons/addon-storage.c git/hald/linux/addons/addon-storage.c
+--- git_/hald/linux/addons/addon-storage.c	2014-10-11 04:26:01.709810638 +0300
++++ git/hald/linux/addons/addon-storage.c	2014-10-11 04:37:28.908674427 +0300
+@@ -39,7 +39,7 @@
+ #include <string.h>
+ #include <sys/ioctl.h>
+ #include <unistd.h>
+-#include <glib/gmain.h>
++#include <glib.h>
+ #include <dbus/dbus-glib.h>
+ #include <dbus/dbus-glib-lowlevel.h>
+ 
+diff -urp git_/hald/linux/addons/addon-usb-csr.c git/hald/linux/addons/addon-usb-csr.c
+--- git_/hald/linux/addons/addon-usb-csr.c	2014-10-11 04:26:01.709810638 +0300
++++ git/hald/linux/addons/addon-usb-csr.c	2014-10-11 04:37:43.236902519 +0300
+@@ -29,7 +29,7 @@
+ #include <string.h>
+ #include <usb.h>
+ 
+-#include <glib/gmain.h>
++#include <glib.h>
+ #include <dbus/dbus-glib.h>
+ #include <dbus/dbus-glib-lowlevel.h>
+ 
+diff -urp git_/hald/linux/hal-file-monitor.c git/hald/linux/hal-file-monitor.c
+--- git_/hald/linux/hal-file-monitor.c	2014-10-11 04:26:01.709810638 +0300
++++ git/hald/linux/hal-file-monitor.c	2014-10-11 04:38:16.332696881 +0300
+@@ -36,8 +36,6 @@
+ #endif
+ 
+ #include <glib.h>
+-#include <glib/gi18n.h>
+-#include <glib/gstdio.h>
+ #include <glib-object.h>
+ 
+ #include "../hal-file-monitor.h"
+diff -urp git_/tools/hal-storage-cleanup-all-mountpoints.c git/tools/hal-storage-cleanup-all-mountpoints.c
+--- git_/tools/hal-storage-cleanup-all-mountpoints.c	2014-10-11 04:26:01.685811644 +0300
++++ git/tools/hal-storage-cleanup-all-mountpoints.c	2014-10-11 04:38:33.219985840 +0300
+@@ -31,7 +31,6 @@
+ #include <stdlib.h>
+ #include <string.h>
+ #include <glib.h>
+-#include <glib/gstdio.h>
+ 
+ #include "hal-storage-shared.h"
+ 
+diff -urp git_/tools/hal-storage-cleanup-mountpoint.c git/tools/hal-storage-cleanup-mountpoint.c
+--- git_/tools/hal-storage-cleanup-mountpoint.c	2014-10-11 04:26:01.689811446 +0300
++++ git/tools/hal-storage-cleanup-mountpoint.c	2014-10-11 04:38:37.219817351 +0300
+@@ -31,7 +31,6 @@
+ #include <stdlib.h>
+ #include <string.h>
+ #include <glib.h>
+-#include <glib/gstdio.h>
+ 
+ #include "hal-storage-shared.h"
+ 
+diff -urp git_/tools/hal-storage-closetray.c git/tools/hal-storage-closetray.c
+--- git_/tools/hal-storage-closetray.c	2014-10-11 04:26:01.685811644 +0300
++++ git/tools/hal-storage-closetray.c	2014-10-11 04:38:41.819623611 +0300
+@@ -30,7 +30,6 @@
+ #include <stdlib.h>
+ #include <string.h>
+ #include <glib.h>
+-#include <glib/gstdio.h>
+ #include <sys/types.h>
+ #include <unistd.h>
+ 
+diff -urp git_/tools/hal-storage-eject.c git/tools/hal-storage-eject.c
+--- git_/tools/hal-storage-eject.c	2014-10-11 04:26:01.689811446 +0300
++++ git/tools/hal-storage-eject.c	2014-10-11 04:38:45.247479302 +0300
+@@ -29,7 +29,6 @@
+ #include <stdlib.h>
+ #include <string.h>
+ #include <glib.h>
+-#include <glib/gstdio.h>
+ #include <sys/types.h>
+ #include <unistd.h>
+ 
+diff -urp git_/tools/hal-storage-mount.c git/tools/hal-storage-mount.c
+--- git_/tools/hal-storage-mount.c	2014-10-11 04:26:01.685811644 +0300
++++ git/tools/hal-storage-mount.c	2014-10-11 04:38:49.591296265 +0300
+@@ -30,7 +30,6 @@
+ #include <stdlib.h>
+ #include <string.h>
+ #include <glib.h>
+-#include <glib/gstdio.h>
+ #ifdef __FreeBSD__
+ #include <fstab.h>
+ #include <sys/param.h>
+diff -urp git_/tools/hal-storage-shared.c git/tools/hal-storage-shared.c
+--- git_/tools/hal-storage-shared.c	2014-10-11 04:26:01.685811644 +0300
++++ git/tools/hal-storage-shared.c	2014-10-11 04:38:53.171145482 +0300
+@@ -30,7 +30,6 @@
+ #include <stdlib.h>
+ #include <string.h>
+ #include <glib.h>
+-#include <glib/gstdio.h>
+ #ifdef __FreeBSD__
+ #include <fstab.h>
+ #include <sys/param.h>
+diff -urp git_/tools/hal-storage-unmount.c git/tools/hal-storage-unmount.c
+--- git_/tools/hal-storage-unmount.c	2014-10-11 04:26:01.685811644 +0300
++++ git/tools/hal-storage-unmount.c	2014-10-11 04:38:57.506962892 +0300
+@@ -30,7 +30,6 @@
+ #include <stdlib.h>
+ #include <string.h>
+ #include <glib.h>
+-#include <glib/gstdio.h>
+ #ifdef __FreeBSD__
+ #include <fstab.h>
+ #include <sys/param.h>
diff --git a/recipes/hal/hal.inc b/recipes/hal/hal.inc
index b93089428f..95c93b894d 100644
--- a/recipes/hal/hal.inc
+++ b/recipes/hal/hal.inc
@@ -3,6 +3,8 @@ HOMEPAGE = "http://freedesktop.org/Software/hal"
 SECTION = "unknown"
 LICENSE = "GPL LGPL AFL"
 
+INC_PR = "r11"
+
 SRC_URI = "http://hal.freedesktop.org/releases/hal-${PV}.tar.gz"
 
 S = "${WORKDIR}/hal-${PV}"
@@ -10,8 +12,8 @@ S = "${WORKDIR}/hal-${PV}"
 inherit autotools pkgconfig
 
 DEPENDS = "consolekit virtual/kernel util-linux-ng dbus-glib udev intltool intltool-native expat virtual/libusb0 gperf-native"
-RDEPENDS += "hal-info udev-utils"
-RRECOMMENDS += "eject"
+RDEPENDS_${PN} += "hal-info udev-utils"
+RRECOMMENDS_${PN} += "eject"
 
 SRC_URI += "file://99_hal \
             file://20hal \
@@ -43,6 +45,11 @@ do_install_append() {
         install -d ${D}/${sysconfdir}/dbus-1/event.d
         install -m 0755 ${WORKDIR}/20hal ${D}/${sysconfdir}/dbus-1/event.d
 	rm -rf ${D}/${sysconfdir}/rc.d || true
+
+        # Handle case where prefix is empty
+        if [ -z "$prefix" ]; then
+                sed -i 's,/usr,,g' ${D}/${sysconfdir}/dbus-1/event.d/20hal
+        fi
 }
 
 # At the time the postinst runs, dbus might not be setup so only restart if running
diff --git a/recipes/hal/hal_0.5.14+git.bb b/recipes/hal/hal_0.5.14+git.bb
index 1e1f10e01a..81e34d0bb8 100644
--- a/recipes/hal/hal_0.5.14+git.bb
+++ b/recipes/hal/hal_0.5.14+git.bb
@@ -1,19 +1,19 @@
 require hal.inc
 
-DEFAULT_PREFERENCE = "-1"
-DEFAULT_PREFERENCE_angstrom = "1"
-
 SRC_URI = "git://anongit.freedesktop.org/hal/;protocol=git \
         file://0001-Add-touchscreen-option.patch;patch=1 \
         file://20hal \
-        file://99_hal"
+        file://99_hal \
+	file://newer_glib.patch;patch=1"
 
-SRCREV = "6dccf8e3ad181e8f56b1d2a994ec50a1953a1c2d"
+SRCREV = "08e7d577151227199fc7c83a4a917ea1b922b14d"
 
 PV = "0.5.14"
-PR = "r2"
+PR = "${INC_PR}.2"
 PR_append = "+gitr${SRCREV}"
 
+EXTRA_OECONF += " --with-cpufreq=no --with-omap=no"
+
 S = "${WORKDIR}/git"
 
 # The following code finds the right linux/input.h,
diff --git a/recipes/networkmanager/network-manager-applet_0.8.bb b/recipes/networkmanager/network-manager-applet_0.8.bb
index 4a0db6b53e..7537d2655c 100644
--- a/recipes/networkmanager/network-manager-applet_0.8.bb
+++ b/recipes/networkmanager/network-manager-applet_0.8.bb
@@ -3,7 +3,7 @@ LICENSE = "GPL"
 DEPENDS = "gnome-bluetooth policykit-gnome libnotify networkmanager dbus-glib libglade gconf gnome-keyring"
 RDEPENDS = "networkmanager"
 
-PR = "r2"
+PR = "r3"
 
 inherit gnome
 
diff --git a/recipes/xfce-base/xfce4-settings_4.6.5.bb b/recipes/xfce-base/xfce4-settings_4.6.5.bb
index 65e4869158..b5f5043f4b 100644
--- a/recipes/xfce-base/xfce4-settings_4.6.5.bb
+++ b/recipes/xfce-base/xfce4-settings_4.6.5.bb
@@ -5,7 +5,7 @@ LICENSE = "GPL-2"
 
 DEPENDS = "virtual/libx11 virtual/xserver libxi libwnck xrandr exo libxfce4util libxfcegui4"
 
-PR = "r0"
+PR = "r1"
 
 inherit xfce46
 
diff --git a/recipes/xfce-extras/orage_4.6.1.bb b/recipes/xfce-extras/orage_4.6.1.bb
index 06f7296429..e5fbad5a99 100644
--- a/recipes/xfce-extras/orage_4.6.1.bb
+++ b/recipes/xfce-extras/orage_4.6.1.bb
@@ -4,7 +4,7 @@ RDEPENDS = "xfce4-panel"
 RREPLACES = "xfcalendar"
 
 SECTION = "x11"
-PR = "r3"
+PR = "r4"
 
 inherit xfce46
 
diff --git a/recipes/xfce-extras/xfce4-battery-plugin_0.5.1.bb b/recipes/xfce-extras/xfce4-battery-plugin_0.5.1.bb
index f4a87a3cfb..f56db5e70b 100644
--- a/recipes/xfce-extras/xfce4-battery-plugin_0.5.1.bb
+++ b/recipes/xfce-extras/xfce4-battery-plugin_0.5.1.bb
@@ -3,7 +3,7 @@ DEPENDS = "libxfcegui4 xfce4-panel"
 RDEPENDS = "libxfcegui4 xfce4-panel"
 
 SECTION = "x11"
-PR = "r2"
+PR = "r3"
 
 inherit xfce46
 
diff --git a/recipes/xfce-extras/xfce4-notifyd_0.1.0.bb b/recipes/xfce-extras/xfce4-notifyd_0.1.0.bb
index 961b7862b3..c04e1d0cbc 100644
--- a/recipes/xfce-extras/xfce4-notifyd_0.1.0.bb
+++ b/recipes/xfce-extras/xfce4-notifyd_0.1.0.bb
@@ -3,7 +3,7 @@ DEPENDS = "pkgconfig dbus gtk+ libsexy"
 RDEPENDS = "libxfce4util libxfcegui4 libnotify xfconf"
 
 SECTION = "x11"
-PR = "r1"
+PR = "r2"
 
 inherit xfce46
 
diff --git a/recipes/xfce-extras/xfce4-power-manager_0.8.4.2.bb b/recipes/xfce-extras/xfce4-power-manager_0.8.4.2.bb
index d970f444d8..8c9a1363e3 100644
--- a/recipes/xfce-extras/xfce4-power-manager_0.8.4.2.bb
+++ b/recipes/xfce-extras/xfce4-power-manager_0.8.4.2.bb
@@ -3,7 +3,7 @@ DEPENDS = "libxfce4util libxfcegui4 libnotify xfconf xfce4-panel"
 RDEPENDS = "libxfce4util libxfcegui4 libnotify xfce4-panel"
 
 SECTION = "x11"
-PR = "r1"
+PR = "r2"
 
 inherit xfce46