diff options
Diffstat (limited to 'meta/recipes-gnome/gnome')
39 files changed, 1361 insertions, 0 deletions
diff --git a/meta/recipes-gnome/gnome/gail_1.20.0.bb b/meta/recipes-gnome/gnome/gail_1.20.0.bb new file mode 100644 index 0000000000..2e9f857a89 --- /dev/null +++ b/meta/recipes-gnome/gnome/gail_1.20.0.bb | |||
| @@ -0,0 +1,14 @@ | |||
| 1 | LICENSE = "LGPL" | ||
| 2 | SECTION = "x11/libs" | ||
| 3 | PR = "r1" | ||
| 4 | DESCRIPTION = "GNOME Accessibility Implementation Library" | ||
| 5 | DEPENDS = "gtk+" | ||
| 6 | PROVIDES = "virtual/gail" | ||
| 7 | |||
| 8 | inherit gnome | ||
| 9 | |||
| 10 | EXTRA_OECONF = "--disable-gtk-doc" | ||
| 11 | |||
| 12 | FILES_${PN} += "${libdir}/gtk-2.0/modules/*.so" | ||
| 13 | FILES_${PN}-dbg += "${libdir}/gtk-2.0/modules/.debug" | ||
| 14 | |||
diff --git a/meta/recipes-gnome/gnome/gconf-dbus_svn.bb b/meta/recipes-gnome/gnome/gconf-dbus_svn.bb new file mode 100644 index 0000000000..879a0bb558 --- /dev/null +++ b/meta/recipes-gnome/gnome/gconf-dbus_svn.bb | |||
| @@ -0,0 +1,32 @@ | |||
| 1 | DESCRIPTION = "Settings daemon using DBUS for communication." | ||
| 2 | SECTION = "x11/utils" | ||
| 3 | LICENSE = "LGPLv2+" | ||
| 4 | LIC_FILES_CHKSUM = "file://COPYING;md5=55ca817ccb7d5b5b66355690e9abc605" | ||
| 5 | |||
| 6 | DEPENDS = "intltool-native virtual/libintl glib-2.0 dbus dbus-glib libxml2 popt gtk-doc-native" | ||
| 7 | PROVIDES = "gconf" | ||
| 8 | RPROVIDES_${PN} = "gconf" | ||
| 9 | RPROVIDES_${PN}-dev = "gconf-dev" | ||
| 10 | |||
| 11 | PV = "2.16.0+svnr${SRCREV}" | ||
| 12 | |||
| 13 | SRC_URI = "svn://developer.imendio.com/svn/gconf-dbus;module=trunk;proto=http" | ||
| 14 | S = "${WORKDIR}/trunk" | ||
| 15 | |||
| 16 | inherit pkgconfig autotools | ||
| 17 | |||
| 18 | PARALLEL_MAKE = "" | ||
| 19 | |||
| 20 | |||
| 21 | EXTRA_OECONF = "--disable-gtk-doc --disable-gtk --enable-shared --disable-static --enable-debug=yes" | ||
| 22 | |||
| 23 | |||
| 24 | do_configure_prepend() { | ||
| 25 | touch gtk-doc.make | ||
| 26 | } | ||
| 27 | |||
| 28 | FILES_${PN} = "${libdir}/GConf-dbus/2/*.so ${libdir}/dbus-1.0 ${sysconfdir} ${datadir}/dbus* ${libdir}/*.so.* ${bindir}/* ${libexecdir}/*" | ||
| 29 | FILES_${PN}-dbg += " ${libdir}/GConf-dbus/2/.debug" | ||
| 30 | |||
| 31 | BBCLASSEXTEND = "native" | ||
| 32 | |||
diff --git a/meta/recipes-gnome/gnome/gnome-common-2.28.0/omf.patch b/meta/recipes-gnome/gnome/gnome-common-2.28.0/omf.patch new file mode 100644 index 0000000000..0d85b001e0 --- /dev/null +++ b/meta/recipes-gnome/gnome/gnome-common-2.28.0/omf.patch | |||
| @@ -0,0 +1,13 @@ | |||
| 1 | --- gnome-common-2.4.0/doc-build/omf.make 2003-05-24 08:16:25.000000000 -0700 | ||
| 2 | +++ gnome-common-2.4.0.new/doc-build/omf.make 2004-11-15 14:01:12.185155192 -0700 | ||
| 3 | @@ -43,7 +43,9 @@ | ||
| 4 | install-data-hook-omf: | ||
| 5 | $(mkinstalldirs) $(DESTDIR)$(omf_dest_dir) | ||
| 6 | for file in $(omffile); do \ | ||
| 7 | - $(INSTALL_DATA) $$file.out $(DESTDIR)$(omf_dest_dir)/$$file; \ | ||
| 8 | + if [ -f $$file.out ]; then \ | ||
| 9 | + $(INSTALL_DATA) $$file.out $(DESTDIR)$(omf_dest_dir)/$$file; \ | ||
| 10 | + fi; \ | ||
| 11 | done | ||
| 12 | -scrollkeeper-update -p $(DESTDIR)$(scrollkeeper_localstate_dir) -o $(DESTDIR)$(omf_dest_dir) | ||
| 13 | |||
diff --git a/meta/recipes-gnome/gnome/gnome-common_2.28.0.bb b/meta/recipes-gnome/gnome/gnome-common_2.28.0.bb new file mode 100644 index 0000000000..5106f58e6b --- /dev/null +++ b/meta/recipes-gnome/gnome/gnome-common_2.28.0.bb | |||
| @@ -0,0 +1,24 @@ | |||
| 1 | DESCRIPTION = "Common macros for building GNOME applications" | ||
| 2 | HOMEPAGE = "http://www.gnome.org/" | ||
| 3 | BUGTRACKER = "https://bugzilla.gnome.org/" | ||
| 4 | |||
| 5 | LICENSE = "GPLv3" | ||
| 6 | LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504" | ||
| 7 | |||
| 8 | SECTION = "x11/gnome" | ||
| 9 | PR = "r0" | ||
| 10 | inherit gnome | ||
| 11 | |||
| 12 | # all isn't appropriate since STAGING_DATADIR is target specific | ||
| 13 | # PACKAGE_ARCH="all" | ||
| 14 | |||
| 15 | # The omf.make file failed if scrollkeeper doesn't happen to be | ||
| 16 | # installed | ||
| 17 | |||
| 18 | SRC_URI += "file://omf.patch;patch=1" | ||
| 19 | |||
| 20 | EXTRA_AUTORECONF = "" | ||
| 21 | DEPENDS = "" | ||
| 22 | |||
| 23 | FILES_${PN} += "${datadir}/aclocal" | ||
| 24 | FILES_${PN}-dev = "" | ||
diff --git a/meta/recipes-gnome/gnome/gnome-desktop.inc b/meta/recipes-gnome/gnome/gnome-desktop.inc new file mode 100644 index 0000000000..de3f751efa --- /dev/null +++ b/meta/recipes-gnome/gnome/gnome-desktop.inc | |||
| @@ -0,0 +1,14 @@ | |||
| 1 | DESCRIPTION = "GNOME library for reading .desktop files" | ||
| 2 | SECTION = "x11/gnome" | ||
| 3 | LICENSE = "GPL" | ||
| 4 | DEPENDS = "gconf-dbus libxrandr virtual/libx11 gtk+ glib-2.0 gnome-doc-utils" | ||
| 5 | |||
| 6 | EXTRA_OECONF = "--disable-scrollkeeper" | ||
| 7 | |||
| 8 | do_configure_prepend () { | ||
| 9 | cp ${STAGING_DATADIR}/gnome-common/data/omf.make ${S} | ||
| 10 | } | ||
| 11 | |||
| 12 | FILES_${PN} += "${datadir}/gnome-about" | ||
| 13 | |||
| 14 | inherit gnome pkgconfig \ No newline at end of file | ||
diff --git a/meta/recipes-gnome/gnome/gnome-desktop/no-desktop-docs.patch b/meta/recipes-gnome/gnome/gnome-desktop/no-desktop-docs.patch new file mode 100644 index 0000000000..c132341728 --- /dev/null +++ b/meta/recipes-gnome/gnome/gnome-desktop/no-desktop-docs.patch | |||
| @@ -0,0 +1,10 @@ | |||
| 1 | --- Makefile.am~ 2007-05-22 16:50:35.000000000 +0200 | ||
| 2 | +++ Makefile.am 2007-05-22 16:50:35.000000000 +0200 | ||
| 3 | @@ -3,7 +3,6 @@ | ||
| 4 | libgnome-desktop \ | ||
| 5 | gnome-about \ | ||
| 6 | pixmaps \ | ||
| 7 | - desktop-docs \ | ||
| 8 | docs \ | ||
| 9 | man | ||
| 10 | |||
diff --git a/meta/recipes-gnome/gnome/gnome-desktop_2.26.2.bb b/meta/recipes-gnome/gnome/gnome-desktop_2.26.2.bb new file mode 100644 index 0000000000..f4184a4d65 --- /dev/null +++ b/meta/recipes-gnome/gnome/gnome-desktop_2.26.2.bb | |||
| @@ -0,0 +1,3 @@ | |||
| 1 | require gnome-desktop.inc | ||
| 2 | |||
| 3 | SRC_URI += "file://no-desktop-docs.patch;patch=1;pnum=0" | ||
diff --git a/meta/recipes-gnome/gnome/gnome-doc-utils.inc b/meta/recipes-gnome/gnome/gnome-doc-utils.inc new file mode 100644 index 0000000000..00a64e2582 --- /dev/null +++ b/meta/recipes-gnome/gnome/gnome-doc-utils.inc | |||
| @@ -0,0 +1,15 @@ | |||
| 1 | LICENSE = "GPL LGPL" | ||
| 2 | DEPENDS = "libxml2 libxslt libxslt-native" | ||
| 3 | |||
| 4 | PR = "r1" | ||
| 5 | |||
| 6 | inherit gnome | ||
| 7 | |||
| 8 | EXTRA_OECONF = "--disable-scrollkeeper" | ||
| 9 | |||
| 10 | do_install_append() { | ||
| 11 | mkdir -p ${D}${datadir}/xml/gnome/xslt/ | ||
| 12 | cp -pPr ${S}/xslt/* ${D}${datadir}/xml/gnome/xslt/ | ||
| 13 | } | ||
| 14 | |||
| 15 | FILES_${PN} += "${datadir}/xml*" | ||
diff --git a/meta/recipes-gnome/gnome/gnome-doc-utils_0.12.0.bb b/meta/recipes-gnome/gnome/gnome-doc-utils_0.12.0.bb new file mode 100644 index 0000000000..2499ac36e4 --- /dev/null +++ b/meta/recipes-gnome/gnome/gnome-doc-utils_0.12.0.bb | |||
| @@ -0,0 +1,3 @@ | |||
| 1 | require gnome-doc-utils.inc | ||
| 2 | |||
| 3 | PR = "r1" | ||
diff --git a/meta/recipes-gnome/gnome/gnome-icon-theme_2.22.0.bb b/meta/recipes-gnome/gnome/gnome-icon-theme_2.22.0.bb new file mode 100644 index 0000000000..f78e6a6e5b --- /dev/null +++ b/meta/recipes-gnome/gnome/gnome-icon-theme_2.22.0.bb | |||
| @@ -0,0 +1,14 @@ | |||
| 1 | LICENSE = "GPL" | ||
| 2 | SECTION = "x11/gnome" | ||
| 3 | DEPENDS = "icon-naming-utils-native glib-2.0 intltool-native" | ||
| 4 | RDEPENDS = "hicolor-icon-theme" | ||
| 5 | RRECOMMENDS = "librsvg-gtk" | ||
| 6 | PR = "r1" | ||
| 7 | |||
| 8 | FILES_${PN} += "${datadir}/*" | ||
| 9 | |||
| 10 | EXTRA_OECONF = "--disable-hicolor-check" | ||
| 11 | |||
| 12 | inherit gnome | ||
| 13 | |||
| 14 | PACKAGE_ARCH = "all" | ||
diff --git a/meta/recipes-gnome/gnome/gnome-keyring/org.gnome.keyring.service b/meta/recipes-gnome/gnome/gnome-keyring/org.gnome.keyring.service new file mode 100644 index 0000000000..96ea061cfb --- /dev/null +++ b/meta/recipes-gnome/gnome/gnome-keyring/org.gnome.keyring.service | |||
| @@ -0,0 +1,3 @@ | |||
| 1 | [D-BUS Service] | ||
| 2 | Name=org.gnome.keyring | ||
| 3 | Exec=/usr/bin/gnome-keyring-daemon | ||
diff --git a/meta/recipes-gnome/gnome/gnome-keyring_2.31.4.bb b/meta/recipes-gnome/gnome/gnome-keyring_2.31.4.bb new file mode 100644 index 0000000000..1826a7ac3a --- /dev/null +++ b/meta/recipes-gnome/gnome/gnome-keyring_2.31.4.bb | |||
| @@ -0,0 +1,32 @@ | |||
| 1 | DESCRIPTION = "Password and keyring managing daemon" | ||
| 2 | HOMEPAGE = "http://www.gnome.org/" | ||
| 3 | BUGTRACKER = "https://bugzilla.gnome.org/" | ||
| 4 | |||
| 5 | LICENSE = "GPLv2+ & LGPLv2+ & LGPLv2.1+" | ||
| 6 | LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \ | ||
| 7 | file://gcr/gcr.h;endline=22;md5=a272df1e633e27ecf35e74fb5576250e \ | ||
| 8 | file://egg/egg-dbus.h;endline=25;md5=eb6f531af37165dc53420c073d774e61 \ | ||
| 9 | file://gp11/gp11.h;endline=24;md5=bd8c7a8a21d6c28d40536d96a35e3469 \ | ||
| 10 | file://pkcs11/pkcs11i.h;endline=24;md5=e72cfbb718389b76a4dae838d1c1f439" | ||
| 11 | |||
| 12 | SECTION = "x11/gnome" | ||
| 13 | |||
| 14 | PR = "r0" | ||
| 15 | |||
| 16 | inherit autotools gnome pkgconfig | ||
| 17 | |||
| 18 | DEPENDS = "gtk+ libgcrypt libtasn1 libtasn1-native gconf" | ||
| 19 | RDEPENDS = "libgnome-keyring" | ||
| 20 | |||
| 21 | EXTRA_OECONF = "--disable-gtk-doc" | ||
| 22 | |||
| 23 | SRC_URI += "file://org.gnome.keyring.service" | ||
| 24 | |||
| 25 | do_install_append () { | ||
| 26 | install -d ${D}${datadir}/dbus-1/services | ||
| 27 | install -m 0644 ${WORKDIR}/org.gnome.keyring.service ${D}${datadir}/dbus-1/services | ||
| 28 | } | ||
| 29 | |||
| 30 | FILES_${PN} += "${datadir}/dbus-1/services" | ||
| 31 | FILES_${PN}-dbg += "${libdir}/gnome-keyring/standalone/.debug/" | ||
| 32 | FILES_${PN}-dbg += "${libdir}/gnome-keyring/devel/.debug/" | ||
diff --git a/meta/recipes-gnome/gnome/gnome-mime-data/pkgconfig.patch b/meta/recipes-gnome/gnome/gnome-mime-data/pkgconfig.patch new file mode 100644 index 0000000000..de287e55a8 --- /dev/null +++ b/meta/recipes-gnome/gnome/gnome-mime-data/pkgconfig.patch | |||
| @@ -0,0 +1,12 @@ | |||
| 1 | Index: gnome-mime-data-2.18.0/Makefile.am | ||
| 2 | =================================================================== | ||
| 3 | --- gnome-mime-data-2.18.0.orig/Makefile.am 2009-06-11 17:27:48.000000000 +0100 | ||
| 4 | +++ gnome-mime-data-2.18.0/Makefile.am 2009-06-11 17:27:59.000000000 +0100 | ||
| 5 | @@ -1,6 +1,6 @@ | ||
| 6 | SUBDIRS = man po | ||
| 7 | |||
| 8 | -pkgconfigdir = $(datadir)/pkgconfig | ||
| 9 | +pkgconfigdir = $(libdir)/pkgconfig | ||
| 10 | pkgconfig_DATA = gnome-mime-data-2.0.pc | ||
| 11 | |||
| 12 | NULL= | ||
diff --git a/meta/recipes-gnome/gnome/gnome-mime-data_2.18.0.bb b/meta/recipes-gnome/gnome/gnome-mime-data_2.18.0.bb new file mode 100644 index 0000000000..edaabe15d9 --- /dev/null +++ b/meta/recipes-gnome/gnome/gnome-mime-data_2.18.0.bb | |||
| @@ -0,0 +1,16 @@ | |||
| 1 | DESCRIPTION = "Base MIME and Application database for GNOME" | ||
| 2 | HOMEPAGE = "http://www.gnome.org/" | ||
| 3 | BUGTRACKER = "https://bugzilla.gnome.org/" | ||
| 4 | |||
| 5 | LICENSE = "GPLv2 & GPLv2+" | ||
| 6 | LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552 \ | ||
| 7 | file://check-mime.pl;endline=26;md5=a95b63c92c33d4ca1af61a315888f450" | ||
| 8 | |||
| 9 | inherit gnome | ||
| 10 | inherit autotools | ||
| 11 | PR = "r3" | ||
| 12 | |||
| 13 | SRC_URI += "file://pkgconfig.patch;patch=1" | ||
| 14 | |||
| 15 | DEPENDS += "shared-mime-info intltool-native" | ||
| 16 | RDEPENDS = "shared-mime-info" | ||
diff --git a/meta/recipes-gnome/gnome/gnome-settings-daemon/configurefix.patch b/meta/recipes-gnome/gnome/gnome-settings-daemon/configurefix.patch new file mode 100644 index 0000000000..01b4f64191 --- /dev/null +++ b/meta/recipes-gnome/gnome/gnome-settings-daemon/configurefix.patch | |||
| @@ -0,0 +1,30 @@ | |||
| 1 | Index: gnome-settings-daemon-2.26.1/configure.ac | ||
| 2 | =================================================================== | ||
| 3 | --- gnome-settings-daemon-2.26.1.orig/configure.ac 2009-09-16 22:57:31.000000000 +0100 | ||
| 4 | +++ gnome-settings-daemon-2.26.1/configure.ac 2009-09-16 22:58:45.000000000 +0100 | ||
| 5 | @@ -133,9 +133,6 @@ | ||
| 6 | # | ||
| 7 | AC_DEFUN([AC_CHECK_X_HEADERS], [ | ||
| 8 | ac_save_CPPFLAGS="$CPPFLAGS" | ||
| 9 | - if test \! -z "$includedir" ; then | ||
| 10 | - CPPFLAGS="$CPPFLAGS -I$includedir" | ||
| 11 | - fi | ||
| 12 | CPPFLAGS="$CPPFLAGS $X_CFLAGS" | ||
| 13 | AC_CHECK_HEADERS([$1],[$2],[$3],[$4]) | ||
| 14 | CPPFLAGS="$ac_save_CPPFLAGS"]) | ||
| 15 | @@ -148,15 +145,9 @@ | ||
| 16 | ac_save_LDFLAGS="$LDFLAGS" | ||
| 17 | # ac_save_LIBS="$LIBS" | ||
| 18 | |||
| 19 | - if test \! -z "$includedir" ; then | ||
| 20 | - CPPFLAGS="$CPPFLAGS -I$includedir" | ||
| 21 | - fi | ||
| 22 | # note: $X_CFLAGS includes $x_includes | ||
| 23 | CPPFLAGS="$CPPFLAGS $X_CFLAGS" | ||
| 24 | |||
| 25 | - if test \! -z "$libdir" ; then | ||
| 26 | - LDFLAGS="$LDFLAGS -L$libdir" | ||
| 27 | - fi | ||
| 28 | # note: $X_LIBS includes $x_libraries | ||
| 29 | LDFLAGS="$LDFLAGS $ALL_X_LIBS" | ||
| 30 | |||
diff --git a/meta/recipes-gnome/gnome/gnome-settings-daemon/desktop-moblin.patch b/meta/recipes-gnome/gnome/gnome-settings-daemon/desktop-moblin.patch new file mode 100644 index 0000000000..d3fd76c621 --- /dev/null +++ b/meta/recipes-gnome/gnome/gnome-settings-daemon/desktop-moblin.patch | |||
| @@ -0,0 +1,11 @@ | |||
| 1 | --- gnome-settings-daemon-2.26.1/data/gnome-settings-daemon.desktop.in.in~ 2009-04-24 20:59:51.000000000 -0700 | ||
| 2 | +++ gnome-settings-daemon-2.26.1/data/gnome-settings-daemon.desktop.in.in 2009-04-24 20:59:51.000000000 -0700 | ||
| 3 | @@ -2,7 +2,7 @@ | ||
| 4 | Type=Application | ||
| 5 | _Name=GNOME Settings Daemon | ||
| 6 | Exec=@LIBEXECDIR@/gnome-settings-daemon | ||
| 7 | -OnlyShowIn=GNOME; | ||
| 8 | +OnlyShowIn=GNOME;MOBLIN; | ||
| 9 | X-GNOME-Autostart-Phase=Initialization | ||
| 10 | X-GNOME-Autostart-Notify=true | ||
| 11 | X-GNOME-AutoRestart=true | ||
diff --git a/meta/recipes-gnome/gnome/gnome-settings-daemon/gnome-settings-daemon-2.24.0-catch-deviceadded.patch b/meta/recipes-gnome/gnome/gnome-settings-daemon/gnome-settings-daemon-2.24.0-catch-deviceadded.patch new file mode 100644 index 0000000000..8e1d0ce9ce --- /dev/null +++ b/meta/recipes-gnome/gnome/gnome-settings-daemon/gnome-settings-daemon-2.24.0-catch-deviceadded.patch | |||
| @@ -0,0 +1,19 @@ | |||
| 1 | ============================================================ | ||
| 2 | Listen for DeviceAdded in addition to DeviceEnabled | ||
| 3 | |||
| 4 | This should help address problems like left-handed | ||
| 5 | mouse, and acceleration settings getting lost after | ||
| 6 | resume, or when new devices gets plugged in. | ||
| 7 | |||
| 8 | diff --git a/plugins/mouse/gsd-mouse-manager.c b/plugins/mouse/gsd-mouse-manager.c | ||
| 9 | --- a/plugins/mouse/gsd-mouse-manager.c | ||
| 10 | +++ b/plugins/mouse/gsd-mouse-manager.c | ||
| 11 | @@ -320,7 +320,7 @@ devicepresence_filter (GdkXEvent *xevent, | ||
| 12 | if (xev->type == xi_presence) | ||
| 13 | { | ||
| 14 | XDevicePresenceNotifyEvent *dpn = (XDevicePresenceNotifyEvent *) xev; | ||
| 15 | - if (dpn->devchange == DeviceEnabled) | ||
| 16 | + if (dpn->devchange == DeviceEnabled || dpn->devchange == DeviceAdded) | ||
| 17 | set_mouse_settings ((GsdMouseManager *) data); | ||
| 18 | } | ||
| 19 | return GDK_FILTER_CONTINUE; | ||
diff --git a/meta/recipes-gnome/gnome/gnome-settings-daemon/gnome-settings-daemon-fix-gthread.patch b/meta/recipes-gnome/gnome/gnome-settings-daemon/gnome-settings-daemon-fix-gthread.patch new file mode 100644 index 0000000000..d77063eba7 --- /dev/null +++ b/meta/recipes-gnome/gnome/gnome-settings-daemon/gnome-settings-daemon-fix-gthread.patch | |||
| @@ -0,0 +1,13 @@ | |||
| 1 | Index: gnome-settings-daemon-2.25.90/configure.ac | ||
| 2 | =================================================================== | ||
| 3 | --- gnome-settings-daemon-2.25.90.orig/configure.ac | ||
| 4 | +++ gnome-settings-daemon-2.25.90/configure.ac | ||
| 5 | @@ -85,6 +85,8 @@ AC_PATH_PROG(GCONFTOOL, gconftool-2) | ||
| 6 | |||
| 7 | AM_GCONF_SOURCE_2 | ||
| 8 | |||
| 9 | +AC_CHECK_LIB(gthread-2.0, g_thread_init) | ||
| 10 | + | ||
| 11 | dnl --------------------------------------------------------------------------- | ||
| 12 | dnl - Check for libnotify | ||
| 13 | dnl --------------------------------------------------------------------------- | ||
diff --git a/meta/recipes-gnome/gnome/gnome-settings-daemon/mojito-cleanup.patch b/meta/recipes-gnome/gnome/gnome-settings-daemon/mojito-cleanup.patch new file mode 100644 index 0000000000..1aff2d6d6f --- /dev/null +++ b/meta/recipes-gnome/gnome/gnome-settings-daemon/mojito-cleanup.patch | |||
| @@ -0,0 +1,74 @@ | |||
| 1 | diff --git a/plugins/housekeeping/gsd-housekeeping-manager.c b/plugins/housekeeping/gsd-housekeeping-manager.c | ||
| 2 | index f84cfad..e8f474a 100644 | ||
| 3 | --- a/plugins/housekeeping/gsd-housekeeping-manager.c | ||
| 4 | +++ b/plugins/housekeeping/gsd-housekeeping-manager.c | ||
| 5 | @@ -85,9 +85,13 @@ thumb_data_free (gpointer data) | ||
| 6 | } | ||
| 7 | } | ||
| 8 | |||
| 9 | +typedef enum { | ||
| 10 | + HASH, | ||
| 11 | + HASH_PNG | ||
| 12 | +} FileType; | ||
| 13 | |||
| 14 | static GList * | ||
| 15 | -read_dir_for_purge (const char *path, GList *files) | ||
| 16 | +read_dir_for_purge (const char *path, GList *files, FileType type) | ||
| 17 | { | ||
| 18 | GFile *read_path; | ||
| 19 | GFileEnumerator *enum_dir; | ||
| 20 | @@ -105,9 +109,20 @@ read_dir_for_purge (const char *path, GList *files) | ||
| 21 | GFileInfo *info; | ||
| 22 | while ((info = g_file_enumerator_next_file (enum_dir, NULL, NULL)) != NULL) { | ||
| 23 | const char *name; | ||
| 24 | + gboolean prune = FALSE; | ||
| 25 | + | ||
| 26 | name = g_file_info_get_name (info); | ||
| 27 | |||
| 28 | - if (strlen (name) == 36 && strcmp (name + 32, ".png") == 0) { | ||
| 29 | + switch (type) { | ||
| 30 | + case HASH: | ||
| 31 | + prune = (strlen (name) == 36); | ||
| 32 | + break; | ||
| 33 | + case HASH_PNG: | ||
| 34 | + prune = (strlen (name) == 36 && strcmp (name + 32, ".png") == 0); | ||
| 35 | + break; | ||
| 36 | + } | ||
| 37 | + | ||
| 38 | + if (prune) { | ||
| 39 | ThumbData *td; | ||
| 40 | GFile *entry; | ||
| 41 | char *entry_path; | ||
| 42 | @@ -197,14 +212,14 @@ purge_thumbnail_cache (void) | ||
| 43 | ".thumbnails", | ||
| 44 | "normal", | ||
| 45 | NULL); | ||
| 46 | - files = read_dir_for_purge (path, NULL); | ||
| 47 | + files = read_dir_for_purge (path, NULL, HASH_PNG); | ||
| 48 | g_free (path); | ||
| 49 | |||
| 50 | path = g_build_filename (g_get_home_dir (), | ||
| 51 | ".thumbnails", | ||
| 52 | "large", | ||
| 53 | NULL); | ||
| 54 | - files = read_dir_for_purge (path, files); | ||
| 55 | + files = read_dir_for_purge (path, files, HASH_PNG); | ||
| 56 | g_free (path); | ||
| 57 | |||
| 58 | path = g_build_filename (g_get_home_dir (), | ||
| 59 | @@ -212,7 +227,14 @@ purge_thumbnail_cache (void) | ||
| 60 | "fail", | ||
| 61 | "gnome-thumbnail-factory", | ||
| 62 | NULL); | ||
| 63 | - files = read_dir_for_purge (path, files); | ||
| 64 | + files = read_dir_for_purge (path, files, HASH_PNG); | ||
| 65 | + g_free (path); | ||
| 66 | + | ||
| 67 | + path = g_build_filename (g_get_user_cache_dir (), | ||
| 68 | + "mojito", | ||
| 69 | + "thumbnails", | ||
| 70 | + NULL); | ||
| 71 | + files = read_dir_for_purge (path, files, HASH); | ||
| 72 | g_free (path); | ||
| 73 | |||
| 74 | g_get_current_time (¤t_time); | ||
diff --git a/meta/recipes-gnome/gnome/gnome-settings-daemon/mount-plugin.patch b/meta/recipes-gnome/gnome/gnome-settings-daemon/mount-plugin.patch new file mode 100644 index 0000000000..67f056b505 --- /dev/null +++ b/meta/recipes-gnome/gnome/gnome-settings-daemon/mount-plugin.patch | |||
| @@ -0,0 +1,618 @@ | |||
| 1 | diff --git a/configure.ac b/configure.ac | ||
| 2 | index 135f2ce..ba737a5 100644 | ||
| 3 | --- a/configure.ac | ||
| 4 | +++ b/configure.ac | ||
| 5 | @@ -356,6 +356,7 @@ plugins/keybindings/Makefile | ||
| 6 | plugins/keyboard/Makefile | ||
| 7 | plugins/media-keys/Makefile | ||
| 8 | plugins/media-keys/cut-n-paste/Makefile | ||
| 9 | +plugins/mount/Makefile | ||
| 10 | plugins/mouse/Makefile | ||
| 11 | plugins/screensaver/Makefile | ||
| 12 | plugins/sound/Makefile | ||
| 13 | diff --git a/data/gnome-settings-daemon.schemas.in b/data/gnome-settings-daemon.schemas.in | ||
| 14 | index 4920ae3..502e9e6 100644 | ||
| 15 | --- a/data/gnome-settings-daemon.schemas.in | ||
| 16 | +++ b/data/gnome-settings-daemon.schemas.in | ||
| 17 | @@ -557,5 +557,29 @@ | ||
| 18 | </locale> | ||
| 19 | </schema> | ||
| 20 | |||
| 21 | + <schema> | ||
| 22 | + <key>/schemas/apps/gnome_settings_daemon/plugins/mount/active</key> | ||
| 23 | + <applyto>/apps/gnome_settings_daemon/plugins/mount/active</applyto> | ||
| 24 | + <owner>gnome-settings-daemon</owner> | ||
| 25 | + <type>bool</type> | ||
| 26 | + <default>TRUE</default> | ||
| 27 | + <locale name="C"> | ||
| 28 | + <short>Enable mount plugin</short> | ||
| 29 | + <long>Set to True to enable the plugin to automount media.</long> | ||
| 30 | + </locale> | ||
| 31 | + </schema> | ||
| 32 | + <schema> | ||
| 33 | + <key>/schemas/apps/gnome_settings_daemon/plugins/mount/priority</key> | ||
| 34 | + <applyto>/apps/gnome_settings_daemon/plugins/mount/priority</applyto> | ||
| 35 | + <owner>gnome-settings-daemon</owner> | ||
| 36 | + <type>int</type> | ||
| 37 | + <default>99</default> | ||
| 38 | + <locale name="C"> | ||
| 39 | + <short></short> | ||
| 40 | + <long></long> | ||
| 41 | + </locale> | ||
| 42 | + </schema> | ||
| 43 | + | ||
| 44 | + | ||
| 45 | </schemalist> | ||
| 46 | </gconfschemafile> | ||
| 47 | diff --git a/plugins/Makefile.am b/plugins/Makefile.am | ||
| 48 | index 2d33061..46615c1 100644 | ||
| 49 | --- a/plugins/Makefile.am | ||
| 50 | +++ b/plugins/Makefile.am | ||
| 51 | @@ -11,6 +11,7 @@ SUBDIRS = \ | ||
| 52 | keybindings \ | ||
| 53 | keyboard \ | ||
| 54 | media-keys \ | ||
| 55 | + mount \ | ||
| 56 | mouse \ | ||
| 57 | screensaver \ | ||
| 58 | sound \ | ||
| 59 | diff --git a/plugins/mount/Makefile.am b/plugins/mount/Makefile.am | ||
| 60 | new file mode 100644 | ||
| 61 | index 0000000..188c83d | ||
| 62 | --- /dev/null | ||
| 63 | +++ b/plugins/mount/Makefile.am | ||
| 64 | @@ -0,0 +1,39 @@ | ||
| 65 | +plugin_LTLIBRARIES = \ | ||
| 66 | + libmount.la | ||
| 67 | + | ||
| 68 | +libmount_la_SOURCES = \ | ||
| 69 | + gsd-mount-manager.c \ | ||
| 70 | + gsd-mount-manager.h \ | ||
| 71 | + gsd-mount-plugin.c \ | ||
| 72 | + gsd-mount-plugin.h | ||
| 73 | + | ||
| 74 | +libmount_la_CPPFLAGS = \ | ||
| 75 | + -I$(top_srcdir)/gnome-settings-daemon \ | ||
| 76 | + -DGNOME_SETTINGS_LOCALEDIR=\""$(datadir)/locale"\" \ | ||
| 77 | + $(AM_CPPFLAGS) | ||
| 78 | + | ||
| 79 | +libmount_la_CFLAGS = \ | ||
| 80 | + $(SETTINGS_PLUGIN_CFLAGS) \ | ||
| 81 | + $(AM_CFLAGS) | ||
| 82 | + | ||
| 83 | +libmount_la_LDFLAGS = \ | ||
| 84 | + $(GSD_PLUGIN_LDFLAGS) | ||
| 85 | + | ||
| 86 | +libmount_la_LIBADD = \ | ||
| 87 | + $(SETTINGS_PLUGIN_LIBS) | ||
| 88 | + | ||
| 89 | +plugin_in_files = \ | ||
| 90 | + mount.gnome-settings-plugin.in | ||
| 91 | + | ||
| 92 | +plugin_DATA = $(plugin_in_files:.gnome-settings-plugin.in=.gnome-settings-plugin) | ||
| 93 | + | ||
| 94 | +EXTRA_DIST = \ | ||
| 95 | + $(plugin_in_files) | ||
| 96 | + | ||
| 97 | +CLEANFILES = \ | ||
| 98 | + $(plugin_DATA) | ||
| 99 | + | ||
| 100 | +DISTCLEANFILES = \ | ||
| 101 | + $(plugin_DATA) | ||
| 102 | + | ||
| 103 | +@GSD_INTLTOOL_PLUGIN_RULE@ | ||
| 104 | diff --git a/plugins/mount/gsd-mount-manager.c b/plugins/mount/gsd-mount-manager.c | ||
| 105 | new file mode 100644 | ||
| 106 | index 0000000..a768f03 | ||
| 107 | --- /dev/null | ||
| 108 | +++ b/plugins/mount/gsd-mount-manager.c | ||
| 109 | @@ -0,0 +1,261 @@ | ||
| 110 | +/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*- | ||
| 111 | + * | ||
| 112 | + * Copyright (C) 2009 Intel Corporation | ||
| 113 | + * | ||
| 114 | + * This program is free software; you can redistribute it and/or modify it under | ||
| 115 | + * the terms of the GNU General Public License as published by the Free Software | ||
| 116 | + * Foundation; either version 2 of the License, or (at your option) any later | ||
| 117 | + * version. | ||
| 118 | + * | ||
| 119 | + * This program is distributed in the hope that it will be useful, but WITHOUT | ||
| 120 | + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS | ||
| 121 | + * FOR A PARTICULAR PURPOSE. See the GNU General Public License for more | ||
| 122 | + * details. | ||
| 123 | + * | ||
| 124 | + * You should have received a copy of the GNU General Public License along with | ||
| 125 | + * this program; if not, write to the Free Software Foundation, Inc., 59 Temple | ||
| 126 | + * Place - Suite 330, Boston, MA 02111-1307, USA. | ||
| 127 | + * | ||
| 128 | + */ | ||
| 129 | + | ||
| 130 | +#include <config.h> | ||
| 131 | + | ||
| 132 | +#include <glib.h> | ||
| 133 | +#include <glib/gi18n.h> | ||
| 134 | +#include <gio/gio.h> | ||
| 135 | +#include <gtk/gtk.h> | ||
| 136 | + | ||
| 137 | +#include "gsd-mount-manager.h" | ||
| 138 | + | ||
| 139 | +#define GSD_MOUNT_MANAGER_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), GSD_TYPE_MOUNT_MANAGER, GsdMountManagerPrivate)) | ||
| 140 | + | ||
| 141 | +struct GsdMountManagerPrivate | ||
| 142 | +{ | ||
| 143 | + GVolumeMonitor *monitor; | ||
| 144 | +}; | ||
| 145 | + | ||
| 146 | +G_DEFINE_TYPE (GsdMountManager, gsd_mount_manager, G_TYPE_OBJECT) | ||
| 147 | + | ||
| 148 | +static gpointer manager_object = NULL; | ||
| 149 | + | ||
| 150 | +#if 0 | ||
| 151 | +static void | ||
| 152 | +drive_connected_cb (GVolumeMonitor *monitor, | ||
| 153 | + GDrive *drive, | ||
| 154 | + GsdMountManager *manager) | ||
| 155 | +{ | ||
| 156 | + /* TODO: listen for the eject button */ | ||
| 157 | +} | ||
| 158 | +#endif | ||
| 159 | + | ||
| 160 | +static void | ||
| 161 | +volume_mounted_cb (GObject *source_object, GAsyncResult *result, gpointer user_data) | ||
| 162 | +{ | ||
| 163 | + GError *error = NULL; | ||
| 164 | + char *name; | ||
| 165 | + | ||
| 166 | + name = g_volume_get_name (G_VOLUME (source_object)); | ||
| 167 | + | ||
| 168 | + if (!g_volume_mount_finish (G_VOLUME (source_object), result, &error)) { | ||
| 169 | + g_debug ("Failed to mount '%s': %s", name, error->message); | ||
| 170 | + | ||
| 171 | + if (error->code != G_IO_ERROR_FAILED_HANDLED) { | ||
| 172 | + char *primary; | ||
| 173 | + GtkWidget *dialog; | ||
| 174 | + | ||
| 175 | + primary = g_strdup_printf (_("Unable to mount %s"), name); | ||
| 176 | + | ||
| 177 | + dialog = gtk_message_dialog_new (NULL, 0, | ||
| 178 | + GTK_MESSAGE_ERROR, | ||
| 179 | + GTK_BUTTONS_CLOSE, | ||
| 180 | + primary); | ||
| 181 | + | ||
| 182 | + g_free (primary); | ||
| 183 | + gtk_message_dialog_format_secondary_text (GTK_MESSAGE_DIALOG (dialog), error->message); | ||
| 184 | + | ||
| 185 | + gtk_dialog_run (GTK_DIALOG (dialog)); | ||
| 186 | + gtk_widget_destroy (dialog); | ||
| 187 | + } | ||
| 188 | + g_error_free (error); | ||
| 189 | + } else { | ||
| 190 | + g_debug ("Mounted '%s'", name); | ||
| 191 | + } | ||
| 192 | + | ||
| 193 | + g_free (name); | ||
| 194 | +} | ||
| 195 | + | ||
| 196 | +static void | ||
| 197 | +volume_added_cb (GVolumeMonitor *monitor, | ||
| 198 | + GVolume *volume, | ||
| 199 | + GsdMountManager *manager) | ||
| 200 | +{ | ||
| 201 | + char *name; | ||
| 202 | + | ||
| 203 | + name = g_volume_get_name (volume); | ||
| 204 | + g_debug ("Volme '%s' added", name); | ||
| 205 | + | ||
| 206 | + if (g_volume_can_mount (volume)) { | ||
| 207 | + GMountOperation *mount_op; | ||
| 208 | + | ||
| 209 | + g_debug ("Mounting '%s'", name); | ||
| 210 | + | ||
| 211 | + mount_op = gtk_mount_operation_new (NULL); | ||
| 212 | + g_volume_mount (volume, G_MOUNT_MOUNT_NONE, | ||
| 213 | + mount_op, NULL, | ||
| 214 | + volume_mounted_cb, manager); | ||
| 215 | + } | ||
| 216 | + | ||
| 217 | + g_free (name); | ||
| 218 | +} | ||
| 219 | + | ||
| 220 | +static void | ||
| 221 | +mount_added_cb (GVolumeMonitor *monitor, | ||
| 222 | + GMount *mount, | ||
| 223 | + GsdMountManager *manager) | ||
| 224 | +{ | ||
| 225 | + GFile *file; | ||
| 226 | + char *uri; | ||
| 227 | + | ||
| 228 | + file = g_mount_get_root (mount); | ||
| 229 | + uri = g_file_get_uri (file); | ||
| 230 | + | ||
| 231 | + g_debug ("%s mounted, starting file manager", uri); | ||
| 232 | + | ||
| 233 | + /* TODO: error */ | ||
| 234 | + gtk_show_uri (NULL, uri, GDK_CURRENT_TIME, NULL); | ||
| 235 | + | ||
| 236 | + g_free (uri); | ||
| 237 | + g_object_unref (file); | ||
| 238 | +} | ||
| 239 | + | ||
| 240 | +static void | ||
| 241 | +mount_existing_volumes (GsdMountManager *manager) | ||
| 242 | +{ | ||
| 243 | + /* TODO: iterate over drives to hook up eject */ | ||
| 244 | + GList *l; | ||
| 245 | + | ||
| 246 | + g_debug ("Mounting existing volumes"); | ||
| 247 | + | ||
| 248 | + l = g_volume_monitor_get_volumes (manager->priv->monitor); | ||
| 249 | + while (l) { | ||
| 250 | + GVolume *volume = l->data; | ||
| 251 | + GMount *mount; | ||
| 252 | + | ||
| 253 | + mount = g_volume_get_mount (volume); | ||
| 254 | + if (mount == NULL && | ||
| 255 | + g_volume_can_mount (volume) && | ||
| 256 | + g_volume_should_automount (volume)) { | ||
| 257 | + GMountOperation *mount_op; | ||
| 258 | + char *name; | ||
| 259 | + | ||
| 260 | + name = g_volume_get_name (volume); | ||
| 261 | + g_debug ("Mounting '%s'", name); | ||
| 262 | + g_free (name); | ||
| 263 | + | ||
| 264 | + mount_op = gtk_mount_operation_new (NULL); | ||
| 265 | + g_volume_mount (volume, G_MOUNT_MOUNT_NONE, | ||
| 266 | + mount_op, NULL, | ||
| 267 | + volume_mounted_cb, manager); | ||
| 268 | + } | ||
| 269 | + | ||
| 270 | + if (mount) | ||
| 271 | + g_object_unref (mount); | ||
| 272 | + g_object_unref (volume); | ||
| 273 | + l = g_list_delete_link (l, l); | ||
| 274 | + } | ||
| 275 | +} | ||
| 276 | + | ||
| 277 | +gboolean | ||
| 278 | +gsd_mount_manager_start (GsdMountManager *manager, | ||
| 279 | + GError **error) | ||
| 280 | +{ | ||
| 281 | + g_debug ("Starting mount manager"); | ||
| 282 | + | ||
| 283 | + manager->priv->monitor = g_volume_monitor_get (); | ||
| 284 | + | ||
| 285 | +#if 0 | ||
| 286 | + g_signal_connect_object (manager->priv->monitor, "drive-connected", | ||
| 287 | + G_CALLBACK (drive_connected_cb), manager, 0); | ||
| 288 | +#endif | ||
| 289 | + g_signal_connect_object (manager->priv->monitor, "volume-added", | ||
| 290 | + G_CALLBACK (volume_added_cb), manager, 0); | ||
| 291 | + g_signal_connect_object (manager->priv->monitor, "mount-added", | ||
| 292 | + G_CALLBACK (mount_added_cb), manager, 0); | ||
| 293 | + | ||
| 294 | + /* TODO: handle eject buttons */ | ||
| 295 | + | ||
| 296 | +#if 0 | ||
| 297 | + mount_existing_volumes (manager); | ||
| 298 | +#endif | ||
| 299 | + | ||
| 300 | + return TRUE; | ||
| 301 | +} | ||
| 302 | + | ||
| 303 | +void | ||
| 304 | +gsd_mount_manager_stop (GsdMountManager *manager) | ||
| 305 | +{ | ||
| 306 | + g_debug ("Stopping mount manager"); | ||
| 307 | +} | ||
| 308 | + | ||
| 309 | +static void | ||
| 310 | +gsd_mount_manager_dispose (GObject *object) | ||
| 311 | +{ | ||
| 312 | + GsdMountManager *manager = GSD_MOUNT_MANAGER (object); | ||
| 313 | + | ||
| 314 | + if (manager->priv->monitor) { | ||
| 315 | + g_signal_handlers_disconnect_by_func | ||
| 316 | + (manager->priv->monitor, volume_added_cb, manager); | ||
| 317 | + g_signal_handlers_disconnect_by_func | ||
| 318 | + (manager->priv->monitor, mount_added_cb, manager); | ||
| 319 | + g_object_unref (manager->priv->monitor); | ||
| 320 | + manager->priv->monitor = NULL; | ||
| 321 | + } | ||
| 322 | + | ||
| 323 | + G_OBJECT_CLASS (gsd_mount_manager_parent_class)->dispose (object); | ||
| 324 | +} | ||
| 325 | + | ||
| 326 | +static void | ||
| 327 | +gsd_mount_manager_init (GsdMountManager *manager) | ||
| 328 | +{ | ||
| 329 | + manager->priv = GSD_MOUNT_MANAGER_GET_PRIVATE (manager); | ||
| 330 | +} | ||
| 331 | + | ||
| 332 | +static void | ||
| 333 | +gsd_mount_manager_finalize (GObject *object) | ||
| 334 | +{ | ||
| 335 | + GsdMountManager *mount_manager; | ||
| 336 | + | ||
| 337 | + g_return_if_fail (object != NULL); | ||
| 338 | + g_return_if_fail (GSD_IS_MOUNT_MANAGER (object)); | ||
| 339 | + | ||
| 340 | + mount_manager = GSD_MOUNT_MANAGER (object); | ||
| 341 | + | ||
| 342 | + g_return_if_fail (mount_manager->priv != NULL); | ||
| 343 | + | ||
| 344 | + G_OBJECT_CLASS (gsd_mount_manager_parent_class)->finalize (object); | ||
| 345 | +} | ||
| 346 | + | ||
| 347 | +static void | ||
| 348 | +gsd_mount_manager_class_init (GsdMountManagerClass *klass) | ||
| 349 | +{ | ||
| 350 | + GObjectClass *object_class = G_OBJECT_CLASS (klass); | ||
| 351 | + | ||
| 352 | + object_class->dispose = gsd_mount_manager_dispose; | ||
| 353 | + object_class->finalize = gsd_mount_manager_finalize; | ||
| 354 | + | ||
| 355 | + g_type_class_add_private (klass, sizeof (GsdMountManagerPrivate)); | ||
| 356 | +} | ||
| 357 | + | ||
| 358 | +GsdMountManager * | ||
| 359 | +gsd_mount_manager_new (void) | ||
| 360 | +{ | ||
| 361 | + if (manager_object != NULL) { | ||
| 362 | + g_object_ref (manager_object); | ||
| 363 | + } else { | ||
| 364 | + manager_object = g_object_new (GSD_TYPE_MOUNT_MANAGER, NULL); | ||
| 365 | + g_object_add_weak_pointer (manager_object, | ||
| 366 | + (gpointer *) &manager_object); | ||
| 367 | + } | ||
| 368 | + | ||
| 369 | + return GSD_MOUNT_MANAGER (manager_object); | ||
| 370 | +} | ||
| 371 | diff --git a/plugins/mount/gsd-mount-manager.h b/plugins/mount/gsd-mount-manager.h | ||
| 372 | new file mode 100644 | ||
| 373 | index 0000000..9093fff | ||
| 374 | --- /dev/null | ||
| 375 | +++ b/plugins/mount/gsd-mount-manager.h | ||
| 376 | @@ -0,0 +1,58 @@ | ||
| 377 | +/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*- | ||
| 378 | + * | ||
| 379 | + * Copyright (C) 2009 Intel Corporation | ||
| 380 | + * | ||
| 381 | + * This program is free software; you can redistribute it and/or modify it under | ||
| 382 | + * the terms of the GNU General Public License as published by the Free Software | ||
| 383 | + * Foundation; either version 2 of the License, or (at your option) any later | ||
| 384 | + * version. | ||
| 385 | + * | ||
| 386 | + * This program is distributed in the hope that it will be useful, but WITHOUT | ||
| 387 | + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS | ||
| 388 | + * FOR A PARTICULAR PURPOSE. See the GNU General Public License for more | ||
| 389 | + * details. | ||
| 390 | + * | ||
| 391 | + * You should have received a copy of the GNU General Public License along with | ||
| 392 | + * this program; if not, write to the Free Software Foundation, Inc., 59 Temple | ||
| 393 | + * Place - Suite 330, Boston, MA 02111-1307, USA. | ||
| 394 | + * | ||
| 395 | + */ | ||
| 396 | + | ||
| 397 | +#ifndef __GSD_MOUNT_MANAGER_H | ||
| 398 | +#define __GSD_MOUNT_MANAGER_H | ||
| 399 | + | ||
| 400 | +#include <glib-object.h> | ||
| 401 | + | ||
| 402 | +G_BEGIN_DECLS | ||
| 403 | + | ||
| 404 | +#define GSD_TYPE_MOUNT_MANAGER (gsd_mount_manager_get_type ()) | ||
| 405 | +#define GSD_MOUNT_MANAGER(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), GSD_TYPE_MOUNT_MANAGER, GsdMountManager)) | ||
| 406 | +#define GSD_MOUNT_MANAGER_CLASS(k) (G_TYPE_CHECK_CLASS_CAST((k), GSD_TYPE_MOUNT_MANAGER, GsdMountManagerClass)) | ||
| 407 | +#define GSD_IS_MOUNT_MANAGER(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), GSD_TYPE_MOUNT_MANAGER)) | ||
| 408 | +#define GSD_IS_MOUNT_MANAGER_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), GSD_TYPE_MOUNT_MANAGER)) | ||
| 409 | +#define GSD_MOUNT_MANAGER_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), GSD_TYPE_MOUNT_MANAGER, GsdMountManagerClass)) | ||
| 410 | + | ||
| 411 | +typedef struct GsdMountManagerPrivate GsdMountManagerPrivate; | ||
| 412 | + | ||
| 413 | +typedef struct | ||
| 414 | +{ | ||
| 415 | + GObject parent; | ||
| 416 | + GsdMountManagerPrivate *priv; | ||
| 417 | +} GsdMountManager; | ||
| 418 | + | ||
| 419 | +typedef struct | ||
| 420 | +{ | ||
| 421 | + GObjectClass parent_class; | ||
| 422 | +} GsdMountManagerClass; | ||
| 423 | + | ||
| 424 | +GType gsd_mount_manager_get_type (void); | ||
| 425 | + | ||
| 426 | +GsdMountManager * gsd_mount_manager_new (void); | ||
| 427 | + | ||
| 428 | +gboolean gsd_mount_manager_start (GsdMountManager *manager, | ||
| 429 | + GError **error); | ||
| 430 | +void gsd_mount_manager_stop (GsdMountManager *manager); | ||
| 431 | + | ||
| 432 | +G_END_DECLS | ||
| 433 | + | ||
| 434 | +#endif /* __GSD_MOUNT_MANAGER_H */ | ||
| 435 | diff --git a/plugins/mount/gsd-mount-plugin.c b/plugins/mount/gsd-mount-plugin.c | ||
| 436 | new file mode 100644 | ||
| 437 | index 0000000..af295a5 | ||
| 438 | --- /dev/null | ||
| 439 | +++ b/plugins/mount/gsd-mount-plugin.c | ||
| 440 | @@ -0,0 +1,103 @@ | ||
| 441 | +/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*- | ||
| 442 | + * | ||
| 443 | + * Copyright (C) 2009 Intel Corporation | ||
| 444 | + * | ||
| 445 | + * This program is free software; you can redistribute it and/or modify it under | ||
| 446 | + * the terms of the GNU General Public License as published by the Free Software | ||
| 447 | + * Foundation; either version 2, or (at your option) any later version. | ||
| 448 | + * | ||
| 449 | + * This program is distributed in the hope that it will be useful, but WITHOUT | ||
| 450 | + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS | ||
| 451 | + * FOR A PARTICULAR PURPOSE. See the GNU General Public License for more | ||
| 452 | + * details. | ||
| 453 | + * | ||
| 454 | + * You should have received a copy of the GNU General Public License along with | ||
| 455 | + * this program; if not, write to the Free Software Foundation, Inc., 59 Temple | ||
| 456 | + * Place - Suite 330, Boston, MA 02111-1307, USA. | ||
| 457 | + * | ||
| 458 | + */ | ||
| 459 | + | ||
| 460 | +#include <config.h> | ||
| 461 | + | ||
| 462 | +#include <glib/gi18n.h> | ||
| 463 | +#include <gmodule.h> | ||
| 464 | +#include <gnome-settings-daemon/gnome-settings-plugin.h> | ||
| 465 | + | ||
| 466 | +#include "gsd-mount-plugin.h" | ||
| 467 | +#include "gsd-mount-manager.h" | ||
| 468 | + | ||
| 469 | +struct GsdMountPluginPrivate { | ||
| 470 | + GsdMountManager *manager; | ||
| 471 | +}; | ||
| 472 | + | ||
| 473 | +#define GSD_MOUNT_PLUGIN_GET_PRIVATE(object) (G_TYPE_INSTANCE_GET_PRIVATE ((object), GSD_TYPE_MOUNT_PLUGIN, GsdMountPluginPrivate)) | ||
| 474 | + | ||
| 475 | +GNOME_SETTINGS_PLUGIN_REGISTER (GsdMountPlugin, gsd_mount_plugin) | ||
| 476 | + | ||
| 477 | +static void | ||
| 478 | +gsd_mount_plugin_init (GsdMountPlugin *plugin) | ||
| 479 | +{ | ||
| 480 | + plugin->priv = GSD_MOUNT_PLUGIN_GET_PRIVATE (plugin); | ||
| 481 | + | ||
| 482 | + g_debug ("GsdMountPlugin initializing"); | ||
| 483 | + | ||
| 484 | + plugin->priv->manager = gsd_mount_manager_new (); | ||
| 485 | +} | ||
| 486 | + | ||
| 487 | +static void | ||
| 488 | +gsd_mount_plugin_finalize (GObject *object) | ||
| 489 | +{ | ||
| 490 | + GsdMountPlugin *plugin; | ||
| 491 | + | ||
| 492 | + g_return_if_fail (object != NULL); | ||
| 493 | + g_return_if_fail (GSD_IS_MOUNT_PLUGIN (object)); | ||
| 494 | + | ||
| 495 | + g_debug ("GsdMountPlugin finalizing"); | ||
| 496 | + | ||
| 497 | + plugin = GSD_MOUNT_PLUGIN (object); | ||
| 498 | + | ||
| 499 | + g_return_if_fail (plugin->priv != NULL); | ||
| 500 | + | ||
| 501 | + if (plugin->priv->manager != NULL) { | ||
| 502 | + g_object_unref (plugin->priv->manager); | ||
| 503 | + } | ||
| 504 | + | ||
| 505 | + G_OBJECT_CLASS (gsd_mount_plugin_parent_class)->finalize (object); | ||
| 506 | +} | ||
| 507 | + | ||
| 508 | +static void | ||
| 509 | +impl_activate (GnomeSettingsPlugin *plugin) | ||
| 510 | +{ | ||
| 511 | + gboolean res; | ||
| 512 | + GError *error; | ||
| 513 | + | ||
| 514 | + g_debug ("Activating mount plugin"); | ||
| 515 | + | ||
| 516 | + error = NULL; | ||
| 517 | + res = gsd_mount_manager_start (GSD_MOUNT_PLUGIN (plugin)->priv->manager, &error); | ||
| 518 | + if (! res) { | ||
| 519 | + g_warning ("Unable to start mount manager: %s", error->message); | ||
| 520 | + g_error_free (error); | ||
| 521 | + } | ||
| 522 | +} | ||
| 523 | + | ||
| 524 | +static void | ||
| 525 | +impl_deactivate (GnomeSettingsPlugin *plugin) | ||
| 526 | +{ | ||
| 527 | + g_debug ("Deactivating mount plugin"); | ||
| 528 | + gsd_mount_manager_stop (GSD_MOUNT_PLUGIN (plugin)->priv->manager); | ||
| 529 | +} | ||
| 530 | + | ||
| 531 | +static void | ||
| 532 | +gsd_mount_plugin_class_init (GsdMountPluginClass *klass) | ||
| 533 | +{ | ||
| 534 | + GObjectClass *object_class = G_OBJECT_CLASS (klass); | ||
| 535 | + GnomeSettingsPluginClass *plugin_class = GNOME_SETTINGS_PLUGIN_CLASS (klass); | ||
| 536 | + | ||
| 537 | + object_class->finalize = gsd_mount_plugin_finalize; | ||
| 538 | + | ||
| 539 | + plugin_class->activate = impl_activate; | ||
| 540 | + plugin_class->deactivate = impl_deactivate; | ||
| 541 | + | ||
| 542 | + g_type_class_add_private (klass, sizeof (GsdMountPluginPrivate)); | ||
| 543 | +} | ||
| 544 | diff --git a/plugins/mount/gsd-mount-plugin.h b/plugins/mount/gsd-mount-plugin.h | ||
| 545 | new file mode 100644 | ||
| 546 | index 0000000..526a41f | ||
| 547 | --- /dev/null | ||
| 548 | +++ b/plugins/mount/gsd-mount-plugin.h | ||
| 549 | @@ -0,0 +1,55 @@ | ||
| 550 | +/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*- | ||
| 551 | + * | ||
| 552 | + * Copyright (C) 2009 Intel Corporation | ||
| 553 | + * | ||
| 554 | + * This program is free software; you can redistribute it and/or modify it under | ||
| 555 | + * the terms of the GNU General Public License as published by the Free Software | ||
| 556 | + * Foundation; either version 2, or (at your option) any later version. | ||
| 557 | + * | ||
| 558 | + * This program is distributed in the hope that it will be useful, but WITHOUT | ||
| 559 | + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS | ||
| 560 | + * FOR A PARTICULAR PURPOSE. See the GNU General Public License for more | ||
| 561 | + * details. | ||
| 562 | + * | ||
| 563 | + * You should have received a copy of the GNU General Public License along with | ||
| 564 | + * this program; if not, write to the Free Software Foundation, Inc., 59 Temple | ||
| 565 | + * Place - Suite 330, Boston, MA 02111-1307, USA. | ||
| 566 | + * | ||
| 567 | + */ | ||
| 568 | + | ||
| 569 | +#ifndef __GSD_MOUNT_PLUGIN_H__ | ||
| 570 | +#define __GSD_MOUNT_PLUGIN_H__ | ||
| 571 | + | ||
| 572 | +#include <glib-object.h> | ||
| 573 | +#include <gmodule.h> | ||
| 574 | +#include <gnome-settings-daemon/gnome-settings-plugin.h> | ||
| 575 | + | ||
| 576 | +G_BEGIN_DECLS | ||
| 577 | + | ||
| 578 | +#define GSD_TYPE_MOUNT_PLUGIN (gsd_mount_plugin_get_type ()) | ||
| 579 | +#define GSD_MOUNT_PLUGIN(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), GSD_TYPE_MOUNT_PLUGIN, GsdMountPlugin)) | ||
| 580 | +#define GSD_MOUNT_PLUGIN_CLASS(k) (G_TYPE_CHECK_CLASS_CAST((k), GSD_TYPE_MOUNT_PLUGIN, GsdMountPluginClass)) | ||
| 581 | +#define GSD_IS_MOUNT_PLUGIN(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), GSD_TYPE_MOUNT_PLUGIN)) | ||
| 582 | +#define GSD_IS_MOUNT_PLUGIN_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), GSD_TYPE_MOUNT_PLUGIN)) | ||
| 583 | +#define GSD_MOUNT_PLUGIN_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), GSD_TYPE_MOUNT_PLUGIN, GsdMountPluginClass)) | ||
| 584 | + | ||
| 585 | +typedef struct GsdMountPluginPrivate GsdMountPluginPrivate; | ||
| 586 | + | ||
| 587 | +typedef struct | ||
| 588 | +{ | ||
| 589 | + GnomeSettingsPlugin parent; | ||
| 590 | + GsdMountPluginPrivate *priv; | ||
| 591 | +} GsdMountPlugin; | ||
| 592 | + | ||
| 593 | +typedef struct | ||
| 594 | +{ | ||
| 595 | + GnomeSettingsPluginClass parent_class; | ||
| 596 | +} GsdMountPluginClass; | ||
| 597 | + | ||
| 598 | +GType gsd_mount_plugin_get_type (void) G_GNUC_CONST; | ||
| 599 | + | ||
| 600 | +G_MODULE_EXPORT GType register_gnome_settings_plugin (GTypeModule *module); | ||
| 601 | + | ||
| 602 | +G_END_DECLS | ||
| 603 | + | ||
| 604 | +#endif /* __GSD_MOUNT_PLUGIN_H__ */ | ||
| 605 | diff --git a/plugins/mount/mount.gnome-settings-plugin.in b/plugins/mount/mount.gnome-settings-plugin.in | ||
| 606 | new file mode 100644 | ||
| 607 | index 0000000..ca29ad1 | ||
| 608 | --- /dev/null | ||
| 609 | +++ b/plugins/mount/mount.gnome-settings-plugin.in | ||
| 610 | @@ -0,0 +1,8 @@ | ||
| 611 | +[GNOME Settings Plugin] | ||
| 612 | +Module=mount | ||
| 613 | +IAge=0 | ||
| 614 | +_Name=Mount | ||
| 615 | +_Description=Mount removable media | ||
| 616 | +Authors=Ross Burton | ||
| 617 | +Copyright=Copyright © 2009 Intel Corporation | ||
| 618 | +Website= | ||
diff --git a/meta/recipes-gnome/gnome/gnome-settings-daemon_2.26.1.bb b/meta/recipes-gnome/gnome/gnome-settings-daemon_2.26.1.bb new file mode 100644 index 0000000000..cb216b2753 --- /dev/null +++ b/meta/recipes-gnome/gnome/gnome-settings-daemon_2.26.1.bb | |||
| @@ -0,0 +1,25 @@ | |||
| 1 | DESCRIPTION = "GNOME settings daemon" | ||
| 2 | LICENSE = "GPL" | ||
| 3 | DEPENDS = "libxklavier gnome-doc-utils gtk+ libglade libgnomekbd gnome-desktop librsvg libxml2 libart-lgpl" | ||
| 4 | |||
| 5 | PR = "r3" | ||
| 6 | |||
| 7 | inherit gnome | ||
| 8 | |||
| 9 | SRC_URI += "file://desktop-moblin.patch;patch=1 \ | ||
| 10 | file://gnome-settings-daemon-fix-gthread.patch;patch=1 \ | ||
| 11 | file://mount-plugin.patch;patch=1 \ | ||
| 12 | file://gnome-settings-daemon-2.24.0-catch-deviceadded.patch;patch=1 \ | ||
| 13 | file://configurefix.patch;patch=1 \ | ||
| 14 | file://mojito-cleanup.patch;patch=1" | ||
| 15 | |||
| 16 | EXTRA_OECONF = "--disable-esd --x-includes=${STAGING_INCDIR} --x-libraries=${STAGING_LIBDIR}" | ||
| 17 | ASNEEDED = "" | ||
| 18 | |||
| 19 | FILES_${PN} += "${libdir}/gnome-settings-daemon-2.0/*.so ${libdir}/gnome-settings-daemon-2.0/*plugin \ | ||
| 20 | ${datadir}/dbus-1/ \ | ||
| 21 | ${datadir}/icon* \ | ||
| 22 | ${datadir}/xsession*" | ||
| 23 | |||
| 24 | FILES_${PN}-dbg += "${libdir}/gnome-settings-daemon-2.0/.debug" | ||
| 25 | FILES_${PN}-dev += "${libdir}/gnome-settings-daemon-2.0/*.a ${libdir}/gnome-settings-daemon-2.0/*.la" | ||
diff --git a/meta/recipes-gnome/gnome/gnome-terminal/30f29e7d8e1b67c40cd18a7155ba30c4382692d5.patch b/meta/recipes-gnome/gnome/gnome-terminal/30f29e7d8e1b67c40cd18a7155ba30c4382692d5.patch new file mode 100644 index 0000000000..0358ed8a64 --- /dev/null +++ b/meta/recipes-gnome/gnome/gnome-terminal/30f29e7d8e1b67c40cd18a7155ba30c4382692d5.patch | |||
| @@ -0,0 +1,20 @@ | |||
| 1 | From 30f29e7d8e1b67c40cd18a7155ba30c4382692d5 Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Seán de Búrca <leftmostcat@gmail.com> | ||
| 3 | Date: Fri, 07 Aug 2009 00:38:52 +0000 | ||
| 4 | Subject: Remove useless Plural-Forms line which breaks build with gnome-doc-utils master | ||
| 5 | |||
| 6 | --- | ||
| 7 | diff --git a/help/el/el.po b/help/el/el.po | ||
| 8 | index ab77264..635b68f 100644 | ||
| 9 | --- a/help/el/el.po | ||
| 10 | +++ b/help/el/el.po | ||
| 11 | @@ -10,7 +10,6 @@ msgstr "" | ||
| 12 | "MIME-Version: 1.0\n" | ||
| 13 | "Content-Type: text/plain; charset=UTF-8\n" | ||
| 14 | "Content-Transfer-Encoding: 8bit\n" | ||
| 15 | -"Plural-Forms: 2\n" | ||
| 16 | "X-Poedit-Language: Greek\n" | ||
| 17 | "X-Poedit-Country: GREECE\n" | ||
| 18 | "X-Generator: Lokalize 0.2\n" | ||
| 19 | -- | ||
| 20 | cgit v0.8.3.1 | ||
diff --git a/meta/recipes-gnome/gnome/gnome-terminal_2.26.3.bb b/meta/recipes-gnome/gnome/gnome-terminal_2.26.3.bb new file mode 100644 index 0000000000..73f0b99eac --- /dev/null +++ b/meta/recipes-gnome/gnome/gnome-terminal_2.26.3.bb | |||
| @@ -0,0 +1,16 @@ | |||
| 1 | DESCRIPTION = "GNOME Terminal" | ||
| 2 | LICENSE = "GPL" | ||
| 3 | DEPENDS = "gtk+ glib-2.0 startup-notification dbus-glib vte" | ||
| 4 | PR = "r2" | ||
| 5 | |||
| 6 | inherit gnome | ||
| 7 | |||
| 8 | SRC_URI += "file://30f29e7d8e1b67c40cd18a7155ba30c4382692d5.patch;patch=1" | ||
| 9 | |||
| 10 | EXTRA_OECONF += "--disable-scrollkeeper" | ||
| 11 | |||
| 12 | # Remove an autogenerated file that needs to be rebuilt | ||
| 13 | do_configure_prepend () { | ||
| 14 | rm -f ${S}/src/terminal-type-builtins.c | ||
| 15 | } | ||
| 16 | |||
diff --git a/meta/recipes-gnome/gnome/gnome-vfs-2.24.3/gconftool-lossage.patch b/meta/recipes-gnome/gnome/gnome-vfs-2.24.3/gconftool-lossage.patch new file mode 100644 index 0000000000..3dbc130ddc --- /dev/null +++ b/meta/recipes-gnome/gnome/gnome-vfs-2.24.3/gconftool-lossage.patch | |||
| @@ -0,0 +1,11 @@ | |||
| 1 | --- gnome-vfs-2.6.0/configure.in~ 2004-03-22 12:36:23.000000000 +0000 | ||
| 2 | +++ gnome-vfs-2.6.0/configure.in 2004-06-07 16:04:34.000000000 +0100 | ||
| 3 | @@ -154,7 +154,7 @@ | ||
| 4 | AC_PATH_PROG(GCONFTOOL, gconftool-2, no) | ||
| 5 | |||
| 6 | if test x"$GCONFTOOL" = xno; then | ||
| 7 | - AC_MSG_ERROR([gconftool-2 executable not found in your path - should be installed with GConf]) | ||
| 8 | + AC_MSG_WARN([gconftool-2 executable not found in your path - should be installed with GConf]) | ||
| 9 | fi | ||
| 10 | |||
| 11 | AM_GCONF_SOURCE_2 | ||
diff --git a/meta/recipes-gnome/gnome/gnome-vfs-2.24.3/gnome-vfs-no-kerberos.patch b/meta/recipes-gnome/gnome/gnome-vfs-2.24.3/gnome-vfs-no-kerberos.patch new file mode 100644 index 0000000000..e25ecdd66f --- /dev/null +++ b/meta/recipes-gnome/gnome/gnome-vfs-2.24.3/gnome-vfs-no-kerberos.patch | |||
| @@ -0,0 +1,51 @@ | |||
| 1 | removes kerberos completely to avoid conflicts with installed kerberos | ||
| 2 | --- configure.in.orig 2007-01-05 19:42:26.418541610 +0200 | ||
| 3 | +++ configure.in 2007-01-05 19:42:56.604261797 +0200 | ||
| 4 | @@ -436,47 +436,6 @@ | ||
| 5 | ]) | ||
| 6 | AM_CONDITIONAL(HAVE_CDDA, test $have_cdda = yes) | ||
| 7 | AC_SUBST(CDDA_LIBS) | ||
| 8 | - | ||
| 9 | -dnl GSSAPI | ||
| 10 | -dnl Check for Kerberos installation | ||
| 11 | -have_gssapi=no | ||
| 12 | -AC_PATH_PROG([KRB5_CONFIG], krb5-config, none, $PATH:/usr/kerberos/bin) | ||
| 13 | - | ||
| 14 | -if test "x$KRB5_CONFIG" != "xnone"; then | ||
| 15 | - GSSAPI_LIBS="`${KRB5_CONFIG} --libs gssapi`" | ||
| 16 | - GSSAPI_CFLAGS="`${KRB5_CONFIG} --cflags gssapi`" | ||
| 17 | - | ||
| 18 | - saved_CPPFLAGS="$CPPFLAGS" | ||
| 19 | - saved_LIBS="$LIBS" | ||
| 20 | - LIBS="$LIBS $GSSAPI_LIBS" | ||
| 21 | - CPPFLAGS="$CPPFLAGS $GSSAPI_CFLAGS" | ||
| 22 | - # MIT and Heimdal put gssapi.h in different places | ||
| 23 | - AC_CHECK_HEADERS(gssapi/gssapi.h gssapi.h, [ | ||
| 24 | - AC_CHECK_FUNCS(gss_init_sec_context, [ | ||
| 25 | - AC_MSG_NOTICE([GSSAPI authentication support enabled]) | ||
| 26 | - AC_DEFINE(HAVE_GSSAPI, 1, [Define if GSSAPI support is enabled]) | ||
| 27 | - AC_CHECK_HEADERS(gssapi/gssapi_generic.h) | ||
| 28 | - have_gssapi=yes | ||
| 29 | - | ||
| 30 | - # MIT Kerberos lacks GSS_C_NT_HOSTBASED_SERVICE | ||
| 31 | - AC_CHECK_DECL([GSS_C_NT_HOSTBASED_SERVICE],, | ||
| 32 | - [AC_DEFINE([GSS_C_NT_HOSTBASED_SERVICE], gss_nt_service_name, | ||
| 33 | - [Define if GSS_C_NT_HOSTBASED_SERVICE is not defined otherwise]) | ||
| 34 | - ], [ | ||
| 35 | - #ifdef HAVE_GSSAPI_GSSAPI_H | ||
| 36 | - #include <gssapi/gssapi.h> | ||
| 37 | - #else | ||
| 38 | - #include <gssapi.h> | ||
| 39 | - #endif | ||
| 40 | - ]) | ||
| 41 | - ]) | ||
| 42 | - break | ||
| 43 | - ]) | ||
| 44 | - LIBS="$saved_LIBS" | ||
| 45 | - CPPFLAGS="$saved_CPPFLAGS" | ||
| 46 | -fi | ||
| 47 | -AC_SUBST(GSSAPI_LIBS) | ||
| 48 | -AC_SUBST(GSSAPI_CFLAGS) | ||
| 49 | |||
| 50 | dnl ****************************** | ||
| 51 | dnl http-method (neon checks) | ||
diff --git a/meta/recipes-gnome/gnome/gnome-vfs_2.24.3.bb b/meta/recipes-gnome/gnome/gnome-vfs_2.24.3.bb new file mode 100644 index 0000000000..928549cca4 --- /dev/null +++ b/meta/recipes-gnome/gnome/gnome-vfs_2.24.3.bb | |||
| @@ -0,0 +1,44 @@ | |||
| 1 | DESCRIPTION = "a userspace virtual filesystem" | ||
| 2 | HOMEPAGE = "http://www.gnome.org/" | ||
| 3 | BUGTRACKER = "https://bugzilla.gnome.org/" | ||
| 4 | |||
| 5 | LICENSE = "GPLv2+ & LGPLv2+" | ||
| 6 | LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \ | ||
| 7 | file://libgnomevfs/gnome-vfs.h;endline=25;md5=17071e69707a8f42887d88413f2623cb \ | ||
| 8 | file://programs/gnomevfs-ls.c;endline=23;md5=678a2e8bedaef5818ccabe633840196b \ | ||
| 9 | file://daemon/vfs-daemon.c;endline=21;md5=5f2c61553fb16abb07fc9498ca03fe1f \ | ||
| 10 | file://modules/cdda-cddb.h;endline=22;md5=20ed324ca64907c366ecd7f22b8e0c54" | ||
| 11 | |||
| 12 | DEPENDS = "libxml2 gconf dbus bzip2 gnome-mime-data zlib" | ||
| 13 | RRECOMMENDS_${PN} = "gnome-vfs-plugin-file shared-mime-info" | ||
| 14 | # Some legacy packages will require gnome-mime-data to be installed, but use of | ||
| 15 | # it is deprecated. | ||
| 16 | PR = "r0" | ||
| 17 | |||
| 18 | inherit gnome | ||
| 19 | |||
| 20 | # This is to provide compatibility with the gnome-vfs DBus fork | ||
| 21 | RPROVIDES = "gnome-vfs-plugin-dbus" | ||
| 22 | |||
| 23 | SRC_URI += "file://gconftool-lossage.patch;patch=1;pnum=1 \ | ||
| 24 | file://gnome-vfs-no-kerberos.patch;patch=1;pnum=0" | ||
| 25 | |||
| 26 | EXTRA_OECONF = " \ | ||
| 27 | --disable-hal \ | ||
| 28 | --disable-openssl \ | ||
| 29 | --disable-samba \ | ||
| 30 | " | ||
| 31 | |||
| 32 | FILES_${PN} += " ${libdir}/vfs ${datadir}/dbus-1/services" | ||
| 33 | FILES_${PN}-dbg += " ${libdir}/gnome-vfs-2.0/modules/.debug" | ||
| 34 | FILES_${PN}-dev += " ${libdir}/gnome-vfs-2.0/include" | ||
| 35 | FILES_${PN}-doc += " ${datadir}/gtk-doc" | ||
| 36 | |||
| 37 | PACKAGES_DYNAMIC = "gnome-vfs-plugin-*" | ||
| 38 | |||
| 39 | python populate_packages_prepend () { | ||
| 40 | print bb.data.getVar('FILES_gnome-vfs', d, 1) | ||
| 41 | |||
| 42 | plugindir = bb.data.expand('${libdir}/gnome-vfs-2.0/modules/', d) | ||
| 43 | do_split_packages(d, plugindir, '^lib(.*)\.so$', 'gnome-vfs-plugin-%s', 'GNOME VFS plugin for %s') | ||
| 44 | } | ||
diff --git a/meta/recipes-gnome/gnome/gobject-introspection/configure.patch b/meta/recipes-gnome/gnome/gobject-introspection/configure.patch new file mode 100644 index 0000000000..c441799b23 --- /dev/null +++ b/meta/recipes-gnome/gnome/gobject-introspection/configure.patch | |||
| @@ -0,0 +1,25 @@ | |||
| 1 | Index: git/common.mk | ||
| 2 | =================================================================== | ||
| 3 | --- git.orig/common.mk 2009-08-19 11:11:26.000000000 +0100 | ||
| 4 | +++ git/common.mk 2009-08-19 11:12:05.000000000 +0100 | ||
| 5 | @@ -4,7 +4,7 @@ | ||
| 6 | UNINSTALLED_INTROSPECTION_SRCDIR=$(top_srcdir) \ | ||
| 7 | UNINSTALLED_INTROSPECTION_BUILDDIR=$(top_builddir) | ||
| 8 | SCANNER_ARGS = -v --add-include-path=$(top_builddir)/gir --add-include-path=. | ||
| 9 | -SCANNER = $(AM_V_GEN) env LPATH=.libs $(CHECK_DEBUG) $(SCANNER_ENV) $(SCANNER_BIN) $(SCANNER_ARGS) | ||
| 10 | +SCANNER = $(AM_V_GEN) env LPATH=.libs $(CHECK_DEBUG) $(SCANNER_ENV) g-ir-scanner $(SCANNER_ARGS) | ||
| 11 | SCANNER_LIBS = \ | ||
| 12 | $(top_srcdir)/giscanner/*.py \ | ||
| 13 | $(top_builddir)/giscanner/libgiscanner.la \ | ||
| 14 | Index: git/configure.ac | ||
| 15 | =================================================================== | ||
| 16 | --- git.orig/configure.ac 2009-08-19 11:11:26.000000000 +0100 | ||
| 17 | +++ git/configure.ac 2009-08-19 11:11:28.000000000 +0100 | ||
| 18 | @@ -201,7 +201,6 @@ | ||
| 19 | pyexecdir=`echo $pyexecdir | tr '\\\\' '/'` | ||
| 20 | ;; | ||
| 21 | esac | ||
| 22 | -AM_CHECK_PYTHON_HEADERS(,AC_MSG_ERROR([Python headers not found])) | ||
| 23 | |||
| 24 | AC_CONFIG_FILES([ | ||
| 25 | Makefile | ||
diff --git a/meta/recipes-gnome/gnome/gobject-introspection/pathfix.patch b/meta/recipes-gnome/gnome/gobject-introspection/pathfix.patch new file mode 100644 index 0000000000..b4582e2eaa --- /dev/null +++ b/meta/recipes-gnome/gnome/gobject-introspection/pathfix.patch | |||
| @@ -0,0 +1,38 @@ | |||
| 1 | Index: git/gir/Makefile.am | ||
| 2 | =================================================================== | ||
| 3 | --- git.orig/gir/Makefile.am 2009-08-19 11:11:26.000000000 +0100 | ||
| 4 | +++ git/gir/Makefile.am 2009-08-19 11:12:45.000000000 +0100 | ||
| 5 | @@ -41,7 +41,7 @@ | ||
| 6 | -I$(GLIB_LIBDIR)/glib-2.0/include \ | ||
| 7 | -DGETTEXT_PACKAGE=Dummy \ | ||
| 8 | -D__G_I18N_LIB_H__ \ | ||
| 9 | - $(GLIB_LIBDIR)/glib-2.0/include/glibconfig.h \ | ||
| 10 | + $(GLIB_INCLUDEDIR)/glibconfig.h \ | ||
| 11 | $(srcdir)/glib-2.0.c \ | ||
| 12 | -DGLIB_COMPILATION \ | ||
| 13 | $(GLIB_INCLUDEDIR)/glib/*.h | ||
| 14 | Index: git/giscanner/dumper.py | ||
| 15 | =================================================================== | ||
| 16 | --- git.orig/giscanner/dumper.py 2009-08-19 11:11:26.000000000 +0100 | ||
| 17 | +++ git/giscanner/dumper.py 2009-08-19 11:12:45.000000000 +0100 | ||
| 18 | @@ -82,7 +82,7 @@ | ||
| 19 | self._tmpdir = tempfile.mkdtemp('', 'tmp-introspect', dir=os.getcwd()) | ||
| 20 | |||
| 21 | self._compiler_cmd = os.environ.get('CC', 'gcc') | ||
| 22 | - self._linker_cmd = os.environ.get('LD', self._compiler_cmd) | ||
| 23 | + self._linker_cmd = os.environ.get('CCLD', self._compiler_cmd) | ||
| 24 | self._pkgconfig_cmd = os.environ.get('PKG_CONFIG', 'pkg-config') | ||
| 25 | |||
| 26 | self._uninst_srcdir = os.environ.get( | ||
| 27 | Index: git/giscanner/scannermain.py | ||
| 28 | =================================================================== | ||
| 29 | --- git.orig/giscanner/scannermain.py 2009-08-19 11:11:26.000000000 +0100 | ||
| 30 | +++ git/giscanner/scannermain.py 2009-08-19 11:12:45.000000000 +0100 | ||
| 31 | @@ -283,6 +283,7 @@ | ||
| 32 | shown_include_warning = False | ||
| 33 | for include in options.includes: | ||
| 34 | if os.sep in include: | ||
| 35 | + continue | ||
| 36 | raise ValueError("Invalid include path %r" % (include, )) | ||
| 37 | include_obj = Include.from_string(include) | ||
| 38 | transformer.register_include(include_obj) | ||
diff --git a/meta/recipes-gnome/gnome/gobject-introspection_git.bb b/meta/recipes-gnome/gnome/gobject-introspection_git.bb new file mode 100644 index 0000000000..fe6eea2855 --- /dev/null +++ b/meta/recipes-gnome/gnome/gobject-introspection_git.bb | |||
| @@ -0,0 +1,24 @@ | |||
| 1 | SRC_URI = "git://git.gnome.org/gobject-introspection;protocol=git \ | ||
| 2 | file://configure.patch;patch=1 \ | ||
| 3 | file://pathfix.patch;patch=1" | ||
| 4 | |||
| 5 | SRC_URI_virtclass-native = "git://git.gnome.org/gobject-introspection;protocol=git \ | ||
| 6 | file://pathfix.patch;patch=1" | ||
| 7 | |||
| 8 | PV = "0.0+git${SRCREV}" | ||
| 9 | PR = "r3" | ||
| 10 | |||
| 11 | S = "${WORKDIR}/git" | ||
| 12 | |||
| 13 | DEPENDS = "libffi python-native gobject-introspection-native" | ||
| 14 | DEPENDS_virtclass-native = "libffi-native python-native" | ||
| 15 | |||
| 16 | inherit autotools | ||
| 17 | |||
| 18 | TARGET_CFLAGS += "-I${STAGING_INCDIR_NATIVE}/python2.5" | ||
| 19 | |||
| 20 | do_configure_prepend () { | ||
| 21 | echo "EXTRA_DIST = " > ${S}/gtk-doc.make | ||
| 22 | } | ||
| 23 | |||
| 24 | BBCLASSEXTEND = "native" \ No newline at end of file | ||
diff --git a/meta/recipes-gnome/gnome/libart-lgpl/Makefile.am.patch b/meta/recipes-gnome/gnome/libart-lgpl/Makefile.am.patch new file mode 100644 index 0000000000..edeed0a6e5 --- /dev/null +++ b/meta/recipes-gnome/gnome/libart-lgpl/Makefile.am.patch | |||
| @@ -0,0 +1,7 @@ | |||
| 1 | --- libart_lgpl-2.3.16/Makefile.am.old 2004-06-26 18:57:07.000000000 +0100 | ||
| 2 | +++ libart_lgpl-2.3.16/Makefile.am 2004-06-26 18:57:12.000000000 +0100 | ||
| 3 | @@ -5,2 +5,2 @@ | ||
| 4 | -art_config.h: gen_art_config$(EXEEXT) | ||
| 5 | - ./gen_art_config > art_config.h | ||
| 6 | +#art_config.h: gen_art_config$(EXEEXT) | ||
| 7 | +# ./gen_art_config > art_config.h | ||
diff --git a/meta/recipes-gnome/gnome/libart-lgpl/arm/art_config.h b/meta/recipes-gnome/gnome/libart-lgpl/arm/art_config.h new file mode 100644 index 0000000000..b0e74ad6ae --- /dev/null +++ b/meta/recipes-gnome/gnome/libart-lgpl/arm/art_config.h | |||
| @@ -0,0 +1,10 @@ | |||
| 1 | /* Automatically generated by gen_art_config.c */ | ||
| 2 | |||
| 3 | #define ART_SIZEOF_CHAR 1 | ||
| 4 | #define ART_SIZEOF_SHORT 2 | ||
| 5 | #define ART_SIZEOF_INT 4 | ||
| 6 | #define ART_SIZEOF_LONG 4 | ||
| 7 | |||
| 8 | typedef unsigned char art_u8; | ||
| 9 | typedef unsigned short art_u16; | ||
| 10 | typedef unsigned int art_u32; | ||
diff --git a/meta/recipes-gnome/gnome/libart-lgpl/i386/art_config.h b/meta/recipes-gnome/gnome/libart-lgpl/i386/art_config.h new file mode 100644 index 0000000000..b0e74ad6ae --- /dev/null +++ b/meta/recipes-gnome/gnome/libart-lgpl/i386/art_config.h | |||
| @@ -0,0 +1,10 @@ | |||
| 1 | /* Automatically generated by gen_art_config.c */ | ||
| 2 | |||
| 3 | #define ART_SIZEOF_CHAR 1 | ||
| 4 | #define ART_SIZEOF_SHORT 2 | ||
| 5 | #define ART_SIZEOF_INT 4 | ||
| 6 | #define ART_SIZEOF_LONG 4 | ||
| 7 | |||
| 8 | typedef unsigned char art_u8; | ||
| 9 | typedef unsigned short art_u16; | ||
| 10 | typedef unsigned int art_u32; | ||
diff --git a/meta/recipes-gnome/gnome/libart-lgpl/i586/art_config.h b/meta/recipes-gnome/gnome/libart-lgpl/i586/art_config.h new file mode 100644 index 0000000000..b0e74ad6ae --- /dev/null +++ b/meta/recipes-gnome/gnome/libart-lgpl/i586/art_config.h | |||
| @@ -0,0 +1,10 @@ | |||
| 1 | /* Automatically generated by gen_art_config.c */ | ||
| 2 | |||
| 3 | #define ART_SIZEOF_CHAR 1 | ||
| 4 | #define ART_SIZEOF_SHORT 2 | ||
| 5 | #define ART_SIZEOF_INT 4 | ||
| 6 | #define ART_SIZEOF_LONG 4 | ||
| 7 | |||
| 8 | typedef unsigned char art_u8; | ||
| 9 | typedef unsigned short art_u16; | ||
| 10 | typedef unsigned int art_u32; | ||
diff --git a/meta/recipes-gnome/gnome/libart-lgpl/i686/art_config.h b/meta/recipes-gnome/gnome/libart-lgpl/i686/art_config.h new file mode 100644 index 0000000000..b0e74ad6ae --- /dev/null +++ b/meta/recipes-gnome/gnome/libart-lgpl/i686/art_config.h | |||
| @@ -0,0 +1,10 @@ | |||
| 1 | /* Automatically generated by gen_art_config.c */ | ||
| 2 | |||
| 3 | #define ART_SIZEOF_CHAR 1 | ||
| 4 | #define ART_SIZEOF_SHORT 2 | ||
| 5 | #define ART_SIZEOF_INT 4 | ||
| 6 | #define ART_SIZEOF_LONG 4 | ||
| 7 | |||
| 8 | typedef unsigned char art_u8; | ||
| 9 | typedef unsigned short art_u16; | ||
| 10 | typedef unsigned int art_u32; | ||
diff --git a/meta/recipes-gnome/gnome/libart-lgpl_2.3.19.bb b/meta/recipes-gnome/gnome/libart-lgpl_2.3.19.bb new file mode 100644 index 0000000000..fa565f3d1c --- /dev/null +++ b/meta/recipes-gnome/gnome/libart-lgpl_2.3.19.bb | |||
| @@ -0,0 +1,27 @@ | |||
| 1 | DESCRIPTION = "Library of functions for 2D graphics" | ||
| 2 | SECTION = "x11/gnome" | ||
| 3 | LICENSE = "LGPL" | ||
| 4 | PR = "r1" | ||
| 5 | |||
| 6 | ART_CONFIG = "${HOST_ARCH}/art_config.h" | ||
| 7 | |||
| 8 | # can't use gnome.oeclass due to _ in filename | ||
| 9 | SRC_URI = "http://ftp.gnome.org/pub/GNOME/sources/libart_lgpl/2.3/libart_lgpl-${PV}.tar.bz2 \ | ||
| 10 | file://${ART_CONFIG} \ | ||
| 11 | file://Makefile.am.patch;patch=1" | ||
| 12 | |||
| 13 | inherit autotools pkgconfig | ||
| 14 | |||
| 15 | DEPENDS = "" | ||
| 16 | |||
| 17 | FILES_${PN} = "${libdir}/*.so.*" | ||
| 18 | FILES_${PN}-dev += "${bindir}/libart2-config" | ||
| 19 | |||
| 20 | S = "${WORKDIR}/libart_lgpl-${PV}" | ||
| 21 | |||
| 22 | do_configure_prepend() { | ||
| 23 | cp ${WORKDIR}/${ART_CONFIG} ${S}/art_config.h | ||
| 24 | } | ||
| 25 | |||
| 26 | EXTRA_OECONF = "--disable-gtk-doc" | ||
| 27 | |||
diff --git a/meta/recipes-gnome/gnome/libgnome-keyring_2.30.1.bb b/meta/recipes-gnome/gnome/libgnome-keyring_2.30.1.bb new file mode 100644 index 0000000000..900400688e --- /dev/null +++ b/meta/recipes-gnome/gnome/libgnome-keyring_2.30.1.bb | |||
| @@ -0,0 +1,18 @@ | |||
| 1 | DESCRIPTION = "Compatibility library for accessing secrets" | ||
| 2 | HOMEPAGE = "http://www.gnome.org/" | ||
| 3 | BUGTRACKER = "https://bugzilla.gnome.org/" | ||
| 4 | |||
| 5 | LICENSE = "LGPLv2 & LGPLv2+ & LGPLv2.1+" | ||
| 6 | LIC_FILES_CHKSUM = "file://COPYING;md5=0914b9d3ebaba41ef2e3e0ae16f296cf \ | ||
| 7 | file://library/gnome-keyring.h;endline=25;md5=68ea64f81c160d670c37da5f137be4fb \ | ||
| 8 | file://library/gnome-keyring.c;endline=26;md5=8d7a4fb674aaa012ea5a98e7c368b4a5 \ | ||
| 9 | file://egg/egg-dh.h;endline=22;md5=1626c16af2a8da1f88324cf3ced33f08" | ||
| 10 | |||
| 11 | SECTION = "x11/gnome/libs" | ||
| 12 | PR = "r0" | ||
| 13 | |||
| 14 | inherit gnome | ||
| 15 | |||
| 16 | DEPENDS = "dbus eggdbus" | ||
| 17 | |||
| 18 | EXTRA_OECONF = "--disable-gtk-doc" | ||
diff --git a/meta/recipes-gnome/gnome/libgnomecanvas_2.20.0.bb b/meta/recipes-gnome/gnome/libgnomecanvas_2.20.0.bb new file mode 100644 index 0000000000..266d44b050 --- /dev/null +++ b/meta/recipes-gnome/gnome/libgnomecanvas_2.20.0.bb | |||
| @@ -0,0 +1,14 @@ | |||
| 1 | LICENSE = "GPL" | ||
| 2 | SECTION = "x11/gnome/libs" | ||
| 3 | DESCRIPTION = "A powerful object-oriented display" | ||
| 4 | PR = "r2" | ||
| 5 | |||
| 6 | inherit gnome | ||
| 7 | |||
| 8 | DEPENDS = "libglade libart-lgpl virtual/gail" | ||
| 9 | |||
| 10 | EXTRA_OECONF = "--disable-gtk-doc" | ||
| 11 | |||
| 12 | FILES_${PN} += "${libdir}/libglade/*/libcanvas.so" | ||
| 13 | FILES_${PN}-dbg += "${libdir}/libglade/*/.debug/" | ||
| 14 | FILES_${PN}-dev += "${libdir}/libglade/*/libcanvas.*a" | ||
diff --git a/meta/recipes-gnome/gnome/libgnomekbd_2.26.0.bb b/meta/recipes-gnome/gnome/libgnomekbd_2.26.0.bb new file mode 100644 index 0000000000..f2e4ec533e --- /dev/null +++ b/meta/recipes-gnome/gnome/libgnomekbd_2.26.0.bb | |||
| @@ -0,0 +1,14 @@ | |||
| 1 | DESCRIPTION = "GNOME keyboard library" | ||
| 2 | LICENSE = "LGPL" | ||
| 3 | |||
| 4 | DEPENDS = "gconf-dbus dbus libxklavier gtk+" | ||
| 5 | |||
| 6 | inherit gnome | ||
| 7 | |||
| 8 | do_configure_append() { | ||
| 9 | find ${S} -name Makefile | xargs sed -i s:'-I$(includedir)':'-I.':g | ||
| 10 | find ${S} -name Makefile | xargs sed -i s:'-I/usr/include':'-I${STAGING_INCDIR}':g | ||
| 11 | } | ||
| 12 | |||
| 13 | |||
| 14 | |||
diff --git a/meta/recipes-gnome/gnome/metacity_2.22.0.bb b/meta/recipes-gnome/gnome/metacity_2.22.0.bb new file mode 100644 index 0000000000..44a5f86ebf --- /dev/null +++ b/meta/recipes-gnome/gnome/metacity_2.22.0.bb | |||
| @@ -0,0 +1,17 @@ | |||
| 1 | SECTION = "x11/wm" | ||
| 2 | DESCRIPTION = "Metacity is the boring window manager for the adult in you." | ||
| 3 | LICENSE = "GPL" | ||
| 4 | DEPENDS = "startup-notification gtk+ gconf gdk-pixbuf-csource-native" | ||
| 5 | PR = "r3" | ||
| 6 | |||
| 7 | inherit gnome update-alternatives | ||
| 8 | |||
| 9 | ALTERNATIVE_NAME = "x-window-manager" | ||
| 10 | ALTERNATIVE_LINK = "${bindir}/x-window-manager" | ||
| 11 | ALTERNATIVE_PATH = "${bindir}/metacity" | ||
| 12 | ALTERNATIVE_PRIORITY = "10" | ||
| 13 | |||
| 14 | EXTRA_OECONF += "--disable-verbose \ | ||
| 15 | --disable-xinerama" | ||
| 16 | |||
| 17 | FILES_${PN} += "${datadir}/themes" | ||
