diff options
| author |   Martin Jansa <Martin.Jansa@gmail.com> | 2017-04-27 11:04:51 +0200 |
|---|---|---|
| committer | Martin Jansa <Martin.Jansa@gmail.com> | 2017-08-31 10:18:33 +0200 |
| commit | ec9e5ed06256ad92c818474cdb490dc0d3a0d0a3 (patch) | |
| tree | e16d2a838f4561d5538928a58f805e5f1373225a /meta-gnome | |
| parent | 6775acb048dabd624c5c8197b683aba45ed91569 (diff) | |
| download | meta-openembedded-contrib-ec9e5ed06256ad92c818474cdb490dc0d3a0d0a3.tar.gz | |
recipes: remove blacklisted recipes
* as PNBLACKLIST message says, these recipes are blacklisted for long
time and nobody showed any interest to fix them
* remove all unused .patch and .inc files as well
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'meta-gnome')
80 files changed, 0 insertions, 6042 deletions
diff --git a/meta-gnome/recipes-apps/cheese/cheese_2.30.1.bb b/meta-gnome/recipes-apps/cheese/cheese_2.30.1.bb deleted file mode 100644 index 3f5a5b1247..0000000000 --- a/meta-gnome/recipes-apps/cheese/cheese_2.30.1.bb +++ /dev/null @@ -1,26 +0,0 @@ -SUMMARY = "Take photos and videos with your webcam, with fun graphical effects" -LICENSE = "GPLv2" -LIC_FILES_CHKSUM = "file://COPYING;md5=a17cb0a873d252440acfdf9b3d0e7fbf" - -DEPENDS = "gtk+ gstreamer gst-plugins-base libcanberra udev librsvg gnome-desktop evolution-data-server intltool-native" - -PR = "r2" - -inherit gnome - -SRC_URI[archive.md5sum] = "1599fded8a1797ea51fb010af4e6c45b" -SRC_URI[archive.sha256sum] = "48f03470c6f527caa0e3b269d3afcff86ae0939a74f66ce030d4eed3bc3cbd9a" -GNOME_COMPRESS_TYPE="bz2" - -FILES_${PN} += "${datadir}/dbus-1" -RRECOMMENDS_${PN} = "gst-plugins-good-meta gst-plugins-base-meta" - -EXTRA_OECONF += "--disable-scrollkeeper" - -do_configure_prepend() { - sed -i -e "s: help : :g" ${S}/Makefile.am -} - -PNBLACKLIST[cheese] ?= "Depends on blacklisted gstreamer - the recipe will be removed on 2017-09-01 unless the issue is fixed" - -PNBLACKLIST[cheese] ?= "Depends on blacklisted gnome-desktop - the recipe will be removed on 2017-09-01 unless the issue is fixed" diff --git a/meta-gnome/recipes-apps/epdfview/epdfview/browser_command.patch b/meta-gnome/recipes-apps/epdfview/epdfview/browser_command.patch deleted file mode 100644 index 75e45e0ab6..0000000000 --- a/meta-gnome/recipes-apps/epdfview/epdfview/browser_command.patch +++ /dev/null @@ -1,17 +0,0 @@ -Imported from Debian 0.1.8-3 - -Upstream-Status: Pending - -diff --git a/src/Config.cxx b/src/Config.cxx -index 28f37ab..bc58819 100644 ---- a/src/Config.cxx -+++ b/src/Config.cxx -@@ -22,7 +22,7 @@ - using namespace ePDFView; - - // Constants --static const gchar *DEFAULT_EXTERNAL_BROWSER_COMMAND_LINE = "firefox %s"; -+static const gchar *DEFAULT_EXTERNAL_BROWSER_COMMAND_LINE = "x-www-browser %s"; - static const gchar *DEFAULT_OPEN_FILE_FOLDER = NULL; - static const gchar *DEFAULT_SAVE_FILE_FOLDER = NULL; - static const gboolean DEFAULT_SHOW_STATUSBAR = TRUE; diff --git a/meta-gnome/recipes-apps/epdfview/epdfview/fix-format.patch b/meta-gnome/recipes-apps/epdfview/epdfview/fix-format.patch deleted file mode 100644 index 8ad5b97ca9..0000000000 --- a/meta-gnome/recipes-apps/epdfview/epdfview/fix-format.patch +++ /dev/null @@ -1,19 +0,0 @@ -Imported from Debian 0.1.8-3 - -Upstream-Status: Pending - -diff --git a/src/gtk/MainView.cxx b/src/gtk/MainView.cxx -index b983bff..f87de28 100644 ---- a/src/gtk/MainView.cxx -+++ b/src/gtk/MainView.cxx -@@ -634,8 +634,9 @@ MainView::showErrorMessage (const gchar *title, const gchar *body) - GTK_DIALOG_DESTROY_WITH_PARENT, - GTK_MESSAGE_ERROR, - GTK_BUTTONS_OK, -+ "%s", - title); -- gtk_message_dialog_format_secondary_text (GTK_MESSAGE_DIALOG(errorDialog), -+ gtk_message_dialog_format_secondary_text (GTK_MESSAGE_DIALOG(errorDialog), "%s", - body); - gtk_dialog_run (GTK_DIALOG (errorDialog)); - gtk_widget_destroy (errorDialog); diff --git a/meta-gnome/recipes-apps/epdfview/epdfview/glib-single-include.patch b/meta-gnome/recipes-apps/epdfview/epdfview/glib-single-include.patch deleted file mode 100644 index 84a4913863..0000000000 --- a/meta-gnome/recipes-apps/epdfview/epdfview/glib-single-include.patch +++ /dev/null @@ -1,17 +0,0 @@ -Imported from Debian 0.1.8-3 - -Upstream-Status: Pending - -diff --git a/src/gtk/StockIcons.h b/src/gtk/StockIcons.h -index c142a7a..58fcf2e 100644 ---- a/src/gtk/StockIcons.h -+++ b/src/gtk/StockIcons.h -@@ -18,7 +18,7 @@ - #if !defined (__STOCK_ICONS_H__) - #define __STOCK_ICONS_H__ - --#include <glib/gmacros.h> -+#include <glib.h> - - G_BEGIN_DECLS - diff --git a/meta-gnome/recipes-apps/epdfview/epdfview/swap-colors.patch b/meta-gnome/recipes-apps/epdfview/epdfview/swap-colors.patch deleted file mode 100644 index 282bfb184a..0000000000 --- a/meta-gnome/recipes-apps/epdfview/epdfview/swap-colors.patch +++ /dev/null @@ -1,43 +0,0 @@ -Imported from Debian 0.1.8-3 - -Upstream-Status: Pending - -Index: trunk/src/PDFDocument.cxx -=================================================================== ---- trunk/src/PDFDocument.cxx (revision 361) -+++ trunk/src/PDFDocument.cxx (revision 367) -@@ -21,4 +21,5 @@ - #include <poppler.h> - #include <unistd.h> -+#include <algorithm> - #include "epdfview.h" - -@@ -33,4 +34,22 @@ - static PageMode convertPageMode (gint pageMode); - static gchar *getAbsoluteFileName (const gchar *fileName); -+ -+namespace -+{ -+ void -+ convert_bgra_to_rgba (guint8 *data, int width, int height) -+ { -+ using std::swap; -+ -+ for (int y = 0; y < height; y++) -+ { -+ for (int x = 0; x < width; x++) -+ { -+ swap(data[0], data[2]); -+ data += 4; -+ } -+ } -+ } -+} - - /// -@@ -651,4 +670,5 @@ - cairo_destroy(context); - cairo_surface_destroy (surface); -+ convert_bgra_to_rgba(renderedPage->getData (), width, height); - #else // !HAVE_POPPLER_0_17_0 - // Create the pixbuf from the data and render to it. diff --git a/meta-gnome/recipes-apps/epdfview/epdfview_0.1.8.bb b/meta-gnome/recipes-apps/epdfview/epdfview_0.1.8.bb deleted file mode 100644 index 5e11a95dec..0000000000 --- a/meta-gnome/recipes-apps/epdfview/epdfview_0.1.8.bb +++ /dev/null @@ -1,25 +0,0 @@ -SUMMARY = "A lightweight PDF viewer based on gtk and poppler" -HOMEPAGE = "http://www.emma-soft.com/projects/epdfview/" -LICENSE = "GPLv2+" -LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552" -SECTION = "x11/applications" -DEPENDS = "gtk+ poppler" - -PR = "r3" - -EXTRA_OECONF += "--without-cups" - -inherit autotools gettext - -SRC_URI = "http://www.emma-soft.com/projects/${BPN}/chrome/site/releases/${BP}.tar.bz2 \ - file://browser_command.patch \ - file://fix-format.patch \ - file://glib-single-include.patch \ - file://swap-colors.patch \ -" -SRC_URI[md5sum] = "e50285b01612169b2594fea375f53ae4" -SRC_URI[sha256sum] = "948648ae7c9d7b3b408d738bd4f48d87375b1196cae1129d6b846a8de0f2f8f0" - -PNBLACKLIST[epdfview] ?= "BROKEN: images are not displayed anymore - the recipe will be removed on 2017-09-01 unless the issue is fixed" -# There will be no further development / upstream is gone [1] -# [1] https://bugzilla.redhat.com/show_bug.cgi?id=906121 diff --git a/meta-gnome/recipes-apps/gnome-mplayer/gmtk_1.0.5.bb b/meta-gnome/recipes-apps/gnome-mplayer/gmtk_1.0.5.bb deleted file mode 100644 index f6d737c813..0000000000 --- a/meta-gnome/recipes-apps/gnome-mplayer/gmtk_1.0.5.bb +++ /dev/null @@ -1,18 +0,0 @@ -SUMMARY = "GTK+ widget and function libraries for gnome-mplayer" -HOMEPAGE = "http://code.google.com/p/gmtk" -SECTION = "libs" - -LICENSE = "GPLv2" -LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552" - -DEPENDS = "gtk+ alsa-lib glib-2.0 virtual/libx11 intltool-native pulseaudio gtk+3" - -SRC_URI = "http://${BPN}.googlecode.com/files/${BP}.tar.gz" -SRC_URI[md5sum] = "e06e9ca8d61d74910343bb3ef4348f7f" -SRC_URI[sha256sum] = "a07130d62719e8c1244f8405dd97445798df5204fc0f3f2f2b669b125114b468" - -EXTRA_OECONF = "--disable-gconf --with-gio --with-alsa --enable-keystore" - -inherit gettext pkgconfig autotools gconf - -PNBLACKLIST[gmtk] ?= "Fails to build with RSS http://errors.yoctoproject.org/Errors/Details/130661/ - the recipe will be removed on 2017-09-01 unless the issue is fixed" diff --git a/meta-gnome/recipes-apps/gnome-mplayer/gnome-mplayer_1.0.5.bb b/meta-gnome/recipes-apps/gnome-mplayer/gnome-mplayer_1.0.5.bb deleted file mode 100644 index 629b830dd5..0000000000 --- a/meta-gnome/recipes-apps/gnome-mplayer/gnome-mplayer_1.0.5.bb +++ /dev/null @@ -1,32 +0,0 @@ -SUMMARY = "A GTK+ interface to MPlayer" -HOMEPAGE = "http://code.google.com/p/gnome-mplayer" -SECTION = "multimedia" - -LICENSE = "GPLv2+" -LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552" - -PNBLACKLIST[gnome-mplayer] ?= "rdepends on blacklisted mplayer - the recipe will be removed on 2017-09-01 unless the issue is fixed" -PR = "r2" - -DEPENDS = "gmtk gtk+ alsa-lib libnotify glib-2.0 dbus-glib virtual/libx11 libxscrnsaver" - -SRC_URI = "http://${BPN}.googlecode.com/files/${BP}.tar.gz" -SRC_URI[md5sum] = "1d3ab24c5501b5528e357931ca4dc6da" -SRC_URI[sha256sum] = "ac3c179345baecb4ca5237782aa33e83253a87bf8b42ce6eb3a9207a340f61b2" - -EXTRA_OECONF = "--with-gio --with-alsa --with-dbus --with-libnotify" - -FILES_${PN} += "${datadir}/gnome-control-center/default-apps/${PN}.xml" -PACKAGES =+ "${PN}-nautilus-extension" -FILES_${PN}-nautilus-extension += "${libdir}/nautilus/extensions-2.0/*.so \ - ${libdir}/nautilus/extensions-3.0/*.so" -FILES_${PN}-dev += "${libdir}/nautilus/extensions-2.0/*.la \ - ${libdir}/nautilus/extensions-3.0/*.la" -FILES_${PN}-staticdev += "${libdir}/nautilus/extensions-2.0/*.a \ - ${libdir}/nautilus/extensions-3.0/*.a" -FILES_${PN}-dbg += "${libdir}/nautilus/extensions-2.0/.debug \ - ${libdir}/nautilus/extensions-3.0/.debug" - -inherit gettext pkgconfig mime gtk-icon-cache autotools - -RDEPENDS_${PN} = "mplayer" diff --git a/meta-gnome/recipes-extended/gtk-theme-torturer/gtk-theme-torturer_git.bb b/meta-gnome/recipes-extended/gtk-theme-torturer/gtk-theme-torturer_git.bb deleted file mode 100644 index c419d0f44a..0000000000 --- a/meta-gnome/recipes-extended/gtk-theme-torturer/gtk-theme-torturer_git.bb +++ /dev/null @@ -1,25 +0,0 @@ -SUMMARY = "GTK+ Theme benchmark program" -DEPENDS = "gtk+" -HOMEPAGE = "http://wiki.laptop.org/go/GTK_for_OLPC" -SECTION = "devel" -LICENSE = "GPLv2" -LIC_FILES_CHKSUM = "file://appwindow.c;endline=13;md5=8c09920de460c7ea1f64ee56986aabd9" - -SRCREV = "99962ae39bb5aadb31929b25c58e1a053f9c9545" -PV = "0.0.0+git${SRCPV}" - -SRC_URI = "git://dev.laptop.org/projects/soc-gtk/" -S = "${WORKDIR}/git/gtk-theme-torturer" - -CFLAGS += "-Wl,-rpath-link,${STAGING_LIBDIR}" - -inherit distro_features_check -ANY_OF_DISTRO_FEATURES = "${GTK2DISTROFEATURES}" - -do_install() { - install -d ${D}${bindir} - install -m 0755 torturer ${D}${bindir} -} - -# http://errors.yoctoproject.org/Errors/Details/35132/ -PNBLACKLIST[gtk-theme-torturer] ?= "BROKEN: gmacros.h:182:53: error: size of array '_GStaticAssertCompileTimeAssertion_2' is negative - the recipe will be removed on 2017-09-01 unless the issue is fixed" diff --git a/meta-gnome/recipes-gnome/gcalctool/gcalctool_5.32.0.bb b/meta-gnome/recipes-gnome/gcalctool/gcalctool_5.32.0.bb deleted file mode 100644 index 6028f2d1a2..0000000000 --- a/meta-gnome/recipes-gnome/gcalctool/gcalctool_5.32.0.bb +++ /dev/null @@ -1,20 +0,0 @@ -SUMMARY = "gcalctool is a powerful calculator" -SECTION = "x11" -DEPENDS = "gtk+ gnome-doc-utils" - -LICENSE = "GPL-2.0" -LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe" - -SHRT_VER = "${@d.getVar('PV').split('.')[0]}.${@d.getVar('PV').split('.')[1]}" -SRC_URI = "http://download.gnome.org/sources/${BPN}/${SHRT_VER}/${BP}.tar.gz" - -SRC_URI[md5sum] = "48db927c6e7ee1d5395f953a8c184c98" -SRC_URI[sha256sum] = "346f645c0fdef900642f6e9a2c18e7ba9a7ca9bc62fe2b08eb418f065a425c89" - -inherit autotools pkgconfig gsettings - -do_configure_prepend() { - sed -i -e "s: help: :g" ${S}/Makefile.am -} - -PNBLACKLIST[gcalctool] ?= "broken at least since April 2013 http://permalink.gmane.org/gmane.comp.handhelds.openembedded/57920 and nobody complained, it's also replaced by gnome calculator - the recipe will be removed on 2017-09-01 unless the issue is fixed" diff --git a/meta-gnome/recipes-gnome/gdm/gdm/0001-Remove-user-switch-applet.patch b/meta-gnome/recipes-gnome/gdm/gdm/0001-Remove-user-switch-applet.patch deleted file mode 100644 index 75aff5d7c4..0000000000 --- a/meta-gnome/recipes-gnome/gdm/gdm/0001-Remove-user-switch-applet.patch +++ /dev/null @@ -1,2281 +0,0 @@ -From 0a4fe802edbd2e8a016161f08283e4b467c6762e Mon Sep 17 00:00:00 2001 -From: Koen Kooi <koen@dominion.thruhere.net> -Date: Tue, 21 Jun 2011 12:48:39 +0200 -Subject: [PATCH] Remove user switch applet - -This hasn't been updated to work with gnome-panel > 2.30.0, so just drop it - -Upstream-Status: unacceptable, backport - -Signed-off-by: Koen Kooi <koen@dominion.thruhere.net> ---- - configure.ac | 8 - - gui/Makefile.am | 2 - - .../GNOME_FastUserSwitchApplet.server.in.in | 38 - - .../GNOME_FastUserSwitchApplet.xml | 20 - - gui/user-switch-applet/Makefile.am | 67 - - gui/user-switch-applet/applet.c | 1662 -------------------- - gui/user-switch-applet/gdm-entry-menu-item.c | 304 ---- - gui/user-switch-applet/gdm-entry-menu-item.h | 51 - - po/POTFILES.in | 4 - - po/POTFILES.skip | 1 - - 10 files changed, 0 insertions(+), 2157 deletions(-) - delete mode 100644 gui/user-switch-applet/GNOME_FastUserSwitchApplet.server.in.in - delete mode 100644 gui/user-switch-applet/GNOME_FastUserSwitchApplet.xml - delete mode 100644 gui/user-switch-applet/Makefile.am - delete mode 100644 gui/user-switch-applet/applet.c - delete mode 100644 gui/user-switch-applet/gdm-entry-menu-item.c - delete mode 100644 gui/user-switch-applet/gdm-entry-menu-item.h - -diff --git a/configure.ac b/configure.ac -index 841efe0..a834110 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -149,13 +149,6 @@ PKG_CHECK_MODULES(SIMPLE_CHOOSER, - AC_SUBST(SIMPLE_CHOOSER_CFLAGS) - AC_SUBST(SIMPLE_CHOOSER_LIBS) - --PKG_CHECK_MODULES(APPLET, -- dbus-glib-1 >= $DBUS_GLIB_REQUIRED_VERSION -- gtk+-2.0 >= $GTK_REQUIRED_VERSION -- libpanelapplet-2.0 >= $GNOME_PANEL_REQUIRED_VERSION) --AC_SUBST(APPLET_CFLAGS) --AC_SUBST(APPLET_LIBS) -- - PLUGIN_LIBTOOL_FLAGS="-export_dynamic -module -avoid-version" - AC_SUBST(PLUGIN_LIBTOOL_FLAGS) - -@@ -1340,7 +1333,6 @@ gui/Makefile - gui/simple-greeter/Makefile - gui/simple-greeter/libnotificationarea/Makefile - gui/simple-chooser/Makefile --gui/user-switch-applet/Makefile - utils/Makefile - data/gdm.conf - data/Makefile -diff --git a/gui/Makefile.am b/gui/Makefile.am -index 326239f..bda3f7a 100644 ---- a/gui/Makefile.am -+++ b/gui/Makefile.am -@@ -2,7 +2,6 @@ NULL = - - SUBDIRS = \ - simple-greeter \ -- user-switch-applet \ - $(NULL) - - if XDMCP_SUPPORT -@@ -12,5 +11,4 @@ endif - DIST_SUBDIRS = \ - simple-chooser \ - simple-greeter \ -- user-switch-applet \ - $(NULL) -diff --git a/gui/user-switch-applet/GNOME_FastUserSwitchApplet.server.in.in b/gui/user-switch-applet/GNOME_FastUserSwitchApplet.server.in.in -deleted file mode 100644 -index a9b775f..0000000 ---- a/gui/user-switch-applet/GNOME_FastUserSwitchApplet.server.in.in -+++ /dev/null -@@ -1,38 +0,0 @@ --<oaf_info> -- <oaf_server iid="OAFIID:GNOME_FastUserSwitchApplet_Factory" type="exe" -- location="@LIBEXECDIR@/gdm-user-switch-applet"> -- -- <oaf_attribute name="repo_ids" type="stringv"> -- <item value="IDL:Bonobo/GenericFactory:1.0"/> -- <item value="IDL:Bonobo/Unknown:1.0"/> -- </oaf_attribute> -- <oaf_attribute name="name" type="string" _value="User Switcher Applet Factory"/> -- <oaf_attribute name="description" type="string" _value="User Switcher Applet Factory"/> -- <oaf_attribute name="bonobo:environment" type="stringv"> -- <item value="DBUS_SESSION_BUS_ADDRESS"/> -- <oaf_attribute name="bugzilla:bugzilla" type="string" value="GNOME"/> -- <oaf_attribute name="bugzilla:product" type="string" value="gdm"/> -- <oaf_attribute name="bugzilla:component" type="string" value="general"/> -- <oaf_attribute name="bugzilla:version" type="string" value="@VERSION@"/> -- <oaf_attribute name="bugzilla:other_binaries" type="string" value="gdm-user-switch-applet"/> -- </oaf_attribute> -- </oaf_server> -- -- <oaf_server iid="OAFIID:GNOME_FastUserSwitchApplet" type="factory" -- location="OAFIID:GNOME_FastUserSwitchApplet_Factory"> -- -- <oaf_attribute name="repo_ids" type="stringv"> -- <item value="IDL:GNOME/Vertigo/PanelAppletShell:1.0"/> -- <item value="IDL:Bonobo/Control:1.0"/> -- <item value="IDL:Bonobo/Unknown:1.0"/> -- </oaf_attribute> -- <oaf_attribute name="name" type="string" _value="User Switcher"/> -- <oaf_attribute name="description" type="string" _value="A menu to quickly switch between users"/> -- <oaf_attribute name="panel:icon" type="string" value="stock_people"/> -- <oaf_attribute name="bugzilla:bugzilla" type="string" value="GNOME"/> -- <oaf_attribute name="bugzilla:product" type="string" value="gdm"/> -- <oaf_attribute name="bugzilla:component" type="string" value="general"/> -- <oaf_attribute name="bugzilla:version" type="string" value="@VERSION@"/> -- <oaf_attribute name="bugzilla:other_binaries" type="string" value="gdm-user-switch-applet"/> -- </oaf_server> --</oaf_info> -diff --git a/gui/user-switch-applet/GNOME_FastUserSwitchApplet.xml b/gui/user-switch-applet/GNOME_FastUserSwitchApplet.xml -deleted file mode 100644 -index e1845c8..0000000 ---- a/gui/user-switch-applet/GNOME_FastUserSwitchApplet.xml -+++ /dev/null -@@ -1,20 +0,0 @@ --<Root> -- <popups> -- <popup name="button3"> -- <menuitem -- name="About Me Item" -- verb="GdmAboutMe" -- _label="Edit Personal _Information"/> -- <menuitem -- name="Users and Groups Admin Item" -- verb="GdmUsersGroupsAdmin" -- _label="_Edit Users and Groups"/> -- <menuitem -- name="About Item" -- verb="GdmAbout" -- _label="_About" -- pixtype="stock" -- pixname="gtk-about"/> -- </popup> -- </popups> --</Root> -diff --git a/gui/user-switch-applet/Makefile.am b/gui/user-switch-applet/Makefile.am -deleted file mode 100644 -index 2d2cdc0..0000000 ---- a/gui/user-switch-applet/Makefile.am -+++ /dev/null -@@ -1,67 +0,0 @@ --NULL = -- --AM_CPPFLAGS = \ -- -I$(top_srcdir)/gui/simple-greeter \ -- -I$(top_srcdir)/common \ -- -DPREFIX=\""$(prefix)"\" \ -- -DLIBDIR=\""$(libdir)"\" \ -- -DDATADIR=\""$(datadir)"\" \ -- -DSYSCONFDIR=\""$(sysconfdir)"\" \ -- -DLIBLOCALEDIR=\""$(prefix)/lib/locale"\" \ -- -DGNOMELOCALEDIR=\""$(datadir)/locale"\" \ -- -DGLADEDIR=\""$(pkgdatadir)"\" \ -- -DLIBEXECDIR=\""$(libexecdir)"\" \ -- -DSBINDIR=\""$(sbindir)"\" \ -- -DGDMCONFDIR=\"$(gdmconfdir)\" \ -- $(GTK_CFLAGS) \ -- $(APPLET_CFLAGS) \ -- $(NULL) -- --libexec_PROGRAMS = \ -- gdm-user-switch-applet \ -- $(NULL) -- --gdm_user_switch_applet_SOURCES = \ -- applet.c \ -- gdm-entry-menu-item.h \ -- gdm-entry-menu-item.c \ -- $(NULL) -- --gdm_user_switch_applet_LDADD = \ -- $(top_builddir)/gui/simple-greeter/libgdmuser.la \ -- $(top_builddir)/common/libgdmcommon.la \ -- $(COMMON_LIBS) \ -- $(APPLET_LIBS) \ -- $(NULL) -- --# Bonobo UI --uidir = $(datadir)/gnome-2.0/ui --ui_DATA = \ -- GNOME_FastUserSwitchApplet.xml \ -- $(NULL) -- --# Bonobo .server --serverdir = $(libdir)/bonobo/servers --server_in_files = \ -- GNOME_FastUserSwitchApplet.server.in \ -- $(NULL) --server_DATA = $(server_in_files:.server.in=.server) -- --$(server_in_files): $(server_in_files:.server.in=.server.in.in) -- sed -e "s|\@LIBEXECDIR\@|$(libexecdir)|" -e "s|\@VERSION\@|$(VERSION)|" $< > $@ -- --@INTLTOOL_SERVER_RULE@ -- --EXTRA_DIST = \ -- $(ui_DATA) \ -- GNOME_FastUserSwitchApplet.server.in.in \ -- $(NULL) -- --DISTCLEANFILES = \ -- $(server_in_files) \ -- $(server_DATA) \ -- $(NULL) -- --MAINTAINERCLEANFILES = \ -- *~ \ -- Makefile.in -diff --git a/gui/user-switch-applet/applet.c b/gui/user-switch-applet/applet.c -deleted file mode 100644 -index b4f944c..0000000 ---- a/gui/user-switch-applet/applet.c -+++ /dev/null -@@ -1,1662 +0,0 @@ --/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*- -- * -- * Copyright (C) 2004-2005 James M. Cape <jcape@ignore-your.tv>. -- * Copyright (C) 2008 Red Hat, Inc. -- * -- * This program is free software; you can redistribute it and/or modify -- * it under the terms of the GNU General Public License as published by -- * the Free Software Foundation; either version 2 of the License, or -- * (at your option) any later version. -- * -- * This program is distributed in the hope that it will be useful, -- * but WITHOUT ANY WARRANTY; without even the implied warranty of -- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -- * GNU General Public License for more details. -- * -- * You should have received a copy of the GNU General Public License -- * along with this program; if not, write to the Free Software -- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -- */ -- --#include "config.h" -- --#include <string.h> --#include <unistd.h> --#include <stdlib.h> --#include <sys/types.h> -- --#include <glib/gi18n.h> --#include <gdk/gdkkeysyms.h> --#include <gtk/gtk.h> -- --#include <gconf/gconf.h> --#include <gconf/gconf-client.h> -- --#include <dbus/dbus-glib.h> -- --#include <bonobo/bonobo-main.h> --#include <bonobo/bonobo-ui-util.h> -- --#include <panel-applet.h> --#include <panel-applet-gconf.h> -- --#include "gdm-user-manager.h" --#include "gdm-entry-menu-item.h" --#include "gdm-settings-client.h" -- --#define LOCKDOWN_DIR "/desktop/gnome/lockdown" --#define LOCKDOWN_USER_SWITCHING_KEY LOCKDOWN_DIR "/disable_user_switching" --#define LOCKDOWN_LOCK_SCREEN_KEY LOCKDOWN_DIR "/disable_lock_screen" --#define LOCKDOWN_COMMAND_LINE_KEY LOCKDOWN_DIR "/disable_command_line" -- --typedef enum { -- GSM_PRESENCE_STATUS_AVAILABLE = 0, -- GSM_PRESENCE_STATUS_INVISIBLE, -- GSM_PRESENCE_STATUS_BUSY, -- GSM_PRESENCE_STATUS_IDLE, --} GsmPresenceStatus; -- --typedef struct _GdmAppletData --{ -- PanelApplet *applet; -- -- GConfClient *client; -- GdmUserManager *manager; -- GdmUser *user; -- -- GtkWidget *menubar; -- GtkWidget *menuitem; -- GtkWidget *menu; --#ifdef BUILD_PRESENSE_STUFF -- GtkWidget *user_item; --#endif -- GtkWidget *control_panel_item; -- GtkWidget *account_item; -- GtkWidget *lock_screen_item; -- GtkWidget *login_screen_item; -- GtkWidget *quit_session_item; -- -- guint client_notify_lockdown_id; -- -- guint current_status; -- guint user_loaded_notify_id; -- guint user_changed_notify_id; -- gint8 pixel_size; -- gint panel_size; -- GtkIconSize icon_size; --#ifdef BUILD_PRESENSE_STUFF -- DBusGProxy *presence_proxy; --#endif --} GdmAppletData; -- --typedef struct _SelectorResponseData --{ -- GdmAppletData *adata; -- GtkRadioButton *radio; --} SelectorResponseData; -- --static void reset_icon (GdmAppletData *adata); --static void update_label (GdmAppletData *adata); -- --static gboolean applet_factory (PanelApplet *applet, -- const char *iid, -- gpointer data); -- --PANEL_APPLET_BONOBO_FACTORY ("OAFIID:GNOME_FastUserSwitchApplet_Factory", -- PANEL_TYPE_APPLET, -- "gdm-user-switch-applet", "0", -- (PanelAppletFactoryCallback)applet_factory, -- NULL) -- --static void --about_me_cb (BonoboUIComponent *ui_container, -- gpointer data, -- const char *cname) --{ -- GError *err; -- -- err = NULL; -- if (! g_spawn_command_line_async ("gnome-about-me", &err)) { -- g_critical ("Could not run `gnome-about-me': %s", -- err->message); -- g_error_free (err); -- bonobo_ui_component_set_prop (ui_container, -- "/commands/GdmAboutMe", -- "hidden", "1", -- NULL); -- } --} -- --/* -- * gnome-panel/applets/wncklet/window-menu.c:window_filter_button_press() -- * -- * Copyright (C) 2005 James M. Cape. -- * Copyright (C) 2003 Sun Microsystems, Inc. -- * Copyright (C) 2001 Free Software Foundation, Inc. -- * Copyright (C) 2000 Helix Code, Inc. -- */ --static gboolean --menubar_button_press_event_cb (GtkWidget *menubar, -- GdkEventButton *event, -- GdmAppletData *adata) --{ -- if (event->button != 1) { -- g_signal_stop_emission_by_name (menubar, "button-press-event"); -- /* Reset the login window item */ -- } -- -- return FALSE; --} -- --static void --about_cb (BonoboUIComponent *ui_container, -- gpointer data, -- const char *cname) --{ -- static const char *authors[] = { -- "James M. Cape <jcape@ignore-your.tv>", -- "Thomas Thurman <thomas@thurman.org.uk>", -- "William Jon McCann <jmccann@redhat.com>", -- NULL -- }; -- static char *license[] = { -- N_("The User Switch Applet is free software; you can redistribute it and/or modify " -- "it under the terms of the GNU General Public License as published by " -- "the Free Software Foundation; either version 2 of the License, or " -- "(at your option) any later version."), -- N_("This program is distributed in the hope that it will be useful, " -- "but WITHOUT ANY WARRANTY; without even the implied warranty of " -- "MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the " -- "GNU General Public License for more details."), -- N_("You should have received a copy of the GNU General Public License " -- "along with this program; if not, write to the Free Software " -- "Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA "), -- NULL -- }; -- char *license_i18n; -- -- license_i18n = g_strconcat (_(license[0]), "\n\n", _(license[1]), "\n\n", _(license[2]), NULL); -- -- gtk_show_about_dialog (NULL, -- "version", VERSION, -- "copyright", "Copyright \xc2\xa9 2004-2005 James M. Cape.\n" -- "Copyright \xc2\xa9 2006 Thomas Thurman.\n" -- "Copyright \xc2\xa9 2008 Red Hat, Inc.", -- "comments", _("A menu to quickly switch between users."), -- "authors", authors, -- "license", license_i18n, -- "wrap-license", TRUE, -- "translator-credits", _("translator-credits"), -- "logo-icon-name", "stock_people", -- NULL); -- -- g_free (license_i18n); --} -- -- --static void --admin_cb (BonoboUIComponent *ui_container, -- gpointer data, -- const char *cname) --{ --#ifdef USERS_ADMIN -- char **args; -- gboolean res; -- GError *err; -- -- err = NULL; -- if (!g_shell_parse_argv (USERS_ADMIN, NULL, &args, &err)) { -- g_critical ("Could not parse users and groups management command line `%s': %s", -- USERS_ADMIN, err->message); -- return; -- } -- -- res = g_spawn_async (g_get_home_dir (), -- args, -- NULL, -- (G_SPAWN_STDOUT_TO_DEV_NULL | -- G_SPAWN_STDERR_TO_DEV_NULL | -- G_SPAWN_SEARCH_PATH), -- NULL, -- NULL, -- NULL, -- &err); -- if (! res) { -- g_critical ("Could not run `%s' to manage users and groups: %s", -- USERS_ADMIN, err->message); -- g_error_free (err); -- } -- g_strfreev (args); --#endif /* USERS_ADMIN */ --} -- --static void --set_menuitem_icon (BonoboUIComponent *component, -- const char *item_path, -- GtkIconTheme *theme, -- const char *icon_name, -- gint icon_size) --{ -- GdkPixbuf *pixbuf; -- int width; -- int height; -- -- pixbuf = gtk_icon_theme_load_icon (theme, icon_name, icon_size, 0, NULL); -- if (pixbuf == NULL) { -- return; -- } -- -- width = gdk_pixbuf_get_width (pixbuf); -- height = gdk_pixbuf_get_height (pixbuf); -- if (width > icon_size + 4 || height > icon_size + 4) { -- GdkPixbuf *tmp; -- if (height > width) { -- width *= (gdouble) icon_size / (gdouble) height; -- height = icon_size; -- } else { -- height *= (gdouble) icon_size / (gdouble) width; -- width = icon_size; -- } -- tmp = gdk_pixbuf_scale_simple (pixbuf, width, height, GDK_INTERP_BILINEAR); -- g_object_unref (pixbuf); -- pixbuf = tmp; -- } -- -- bonobo_ui_util_set_pixbuf (component, item_path, pixbuf, NULL); -- g_object_unref (pixbuf); --} -- --static void --applet_style_set_cb (GtkWidget *widget, -- GtkStyle *old_style, -- gpointer data) --{ -- BonoboUIComponent *component; -- GdkScreen *screen; -- GtkIconTheme *theme; -- int width; -- int height; -- int icon_size; -- -- if (gtk_widget_has_screen (widget)) { -- screen = gtk_widget_get_screen (widget); -- } else { -- screen = gdk_screen_get_default (); -- } -- -- if (gtk_icon_size_lookup_for_settings (gtk_settings_get_for_screen (screen), -- GTK_ICON_SIZE_MENU, &width, &height)) { -- icon_size = MAX (width, height); -- } else { -- icon_size = 16; -- } -- -- theme = gtk_icon_theme_get_for_screen (screen); -- component = panel_applet_get_popup_component (PANEL_APPLET (widget)); -- -- set_menuitem_icon (component, -- "/commands/GdmAboutMe", -- theme, -- "user-info", -- icon_size); -- set_menuitem_icon (component, -- "/commands/GdmUsersGroupsAdmin", -- theme, -- "stock_people", -- icon_size); --} -- --static void --applet_change_background_cb (PanelApplet *applet, -- PanelAppletBackgroundType type, -- GdkColor *color, -- GdkPixmap *pixmap, -- GdmAppletData *adata) --{ -- GtkRcStyle *rc_style; -- GtkStyle *style; -- -- gtk_widget_set_style (adata->menubar, NULL); -- rc_style = gtk_rc_style_new (); -- gtk_widget_modify_style (GTK_WIDGET (adata->menubar), rc_style); -- g_object_unref (rc_style); -- -- switch (type) { -- case PANEL_NO_BACKGROUND: -- break; -- case PANEL_COLOR_BACKGROUND: -- gtk_widget_modify_bg (adata->menubar, GTK_STATE_NORMAL, color); -- break; -- case PANEL_PIXMAP_BACKGROUND: -- style = gtk_style_copy (gtk_widget_get_style (adata->menubar)); -- if (style->bg_pixmap[GTK_STATE_NORMAL]) { -- g_object_unref (style->bg_pixmap[GTK_STATE_NORMAL]); -- } -- -- style->bg_pixmap[GTK_STATE_NORMAL] = g_object_ref (pixmap); -- gtk_widget_set_style (adata->menubar, style); -- g_object_unref (style); -- break; -- } --} -- --/* -- * gnome-panel/applets/wncklet/window-menu.c:window_menu_key_press_event() -- * -- * Copyright (C) 2003 Sun Microsystems, Inc. -- * Copyright (C) 2001 Free Software Foundation, Inc. -- * Copyright (C) 2000 Helix Code, Inc. -- */ --static gboolean --applet_key_press_event_cb (GtkWidget *widget, -- GdkEventKey *event, -- GdmAppletData *adata) --{ -- GtkMenuShell *menu_shell; -- -- switch (event->keyval) { -- case GDK_KP_Enter: -- case GDK_ISO_Enter: -- case GDK_3270_Enter: -- case GDK_Return: -- case GDK_space: -- case GDK_KP_Space: -- menu_shell = GTK_MENU_SHELL (adata->menubar); -- /* -- * We need to call _gtk_menu_shell_activate() here as is done in -- * window_key_press_handler in gtkmenubar.c which pops up menu -- * when F10 is pressed. -- * -- * As that function is private its code is replicated here. -- */ -- if (!menu_shell->active) { -- gtk_grab_add (GTK_WIDGET (menu_shell)); -- menu_shell->have_grab = TRUE; -- menu_shell->active = TRUE; -- } -- -- gtk_menu_shell_select_first (menu_shell, FALSE); -- return TRUE; -- default: -- break; -- } -- -- return FALSE; --} -- --static void --set_item_text_angle_and_alignment (GtkWidget *item, -- double text_angle, -- float xalign, -- float yalign) --{ -- GtkWidget *label; -- -- label = gtk_bin_get_child (GTK_BIN (item)); -- -- gtk_label_set_angle (GTK_LABEL (label), text_angle); -- -- gtk_misc_set_alignment (GTK_MISC (label), xalign, yalign); --} -- --/* -- * gnome-panel/applets/wncklet/window-menu.c:window_menu_size_allocate() -- * -- * Copyright (C) 2003 Sun Microsystems, Inc. -- * Copyright (C) 2001 Free Software Foundation, Inc. -- * Copyright (C) 2000 Helix Code, Inc. -- */ --static void --applet_size_allocate_cb (GtkWidget *widget, -- GtkAllocation *allocation, -- GdmAppletData *adata) --{ -- GList *children; -- GtkWidget *top_item; -- PanelAppletOrient orient; -- gint pixel_size; -- gdouble text_angle; -- GtkPackDirection pack_direction; -- float text_xalign; -- float text_yalign; -- -- pack_direction = GTK_PACK_DIRECTION_LTR; -- text_angle = 0.0; -- text_xalign = 0.0; -- text_yalign = 0.5; -- -- children = gtk_container_get_children (GTK_CONTAINER (adata->menubar)); -- top_item = GTK_WIDGET (children->data); -- g_list_free (children); -- -- orient = panel_applet_get_orient (PANEL_APPLET (widget)); -- -- switch (orient) { -- case PANEL_APPLET_ORIENT_UP: -- case PANEL_APPLET_ORIENT_DOWN: -- gtk_widget_set_size_request (top_item, -1, allocation->height); -- pixel_size = allocation->height - gtk_widget_get_style (top_item)->ythickness * 2; -- break; -- case PANEL_APPLET_ORIENT_LEFT: -- gtk_widget_set_size_request (top_item, allocation->width, -1); -- pixel_size = allocation->width - gtk_widget_get_style (top_item)->xthickness * 2; -- pack_direction = GTK_PACK_DIRECTION_TTB; -- text_angle = 270.0; -- text_xalign = 0.5; -- text_yalign = 0.0; -- break; -- case PANEL_APPLET_ORIENT_RIGHT: -- gtk_widget_set_size_request (top_item, allocation->width, -1); -- pixel_size = allocation->width - gtk_widget_get_style (top_item)->xthickness * 2; -- pack_direction = GTK_PACK_DIRECTION_BTT; -- text_angle = 90.0; -- text_xalign = 0.5; -- text_yalign = 0.0; -- break; -- default: -- g_assert_not_reached (); -- break; -- } -- -- gtk_menu_bar_set_pack_direction (GTK_MENU_BAR (adata->menubar), -- pack_direction); -- gtk_menu_bar_set_child_pack_direction (GTK_MENU_BAR (adata->menubar), -- pack_direction); -- -- set_item_text_angle_and_alignment (adata->menuitem, -- text_angle, -- text_xalign, -- text_yalign); -- -- if (adata->panel_size != pixel_size) { -- adata->panel_size = pixel_size; -- reset_icon (adata); -- } --} -- -- --static void --gdm_applet_data_free (GdmAppletData *adata) --{ -- gconf_client_notify_remove (adata->client, adata->client_notify_lockdown_id); -- -- if (adata->user_loaded_notify_id != 0) { -- g_signal_handler_disconnect (adata->user, adata->user_loaded_notify_id); -- } -- -- if (adata->user_changed_notify_id != 0) { -- g_signal_handler_disconnect (adata->user, adata->user_changed_notify_id); -- } -- --#ifdef BUILD_PRESENSE_STUFF -- if (adata->presence_proxy != NULL) { -- g_object_unref (adata->presence_proxy); -- } --#endif -- -- if (adata->user != NULL) { -- g_object_unref (adata->user); -- } -- g_object_unref (adata->client); -- g_object_unref (adata->manager); -- -- g_free (adata); --} -- -- --/* -- * gnome-panel/applets/wncklet/window-menu.c:window_menu_on_expose() -- * -- * Copyright (C) 2003 Sun Microsystems, Inc. -- * Copyright (C) 2001 Free Software Foundation, Inc. -- * Copyright (C) 2000 Helix Code, Inc. -- */ --static gboolean --menubar_expose_event_cb (GtkWidget *widget, -- GdkEventExpose *event, -- GdmAppletData *adata) --{ -- if (gtk_widget_has_focus (GTK_WIDGET (adata->applet))) -- gtk_paint_focus (gtk_widget_get_style (widget), -- gtk_widget_get_window (widget), -- gtk_widget_get_state (widget), -- NULL, widget, "menu-applet", 0, 0, -1, -1); -- -- return FALSE; --} -- --static void --menu_style_set_cb (GtkWidget *menu, -- GtkStyle *old_style, -- GdmAppletData *adata) --{ -- GtkSettings *settings; -- int width; -- int height; -- -- adata->icon_size = gtk_icon_size_from_name ("panel-menu"); -- -- if (adata->icon_size == GTK_ICON_SIZE_INVALID) { -- adata->icon_size = gtk_icon_size_register ("panel-menu", 24, 24); -- } -- -- if (gtk_widget_has_screen (menu)) { -- settings = gtk_settings_get_for_screen (gtk_widget_get_screen (menu)); -- } else { -- settings = gtk_settings_get_default (); -- } -- -- if (!gtk_icon_size_lookup_for_settings (settings, adata->icon_size, -- &width, &height)) { -- adata->pixel_size = -1; -- } else { -- adata->pixel_size = MAX (width, height); -- } --} -- --static void --menuitem_style_set_cb (GtkWidget *menuitem, -- GtkStyle *old_style, -- GdmAppletData *adata) --{ -- GtkWidget *image; -- -- if (GDM_IS_ENTRY_MENU_ITEM (menuitem)) { -- } else { -- const char *icon_name; -- -- if (menuitem == adata->login_screen_item) { -- icon_name = "system-users"; -- } else if (menuitem == adata->lock_screen_item) { -- icon_name = "system-lock-screen"; -- } else if (menuitem == adata->quit_session_item) { -- icon_name = "system-log-out"; -- } else if (menuitem == adata->account_item) { -- icon_name = "user-info"; -- } else if (menuitem == adata->control_panel_item) { -- icon_name = "preferences-desktop"; -- } else { -- icon_name = GTK_STOCK_MISSING_IMAGE; -- } -- -- image = gtk_image_menu_item_get_image (GTK_IMAGE_MENU_ITEM (menuitem)); -- gtk_image_set_pixel_size (GTK_IMAGE (image), adata->pixel_size); -- gtk_image_set_from_icon_name (GTK_IMAGE (image), icon_name, -- adata->icon_size); -- } --} -- --static void --on_user_changed (GdmUser *user, -- GdmAppletData *adata) --{ -- g_debug ("user changed"); -- update_label (adata); -- reset_icon (adata); --} -- --/* Called every time the menu is displayed (and also for some reason -- * immediately it's created, which does no harm). All we have to do -- * here is kick off a request to GDM to let us know which users are -- * logged in, so we can display check marks next to their names. -- */ --static gboolean --menu_expose_cb (GtkWidget *menu, -- gpointer data) --{ -- char *program; -- GdmAppletData *adata = data; -- -- program = g_find_program_in_path ("gnome-control-center"); -- if (program != NULL) { -- gtk_widget_show (adata->control_panel_item); -- } else { -- gtk_widget_hide (adata->control_panel_item); -- } -- g_free (program); -- return FALSE; --} -- --static void --maybe_lock_screen (GdmAppletData *adata) --{ -- char *args[3]; -- GError *err; -- GdkScreen *screen; -- gboolean use_gscreensaver = TRUE; -- gboolean res; -- -- g_debug ("Attempting to lock screen"); -- -- args[0] = g_find_program_in_path ("gnome-screensaver-command"); -- if (args[0] == NULL) { -- args[0] = g_find_program_in_path ("xscreensaver-command"); -- use_gscreensaver = FALSE; -- } -- -- if (args[0] == NULL) { -- return; -- } -- -- if (use_gscreensaver) { -- args[1] = "--lock"; -- } else { -- args[1] = "-lock"; -- } -- args[2] = NULL; -- -- if (gtk_widget_has_screen (GTK_WIDGET (adata->applet))) { -- screen = gtk_widget_get_screen (GTK_WIDGET (adata->applet)); -- } else { -- screen = gdk_screen_get_default (); -- } -- -- err = NULL; -- res = gdk_spawn_on_screen (screen, -- g_get_home_dir (), -- args, -- NULL, -- 0, -- NULL, -- NULL, -- NULL, -- &err); -- if (! res) { -- g_warning (_("Can't lock screen: %s"), err->message); -- g_error_free (err); -- } -- -- if (use_gscreensaver) { -- args[1] = "--throttle"; -- } else { -- args[1] = "-throttle"; -- } -- -- err = NULL; -- res = gdk_spawn_on_screen (screen, -- g_get_home_dir (), -- args, -- NULL, -- (G_SPAWN_STDERR_TO_DEV_NULL -- | G_SPAWN_STDOUT_TO_DEV_NULL), -- NULL, -- NULL, -- NULL, -- &err); -- if (! res) { -- g_warning (_("Can't temporarily set screensaver to blank screen: %s"), -- err->message); -- g_error_free (err); -- } -- -- g_free (args[0]); --} -- --static void --do_switch (GdmAppletData *adata, -- GdmUser *user) --{ -- guint num_sessions; -- -- g_debug ("Do user switch"); -- -- if (user == NULL) { -- gdm_user_manager_goto_login_session (adata->manager); -- goto out; -- } -- -- num_sessions = gdm_user_get_num_sessions (user); -- if (num_sessions > 0) { -- gdm_user_manager_activate_user_session (adata->manager, user); -- } else { -- gdm_user_manager_goto_login_session (adata->manager); -- } -- out: -- maybe_lock_screen (adata); --} -- --static void --update_switch_user (GdmAppletData *adata) --{ -- gboolean can_switch; -- gboolean has_other_users; -- -- can_switch = gdm_user_manager_can_switch (adata->manager); -- g_object_get (adata->manager, -- "has-multiple-users", &has_other_users, -- NULL); -- -- if (can_switch && has_other_users) { -- gtk_widget_show (adata->login_screen_item); -- } else { -- -- gtk_widget_hide (adata->login_screen_item); -- } --} -- --static void --on_manager_is_loaded_changed (GdmUserManager *manager, -- GParamSpec *pspec, -- GdmAppletData *adata) --{ -- update_switch_user (adata); --} -- --static void --on_manager_has_multiple_users_changed (GdmUserManager *manager, -- GParamSpec *pspec, -- GdmAppletData *adata) --{ -- update_switch_user (adata); --} -- --#ifdef BUILD_PRESENSE_STUFF --static void --on_user_item_activate (GtkMenuItem *item, -- GdmAppletData *adata) --{ -- g_signal_stop_emission_by_name (item, "activate"); --} --#endif -- --static void --on_control_panel_activate (GtkMenuItem *item, -- GdmAppletData *adata) --{ -- char *args[2]; -- GError *error; -- GdkScreen *screen; -- gboolean res; -- -- args[0] = g_find_program_in_path ("gnome-control-center"); -- if (args[0] == NULL) { -- return; -- } -- args[1] = NULL; -- -- if (gtk_widget_has_screen (GTK_WIDGET (adata->applet))) { -- screen = gtk_widget_get_screen (GTK_WIDGET (adata->applet)); -- } else { -- screen = gdk_screen_get_default (); -- } -- -- error = NULL; -- res = gdk_spawn_on_screen (screen, -- g_get_home_dir (), -- args, -- NULL, -- 0, -- NULL, -- NULL, -- NULL, -- &error); -- if (! res) { -- g_warning (_("Can't lock screen: %s"), error->message); -- g_error_free (error); -- } -- -- g_free (args[0]); --} -- --static void --on_account_activate (GtkMenuItem *item, -- GdmAppletData *adata) --{ -- char *args[2]; -- GError *error; -- GdkScreen *screen; -- gboolean res; -- -- args[0] = g_find_program_in_path ("accounts-dialog"); -- if (args[0] == NULL) { -- args[0] = g_find_program_in_path ("gnome-about-me"); -- if (args[0] == NULL) { -- return; -- } -- } -- args[1] = NULL; -- -- if (gtk_widget_has_screen (GTK_WIDGET (adata->applet))) { -- screen = gtk_widget_get_screen (GTK_WIDGET (adata->applet)); -- } else { -- screen = gdk_screen_get_default (); -- } -- -- error = NULL; -- res = gdk_spawn_on_screen (screen, -- g_get_home_dir (), -- args, -- NULL, -- 0, -- NULL, -- NULL, -- NULL, -- &error); -- if (! res) { -- g_warning (_("Can't lock screen: %s"), error->message); -- g_error_free (error); -- } -- -- g_free (args[0]); --} -- --static void --on_lock_screen_activate (GtkMenuItem *item, -- GdmAppletData *adata) --{ -- maybe_lock_screen (adata); --} -- --static void --on_login_screen_activate (GtkMenuItem *item, -- GdmAppletData *adata) --{ -- GdmUser *user; -- -- user = NULL; -- -- do_switch (adata, user); --} -- --static void --on_quit_session_activate (GtkMenuItem *item, -- GdmAppletData *adata) --{ -- char *args[3]; -- GError *error; -- GdkScreen *screen; -- gboolean res; -- -- args[0] = g_find_program_in_path ("gnome-session-save"); -- if (args[0] == NULL) { -- return; -- } -- -- args[1] = "--logout-dialog"; -- args[2] = NULL; -- -- if (gtk_widget_has_screen (GTK_WIDGET (adata->applet))) { -- screen = gtk_widget_get_screen (GTK_WIDGET (adata->applet)); -- } else { -- screen = gdk_screen_get_default (); -- } -- -- error = NULL; -- res = gdk_spawn_on_screen (screen, -- g_get_home_dir (), -- args, -- NULL, -- 0, -- NULL, -- NULL, -- NULL, -- &error); -- if (! res) { -- g_warning (_("Can't log out: %s"), error->message); -- g_error_free (error); -- } -- -- g_free (args[0]); --} -- --#ifdef BUILD_PRESENSE_STUFF --static gboolean --on_menu_key_press_event (GtkWidget *widget, -- GdkEventKey *event, -- GdmAppletData *adata) --{ -- GtkWidget *entry; -- -- entry = gdm_entry_menu_item_get_entry (GDM_ENTRY_MENU_ITEM (adata->user_item)); -- -- if (GTK_WIDGET_HAS_FOCUS (entry)) { -- gtk_widget_event (entry, (GdkEvent *)event); -- return TRUE; -- } else { -- return FALSE; -- } --} -- --static void --save_status (GdmAppletData *adata, -- guint status) --{ -- if (adata->current_status != status) { -- GError *error; -- -- adata->current_status = status; -- -- g_debug ("Saving status: %u", status); -- error = NULL; -- dbus_g_proxy_call (adata->presence_proxy, -- "SetStatus", -- &error, -- G_TYPE_UINT, status, -- G_TYPE_INVALID, -- G_TYPE_INVALID); -- -- if (error != NULL) { -- g_warning ("Couldn't save presence status: %s", error->message); -- g_error_free (error); -- } -- } --} -- --static void --on_status_available_activate (GtkWidget *widget, -- GdmAppletData *adata) --{ -- -- if (gtk_check_menu_item_get_active (GTK_CHECK_MENU_ITEM (widget))) { -- save_status (adata, GSM_PRESENCE_STATUS_AVAILABLE); -- } --} -- --static void --on_status_busy_activate (GtkWidget *widget, -- GdmAppletData *adata) --{ -- if (gtk_check_menu_item_get_active (GTK_CHECK_MENU_ITEM (widget))) { -- save_status (adata, GSM_PRESENCE_STATUS_BUSY); -- } --} -- --static void --on_status_invisible_activate (GtkWidget *widget, -- GdmAppletData *adata) --{ -- if (gtk_check_menu_item_get_active (GTK_CHECK_MENU_ITEM (widget))) { -- save_status (adata, GSM_PRESENCE_STATUS_INVISIBLE); -- } --} -- --static struct { -- char *icon_name; -- char *display_name; -- void *menu_callback; -- GtkWidget *widget; --} statuses[] = { -- { "user-online", N_("Available"), on_status_available_activate, NULL }, -- { "user-invisible", N_("Invisible"), on_status_invisible_activate, NULL }, -- { "user-busy", N_("Busy"), on_status_busy_activate, NULL }, -- { "user-away", N_("Away"), NULL, NULL }, --}; --#endif -- --static void --update_label (GdmAppletData *adata) --{ -- GtkWidget *label; -- char *markup; -- -- label = gtk_bin_get_child (GTK_BIN (adata->menuitem)); -- --#ifdef BUILD_PRESENSE_STUFF -- markup = g_strdup_printf ("<b>%s</b> <small>(%s)</small>", -- gdm_user_get_real_name (GDM_USER (adata->user)), -- _(statuses[adata->current_status].display_name)); --#else -- markup = g_strdup_printf ("<b>%s</b>", -- gdm_user_get_real_name (GDM_USER (adata->user))); --#endif -- gtk_label_set_markup (GTK_LABEL (label), markup); -- g_free (markup); --} -- --#ifdef BUILD_PRESENSE_STUFF --static void --save_status_text (GdmAppletData *adata) --{ -- GtkWidget *entry; -- GtkTextBuffer *buffer; -- char *escaped_text; -- char *text; -- GtkTextIter start, end; -- -- entry = gdm_entry_menu_item_get_entry (GDM_ENTRY_MENU_ITEM (adata->user_item)); -- buffer = gtk_text_view_get_buffer (GTK_TEXT_VIEW (entry)); -- gtk_text_buffer_get_bounds (buffer, &start, &end); -- text = gtk_text_buffer_get_text (buffer, &start, &end, FALSE); -- escaped_text = g_markup_escape_text (text, -1); -- -- if (escaped_text != NULL) { -- GError *error; -- -- error = NULL; -- dbus_g_proxy_call (adata->presence_proxy, -- "SetStatusText", -- &error, -- G_TYPE_STRING, escaped_text, -- G_TYPE_INVALID, -- G_TYPE_INVALID); -- -- if (error != NULL) { -- g_warning ("Couldn't set presence status text: %s", error->message); -- g_error_free (error); -- } -- } -- -- g_free (text); -- g_free (escaped_text); --} -- --static void --on_user_item_deselect (GtkWidget *item, -- GdmAppletData *adata) --{ -- save_status_text (adata); --} --#endif -- --static void --create_sub_menu (GdmAppletData *adata) --{ -- GtkWidget *item; --#ifdef BUILD_PRESENSE_STUFF -- int i; -- GSList *radio_group; --#endif -- -- adata->menu = gtk_menu_new (); --#ifdef BUILD_PRESENSE_STUFF -- g_signal_connect (adata->menu, -- "key-press-event", -- G_CALLBACK (on_menu_key_press_event), -- adata); --#endif -- gtk_menu_item_set_submenu (GTK_MENU_ITEM (adata->menuitem), adata->menu); -- g_signal_connect (adata->menu, "style-set", -- G_CALLBACK (menu_style_set_cb), adata); -- g_signal_connect (adata->menu, "show", -- G_CALLBACK (menu_expose_cb), adata); -- --#ifdef BUILD_PRESENSE_STUFF -- adata->user_item = gdm_entry_menu_item_new (); -- gtk_menu_shell_append (GTK_MENU_SHELL (adata->menu), -- adata->user_item); -- gtk_widget_show (adata->user_item); -- g_signal_connect (adata->user_item, "activate", -- G_CALLBACK (on_user_item_activate), adata); -- g_signal_connect (adata->user_item, -- "deselect", -- G_CALLBACK (on_user_item_deselect), -- adata); -- -- item = gtk_separator_menu_item_new (); -- gtk_menu_shell_append (GTK_MENU_SHELL (adata->menu), item); -- gtk_widget_show (item); -- -- radio_group = NULL; -- for (i = 0; i < G_N_ELEMENTS (statuses); i++) { -- GtkWidget *hbox; -- GtkWidget *label; -- GtkWidget *image; -- GtkWidget *item; -- -- if (statuses[i].menu_callback == NULL) { -- continue; -- } -- -- item = gtk_radio_menu_item_new (radio_group); -- radio_group = gtk_radio_menu_item_get_group (GTK_RADIO_MENU_ITEM (item)); -- hbox = gtk_hbox_new (FALSE, 3); -- label = gtk_label_new (_(statuses[i].display_name)); -- gtk_label_set_justify (GTK_LABEL(label), GTK_JUSTIFY_LEFT); -- gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5); -- gtk_box_pack_start (GTK_BOX (hbox), label, TRUE, TRUE, 0); -- gtk_widget_show (label); -- image = gtk_image_new_from_icon_name (statuses[i].icon_name, GTK_ICON_SIZE_MENU); -- gtk_box_pack_start (GTK_BOX (hbox), image, FALSE, TRUE, 0); -- gtk_widget_show (image); -- gtk_widget_show (hbox); -- gtk_container_add (GTK_CONTAINER (item), hbox); -- -- gtk_menu_shell_append (GTK_MENU_SHELL (adata->menu), -- item); -- g_signal_connect (item, "activate", -- G_CALLBACK (statuses[i].menu_callback), adata); -- gtk_widget_show (item); -- -- statuses[i].widget = item; -- } -- -- item = gtk_separator_menu_item_new (); -- gtk_menu_shell_append (GTK_MENU_SHELL (adata->menu), item); -- gtk_widget_show (item); --#endif -- -- adata->account_item = gtk_image_menu_item_new_with_label (_("Account Information")); -- gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (adata->account_item), -- gtk_image_new ()); -- gtk_menu_shell_append (GTK_MENU_SHELL (adata->menu), -- adata->account_item); -- g_signal_connect (adata->account_item, "style-set", -- G_CALLBACK (menuitem_style_set_cb), adata); -- g_signal_connect (adata->account_item, "activate", -- G_CALLBACK (on_account_activate), adata); -- gtk_widget_show (adata->account_item); -- -- -- adata->control_panel_item = gtk_image_menu_item_new_with_label (_("System Preferences")); -- gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (adata->control_panel_item), -- gtk_image_new ()); -- gtk_menu_shell_append (GTK_MENU_SHELL (adata->menu), -- adata->control_panel_item); -- g_signal_connect (adata->control_panel_item, "style-set", -- G_CALLBACK (menuitem_style_set_cb), adata); -- g_signal_connect (adata->control_panel_item, "activate", -- G_CALLBACK (on_control_panel_activate), adata); -- -- item = gtk_separator_menu_item_new (); -- gtk_menu_shell_append (GTK_MENU_SHELL (adata->menu), item); -- gtk_widget_show (item); -- -- adata->lock_screen_item = gtk_image_menu_item_new_with_label (_("Lock Screen")); -- gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (adata->lock_screen_item), -- gtk_image_new ()); -- gtk_menu_shell_append (GTK_MENU_SHELL (adata->menu), -- adata->lock_screen_item); -- g_signal_connect (adata->lock_screen_item, "style-set", -- G_CALLBACK (menuitem_style_set_cb), adata); -- g_signal_connect (adata->lock_screen_item, "activate", -- G_CALLBACK (on_lock_screen_activate), adata); -- /* Only show if not locked down */ -- -- adata->login_screen_item = gtk_image_menu_item_new_with_label (_("Switch User")); -- gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (adata->login_screen_item), -- gtk_image_new ()); -- gtk_menu_shell_append (GTK_MENU_SHELL (adata->menu), -- adata->login_screen_item); -- g_signal_connect (adata->login_screen_item, "style-set", -- G_CALLBACK (menuitem_style_set_cb), adata); -- g_signal_connect (adata->login_screen_item, "activate", -- G_CALLBACK (on_login_screen_activate), adata); -- /* Only show switch user if there are other users */ -- -- adata->quit_session_item = gtk_image_menu_item_new_with_label (_("Quit…")); -- gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (adata->quit_session_item), -- gtk_image_new ()); -- gtk_menu_shell_append (GTK_MENU_SHELL (adata->menu), -- adata->quit_session_item); -- g_signal_connect (adata->quit_session_item, "style-set", -- G_CALLBACK (menuitem_style_set_cb), adata); -- g_signal_connect (adata->quit_session_item, "activate", -- G_CALLBACK (on_quit_session_activate), adata); -- gtk_widget_show (adata->quit_session_item); -- gtk_widget_show (adata->menu); --} -- --static void --destroy_sub_menu (GdmAppletData *adata) --{ -- gtk_menu_item_set_submenu (GTK_MENU_ITEM (adata->menuitem), NULL); --} -- --static void --set_menu_visibility (GdmAppletData *adata, -- gboolean visible) --{ -- -- if (visible) { -- create_sub_menu (adata); -- } else { -- destroy_sub_menu (adata); -- } --} -- --static void --client_notify_lockdown_func (GConfClient *client, -- guint cnxn_id, -- GConfEntry *entry, -- GdmAppletData *adata) --{ -- GConfValue *value; -- const char *key; -- -- value = gconf_entry_get_value (entry); -- key = gconf_entry_get_key (entry); -- -- if (value == NULL || key == NULL) { -- return; -- } -- -- if (strcmp (key, LOCKDOWN_USER_SWITCHING_KEY) == 0) { -- if (gconf_value_get_bool (value)) { -- set_menu_visibility (adata, FALSE); -- } else { -- set_menu_visibility (adata, TRUE); -- } -- } else if (strcmp (key, LOCKDOWN_LOCK_SCREEN_KEY) == 0) { -- if (gconf_value_get_bool (value)) { -- gtk_widget_hide (adata->lock_screen_item); -- } else { -- gtk_widget_show (adata->lock_screen_item); -- } -- } --} -- --static void --reset_icon (GdmAppletData *adata) --{ -- GdkPixbuf *pixbuf; -- GtkWidget *image; -- -- if (adata->user == NULL || !gtk_widget_has_screen (GTK_WIDGET (adata->menuitem))) { -- return; -- } -- --#ifdef BUILD_PRESENSE_STUFF -- if (adata->user_item != NULL) { -- image = gdm_entry_menu_item_get_image (GDM_ENTRY_MENU_ITEM (adata->user_item)); -- pixbuf = gdm_user_render_icon (adata->user, adata->panel_size * 3); -- if (pixbuf == NULL) { -- return; -- } -- -- gtk_image_set_from_pixbuf (GTK_IMAGE (image), pixbuf); -- g_object_unref (pixbuf); -- } --#else -- pixbuf = gdm_user_render_icon (adata->user, adata->panel_size); -- -- if (pixbuf == NULL) { -- return; -- } -- -- image = gtk_image_menu_item_get_image (GTK_IMAGE_MENU_ITEM (adata->menuitem)); -- gtk_image_set_from_pixbuf (GTK_IMAGE (image), pixbuf); -- g_object_unref (pixbuf); --#endif --} -- --static void --setup_current_user_now (GdmAppletData *adata) --{ -- g_assert (adata->user != NULL); -- -- if (adata->user_loaded_notify_id != 0) { -- g_signal_handler_disconnect (adata->user, adata->user_loaded_notify_id); -- } -- adata->user_loaded_notify_id = 0; -- -- update_label (adata); -- reset_icon (adata); -- adata->user_changed_notify_id = -- g_signal_connect (adata->user, -- "changed", -- G_CALLBACK (on_user_changed), -- adata); --} -- --static void --on_current_user_loaded (GdmUser *user, -- GParamSpec *pspec, -- GdmAppletData *adata) --{ -- if (!gdm_user_is_loaded (user)) { -- return; -- } -- -- setup_current_user_now (adata); --} -- --static void --setup_current_user (GdmAppletData *adata) --{ -- adata->user = gdm_user_manager_get_user_by_uid (adata->manager, getuid ()); -- -- if (adata->user == NULL) { -- g_warning ("Could not setup current user"); -- return; -- } -- -- g_object_ref (adata->user); -- -- adata->menuitem = gtk_image_menu_item_new_with_label (""); --#ifndef BUILD_PRESENSE_STUFF -- gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (adata->menuitem), -- gtk_image_new ()); --#endif -- gtk_menu_shell_append (GTK_MENU_SHELL (adata->menubar), adata->menuitem); -- gtk_widget_show (adata->menuitem); -- -- if (gdm_user_is_loaded (adata->user)) { -- setup_current_user_now (adata); -- return; -- } -- -- adata->user_loaded_notify_id = g_signal_connect (adata->user, -- "notify::is-loaded", -- G_CALLBACK (on_current_user_loaded), -- adata); --} -- --#ifdef BUILD_PRESENSE_STUFF --static void --set_status (GdmAppletData *adata, -- guint status) --{ -- int i; -- -- g_debug ("Setting current status: %u", status); -- adata->current_status = status; -- for (i = 0; i < G_N_ELEMENTS (statuses); i++) { -- if (statuses[i].widget == NULL) { -- continue; -- } -- if (i == status) { -- gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (statuses[i].widget), -- TRUE); -- } -- } -- -- update_label (adata); --} -- --static void --on_presence_status_changed (DBusGProxy *presence_proxy, -- guint status, -- GdmAppletData *adata) --{ -- g_debug ("Status changed: %u", status); -- -- set_status (adata, status); --} -- --static void --set_status_text (GdmAppletData *adata, -- const char *status_text) --{ -- GtkWidget *entry; -- GtkTextBuffer *buffer; -- -- g_debug ("Status text changed: %s", status_text); -- -- entry = gdm_entry_menu_item_get_entry (GDM_ENTRY_MENU_ITEM (adata->user_item)); -- buffer = gtk_text_view_get_buffer (GTK_TEXT_VIEW (entry)); -- gtk_text_buffer_set_text (buffer, status_text, -1); --} -- --static void --on_presence_status_text_changed (DBusGProxy *presence_proxy, -- const char *status_text, -- GdmAppletData *adata) --{ -- set_status_text (adata, status_text); --} --#endif -- --static gboolean --fill_applet (PanelApplet *applet) --{ -- static const BonoboUIVerb menu_verbs[] = { -- BONOBO_UI_VERB ("GdmAboutMe", about_me_cb), -- BONOBO_UI_VERB ("GdmUsersGroupsAdmin", admin_cb), -- BONOBO_UI_VERB ("GdmAbout", about_cb), -- BONOBO_UI_VERB_END -- }; -- static gboolean first_time = FALSE; -- char *tmp; -- BonoboUIComponent *popup_component; -- GdmAppletData *adata; -- GError *error; -- DBusGConnection *bus; -- -- if (!first_time) { -- first_time = TRUE; -- -- /* Do this here so it's only done once. */ -- gtk_rc_parse_string ("style \"gdm-user-switch-menubar-style\"\n" -- "{\n" -- "GtkMenuBar::shadow-type = none\n" -- "GtkMenuBar::internal-padding = 0\n" -- "}\n" -- "style \"gdm-user-switch-applet-style\"\n" -- "{\n" -- "GtkWidget::focus-line-width = 0\n" -- "GtkWidget::focus-padding = 0\n" -- "}\n" -- "widget \"*.gdm-user-switch-menubar\" style \"gdm-user-switch-menubar-style\"\n" -- "widget \"*.gdm-user-switch-applet\" style \"gdm-user-switch-applet-style\"\n"); -- gtk_window_set_default_icon_name ("stock_people"); -- g_set_application_name (_("User Switch Applet")); -- -- if (! gdm_settings_client_init (DATADIR "/gdm/gdm.schemas", "/")) { -- g_critical ("Unable to initialize settings client"); -- exit (1); -- } -- -- } -- -- adata = g_new0 (GdmAppletData, 1); -- adata->applet = applet; -- adata->panel_size = 24; -- -- adata->client = gconf_client_get_default (); -- -- gtk_widget_set_tooltip_text (GTK_WIDGET (applet), _("Change account settings and status")); -- gtk_container_set_border_width (GTK_CONTAINER (applet), 0); -- gtk_widget_set_name (GTK_WIDGET (applet), "gdm-user-switch-applet"); -- panel_applet_set_flags (applet, PANEL_APPLET_EXPAND_MINOR); -- panel_applet_setup_menu_from_file (applet, NULL, -- DATADIR "/gnome-2.0/ui/GNOME_FastUserSwitchApplet.xml", -- NULL, menu_verbs, adata); -- -- popup_component = panel_applet_get_popup_component (applet); -- -- /* Hide the admin context menu items if locked down or no cmd-line */ -- if (gconf_client_get_bool (adata->client, -- LOCKDOWN_COMMAND_LINE_KEY, -- NULL) || -- panel_applet_get_locked_down (applet)) { -- bonobo_ui_component_set_prop (popup_component, -- "/popups/button3/GdmSeparator", -- "hidden", "1", NULL); -- bonobo_ui_component_set_prop (popup_component, -- "/commands/GdmUsersGroupsAdmin", -- "hidden", "1", NULL); -- } else { --#ifndef USERS_ADMIN --# ifdef GDM_SETUP -- bonobo_ui_component_set_prop (popup_component, -- "/popups/button3/GdmSeparator", -- "hidden", "1", -- NULL); --# endif /* !GDM_SETUP */ -- bonobo_ui_component_set_prop (popup_component, -- "/commands/GdmUsersGroupsAdmin", -- "hidden", "1", -- NULL); --#endif /* !USERS_ADMIN */ -- } -- -- /* Hide the gdmphotosetup item if it can't be found in the path. */ -- tmp = g_find_program_in_path ("gnome-about-me"); -- if (!tmp) { -- bonobo_ui_component_set_prop (popup_component, -- "/commands/GdmAboutMe", -- "hidden", "1", -- NULL); -- } else { -- g_free (tmp); -- } -- -- g_signal_connect (adata->applet, -- "style-set", -- G_CALLBACK (applet_style_set_cb), adata); -- g_signal_connect (applet, -- "change-background", -- G_CALLBACK (applet_change_background_cb), adata); -- g_signal_connect (applet, -- "size-allocate", -- G_CALLBACK (applet_size_allocate_cb), adata); -- g_signal_connect (applet, -- "key-press-event", -- G_CALLBACK (applet_key_press_event_cb), adata); -- g_signal_connect_after (applet, -- "focus-in-event", -- G_CALLBACK (gtk_widget_queue_draw), NULL); -- g_signal_connect_after (applet, -- "focus-out-event", -- G_CALLBACK (gtk_widget_queue_draw), NULL); -- g_object_set_data_full (G_OBJECT (applet), -- "gdm-applet-data", -- adata, -- (GDestroyNotify) gdm_applet_data_free); -- -- adata->menubar = gtk_menu_bar_new (); -- gtk_widget_set_name (adata->menubar, "gdm-user-switch-menubar"); -- gtk_widget_set_can_focus (adata->menubar, TRUE); -- g_signal_connect (adata->menubar, "button-press-event", -- G_CALLBACK (menubar_button_press_event_cb), adata); -- g_signal_connect_after (adata->menubar, "expose-event", -- G_CALLBACK (menubar_expose_event_cb), adata); -- gtk_container_add (GTK_CONTAINER (applet), adata->menubar); -- gtk_widget_show (adata->menubar); -- -- adata->manager = gdm_user_manager_ref_default (); -- g_object_set (adata->manager, "include-all", TRUE, NULL); -- g_signal_connect (adata->manager, -- "notify::is-loaded", -- G_CALLBACK (on_manager_is_loaded_changed), -- adata); -- g_signal_connect (adata->manager, -- "notify::has-multiple-users", -- G_CALLBACK (on_manager_has_multiple_users_changed), -- adata); -- -- gdm_user_manager_queue_load (adata->manager); -- setup_current_user (adata); -- -- gconf_client_add_dir (adata->client, -- LOCKDOWN_DIR, -- GCONF_CLIENT_PRELOAD_ONELEVEL, -- NULL); -- -- adata->client_notify_lockdown_id = gconf_client_notify_add (adata->client, -- LOCKDOWN_DIR, -- (GConfClientNotifyFunc)client_notify_lockdown_func, -- adata, -- NULL, -- NULL); -- -- if (gconf_client_get_bool (adata->client, LOCKDOWN_USER_SWITCHING_KEY, NULL)) { -- set_menu_visibility (adata, FALSE); -- } else { -- set_menu_visibility (adata, TRUE); -- } -- if (gconf_client_get_bool (adata->client, LOCKDOWN_LOCK_SCREEN_KEY, NULL)) { -- gtk_widget_hide (adata->lock_screen_item); -- } else { -- gtk_widget_show (adata->lock_screen_item); -- } -- -- error = NULL; -- bus = dbus_g_bus_get (DBUS_BUS_SESSION, &error); -- if (bus == NULL) { -- g_warning ("Unable to get session bus: %s", error->message); -- g_error_free (error); -- goto done; -- } -- --#ifdef BUILD_PRESENSE_STUFF -- adata->presence_proxy = dbus_g_proxy_new_for_name (bus, -- "org.gnome.SessionManager", -- "/org/gnome/SessionManager/Presence", -- "org.gnome.SessionManager.Presence"); -- if (adata->presence_proxy != NULL) { -- DBusGProxy *proxy; -- -- dbus_g_proxy_add_signal (adata->presence_proxy, -- "StatusChanged", -- G_TYPE_UINT, -- G_TYPE_INVALID); -- dbus_g_proxy_connect_signal (adata->presence_proxy, -- "StatusChanged", -- G_CALLBACK (on_presence_status_changed), -- adata, -- NULL); -- dbus_g_proxy_add_signal (adata->presence_proxy, -- "StatusTextChanged", -- G_TYPE_STRING, -- G_TYPE_INVALID); -- dbus_g_proxy_connect_signal (adata->presence_proxy, -- "StatusTextChanged", -- G_CALLBACK (on_presence_status_text_changed), -- adata, -- NULL); -- -- -- proxy = dbus_g_proxy_new_from_proxy (adata->presence_proxy, -- "org.freedesktop.DBus.Properties", -- "/org/gnome/SessionManager/Presence"); -- if (proxy != NULL) { -- guint status; -- const char *status_text; -- GValue value = { 0, }; -- -- status = 0; -- status_text = NULL; -- -- error = NULL; -- dbus_g_proxy_call (proxy, -- "Get", -- &error, -- G_TYPE_STRING, "org.gnome.SessionManager.Presence", -- G_TYPE_STRING, "status", -- G_TYPE_INVALID, -- G_TYPE_VALUE, &value, -- G_TYPE_INVALID); -- -- if (error != NULL) { -- g_warning ("Couldn't get presence status: %s", error->message); -- g_error_free (error); -- } else { -- status = g_value_get_uint (&value); -- } -- -- g_value_unset (&value); -- -- error = NULL; -- dbus_g_proxy_call (proxy, -- "Get", -- &error, -- G_TYPE_STRING, "org.gnome.SessionManager.Presence", -- G_TYPE_STRING, "status-text", -- G_TYPE_INVALID, -- G_TYPE_VALUE, &value, -- G_TYPE_INVALID); -- -- if (error != NULL) { -- g_warning ("Couldn't get presence status text: %s", error->message); -- g_error_free (error); -- } else { -- status_text = g_value_get_string (&value); -- } -- -- set_status (adata, status); -- set_status_text (adata, status_text); -- } -- } else { -- g_warning ("Failed to get session presence proxy"); -- } --#endif -- -- done: -- gtk_widget_show (GTK_WIDGET (adata->applet)); -- -- return TRUE; --} -- --static gboolean --applet_factory (PanelApplet *applet, -- const char *iid, -- gpointer data) --{ -- gboolean ret; -- ret = FALSE; -- if (strcmp (iid, "OAFIID:GNOME_FastUserSwitchApplet") == 0) { -- ret = fill_applet (applet); -- } -- return ret; --} -diff --git a/gui/user-switch-applet/gdm-entry-menu-item.c b/gui/user-switch-applet/gdm-entry-menu-item.c -deleted file mode 100644 -index d657e7a..0000000 ---- a/gui/user-switch-applet/gdm-entry-menu-item.c -+++ /dev/null -@@ -1,304 +0,0 @@ --/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*- -- * -- * Copyright (C) 2008 Red Hat, Inc. -- * -- * This program is free software; you can redistribute it and/or modify -- * it under the terms of the GNU General Public License as published by -- * the Free Software Foundation; either version 2 of the License, or -- * (at your option) any later version. -- * -- * This program is distributed in the hope that it will be useful, -- * but WITHOUT ANY WARRANTY; without even the implied warranty of -- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -- * GNU General Public License for more details. -- * -- * You should have received a copy of the GNU General Public License -- * along with this program; if not, write to the Free Software -- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -- */ -- --#include "config.h" -- --#include <unistd.h> --#include <sys/types.h> -- --#include <string.h> -- --#include <glib/gi18n.h> --#include <gtk/gtk.h> -- --#include "gdm-entry-menu-item.h" -- --/* same as twitter */ --#define TEXT_BUFFER_MAX_CHARS 64 -- --enum --{ -- PROP_0, --}; -- --struct _GdmEntryMenuItem --{ -- GtkMenuItem parent; -- -- GtkWidget *hbox; -- GtkWidget *image; -- GtkWidget *entry; --}; -- --struct _GdmEntryMenuItemClass --{ -- GtkMenuItemClass parent_class; --}; -- --G_DEFINE_TYPE (GdmEntryMenuItem, gdm_entry_menu_item, GTK_TYPE_MENU_ITEM) -- --static void --gdm_entry_menu_item_set_property (GObject *object, -- guint param_id, -- const GValue *value, -- GParamSpec *pspec) --{ -- GdmEntryMenuItem *item; -- -- item = GDM_ENTRY_MENU_ITEM (object); -- -- switch (param_id) { -- default: -- G_OBJECT_WARN_INVALID_PROPERTY_ID (object, param_id, pspec); -- break; -- } --} -- --static void --gdm_entry_menu_item_get_property (GObject *object, -- guint param_id, -- GValue *value, -- GParamSpec *pspec) --{ -- GdmEntryMenuItem *item; -- -- item = GDM_ENTRY_MENU_ITEM (object); -- -- switch (param_id) { -- default: -- G_OBJECT_WARN_INVALID_PROPERTY_ID (object, param_id, pspec); -- break; -- } --} -- --static void --gdm_entry_menu_item_dispose (GObject *object) --{ -- -- (*G_OBJECT_CLASS (gdm_entry_menu_item_parent_class)->dispose) (object); --} -- --static gboolean --gdm_entry_menu_item_button_release (GtkWidget *widget, -- GdkEventButton *event) --{ -- return TRUE; --} -- --/* Cut and paste from gtkwindow.c */ --static void --send_focus_change (GtkWidget *widget, -- gboolean in) --{ -- GdkEvent *fevent = gdk_event_new (GDK_FOCUS_CHANGE); -- -- g_object_ref (widget); -- -- gtk_widget_set_can_focus (widget, in); -- -- fevent->focus_change.type = GDK_FOCUS_CHANGE; -- fevent->focus_change.window = g_object_ref (gtk_widget_get_window (widget)); -- fevent->focus_change.in = in; -- -- gtk_widget_event (widget, fevent); -- -- g_object_notify (G_OBJECT (widget), "has-focus"); -- -- g_object_unref (widget); -- gdk_event_free (fevent); --} -- --static gboolean --gdm_entry_menu_item_button_press (GtkWidget *widget, -- GdkEventButton *event) --{ -- GtkWidget *entry; -- -- entry = GDM_ENTRY_MENU_ITEM (widget)->entry; -- -- if (gtk_widget_get_window (entry) != NULL) { -- gdk_window_raise (gtk_widget_get_window (entry)); -- } -- -- if (!gtk_widget_has_focus (entry)) { -- gtk_widget_grab_focus (entry); -- } -- -- return FALSE; --} -- --static void --gdm_entry_menu_item_realize (GtkWidget *widget) --{ -- if (GTK_WIDGET_CLASS (gdm_entry_menu_item_parent_class)->realize) { -- GTK_WIDGET_CLASS (gdm_entry_menu_item_parent_class)->realize (widget); -- } --} -- --static void --gdm_entry_menu_item_select (GtkItem *item) --{ -- g_return_if_fail (GDM_IS_ENTRY_MENU_ITEM (item)); -- send_focus_change (GTK_WIDGET (GDM_ENTRY_MENU_ITEM (item)->entry), TRUE); --} -- --static void --gdm_entry_menu_item_deselect (GtkItem *item) --{ -- g_return_if_fail (GDM_IS_ENTRY_MENU_ITEM (item)); -- -- send_focus_change (GTK_WIDGET (GDM_ENTRY_MENU_ITEM (item)->entry), FALSE); --} -- --static void --gdm_entry_menu_item_class_init (GdmEntryMenuItemClass *klass) --{ -- GObjectClass *gobject_class; -- GtkWidgetClass *widget_class; -- GtkMenuItemClass *menu_item_class; -- GtkItemClass *item_class; -- -- gobject_class = G_OBJECT_CLASS (klass); -- widget_class = GTK_WIDGET_CLASS (klass); -- menu_item_class = GTK_MENU_ITEM_CLASS (klass); -- item_class = GTK_ITEM_CLASS (klass); -- -- gobject_class->set_property = gdm_entry_menu_item_set_property; -- gobject_class->get_property = gdm_entry_menu_item_get_property; -- gobject_class->dispose = gdm_entry_menu_item_dispose; -- -- widget_class->button_release_event = gdm_entry_menu_item_button_release; -- widget_class->button_press_event = gdm_entry_menu_item_button_press; -- widget_class->realize = gdm_entry_menu_item_realize; -- -- item_class->select = gdm_entry_menu_item_select; -- item_class->deselect = gdm_entry_menu_item_deselect; -- -- menu_item_class->hide_on_activate = FALSE; --} -- --static void --on_entry_show (GtkWidget *widget, -- GdmEntryMenuItem *item) --{ -- if (gtk_widget_get_window (widget) != NULL) { -- gdk_window_raise (gtk_widget_get_window (widget)); -- } -- send_focus_change (widget, TRUE); --} -- --static void --on_text_buffer_changed (GtkTextBuffer *buffer, -- GdmEntryMenuItem *item) --{ -- int len; -- -- len = gtk_text_buffer_get_char_count (buffer); -- if (len > TEXT_BUFFER_MAX_CHARS) { -- gdk_window_beep (gtk_widget_get_window (GTK_WIDGET (item))); -- } --} -- --static void --on_entry_move_focus (GtkWidget *widget, -- GtkDirectionType direction, -- GdmEntryMenuItem *item) --{ -- g_debug ("focus move"); -- send_focus_change (GTK_WIDGET (GDM_ENTRY_MENU_ITEM (item)->entry), FALSE); -- g_signal_emit_by_name (item, -- "move-focus", -- GTK_DIR_TAB_FORWARD); --} -- --static void --gdm_entry_menu_item_init (GdmEntryMenuItem *item) --{ -- PangoFontDescription *fontdesc; -- PangoFontMetrics *metrics; -- PangoContext *context; -- PangoLanguage *lang; -- int ascent; -- GtkTextBuffer *buffer; -- -- item->hbox = gtk_hbox_new (FALSE, 6); -- gtk_container_add (GTK_CONTAINER (item), item->hbox); -- -- item->image = gtk_image_new (); -- gtk_box_pack_start (GTK_BOX (item->hbox), item->image, FALSE, FALSE, 0); -- -- item->entry = gtk_text_view_new (); -- gtk_text_view_set_accepts_tab (GTK_TEXT_VIEW (item->entry), FALSE); -- gtk_text_view_set_editable (GTK_TEXT_VIEW (item->entry), TRUE); -- gtk_text_view_set_wrap_mode (GTK_TEXT_VIEW (item->entry), -- GTK_WRAP_WORD); -- g_signal_connect (item->entry, -- "show", -- G_CALLBACK (on_entry_show), -- item); -- g_signal_connect (item->entry, -- "move-focus", -- G_CALLBACK (on_entry_move_focus), -- item); -- -- buffer = gtk_text_view_get_buffer (GTK_TEXT_VIEW (item->entry)); -- g_signal_connect (buffer, -- "changed", -- G_CALLBACK (on_text_buffer_changed), -- item); -- -- /* get the font ascent for the current font and language */ -- context = gtk_widget_get_pango_context (item->entry); -- fontdesc = pango_context_get_font_description (context); -- lang = pango_context_get_language (context); -- metrics = pango_context_get_metrics (context, fontdesc, lang); -- ascent = pango_font_metrics_get_ascent (metrics) * 1.5 / PANGO_SCALE; -- pango_font_metrics_unref (metrics); -- -- /* size our progress bar to be five ascents long */ -- gtk_widget_set_size_request (item->entry, ascent * 5, -1); -- -- gtk_box_pack_start (GTK_BOX (item->hbox), item->entry, TRUE, TRUE, 0); -- -- gtk_widget_show (item->hbox); -- gtk_widget_show (item->image); -- gtk_widget_show (item->entry); --} -- --GtkWidget * --gdm_entry_menu_item_new (void) --{ -- return g_object_new (GDM_TYPE_ENTRY_MENU_ITEM, NULL); --} -- --GtkWidget * --gdm_entry_menu_item_get_entry (GdmEntryMenuItem *item) --{ -- g_return_val_if_fail (GDM_IS_ENTRY_MENU_ITEM (item), NULL); -- -- return item->entry; --} -- --GtkWidget * --gdm_entry_menu_item_get_image (GdmEntryMenuItem *item) --{ -- g_return_val_if_fail (GDM_IS_ENTRY_MENU_ITEM (item), NULL); -- -- return item->image; --} -diff --git a/gui/user-switch-applet/gdm-entry-menu-item.h b/gui/user-switch-applet/gdm-entry-menu-item.h -deleted file mode 100644 -index 3031609..0000000 ---- a/gui/user-switch-applet/gdm-entry-menu-item.h -+++ /dev/null -@@ -1,51 +0,0 @@ --/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*- -- * -- * Copyright (C) 2004-2005 James M. Cape <jcape@ignore-your.tv>. -- * -- * This program is free software; you can redistribute it and/or modify -- * it under the terms of the GNU General Public License as published by -- * the Free Software Foundation; either version 2 of the License, or -- * (at your option) any later version. -- * -- * This program is distributed in the hope that it will be useful, -- * but WITHOUT ANY WARRANTY; without even the implied warranty of -- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -- * GNU General Public License for more details. -- * -- * You should have received a copy of the GNU General Public License -- * along with this program; if not, write to the Free Software -- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -- */ -- --#ifndef __GDM_ENTRY_MENU_ITEM__ --#define __GDM_ENTRY_MENU_ITEM__ -- --#include <gtk/gtk.h> -- --G_BEGIN_DECLS -- --#define GDM_TYPE_ENTRY_MENU_ITEM \ -- (gdm_entry_menu_item_get_type ()) --#define GDM_ENTRY_MENU_ITEM(object) \ -- (G_TYPE_CHECK_INSTANCE_CAST ((object), GDM_TYPE_ENTRY_MENU_ITEM, GdmEntryMenuItem)) --#define GDM_ENTRY_MENU_ITEM_CLASS(klass) \ -- (G_TYPE_CHECK_CLASS_CAST ((klass), GDM_TYPE_ENTRY_MENU_ITEM, GdmEntryMenuItemClass)) --#define GDM_IS_ENTRY_MENU_ITEM(object) \ -- (G_TYPE_CHECK_INSTANCE_TYPE ((object), GDM_TYPE_ENTRY_MENU_ITEM)) --#define GDM_IS_ENTRY_MENU_ITEM_CLASS(klass) \ -- (G_TYPE_CHECK_CLASS_TYPE ((klass), GDM_TYPE_ENTRY_MENU_ITEM)) --#define GDM_ENTRY_MENU_ITEM_GET_CLASS(object) \ -- (G_TYPE_INSTANCE_GET_CLASS ((object), GDM_TYPE_ENTRY_MENU_ITEM, GdmEntryMenuItemClass)) -- --typedef struct _GdmEntryMenuItem GdmEntryMenuItem; --typedef struct _GdmEntryMenuItemClass GdmEntryMenuItemClass; -- --GType gdm_entry_menu_item_get_type (void) G_GNUC_CONST; -- --GtkWidget *gdm_entry_menu_item_new (void); --GtkWidget *gdm_entry_menu_item_get_entry (GdmEntryMenuItem *item); --GtkWidget *gdm_entry_menu_item_get_image (GdmEntryMenuItem *item); -- --G_END_DECLS -- --#endif /* __GDM_ENTRY_MENU_ITEM__ */ -diff --git a/po/POTFILES.in b/po/POTFILES.in -index 1fccb90..cc1a3fd 100644 ---- a/po/POTFILES.in -+++ b/po/POTFILES.in -@@ -84,10 +84,6 @@ gui/simple-greeter/gdm-timer.c - gui/simple-greeter/gdm-user.c - gui/simple-greeter/gdm-user-chooser-widget.c - gui/simple-greeter/greeter-main.c --gui/user-switch-applet/applet.c --gui/user-switch-applet/gdm-entry-menu-item.c --gui/user-switch-applet/GNOME_FastUserSwitchApplet.server.in.in --gui/user-switch-applet/GNOME_FastUserSwitchApplet.xml - utils/gdmflexiserver.c - utils/gdm-screenshot.c - -diff --git a/po/POTFILES.skip b/po/POTFILES.skip -index 0269a0f..ee3d753 100644 ---- a/po/POTFILES.skip -+++ b/po/POTFILES.skip -@@ -7,7 +7,6 @@ - # remove these unless you fix "make distcheck" a different way. - # - data/gdm.schemas.in --gui/user-switch-applet/GNOME_FastUserSwitchApplet.server.in - data/greeter-autostart/at-spi-registryd-wrapper.desktop.in - data/greeter-autostart/gdm-simple-greeter.desktop.in - data/greeter-autostart/gnome-power-manager.desktop.in --- -1.6.6.1 - diff --git a/meta-gnome/recipes-gnome/gdm/gdm/0002-gdm-user-manager.c-avoid-displaying-system-users-in-.patch b/meta-gnome/recipes-gnome/gdm/gdm/0002-gdm-user-manager.c-avoid-displaying-system-users-in-.patch deleted file mode 100644 index ad21073a09..0000000000 --- a/meta-gnome/recipes-gnome/gdm/gdm/0002-gdm-user-manager.c-avoid-displaying-system-users-in-.patch +++ /dev/null @@ -1,34 +0,0 @@ -From 43e59f3deadb3914a1cc931ae18d4023874cdeca Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com> -Date: Fri, 26 Apr 2013 17:15:48 +0200 -Subject: [PATCH] gdm-user-manager.c: avoid displaying system users in - greeter's list -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -yocto environment system users have UID below 1000 - -Upstream-Status: Inappropriate [configuration] - -Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com> ---- - gui/simple-greeter/gdm-user-manager.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -diff --git a/gui/simple-greeter/gdm-user-manager.c b/gui/simple-greeter/gdm-user-manager.c -index c631989..f18e478 100644 ---- a/gui/simple-greeter/gdm-user-manager.c -+++ b/gui/simple-greeter/gdm-user-manager.c -@@ -63,7 +63,7 @@ - #ifdef __sun - #define FALLBACK_MINIMAL_UID 100 - #else --#define FALLBACK_MINIMAL_UID 500 -+#define FALLBACK_MINIMAL_UID 1000 - #endif - - #ifndef _PATH_SHELLS --- -1.7.4.4 - diff --git a/meta-gnome/recipes-gnome/gdm/gdm/sysrooted-pkg-config.patch b/meta-gnome/recipes-gnome/gdm/gdm/sysrooted-pkg-config.patch deleted file mode 100644 index 1f9fa2ac2f..0000000000 --- a/meta-gnome/recipes-gnome/gdm/gdm/sysrooted-pkg-config.patch +++ /dev/null @@ -1,37 +0,0 @@ -In cross environment we have to prepend the sysroot to the path found by -pkgconfig since the path returned from pkgconfig does not have sysroot prefixed -it ends up using the files from host system. Now usually people have gnome installed -so the build succeeds but if you dont have gnome installed on build host then -it wont find the files on host system and packages using gnome-doc-utils wont -compile. - -This should work ok with non sysrooted builds too since in those cases PKG_CONFIG_SYSROOT_DIR -will be empty - -Upstream-Status: Pending - -Signed-off-by: Khem Raj <raj.khem@gmail.com> - -Index: gdm-2.32.2/gnome-doc-utils.make -=================================================================== ---- gdm-2.32.2.orig/gnome-doc-utils.make 2011-05-31 08:06:59.000000000 -0700 -+++ gdm-2.32.2/gnome-doc-utils.make 2011-09-25 15:32:39.540992521 -0700 -@@ -133,12 +133,12 @@ - _xml2po ?= `which xml2po` - _xml2po_mode = $(if $(DOC_ID),mallard,docbook) - --_db2html ?= `$(PKG_CONFIG) --variable db2html gnome-doc-utils` --_db2omf ?= `$(PKG_CONFIG) --variable db2omf gnome-doc-utils` --_malrng ?= `$(PKG_CONFIG) --variable malrng gnome-doc-utils` --_chunks ?= `$(PKG_CONFIG) --variable xmldir gnome-doc-utils`/gnome/xslt/docbook/utils/chunks.xsl --_credits ?= `$(PKG_CONFIG) --variable xmldir gnome-doc-utils`/gnome/xslt/docbook/utils/credits.xsl --_ids ?= $(shell $(PKG_CONFIG) --variable xmldir gnome-doc-utils)/gnome/xslt/docbook/utils/ids.xsl -+_db2html ?= ${PKG_CONFIG_SYSROOT_DIR}`$(PKG_CONFIG) --variable db2html gnome-doc-utils` -+_db2omf ?= ${PKG_CONFIG_SYSROOT_DIR}`$(PKG_CONFIG) --variable db2omf gnome-doc-utils` -+_malrng ?= ${PKG_CONFIG_SYSROOT_DIR}`$(PKG_CONFIG) --variable malrng gnome-doc-utils` -+_chunks ?= ${PKG_CONFIG_SYSROOT_DIR}`$(PKG_CONFIG) --variable xmldir gnome-doc-utils`/gnome/xslt/docbook/utils/chunks.xsl -+_credits ?= ${PKG_CONFIG_SYSROOT_DIR}`$(PKG_CONFIG) --variable xmldir gnome-doc-utils`/gnome/xslt/docbook/utils/credits.xsl -+_ids ?= ${PKG_CONFIG_SYSROOT_DIR}$(shell $(PKG_CONFIG) --variable xmldir gnome-doc-utils)/gnome/xslt/docbook/utils/ids.xsl - - if ENABLE_SK - _ENABLE_SK = true diff --git a/meta-gnome/recipes-gnome/gdm/gdm_2.32.2.bb b/meta-gnome/recipes-gnome/gdm/gdm_2.32.2.bb deleted file mode 100644 index 64785ca1c0..0000000000 --- a/meta-gnome/recipes-gnome/gdm/gdm_2.32.2.bb +++ /dev/null @@ -1,108 +0,0 @@ -SUMMARY = "Graphical login manager" -LICENSE = "GPLv2" -LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f" - -DEPENDS = "xinput gnome-panel tcp-wrappers libcanberra libxklavier grep consolekit libpam gnome-doc-utils gtk+ xrdb" - -PR = "r18" - -inherit gnome update-rc.d systemd useradd - -SRC_URI += " \ - file://cross-xdetection.diff \ - file://0001-Remove-user-switch-applet.patch \ - file://0002-gdm-user-manager.c-avoid-displaying-system-users-in-.patch \ - file://sysrooted-pkg-config.patch \ - file://%gconf-tree.xml \ - file://gdm \ - file://gdm.conf \ - file://gdm-pam \ - file://Default \ - file://gdm.service.in \ -" - -SRC_URI[archive.md5sum] = "dbe5187a2e17881cc454e313e0ae8d1e" -SRC_URI[archive.sha256sum] = "034d23af0ea18d86e5543e707212d9297ec7d83f221808968af266dbebc0e703" -GNOME_COMPRESS_TYPE="bz2" - -EXTRA_OECONF = " \ - --enable-authentication-scheme=shadow \ - --enable-debug=yes \ - --with-console-kit \ - --disable-scrollkeeper \ -" - -do_configure_prepend() { - sed -i -e "s:\bdocs::g" ${S}/Makefile.am - rm -f ${S}/m4/gnome-doc-utils.m4 -} - -do_install_prepend() { - install -d ${D}/${localstatedir}/lib/gdm/.gconf.mandatory - install ${WORKDIR}/%gconf-tree.xml ${D}/${localstatedir}/lib/gdm/.gconf.mandatory/ -} - -do_install_append() { - install -d ${D}/${sysconfdir}/init.d - install -m 0755 ${WORKDIR}/gdm ${D}/${sysconfdir}/init.d/ - - install -d ${D}/${sysconfdir}/gdm - install -m 0644 ${WORKDIR}/gdm.conf ${D}/${sysconfdir}/gdm/ - - install -d ${D}/${sysconfdir}/pam.d - install -m 0755 ${WORKDIR}/gdm-pam ${D}/${sysconfdir}/pam.d/gdm - rm -f ${D}/${sysconfdir}/pam.d/gdm-autologin - - install -d ${D}/${sysconfdir}/gdm/Init - install -m 0755 ${WORKDIR}/Default ${D}/${sysconfdir}/gdm/Init - - install -d ${D}${systemd_unitdir}/system - sed -e 's,%sbindir%,${sbindir},g' \ - < ${WORKDIR}/gdm.service.in \ - > ${D}${systemd_unitdir}/system/gdm.service - - chown -R gdm:gdm ${D}${localstatedir}/lib/gdm - chmod 0750 ${D}${localstatedir}/lib/gdm - - rm -rf "${D}${localstatedir}/run" - rmdir --ignore-fail-on-non-empty "${D}${localstatedir}" - - rm -f ${D}${datadir}/gdm/autostart/LoginWindow/at-spi-registryd-wrapper.desktop - rm -f ${D}${datadir}/gdm/autostart/LoginWindow/orca-screen-reader.desktop - rm -f ${D}${datadir}/gdm/autostart/LoginWindow/gnome-mag.desktop - rm -f ${D}${datadir}/gdm/autostart/LoginWindow/gok.desktop - rm -f ${D}${datadir}/gdm/autostart/LoginWindow/metacity.desktop -} - -FILES_${PN} += "${datadir}/icon* \ - ${datadir}/xsession* \ -" - -RDEPENDS_${PN} += "grep dbus-x11 shadow" -# "libpam-base-files" -CONFFILES_${PN} += "${sysconfdir}/gdm/gdm.conf ${sysconfdir}/init.d/gdm" -RRECOMMENDS_${PN} += "openssh-misc desktop-file-utils glib-2.0-utils metacity gnome-session polkit-gnome consolekit" - -RREPLACES_${PN} += "${PN}-systemd" -RCONFLICTS_${PN} += "${PN}-systemd" -SYSTEMD_SERVICE_${PN} = "gdm.service" - -INITSCRIPT_NAME = "gdm" -INITSCRIPT_PARAMS = "start 99 5 . stop 20 0 1 2 3 6 ." - -USERADD_PACKAGES = "${PN}" -USERADD_PARAM_${PN} = "--system --no-create-home --home ${localstatedir}/lib/gdm --user-group gdm" - -pkg_postinst_${PN} () { -# Register up as default dm -mkdir -p $D${sysconfdir}/X11/ -echo "${bindir}/gdm" > $D${sysconfdir}/X11/default-display-manager -} - -pkg_postrm_${PN} () { - deluser gdm || true - delgroup gdm || true - sed -i /gdm/d ${sysconfdir}/X11/default-display-manager || true -} - -PNBLACKLIST[gdm] ?= "Depends on broken gnome-panel - the recipe will be removed on 2017-09-01 unless the issue is fixed" diff --git a/meta-gnome/recipes-gnome/gnome-backgrounds/gnome-backgrounds_2.32.0.bb b/meta-gnome/recipes-gnome/gnome-backgrounds/gnome-backgrounds_2.32.0.bb deleted file mode 100644 index 235b02a2fe..0000000000 --- a/meta-gnome/recipes-gnome/gnome-backgrounds/gnome-backgrounds_2.32.0.bb +++ /dev/null @@ -1,21 +0,0 @@ -SUMMARY = "Gnome background images" - -LICENSE = "GPLv2" -LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f" - -SECTION = "x11/gnome" - -# glib-2.0 for glib-gettext.m4 which provides AM_GLIB_GNU_GETTEXT -# intltool-native for IT_PROG_INTLTOOL(0.35.0) -DEPENDS = "glib-2.0 intltool-native" - -inherit gnomebase - -SRC_URI[archive.md5sum] = "3df26626483b02e51adefc6ab5945a8d" -SRC_URI[archive.sha256sum] = "4d7b60b5ba768bf8834b5fa3a3471cd9a9e14b5884bc210dc2d3cdbf1faddcef" -GNOME_COMPRESS_TYPE="bz2" - -FILES_${PN} += "${datadir}/gnome-background-properties" - - -PNBLACKLIST[gnome-backgrounds] ?= "Fails to build with RSS http://errors.yoctoproject.org/Errors/Details/130647/ - the recipe will be removed on 2017-09-01 unless the issue is fixed" diff --git a/meta-gnome/recipes-gnome/gnome-control-center/gnome-control-center_2.32.1.bb b/meta-gnome/recipes-gnome/gnome-control-center/gnome-control-center_2.32.1.bb deleted file mode 100644 index 201783e91d..0000000000 --- a/meta-gnome/recipes-gnome/gnome-control-center/gnome-control-center_2.32.1.bb +++ /dev/null @@ -1,35 +0,0 @@ -SUMMARY = "GNOME control center" -LICENSE = "GPLv2" -LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f" - -DEPENDS = "desktop-file-utils-native gnome-menus libunique dbus-glib gnome-desktop libxml2 metacity gconf gnome-settings-daemon librsvg pango libgnomekbd libxklavier libcanberra libgtop libxscrnsaver" - -PR = "r1" - -inherit gnome - -SRC_URI[archive.md5sum] = "b4e8ab5c7556ae07addbfcfb4fa2f761" -SRC_URI[archive.sha256sum] = "7c568b57358e5c08f4d8dd76dbac7df2539135ad081872b60514b7a8ac797e66" -GNOME_COMPRESS_TYPE="bz2" - -LDFLAGS += "-lgthread-2.0 -lxml2" - -do_configure_prepend() { - sed -i s:help::g ${S}/Makefile.am - rm -f ${S}/m4/gnome-doc-utils.m4 -} -do_install_append() { - rm -rf ${D}${datadir}/mime -} - -FILES_${PN} += "${datadir}/icon* \ - ${datadir}/xsession* \ - ${libdir}/window-manager-settings/*.so \ - ${datadir}/gnome \ - ${datadir}/desktop-directories \ -" -FILES_${PN}-dbg += "${libdir}/window-manager-settings/.debug" -FILES_${PN}-dev += "${libdir}/window-manager-settings/*.la" -FILES_${PN}-staticdev += "${libdir}/window-manager-settings/*.a" - -PNBLACKLIST[gnome-control-center] ?= "Depends on broken gnome-menus - the recipe will be removed on 2017-09-01 unless the issue is fixed" diff --git a/meta-gnome/recipes-gnome/gnome-desktop/gnome-desktop_2.32.1.bb b/meta-gnome/recipes-gnome/gnome-desktop/gnome-desktop_2.32.1.bb deleted file mode 100644 index f1dafad2ea..0000000000 --- a/meta-gnome/recipes-gnome/gnome-desktop/gnome-desktop_2.32.1.bb +++ /dev/null @@ -1,28 +0,0 @@ -SUMMARY = "GNOME library for reading .desktop files" -SECTION = "x11/gnome" -LICENSE = "GPLv2 & LGPLv2" -LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ - file://COPYING.LIB;md5=5f30f0716dfdd0d91eb439ebec522ec2" - -PR = "r6" - -inherit gnome pkgconfig - -SRC_URI[archive.md5sum] = "5c80d628a240eb9d9ff78913b31f2f67" -SRC_URI[archive.sha256sum] = "55cbecf67efe1fa1e57ac966520a7c46d799c8ba3c652a1219f60cafccb3739d" -GNOME_COMPRESS_TYPE="bz2" - -DEPENDS += "gconf libxrandr virtual/libx11 gtk+ glib-2.0 gnome-doc-utils startup-notification intltool-native gnome-common-native" - -EXTRA_OECONF = "--disable-scrollkeeper --disable-desktop-docs --disable-gnome-about" - -do_configure_prepend () { - sed -i -e s:^#!@PYTHON@:#!${bindir}/python: ${S}/gnome-about/gnome-about.in - rm -f ${S}/m4/gnome-doc-utils.m4 -} - -PACKAGES =+ "libgnome-desktop" -FILES_libgnome-desktop = "${libdir}/lib*${SOLIBS} ${datadir}/libgnome-desktop/pnp.ids" -FILES_${PN} += "${datadir}/gnome-about" - -PNBLACKLIST[gnome-desktop] ?= "Fails to build with RSS http://errors.yoctoproject.org/Errors/Details/130595/ - the recipe will be removed on 2017-09-01 unless the issue is fixed" diff --git a/meta-gnome/recipes-gnome/gnome-disk-utility/gnome-disk-utility/0001-Add-support-for-DeviceAutomountHint.patch b/meta-gnome/recipes-gnome/gnome-disk-utility/gnome-disk-utility/0001-Add-support-for-DeviceAutomountHint.patch deleted file mode 100644 index 805e937763..0000000000 --- a/meta-gnome/recipes-gnome/gnome-disk-utility/gnome-disk-utility/0001-Add-support-for-DeviceAutomountHint.patch +++ /dev/null @@ -1,74 +0,0 @@ -From 7dde5bc75a1d96be9510ce1e98d28f9d33520919 Mon Sep 17 00:00:00 2001 -From: David Zeuthen <davidz@redhat.com> -Date: Fri, 8 Jul 2011 11:03:52 -0400 -Subject: [PATCH] Add support for DeviceAutomountHint - -Based on the patch in https://bugzilla.gnome.org/show_bug.cgi?id=653184 - -Upstream-Status: Applied [1] - -[1] https://mail.gnome.org/archives/commits-list/2011-July/msg03207.html - -Signed-off-by: David Zeuthen <davidz@redhat.com> ---- - src/gdu/gdu-device.c | 10 ++++++++++ - src/gdu/gdu-device.h | 1 + - 2 files changed, 11 insertions(+), 0 deletions(-) - -diff --git a/src/gdu/gdu-device.c b/src/gdu/gdu-device.c -index 6a5afad..4be39cf 100644 ---- a/src/gdu/gdu-device.c -+++ b/src/gdu/gdu-device.c -@@ -82,6 +82,7 @@ typedef struct - gboolean device_presentation_nopolicy; - char *device_presentation_name; - char *device_presentation_icon_name; -+ char *device_automount_hint; - guint64 device_size; - guint64 device_block_size; - -@@ -279,6 +280,8 @@ collect_props (const char *key, - props->device_presentation_name = g_strdup (g_value_get_string (value)); - else if (strcmp (key, "DevicePresentationIconName") == 0) - props->device_presentation_icon_name = g_strdup (g_value_get_string (value)); -+ else if (strcmp (key, "DeviceAutomountHint") == 0) -+ props->device_automount_hint = g_strdup (g_value_get_string (value)); - else if (strcmp (key, "DeviceSize") == 0) - props->device_size = g_value_get_uint64 (value); - else if (strcmp (key, "DeviceBlockSize") == 0) -@@ -549,6 +552,7 @@ device_properties_free (DeviceProperties *props) - g_strfreev (props->device_mount_paths); - g_free (props->device_presentation_name); - g_free (props->device_presentation_icon_name); -+ g_free (props->device_automount_hint); - g_free (props->job_id); - g_free (props->id_usage); - g_free (props->id_type); -@@ -1294,6 +1298,12 @@ gdu_device_drive_get_media_compatibility (GduDevice *device) - } - - const char * -+gdu_device_get_automount_hint (GduDevice *device) -+{ -+ return device->priv->props->device_automount_hint; -+} -+ -+const char * - gdu_device_drive_get_media (GduDevice *device) - { - return device->priv->props->drive_media; -diff --git a/src/gdu/gdu-device.h b/src/gdu/gdu-device.h -index 4c1302b..8cfd7a9 100644 ---- a/src/gdu/gdu-device.h -+++ b/src/gdu/gdu-device.h -@@ -143,6 +143,7 @@ const char *gdu_device_drive_get_wwn (GduDevice *device); - const char *gdu_device_drive_get_connection_interface (GduDevice *device); - guint64 gdu_device_drive_get_connection_speed (GduDevice *device); - char **gdu_device_drive_get_media_compatibility (GduDevice *device); -+const gchar *gdu_device_get_automount_hint(GduDevice *device); - const char *gdu_device_drive_get_media (GduDevice *device); - gboolean gdu_device_drive_get_is_media_ejectable (GduDevice *device); - gboolean gdu_device_drive_get_requires_eject (GduDevice *device); --- -1.7.6.5 - diff --git a/meta-gnome/recipes-gnome/gnome-disk-utility/gnome-disk-utility/0002-Require-libnotify-0.6.1.patch b/meta-gnome/recipes-gnome/gnome-disk-utility/gnome-disk-utility/0002-Require-libnotify-0.6.1.patch deleted file mode 100644 index 0bc9707c26..0000000000 --- a/meta-gnome/recipes-gnome/gnome-disk-utility/gnome-disk-utility/0002-Require-libnotify-0.6.1.patch +++ /dev/null @@ -1,49 +0,0 @@ -From f8dea8dd411cba10a54ec083c3d5c9d641ec36c0 Mon Sep 17 00:00:00 2001 -From: William Jon McCann <jmccann@redhat.com> -Date: Tue, 12 Oct 2010 00:12:49 -0400 -Subject: [PATCH] Require libnotify 0.6.1 - -https://bugzilla.gnome.org/show_bug.cgi?id=631940 - -Upstream-Status: Backport [1] - -[1] https://git.gnome.org/browse/gnome-disk-utility/commit/?id=f8dea8dd411cba10a54ec083c3d5c9d641ec36c0 - -Signed-off-by: David Zeuthen <davidz@redhat.com> ---- - configure.ac | 2 +- - src/notification/notification-main.c | 5 +---- - 2 files changed, 2 insertions(+), 5 deletions(-) - -diff --git a/configure.ac b/configure.ac -index c61212e..3790fcf 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -128,7 +128,7 @@ DBUS_GLIB_REQUIRED=0.74 - GNOME_KEYRING_REQUIRED=2.22 - GTK2_REQUIRED=2.20.0 - UNIQUE_REQUIRED=1.0 --LIBNOTIFY_REQUIRED=0.3.0 -+LIBNOTIFY_REQUIRED=0.6.1 - NAUTILUS_REQUIRED=2.24.0 - AVAHI_UI_REQUIRED=0.6.25 - -diff --git a/src/notification/notification-main.c b/src/notification/notification-main.c -index 18e9672..b6a713f 100644 ---- a/src/notification/notification-main.c -+++ b/src/notification/notification-main.c -@@ -535,10 +535,7 @@ update_status_icon (NotificationData *data) - _("A hard disk may be failing"), - /* Translators: This is used as the text of the notification*/ - _("One or more hard disks report health problems. Click the icon to get more information."), -- "gtk-dialog-warning", -- NULL); -- notify_notification_attach_to_status_icon (data->ata_smart_notification, -- data->status_icon); -+ "gtk-dialog-warning"); - notify_notification_set_urgency (data->ata_smart_notification, NOTIFY_URGENCY_CRITICAL); - notify_notification_set_timeout (data->ata_smart_notification, NOTIFY_EXPIRES_NEVER); - show_notification (data); --- -2.1.0 - diff --git a/meta-gnome/recipes-gnome/gnome-disk-utility/gnome-disk-utility/disable-scrollkeeper.patch b/meta-gnome/recipes-gnome/gnome-disk-utility/gnome-disk-utility/disable-scrollkeeper.patch deleted file mode 100644 index f36942d194..0000000000 --- a/meta-gnome/recipes-gnome/gnome-disk-utility/gnome-disk-utility/disable-scrollkeeper.patch +++ /dev/null @@ -1,27 +0,0 @@ -From: Dmitry Eremin-Solenikov <dbaryshkov@gmail.com> -Subject: Disable scrollkeeper-config not found message -Upstream-Status: Not-Applicable - -If scrollkeeper-config isn't found, configure fails with an error. -Fix that by commenting out the check. - -Signed-Off-By: Dmitry Eremin-Solenikov <dbaryshkov@gmail.com> - - -Index: gnome-disk-utility-2.32.0/configure.ac -=================================================================== ---- gnome-disk-utility-2.32.0.orig/configure.ac 2010-09-15 19:07:25.000000000 +0400 -+++ gnome-disk-utility-2.32.0/configure.ac 2011-08-20 01:29:48.000000000 +0400 -@@ -188,9 +188,9 @@ - # ************* - - AC_PATH_PROG(SCROLLKEEPER_CONFIG, scrollkeeper-config,no) --if test x$SCROLLKEEPER_CONFIG = xno; then -- AC_MSG_ERROR(Couldn't find scrollkeeper-config, please install the scrollkeeper package) --fi -+dnl if test x$SCROLLKEEPER_CONFIG = xno; then -+dnl AC_MSG_ERROR([Couldn't find scrollkeeper-config, please install the scrollkeeper package]) -+dnl fi - - # ******************** - # Internationalization diff --git a/meta-gnome/recipes-gnome/gnome-disk-utility/gnome-disk-utility/fix-dbus-interfaces.patch b/meta-gnome/recipes-gnome/gnome-disk-utility/gnome-disk-utility/fix-dbus-interfaces.patch deleted file mode 100644 index 6ba3979557..0000000000 --- a/meta-gnome/recipes-gnome/gnome-disk-utility/gnome-disk-utility/fix-dbus-interfaces.patch +++ /dev/null @@ -1,34 +0,0 @@ -Index: gnome-disk-utility-2.32.0/src/gdu/Makefile.am -=================================================================== ---- gnome-disk-utility-2.32.0.orig/src/gdu/Makefile.am 2011-08-20 01:59:16.000000000 +0400 -+++ gnome-disk-utility-2.32.0/src/gdu/Makefile.am 2011-08-20 02:08:18.000000000 +0400 -@@ -14,20 +14,20 @@ - gdu-marshal.c: gdu-marshal.list - echo "#include \"gdu-marshal.h\"" > $@ && glib-genmarshal $< --prefix=gdu_marshal --body >> $@ - --udisks-daemon-glue.h: /usr/share/dbus-1/interfaces/org.freedesktop.UDisks.xml Makefile.am -- dbus-binding-tool --prefix=devkit_disks_daemon --mode=glib-client --output=udisks-daemon-glue.h /usr/share/dbus-1/interfaces/org.freedesktop.UDisks.xml -+udisks-daemon-glue.h: $(PKG_CONFIG_SYSROOT_DIR)/usr/share/dbus-1/interfaces/org.freedesktop.UDisks.xml Makefile.am -+ dbus-binding-tool --prefix=devkit_disks_daemon --mode=glib-client --output=udisks-daemon-glue.h $(PKG_CONFIG_SYSROOT_DIR)/usr/share/dbus-1/interfaces/org.freedesktop.UDisks.xml - --udisks-device-glue.h: /usr/share/dbus-1/interfaces/org.freedesktop.UDisks.Device.xml Makefile.am -- dbus-binding-tool --prefix=devkit_disks_daemon --mode=glib-client --output=udisks-device-glue.h /usr/share/dbus-1/interfaces/org.freedesktop.UDisks.Device.xml -+udisks-device-glue.h: $(PKG_CONFIG_SYSROOT_DIR)/usr/share/dbus-1/interfaces/org.freedesktop.UDisks.Device.xml Makefile.am -+ dbus-binding-tool --prefix=devkit_disks_daemon --mode=glib-client --output=udisks-device-glue.h $(PKG_CONFIG_SYSROOT_DIR)/usr/share/dbus-1/interfaces/org.freedesktop.UDisks.Device.xml - --udisks-adapter-glue.h: /usr/share/dbus-1/interfaces/org.freedesktop.UDisks.Adapter.xml Makefile.am -- dbus-binding-tool --prefix=devkit_disks_daemon --mode=glib-client --output=udisks-adapter-glue.h /usr/share/dbus-1/interfaces/org.freedesktop.UDisks.Adapter.xml -+udisks-adapter-glue.h: $(PKG_CONFIG_SYSROOT_DIR)/usr/share/dbus-1/interfaces/org.freedesktop.UDisks.Adapter.xml Makefile.am -+ dbus-binding-tool --prefix=devkit_disks_daemon --mode=glib-client --output=udisks-adapter-glue.h $(PKG_CONFIG_SYSROOT_DIR)/usr/share/dbus-1/interfaces/org.freedesktop.UDisks.Adapter.xml - --udisks-expander-glue.h: /usr/share/dbus-1/interfaces/org.freedesktop.UDisks.Expander.xml Makefile.am -- dbus-binding-tool --prefix=devkit_disks_daemon --mode=glib-client --output=udisks-expander-glue.h /usr/share/dbus-1/interfaces/org.freedesktop.UDisks.Expander.xml -+udisks-expander-glue.h: $(PKG_CONFIG_SYSROOT_DIR)/usr/share/dbus-1/interfaces/org.freedesktop.UDisks.Expander.xml Makefile.am -+ dbus-binding-tool --prefix=devkit_disks_daemon --mode=glib-client --output=udisks-expander-glue.h $(PKG_CONFIG_SYSROOT_DIR)/usr/share/dbus-1/interfaces/org.freedesktop.UDisks.Expander.xml - --udisks-port-glue.h: /usr/share/dbus-1/interfaces/org.freedesktop.UDisks.Port.xml Makefile.am -- dbus-binding-tool --prefix=devkit_disks_daemon --mode=glib-client --output=udisks-port-glue.h /usr/share/dbus-1/interfaces/org.freedesktop.UDisks.Port.xml -+udisks-port-glue.h: $(PKG_CONFIG_SYSROOT_DIR)/usr/share/dbus-1/interfaces/org.freedesktop.UDisks.Port.xml Makefile.am -+ dbus-binding-tool --prefix=devkit_disks_daemon --mode=glib-client --output=udisks-port-glue.h $(PKG_CONFIG_SYSROOT_DIR)/usr/share/dbus-1/interfaces/org.freedesktop.UDisks.Port.xml - - lib_LTLIBRARIES=libgdu.la diff --git a/meta-gnome/recipes-gnome/gnome-disk-utility/gnome-disk-utility/sysrooted-pkg-config.patch b/meta-gnome/recipes-gnome/gnome-disk-utility/gnome-disk-utility/sysrooted-pkg-config.patch deleted file mode 100644 index 48e63b1ea7..0000000000 --- a/meta-gnome/recipes-gnome/gnome-disk-utility/gnome-disk-utility/sysrooted-pkg-config.patch +++ /dev/null @@ -1,37 +0,0 @@ -In cross environment we have to prepend the sysroot to the path found by -pkgconfig since the path returned from pkgconfig does not have sysroot prefixed -it ends up using the files from host system. Now usually people have gnome installed -so the build succeeds but if you dont have gnome installed on build host then -it wont find the files on host system and packages using gnome-doc-utils wont -compile. - -This should work ok with non sysrooted builds too since in those cases PKG_CONFIG_SYSROOT_DIR -will be empty - -Upstream-Status: Pending - -Signed-off-by: Khem Raj <raj.khem@gmail.com> - -Index: gnome-disk-utility-2.32.0/gnome-doc-utils.make -=================================================================== ---- gnome-disk-utility-2.32.0.orig/gnome-doc-utils.make 2010-09-15 08:27:46.000000000 -0700 -+++ gnome-disk-utility-2.32.0/gnome-doc-utils.make 2011-09-25 16:04:30.693795591 -0700 -@@ -133,12 +133,12 @@ - _xml2po ?= `which xml2po` - _xml2po_mode = $(if $(DOC_ID),mallard,docbook) - --_db2html ?= `$(PKG_CONFIG) --variable db2html gnome-doc-utils` --_db2omf ?= `$(PKG_CONFIG) --variable db2omf gnome-doc-utils` --_malrng ?= `$(PKG_CONFIG) --variable malrng gnome-doc-utils` --_chunks ?= `$(PKG_CONFIG) --variable xmldir gnome-doc-utils`/gnome/xslt/docbook/utils/chunks.xsl --_credits ?= `$(PKG_CONFIG) --variable xmldir gnome-doc-utils`/gnome/xslt/docbook/utils/credits.xsl --_ids ?= `$(PKG_CONFIG) --variable xmldir gnome-doc-utils`/gnome/xslt/docbook/utils/ids.xsl -+_db2html ?= ${PKG_CONFIG_SYSROOT_DIR}`$(PKG_CONFIG) --variable db2html gnome-doc-utils` -+_db2omf ?= ${PKG_CONFIG_SYSROOT_DIR}`$(PKG_CONFIG) --variable db2omf gnome-doc-utils` -+_malrng ?= ${PKG_CONFIG_SYSROOT_DIR}`$(PKG_CONFIG) --variable malrng gnome-doc-utils` -+_chunks ?= ${PKG_CONFIG_SYSROOT_DIR}`$(PKG_CONFIG) --variable xmldir gnome-doc-utils`/gnome/xslt/docbook/utils/chunks.xsl -+_credits ?= ${PKG_CONFIG_SYSROOT_DIR}`$(PKG_CONFIG) --variable xmldir gnome-doc-utils`/gnome/xslt/docbook/utils/credits.xsl -+_ids ?= ${PKG_CONFIG_SYSROOT_DIR}`$(PKG_CONFIG) --variable xmldir gnome-doc-utils`/gnome/xslt/docbook/utils/ids.xsl - - if ENABLE_SK - _ENABLE_SK = true diff --git a/meta-gnome/recipes-gnome/gnome-disk-utility/gnome-disk-utility_2.32.0.bb b/meta-gnome/recipes-gnome/gnome-disk-utility/gnome-disk-utility_2.32.0.bb deleted file mode 100644 index 55a589c3f9..0000000000 --- a/meta-gnome/recipes-gnome/gnome-disk-utility/gnome-disk-utility_2.32.0.bb +++ /dev/null @@ -1,45 +0,0 @@ -SUMMARY = "GNOME disk utility" - -LICENSE = "GPLv2+" -LIC_FILES_CHKSUM = "file://COPYING;md5=e9115d11797a5e6b746b4e9b90194564" - -DEPENDS = "glib-2.0 gtk+ libnotify libunique udisks avahi-ui \ - virtual/libx11 libatasmart gnome-doc-utils intltool-native \ - gnome-common-native libgnome-keyring dbus-glib-native \ -" - -PR = "r4" - -inherit gnomebase gtk-icon-cache distro_features_check - -REQUIRED_DISTRO_FEATURES = "x11" - -SRC_URI[archive.md5sum] = "f0366c8baebca0404d190b2d78f3582d" -SRC_URI[archive.sha256sum] = "03e461b6bda7f773f8018d25fa3213d3073d4dc83a76e6b39d962652f4de6a98" -GNOME_COMPRESS_TYPE="bz2" - -SRC_URI += "\ - file://disable-scrollkeeper.patch \ - file://fix-dbus-interfaces.patch \ - file://sysrooted-pkg-config.patch \ - file://0001-Add-support-for-DeviceAutomountHint.patch \ - file://0002-Require-libnotify-0.6.1.patch \ -" - -EXTRA_OECONF += "--disable-scrollkeeper" - -PACKAGECONFIG ??= "" -PACKAGECONFIG[nautilus] = "--enable-nautilus,--disable-nautilus,nautilus" - -do_configure_prepend() { - sed -i -e "s: help : :g" ${S}/Makefile.am -} - -PACKAGES =+ "${PN}-nautilus-extension ${PN}-libs" -FILES_${PN}-nautilus-extension += "${libdir}/nautilus/extensions-2.0/*.so" -FILES_${PN}-libs += "${libdir}/libgdu*.so.*" -FILES_${PN}-dev += "${libdir}/nautilus/extensions-2.0/*.la" -FILES_${PN}-staticdev += "${libdir}/nautilus/extensions-2.0/*.a" -FILES_${PN}-dbg += "${libdir}/nautilus/extensions-2.0/.debug" - -PNBLACKLIST[gnome-disk-utility] ?= "Fails to build with RSS http://errors.yoctoproject.org/Errors/Details/132824/ - the recipe will be removed on 2017-09-01 unless the issue is fixed" diff --git a/meta-gnome/recipes-gnome/gnome-menus/gnome-menus_2.30.5.bb b/meta-gnome/recipes-gnome/gnome-menus/gnome-menus_2.30.5.bb deleted file mode 100644 index d1c9e4d8f9..0000000000 --- a/meta-gnome/recipes-gnome/gnome-menus/gnome-menus_2.30.5.bb +++ /dev/null @@ -1,30 +0,0 @@ -SUMMARY = "GNOME menus" -SECTION = "x11/gnome" -LICENSE = "GPLv2 & LGPLv2" -LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ - file://COPYING.LIB;md5=5f30f0716dfdd0d91eb439ebec522ec2" -PR = "r1" - -DEPENDS = "python libxml2 gconf popt gtk+ intltool-native" - -inherit gnomebase pkgconfig python-dir pythonnative gobject-introspection - -SRC_URI[archive.md5sum] = "caa6772e63ed5870cf43dc3d354e0624" -SRC_URI[archive.sha256sum] = "6dcc565006d6e8c2025ae83ab1f82edf6bd04d61c804c0dc9bf5ea50629c4caa" -GNOME_COMPRESS_TYPE="bz2" - -do_configure_append () { - - # this expands to native-pthon which we don't want. - sed -i 's:\@PYTHON\@:/usr/bin/env python:' ${S}/simple-editor/gmenu-simple-editor.in - -} -PACKAGES += "${PN}-python ${PN}-python-staticdev" -FILES_${PN} += "${datadir}/desktop-directories/" -FILES_${PN}-python-staticdev = "${PYTHON_SITEPACKAGES_DIR}/gmenu.a ${PYTHON_SITEPACKAGES_DIR}/gmenu.la" -FILES_${PN}-python = "${PYTHON_SITEPACKAGES_DIR}/gmenu.so ${PYTHON_SITEPACKAGES_DIR}/GMenuSimpleEditor " -FILES_${PN}-dbg += "${PYTHON_SITEPACKAGES_DIR}/*/.debug \ - ${PYTHON_SITEPACKAGES_DIR}/.debug" - -# http://errors.yoctoproject.org/Errors/Details/81001/ -PNBLACKLIST[gnome-menus] ?= "BROKEN: fails to build because of python + conflicts with gnome-menu3 - the recipe will be removed on 2017-09-01 unless the issue is fixed" diff --git a/meta-gnome/recipes-gnome/gnome-panel/gnome-panel/0001-Add-gnome-doc-utils.make.patch b/meta-gnome/recipes-gnome/gnome-panel/gnome-panel/0001-Add-gnome-doc-utils.make.patch deleted file mode 100644 index fdcccb9d73..0000000000 --- a/meta-gnome/recipes-gnome/gnome-panel/gnome-panel/0001-Add-gnome-doc-utils.make.patch +++ /dev/null @@ -1,730 +0,0 @@ -From 7345730ac882ee5a493254e5cf9162c96c648ef2 Mon Sep 17 00:00:00 2001 -From: Alexander Kanavin <alex.kanavin@gmail.com> -Date: Tue, 17 May 2016 14:40:33 +0300 -Subject: [PATCH] Add gnome-doc-utils.make - -Since the sources are taken from git, the file is absent -(and is installed by tools from gnome-doc-utils which -are no longer provided). - -Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> ---- - gnome-doc-utils.make | 706 +++++++++++++++++++++++++++++++++++++++++++++++++++ - 1 file changed, 706 insertions(+) - create mode 100644 gnome-doc-utils.make - -diff --git a/gnome-doc-utils.make b/gnome-doc-utils.make -new file mode 100644 -index 0000000..b2e0fa1 ---- /dev/null -+++ b/gnome-doc-utils.make -@@ -0,0 +1,706 @@ -+# gnome-doc-utils.make - make magic for building documentation -+# Copyright (C) 2004-2005 Shaun McCance <shaunm@gnome.org> -+# -+# This program is free software; you can redistribute it and/or modify -+# it under the terms of the GNU General Public License as published by -+# the Free Software Foundation; either version 2 of the License, or -+# (at your option) any later version. -+# -+# This program is distributed in the hope that it will be useful, -+# but WITHOUT ANY WARRANTY; without even the implied warranty of -+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+# GNU General Public License for more details. -+# -+# You should have received a copy of the GNU General Public License -+# along with this program; if not, write to the Free Software Foundation, -+# Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -+# -+# As a special exception to the GNU General Public License, if you -+# distribute this file as part of a program that contains a -+# configuration script generated by Autoconf, you may include it under -+# the same distribution terms that you use for the rest of that program. -+ -+################################################################################ -+## @@ Generating Header Files -+ -+## @ DOC_H_FILE -+## The name of the header file to generate -+DOC_H_FILE ?= -+ -+## @ DOC_H_DOCS -+## The input DocBook files for generating the header file -+DOC_H_DOCS ?= -+ -+$(DOC_H_FILE): $(DOC_H_DOCS); -+ @rm -f $@.tmp; touch $@.tmp; -+ echo 'const gchar* documentation_credits[] = {' >> $@.tmp -+ list='$(DOC_H_DOCS)'; for doc in $$list; do \ -+ xmlpath="`echo $$doc | sed -e 's/^\(.*\/\).*/\1/' -e '/\//!s/.*//'`:$(srcdir)/`echo $$doc | sed -e 's/^\(.*\/\).*/\1/' -e '/\//!s/.*//'`"; \ -+ if ! test -f "$$doc"; then doc="$(srcdir)/$$doc"; fi; \ -+ xsltproc -nonet --path "$$xmlpath" $(_credits) $$doc; \ -+ done | sort | uniq \ -+ | awk 'BEGIN{s=""}{n=split($$0,w,"<");if(s!=""&&s!=substr(w[1],1,length(w[1])-1)){print s};if(n>1){print $$0;s=""}else{s=$$0}};END{if(s!=""){print s}}' \ -+ | sed -e 's/\\/\\\\/' -e 's/"/\\"/' -e 's/\(.*\)/\t"\1",/' >> $@.tmp -+ echo ' NULL' >> $@.tmp -+ echo '};' >> $@.tmp -+ echo >> $@.tmp -+ list='$(DOC_H_DOCS)'; for doc in $$list; do \ -+ xmlpath="`echo $$doc | sed -e 's/^\(.*\/\).*/\1/' -e '/\//!s/.*//'`:$(srcdir)/`echo $$doc | sed -e 's/^\(.*\/\).*/\1/' -e '/\//!s/.*//'`"; \ -+ if ! test -f "$$doc"; then doc="$(srcdir)/$$doc"; fi; \ -+ docid=`echo "$$doc" | sed -e 's/.*\/\([^/]*\)\.xml/\1/' \ -+ | sed -e 's/[^a-zA-Z_]/_/g' | tr 'a-z' 'A-Z'`; \ -+ echo $$xmlpath; \ -+ ids=`xsltproc -nonet --xinclude --path "$$xmlpath" $(_ids) $$doc`; \ -+ for id in $$ids; do \ -+ echo '#define HELP_'`echo $$docid`'_'`echo $$id \ -+ | sed -e 's/[^a-zA-Z_]/_/g' | tr 'a-z' 'A-Z'`' "'$$id'"' >> $@.tmp; \ -+ done; \ -+ echo >> $@.tmp; \ -+ done; -+ cp $@.tmp $@ && rm -f $@.tmp -+ -+dist-check-gdu: -+if !HAVE_GNOME_DOC_UTILS -+ @echo "*** GNOME Doc Utils must be installed in order to make dist" -+ @false -+endif -+ -+.PHONY: dist-doc-header -+dist-doc-header: $(DOC_H_FILE) -+ @if test -f "$(DOC_H_FILE)"; then d=; else d="$(srcdir)/"; fi; \ -+ echo "$(INSTALL_DATA) $${d}$(DOC_H_FILE) $(distdir)/$(DOC_H_FILE)"; \ -+ $(INSTALL_DATA) "$${d}$(DOC_H_FILE)" "$(distdir)/$(DOC_H_FILE)"; -+ -+doc-dist-hook: dist-check-gdu $(if $(DOC_H_FILE),dist-doc-header) -+ -+.PHONY: clean-doc-header -+_clean_doc_header = $(if $(DOC_H_FILE),clean-doc-header) -+clean-local: $(_clean_doc_header) -+distclean-local: $(_clean_doc_header) -+mostlyclean-local: $(_clean_doc_header) -+maintainer-clean-local: $(_clean_doc_header) -+clean-doc-header: -+ rm -f $(DOC_H_FILE) -+ -+all: $(DOC_H_FILE) -+ -+ -+################################################################################ -+## @@ Generating Documentation Files -+ -+## @ DOC_MODULE -+## The name of the document being built -+DOC_MODULE ?= -+ -+## @ DOC_ID -+## The unique identifier for a Mallard document -+DOC_ID ?= -+ -+## @ DOC_PAGES -+## Page files in a Mallard document -+DOC_PAGES ?= -+ -+## @ DOC_ENTITIES -+## Files included with a SYSTEM entity -+DOC_ENTITIES ?= -+ -+## @ DOC_INCLUDES -+## Files included with XInclude -+DOC_INCLUDES ?= -+ -+## @ DOC_FIGURES -+## Figures and other external data -+DOC_FIGURES ?= -+ -+## @ DOC_FORMATS -+## The default formats to be built and installed -+DOC_FORMATS ?= docbook -+_DOC_REAL_FORMATS = $(if $(DOC_USER_FORMATS),$(DOC_USER_FORMATS),$(DOC_FORMATS)) -+ -+## @ DOC_LINGUAS -+## The languages this document is translated into -+DOC_LINGUAS ?= -+_DOC_REAL_LINGUAS = $(if $(filter environment,$(origin LINGUAS)), \ -+ $(filter $(LINGUAS),$(DOC_LINGUAS)), \ -+ $(DOC_LINGUAS)) -+ -+_DOC_ABS_SRCDIR = @abs_srcdir@ -+ -+ -+################################################################################ -+## Variables for Bootstrapping -+ -+_xml2po ?= `which xml2po` -+_xml2po_mode = $(if $(DOC_ID),mallard,docbook) -+ -+_db2html ?= ${PKG_CONFIG_SYSROOT_DIR}`$(PKG_CONFIG) --variable db2html gnome-doc-utils` -+_db2omf ?= ${PKG_CONFIG_SYSROOT_DIR}`$(PKG_CONFIG) --variable db2omf gnome-doc-utils` -+_chunks ?= ${PKG_CONFIG_SYSROOT_DIR}`$(PKG_CONFIG) --variable xmldir gnome-doc-utils`/gnome/xslt/docbook/utils/chunks.xsl -+_credits ?= ${PKG_CONFIG_SYSROOT_DIR}`$(PKG_CONFIG) --variable xmldir gnome-doc-utils`/gnome/xslt/docbook/utils/credits.xsl -+_ids ?= ${PKG_CONFIG_SYSROOT_DIR}$(shell $(PKG_CONFIG) --variable xmldir gnome-doc-utils)/gnome/xslt/docbook/utils/ids.xsl -+ -+if ENABLE_SK -+_ENABLE_SK = true -+_skpkgdatadir ?= `scrollkeeper-config --pkgdatadir` -+_sklocalstatedir ?= `scrollkeeper-config --pkglocalstatedir` -+_skcontentslist ?= $(_skpkgdatadir)/Templates/C/scrollkeeper_cl.xml -+endif -+ -+ -+################################################################################ -+## Support for automake silent-rules -+GDU_V_XML2PO=$(GDU__v_XML2PO_$(V)) -+GDU__v_XML2PO_=$(GDU__v_XML2PO_$(AM_DEFAULT_VERBOSITY)) -+GDU__v_XML2PO_0=@echo " XML2PO" $@; -+ -+GDU_V_MSGFMT=$(GDU__v_MSGFMT_$(V)) -+GDU__v_MSGFMT_=$(GDU__v_MSGFMT_$(AM_DEFAULT_VERBOSITY)) -+GDU__v_MSGFMT_0=@echo " MSGFMT" $@; -+ -+GDU_V_DB2OMF=$(GDU__v_DB2OMF_$(V)) -+GDU__v_DB2OMF_=$(GDU__v_DB2OMF_$(AM_DEFAULT_VERBOSITY)) -+GDU__v_DB2OMF_0=@echo " DB2OMF" $@; -+ -+GDU_V_DB2HTM=$(GDU__v_DB2HTM_$(V)) -+GDU__v_DB2HTM_=$(GDU__v_DB2HTM_$(AM_DEFAULT_VERBOSITY)) -+GDU__v_DB2HTM_0=@echo " DB2HTM" $@; -+ -+################################################################################ -+## @@ Rules for OMF Files -+ -+db2omf_args = \ -+ --stringparam db2omf.basename $(DOC_MODULE) \ -+ --stringparam db2omf.format $(3) \ -+ --stringparam db2omf.dtd \ -+ $(shell xmllint --format $(2) | grep -h PUBLIC | head -n 1 \ -+ | sed -e 's/.*PUBLIC \(\"[^\"]*\"\).*/\1/') \ -+ --stringparam db2omf.lang $(notdir $(patsubst %/$(notdir $(2)),%,$(2))) \ -+ --stringparam db2omf.omf_dir "$(OMF_DIR)" \ -+ --stringparam db2omf.help_dir "$(HELP_DIR)" \ -+ --stringparam db2omf.omf_in "$(_DOC_OMF_IN)" \ -+ $(if $(_ENABLE_SK), \ -+ --stringparam db2omf.scrollkeeper_cl "$(_skcontentslist)") \ -+ $(_db2omf) $(2) -+ -+## @ _DOC_OMF_IN -+## The OMF input file -+_DOC_OMF_IN = $(if $(DOC_MODULE),$(wildcard $(_DOC_ABS_SRCDIR)/$(DOC_MODULE).omf.in)) -+ -+## @ _DOC_OMF_DB -+## The OMF files for DocBook output -+_DOC_OMF_DB = $(if $(_DOC_OMF_IN), \ -+ $(foreach lc,C $(_DOC_REAL_LINGUAS),$(DOC_MODULE)-$(lc).omf)) -+ -+$(_DOC_OMF_DB) : $(_DOC_OMF_IN) -+$(_DOC_OMF_DB) : $(DOC_MODULE)-%.omf : %/$(DOC_MODULE).xml -+ @test "x$(_ENABLE_SK)" != "xtrue" -o -f "$(_skcontentslist)" || { \ -+ echo "The file '$(_skcontentslist)' does not exist." >&2; \ -+ echo "Please check your ScrollKeeper installation." >&2; \ -+ exit 1; } -+ $(GDU_V_DB2OMF)xsltproc -nonet -o $@ $(call db2omf_args,$@,$<,'docbook') || { rm -f "$@"; exit 1; } -+ -+## @ _DOC_OMF_HTML -+## The OMF files for HTML output -+_DOC_OMF_HTML = $(if $(_DOC_OMF_IN), \ -+ $(foreach lc,C $(_DOC_REAL_LINGUAS),$(DOC_MODULE)-html-$(lc).omf)) -+ -+$(_DOC_OMF_HTML) : $(_DOC_OMF_IN) -+$(_DOC_OMF_HTML) : $(DOC_MODULE)-html-%.omf : %/$(DOC_MODULE).xml -+if ENABLE_SK -+ @test "x$(_ENABLE_SK)" != "xtrue" -o -f "$(_skcontentslist)" || { \ -+ echo "The file '$(_skcontentslist)' does not exist" >&2; \ -+ echo "Please check your ScrollKeeper installation." >&2; \ -+ exit 1; } -+endif -+ $(GDU_V_DB2OMF)xsltproc -nonet -o $@ $(call db2omf_args,$@,$<,'xhtml') || { rm -f "$@"; exit 1; } -+ -+## @ _DOC_OMF_ALL -+## All OMF output files to be built -+# FIXME -+_DOC_OMF_ALL = \ -+ $(if $(filter docbook,$(_DOC_REAL_FORMATS)),$(_DOC_OMF_DB)) \ -+ $(if $(filter html HTML,$(_DOC_REAL_FORMATS)),$(_DOC_OMF_HTML)) -+ -+.PHONY: omf -+omf: $(_DOC_OMF_ALL) -+ -+ -+################################################################################ -+## @@ C Locale Documents -+ -+## @ _DOC_C_MODULE -+## The top-level documentation file in the C locale -+_DOC_C_MODULE = $(if $(DOC_MODULE),C/$(DOC_MODULE).xml) -+ -+## @ _DOC_C_PAGES -+## Page files in a Mallard document in the C locale -+_DOC_C_PAGES = $(foreach page,$(DOC_PAGES),C/$(page)) -+ -+## @ _DOC_C_ENTITIES -+## Files included with a SYSTEM entity in the C locale -+_DOC_C_ENTITIES = $(foreach ent,$(DOC_ENTITIES),C/$(ent)) -+ -+## @ _DOC_C_XINCLUDES -+## Files included with XInclude in the C locale -+_DOC_C_INCLUDES = $(foreach inc,$(DOC_INCLUDES),C/$(inc)) -+ -+## @ _DOC_C_DOCS -+## All documentation files in the C locale -+_DOC_C_DOCS = \ -+ $(_DOC_C_ENTITIES) $(_DOC_C_INCLUDES) \ -+ $(_DOC_C_PAGES) $(_DOC_C_MODULE) -+ -+## @ _DOC_C_DOCS_NOENT -+## All documentation files in the C locale, -+## except files included with a SYSTEM entity -+_DOC_C_DOCS_NOENT = \ -+ $(_DOC_C_MODULE) $(_DOC_C_INCLUDES) \ -+ $(_DOC_C_PAGES) -+ -+## @ _DOC_C_FIGURES -+## All figures and other external data in the C locale -+_DOC_C_FIGURES = $(if $(DOC_FIGURES), \ -+ $(foreach fig,$(DOC_FIGURES),C/$(fig)), \ -+ $(patsubst $(srcdir)/%,%,$(wildcard $(srcdir)/C/figures/*.png))) -+ -+## @ _DOC_C_HTML -+## All HTML documentation in the C locale -+# FIXME: probably have to shell escape to determine the file names -+_DOC_C_HTML = $(foreach f, \ -+ $(shell xsltproc -nonet --xinclude \ -+ --stringparam db.chunk.basename "$(DOC_MODULE)" \ -+ $(_chunks) "C/$(DOC_MODULE).xml"), \ -+ C/$(f).xhtml) -+ -+############################################################################### -+## @@ Other Locale Documentation -+ -+## @ _DOC_POFILES -+## The .po files used for translating the document -+_DOC_POFILES = $(if $(DOC_MODULE)$(DOC_ID), \ -+ $(foreach lc,$(_DOC_REAL_LINGUAS),$(lc)/$(lc).po)) -+ -+.PHONY: po -+po: $(_DOC_POFILES) -+ -+## @ _DOC_MOFILES -+## The .mo files used for translating the document -+_DOC_MOFILES = $(patsubst %.po,%.mo,$(_DOC_POFILES)) -+ -+.PHONY: mo -+mo: $(_DOC_MOFILES) -+ -+## @ _DOC_LC_MODULES -+## The top-level documentation files in all other locales -+_DOC_LC_MODULES = $(if $(DOC_MODULE), \ -+ $(foreach lc,$(_DOC_REAL_LINGUAS),$(lc)/$(DOC_MODULE).xml)) -+ -+## @ _DOC_LC_PAGES -+## Page files in a Mallard document in all other locales -+_DOC_LC_PAGES = \ -+ $(foreach lc,$(_DOC_REAL_LINGUAS),$(foreach page,$(_DOC_C_PAGES), \ -+ $(lc)/$(notdir $(page)) )) -+ -+## @ _DOC_LC_XINCLUDES -+## Files included with XInclude in all other locales -+_DOC_LC_INCLUDES = \ -+ $(foreach lc,$(_DOC_REAL_LINGUAS),$(foreach inc,$(_DOC_C_INCLUDES), \ -+ $(lc)/$(notdir $(inc)) )) -+ -+## @ _DOC_LC_HTML -+## All HTML documentation in all other locales -+# FIXME: probably have to shell escape to determine the file names -+_DOC_LC_HTML = \ -+ $(foreach lc,$(_DOC_REAL_LINGUAS),$(foreach doc,$(_DOC_C_HTML), \ -+ $(lc)/$(notdir $(doc)) )) -+ -+## @ _DOC_LC_DOCS -+## All documentation files in all other locales -+_DOC_LC_DOCS = \ -+ $(_DOC_LC_MODULES) $(_DOC_LC_INCLUDES) $(_DOC_LC_PAGES) \ -+ $(if $(filter html HTML,$(_DOC_REAL_FORMATS)),$(_DOC_LC_HTML)) -+ -+## @ _DOC_LC_FIGURES -+## All figures and other external data in all other locales -+_DOC_LC_FIGURES = $(foreach lc,$(_DOC_REAL_LINGUAS), \ -+ $(patsubst C/%,$(lc)/%,$(_DOC_C_FIGURES)) ) -+ -+_DOC_SRC_FIGURES = \ -+ $(foreach fig,$(_DOC_C_FIGURES), $(foreach lc,C $(_DOC_REAL_LINGUAS), \ -+ $(wildcard $(srcdir)/$(lc)/$(patsubst C/%,%,$(fig))) )) -+ -+$(_DOC_POFILES): -+ @if ! test -d $(dir $@); then \ -+ echo "mkdir $(dir $@)"; \ -+ mkdir "$(dir $@)"; \ -+ fi -+ @if test ! -f $@ -a -f $(srcdir)/$@; then \ -+ echo "cp $(srcdir)/$@ $@"; \ -+ cp "$(srcdir)/$@" "$@"; \ -+ fi; -+ @docs=; \ -+ list='$(_DOC_C_DOCS_NOENT)'; for doc in $$list; do \ -+ docs="$$docs $(_DOC_ABS_SRCDIR)/$$doc"; \ -+ done; \ -+ if ! test -f $@; then \ -+ echo "(cd $(dir $@) && \ -+ $(_xml2po) -m $(_xml2po_mode) -e $$docs > $(notdir $@).tmp && \ -+ cp $(notdir $@).tmp $(notdir $@) && rm -f $(notdir $@).tmp)"; \ -+ (cd $(dir $@) && \ -+ $(_xml2po) -m $(_xml2po_mode) -e $$docs > $(notdir $@).tmp && \ -+ cp $(notdir $@).tmp $(notdir $@) && rm -f $(notdir $@).tmp); \ -+ else \ -+ echo "(cd $(dir $@) && \ -+ $(_xml2po) -m $(_xml2po_mode) -e -u $(notdir $@) $$docs)"; \ -+ (cd $(dir $@) && \ -+ $(_xml2po) -m $(_xml2po_mode) -e -u $(notdir $@) $$docs); \ -+ fi -+ -+$(_DOC_MOFILES): %.mo: %.po -+ $(AM_V_at)if ! test -d $(dir $@); then mkdir "$(dir $@)"; fi -+ $(GDU_V_MSGFMT)msgfmt -o $@ $< -+ -+# FIXME: fix the dependancy -+# FIXME: hook xml2po up -+$(_DOC_LC_DOCS) : $(_DOC_MOFILES) -+$(_DOC_LC_DOCS) : $(_DOC_C_DOCS) -+ $(AM_V_at)if ! test -d $(dir $@); then mkdir $(dir $@); fi -+ $(GDU_V_XML2PO)if [ -f "C/$(notdir $@)" ]; then d="../"; else d="$(_DOC_ABS_SRCDIR)/"; fi; \ -+ mo="$(dir $@)$(patsubst %/$(notdir $@),%,$@).mo"; \ -+ if [ -f "$${mo}" ]; then mo="../$${mo}"; else mo="$(_DOC_ABS_SRCDIR)/$${mo}"; fi; \ -+ (cd $(dir $@) && \ -+ $(_xml2po) -m $(_xml2po_mode) -e -t "$${mo}" \ -+ "$${d}C/$(notdir $@)" > $(notdir $@).tmp && \ -+ cp $(notdir $@).tmp $(notdir $@) && rm -f $(notdir $@).tmp) -+ -+## @ _DOC_POT -+## A pot file -+_DOC_POT = $(if $(DOC_MODULE),$(DOC_MODULE).pot,$(if $(DOC_ID),$(DOC_ID).pot)) -+.PHONY: pot -+pot: $(_DOC_POT) -+$(_DOC_POT): $(_DOC_C_DOCS_NOENT) -+ $(GDU_V_XML2PO)$(_xml2po) -m $(_xml2po_mode) -e -o $@ $^ -+ -+ -+################################################################################ -+## @@ All Documentation -+ -+## @ _DOC_HTML_ALL -+## All HTML documentation, only if it's built -+_DOC_HTML_ALL = $(if $(filter html HTML,$(_DOC_REAL_FORMATS)), \ -+ $(_DOC_C_HTML) $(_DOC_LC_HTML)) -+ -+_DOC_HTML_TOPS = $(foreach lc,C $(_DOC_REAL_LINGUAS),$(lc)/$(DOC_MODULE).xhtml) -+ -+$(_DOC_HTML_TOPS): $(_DOC_C_DOCS) $(_DOC_LC_DOCS) -+ $(GDU_V_DB2HTM)xsltproc -nonet -o $@ --xinclude --param db.chunk.chunk_top "false()" --stringparam db.chunk.basename "$(DOC_MODULE)" --stringparam db.chunk.extension ".xhtml" $(_db2html) $(patsubst %.xhtml,%.xml,$@) -+ -+ -+################################################################################ -+## All -+ -+all: \ -+ $(_DOC_C_DOCS) $(_DOC_LC_DOCS) \ -+ $(_DOC_OMF_ALL) $(_DOC_DSK_ALL) \ -+ $(_DOC_HTML_ALL) $(_DOC_POFILES) -+ -+ -+################################################################################ -+## Clean -+ -+.PHONY: clean-doc-omf clean-doc-dsk clean-doc-lc clean-doc-dir -+ -+clean-doc-omf: ; rm -f $(_DOC_OMF_DB) $(_DOC_OMF_HTML) -+clean-doc-dsk: ; rm -f $(_DOC_DSK_DB) $(_DOC_DSK_HTML) -+clean-doc-lc: -+ rm -f $(_DOC_LC_DOCS) -+ rm -f $(_DOC_MOFILES) -+ @list='$(_DOC_POFILES)'; for po in $$list; do \ -+ if ! test "$$po" -ef "$(srcdir)/$$po"; then \ -+ echo "rm -f $$po"; \ -+ rm -f "$$po"; \ -+ fi; \ -+ done -+# .xml2.po.mo cleaning is obsolete as of 0.18.1 and could be removed in 0.20.x -+ @for lc in C $(_DOC_REAL_LINGUAS); do \ -+ if test -f "$$lc/.xml2po.mo"; then \ -+ echo "rm -f $$lc/.xml2po.mo"; \ -+ rm -f "$$lc/.xml2po.mo"; \ -+ fi; \ -+ done -+clean-doc-dir: clean-doc-lc -+ @for lc in C $(_DOC_REAL_LINGUAS); do \ -+ for dir in `find $$lc -depth -type d`; do \ -+ if ! test $$dir -ef $(srcdir)/$$dir; then \ -+ echo "rmdir $$dir"; \ -+ rmdir "$$dir"; \ -+ fi; \ -+ done; \ -+ done -+ -+_clean_omf = $(if $(_DOC_OMF_IN),clean-doc-omf) -+_clean_dsk = $(if $(_DOC_DSK_IN),clean-doc-dsk) -+_clean_lc = $(if $(_DOC_REAL_LINGUAS),clean-doc-lc) -+_clean_dir = $(if $(DOC_MODULE)$(DOC_ID),clean-doc-dir) -+ -+clean-local: \ -+ $(_clean_omf) $(_clean_dsk) \ -+ $(_clean_lc) $(_clean_dir) -+distclean-local: \ -+ $(_clean_omf) $(_clean_dsk) \ -+ $(_clean_lc) $(_clean_dir) -+mostlyclean-local: \ -+ $(_clean_omf) $(_clean_dsk) \ -+ $(_clean_lc) $(_clean_dir) -+maintainer-clean-local: \ -+ $(_clean_omf) $(_clean_dsk) \ -+ $(_clean_lc) $(_clean_dir) -+ -+ -+ -+################################################################################ -+## Dist -+ -+.PHONY: dist-doc-docs dist-doc-pages dist-doc-figs dist-doc-omf dist-doc-dsk -+doc-dist-hook: \ -+ $(if $(DOC_MODULE)$(DOC_ID),dist-doc-docs) \ -+ $(if $(_DOC_C_FIGURES),dist-doc-figs) \ -+ $(if $(_DOC_OMF_IN),dist-doc-omf) -+# $(if $(_DOC_DSK_IN),dist-doc-dsk) -+ -+dist-doc-docs: $(_DOC_C_DOCS) $(_DOC_LC_DOCS) $(_DOC_POFILES) -+ @for lc in C $(_DOC_REAL_LINGUAS); do \ -+ echo " $(mkinstalldirs) $(distdir)/$$lc"; \ -+ $(mkinstalldirs) "$(distdir)/$$lc"; \ -+ done -+ @list='$(_DOC_C_DOCS)'; \ -+ for doc in $$list; do \ -+ if test -f "$$doc"; then d=; else d="$(srcdir)/"; fi; \ -+ docdir=`echo $$doc | sed -e 's/^\(.*\/\).*/\1/' -e '/\//!s/.*//'`; \ -+ if ! test -d "$(distdir)/$$docdir"; then \ -+ echo "$(mkinstalldirs) $(distdir)/$$docdir"; \ -+ $(mkinstalldirs) "$(distdir)/$$docdir"; \ -+ fi; \ -+ echo "$(INSTALL_DATA) $$d$$doc $(distdir)/$$doc"; \ -+ $(INSTALL_DATA) "$$d$$doc" "$(distdir)/$$doc"; \ -+ done -+ @list='$(_DOC_LC_DOCS)'; \ -+ for doc in $$list; do \ -+ if test -f "$$doc"; then d=; else d="$(srcdir)/"; fi; \ -+ docdir=`echo $$doc | sed -e 's/^\(.*\/\).*/\1/' -e '/\//!s/.*//'`; \ -+ if ! test -d "$(distdir)/$$docdir"; then \ -+ echo "$(mkinstalldirs) $(distdir)/$$docdir"; \ -+ $(mkinstalldirs) "$(distdir)/$$docdir"; \ -+ fi; \ -+ echo "$(INSTALL_DATA) $$d$$doc $(distdir)/$$doc"; \ -+ $(INSTALL_DATA) "$$d$$doc" "$(distdir)/$$doc"; \ -+ done -+ @list='$(_DOC_POFILES)'; \ -+ for doc in $$list; do \ -+ if test -f "$$doc"; then d=; else d="$(srcdir)/"; fi; \ -+ docdir=`echo $$doc | sed -e 's/^\(.*\/\).*/\1/' -e '/\//!s/.*//'`; \ -+ if ! test -d "$(distdir)/$$docdir"; then \ -+ echo "$(mkinstalldirs) $(distdir)/$$docdir"; \ -+ $(mkinstalldirs) "$(distdir)/$$docdir"; \ -+ fi; \ -+ echo "$(INSTALL_DATA) $$d$$doc $(distdir)/$$doc"; \ -+ $(INSTALL_DATA) "$$d$$doc" "$(distdir)/$$doc"; \ -+ done -+ -+dist-doc-figs: $(_DOC_SRC_FIGURES) -+ @list='$(_DOC_C_FIGURES) $(_DOC_LC_FIGURES)'; \ -+ for fig in $$list; do \ -+ if test -f "$$fig"; then d=; else d="$(srcdir)/"; fi; \ -+ if test -f "$$d$$fig"; then \ -+ figdir=`echo $$fig | sed -e 's/^\(.*\/\).*/\1/' -e '/\//!s/.*//'`; \ -+ if ! test -d "$(distdir)/$$figdir"; then \ -+ echo "$(mkinstalldirs) $(distdir)/$$figdir"; \ -+ $(mkinstalldirs) "$(distdir)/$$figdir"; \ -+ fi; \ -+ echo "$(INSTALL_DATA) $$d$$fig $(distdir)/$$fig"; \ -+ $(INSTALL_DATA) "$$d$$fig" "$(distdir)/$$fig"; \ -+ fi; \ -+ done; -+ -+dist-doc-omf: -+ @if test -f "$(_DOC_OMF_IN)"; then d=; else d="$(srcdir)/"; fi; \ -+ echo "$(INSTALL_DATA) $$d$(_DOC_OMF_IN) $(distdir)/$(notdir $(_DOC_OMF_IN))"; \ -+ $(INSTALL_DATA) "$$d$(_DOC_OMF_IN)" "$(distdir)/$(notdir $(_DOC_OMF_IN))" -+ -+dist-doc-dsk: -+ @if test -f "$(_DOC_DSK_IN)"; then d=; else d="$(srcdir)/"; fi; \ -+ echo "$(INSTALL_DATA) $$d$(_DOC_DSK_IN) $(distdir)/$(notdir $(_DOC_DSK_IN))"; \ -+ $(INSTALL_DATA) "$$d$(_DOC_DSK_IN)" "$(distdir)/$(notdir $(_DOC_DSK_IN))" -+ -+ -+ -+################################################################################ -+## Check -+ -+.PHONY: check-doc-docs check-doc-omf -+check: \ -+ $(if $(DOC_MODULE),check-doc-docs) \ -+ $(if $(DOC_ID),check-doc-pages) \ -+ $(if $(_DOC_OMF_IN),check-doc-omf) -+ -+check-doc-docs: $(_DOC_C_DOCS) $(_DOC_LC_DOCS) -+ @for lc in C $(_DOC_REAL_LINGUAS); do \ -+ if test -f "$$lc"; \ -+ then d=; \ -+ xmlpath="$$lc"; \ -+ else \ -+ d="$(srcdir)/"; \ -+ xmlpath="$$lc:$(srcdir)/$$lc"; \ -+ fi; \ -+ echo "xmllint --noout --noent --path $$xmlpath --xinclude --postvalid $$d$$lc/$(DOC_MODULE).xml"; \ -+ xmllint --noout --noent --path "$$xmlpath" --xinclude --postvalid "$$d$$lc/$(DOC_MODULE).xml"; \ -+ done -+ -+check-doc-pages: $(_DOC_C_PAGES) $(_DOC_LC_PAGES) -+ for lc in C $(_DOC_REAL_LINGUAS); do \ -+ if test -f "$$lc"; \ -+ then d=; \ -+ xmlpath="$$lc"; \ -+ else \ -+ d="$(srcdir)/"; \ -+ xmlpath="$$lc:$(srcdir)/$$lc"; \ -+ fi; \ -+ for page in $(DOC_PAGES); do \ -+ echo "xmllint --noout --noent --path $$xmlpath --xinclude $$d$$lc/$$page"; \ -+ xmllint --noout --noent --path "$$xmlpath" --xinclude "$$d$$lc/$$page"; \ -+ done; \ -+ done -+ -+check-doc-omf: $(_DOC_OMF_ALL) -+ @list='$(_DOC_OMF_ALL)'; for omf in $$list; do \ -+ echo "xmllint --noout --xinclude --dtdvalid 'http://scrollkeeper.sourceforge.net/dtds/scrollkeeper-omf-1.0/scrollkeeper-omf.dtd' $$omf"; \ -+ xmllint --noout --xinclude --dtdvalid 'http://scrollkeeper.sourceforge.net/dtds/scrollkeeper-omf-1.0/scrollkeeper-omf.dtd' $$omf; \ -+ done -+ -+ -+ -+################################################################################ -+## Install -+ -+.PHONY: install-doc-docs install-doc-html install-doc-figs install-doc-omf install-doc-dsk -+ -+_doc_install_dir = $(if $(DOC_ID),$(DOC_ID),$(DOC_MODULE)) -+ -+install-data-local: \ -+ $(if $(DOC_MODULE)$(DOC_ID),install-doc-docs) \ -+ $(if $(_DOC_HTML_ALL),install-doc-html) \ -+ $(if $(_DOC_C_FIGURES),install-doc-figs) \ -+ $(if $(_DOC_OMF_IN),install-doc-omf) -+# $(if $(_DOC_DSK_IN),install-doc-dsk) -+ -+install-doc-docs: -+ @for lc in C $(_DOC_REAL_LINGUAS); do \ -+ echo "$(mkinstalldirs) $(DESTDIR)$(HELP_DIR)/$(_doc_install_dir)/$$lc"; \ -+ $(mkinstalldirs) $(DESTDIR)$(HELP_DIR)/$(_doc_install_dir)/$$lc; \ -+ done -+ @list='$(_DOC_C_DOCS)'; for doc in $$list; do \ -+ if test -f "$$doc"; then d=; else d="$(srcdir)/"; fi; \ -+ docdir="$$lc/"`echo $$doc | sed -e 's/^\(.*\/\).*/\1/' -e '/\//!s/.*//'`; \ -+ docdir="$(DESTDIR)$(HELP_DIR)/$(_doc_install_dir)/$$docdir"; \ -+ if ! test -d "$$docdir"; then \ -+ echo "$(mkinstalldirs) $$docdir"; \ -+ $(mkinstalldirs) "$$docdir"; \ -+ fi; \ -+ echo "$(INSTALL_DATA) $$d$$doc $(DESTDIR)$(HELP_DIR)/$(_doc_install_dir)/$$doc"; \ -+ $(INSTALL_DATA) $$d$$doc $(DESTDIR)$(HELP_DIR)/$(_doc_install_dir)/$$doc; \ -+ done -+ @list='$(_DOC_LC_DOCS)'; for doc in $$list; do \ -+ if test -f "$$doc"; then d=; else d="$(srcdir)/"; fi; \ -+ docdir="$$lc/"`echo $$doc | sed -e 's/^\(.*\/\).*/\1/' -e '/\//!s/.*//'`; \ -+ docdir="$(DESTDIR)$(HELP_DIR)/$(_doc_install_dir)/$$docdir"; \ -+ if ! test -d "$$docdir"; then \ -+ echo "$(mkinstalldirs) $$docdir"; \ -+ $(mkinstalldirs) "$$docdir"; \ -+ fi; \ -+ echo "$(INSTALL_DATA) $$d$$doc $(DESTDIR)$(HELP_DIR)/$(_doc_install_dir)/$$doc"; \ -+ $(INSTALL_DATA) $$d$$doc $(DESTDIR)$(HELP_DIR)/$(_doc_install_dir)/$$doc; \ -+ done -+ -+install-doc-figs: -+ @list='$(patsubst C/%,%,$(_DOC_C_FIGURES))'; for fig in $$list; do \ -+ for lc in C $(_DOC_REAL_LINGUAS); do \ -+ figsymlink=false; \ -+ if test -f "$$lc/$$fig"; then \ -+ figfile="$$lc/$$fig"; \ -+ elif test -f "$(srcdir)/$$lc/$$fig"; then \ -+ figfile="$(srcdir)/$$lc/$$fig"; \ -+ else \ -+ figsymlink=true; \ -+ fi; \ -+ figdir="$$lc/"`echo $$fig | sed -e 's/^\(.*\/\).*/\1/' -e '/\//!s/.*//'`; \ -+ figdir="$(DESTDIR)$(HELP_DIR)/$(_doc_install_dir)/$$figdir"; \ -+ if ! test -d "$$figdir"; then \ -+ echo "$(mkinstalldirs) $$figdir"; \ -+ $(mkinstalldirs) "$$figdir"; \ -+ fi; \ -+ figbase=`echo $$fig | sed -e 's/^.*\///'`; \ -+ if $$figsymlink; then \ -+ echo "cd $$figdir && $(LN_S) -f ../../C/$$fig $$figbase"; \ -+ ( cd "$$figdir" && $(LN_S) -f "../../C/$$fig" "$$figbase" ); \ -+ else \ -+ echo "$(INSTALL_DATA) $$figfile $$figdir$$figbase"; \ -+ $(INSTALL_DATA) "$$figfile" "$$figdir$$figbase"; \ -+ fi; \ -+ done; \ -+ done -+ -+install-doc-html: -+ echo install-html -+ -+install-doc-omf: -+ $(mkinstalldirs) $(DESTDIR)$(OMF_DIR)/$(_doc_install_dir) -+ @list='$(_DOC_OMF_ALL)'; for omf in $$list; do \ -+ echo "$(INSTALL_DATA) $$omf $(DESTDIR)$(OMF_DIR)/$(_doc_install_dir)/$$omf"; \ -+ $(INSTALL_DATA) $$omf $(DESTDIR)$(OMF_DIR)/$(_doc_install_dir)/$$omf; \ -+ done -+ @if test "x$(_ENABLE_SK)" = "xtrue"; then \ -+ echo "scrollkeeper-update -p $(DESTDIR)$(_sklocalstatedir) -o $(DESTDIR)$(OMF_DIR)/$(_doc_install_dir)"; \ -+ scrollkeeper-update -p "$(DESTDIR)$(_sklocalstatedir)" -o "$(DESTDIR)$(OMF_DIR)/$(_doc_install_dir)"; \ -+ fi; -+ -+install-doc-dsk: -+ echo install-dsk -+ -+ -+ -+################################################################################ -+## Uninstall -+ -+.PHONY: uninstall-doc-docs uninstall-doc-html uninstall-doc-figs uninstall-doc-omf uninstall-doc-dsk -+uninstall-local: \ -+ $(if $(DOC_MODULE)$(DOC_ID),uninstall-doc-docs) \ -+ $(if $(_DOC_HTML_ALL),uninstall-doc-html) \ -+ $(if $(_DOC_C_FIGURES),uninstall-doc-figs) \ -+ $(if $(_DOC_OMF_IN),uninstall-doc-omf) -+# $(if $(_DOC_DSK_IN),uninstall-doc-dsk) -+ -+uninstall-doc-docs: -+ @list='$(_DOC_C_DOCS)'; for doc in $$list; do \ -+ echo " rm -f $(DESTDIR)$(HELP_DIR)/$(_doc_install_dir)/$$doc"; \ -+ rm -f "$(DESTDIR)$(HELP_DIR)/$(_doc_install_dir)/$$doc"; \ -+ done -+ @list='$(_DOC_LC_DOCS)'; for doc in $$list; do \ -+ echo " rm -f $(DESTDIR)$(HELP_DIR)/$(_doc_install_dir)/$$doc"; \ -+ rm -f "$(DESTDIR)$(HELP_DIR)/$(_doc_install_dir)/$$doc"; \ -+ done -+ -+uninstall-doc-figs: -+ @list='$(_DOC_C_FIGURES) $(_DOC_LC_FIGURES)'; for fig in $$list; do \ -+ echo "rm -f $(DESTDIR)$(HELP_DIR)/$(_doc_install_dir)/$$fig"; \ -+ rm -f "$(DESTDIR)$(HELP_DIR)/$(_doc_install_dir)/$$fig"; \ -+ done; -+ -+uninstall-doc-omf: -+ @list='$(_DOC_OMF_ALL)'; for omf in $$list; do \ -+ if test "x$(_ENABLE_SK)" = "xtrue"; then \ -+ echo "scrollkeeper-uninstall -p $(_sklocalstatedir) $(DESTDIR)$(OMF_DIR)/$(_doc_install_dir)/$$omf"; \ -+ scrollkeeper-uninstall -p "$(_sklocalstatedir)" "$(DESTDIR)$(OMF_DIR)/$(_doc_install_dir)/$$omf"; \ -+ fi; \ -+ echo "rm -f $(DESTDIR)$(OMF_DIR)/$(_doc_install_dir)/$$omf"; \ -+ rm -f "$(DESTDIR)$(OMF_DIR)/$(_doc_install_dir)/$$omf"; \ -+ done --- -2.8.1 - diff --git a/meta-gnome/recipes-gnome/gnome-panel/gnome-panel/0001-Fix-build-with-gcc-5.patch b/meta-gnome/recipes-gnome/gnome-panel/gnome-panel/0001-Fix-build-with-gcc-5.patch deleted file mode 100644 index 6b7fc5bec5..0000000000 --- a/meta-gnome/recipes-gnome/gnome-panel/gnome-panel/0001-Fix-build-with-gcc-5.patch +++ /dev/null @@ -1,35 +0,0 @@ -From 20810fcf329c6e0b48b8e7602565ccc70c7ce62b Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Sun, 10 May 2015 02:10:59 -0700 -Subject: [PATCH] Fix build with gcc 5 - -cc1: error: ../../gnome-panel/libpanel-applets-private: No such file or -directory [-Werror=missing-include-dirs] -cc1: error: ../../gnome-panel/libpanel-applets-private: No such file or -directory [-Werror=missing-include-dirs] -cc1: error: ../../gnome-panel/libpanel-applets-private: No such file or -directory [-Werror=missing-include-dirs] -cc1: some warnings being treated as errors - -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- -Upstream-Status: Pending - - gnome-panel/libpanel-applet-private/Makefile.am | 1 - - 1 file changed, 1 deletion(-) - -diff --git a/gnome-panel/libpanel-applet-private/Makefile.am b/gnome-panel/libpanel-applet-private/Makefile.am -index f12dee8..d556f12 100644 ---- a/gnome-panel/libpanel-applet-private/Makefile.am -+++ b/gnome-panel/libpanel-applet-private/Makefile.am -@@ -8,7 +8,6 @@ AM_CPPFLAGS = \ - -I$(srcdir) \ - -I$(top_srcdir)/gnome-panel \ - -I$(top_builddir)/gnome-panel \ -- -I$(top_builddir)/gnome-panel/libpanel-applets-private \ - -I$(top_builddir)/gnome-panel/libpanel-util \ - -DDATADIR=\""$(datadir)"\" \ - -DPANEL_APPLETS_DIR=\"$(appletsdir)\" \ --- -2.1.4 - diff --git a/meta-gnome/recipes-gnome/gnome-panel/gnome-panel/as-needed.patch b/meta-gnome/recipes-gnome/gnome-panel/gnome-panel/as-needed.patch deleted file mode 100644 index 378e3e405a..0000000000 --- a/meta-gnome/recipes-gnome/gnome-panel/gnome-panel/as-needed.patch +++ /dev/null @@ -1,36 +0,0 @@ -From c65f1ae3472cfd4cd96fd376b7bbd95fba5eef0a Mon Sep 17 00:00:00 2001 -From: Vincent Untz <vuntz@gnome.org> -Date: Fri, 27 May 2011 17:00:14 +0000 -Subject: build: Fix build with --as-needed - -upstream-status: backport - ---- -diff --git a/applets/notification_area/Makefile.am b/applets/notification_area/Makefile.am -index 0afc6c5..9734536 100644 ---- a/applets/notification_area/Makefile.am -+++ b/applets/notification_area/Makefile.am -@@ -29,17 +29,17 @@ libtray_la_SOURCES = \ - NOTIFICATION_AREA_SOURCES = main.c main.h - - NOTIFICATION_AREA_LDADD = \ -+ libtray.la \ - ../../libpanel-applet/libpanel-applet-4.la \ - $(X_LIBS) \ - $(NOTIFICATION_AREA_LIBS) \ -- $(LIBPANEL_APPLET_LIBS) \ -- libtray.la -+ $(LIBPANEL_APPLET_LIBS) - - testtray_SOURCES = testtray.c - testtray_LDADD = \ -+ libtray.la \ - $(X_LIBS) \ -- $(NOTIFICATION_AREA_LIBS) \ -- libtray.la -+ $(NOTIFICATION_AREA_LIBS) - - if NOTIFICATION_AREA_INPROCESS - APPLET_IN_PROCESS = true --- -cgit v0.9 diff --git a/meta-gnome/recipes-gnome/gnome-panel/gnome-panel/idl-sysroot.patch b/meta-gnome/recipes-gnome/gnome-panel/gnome-panel/idl-sysroot.patch deleted file mode 100644 index de4cd8486c..0000000000 --- a/meta-gnome/recipes-gnome/gnome-panel/gnome-panel/idl-sysroot.patch +++ /dev/null @@ -1,22 +0,0 @@ ---- /tmp/Makefile.am 2009-10-26 16:53:20.000000000 +0100 -+++ gnome-panel-2.28.0/gnome-panel/Makefile.am 2009-10-26 16:53:51.000000000 +0100 -@@ -43,7 +43,7 @@ - $(NULL) - - $(CORBA_SRCLIST): $(top_srcdir)/idl/GNOME_Panel.idl $(ORBIT_IDL) -- $(AM_V_GEN)$(ORBIT_IDL) -I $(BONOBO_IDLDIR) -I $(BONOBO_ACT_IDLDIR) $(top_srcdir)/idl/GNOME_Panel.idl -+ $(AM_V_GEN)$(ORBIT_IDL) -I $(SYSROOT)$(BONOBO_IDLDIR) -I $(SYSROOT)$(BONOBO_ACT_IDLDIR) $(top_srcdir)/idl/GNOME_Panel.idl - - BUILT_SOURCES = \ - $(CORBA_SRCLIST) \ ---- /tmp/Makefile.am 2009-10-26 16:54:17.000000000 +0100 -+++ gnome-panel-2.28.0/libpanel-applet/Makefile.am 2009-10-26 16:54:34.000000000 +0100 -@@ -45,7 +45,7 @@ - GNOME_Panel.h - - $(CORBA_SRCLIST): $(top_srcdir)/idl/GNOME_Panel.idl $(ORBIT_IDL) -- $(AM_V_GEN)$(ORBIT_IDL) -I $(BONOBO_IDLDIR) -I $(BONOBO_ACT_IDLDIR) $(top_srcdir)/idl/GNOME_Panel.idl -+ $(AM_V_GEN)$(ORBIT_IDL) -I $(SYSROOT)$(BONOBO_IDLDIR) -I $(SYSROOT)$(BONOBO_ACT_IDLDIR) $(top_srcdir)/idl/GNOME_Panel.idl - - noinst_PROGRAMS = test-bonobo-applet - diff --git a/meta-gnome/recipes-gnome/gnome-panel/gnome-panel3_3.0.2.bb b/meta-gnome/recipes-gnome/gnome-panel/gnome-panel3_3.0.2.bb deleted file mode 100644 index d1cfab8fb9..0000000000 --- a/meta-gnome/recipes-gnome/gnome-panel/gnome-panel3_3.0.2.bb +++ /dev/null @@ -1,51 +0,0 @@ -SUMMARY = "GNOME panel" -LICENSE = "GPLv2 & LGPLv2 & GFDL-1.1" - -BPN = "gnome-panel" -PR = "r1" - -PNBLACKLIST[gnome-panel3] ?= "CONFLICT: depends on libgweather3 which conflicts with libgweather - the recipe will be removed on 2017-09-01 unless the issue is fixed" - -# conflicts with gnome-panel, because they provide the same package -# http://patches.openembedded.org/patch/43105/ -EXCLUDE_FROM_WORLD = "1" -DEFAULT_PREFERENCE = "-1" - -LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ - file://COPYING-DOCS;md5=c9211dab3ae61e580f48432020784324 \ - file://COPYING.LIB;md5=5f30f0716dfdd0d91eb439ebec522ec2" - -SECTION = "x11/gnome" - -DEPENDS = "gnome-doc-utils-native gtk+3 dconf gconf glib-2.0 gnome-desktop3 gtk+ pango libwnck3 gnome-menus cairo libgweather3 dbus-glib librsvg libcanberra" - -inherit gtk-doc gnome gettext pkgconfig - -SRC_URI += "file://as-needed.patch " - -SRC_URI[archive.md5sum] = "0f2f644dc4081b72f6df7a65282af7c6" -SRC_URI[archive.sha256sum] = "25db8ec026c4bf47f0ef5cc7e2712f2aad175bd7fb8e4952ef5f8b200f17f196" - -EXTRA_OECONF = "--disable-scrollkeeper --disable-eds --enable-bonobo=no --with-in-process-applets=none" - -do_configure_prepend() { - gnome-doc-prepare --automake - sed -i -e s:help:: ${S}/Makefile.am -} - -pkg_postinst_${PN}_append () { - gconftool-2 --config-source=xml:readwrite:/etc/gconf/gconf.xml.defaults \ - --direct --load /etc/gconf/schemas/panel-default-setup.entries -} - -PACKAGES =+ "libpanel-applet" -FILES_libpanel-applet = "${libdir}/libpanel-applet-3.so.*" - -FILES_${PN} =+ "${datadir}/gnome* \ - ${datadir}/dbus-1 \ - ${datadir}/icons \ - ${datadir}/PolicyKit \ - ${libdir}/bonobo \ -" - -PNBLACKLIST[gnome-panel3] ?= "Depends on broken gnome-menus - the recipe will be removed on 2017-09-01 unless the issue is fixed" diff --git a/meta-gnome/recipes-gnome/gnome-panel/gnome-panel_2.32.1.bb b/meta-gnome/recipes-gnome/gnome-panel/gnome-panel_2.32.1.bb deleted file mode 100644 index 7cb8b9ddf8..0000000000 --- a/meta-gnome/recipes-gnome/gnome-panel/gnome-panel_2.32.1.bb +++ /dev/null @@ -1,48 +0,0 @@ -SUMMARY = "GNOME panel" -LICENSE = "GPL-2.0 & LGPL-2.0 & GFDL-1.1" - -LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ - file://COPYING-DOCS;md5=c9211dab3ae61e580f48432020784324 \ - file://COPYING.LIB;md5=5f30f0716dfdd0d91eb439ebec522ec2" - -SECTION = "x11/gnome" - -PR = "r7" - -DEPENDS = "gnome-doc-utils gconf glib-2.0 gnome-desktop gtk+ \ - pango libwnck gnome-menus cairo libgweather dbus dbus-glib \ - librsvg libcanberra \ -" -RDEPENDS_${PN} = "python" - -inherit gtk-doc gnome autotools-brokensep gettext pkgconfig gconf gobject-introspection - -SRCREV = "8292bd2b8a36df7eed3c760899400790cde68590" -SRC_URI = "git://git.gnome.org/gnome-panel;branch=gnome-2-32 \ - file://0001-Fix-build-with-gcc-5.patch \ - file://0001-Add-gnome-doc-utils.make.patch \ -" - -S = "${WORKDIR}/git" - -EXTRA_OECONF = "--disable-scrollkeeper --disable-eds --enable-bonobo=no --with-in-process-applets=none" - -PACKAGECONFIG ??= "" -PACKAGECONFIG[networkmanager] = "--enable-network-manager,--disable-network-manager,networkmanager" - -do_configure_prepend() { - sed -i -e s:help:: ${S}/Makefile.am - sed -i -e s:^#!@PYTHON@:#!/usr/bin/python: ${S}/gnome-panel/gnome-panel-add.in -} - -PACKAGES =+ "libpanel-applet" -FILES_libpanel-applet = "${libdir}/libpanel-applet-*.so.*" - -FILES_${PN} =+ "${datadir}/gnome* \ - ${datadir}/dbus-1 \ - ${datadir}/icons \ - ${datadir}/PolicyKit \ - ${libdir}/bonobo \ -" - -PNBLACKLIST[gnome-panel] ?= "Depends on broken libgweather - the recipe will be removed on 2017-09-01 unless the issue is fixed" diff --git a/meta-gnome/recipes-gnome/gnome-power-manager/gnome-power-manager-2.32.0/0001-Makefile.am-don-t-build-help-man.patch b/meta-gnome/recipes-gnome/gnome-power-manager/gnome-power-manager-2.32.0/0001-Makefile.am-don-t-build-help-man.patch deleted file mode 100644 index d6d49bbda6..0000000000 --- a/meta-gnome/recipes-gnome/gnome-power-manager/gnome-power-manager-2.32.0/0001-Makefile.am-don-t-build-help-man.patch +++ /dev/null @@ -1,37 +0,0 @@ -From 3ed15a3c6ae4ab94c7e3af306644bb5d7f3fd1fa Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com> -Date: Mon, 29 Apr 2013 13:08:10 +0200 -Subject: [PATCH] Makefile.am: don't build help/man -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -help crashes with: - -| xsltproc -o gnome-power-manager-C.omf --stringparam db2omf.basename gnome-power-manager --stringparam db2omf.format 'docbook' --stringparam db2omf.dtd "-//OASIS//DTD DocBook XML V4.3//EN" --stringparam db2omf.lang C --stringparam db2omf.omf_dir "/usr/share/omf" --stringparam db2omf.help_dir "/usr/share/gnome/help" --stringparam db2omf.omf_in "/home/jenkins/oe/shr-core-branches/shr-core/tmp-eglibc/work/armv5te-oe-linux-gnueabi/gnome-power-manager/2.32.0-r2/gnome-power-manager-2.32.0/help/gnome-power-manager.omf.in" /home/jenkins/oe/shr-core-branches/shr-core/tmp-eglibc/sysroots/qemuarm`/home/jenkins/oe/shr-core-branches/shr-core/tmp-eglibc/sysroots/x86_64-linux/usr/bin/pkg-config --variable db2omf gnome-doc-utils` C/gnome-power-manager.xml || { rm -f "gnome-power-manager-C.omf"; exit 1; } -| unable to parse fr/gnome-power-manager.xml - -Upstream-Status: Inappropriate [configuration] - -Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com> ---- - Makefile.am | 2 -- - 1 files changed, 0 insertions(+), 2 deletions(-) - -diff --git a/Makefile.am b/Makefile.am -index 005b8a0..5b9e318 100644 ---- a/Makefile.am -+++ b/Makefile.am -@@ -5,9 +5,7 @@ SUBDIRS = \ - src \ - po \ - docs \ -- man \ - data \ -- help \ - policy \ - tools - --- -1.7.6.5 - diff --git a/meta-gnome/recipes-gnome/gnome-power-manager/gnome-power-manager-2.32.0/sysrooted-pkg-config.patch b/meta-gnome/recipes-gnome/gnome-power-manager/gnome-power-manager-2.32.0/sysrooted-pkg-config.patch deleted file mode 100644 index f3db7ab6e2..0000000000 --- a/meta-gnome/recipes-gnome/gnome-power-manager/gnome-power-manager-2.32.0/sysrooted-pkg-config.patch +++ /dev/null @@ -1,35 +0,0 @@ -In cross environment we have to prepend the sysroot to the path found by -pkgconfig since the path returned from pkgconfig does not have sysroot prefixed -it ends up using the files from host system. Now usually people have gnome installed -so the build succeeds but if you dont have gnome installed on build host then -it wont find the files on host system and packages using gnome-doc-utils wont -compile. - -This should work ok with non sysrooted builds too since in those cases PKG_CONFIG_SYSROOT_DIR -will be empty - -Upstream-Status: Pending - -Signed-off-by: Khem Raj <raj.khem@gmail.com> - -Index: gnome-power-manager-2.32.0/gnome-doc-utils.make -=================================================================== ---- gnome-power-manager-2.32.0.orig/gnome-doc-utils.make 2010-01-27 08:28:31.000000000 -0800 -+++ gnome-power-manager-2.32.0/gnome-doc-utils.make 2011-09-25 16:16:04.914813800 -0700 -@@ -124,11 +124,11 @@ - - _xml2po ?= `which xml2po` - --_db2html ?= `$(PKG_CONFIG) --variable db2html gnome-doc-utils` --_db2omf ?= `$(PKG_CONFIG) --variable db2omf gnome-doc-utils` --_chunks ?= `$(PKG_CONFIG) --variable xmldir gnome-doc-utils`/gnome/xslt/docbook/utils/chunks.xsl --_credits ?= `$(PKG_CONFIG) --variable xmldir gnome-doc-utils`/gnome/xslt/docbook/utils/credits.xsl --_ids ?= `$(PKG_CONFIG) --variable xmldir gnome-doc-utils`/gnome/xslt/docbook/utils/ids.xsl -+_db2html ?= ${PKG_CONFIG_SYSROOT_DIR}`$(PKG_CONFIG) --variable db2html gnome-doc-utils` -+_db2omf ?= ${PKG_CONFIG_SYSROOT_DIR}`$(PKG_CONFIG) --variable db2omf gnome-doc-utils` -+_chunks ?= ${PKG_CONFIG_SYSROOT_DIR}`$(PKG_CONFIG) --variable xmldir gnome-doc-utils`/gnome/xslt/docbook/utils/chunks.xsl -+_credits ?= ${PKG_CONFIG_SYSROOT_DIR}`$(PKG_CONFIG) --variable xmldir gnome-doc-utils`/gnome/xslt/docbook/utils/credits.xsl -+_ids ?= ${PKG_CONFIG_SYSROOT_DIR}`$(PKG_CONFIG) --variable xmldir gnome-doc-utils`/gnome/xslt/docbook/utils/ids.xsl - - if ENABLE_SK - _ENABLE_SK = true diff --git a/meta-gnome/recipes-gnome/gnome-power-manager/gnome-power-manager_2.32.0.bb b/meta-gnome/recipes-gnome/gnome-power-manager/gnome-power-manager_2.32.0.bb deleted file mode 100644 index ec2110785d..0000000000 --- a/meta-gnome/recipes-gnome/gnome-power-manager/gnome-power-manager_2.32.0.bb +++ /dev/null @@ -1,54 +0,0 @@ -SUMMARY = "Power management daemon" -LICENSE = "GPLv2" -LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f" - -PR = "r4" - -DEPENDS = "glib-2.0 gtk+ gconf libgnome-keyring dbus dbus-glib libnotify libwnck cairo libunique xrandr virtual/libx11 libxrender libcanberra upower gnome-doc-utils" -RRECOMMENDS_${PN} += "gnome-keyring" - -inherit gnome - -SRC_URI += " \ - file://sysrooted-pkg-config.patch \ - file://0001-Makefile.am-don-t-build-help-man.patch \ -" - -SRC_URI[archive.md5sum] = "9a08e85dce3ffb90775f15e3bda4adda" -SRC_URI[archive.sha256sum] = "17fa301bf7e133285c0e054ae3be2b0f690c48f59b09f67e04d6ed339b330476" -GNOME_COMPRESS_TYPE="bz2" - -EXTRA_OECONF = " --disable-scrollkeeper \ - --disable-applets \ - --x-includes=${STAGING_INCDIR} \ - --x-libraries=${STAGING_LIBDIR} \ - --enable-compile-warnings=no \ - ac_cv_header_X11_extensions_dpms_h=yes \ -" - -do_configure_append() { - # Sigh... --enable-compile-warnings=no doesn't actually turn off -Werror - for i in $(find ${B} -name "Makefile") ; do - sed -i -e s:-Werror::g $i - done - sed -e "s/libtool --/${TARGET_SYS}-libtool --/" -i ${B}/src/Makefile -} - -PACKAGES =+ "${PN}-applets" - -FILES_${PN}-applets = "${bindir}/*applet* \ - ${libdir}/bonobo/servers \ - ${datadir}/gnome-2.0/ui \ -" - -FILES_${PN} += "${datadir}/icons \ - ${datadir}/dbus-1 \ - ${datadir}/gnome/autostart \ -" - -FILES_${PN}-doc += "${datadir}/omf \ - ${datadir}/gnome/help \ -" - -# gnome-power-manager-2.32.0/src/gpm-manager.c:488:18: error: too many arguments to function 'notify_notification_new' -PNBLACKLIST[gnome-power-manager] ?= "BROKEN: not compatible with current libnotify - the recipe will be removed on 2017-09-01 unless the issue is fixed" diff --git a/meta-gnome/recipes-gnome/gnome-session/gnome-session/use_G_GINT64_FORMAT.patch b/meta-gnome/recipes-gnome/gnome-session/gnome-session/use_G_GINT64_FORMAT.patch deleted file mode 100644 index b09f8d200a..0000000000 --- a/meta-gnome/recipes-gnome/gnome-session/gnome-session/use_G_GINT64_FORMAT.patch +++ /dev/null @@ -1,61 +0,0 @@ -This patch fixes the build errors when building gnome-session for 64bit target using gcc 4.8 - -| gs-idle-monitor.c: In function 'handle_alarm_notify_event': -| gs-idle-monitor.c:196:9: error: format '%lld' expects argument of type 'long long int', but argument 5 has type 'gint64' [-Werror=format=] -| g_debug ("Watch %d fired, idle time = %lld", -| ^ -| gs-idle-monitor.c: In function '_xsync_alarm_set': -| gs-idle-monitor.c:453:17: error: format '%lld' expects argument of type 'long long int', but argument 4 has type 'gint64' [-Werror=format=] -| g_debug ("GSIdleMonitor: updating alarm for positive transition wait=%lld", -| ^ -| gs-idle-monitor.c:457:17: error: format '%lld' expects argument of type 'long long int', but argument 4 has type 'gint64' [-Werror=format=] -| g_debug ("GSIdleMonitor: creating new alarm for positive transition wait=%lld", -| ^ -| gs-idle-monitor.c:464:17: error: format '%lld' expects argument of type 'long long int', but argument 4 has type 'gint64' [-Werror=format=] -| g_debug ("GSIdleMonitor: updating alarm for negative transition wait=%lld", -| ^ -| gs-idle-monitor.c:468:17: error: format '%lld' expects argument of type 'long long int', but argument 4 has type 'gint64' [-Werror=format=] - -Upstream-Status: Unknown - -Signed-off-by: Khem Raj <raj.khem@gmail.com> -Index: gnome-session-2.32.1/gnome-session/gs-idle-monitor.c -=================================================================== ---- gnome-session-2.32.1.orig/gnome-session/gs-idle-monitor.c 2010-11-17 03:17:04.000000000 -0800 -+++ gnome-session-2.32.1/gnome-session/gs-idle-monitor.c 2013-06-11 23:33:12.239960082 -0700 -@@ -193,7 +193,7 @@ - return; - } - -- g_debug ("Watch %d fired, idle time = %lld", -+ g_debug ("Watch %d fired, idle time = %" G_GINT64_FORMAT "", - watch->id, - _xsyncvalue_to_int64 (alarm_event->counter_value)); - -@@ -450,22 +450,22 @@ - - attr.trigger.test_type = XSyncPositiveTransition; - if (watch->xalarm_positive != None) { -- g_debug ("GSIdleMonitor: updating alarm for positive transition wait=%lld", -+ g_debug ("GSIdleMonitor: updating alarm for positive transition wait=%" G_GINT64_FORMAT "", - _xsyncvalue_to_int64 (attr.trigger.wait_value)); - XSyncChangeAlarm (GDK_DISPLAY (), watch->xalarm_positive, flags, &attr); - } else { -- g_debug ("GSIdleMonitor: creating new alarm for positive transition wait=%lld", -+ g_debug ("GSIdleMonitor: creating new alarm for positive transition wait=%" G_GINT64_FORMAT "", - _xsyncvalue_to_int64 (attr.trigger.wait_value)); - watch->xalarm_positive = XSyncCreateAlarm (GDK_DISPLAY (), flags, &attr); - } - - attr.trigger.test_type = XSyncNegativeTransition; - if (watch->xalarm_negative != None) { -- g_debug ("GSIdleMonitor: updating alarm for negative transition wait=%lld", -+ g_debug ("GSIdleMonitor: updating alarm for negative transition wait=%" G_GINT64_FORMAT "", - _xsyncvalue_to_int64 (attr.trigger.wait_value)); - XSyncChangeAlarm (GDK_DISPLAY (), watch->xalarm_negative, flags, &attr); - } else { -- g_debug ("GSIdleMonitor: creating new alarm for negative transition wait=%lld", -+ g_debug ("GSIdleMonitor: creating new alarm for negative transition wait=%" G_GINT64_FORMAT "", - _xsyncvalue_to_int64 (attr.trigger.wait_value)); - watch->xalarm_negative = XSyncCreateAlarm (GDK_DISPLAY (), flags, &attr); - } diff --git a/meta-gnome/recipes-gnome/gnome-session/gnome-session_2.32.1.bb b/meta-gnome/recipes-gnome/gnome-session/gnome-session_2.32.1.bb deleted file mode 100644 index c49f2d3fb8..0000000000 --- a/meta-gnome/recipes-gnome/gnome-session/gnome-session_2.32.1.bb +++ /dev/null @@ -1,32 +0,0 @@ -SUMMARY = "Gnome session manager" -LICENSE = "GPLv2" -LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" - -PR = "r3" - -SECTION = "x11/gnome" -DEPENDS = "libxtst gtk+ glib-2.0 upower dbus-glib gconf pango gdk-pixbuf-native startup-notification" - -inherit gnome - -SRC_URI += "file://use_G_GINT64_FORMAT.patch" - -SRC_URI[archive.md5sum] = "222bad6b446cb19a6b9028ea24538002" -SRC_URI[archive.sha256sum] = "22d93ce433fcf9c7ce6b5f36dd81f64e692ea0e41faaa0f61159ddac28c3686a" -GNOME_COMPRESS_TYPE="bz2" - -EXTRA_OECONF = " --with-gtk=2.0 ac_cv_path_GCONF_SANITY_CHECK=set --disable-docbook-docs" - -do_configure_append() { - for i in $(find ${S} -name "Makefile") ; do - sed -i -e s:"GCONFTOOL = .*/usr/bin/gconftool-2":"GCONFTOOL = /usr/bin/gconftool-2":g $i - sed -i -e s:"GCONF_SANITY_CHECK = set":"GCONF_SANITY_CHECK = /usr/libexec/gconf-sanity-check-2":g $i - done -} - -RRECOMMENDS_${PN} += "${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'pam-plugin-ck-connector', '', d)}" -FILES_${PN} += "${datadir}/xsessions ${datadir}/icons ${datadir}/gnome ${libdir}/gnome-session/helpers" -FILES_${PN}-dbg += "${libexecdir}/gnome-session/helpers/.debug" - -# http://errors.yoctoproject.org/Errors/Details/68621/ -PNBLACKLIST[gnome-session] ?= "BROKEN: fails to build with gcc-6 - the recipe will be removed on 2017-09-01 unless the issue is fixed" diff --git a/meta-gnome/recipes-gnome/gnome-settings-daemon/files/0001-Require-libnotify-0.6.0.patch b/meta-gnome/recipes-gnome/gnome-settings-daemon/files/0001-Require-libnotify-0.6.0.patch deleted file mode 100644 index 6dd33f3517..0000000000 --- a/meta-gnome/recipes-gnome/gnome-settings-daemon/files/0001-Require-libnotify-0.6.0.patch +++ /dev/null @@ -1,81 +0,0 @@ -From e1ab570b0dce479ba235e5542ea07d1b5bafc4c9 Mon Sep 17 00:00:00 2001 -From: William Jon McCann <jmccann@redhat.com> -Date: Mon, 11 Oct 2010 23:35:45 -0400 -Subject: [PATCH] Require libnotify 0.6.0 - -Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com> - -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 - diff --git a/meta-gnome/recipes-gnome/gnome-settings-daemon/gnome-settings-daemon_2.32.1.bb b/meta-gnome/recipes-gnome/gnome-settings-daemon/gnome-settings-daemon_2.32.1.bb deleted file mode 100644 index 9a18972409..0000000000 --- a/meta-gnome/recipes-gnome/gnome-settings-daemon/gnome-settings-daemon_2.32.1.bb +++ /dev/null @@ -1,43 +0,0 @@ -SUMMARY = "GNOME settings daemon" -LICENSE = "GPLv2" -LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552" - -PR = "r7" - -DEPENDS = "intltool libxxf86misc libsndfile1 libxtst glib-2.0 polkit gtk+ gconf dbus-glib libnotify libgnomekbd libxklavier gnome-doc-utils gnome-desktop" - -inherit gnome - -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" - -PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'pulseaudio', d)}" -PACKAGECONFIG[pulseaudio] = "--enable-pulse,--disable-pulse,pulseaudio glib-2.0 libcanberra" -PACKAGECONFIG[smartcard] = "--enable-smartcard-support,--disable-smartcard-support,nss" - -EXTRA_OECONF = " \ - --x-includes=${STAGING_INCDIR} \ - --x-libraries=${STAGING_LIBDIR} \ - --enable-polkit \ -" - -do_configure_prepend() { - sed -i -e 's:-L$libdir::g' -e 's:-I$includedir::g' ${S}/configure.ac -} - -FILES_${PN} += "${libdir}/gnome-settings-daemon-2.0/*.so ${libdir}/gnome-settings-daemon-2.0/*plugin \ - ${datadir}/dbus-1/ \ - ${datadir}/icon* \ - ${datadir}/gnome-control-center \ - ${datadir}/xsession*" - -FILES_${PN}-dbg += "${libdir}/gnome-settings-daemon-2.0/.debug" -FILES_${PN}-dev += "${libdir}/gnome-settings-daemon-2.0/*.la" -FILES_${PN}-staticdev += "${libdir}/gnome-settings-daemon-2.0/*.a" - -PNBLACKLIST[gnome-settings-daemon] ?= "Depends on blacklisted gnome-desktop - the recipe will be removed on 2017-09-01 unless the issue is fixed" diff --git a/meta-gnome/recipes-gnome/gnome-system-monitor/files/0001-Fix-glib-includes.patch b/meta-gnome/recipes-gnome/gnome-system-monitor/files/0001-Fix-glib-includes.patch deleted file mode 100644 index ace1b00761..0000000000 --- a/meta-gnome/recipes-gnome/gnome-system-monitor/files/0001-Fix-glib-includes.patch +++ /dev/null @@ -1,101 +0,0 @@ -From 8587e35af52f7773f62361be2e72ddf286a59185 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com> -Date: Tue, 15 May 2012 13:02:02 +0200 -Subject: [PATCH] Fix glib includes -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit -Upstream-Status: unknown - - -Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com> ---- - src/interface.h | 2 +- - src/load-graph.h | 2 +- - src/lsof.h | 2 +- - src/openfiles.h | 2 +- - src/procman_gnomesu.h | 2 +- - src/util.cpp | 2 +- - 6 files changed, 6 insertions(+), 6 deletions(-) - -diff --git a/src/interface.h b/src/interface.h -index 4bda35a..b26b670 100644 ---- a/src/interface.h -+++ b/src/interface.h -@@ -20,7 +20,7 @@ - #ifndef _PROCMAN_INTERFACE_H_ - #define _PROCMAN_INTERFACE_H_ - --#include <glib/gtypes.h> -+#include <glib.h> - #include <gtk/gtk.h> - #include "procman.h" - -diff --git a/src/load-graph.h b/src/load-graph.h -index 6111c78..6e7a599 100644 ---- a/src/load-graph.h -+++ b/src/load-graph.h -@@ -1,7 +1,7 @@ - #ifndef _PROCMAN_LOAD_GRAPH_H_ - #define _PROCMAN_LOAD_GRAPH_H_ - --#include <glib/gtypes.h> -+#include <glib.h> - #include <glibtop/cpu.h> - - enum -diff --git a/src/lsof.h b/src/lsof.h -index ad7f111..da420e2 100644 ---- a/src/lsof.h -+++ b/src/lsof.h -@@ -1,7 +1,7 @@ - #ifndef H_PROCMAN_LSOF_1161179202 - #define H_PROCMAN_LSOF_1161179202 - --#include <glib/gmacros.h> -+#include <glib.h> - #include "procman.h" - - void procman_lsof(ProcData *data); -diff --git a/src/openfiles.h b/src/openfiles.h -index 38b1cc8..a8b7b05 100644 ---- a/src/openfiles.h -+++ b/src/openfiles.h -@@ -1,7 +1,7 @@ - #ifndef _OPENFILES_H_ - #define _OPENFILES_H_ - --#include <glib/gtypes.h> -+#include <glib.h> - - #include "procman.h" - -diff --git a/src/procman_gnomesu.h b/src/procman_gnomesu.h -index fec2650..474ca9a 100644 ---- a/src/procman_gnomesu.h -+++ b/src/procman_gnomesu.h -@@ -1,7 +1,7 @@ - #ifndef H_GNOME_SYSTEM_MONITOR_GNOMESU_H_1132171917 - #define H_GNOME_SYSTEM_MONITOR_GNOMESU_H_1132171917 - --#include <glib/gtypes.h> -+#include <glib.h> - - gboolean - procman_gnomesu_create_root_password_dialog(const char * message); -diff --git a/src/util.cpp b/src/util.cpp -index 9b1c9f5..90073fe 100644 ---- a/src/util.cpp -+++ b/src/util.cpp -@@ -1,7 +1,7 @@ - #include <config.h> - - #include <glib/gi18n.h> --#include <glib/gstring.h> -+#include <glib.h> - #include <gtk/gtk.h> - - #include <glibtop/proctime.h> --- -1.7.6.5 - diff --git a/meta-gnome/recipes-gnome/gnome-system-monitor/files/0002-src-procman.cpp-include-main-gtkmm.h.patch b/meta-gnome/recipes-gnome/gnome-system-monitor/files/0002-src-procman.cpp-include-main-gtkmm.h.patch deleted file mode 100644 index 7b6728102b..0000000000 --- a/meta-gnome/recipes-gnome/gnome-system-monitor/files/0002-src-procman.cpp-include-main-gtkmm.h.patch +++ /dev/null @@ -1,49 +0,0 @@ -From acff719983aa1294148dc4a367c48957f5510eff Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com> -Date: Fri, 17 May 2013 18:25:56 +0200 -Subject: [PATCH] src/procman.cpp: include main gtkmm.h -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -after update of gtkmm build failed with: - -In file included from /home/Superandy/tmp/oe-core-eglibc/sysroots/overo/usr/include/gtkmm-2.4/gtkmm/main.h:33:0, - from procman.cpp:26: -/home/Superandy/tmp/oe-core-eglibc/sysroots/overo/usr/include/gdkmm-2.4/gdkmm/types.h:92:7: error: 'Value' is not a template -/home/Superandy/tmp/oe-core-eglibc/sysroots/overo/usr/include/gdkmm-2.4/gdkmm/types.h:92:54: error: expected template-name before '<' token -/home/Superandy/tmp/oe-core-eglibc/sysroots/overo/usr/include/gdkmm-2.4/gdkmm/types.h:92:54: error: expected '{' before '<' token -/home/Superandy/tmp/oe-core-eglibc/sysroots/overo/usr/include/gdkmm-2.4/gdkmm/types.h:92:54: error: expected unqualified-id before '<' token -/home/Superandy/tmp/oe-core-eglibc/sysroots/overo/usr/include/gdkmm-2.4/gdkmm/types.h:174:7: error: 'Value' is not a template -/home/Superandy/tmp/oe-core-eglibc/sysroots/overo/usr/include/gdkmm-2.4/gdkmm/types.h:174:30: error: 'Glib::Value' is not a template type -/home/Superandy/tmp/oe-core-eglibc/sysroots/overo/usr/include/gdkmm-2.4/gdkmm/types.h:174:58: error: expected template-name before '<' token -/home/Superandy/tmp/oe-core-eglibc/sysroots/overo/usr/include/gdkmm-2.4/gdkmm/types.h:207:7: error: 'Value' is not a template -/home/Superandy/tmp/oe-core-eglibc/sysroots/overo/usr/include/gdkmm-2.4/gdkmm/types.h:207:24: error: 'Glib::Value' is not a template type -/home/Superandy/tmp/oe-core-eglibc/sysroots/overo/usr/include/gdkmm-2.4/gdkmm/types.h:207:51: error: expected template-name before '<' token -/home/Superandy/tmp/oe-core-eglibc/sysroots/overo/usr/include/gdkmm-2.4/gdkmm/types.h:274:7: error: 'Value' is not a template -/home/Superandy/tmp/oe-core-eglibc/sysroots/overo/usr/include/gdkmm-2.4/gdkmm/types.h:274:32: error: 'Glib::Value' is not a template type -<...> - -Upstream-Status: Backport - -Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com> ---- - src/procman.cpp | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -diff --git a/src/procman.cpp b/src/procman.cpp -index b5c0d0a..d9b4b3f 100644 ---- a/src/procman.cpp -+++ b/src/procman.cpp -@@ -23,7 +23,7 @@ - - #include <locale.h> - --#include <gtkmm/main.h> -+#include <gtkmm.h> - #include <giomm/volumemonitor.h> - #include <giomm/init.h> - #include <glib.h> --- -1.7.4.4 - diff --git a/meta-gnome/recipes-gnome/gnome-system-monitor/files/Remove-pkg-config-check-for-gnome-icon-theme.patch b/meta-gnome/recipes-gnome/gnome-system-monitor/files/Remove-pkg-config-check-for-gnome-icon-theme.patch deleted file mode 100644 index 3c5169e788..0000000000 --- a/meta-gnome/recipes-gnome/gnome-system-monitor/files/Remove-pkg-config-check-for-gnome-icon-theme.patch +++ /dev/null @@ -1,30 +0,0 @@ -From 36fd2aa23e712f05f0cce4a1be3453fcf405d026 Mon Sep 17 00:00:00 2001 -From: Jussi Kukkonen <jussi.kukkonen@intel.com> -Date: Tue, 15 Sep 2015 16:28:18 +0300 -Subject: [PATCH] Remove pkg-config check for gnome-icon-theme - -Theme is not required for building, and the icons are provided by -adwaita-icon-theme anyway - -Upstream-Status: Inappropriate [Fixed in current versions] -Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com> ---- - configure.in | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/configure.in b/configure.in -index 3600823..42262f2 100644 ---- a/configure.in -+++ b/configure.in -@@ -37,7 +37,7 @@ LIBXML_REQUIRED=2.0 - RSVG_REQUIRED=2.12 - DBUS_REQUIRED=0.7 - --PKG_CHECK_MODULES(PROCMAN, glib-2.0 >= $GLIB_REQUIRED gconf-2.0 >= $GCONF_REQUIRED libgtop-2.0 >= $LIBGTOP_REQUIRED libwnck-1.0 >= $LIBWNCK_REQUIRED gtk+-2.0 >= $GTK_REQUIRED gnome-icon-theme >= $GNOME_ICON_THEME_REQUIRED gtkmm-2.4 >= $GTKMM_REQUIRED libxml-2.0 >= $LIBXML_REQUIRED librsvg-2.0 >= $RSVG_REQUIRED glibmm-2.4 >= $GLIBMM_REQUIRED giomm-2.4 >= $GIOMM_REQUIRED dbus-glib-1 >= $DBUS_REQUIRED) -+PKG_CHECK_MODULES(PROCMAN, glib-2.0 >= $GLIB_REQUIRED gconf-2.0 >= $GCONF_REQUIRED libgtop-2.0 >= $LIBGTOP_REQUIRED libwnck-1.0 >= $LIBWNCK_REQUIRED gtk+-2.0 >= $GTK_REQUIRED gtkmm-2.4 >= $GTKMM_REQUIRED libxml-2.0 >= $LIBXML_REQUIRED librsvg-2.0 >= $RSVG_REQUIRED glibmm-2.4 >= $GLIBMM_REQUIRED giomm-2.4 >= $GIOMM_REQUIRED dbus-glib-1 >= $DBUS_REQUIRED) - - - AC_ARG_ENABLE(more-warnings, --- -2.1.4 - diff --git a/meta-gnome/recipes-gnome/gnome-system-monitor/gnome-system-monitor_2.28.2.bb b/meta-gnome/recipes-gnome/gnome-system-monitor/gnome-system-monitor_2.28.2.bb deleted file mode 100644 index 4b397bf83d..0000000000 --- a/meta-gnome/recipes-gnome/gnome-system-monitor/gnome-system-monitor_2.28.2.bb +++ /dev/null @@ -1,35 +0,0 @@ -SUMMARY = "Gnome system monitor" -LICENSE = "GPLv2" -LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe" -SECTION = "x11/gnome" -PR = "r2" - -DEPENDS = "libgtop gtkmm glibmm gnome-doc-utils libwnck gtk+ dbus-glib librsvg intltool-native gnome-common-native" - -inherit gnome -SRC_URI[archive.md5sum] = "3f0bca9b0ebc7a365466851cd580d167" -SRC_URI[archive.sha256sum] = "b628edfd39e3a6b374ce133f367d3568475eb4e981a367f4f9d62a9784e5ae59" -GNOME_COMPRESS_TYPE="bz2" -SRC_URI += " \ - file://0001-Fix-glib-includes.patch \ - file://0002-src-procman.cpp-include-main-gtkmm.h.patch \ - file://Remove-pkg-config-check-for-gnome-icon-theme.patch \ -" - -do_configure_prepend() { - sed -i -e s:help::g ${S}/Makefile.am -} - -CXXFLAGS += "--std=c++11" - -RRECOMMENDS_${PN} = "adwaita-icon-theme" - -FILES_${PN} += "${datadir}/icons \ - ${datadir}/dbus-1 \ - ${datadir}/gnome/autostart \ -" - -FILES_${PN}-doc += "${datadir}/omf \ - ${datadir}/gnome/help " - -PNBLACKLIST[gnome-system-monitor] ?= "Fails to build with RSS http://errors.yoctoproject.org/Errors/Details/131635/ - the recipe will be removed on 2017-09-01 unless the issue is fixed" diff --git a/meta-gnome/recipes-gnome/gnome/gnome-terminal/0001-Makefile.am-do-not-build-help.patch b/meta-gnome/recipes-gnome/gnome/gnome-terminal/0001-Makefile.am-do-not-build-help.patch deleted file mode 100644 index d7874e492e..0000000000 --- a/meta-gnome/recipes-gnome/gnome/gnome-terminal/0001-Makefile.am-do-not-build-help.patch +++ /dev/null @@ -1,28 +0,0 @@ -From d2549d3ef08536be6d141524e3382fef07fea8bf Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com> -Date: Tue, 30 Apr 2013 19:48:27 +0200 -Subject: [PATCH] Makefile.am: do not build help -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Upstream-Status: Inappropriate [configuration] - -Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com> ---- - Makefile.am | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -diff --git a/Makefile.am b/Makefile.am -index 89f7ee4..31e11ab 100644 ---- a/Makefile.am -+++ b/Makefile.am -@@ -1,4 +1,4 @@ --SUBDIRS = src po help -+SUBDIRS = src po - - NULL = - --- -1.7.6.5 - diff --git a/meta-gnome/recipes-gnome/gnome/gnome-terminal_2.30.2.bb b/meta-gnome/recipes-gnome/gnome/gnome-terminal_2.30.2.bb deleted file mode 100644 index 6b3bf7654d..0000000000 --- a/meta-gnome/recipes-gnome/gnome/gnome-terminal_2.30.2.bb +++ /dev/null @@ -1,22 +0,0 @@ -SUMMARY = "GNOME Terminal" -LICENSE = "GPL-2.0" -LIC_FILES_CHKSUM = "file://COPYING;md5=5b51eba4ba4cafe64073227530c061ed" -DEPENDS = "gtk+ glib-2.0 startup-notification dbus-glib vte9 gnome-doc-utils intltool-native" -PR = "r1" - -inherit gnome - -SRC_URI += " \ - file://0001-Makefile.am-do-not-build-help.patch \ -" - -EXTRA_OECONF += "--disable-scrollkeeper" - -SRC_URI[archive.md5sum] = "74c4528f00067072c2bd867d1f8fe844" -SRC_URI[archive.sha256sum] = "2c7af2250698b9f9f53c6eaa93211c1118cf2c7e29cbbacfd1e8a6a10069e07a" -GNOME_COMPRESS_TYPE="bz2" - -RRECOMMENDS_${PN} += "gnome-common-schemas" - -# http://errors.yoctoproject.org/Errors/Details/68636/ -PNBLACKLIST[gnome-terminal] ?= "BROKEN: fails to build with gcc-6 - the recipe will be removed on 2017-09-01 unless the issue is fixed" diff --git a/meta-gnome/recipes-gnome/gnome/libgnomecups_0.2.3.bb b/meta-gnome/recipes-gnome/gnome/libgnomecups_0.2.3.bb deleted file mode 100644 index 3480712b5d..0000000000 --- a/meta-gnome/recipes-gnome/gnome/libgnomecups_0.2.3.bb +++ /dev/null @@ -1,25 +0,0 @@ -DESCRIPTION="Gnome Cups Manager" -LICENSE="GPLv2" -LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f" - -DEPENDS="glib-2.0 gtk+ pango cups intltool libgnomeui" - -PR = "r2" - -inherit gnomebase pkgconfig - -do_compile_append () { - cp libgnomecups-1.0.pc libgnomecups-1.0.pc.old - sed 's:${STAGING_DIR_HOST}::' < libgnomecups-1.0.pc.old > libgnomecups-1.0.pc -} - -SRC_URI += "\ - file://libgnomecups-0.2.3-glib.h.patch \ - file://libgnomecups-0.2.3-cups-1.6.patch \ -" - -SRC_URI[archive.md5sum] = "dc4920c15c9f886f73ea74fbff0ae48b" -SRC_URI[archive.sha256sum] = "e130e80942b386de19a288a4c194ff3dbe9140315b31e982058c8bffbb6a1d29" -GNOME_COMPRESS_TYPE="bz2" - -PNBLACKLIST[libgnomecups] ?= "Depends on blacklisted libgnomeui - the recipe will be removed on 2017-09-01 unless the issue is fixed" diff --git a/meta-gnome/recipes-gnome/gnome/libgnomeprint/0001-configure-use-pkgconfig-for-freetype.patch b/meta-gnome/recipes-gnome/gnome/libgnomeprint/0001-configure-use-pkgconfig-for-freetype.patch deleted file mode 100644 index 174985a7eb..0000000000 --- a/meta-gnome/recipes-gnome/gnome/libgnomeprint/0001-configure-use-pkgconfig-for-freetype.patch +++ /dev/null @@ -1,37 +0,0 @@ -From ed31fd89f4c77d89390774d29427898a85b25ab1 Mon Sep 17 00:00:00 2001 -From: Koen Kooi <koen@dominion.thruhere.net> -Date: Fri, 1 Aug 2014 13:58:36 +0200 -Subject: [PATCH] configure: use pkgconfig for freetype - -Upstream-status: Pending -Signed-off-by: Koen Kooi <koen@dominion.thruhere.net> ---- - configure.in | 12 +++++------- - 1 file changed, 5 insertions(+), 7 deletions(-) - -diff --git a/configure.in b/configure.in -index 729278d..e569429 100644 ---- a/configure.in -+++ b/configure.in -@@ -164,13 +164,11 @@ dnl Checking for freetype2 - dnl ================================= - FREETYPE_LIBS= - FREETYPE_CFLAGS= --AC_PATH_PROG(FREETYPE_CONFIG, freetype-config, no) --if test "x$FREETYPE_CONFIG" = "xno" ; then -- AC_MSG_ERROR(You need FreeType2 (freetype-devel v 2.x package) for this version of libgnomeprint) --else -- FREETYPE_CFLAGS=`$FREETYPE_CONFIG --cflags` -- FREETYPE_LIBS=`$FREETYPE_CONFIG --libs` --fi -+PKG_CHECK_MODULES(FREETYPE2, freetype2, -+ FREETYPE_CFLAGS="$CFLAGS $FREETYPE2_CFLAGS" -+ FREETYPE_LIBS="$LIBS $FREETYPE2_LIBS", -+ AC_MSG_ERROR([*** Unable to find FreeType2 library (http://www.freetype.org/)]) -+) - - libgnomeprint_save_ldflags=$LDFLAGS - LDFLAGS="$LDFLAGS $FREETYPE_LIBS" --- -1.9.0 - diff --git a/meta-gnome/recipes-gnome/gnome/libgnomeprint/bison3-support.patch b/meta-gnome/recipes-gnome/gnome/libgnomeprint/bison3-support.patch deleted file mode 100644 index 29d410a0ab..0000000000 --- a/meta-gnome/recipes-gnome/gnome/libgnomeprint/bison3-support.patch +++ /dev/null @@ -1,30 +0,0 @@ -Index: libgnomeprint-2.18.8/libgnomeprint/grammar.y -=================================================================== ---- libgnomeprint-2.18.8.orig/libgnomeprint/grammar.y -+++ libgnomeprint-2.18.8/libgnomeprint/grammar.y -@@ -99,7 +99,7 @@ gnome_print_filter_parse_prop (GnomePrin - } - - static int yylex (void *lvalp); --static int yyerror (const char *s); -+static int yyerror (graph_t *g, const char *s); - %} - - %union { -@@ -117,6 +117,7 @@ static int yyerror (const char *s); - %type <p> pool - - %pure_parser -+%parse-param { graph_t *graph } - - %start graph - %% -@@ -185,7 +186,7 @@ graph: filter { - %% - - static int --yyerror (const char *s) -+yyerror (graph_t *g, const char *s) - { - return -1; - } diff --git a/meta-gnome/recipes-gnome/gnome/libgnomeprint/fix.includes.patch b/meta-gnome/recipes-gnome/gnome/libgnomeprint/fix.includes.patch deleted file mode 100644 index 53235a12d3..0000000000 --- a/meta-gnome/recipes-gnome/gnome/libgnomeprint/fix.includes.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff -uNr libgnomeprint-2.18.7.orig/libgnomeprint/modules/cups/gnome-print-cups-transport.c libgnomeprint-2.18.7/libgnomeprint/modules/cups/gnome-print-cups-transport.c ---- libgnomeprint-2.18.7.orig/libgnomeprint/modules/cups/gnome-print-cups-transport.c 2009-04-19 19:45:36.000000000 +0200 -+++ libgnomeprint-2.18.7/libgnomeprint/modules/cups/gnome-print-cups-transport.c 2012-12-23 12:34:52.058643537 +0100 -@@ -35,6 +35,7 @@ - #include <sys/stat.h> - #include <fcntl.h> - #include <unistd.h> -+#include <stdio.h> - #include <locale.h> - - #include <cups/cups.h> diff --git a/meta-gnome/recipes-gnome/gnome/libgnomeprint/freetype.patch b/meta-gnome/recipes-gnome/gnome/libgnomeprint/freetype.patch deleted file mode 100644 index 7a27ecd239..0000000000 --- a/meta-gnome/recipes-gnome/gnome/libgnomeprint/freetype.patch +++ /dev/null @@ -1,38 +0,0 @@ -Use proper method to include freetype headers - -FreeType wants to use these special macros to include its APIs -so be it. - -Signed-off-by: Khem Raj <raj.khem@gmail.com> -Upstream-Status: Pending - -Index: libgnomeprint-2.18.7/libgnomeprint/gnome-font-face.c -=================================================================== ---- libgnomeprint-2.18.7.orig/libgnomeprint/gnome-font-face.c -+++ libgnomeprint-2.18.7/libgnomeprint/gnome-font-face.c -@@ -36,7 +36,9 @@ - #include <stdarg.h> - #include <locale.h> - --#include <freetype/ftoutln.h> -+#include <ft2build.h> -+#include FT_FREETYPE_H -+ - - #include <libgnomeprint/gnome-print-private.h> - #include <libgnomeprint/gnome-font-private.h> -Index: libgnomeprint-2.18.7/libgnomeprint/gnome-rfont.c -=================================================================== ---- libgnomeprint-2.18.7.orig/libgnomeprint/gnome-rfont.c -+++ libgnomeprint-2.18.7/libgnomeprint/gnome-rfont.c -@@ -28,8 +28,8 @@ - - #include <ft2build.h> - #include FT_FREETYPE_H --#include <freetype/ftglyph.h> --#include <freetype/ftbbox.h> -+#include FT_GLYPH_H -+#include FT_BBOX_H - #include <libart_lgpl/art_misc.h> - #include <libart_lgpl/art_affine.h> - #include <libart_lgpl/art_vpath.h> diff --git a/meta-gnome/recipes-gnome/gnome/libgnomeprint_2.18.8.bb b/meta-gnome/recipes-gnome/gnome/libgnomeprint_2.18.8.bb deleted file mode 100644 index a462a4b9e6..0000000000 --- a/meta-gnome/recipes-gnome/gnome/libgnomeprint_2.18.8.bb +++ /dev/null @@ -1,28 +0,0 @@ -LICENSE = "GPLv2" -SECTION = "x11/gnome/libs" - -DEPENDS = "bison-native flex-native libxml2 libgnomecups glib-2.0 pango libart-lgpl fontconfig popt gnome-common freetype" - -LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f" - -inherit gnomebase - -SRC_URI += "file://fix.includes.patch \ - file://freetype.patch \ - file://0001-configure-use-pkgconfig-for-freetype.patch \ - file://bison3-support.patch \ - " -SRC_URI[archive.md5sum] = "63b05ffb5386e131487c6af30f4c56ac" -SRC_URI[archive.sha256sum] = "1034ec8651051f84d2424e7a1da61c530422cc20ce5b2d9e107e1e46778d9691" -GNOME_COMPRESS_TYPE="bz2" - -FILES_${PN}-dbg += "\ - ${libdir}/${PN}/${PV}/modules/.debug \ - ${libdir}/${PN}/${PV}/modules/*/.debug \ -" -FILES_${PN}-staticdev += "\ - ${libdir}/${PN}/${PV}/modules/*.a \ - ${libdir}/${PN}/${PV}/modules/*/*.a \ -" - -PNBLACKLIST[libgnomeprint] ?= "Depends on broken libgnomecups - the recipe will be removed on 2017-09-01 unless the issue is fixed" diff --git a/meta-gnome/recipes-gnome/gnumeric/gnumeric/0001-configure.in-drop-introspection-macros-replace-them-.patch b/meta-gnome/recipes-gnome/gnumeric/gnumeric/0001-configure.in-drop-introspection-macros-replace-them-.patch deleted file mode 100644 index 914d2ccf99..0000000000 --- a/meta-gnome/recipes-gnome/gnumeric/gnumeric/0001-configure.in-drop-introspection-macros-replace-them-.patch +++ /dev/null @@ -1,84 +0,0 @@ -From de5f0a535d6ea1932d2c7de53bd33510c8682ee7 Mon Sep 17 00:00:00 2001 -From: Alexander Kanavin <alex.kanavin@gmail.com> -Date: Mon, 22 Feb 2016 16:34:03 +0200 -Subject: [PATCH] configure.in: drop introspection macros, replace them with a - standard one - -Upstream-Status: Pending -Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> ---- - configure.in | 57 +-------------------------------------------------------- - 1 file changed, 1 insertion(+), 56 deletions(-) - -diff --git a/configure.in b/configure.in -index 8e1aa37..3086503 100644 ---- a/configure.in -+++ b/configure.in -@@ -934,63 +934,8 @@ AC_SUBST(MONO_CFLAGS) - AC_SUBST(MONO_LIBS) - ]) - --# GObject Introspection --GIR_REQ=1.0.0 --AC_ARG_ENABLE(introspection, -- AS_HELP_STRING([--enable-introspection[=@<:@no/auto/yes@:>@]], -- [Enable introspection for this build]),, -- [enable_introspection=no]) -- --AC_MSG_CHECKING([for gobject-introspection]) -- --dnl presence/version checking --AS_CASE([$enable_introspection], --[no], [ -- found_introspection="no (disabled, use --enable-introspection to enable)" --], --[yes],[ -- PKG_CHECK_EXISTS([gobject-introspection-1.0],, -- AC_MSG_ERROR([gobject-introspection-1.0 is not installed])) -- PKG_CHECK_EXISTS([gobject-introspection-1.0 >= $GIR_REQ], -- found_introspection=yes, -- AC_MSG_ERROR([You need to have gobject-introspection >= $1 installed to build AC_PACKAGE_NAME])) --], --[auto],[ -- PKG_CHECK_EXISTS([gobject-introspection-1.0 >= $GIR_REQ], found_introspection=yes, found_introspection=no) --dnl Canonicalize enable_introspection --enable_introspection=$found_introspection --], --[ -- AC_MSG_ERROR([invalid argument passed to --enable-introspection, should be one of @<:@no/auto/yes@:>@]) --]) -+GOBJECT_INTROSPECTION_CHECK([1.46.0]) - --AC_MSG_RESULT([$found_introspection]) -- --INTROSPECTION_SCANNER= --INTROSPECTION_COMPILER= --INTROSPECTION_GENERATE= --INTROSPECTION_GIRDIR= --INTROSPECTION_TYPELIBDIR= --if test "x$found_introspection" = "xyes"; then -- INTROSPECTION_SCANNER=`$PKG_CONFIG --variable=g_ir_scanner gobject-introspection-1.0` -- INTROSPECTION_COMPILER=`$PKG_CONFIG --variable=g_ir_compiler gobject-introspection-1.0` -- INTROSPECTION_GENERATE=`$PKG_CONFIG --variable=g_ir_generate gobject-introspection-1.0` -- INTROSPECTION_GIRDIR=`$PKG_CONFIG --variable=girdir gobject-introspection-1.0` -- INTROSPECTION_TYPELIBDIR="$($PKG_CONFIG --variable=typelibdir gobject-introspection-1.0)" -- INTROSPECTION_CFLAGS=`$PKG_CONFIG --cflags gobject-introspection-1.0` -- INTROSPECTION_LIBS=`$PKG_CONFIG --libs gobject-introspection-1.0` -- INTROSPECTION_MAKEFILE=`$PKG_CONFIG --variable=datadir gobject-introspection-1.0`/gobject-introspection-1.0/Makefile.introspection --fi --AC_SUBST(INTROSPECTION_SCANNER) --AC_SUBST(INTROSPECTION_COMPILER) --AC_SUBST(INTROSPECTION_GENERATE) --AC_SUBST(INTROSPECTION_GIRDIR) --AC_SUBST(INTROSPECTION_TYPELIBDIR) --AC_SUBST(INTROSPECTION_CFLAGS) --AC_SUBST(INTROSPECTION_LIBS) --AC_SUBST(INTROSPECTION_MAKEFILE) -- --AM_CONDITIONAL(HAVE_INTROSPECTION, test "x$found_introspection" = "xyes") - dnl we need to change the install directories for distcheck - AC_ARG_WITH([gir-dir], - AS_HELP_STRING( --- -2.7.0 - diff --git a/meta-gnome/recipes-gnome/gnumeric/gnumeric/do-not-use-srcdir.patch b/meta-gnome/recipes-gnome/gnumeric/gnumeric/do-not-use-srcdir.patch deleted file mode 100644 index cc81b1fc04..0000000000 --- a/meta-gnome/recipes-gnome/gnumeric/gnumeric/do-not-use-srcdir.patch +++ /dev/null @@ -1,15 +0,0 @@ -Index: gnumeric-1.12.0/test/Makefile.am -=================================================================== ---- gnumeric-1.12.0.orig/test/Makefile.am 2011-05-17 17:54:24.000000000 -0700 -+++ gnumeric-1.12.0/test/Makefile.am 2013-10-17 20:28:19.920618596 -0700 -@@ -25,7 +25,9 @@ - # - # 90xx: Misc stuff. - --TESTS = $(sort $(wildcard $(srcdir)/t[0-9][0-9][0-9][0-9]-*.pl)) -+TESTS_EXTENSIONS=.pl -+TESTS = @auto_find_tests@ -+ - SUPPS = common.supp commondots.supp gui.supp t8003-valgrind-pdf.supp - - import-db: diff --git a/meta-gnome/recipes-gnome/gnumeric/gnumeric_1.12.0.bb b/meta-gnome/recipes-gnome/gnumeric/gnumeric_1.12.0.bb deleted file mode 100644 index 49d0fe9d47..0000000000 --- a/meta-gnome/recipes-gnome/gnumeric/gnumeric_1.12.0.bb +++ /dev/null @@ -1,49 +0,0 @@ -LICENSE = "GPLv2 | GPLv3" -LIC_FILES_CHKSUM = "file://COPYING;md5=be0de417af78dd340558810d1ced52e6" -SECTION = "x11/utils" -S = "${WORKDIR}/gnumeric-${PV}" -DEPENDS = "gdk-pixbuf libgsf gtk+3 libxml2 libglade libart-lgpl intltool-native libgnomecanvas libgnomeprint libbonoboui orbit2-native goffice" -SUMMARY = "Gnumeric spreadsheet for GNOME" - -GNOME_COMPRESS_TYPE = "xz" - -inherit gnome pythonnative gobject-introspection - -SRC_URI += "file://do-not-use-srcdir.patch \ - file://0001-configure.in-drop-introspection-macros-replace-them-.patch" - -SRC_URI[archive.md5sum] = "3fd87cca95334b5d8ac922989670fe27" -SRC_URI[archive.sha256sum] = "037b53d909e5d1454b2afda8c4fb1e7838e260343e36d4e36245f4a5d0e04111" - - -EXTRA_OECONF=" --without-perl " - -PACKAGES_DYNAMIC += "gnumeric-plugin-*" -PACKAGES += "libspreadsheet libspreadsheet-dev gnumeric-goffice gnumeric-goffice-dbg" - -FILES_${PN}-dbg += "${libdir}/gnumeric/${PV}/plugins/*/.debug" -FILES_${PN}-dev = "${includedir} ${libdir}/pkgconfig" -FILES_${PN}-staticdev = "${libdir}/libspreadsheet.la" -FILES_libspreadsheet = "${libdir}/libspreadsheet-${PV}.so" -FILES_libspreadsheet-dev = "${libdir}/libspreadsheet.so" -FILES_gnumeric-goffice-dbg += "${libdir}/goffice/*/plugins/gnumeric/.debug" -FILES_gnumeric-goffice = "${libdir}/goffice/*/plugins/gnumeric/*" - -# This hack works around the problem mentioned here: -# https://mail.gnome.org/archives/gnumeric-list/2010-February/msg00006.html -do_install_prepend() { - sed -i ${B}/doc/C/Makefile -e 's/\tfor file in $(omffile); do/\t-for file in $(omffile); do/' -} - -python populate_packages_prepend () { - gnumeric_libdir = bb.data.expand('${libdir}/gnumeric/${PV}/plugins', d) - - do_split_packages(d, gnumeric_libdir, '^(.*)/.*$', - output_pattern='gnumeric-plugin-%s', - description='Gnumeric plugin %s', - extra_depends='', - recursive=True, - prepend=True) -} - -PNBLACKLIST[gnumeric] ?= "Depends on broken libgnomeprint - the recipe will be removed on 2017-09-01 unless the issue is fixed" diff --git a/meta-gnome/recipes-gnome/gthumb/files/0001-Drop-help-directory-from-build.patch b/meta-gnome/recipes-gnome/gthumb/files/0001-Drop-help-directory-from-build.patch deleted file mode 100644 index d116968a6d..0000000000 --- a/meta-gnome/recipes-gnome/gthumb/files/0001-Drop-help-directory-from-build.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 48cb878cb724e7a509260f014db6365510b8b541 Mon Sep 17 00:00:00 2001 -From: Alexander Kanavin <alex.kanavin@gmail.com> -Date: Tue, 17 May 2016 14:05:29 +0300 -Subject: [PATCH] Drop help directory from build - -It hardcodes the use of xml2po tool form gnome-doc-utils - -Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> ---- - Makefile.am | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/Makefile.am b/Makefile.am -index d056875..3fc4a41 100644 ---- a/Makefile.am -+++ b/Makefile.am -@@ -1,4 +1,4 @@ --SUBDIRS = m4 copy-n-paste data po gthumb extensions tests help -+SUBDIRS = m4 copy-n-paste data po gthumb extensions tests - - ACLOCAL_AMFLAGS = -I m4 - AMCFLAGS = -fPIC -DPIC --- -2.8.1 - diff --git a/meta-gnome/recipes-gnome/gthumb/files/parallel.patch b/meta-gnome/recipes-gnome/gthumb/files/parallel.patch deleted file mode 100644 index 20ce5c5aa2..0000000000 --- a/meta-gnome/recipes-gnome/gthumb/files/parallel.patch +++ /dev/null @@ -1,158 +0,0 @@ -From 34969cde1dcb7740b4a7c3b6e3d04d481e5980b5 Mon Sep 17 00:00:00 2001 -From: Ross Burton <ross.burton@intel.com> -Date: Tue, 31 Jul 2012 17:26:27 +0100 -Subject: [PATCH] build: Fix parallel build problems with enum generation - -This is a backport from a patch against master. - -Upstream-Status: Submitted [https://bugzilla.gnome.org/show_bug.cgi?id=680925] ---- - extensions/file_tools/Makefile.am | 10 ++++------ - extensions/importer/Makefile.am | 10 ++++------ - extensions/pixbuf_savers/Makefile.am | 10 ++++------ - gthumb/Makefile.am | 10 ++++------ - 4 files changed, 16 insertions(+), 24 deletions(-) - -diff --git a/extensions/file_tools/Makefile.am b/extensions/file_tools/Makefile.am -index 7785eff..d70a8a5 100644 ---- a/extensions/file_tools/Makefile.am -+++ b/extensions/file_tools/Makefile.am -@@ -24,17 +24,16 @@ HEADER_FILES = \ - gth-file-tool-undo.h \ - preferences.h - --enum-types.h: $(HEADER_FILES) $(GLIB_MKENUMS) -+enum-types.h: $(HEADER_FILES) - $(AM_V_GEN)( $(GLIB_MKENUMS) \ - --fhead "#ifndef ENUM_TYPES_H\n#define ENUM_TYPES_H\n\n#include <glib-object.h>\n\nG_BEGIN_DECLS\n" \ - --fprod "/* enumerations from \"@filename@\" */\n" \ - --vhead "GType @enum_name@_get_type (void);\n#define GTH_TYPE_@ENUMSHORT@ (@enum_name@_get_type())\n" \ - --ftail "G_END_DECLS\n\n#endif /* ENUM_TYPES_H */" \ - $^> xgen-$(@F) \ -- && (cmp -s xgen-$(@F) enum-types.h || cp xgen-$(@F) enum-types.h ) \ -- && rm -f xgen-$(@F) ) -+ && mv -f xgen-$(@F) enum-types.h ) - --enum-types.c: $(HEADER_FILES) enum-types.h -+enum-types.c: $(HEADER_FILES) - $(AM_V_GEN)( $(GLIB_MKENUMS) \ - --fhead "#include <glib-object.h>\n" \ - --fprod "\n/* enumerations from \"@filename@\" */\n#include \"@filename@\"" \ -@@ -42,8 +41,7 @@ enum-types.c: $(HEADER_FILES) enum-types.h - --vprod " { @VALUENAME@, \"@VALUENAME@\", \"@valuenick@\" }," \ - --vtail " { 0, NULL, NULL }\n };\n etype = g_@type@_register_static (\"@EnumName@\", values);\n }\n return etype;\n}\n" \ - $^> xgen-$(@F) \ -- && (cmp -s xgen-$(@F) enum-types.c || cp xgen-$(@F) enum-types.c ) \ -- && rm -f xgen-$(@F) ) -+ && mv -f xgen-$(@F) enum-types.c ) - - libfile_tools_la_SOURCES = \ - $(ENUM_TYPES) \ -diff --git a/extensions/importer/Makefile.am b/extensions/importer/Makefile.am -index 29e7f2c..07c1eba 100644 ---- a/extensions/importer/Makefile.am -+++ b/extensions/importer/Makefile.am -@@ -14,17 +14,16 @@ HEADER_FILES = \ - preferences.h \ - utils.h - --gth-import-enum-types.h: $(HEADER_FILES) $(GLIB_MKENUMS) -+gth-import-enum-types.h: $(HEADER_FILES) - $(AM_V_GEN)( $(GLIB_MKENUMS) \ - --fhead "#ifndef ENUM_TYPES_H\n#define ENUM_TYPES_H\n\n#include <glib-object.h>\n\nG_BEGIN_DECLS\n" \ - --fprod "/* enumerations from \"@filename@\" */\n" \ - --vhead "GType @enum_name@_get_type (void);\n#define GTH_TYPE_@ENUMSHORT@ (@enum_name@_get_type())\n" \ - --ftail "G_END_DECLS\n\n#endif /* ENUM_TYPES_H */" \ - $^> xgen-$(@F) \ -- && (cmp -s xgen-$(@F) gth-import-enum-types.h || cp xgen-$(@F) gth-import-enum-types.h ) \ -- && rm -f xgen-$(@F) ) -+ && mv -f xgen-$(@F) gth-import-enum-types.h ) - --gth-import-enum-types.c: $(HEADER_FILES) gth-import-enum-types.h -+gth-import-enum-types.c: $(HEADER_FILES) - $(AM_V_GEN)( $(GLIB_MKENUMS) \ - --fhead "#include <glib-object.h>\n" \ - --fprod "\n/* enumerations from \"@filename@\" */\n#include \"@filename@\"" \ -@@ -32,8 +31,7 @@ gth-import-enum-types.c: $(HEADER_FILES) gth-import-enum-types.h - --vprod " { @VALUENAME@, \"@VALUENAME@\", \"@valuenick@\" }," \ - --vtail " { 0, NULL, NULL }\n };\n etype = g_@type@_register_static (\"@EnumName@\", values);\n }\n return etype;\n}\n" \ - $^> xgen-$(@F) \ -- && (cmp -s xgen-$(@F) gth-import-enum-types.c || cp xgen-$(@F) gth-import-enum-types.c ) \ -- && rm -f xgen-$(@F) ) -+ && mv -f xgen-$(@F) gth-import-enum-types.c ) - - libimporter_la_SOURCES = \ - $(ENUM_TYPES) \ -diff --git a/extensions/pixbuf_savers/Makefile.am b/extensions/pixbuf_savers/Makefile.am -index bfe9f34..4764c32 100644 ---- a/extensions/pixbuf_savers/Makefile.am -+++ b/extensions/pixbuf_savers/Makefile.am -@@ -10,17 +10,16 @@ ENUM_TYPES = \ - HEADER_FILES = \ - preferences.h - --enum-types.h: $(HEADER_FILES) $(GLIB_MKENUMS) -+enum-types.h: $(HEADER_FILES) - $(AM_V_GEN)( $(GLIB_MKENUMS) \ - --fhead "#ifndef ENUM_TYPES_H\n#define ENUM_TYPES_H\n\n#include <glib-object.h>\n\nG_BEGIN_DECLS\n" \ - --fprod "/* enumerations from \"@filename@\" */\n" \ - --vhead "GType @enum_name@_get_type (void);\n#define GTH_TYPE_@ENUMSHORT@ (@enum_name@_get_type())\n" \ - --ftail "G_END_DECLS\n\n#endif /* ENUM_TYPES_H */" \ - $^> xgen-$(@F) \ -- && (cmp -s xgen-$(@F) enum-types.h || cp xgen-$(@F) enum-types.h ) \ -- && rm -f xgen-$(@F) ) -+ && mv -f xgen-$(@F) enum-types.h ) - --enum-types.c: $(HEADER_FILES) enum-types.h -+enum-types.c: $(HEADER_FILES) - $(AM_V_GEN)( $(GLIB_MKENUMS) \ - --fhead "#include <glib-object.h>\n" \ - --fprod "\n/* enumerations from \"@filename@\" */\n#include \"@filename@\"" \ -@@ -28,8 +27,7 @@ enum-types.c: $(HEADER_FILES) enum-types.h - --vprod " { @VALUENAME@, \"@VALUENAME@\", \"@valuenick@\" }," \ - --vtail " { 0, NULL, NULL }\n };\n etype = g_@type@_register_static (\"@EnumName@\", values);\n }\n return etype;\n}\n" \ - $^> xgen-$(@F) \ -- && (cmp -s xgen-$(@F) enum-types.c || cp xgen-$(@F) enum-types.c ) \ -- && rm -f xgen-$(@F) ) -+ && mv -f xgen-$(@F) enum-types.c ) - - libpixbuf_savers_la_SOURCES = \ - $(ENUM_TYPES) \ -diff --git a/gthumb/Makefile.am b/gthumb/Makefile.am -index e9e385e..2f14e03 100644 ---- a/gthumb/Makefile.am -+++ b/gthumb/Makefile.am -@@ -296,17 +296,16 @@ gthumb_CFLAGS = \ - -DGTHUMB_EXTENSIONS_DIR=\"$(extensions_dir)\" \ - $(NULL) - --gth-enum-types.h: $(PUBLIC_HEADER_FILES) $(GLIB_MKENUMS) -+gth-enum-types.h: $(PUBLIC_HEADER_FILES) - $(AM_V_GEN)( $(GLIB_MKENUMS) \ - --fhead "#ifndef GTH_ENUM_TYPES_H\n#define GTH_ENUM_TYPES_H\n\n#include <glib-object.h>\n\nG_BEGIN_DECLS\n" \ - --fprod "/* enumerations from \"@filename@\" */\n" \ - --vhead "GType @enum_name@_get_type (void);\n#define GTH_TYPE_@ENUMSHORT@ (@enum_name@_get_type())\n" \ - --ftail "G_END_DECLS\n\n#endif /* GTH_ENUM_TYPES_H */" \ - $^> xgen-$(@F) \ -- && (cmp -s xgen-$(@F) gth-enum-types.h || cp xgen-$(@F) gth-enum-types.h ) \ -- && rm -f xgen-$(@F) ) -+ && mv -f xgen-$(@F) gth-enum-types.h ) - --gth-enum-types.c: $(PUBLIC_HEADER_FILES) gth-enum-types.h -+gth-enum-types.c: $(PUBLIC_HEADER_FILES) - $(AM_V_GEN)( $(GLIB_MKENUMS) \ - --fhead "#include <glib-object.h>\n" \ - --fprod "\n/* enumerations from \"@filename@\" */\n#include \"@filename@\"" \ -@@ -314,8 +313,7 @@ gth-enum-types.c: $(PUBLIC_HEADER_FILES) gth-enum-types.h - --vprod " { @VALUENAME@, \"@VALUENAME@\", \"@valuenick@\" }," \ - --vtail " { 0, NULL, NULL }\n };\n etype = g_@type@_register_static (\"@EnumName@\", values);\n }\n return etype;\n}\n" \ - $^> xgen-$(@F) \ -- && (cmp -s xgen-$(@F) gth-enum-types.c || cp xgen-$(@F) gth-enum-types.c ) \ -- && rm -f xgen-$(@F) ) -+ && mv -f xgen-$(@F) gth-enum-types.c ) - - gth-marshal.h: gth-marshal.list $(GLIB_GENMARSHAL) - $(AM_V_GEN)( $(GLIB_GENMARSHAL) $(srcdir)/gth-marshal.list --header --prefix=gth_marshal > $@ ) --- -1.7.10.4 - diff --git a/meta-gnome/recipes-gnome/gthumb/gthumb_2.12.4.bb b/meta-gnome/recipes-gnome/gthumb/gthumb_2.12.4.bb deleted file mode 100644 index 62d3df98e1..0000000000 --- a/meta-gnome/recipes-gnome/gthumb/gthumb_2.12.4.bb +++ /dev/null @@ -1,35 +0,0 @@ -SUMMARY = "gThumb is an image viewer and browser for the GNOME Desktop" -SECTION = "x11/gnome" -LICENSE = "GPLv2" -LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552" -DEPENDS = "gnome-common-native glib-2.0 gtk+ libxml2 gnome-doc-utils libunique gconf libpng gstreamer jpeg tiff gst-plugins-base intltool-native gconf-native" - -PR = "r4" - -EXTRA_OECONF = "--disable-gnome-keyring --disable-libsoup --disable-exiv2 --disable-clutter" - -inherit gnome pkgconfig - -SRC_URI[archive.md5sum] = "97fc13221b0c5d80c27a2e25a3a3ac6f" -SRC_URI[archive.sha256sum] = "cf809695230ab8892a078be454a42ade865754c72ec1da7c3d74d4310de54f1d" -GNOME_COMPRESS_TYPE="bz2" - -SRC_URI += "file://parallel.patch \ - file://0001-Drop-help-directory-from-build.patch" - -do_configure_prepend () { - rm -f ${S}/m4/gnome-doc-utils.m4 -} - -do_install_append () { - rm -f ${D}${libdir}/${BPN}/extensions/*.a -} - -FILES_${PN} += "${datadir}/icons" -FILES_${PN} += "${libdir}/${BPN}/extensions/*.so \ - ${libdir}/${BPN}/extensions/*.extension" -FILES_${PN}-dev += "${libdir}/${BPN}/extensions/*.la" -FILES_${PN}-dbg += "${libdir}/${BPN}/extensions/.debug/" - - -PNBLACKLIST[gthumb] ?= "Depends on blacklisted gstreamer - the recipe will be removed on 2017-09-01 unless the issue is fixed" diff --git a/meta-gnome/recipes-gnome/gweather/libgweather3_3.0.2.bb b/meta-gnome/recipes-gnome/gweather/libgweather3_3.0.2.bb deleted file mode 100644 index 6920f0aa2b..0000000000 --- a/meta-gnome/recipes-gnome/gweather/libgweather3_3.0.2.bb +++ /dev/null @@ -1,28 +0,0 @@ -LICENSE = "GPLv2" -LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" - -SECTION = "x11/gnome/libs" -DEPENDS = "libxml2 gconf libsoup-2.4 gtk+3" - -PNBLACKLIST[libgweather3] ?= "CONFLICT: 876 files are conflicting with libgweather - the recipe will be removed on 2017-09-01 unless the issue is fixed" -# e.g. sysroots/qemux86-64/usr/share/libgweather/locations.dtd -# sysroots/qemux86-64/usr/share/libgweather/Locations.zh_TW.xml - -BPN = "libgweather" - -inherit gnome -SRC_URI[archive.md5sum] = "f1a96c6f19c9a0bc6b4e12acc9a8a85d" -SRC_URI[archive.sha256sum] = "9041526fa0466b99dae5cf06c2cc70376f25531eec5d58b1e1378acfb302410c" - -do_configure_prepend() { - sed -i -e 's: doc : :g' ${S}/Makefile.am -} - -FILES_${PN} += "${datadir}/gnome* \ - ${datadir}/icons" - -PACKAGES =+ "${PN}-locationdata" -FILES_${PN}-locationdata = "${datadir}/libgweather/*ocations*" - - - diff --git a/meta-gnome/recipes-gnome/gweather/libgweather_2.30.3.bb b/meta-gnome/recipes-gnome/gweather/libgweather_2.30.3.bb deleted file mode 100644 index 8b69f1fe72..0000000000 --- a/meta-gnome/recipes-gnome/gweather/libgweather_2.30.3.bb +++ /dev/null @@ -1,24 +0,0 @@ -LICENSE = "GPLv2" -LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f" - -SECTION = "x11/gnome/libs" -DEPENDS = "libxml2 gconf libsoup-2.4 gtk+ libgnome-keyring" - -inherit gnome - -SRC_URI[archive.md5sum] = "bf6a0a05051341ecb250f332e3edfb88" -SRC_URI[archive.sha256sum] = "b835374661423f37c46aa8e37368ae24a68856f117b7c21e475a21efdba5264c" -GNOME_COMPRESS_TYPE="bz2" - -do_configure_prepend() { - sed -i -e 's: doc : :g' ${S}/Makefile.am -} - -FILES_${PN} += "${datadir}/gnome* \ - ${datadir}/icons" - -PACKAGES =+ "${PN}-locationdata" -FILES_${PN}-locationdata = "${datadir}/libgweather/Locations*" - -# http://errors.yoctoproject.org/Errors/Details/68608/ -PNBLACKLIST[libgweather] ?= "BROKEN: fails to build with gcc-6 - the recipe will be removed on 2017-09-01 unless the issue is fixed" diff --git a/meta-gnome/recipes-gnome/nautilus/nautilus/idl-sysroot.patch b/meta-gnome/recipes-gnome/nautilus/nautilus/idl-sysroot.patch deleted file mode 100644 index 0062cfb11a..0000000000 --- a/meta-gnome/recipes-gnome/nautilus/nautilus/idl-sysroot.patch +++ /dev/null @@ -1,7 +0,0 @@ -Index: nautilus-2.24.2/add-include-prefix -=================================================================== ---- nautilus-2.24.2.orig/add-include-prefix 2008-10-06 17:22:21.000000000 +0000 -+++ nautilus-2.24.2/add-include-prefix 2009-04-09 16:00:05.000000000 +0000 -@@ -1 +1 @@ --sed -e 's/^/ /' -e 's/ */ /g' -e 's/ / -I /g' -e 's/ -I $//' -+sed -e 's:^: :' -e 's: *: :g' -e 's: : -I '"$SYSROOT"':g' -e 's: -I '"$SYSROOT"'$::' diff --git a/meta-gnome/recipes-gnome/nautilus/nautilus/no-G_DISABLE_DEPRECATED.patch b/meta-gnome/recipes-gnome/nautilus/nautilus/no-G_DISABLE_DEPRECATED.patch deleted file mode 100644 index 43a6152d83..0000000000 --- a/meta-gnome/recipes-gnome/nautilus/nautilus/no-G_DISABLE_DEPRECATED.patch +++ /dev/null @@ -1,44 +0,0 @@ -From e7233d98c114b03c7c8b96d1f41770452da14aa7 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmx.de> -Date: Mon, 17 Oct 2011 00:59:01 +0200 -Subject: [PATCH] nautilus build fails for newer glib versions -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -build with glib-2.0 v2.30.0 run into errors for at least G_CONST_RETURN missing - -Signed-off-by: Andreas Müller <schnitzeltony@gmx.de> ---- - configure.in | 2 +- - eel/Makefile.am | 1 - - 2 files changed, 1 insertions(+), 2 deletions(-) - -diff --git a/configure.in b/configure.in -index 97e171e..859a097 100644 ---- a/configure.in -+++ b/configure.in -@@ -342,7 +342,7 @@ AC_SUBST(CORE_CFLAGS) - CORE_LIBS="`$PKG_CONFIG --libs $CORE_MODULES` $x_libs" - AC_SUBST(CORE_LIBS) - --DISABLE_DEPRECATED_CFLAGS="-DG_DISABLE_DEPRECATED -DGDK_PIXBUF_DISABLE_DEPRECATED" -+DISABLE_DEPRECATED_CFLAGS="-DGDK_PIXBUF_DISABLE_DEPRECATED" - AC_SUBST(DISABLE_DEPRECATED_CFLAGS) - - dnl Multimedia keys -diff --git a/eel/Makefile.am b/eel/Makefile.am -index b1fe356..c1d56cd 100644 ---- a/eel/Makefile.am -+++ b/eel/Makefile.am -@@ -10,7 +10,6 @@ INCLUDES = \ - -DDATADIR=\""$(datadir)"\" \ - -DSOURCE_DATADIR=\""$(top_srcdir)/data"\" \ - -DGNOMELOCALEDIR=\""$(prefix)/${DATADIRNAME}/locale"\" \ -- -DG_DISABLE_DEPRECATED \ - -DGDK_PIXBUF_DISABLE_DEPRECATED \ - -DGMENU_I_KNOW_THIS_IS_UNSTABLE \ - $(NULL) --- -1.7.4.4 - diff --git a/meta-gnome/recipes-gnome/nautilus/nautilus3_3.2.1.bb b/meta-gnome/recipes-gnome/nautilus/nautilus3_3.2.1.bb deleted file mode 100644 index 5580f93a5b..0000000000 --- a/meta-gnome/recipes-gnome/nautilus/nautilus3_3.2.1.bb +++ /dev/null @@ -1,54 +0,0 @@ -# nautilus OE build file -# Copyright (C) 2005, Advanced Micro Devices, Inc. All Rights Reserved -# Released under the MIT license (see packages/COPYING) - -LICENSE="GPLv2 & LGPLv2" -LIC_FILES_CHKSUM = "file://COPYING;md5=f08a446809913fc9b3c718f0eaea0426 \ - file://COPYING.LIB;md5=f30a9716ef3762e3467a2f62bf790f0a" - -PR = "r4" - -DEPENDS = "libnotify gtk+3 libunique gvfs librsvg libexif gnome-desktop3" -# optional: tracker - -# to include nautilus3/no-try-run-strftime.diff before the rest -FILESEXTRAPATHS_prepend := "${THISDIR}/${BPN}:" -BPN = "nautilus" -inherit gnome - -SRC_URI += "file://no-try-run-strftime.diff" -SRC_URI[archive.md5sum] = "12314328b59aa1dfd83619f718b81bd5" -SRC_URI[archive.sha256sum] = "c482d6e7babcc238304cf55586cdf7e2b2806025214a143ed355f0d89b33b154" - -EXTRA_OECONF = " --disable-gtk-doc --disable-update-mimedb --enable-nst-extension" -export SYSROOT = "${STAGING_DIR_HOST}" - -do_configure() { - sed -i -e /docs/d ${S}/Makefile.am - autotools_do_configure -} - -RDEPENDS_${PN} = "gvfs gvfsd-ftp gvfsd-sftp gvfsd-trash glib-2.0-utils" -FILES_${PN} += "${datadir}/icons \ - /usr/libexec/ \ - ${datadir}/nautilus* \ - ${datadir}/dbus-1 \ - ${libdir}/nautilus/extensions*/*.so \ -" -FILES_${PN}-dbg += "/usr/libexec/.debug \ - ${libdir}/nautilus/extensions*/.debug" - -# Don't make nautils drag us in -PRIVATE_LIBS = "libnautilus-extension.so.1" - -pkg_postinst_${PN} () { -if [ -n "$D" ]; then - exit 1 -fi - -glib-compile-schemas ${datadir}/glib-2.0/schemas -} - -# 3.2.1-r4/nautilus-3.2.1/eel/eel-gnome-extensions.c:34:50: fatal error: libgnome-desktop/gnome-desktop-utils.h: No such file or directory -# 3.2.1-r4/nautilus-3.2.1/eel/eel-editable-label.c:3105:55: error: 'GTK_STOCK_CUT' undeclared (first use in this function) -PNBLACKLIST[nautilus3] ?= "BROKEN: fails to build, maybe missing dependency on gnome-desktop-utils.h provider - the recipe will be removed on 2017-09-01 unless the issue is fixed" diff --git a/meta-gnome/recipes-gnome/nautilus/nautilus_2.32.2.bb b/meta-gnome/recipes-gnome/nautilus/nautilus_2.32.2.bb deleted file mode 100644 index caf7f57b18..0000000000 --- a/meta-gnome/recipes-gnome/nautilus/nautilus_2.32.2.bb +++ /dev/null @@ -1,43 +0,0 @@ -# nautilus OE build file -# Copyright (C) 2005, Advanced Micro Devices, Inc. All Rights Reserved -# Released under the MIT license (see packages/COPYING) - -LICENSE="GPLv2 & LGPLv2" -LIC_FILES_CHKSUM = "file://COPYING;md5=7c0048536e43642a1f3a724c2909872b \ - file://COPYING.LIB;md5=f30a9716ef3762e3467a2f62bf790f0a" - -PR = "r6" - -DEPENDS = "gdk-pixbuf gtk+ libunique gvfs librsvg libexif esound gnome-desktop orbit2-native" -# optional: tracker - -inherit gnome gobject-introspection - -SRC_URI[archive.md5sum] = "51565aa10d1625dff56e381228346911" -SRC_URI[archive.sha256sum] = "2d4ff28c7a7aa5d40eb2468149954a564c257a305183773057584d22d15347a2" -GNOME_COMPRESS_TYPE="bz2" - -SRC_URI += "file://idl-sysroot.patch \ - file://no-try-run-strftime.diff \ - file://no-G_DISABLE_DEPRECATED.patch \ -" - - -EXTRA_OECONF = " --disable-gtk-doc --disable-update-mimedb " -export SYSROOT = "${STAGING_DIR_HOST}" - -do_configure() { - sed -i -e /docs/d ${S}/Makefile.am - autotools_do_configure - # We need native orbit-idl with target idl files. No way to say it in a clean way: - find ${B} -name Makefile -exec sed -i '/\/usr\/bin\/orbit-idl-2/{s:/usr/bin:${STAGING_BINDIR_NATIVE}:;s:/usr/share:${STAGING_DATADIR}:g}' {} \; -} - -RDEPENDS_${PN} = "gvfs gvfsd-ftp gvfsd-sftp gvfsd-trash glib-networking" -FILES_${PN} += "${datadir}/icons" - -# Don't make nautils3 drag us in -PRIVATE_LIBS = "libnautilus-extension.so.1" - - -PNBLACKLIST[nautilus] ?= "Depends on blacklisted gnome-desktop - the recipe will be removed on 2017-09-01 unless the issue is fixed" diff --git a/meta-gnome/recipes-gnome/pimlico/contacts.inc b/meta-gnome/recipes-gnome/pimlico/contacts.inc deleted file mode 100644 index fedd223328..0000000000 --- a/meta-gnome/recipes-gnome/pimlico/contacts.inc +++ /dev/null @@ -1,28 +0,0 @@ -DESCRIPTION = "Address-book application." -HOMEPAGE = "http://pimlico-project.org/contacts.html" -BUGTRACKER = "https://bugzilla.gnome.org/" - -LICENSE = "GPLv2 & GPLv2+ & GPLv3+ " -SECTION = "x11" -DEPENDS = "glib-2.0 gtk+ evolution-data-server intltool-native" -RDEPENDS_${PN} = "libedata-book" - -inherit autotools pkgconfig gconf - -EXTRA_OECONF += "--disable-gnome-vfs" -EXTRA_OEMAKE += "GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1" - -do_install_append () { - install -d ${D}/${datadir}/pixmaps - install -m 0644 ${WORKDIR}/stock_contact.png ${D}/${datadir}/pixmaps - install -m 0644 ${WORKDIR}/stock_person.png ${D}/${datadir}/pixmaps -} - -FILES_${PN} += "${datadir}/pixmaps/stock_contact.png \ - ${datadir}/pixmaps/stock_person.png \ - ${datadir}/icons/hicolor" - -SRC_URI = "file://stock_contact.png \ - file://stock_person.png \ - file://contacts-conditionally-install-schema.patch \ -" diff --git a/meta-gnome/recipes-gnome/pimlico/contacts/contacts-conditionally-install-schema.patch b/meta-gnome/recipes-gnome/pimlico/contacts/contacts-conditionally-install-schema.patch deleted file mode 100644 index 2ab7882c81..0000000000 --- a/meta-gnome/recipes-gnome/pimlico/contacts/contacts-conditionally-install-schema.patch +++ /dev/null @@ -1,37 +0,0 @@ -Install schema should respect to GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL - -If GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL is set, the schema should not -be installed. - -Signed-off-by: Robert Yang <liezhi.yang@windriver.com> - -Upstream-Status: Pending ---- - data/Makefile.am | 7 ++++--- - 1 files changed, 4 insertions(+), 3 deletions(-) - -diff --git a/data/Makefile.am b/data/Makefile.am -index f790823..b6fd643 100644 ---- a/data/Makefile.am -+++ b/data/Makefile.am -@@ -14,13 +14,14 @@ dist_man1_MANS = contacts.1 - - if HAVE_GCONF - install-data-local: -- GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) \ -+ if [ "$(GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL)" != "1" ]; then \ -+ GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) \ - $(GCONFTOOL) --makefile-install-rule $(schema_DATA) || \ - (echo ;\ - echo "*****************************************************"; \ - echo "Installation of schemas failed, install them manually"; \ -- echo "*****************************************************";) -- @true -+ echo "*****************************************************";); \ -+ fi - endif - - CLEANFILES = $(desktop_DATA) --- -1.7.7.6 - diff --git a/meta-gnome/recipes-gnome/pimlico/contacts/make-382.patch b/meta-gnome/recipes-gnome/pimlico/contacts/make-382.patch deleted file mode 100644 index a7cfee3a00..0000000000 --- a/meta-gnome/recipes-gnome/pimlico/contacts/make-382.patch +++ /dev/null @@ -1,16 +0,0 @@ -Fix for stricter parser in make 3.82. This fix has been pushed to upstream git. - -JL - 15/12/10 - -Upstream-Status: Accepted - -Index: git/Makefile.am -=================================================================== ---- git.orig/Makefile.am -+++ git/Makefile.am -@@ -11,4 +11,4 @@ DISTCLEANFILES = $(INTLTOOL_BUILT) - MAINTAINERCLEANFILES = aclocal.m4 compile config.guess config.sub configure depcomp $(INTLTOOL_BUILT:=.in) install-sh ltmain.sh mkinstalldirs Makefile.in missing - - snapshot: -- $(MAKE) dist distdir=$(PACKAGE)-snap`date +"%Y%m%d"` -+ $(MAKE) dist distdir=$(PACKAGE)-snap`date +"%Y%m%d"` diff --git a/meta-gnome/recipes-gnome/pimlico/contacts_0.9.bb b/meta-gnome/recipes-gnome/pimlico/contacts_0.9.bb deleted file mode 100644 index 516cf93e42..0000000000 --- a/meta-gnome/recipes-gnome/pimlico/contacts_0.9.bb +++ /dev/null @@ -1,20 +0,0 @@ -require contacts.inc - -PR = "r8" - -SRC_URI =+ "http://pimlico-project.org/sources/${BPN}/${BPN}-${PV}.tar.gz" - -SRC_URI[md5sum] = "aab5affbf93d6fa7b978b323a8d44de0" -SRC_URI[sha256sum] = "9cacec98f8123993033aaa255f3f4c04c86a1be65e487dd21f0aaa54384a6f6d" - -LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \ - file://src/contacts-main.h;endline=18;md5=0371af46fbc72e33575e0072dca5fb19 \ - file://src/contacts-dbus.c;endline=18;md5=e4da9ac1a0539fafc7df431010904fd5 \ - file://src/contacts-gtk.c;endline=21;md5=1c2e3f55b215635eff4ba76f7696f8ee" - -do_configure_prepend () { - # It used 8 spaces to instead of a tab, but it doesn't work for us - sed -i 's/^ $(MAKE) dist distdir=/\t$(MAKE) dist distdir/' Makefile.am -} - -PNBLACKLIST[contacts] ?= "Fails to fetch, pimlico-project.org is gone http://errors.yoctoproject.org/Errors/Details/132854/ - the recipe will be removed on 2017-09-01 unless the issue is fixed" diff --git a/meta-gnome/recipes-gnome/pimlico/contacts_git.bb b/meta-gnome/recipes-gnome/pimlico/contacts_git.bb deleted file mode 100644 index b46e9d9db5..0000000000 --- a/meta-gnome/recipes-gnome/pimlico/contacts_git.bb +++ /dev/null @@ -1,19 +0,0 @@ -require contacts.inc - -LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \ - file://src/contacts-main.h;endline=20;md5=9dc3531c914fb6d6d4a8d1aee4519fef \ - file://src/contacts-dbus.c;endline=20;md5=95e02d77f155fbd07a14dba3348b9b03 \ - file://src/contacts-gtk.c;endline=23;md5=e1ee9b9e72045f2d3aa44cf17313b46e" - -SRCREV = "19853893fdb595de6aa59db0d9dc2f9451ed2933" -PV = "0.12+git${SRCPV}" -PR = "r4" - -S = "${WORKDIR}/git" - -SRC_URI =+ "git://git.gnome.org/${BPN} \ - file://make-382.patch" - -S = "${WORKDIR}/git" - -PNBLACKLIST[contacts] ?= "Fails to build with RSS http://errors.yoctoproject.org/Errors/Details/132826/ - the recipe will be removed on 2017-09-01 unless the issue is fixed" diff --git a/meta-gnome/recipes-gnome/pimlico/tasks.inc b/meta-gnome/recipes-gnome/pimlico/tasks.inc deleted file mode 100644 index f8217dc3a1..0000000000 --- a/meta-gnome/recipes-gnome/pimlico/tasks.inc +++ /dev/null @@ -1,10 +0,0 @@ -DESCRIPTION = "Task list application" -HOMEPAGE = "http://pimlico-project.org/tasks.html" -BUGTRACKER = "https://bugzilla.gnome.org/" - -LICENSE = "GPLv2 & GPLv2+" - -SECTION = "x11" -DEPENDS = "glib-2.0 gtk+ evolution-data-server intltool-native" - -inherit autotools pkgconfig gtk-icon-cache diff --git a/meta-gnome/recipes-gnome/pimlico/tasks_0.19.bb b/meta-gnome/recipes-gnome/pimlico/tasks_0.19.bb deleted file mode 100644 index 42c20c47ea..0000000000 --- a/meta-gnome/recipes-gnome/pimlico/tasks_0.19.bb +++ /dev/null @@ -1,16 +0,0 @@ -require tasks.inc - -LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \ - file://src/gtk/main.c;endline=19;md5=8659d0b7fd68a2ad6ac30c6539ea5b82 \ - file://src/omoko/openmoko-tasks.c;endline=20;md5=04d56a46863c9f4247694f40257a836a \ - file://src/hildon/hildon-tasks.c;endline=21;md5=488ddf31dc14b2196dec7cc736211b52" - -SRC_URI = "http://pimlico-project.org/sources/${BPN}/${BPN}-${PV}.tar.gz" - -SRC_URI[md5sum] = "0afd969758561599fd782e1effb39c08" -SRC_URI[sha256sum] = "1a7fdc5f95a2193a1a25fdb13f071867fb7e42245ce19ccee4bcccb69e557f2e" - -PR = "r3" - -# tasks-0.19/libkoto/koto-utils.c:81:3: error: format not a string literal, argument types not checked [-Werror=format-nonliteral] -PNBLACKLIST[tasks] ?= "Fails to build with gcc-6 - the recipe will be removed on 2017-09-01 unless the issue is fixed" diff --git a/meta-gnome/recipes-gnome/pimlico/tasks_git.bb b/meta-gnome/recipes-gnome/pimlico/tasks_git.bb deleted file mode 100644 index b71f1dc5bc..0000000000 --- a/meta-gnome/recipes-gnome/pimlico/tasks_git.bb +++ /dev/null @@ -1,12 +0,0 @@ -require tasks.inc - -SRC_URI = "git://git.gnome.org/${BPN}" - -SRCREV = "ea52d46d691c5fce4473ea4e24a35411381f3a65" -PV = "0.13+git${SRCPV}" -PR = "r3" - -S = "${WORKDIR}/git" - -# ../../git/libkoto/koto-utils.c:81:3: error: format not a string literal, argument types not checked [-Werror=format-nonliteral] -PNBLACKLIST[tasks] ?= "Fails to build with gcc-6 - the recipe will be removed on 2017-09-01 unless the issue is fixed" diff --git a/meta-gnome/recipes-gnome/system-tools/system-tools-backends-2.10.2/add-angstrom-distro.patch b/meta-gnome/recipes-gnome/system-tools/system-tools-backends-2.10.2/add-angstrom-distro.patch deleted file mode 100644 index cb03fd86e5..0000000000 --- a/meta-gnome/recipes-gnome/system-tools/system-tools-backends-2.10.2/add-angstrom-distro.patch +++ /dev/null @@ -1,41 +0,0 @@ -From b5084616a3bc2a0d485f43aeae69c6025f3f857e Mon Sep 17 00:00:00 2001 -From: Koen Kooi <koen@dominion.thruhere.net> -Date: Fri, 10 Jun 2011 18:44:21 +0200 -Subject: [PATCH] add support for the angstrom distribtion - -Signed-off-by: Koen Kooi <koen@dominion.thruhere.net> ---- - Utils/Platform.pm | 3 +++ - 1 files changed, 3 insertions(+), 0 deletions(-) - -diff --git a/Utils/Platform.pm b/Utils/Platform.pm -index fc76360..8b8c770 100644 ---- a/Utils/Platform.pm -+++ b/Utils/Platform.pm -@@ -92,6 +92,7 @@ my $PLATFORM_INFO = { - "nexenta-1.0" => [ "Nexenta GNU/Solaris", "1.0", "Ellate" ], - "yellowdog-4.1" => [ "Yellow Dog Linux", "4.1", "Sagitta" ], - "guadalinex-v4" => [ "Guadalinex", "v4", "Toro" ], -+ "angstrom" => [ "Angstrom", "", "" ], - }; - - sub get_platform_info -@@ -143,6 +144,7 @@ sub ensure_distro_map - "vine-3.1" => "vine-3.0", - "vlos-1.2" => "gentoo", - "nexenta-1.0" => "solaris-2.11", -+ "angstrom" => "debian", - ); - - return $metamap{$distro} if ($metamap{$distro}); -@@ -375,6 +377,7 @@ sub guess - [ \&check_ark ], - [ \&check_yoper ], - [ \&check_distro_file, "/etc/yellowdog-release", "yellowdog", "^Yellow Dog Linux release (\\S+)" ], -+ [ \&check_file_exists, "/etc/angstrom-version", "angstrom" ], - ], - "FreeBSD" => [[ \&check_freebsd ]], - "SunOS" => [[ \&check_solaris ]] --- -1.6.6.1 - diff --git a/meta-gnome/recipes-gnome/system-tools/system-tools-backends_2.10.2.bb b/meta-gnome/recipes-gnome/system-tools/system-tools-backends_2.10.2.bb deleted file mode 100644 index 862c0ea302..0000000000 --- a/meta-gnome/recipes-gnome/system-tools/system-tools-backends_2.10.2.bb +++ /dev/null @@ -1,54 +0,0 @@ -SUMMARY = "gnome system tools backends" -LICENSE = "GPLv3" -LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504" - -DEPENDS = "dbus dbus-glib glib-2.0 polkit" - -inherit gnome pkgconfig update-rc.d gettext - -SRC_URI[archive.md5sum] = "edae148b31342aecae035051adc70c74" -SRC_URI[archive.sha256sum] = "1dbe5177df46a9c7250735e05e77129fe7ec04840771accfa87690111ca2c670" - -SRC_URI += " \ - file://system-tools-backends \ -" - -# This needs to move to meta-angstrom -SRC_URI_append_angstrom = " \ - file://add-angstrom-distro.patch \ -" - -EXTRA_OECONF = " --with-net-dbus=${libdir}/perl5 " - -do_configure() { - rm missing || true - automake --add-missing - sed -i -e 's:CC=$(CC):CC="$(CC)":g' ${S}/Net-DBus/Makefile.am - sed -i -e 's:CC=$(CC):CC="$(CC)":g' ${S}/Net-DBus/Makefile.in - libtoolize --force --install - aclocal - gnu-configize - oe_runconf - cp ${STAGING_BINDIR_CROSS}/${HOST_SYS}-libtool ${S} -} - -do_install_append () { - install -d ${D}/${sysconfdir}/init.d - install -m 0755 ${WORKDIR}/system-tools-backends ${D}/${sysconfdir}/init.d/ -} - -INITSCRIPT_NAME = "system-tools-backends" -INITSCRIPT_PARAMS = "start 50 2 3 4 5 . stop 70 1 ." - -# Shadow added so there is a full adduser/deluser -# (Gnome images tend to pull in shadow anyway) -RDEPENDS_${PN} = "shadow" - -FILES_${PN} += " ${sysconfdir}/dbus-1/system.d" -FILES_${PN} += " ${libdir}/pkgconfig" -FILES_${PN} += " ${datadir}/dbus-1/system-services" -FILES_${PN} += " ${datadir}/system-tools-backends-2.0/files" -FILES_${PN} += " ${datadir}/system-tools-backends-2.0/scripts" -FILES_${PN} += " ${datadir}/polkit*" - -PNBLACKLIST[system-tools-backends] ?= "does not build with distroless qemuarm as reported in 'State of bitbake world' thread, nobody volunteered to fix them - the recipe will be removed on 2017-09-01 unless the issue is fixed" diff --git a/meta-gnome/recipes-gnome/zenity/files/0001-Makefile.am-don-t-build-help.patch b/meta-gnome/recipes-gnome/zenity/files/0001-Makefile.am-don-t-build-help.patch deleted file mode 100644 index 50c9cb99f6..0000000000 --- a/meta-gnome/recipes-gnome/zenity/files/0001-Makefile.am-don-t-build-help.patch +++ /dev/null @@ -1,39 +0,0 @@ -From 17e5606f8c4c8ff26ba18489aad4c484cf8e2949 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com> -Date: Mon, 29 Apr 2013 11:34:27 +0200 -Subject: [PATCH] Makefile.am: don't build help -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -it crashes with: - -| warning: failed to load external entity "/usr/share/xml/gnome/xslt/docbook/omf/db2omf.xsl" -| cannot parse /usr/share/xml/gnome/xslt/docbook/omf/db2omf.xsl -| make[2]: *** [zenity-bg.omf] Error 1 -| make[2]: Leaving directory `/home/andreas/tmp/oe-core-eglibc/work/armv7a-vfp-neon-angstrom-linux-gnueabi/zenity/2.32.1-r2/zenity-2.32.1/help' - -Upstream-Status: Inappropriate [configuration] - -Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com> ---- - Makefile.am | 3 +-- - 1 files changed, 1 insertions(+), 2 deletions(-) - -diff --git a/Makefile.am b/Makefile.am -index 03accc1..caec7f0 100644 ---- a/Makefile.am -+++ b/Makefile.am -@@ -1,8 +1,7 @@ - SUBDIRS = \ - src \ - po \ -- data \ -- help -+ data - - EXTRA_DIST = \ - autogen.sh \ --- -1.7.6.5 - diff --git a/meta-gnome/recipes-gnome/zenity/zenity_2.32.1.bb b/meta-gnome/recipes-gnome/zenity/zenity_2.32.1.bb deleted file mode 100644 index bd9f7a0ab6..0000000000 --- a/meta-gnome/recipes-gnome/zenity/zenity_2.32.1.bb +++ /dev/null @@ -1,21 +0,0 @@ -SUMMARY = "Display dialog boxes from the commandline and shell scripts" -LICENSE = "LGPLv2" -LIC_FILES_CHKSUM = "file://COPYING;md5=3bf50002aefd002f49e7bb854063f7e7" - -PR = "r2" - -PNBLACKLIST[zenity] ?= "BROKEN: doesn't build with B!=S - the recipe will be removed on 2017-09-01 unless the issue is fixed" - -DEPENDS = "gtk+ glib-2.0 libnotify gnome-doc-utils" - -inherit gnomebase -SRC_URI += "file://0001-Makefile.am-don-t-build-help.patch" -SRC_URI[archive.md5sum] = "aa66ec35451b16e424519b4973082170" -SRC_URI[archive.sha256sum] = "8838be041a07364b62a4281c971392e4a09bb01bb3237a836ec0457ec0ea18ac" - -EXTRA_OECONF += "--disable-scrollkeeper" -# remove -I/usr/include from zenity_CPPFLAGS -do_configure_prepend() { - sed -i -e '/-I$(includedir)/d' src/Makefile.am -} - diff --git a/meta-gnome/recipes-support/florence/files/0001-Fix-glib-includes.patch b/meta-gnome/recipes-support/florence/files/0001-Fix-glib-includes.patch deleted file mode 100644 index 83e598e6a6..0000000000 --- a/meta-gnome/recipes-support/florence/files/0001-Fix-glib-includes.patch +++ /dev/null @@ -1,33 +0,0 @@ -From c8419ef05ff92ffa3de2e626eb6acd5d2df3baa1 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com> -Date: Tue, 15 May 2012 13:40:05 +0200 -Subject: [PATCH] Fix glib includes -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit -Upstream-Status: unknown - -Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com> ---- - src/trace.c | 5 +---- - 1 files changed, 1 insertions(+), 4 deletions(-) - -diff --git a/src/trace.c b/src/trace.c -index 5ea5c13..774c56d 100644 ---- a/src/trace.c -+++ b/src/trace.c -@@ -21,10 +21,7 @@ - - #include "trace.h" - #include "system.h" --#include <glib/gprintf.h> --#include <glib/gutils.h> --#include <glib/gslist.h> --#include <glib/gstrfuncs.h> -+#include <glib.h> - #include <stdio.h> - #include <stdarg.h> - --- -1.7.6.5 - diff --git a/meta-gnome/recipes-support/goffice/goffice/0001-configure.ac-fix-paths-to-introspection-tools.patch b/meta-gnome/recipes-support/goffice/goffice/0001-configure.ac-fix-paths-to-introspection-tools.patch deleted file mode 100644 index a645978d92..0000000000 --- a/meta-gnome/recipes-support/goffice/goffice/0001-configure.ac-fix-paths-to-introspection-tools.patch +++ /dev/null @@ -1,41 +0,0 @@ -From 8e158c16cd15fff08b42ed86edc55816d3387837 Mon Sep 17 00:00:00 2001 -From: Alexander Kanavin <alex.kanavin@gmail.com> -Date: Fri, 19 Feb 2016 16:04:24 +0200 -Subject: [PATCH] configure.ac: fix paths to introspection tools - -They need to be prefixed with $PKG_CONFIG_SYSROOT_DIR - -Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> ---- - configure.ac | 8 ++++---- - 1 file changed, 4 insertions(+), 4 deletions(-) - -diff --git a/configure.ac b/configure.ac -index 6d2b747..3b28463 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -706,9 +706,9 @@ if test "x$found_introspection" = "xyes"; then - dnl python where to find libgoffice, so you might also need to set - dnl LD_LIBRARY_PATH. - -- INTROSPECTION_SCANNER=`$PKG_CONFIG --variable=g_ir_scanner gobject-introspection-1.0` -- INTROSPECTION_COMPILER=`$PKG_CONFIG --variable=g_ir_compiler gobject-introspection-1.0` -- INTROSPECTION_GENERATE=`$PKG_CONFIG --variable=g_ir_generate gobject-introspection-1.0` -+ INTROSPECTION_SCANNER=$PKG_CONFIG_SYSROOT_DIR`$PKG_CONFIG --variable=g_ir_scanner gobject-introspection-1.0` -+ INTROSPECTION_COMPILER=$PKG_CONFIG_SYSROOT_DIR`$PKG_CONFIG --variable=g_ir_compiler gobject-introspection-1.0` -+ INTROSPECTION_GENERATE=$PKG_CONFIG_SYSROOT_DIR`$PKG_CONFIG --variable=g_ir_generate gobject-introspection-1.0` - if test "x$INTROSPECTION_GIRDIR" = x; then - INTROSPECTION_GIRDIR=`$PKG_CONFIG --variable=girdir gobject-introspection-1.0` - fi -@@ -717,7 +717,7 @@ if test "x$found_introspection" = "xyes"; then - fi - INTROSPECTION_CFLAGS=`$PKG_CONFIG --cflags gobject-introspection-1.0` - INTROSPECTION_LIBS=`$PKG_CONFIG --libs gobject-introspection-1.0` -- INTROSPECTION_MAKEFILE=`$PKG_CONFIG --variable=datadir gobject-introspection-1.0`/gobject-introspection-1.0/Makefile.introspection -+ INTROSPECTION_MAKEFILE=$PKG_CONFIG_SYSROOT_DIR`$PKG_CONFIG --variable=datadir gobject-introspection-1.0`/gobject-introspection-1.0/Makefile.introspection - else - INTROSPECTION_SCANNER= - INTROSPECTION_COMPILER= --- -2.7.0 - diff --git a/meta-gnome/recipes-support/goffice/goffice_0.10.1.bb b/meta-gnome/recipes-support/goffice/goffice_0.10.1.bb deleted file mode 100644 index 6a2080d4cc..0000000000 --- a/meta-gnome/recipes-support/goffice/goffice_0.10.1.bb +++ /dev/null @@ -1,51 +0,0 @@ -DESCRIPTION="Gnome Office Library" - -LICENSE="GPLv2" -LIC_FILES_CHKSUM = "file://COPYING;md5=6dc33ff21e1ba1ac1a2a1069d361e29e" - -DEPENDS = "libxml-parser-perl-native glib-2.0 gtk+3 pango cairo libgsf libpcre libxml2 libart-lgpl librsvg intltool" - -inherit gnomebase pkgconfig perlnative gobject-introspection - -GNOME_COMPRESS_TYPE = "xz" - -SRC_URI += "file://0001-configure.ac-fix-paths-to-introspection-tools.patch" - -SRC_URI[archive.md5sum] = "90fd17c6fe205b779571e00d9b0b4727" -SRC_URI[archive.sha256sum] = "5c38f4e81e874cc8e89481b080f77c47c72bfd6fe2526f4fc2ef87c17f96cad0" - -FILES_${PN}-dbg += "${libdir}/goffice/${PV}/plugins/*/.debug" - -RRECOMMENDS_${PN} = " \ - goffice-plugin-plot-barcol \ - goffice-plugin-plot-distrib \ - goffice-plugin-plot-pie \ - goffice-plugin-plot-radar \ - goffice-plugin-plot-surface \ - goffice-plugin-plot-xy \ - goffice-plugin-reg-linear \ - goffice-plugin-reg-logfit \ - goffice-plugin-smoothing \ -" - -FILES_${PN} = "${bindir}/* ${sbindir}/* ${libexecdir}/* ${libdir}/lib*${SOLIBS} \ - ${sysconfdir} ${sharedstatedir} ${localstatedir} \ - ${base_bindir}/* ${base_sbindir}/* \ - ${base_libdir}/*${SOLIBS} \ - ${datadir}/${PN} \ - ${datadir}/pixmaps ${datadir}/applications \ - ${datadir}/idl ${datadir}/omf ${datadir}/sounds \ - ${libdir}/bonobo/servers" - -FILES_${PN}-locale = "${libdir}/locale" - -PACKAGES_DYNAMIC += "^goffice-plugin-.*" - -python populate_packages_prepend () { - goffice_libdir = d.expand('${libdir}/goffice/${PV}/plugins/') - - do_split_packages(d, goffice_libdir, '(.*)', 'goffice-plugin-%s', 'Goffice plugin for %s', allow_dirs=True) -} - -# | ../../goffice-0.10.1/goffice/math/go-complex.c:75:3: error: format not a string literal, argument types not checked [-Werror=format-nonliteral] -PNBLACKLIST[goffice] ?= "BROKEN: fails to build with gcc-6 - the recipe will be removed on 2017-09-01 unless the issue is fixed" diff --git a/meta-gnome/recipes-support/tracker/tracker-0.14.2/enable-sqlite-crosscompile.patch b/meta-gnome/recipes-support/tracker/tracker-0.14.2/enable-sqlite-crosscompile.patch deleted file mode 100644 index 5dadda2a29..0000000000 --- a/meta-gnome/recipes-support/tracker/tracker-0.14.2/enable-sqlite-crosscompile.patch +++ /dev/null @@ -1,13 +0,0 @@ -Index: tracker-0.10.17/m4/sqlite-threadsafe.m4 -=================================================================== ---- tracker-0.10.17.orig/m4/sqlite-threadsafe.m4 -+++ tracker-0.10.17/m4/sqlite-threadsafe.m4 -@@ -45,7 +45,7 @@ int main () - ]])], - [ax_cv_sqlite_threadsafe=yes], - [ax_cv_sqlite_threadsafe=no], -- [ax_cv_sqlite_threadsafe=no])]) -+ [ax_cv_sqlite_threadsafe=yes])]) - - LIBS="$save_LIBS" - ]) diff --git a/meta-gnome/recipes-support/tracker/tracker-0.14.2/fix-removable-media-detection.patch b/meta-gnome/recipes-support/tracker/tracker-0.14.2/fix-removable-media-detection.patch deleted file mode 100644 index 6c3d9de107..0000000000 --- a/meta-gnome/recipes-support/tracker/tracker-0.14.2/fix-removable-media-detection.patch +++ /dev/null @@ -1,30 +0,0 @@ -Index: tracker-0.14.2/src/libtracker-miner/tracker-storage.c -=================================================================== ---- tracker-0.14.2.orig/src/libtracker-miner/tracker-storage.c 2011-08-03 13:53:16.000000000 +0100 -+++ tracker-0.14.2/src/libtracker-miner/tracker-storage.c 2012-09-10 08:25:18.322215126 +0100 -@@ -20,6 +20,7 @@ - #include "config.h" - - #include <string.h> -+#include <sys/stat.h> - - #include <gio/gio.h> - #include <gio/gunixmounts.h> -@@ -646,6 +647,17 @@ - gchar *content_type; - gboolean is_multimedia; - gboolean is_blank; -+ struct stat st; -+ -+ /* -+ * Consider all files under /media to be -+ * removable unless the file .this-is-root is -+ * present. -+ */ -+ if (!strncmp (mount_path, "/media/", -+ strlen ("/media/")) && -+ stat ("/media/.this-is-root", &st)) -+ is_removable = TRUE; - - content_type = mount_guess_content_type (mount, &is_optical, &is_multimedia, &is_blank); - diff --git a/meta-gnome/recipes-support/tracker/tracker-0.14.2/giflib5-support.patch b/meta-gnome/recipes-support/tracker/tracker-0.14.2/giflib5-support.patch deleted file mode 100644 index fab3371f0f..0000000000 --- a/meta-gnome/recipes-support/tracker/tracker-0.14.2/giflib5-support.patch +++ /dev/null @@ -1,126 +0,0 @@ - src/tracker-extract/tracker-extract-gif.c | 36 +++++++++++++++++++++++++++++ - 1 file changed, 36 insertions(+) ---- a/src/tracker-extract/tracker-extract-gif.c -+++ a/src/tracker-extract/tracker-extract-gif.c -@@ -75,6 +75,39 @@ - return (GIF_OK); - } - -+#if GIFLIB_MAJOR >= 5 -+static inline void -+gif_error (const gchar *action, int err) -+{ -+ const char *str = GifErrorString (err); -+ if (str != NULL) { -+ g_message ("%s, error: '%s'", action, str); -+ } else { -+ g_message ("%s, undefined error %d", action, err); -+ } -+} -+#else /* GIFLIB_MAJOR >= 5 */ -+static inline void print_gif_error() -+{ -+#if defined(GIFLIB_MAJOR) && defined(GIFLIB_MINOR) && ((GIFLIB_MAJOR == 4 && GIFLIB_MINOR >= 2) || GIFLIB_MAJOR > 4) -+ const char *str = GifErrorString (); -+ if (str != NULL) { -+ g_message ("GIF, error: '%s'", str); -+ } else { -+ g_message ("GIF, undefined error"); -+ } -+#else -+ PrintGifError(); -+#endif -+} -+#endif /* GIFLIB_MAJOR >= 5 */ -+ -+/* giflib 5.1 changed the API of DGifCloseFile to take two arguments */ -+#if !defined(GIFLIB_MAJOR) || \ -+ !(GIFLIB_MAJOR > 5 || (GIFLIB_MAJOR == 5 && GIFLIB_MINOR >= 1)) -+#define DGifCloseFile(a, b) DGifCloseFile(a) -+#endif -+ - static void - read_metadata (TrackerSparqlBuilder *preupdate, - TrackerSparqlBuilder *metadata, -@@ -100,14 +133,22 @@ - ExtBlock extBlock; - - if (DGifGetRecordType(gifFile, &RecordType) == GIF_ERROR) { -- PrintGifError(); -+#if GIFLIB_MAJOR < 5 -+ print_gif_error (); -+#else /* GIFLIB_MAJOR < 5 */ -+ gif_error ("Could not read next GIF record type", gifFile->Error); -+#endif /* GIFLIB_MAJOR < 5 */ - return; - } - - switch (RecordType) { - case IMAGE_DESC_RECORD_TYPE: - if (DGifGetImageDesc(gifFile) == GIF_ERROR) { -- PrintGifError(); -+#if GIFLIB_MAJOR < 5 -+ print_gif_error(); -+#else /* GIFLIB_MAJOR < 5 */ -+ gif_error ("Could not get GIF record information", gifFile->Error); -+#endif /* GIFLIB_MAJOR < 5 */ - return; - } - -@@ -117,7 +158,11 @@ - framedata = g_malloc (framewidth*frameheight); - - if (DGifGetLine(gifFile, framedata, framewidth*frameheight)==GIF_ERROR) { -- PrintGifError(); -+#if GIFLIB_MAJOR < 5 -+ print_gif_error(); -+#else /* GIFLIB_MAJOR < 5 */ -+ gif_error ("Could not load a block of GIF pixes", gifFile->Error); -+#endif /* GIFLIB_MAJOR < 5 */ - return; - } - -@@ -593,6 +638,9 @@ - gchar *filename, *uri; - GFile *file; - int fd; -+#if GIFLIB_MAJOR >= 5 -+ int err; -+#endif - - preupdate = tracker_extract_info_get_preupdate_builder (info); - metadata = tracker_extract_info_get_metadata_builder (info); -@@ -617,8 +665,14 @@ - return FALSE; - } - -+#if GIFLIB_MAJOR < 5 - if ((gifFile = DGifOpenFileHandle (fd)) == NULL) { -- PrintGifError (); -+ print_gif_error (); -+#else /* GIFLIB_MAJOR < 5 */ -+ if ((gifFile = DGifOpenFileHandle (fd, &err)) == NULL) { -+ gif_error ("Could not open GIF file with handle", err); -+#endif /* GIFLIB_MAJOR < 5 */ -+ g_free (filename); - close (fd); - return FALSE; - } -@@ -637,10 +691,15 @@ - g_string_free (where, TRUE); - - g_free (uri); -- -+#if GIFLIB_MAJOR < 5 - if (DGifCloseFile (gifFile) != GIF_OK) { -- PrintGifError (); -+ print_gif_error (); -+ } -+#else /* GIFLIB_MAJOR < 5 */ -+ if (DGifCloseFile (gifFile, NULL) != GIF_OK) { -+ gif_error ("Could not close GIF file", gifFile->Error); - } -+#endif /* GIFLIB_MAJOR < 5 */ - - return TRUE; - } diff --git a/meta-gnome/recipes-support/tracker/tracker_0.14.2.bb b/meta-gnome/recipes-support/tracker/tracker_0.14.2.bb deleted file mode 100644 index eb36a120fe..0000000000 --- a/meta-gnome/recipes-support/tracker/tracker_0.14.2.bb +++ /dev/null @@ -1,88 +0,0 @@ -DESCRIPTION = "Tracker is a tool designed to extract information and metadata about your personal data so that it can be searched easily and quickly." -LICENSE = "GPLv2" -LIC_FILES_CHKSUM = "file://COPYING;md5=ee31012bf90e7b8c108c69f197f3e3a4" -DEPENDS = "file gstreamer dbus libexif gettext sqlite3 icu gst-plugins-base libgnome-keyring poppler tiff enca libgsf libunistring giflib taglib bzip2 upower gtk+3 libgee networkmanager intltool-native" - -RDEPENDS_${PN} += " gvfs gsettings-desktop-schemas" - -RDEPENDS_${PN}-nautilus-extension += "nautilus" -HOMEPAGE = "http://projects.gnome.org/tracker/" - -PR = "r7" - -inherit autotools pkgconfig gnomebase gettext gsettings systemd gobject-introspection - -VER_DIR = "${@gnome_verdir("${PV}")}" -SRC_URI = "http://ftp.gnome.org/pub/GNOME/sources/tracker/${VER_DIR}/tracker-${PV}.tar.xz \ - file://enable-sqlite-crosscompile.patch \ - file://fix-removable-media-detection.patch \ - file://giflib5-support.patch \ - file://90tracker \ - file://tracker-store.service \ - file://tracker-miner-fs.service \ - file://tracker-dbus.service \ - " - -SYSTEMD_SERVICE_${PN} = " tracker-store.service tracker-miner-fs.service tracker-dbus.service " -SYSTEMD_AUTO_ENABLE = "disable" - -EXTRA_OECONF += " tracker_cv_have_ioprio=yes" - -PACKAGECONFIG ?= "nautilus" -PACKAGECONFIG[nautilus] = "--enable-nautilus-extension,--disable-nautilus-extension,nautilus" - -# Disable the desktop-centric miners -EXTRA_OECONF += "--disable-miner-thunderbird --disable-miner-firefox \ - --disable-miner-evolution --disable-miner-flickr" - -LEAD_SONAME = "libtrackerclient.so.0" - -do_compile_prepend() { - export GIR_EXTRA_LIBS_PATH="${B}/src/libtracker-sparql-backend/.libs:${B}/src/libtracker-data/.libs:${B}/src/libtracker-common/.libs" -} - -do_install_append() { - cp -PpR ${D}${STAGING_DATADIR}/* ${D}${datadir}/ || true -# install -d ${D}/${sysconfdir}/X11/Xsession.d/ -# install -m 0755 ${WORKDIR}/90tracker ${D}/${sysconfdir}/X11/Xsession.d/ - - install -d ${D}${systemd_unitdir}/system - install -m 0644 ${WORKDIR}/tracker-store.service ${D}${systemd_unitdir}/system - install -m 0644 ${WORKDIR}/tracker-miner-fs.service ${D}${systemd_unitdir}/system - install -m 0644 ${WORKDIR}/tracker-dbus.service ${D}${systemd_unitdir}/system - sed -i -e 's,@LIBEXECDIR@,${libexecdir},g' \ - -e 's,@BASE_BINDIR@,${base_bindir},g' \ - ${D}${systemd_unitdir}/system/*.service -} - -PACKAGES =+ "${PN}-tests ${PN}-vala ${PN}-nautilus-extension" - -FILES_${PN} += "${datadir}/dbus-1/ \ - ${libdir}/tracker-${VER_DIR}/*.so.* \ - ${libdir}/tracker-${VER_DIR}/extract-modules/*.so \ - ${libdir}/tracker-${VER_DIR}/writeback-modules/*.so \ - ${datadir}/icons/hicolor/*/apps/tracker.* \ - ${libdir}/nautilus/extensions-2.0/*.la \ - ${datadir}/glib-2.0/schemas/* \ - ${systemd_unitdir}/system/tracker-store.service \ - ${systemd_unitdir}/system/tracker-miner-fs.service \ - ${systemd_unitdir}/system/tracker-dbus.service \ -" - -FILES_${PN}-dev += "${libdir}/tracker-${VER_DIR}/*.la \ - ${libdir}/tracker-${VER_DIR}/*.so \ - ${libdir}/tracker-${VER_DIR}/*/*.la \ - ${libdir}/tracker-${VER_DIR}/extract-modules/*.la" - -FILES_${PN}-staticdev += "${libdir}/nautilus/extensions-2.0/*.a" -FILES_${PN}-dbg += "${libdir}/*/*/.debug \ - ${libdir}/*/.debug" -FILES_${PN}-tests = "${datadir}/tracker-tests/" -FILES_${PN}-vala = "${datadir}/vala/" -FILES_${PN}-nautilus-extension += "${libdir}/nautilus/extensions-2.0/*.so" - -SRC_URI[md5sum] = "f3a871beeebf86fd752863ebd22af9ac" -SRC_URI[sha256sum] = "9b59330aa2e9e09feee587ded895e9247f71fc25f46b023d616d9969314bc7f1" - -# http://errors.yoctoproject.org/Errors/Details/81007/ -PNBLACKLIST[tracker] ?= "BROKEN: fails to build with new binutils-2.27 - the recipe will be removed on 2017-09-01 unless the issue is fixed" |