diff options
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 3f5a5b124..000000000 --- a/meta-gnome/recipes-apps/cheese/cheese_2.30.1.bb +++ /dev/null | |||
@@ -1,26 +0,0 @@ | |||
1 | SUMMARY = "Take photos and videos with your webcam, with fun graphical effects" | ||
2 | LICENSE = "GPLv2" | ||
3 | LIC_FILES_CHKSUM = "file://COPYING;md5=a17cb0a873d252440acfdf9b3d0e7fbf" | ||
4 | |||
5 | DEPENDS = "gtk+ gstreamer gst-plugins-base libcanberra udev librsvg gnome-desktop evolution-data-server intltool-native" | ||
6 | |||
7 | PR = "r2" | ||
8 | |||
9 | inherit gnome | ||
10 | |||
11 | SRC_URI[archive.md5sum] = "1599fded8a1797ea51fb010af4e6c45b" | ||
12 | SRC_URI[archive.sha256sum] = "48f03470c6f527caa0e3b269d3afcff86ae0939a74f66ce030d4eed3bc3cbd9a" | ||
13 | GNOME_COMPRESS_TYPE="bz2" | ||
14 | |||
15 | FILES_${PN} += "${datadir}/dbus-1" | ||
16 | RRECOMMENDS_${PN} = "gst-plugins-good-meta gst-plugins-base-meta" | ||
17 | |||
18 | EXTRA_OECONF += "--disable-scrollkeeper" | ||
19 | |||
20 | do_configure_prepend() { | ||
21 | sed -i -e "s: help : :g" ${S}/Makefile.am | ||
22 | } | ||
23 | |||
24 | PNBLACKLIST[cheese] ?= "Depends on blacklisted gstreamer - the recipe will be removed on 2017-09-01 unless the issue is fixed" | ||
25 | |||
26 | 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 75e45e0ab..000000000 --- a/meta-gnome/recipes-apps/epdfview/epdfview/browser_command.patch +++ /dev/null | |||
@@ -1,17 +0,0 @@ | |||
1 | Imported from Debian 0.1.8-3 | ||
2 | |||
3 | Upstream-Status: Pending | ||
4 | |||
5 | diff --git a/src/Config.cxx b/src/Config.cxx | ||
6 | index 28f37ab..bc58819 100644 | ||
7 | --- a/src/Config.cxx | ||
8 | +++ b/src/Config.cxx | ||
9 | @@ -22,7 +22,7 @@ | ||
10 | using namespace ePDFView; | ||
11 | |||
12 | // Constants | ||
13 | -static const gchar *DEFAULT_EXTERNAL_BROWSER_COMMAND_LINE = "firefox %s"; | ||
14 | +static const gchar *DEFAULT_EXTERNAL_BROWSER_COMMAND_LINE = "x-www-browser %s"; | ||
15 | static const gchar *DEFAULT_OPEN_FILE_FOLDER = NULL; | ||
16 | static const gchar *DEFAULT_SAVE_FILE_FOLDER = NULL; | ||
17 | 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 8ad5b97ca..000000000 --- a/meta-gnome/recipes-apps/epdfview/epdfview/fix-format.patch +++ /dev/null | |||
@@ -1,19 +0,0 @@ | |||
1 | Imported from Debian 0.1.8-3 | ||
2 | |||
3 | Upstream-Status: Pending | ||
4 | |||
5 | diff --git a/src/gtk/MainView.cxx b/src/gtk/MainView.cxx | ||
6 | index b983bff..f87de28 100644 | ||
7 | --- a/src/gtk/MainView.cxx | ||
8 | +++ b/src/gtk/MainView.cxx | ||
9 | @@ -634,8 +634,9 @@ MainView::showErrorMessage (const gchar *title, const gchar *body) | ||
10 | GTK_DIALOG_DESTROY_WITH_PARENT, | ||
11 | GTK_MESSAGE_ERROR, | ||
12 | GTK_BUTTONS_OK, | ||
13 | + "%s", | ||
14 | title); | ||
15 | - gtk_message_dialog_format_secondary_text (GTK_MESSAGE_DIALOG(errorDialog), | ||
16 | + gtk_message_dialog_format_secondary_text (GTK_MESSAGE_DIALOG(errorDialog), "%s", | ||
17 | body); | ||
18 | gtk_dialog_run (GTK_DIALOG (errorDialog)); | ||
19 | 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 84a491386..000000000 --- a/meta-gnome/recipes-apps/epdfview/epdfview/glib-single-include.patch +++ /dev/null | |||
@@ -1,17 +0,0 @@ | |||
1 | Imported from Debian 0.1.8-3 | ||
2 | |||
3 | Upstream-Status: Pending | ||
4 | |||
5 | diff --git a/src/gtk/StockIcons.h b/src/gtk/StockIcons.h | ||
6 | index c142a7a..58fcf2e 100644 | ||
7 | --- a/src/gtk/StockIcons.h | ||
8 | +++ b/src/gtk/StockIcons.h | ||
9 | @@ -18,7 +18,7 @@ | ||
10 | #if !defined (__STOCK_ICONS_H__) | ||
11 | #define __STOCK_ICONS_H__ | ||
12 | |||
13 | -#include <glib/gmacros.h> | ||
14 | +#include <glib.h> | ||
15 | |||
16 | G_BEGIN_DECLS | ||
17 | |||
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 282bfb184..000000000 --- a/meta-gnome/recipes-apps/epdfview/epdfview/swap-colors.patch +++ /dev/null | |||
@@ -1,43 +0,0 @@ | |||
1 | Imported from Debian 0.1.8-3 | ||
2 | |||
3 | Upstream-Status: Pending | ||
4 | |||
5 | Index: trunk/src/PDFDocument.cxx | ||
6 | =================================================================== | ||
7 | --- trunk/src/PDFDocument.cxx (revision 361) | ||
8 | +++ trunk/src/PDFDocument.cxx (revision 367) | ||
9 | @@ -21,4 +21,5 @@ | ||
10 | #include <poppler.h> | ||
11 | #include <unistd.h> | ||
12 | +#include <algorithm> | ||
13 | #include "epdfview.h" | ||
14 | |||
15 | @@ -33,4 +34,22 @@ | ||
16 | static PageMode convertPageMode (gint pageMode); | ||
17 | static gchar *getAbsoluteFileName (const gchar *fileName); | ||
18 | + | ||
19 | +namespace | ||
20 | +{ | ||
21 | + void | ||
22 | + convert_bgra_to_rgba (guint8 *data, int width, int height) | ||
23 | + { | ||
24 | + using std::swap; | ||
25 | + | ||
26 | + for (int y = 0; y < height; y++) | ||
27 | + { | ||
28 | + for (int x = 0; x < width; x++) | ||
29 | + { | ||
30 | + swap(data[0], data[2]); | ||
31 | + data += 4; | ||
32 | + } | ||
33 | + } | ||
34 | + } | ||
35 | +} | ||
36 | |||
37 | /// | ||
38 | @@ -651,4 +670,5 @@ | ||
39 | cairo_destroy(context); | ||
40 | cairo_surface_destroy (surface); | ||
41 | + convert_bgra_to_rgba(renderedPage->getData (), width, height); | ||
42 | #else // !HAVE_POPPLER_0_17_0 | ||
43 | // 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 5e11a95de..000000000 --- a/meta-gnome/recipes-apps/epdfview/epdfview_0.1.8.bb +++ /dev/null | |||
@@ -1,25 +0,0 @@ | |||
1 | SUMMARY = "A lightweight PDF viewer based on gtk and poppler" | ||
2 | HOMEPAGE = "http://www.emma-soft.com/projects/epdfview/" | ||
3 | LICENSE = "GPLv2+" | ||
4 | LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552" | ||
5 | SECTION = "x11/applications" | ||
6 | DEPENDS = "gtk+ poppler" | ||
7 | |||
8 | PR = "r3" | ||
9 | |||
10 | EXTRA_OECONF += "--without-cups" | ||
11 | |||
12 | inherit autotools gettext | ||
13 | |||
14 | SRC_URI = "http://www.emma-soft.com/projects/${BPN}/chrome/site/releases/${BP}.tar.bz2 \ | ||
15 | file://browser_command.patch \ | ||
16 | file://fix-format.patch \ | ||
17 | file://glib-single-include.patch \ | ||
18 | file://swap-colors.patch \ | ||
19 | " | ||
20 | SRC_URI[md5sum] = "e50285b01612169b2594fea375f53ae4" | ||
21 | SRC_URI[sha256sum] = "948648ae7c9d7b3b408d738bd4f48d87375b1196cae1129d6b846a8de0f2f8f0" | ||
22 | |||
23 | PNBLACKLIST[epdfview] ?= "BROKEN: images are not displayed anymore - the recipe will be removed on 2017-09-01 unless the issue is fixed" | ||
24 | # There will be no further development / upstream is gone [1] | ||
25 | # [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 f6d737c81..000000000 --- a/meta-gnome/recipes-apps/gnome-mplayer/gmtk_1.0.5.bb +++ /dev/null | |||
@@ -1,18 +0,0 @@ | |||
1 | SUMMARY = "GTK+ widget and function libraries for gnome-mplayer" | ||
2 | HOMEPAGE = "http://code.google.com/p/gmtk" | ||
3 | SECTION = "libs" | ||
4 | |||
5 | LICENSE = "GPLv2" | ||
6 | LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552" | ||
7 | |||
8 | DEPENDS = "gtk+ alsa-lib glib-2.0 virtual/libx11 intltool-native pulseaudio gtk+3" | ||
9 | |||
10 | SRC_URI = "http://${BPN}.googlecode.com/files/${BP}.tar.gz" | ||
11 | SRC_URI[md5sum] = "e06e9ca8d61d74910343bb3ef4348f7f" | ||
12 | SRC_URI[sha256sum] = "a07130d62719e8c1244f8405dd97445798df5204fc0f3f2f2b669b125114b468" | ||
13 | |||
14 | EXTRA_OECONF = "--disable-gconf --with-gio --with-alsa --enable-keystore" | ||
15 | |||
16 | inherit gettext pkgconfig autotools gconf | ||
17 | |||
18 | 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 629b830dd..000000000 --- a/meta-gnome/recipes-apps/gnome-mplayer/gnome-mplayer_1.0.5.bb +++ /dev/null | |||
@@ -1,32 +0,0 @@ | |||
1 | SUMMARY = "A GTK+ interface to MPlayer" | ||
2 | HOMEPAGE = "http://code.google.com/p/gnome-mplayer" | ||
3 | SECTION = "multimedia" | ||
4 | |||
5 | LICENSE = "GPLv2+" | ||
6 | LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552" | ||
7 | |||
8 | PNBLACKLIST[gnome-mplayer] ?= "rdepends on blacklisted mplayer - the recipe will be removed on 2017-09-01 unless the issue is fixed" | ||
9 | PR = "r2" | ||
10 | |||
11 | DEPENDS = "gmtk gtk+ alsa-lib libnotify glib-2.0 dbus-glib virtual/libx11 libxscrnsaver" | ||
12 | |||
13 | SRC_URI = "http://${BPN}.googlecode.com/files/${BP}.tar.gz" | ||
14 | SRC_URI[md5sum] = "1d3ab24c5501b5528e357931ca4dc6da" | ||
15 | SRC_URI[sha256sum] = "ac3c179345baecb4ca5237782aa33e83253a87bf8b42ce6eb3a9207a340f61b2" | ||
16 | |||
17 | EXTRA_OECONF = "--with-gio --with-alsa --with-dbus --with-libnotify" | ||
18 | |||
19 | FILES_${PN} += "${datadir}/gnome-control-center/default-apps/${PN}.xml" | ||
20 | PACKAGES =+ "${PN}-nautilus-extension" | ||
21 | FILES_${PN}-nautilus-extension += "${libdir}/nautilus/extensions-2.0/*.so \ | ||
22 | ${libdir}/nautilus/extensions-3.0/*.so" | ||
23 | FILES_${PN}-dev += "${libdir}/nautilus/extensions-2.0/*.la \ | ||
24 | ${libdir}/nautilus/extensions-3.0/*.la" | ||
25 | FILES_${PN}-staticdev += "${libdir}/nautilus/extensions-2.0/*.a \ | ||
26 | ${libdir}/nautilus/extensions-3.0/*.a" | ||
27 | FILES_${PN}-dbg += "${libdir}/nautilus/extensions-2.0/.debug \ | ||
28 | ${libdir}/nautilus/extensions-3.0/.debug" | ||
29 | |||
30 | inherit gettext pkgconfig mime gtk-icon-cache autotools | ||
31 | |||
32 | 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 c419d0f44..000000000 --- a/meta-gnome/recipes-extended/gtk-theme-torturer/gtk-theme-torturer_git.bb +++ /dev/null | |||
@@ -1,25 +0,0 @@ | |||
1 | SUMMARY = "GTK+ Theme benchmark program" | ||
2 | DEPENDS = "gtk+" | ||
3 | HOMEPAGE = "http://wiki.laptop.org/go/GTK_for_OLPC" | ||
4 | SECTION = "devel" | ||
5 | LICENSE = "GPLv2" | ||
6 | LIC_FILES_CHKSUM = "file://appwindow.c;endline=13;md5=8c09920de460c7ea1f64ee56986aabd9" | ||
7 | |||
8 | SRCREV = "99962ae39bb5aadb31929b25c58e1a053f9c9545" | ||
9 | PV = "0.0.0+git${SRCPV}" | ||
10 | |||
11 | SRC_URI = "git://dev.laptop.org/projects/soc-gtk/" | ||
12 | S = "${WORKDIR}/git/gtk-theme-torturer" | ||
13 | |||
14 | CFLAGS += "-Wl,-rpath-link,${STAGING_LIBDIR}" | ||
15 | |||
16 | inherit distro_features_check | ||
17 | ANY_OF_DISTRO_FEATURES = "${GTK2DISTROFEATURES}" | ||
18 | |||
19 | do_install() { | ||
20 | install -d ${D}${bindir} | ||
21 | install -m 0755 torturer ${D}${bindir} | ||
22 | } | ||
23 | |||
24 | # http://errors.yoctoproject.org/Errors/Details/35132/ | ||
25 | 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 6028f2d1a..000000000 --- a/meta-gnome/recipes-gnome/gcalctool/gcalctool_5.32.0.bb +++ /dev/null | |||
@@ -1,20 +0,0 @@ | |||
1 | SUMMARY = "gcalctool is a powerful calculator" | ||
2 | SECTION = "x11" | ||
3 | DEPENDS = "gtk+ gnome-doc-utils" | ||
4 | |||
5 | LICENSE = "GPL-2.0" | ||
6 | LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe" | ||
7 | |||
8 | SHRT_VER = "${@d.getVar('PV').split('.')[0]}.${@d.getVar('PV').split('.')[1]}" | ||
9 | SRC_URI = "http://download.gnome.org/sources/${BPN}/${SHRT_VER}/${BP}.tar.gz" | ||
10 | |||
11 | SRC_URI[md5sum] = "48db927c6e7ee1d5395f953a8c184c98" | ||
12 | SRC_URI[sha256sum] = "346f645c0fdef900642f6e9a2c18e7ba9a7ca9bc62fe2b08eb418f065a425c89" | ||
13 | |||
14 | inherit autotools pkgconfig gsettings | ||
15 | |||
16 | do_configure_prepend() { | ||
17 | sed -i -e "s: help: :g" ${S}/Makefile.am | ||
18 | } | ||
19 | |||
20 | 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 75aff5d7c..000000000 --- a/meta-gnome/recipes-gnome/gdm/gdm/0001-Remove-user-switch-applet.patch +++ /dev/null | |||
@@ -1,2281 +0,0 @@ | |||
1 | From 0a4fe802edbd2e8a016161f08283e4b467c6762e Mon Sep 17 00:00:00 2001 | ||
2 | From: Koen Kooi <koen@dominion.thruhere.net> | ||
3 | Date: Tue, 21 Jun 2011 12:48:39 +0200 | ||
4 | Subject: [PATCH] Remove user switch applet | ||
5 | |||
6 | This hasn't been updated to work with gnome-panel > 2.30.0, so just drop it | ||
7 | |||
8 | Upstream-Status: unacceptable, backport | ||
9 | |||
10 | Signed-off-by: Koen Kooi <koen@dominion.thruhere.net> | ||
11 | --- | ||
12 | configure.ac | 8 - | ||
13 | gui/Makefile.am | 2 - | ||
14 | .../GNOME_FastUserSwitchApplet.server.in.in | 38 - | ||
15 | .../GNOME_FastUserSwitchApplet.xml | 20 - | ||
16 | gui/user-switch-applet/Makefile.am | 67 - | ||
17 | gui/user-switch-applet/applet.c | 1662 -------------------- | ||
18 | gui/user-switch-applet/gdm-entry-menu-item.c | 304 ---- | ||
19 | gui/user-switch-applet/gdm-entry-menu-item.h | 51 - | ||
20 | po/POTFILES.in | 4 - | ||
21 | po/POTFILES.skip | 1 - | ||
22 | 10 files changed, 0 insertions(+), 2157 deletions(-) | ||
23 | delete mode 100644 gui/user-switch-applet/GNOME_FastUserSwitchApplet.server.in.in | ||
24 | delete mode 100644 gui/user-switch-applet/GNOME_FastUserSwitchApplet.xml | ||
25 | delete mode 100644 gui/user-switch-applet/Makefile.am | ||
26 | delete mode 100644 gui/user-switch-applet/applet.c | ||
27 | delete mode 100644 gui/user-switch-applet/gdm-entry-menu-item.c | ||
28 | delete mode 100644 gui/user-switch-applet/gdm-entry-menu-item.h | ||
29 | |||
30 | diff --git a/configure.ac b/configure.ac | ||
31 | index 841efe0..a834110 100644 | ||
32 | --- a/configure.ac | ||
33 | +++ b/configure.ac | ||
34 | @@ -149,13 +149,6 @@ PKG_CHECK_MODULES(SIMPLE_CHOOSER, | ||
35 | AC_SUBST(SIMPLE_CHOOSER_CFLAGS) | ||
36 | AC_SUBST(SIMPLE_CHOOSER_LIBS) | ||
37 | |||
38 | -PKG_CHECK_MODULES(APPLET, | ||
39 | - dbus-glib-1 >= $DBUS_GLIB_REQUIRED_VERSION | ||
40 | - gtk+-2.0 >= $GTK_REQUIRED_VERSION | ||
41 | - libpanelapplet-2.0 >= $GNOME_PANEL_REQUIRED_VERSION) | ||
42 | -AC_SUBST(APPLET_CFLAGS) | ||
43 | -AC_SUBST(APPLET_LIBS) | ||
44 | - | ||
45 | PLUGIN_LIBTOOL_FLAGS="-export_dynamic -module -avoid-version" | ||
46 | AC_SUBST(PLUGIN_LIBTOOL_FLAGS) | ||
47 | |||
48 | @@ -1340,7 +1333,6 @@ gui/Makefile | ||
49 | gui/simple-greeter/Makefile | ||
50 | gui/simple-greeter/libnotificationarea/Makefile | ||
51 | gui/simple-chooser/Makefile | ||
52 | -gui/user-switch-applet/Makefile | ||
53 | utils/Makefile | ||
54 | data/gdm.conf | ||
55 | data/Makefile | ||
56 | diff --git a/gui/Makefile.am b/gui/Makefile.am | ||
57 | index 326239f..bda3f7a 100644 | ||
58 | --- a/gui/Makefile.am | ||
59 | +++ b/gui/Makefile.am | ||
60 | @@ -2,7 +2,6 @@ NULL = | ||
61 | |||
62 | SUBDIRS = \ | ||
63 | simple-greeter \ | ||
64 | - user-switch-applet \ | ||
65 | $(NULL) | ||
66 | |||
67 | if XDMCP_SUPPORT | ||
68 | @@ -12,5 +11,4 @@ endif | ||
69 | DIST_SUBDIRS = \ | ||
70 | simple-chooser \ | ||
71 | simple-greeter \ | ||
72 | - user-switch-applet \ | ||
73 | $(NULL) | ||
74 | diff --git a/gui/user-switch-applet/GNOME_FastUserSwitchApplet.server.in.in b/gui/user-switch-applet/GNOME_FastUserSwitchApplet.server.in.in | ||
75 | deleted file mode 100644 | ||
76 | index a9b775f..0000000 | ||
77 | --- a/gui/user-switch-applet/GNOME_FastUserSwitchApplet.server.in.in | ||
78 | +++ /dev/null | ||
79 | @@ -1,38 +0,0 @@ | ||
80 | -<oaf_info> | ||
81 | - <oaf_server iid="OAFIID:GNOME_FastUserSwitchApplet_Factory" type="exe" | ||
82 | - location="@LIBEXECDIR@/gdm-user-switch-applet"> | ||
83 | - | ||
84 | - <oaf_attribute name="repo_ids" type="stringv"> | ||
85 | - <item value="IDL:Bonobo/GenericFactory:1.0"/> | ||
86 | - <item value="IDL:Bonobo/Unknown:1.0"/> | ||
87 | - </oaf_attribute> | ||
88 | - <oaf_attribute name="name" type="string" _value="User Switcher Applet Factory"/> | ||
89 | - <oaf_attribute name="description" type="string" _value="User Switcher Applet Factory"/> | ||
90 | - <oaf_attribute name="bonobo:environment" type="stringv"> | ||
91 | - <item value="DBUS_SESSION_BUS_ADDRESS"/> | ||
92 | - <oaf_attribute name="bugzilla:bugzilla" type="string" value="GNOME"/> | ||
93 | - <oaf_attribute name="bugzilla:product" type="string" value="gdm"/> | ||
94 | - <oaf_attribute name="bugzilla:component" type="string" value="general"/> | ||
95 | - <oaf_attribute name="bugzilla:version" type="string" value="@VERSION@"/> | ||
96 | - <oaf_attribute name="bugzilla:other_binaries" type="string" value="gdm-user-switch-applet"/> | ||
97 | - </oaf_attribute> | ||
98 | - </oaf_server> | ||
99 | - | ||
100 | - <oaf_server iid="OAFIID:GNOME_FastUserSwitchApplet" type="factory" | ||
101 | - location="OAFIID:GNOME_FastUserSwitchApplet_Factory"> | ||
102 | - | ||
103 | - <oaf_attribute name="repo_ids" type="stringv"> | ||
104 | - <item value="IDL:GNOME/Vertigo/PanelAppletShell:1.0"/> | ||
105 | - <item value="IDL:Bonobo/Control:1.0"/> | ||
106 | - <item value="IDL:Bonobo/Unknown:1.0"/> | ||
107 | - </oaf_attribute> | ||
108 | - <oaf_attribute name="name" type="string" _value="User Switcher"/> | ||
109 | - <oaf_attribute name="description" type="string" _value="A menu to quickly switch between users"/> | ||
110 | - <oaf_attribute name="panel:icon" type="string" value="stock_people"/> | ||
111 | - <oaf_attribute name="bugzilla:bugzilla" type="string" value="GNOME"/> | ||
112 | - <oaf_attribute name="bugzilla:product" type="string" value="gdm"/> | ||
113 | - <oaf_attribute name="bugzilla:component" type="string" value="general"/> | ||
114 | - <oaf_attribute name="bugzilla:version" type="string" value="@VERSION@"/> | ||
115 | - <oaf_attribute name="bugzilla:other_binaries" type="string" value="gdm-user-switch-applet"/> | ||
116 | - </oaf_server> | ||
117 | -</oaf_info> | ||
118 | diff --git a/gui/user-switch-applet/GNOME_FastUserSwitchApplet.xml b/gui/user-switch-applet/GNOME_FastUserSwitchApplet.xml | ||
119 | deleted file mode 100644 | ||
120 | index e1845c8..0000000 | ||
121 | --- a/gui/user-switch-applet/GNOME_FastUserSwitchApplet.xml | ||
122 | +++ /dev/null | ||
123 | @@ -1,20 +0,0 @@ | ||
124 | -<Root> | ||
125 | - <popups> | ||
126 | - <popup name="button3"> | ||
127 | - <menuitem | ||
128 | - name="About Me Item" | ||
129 | - verb="GdmAboutMe" | ||
130 | - _label="Edit Personal _Information"/> | ||
131 | - <menuitem | ||
132 | - name="Users and Groups Admin Item" | ||
133 | - verb="GdmUsersGroupsAdmin" | ||
134 | - _label="_Edit Users and Groups"/> | ||
135 | - <menuitem | ||
136 | - name="About Item" | ||
137 | - verb="GdmAbout" | ||
138 | - _label="_About" | ||
139 | - pixtype="stock" | ||
140 | - pixname="gtk-about"/> | ||
141 | - </popup> | ||
142 | - </popups> | ||
143 | -</Root> | ||
144 | diff --git a/gui/user-switch-applet/Makefile.am b/gui/user-switch-applet/Makefile.am | ||
145 | deleted file mode 100644 | ||
146 | index 2d2cdc0..0000000 | ||
147 | --- a/gui/user-switch-applet/Makefile.am | ||
148 | +++ /dev/null | ||
149 | @@ -1,67 +0,0 @@ | ||
150 | -NULL = | ||
151 | - | ||
152 | -AM_CPPFLAGS = \ | ||
153 | - -I$(top_srcdir)/gui/simple-greeter \ | ||
154 | - -I$(top_srcdir)/common \ | ||
155 | - -DPREFIX=\""$(prefix)"\" \ | ||
156 | - -DLIBDIR=\""$(libdir)"\" \ | ||
157 | - -DDATADIR=\""$(datadir)"\" \ | ||
158 | - -DSYSCONFDIR=\""$(sysconfdir)"\" \ | ||
159 | - -DLIBLOCALEDIR=\""$(prefix)/lib/locale"\" \ | ||
160 | - -DGNOMELOCALEDIR=\""$(datadir)/locale"\" \ | ||
161 | - -DGLADEDIR=\""$(pkgdatadir)"\" \ | ||
162 | - -DLIBEXECDIR=\""$(libexecdir)"\" \ | ||
163 | - -DSBINDIR=\""$(sbindir)"\" \ | ||
164 | - -DGDMCONFDIR=\"$(gdmconfdir)\" \ | ||
165 | - $(GTK_CFLAGS) \ | ||
166 | - $(APPLET_CFLAGS) \ | ||
167 | - $(NULL) | ||
168 | - | ||
169 | -libexec_PROGRAMS = \ | ||
170 | - gdm-user-switch-applet \ | ||
171 | - $(NULL) | ||
172 | - | ||
173 | -gdm_user_switch_applet_SOURCES = \ | ||
174 | - applet.c \ | ||
175 | - gdm-entry-menu-item.h \ | ||
176 | - gdm-entry-menu-item.c \ | ||
177 | - $(NULL) | ||
178 | - | ||
179 | -gdm_user_switch_applet_LDADD = \ | ||
180 | - $(top_builddir)/gui/simple-greeter/libgdmuser.la \ | ||
181 | - $(top_builddir)/common/libgdmcommon.la \ | ||
182 | - $(COMMON_LIBS) \ | ||
183 | - $(APPLET_LIBS) \ | ||
184 | - $(NULL) | ||
185 | - | ||
186 | -# Bonobo UI | ||
187 | -uidir = $(datadir)/gnome-2.0/ui | ||
188 | -ui_DATA = \ | ||
189 | - GNOME_FastUserSwitchApplet.xml \ | ||
190 | - $(NULL) | ||
191 | - | ||
192 | -# Bonobo .server | ||
193 | -serverdir = $(libdir)/bonobo/servers | ||
194 | -server_in_files = \ | ||
195 | - GNOME_FastUserSwitchApplet.server.in \ | ||
196 | - $(NULL) | ||
197 | -server_DATA = $(server_in_files:.server.in=.server) | ||
198 | - | ||
199 | -$(server_in_files): $(server_in_files:.server.in=.server.in.in) | ||
200 | - sed -e "s|\@LIBEXECDIR\@|$(libexecdir)|" -e "s|\@VERSION\@|$(VERSION)|" $< > $@ | ||
201 | - | ||
202 | -@INTLTOOL_SERVER_RULE@ | ||
203 | - | ||
204 | -EXTRA_DIST = \ | ||
205 | - $(ui_DATA) \ | ||
206 | - GNOME_FastUserSwitchApplet.server.in.in \ | ||
207 | - $(NULL) | ||
208 | - | ||
209 | -DISTCLEANFILES = \ | ||
210 | - $(server_in_files) \ | ||
211 | - $(server_DATA) \ | ||
212 | - $(NULL) | ||
213 | - | ||
214 | -MAINTAINERCLEANFILES = \ | ||
215 | - *~ \ | ||
216 | - Makefile.in | ||
217 | diff --git a/gui/user-switch-applet/applet.c b/gui/user-switch-applet/applet.c | ||
218 | deleted file mode 100644 | ||
219 | index b4f944c..0000000 | ||
220 | --- a/gui/user-switch-applet/applet.c | ||
221 | +++ /dev/null | ||
222 | @@ -1,1662 +0,0 @@ | ||
223 | -/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*- | ||
224 | - * | ||
225 | - * Copyright (C) 2004-2005 James M. Cape <jcape@ignore-your.tv>. | ||
226 | - * Copyright (C) 2008 Red Hat, Inc. | ||
227 | - * | ||
228 | - * This program is free software; you can redistribute it and/or modify | ||
229 | - * it under the terms of the GNU General Public License as published by | ||
230 | - * the Free Software Foundation; either version 2 of the License, or | ||
231 | - * (at your option) any later version. | ||
232 | - * | ||
233 | - * This program is distributed in the hope that it will be useful, | ||
234 | - * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
235 | - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
236 | - * GNU General Public License for more details. | ||
237 | - * | ||
238 | - * You should have received a copy of the GNU General Public License | ||
239 | - * along with this program; if not, write to the Free Software | ||
240 | - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA | ||
241 | - */ | ||
242 | - | ||
243 | -#include "config.h" | ||
244 | - | ||
245 | -#include <string.h> | ||
246 | -#include <unistd.h> | ||
247 | -#include <stdlib.h> | ||
248 | -#include <sys/types.h> | ||
249 | - | ||
250 | -#include <glib/gi18n.h> | ||
251 | -#include <gdk/gdkkeysyms.h> | ||
252 | -#include <gtk/gtk.h> | ||
253 | - | ||
254 | -#include <gconf/gconf.h> | ||
255 | -#include <gconf/gconf-client.h> | ||
256 | - | ||
257 | -#include <dbus/dbus-glib.h> | ||
258 | - | ||
259 | -#include <bonobo/bonobo-main.h> | ||
260 | -#include <bonobo/bonobo-ui-util.h> | ||
261 | - | ||
262 | -#include <panel-applet.h> | ||
263 | -#include <panel-applet-gconf.h> | ||
264 | - | ||
265 | -#include "gdm-user-manager.h" | ||
266 | -#include "gdm-entry-menu-item.h" | ||
267 | -#include "gdm-settings-client.h" | ||
268 | - | ||
269 | -#define LOCKDOWN_DIR "/desktop/gnome/lockdown" | ||
270 | -#define LOCKDOWN_USER_SWITCHING_KEY LOCKDOWN_DIR "/disable_user_switching" | ||
271 | -#define LOCKDOWN_LOCK_SCREEN_KEY LOCKDOWN_DIR "/disable_lock_screen" | ||
272 | -#define LOCKDOWN_COMMAND_LINE_KEY LOCKDOWN_DIR "/disable_command_line" | ||
273 | - | ||
274 | -typedef enum { | ||
275 | - GSM_PRESENCE_STATUS_AVAILABLE = 0, | ||
276 | - GSM_PRESENCE_STATUS_INVISIBLE, | ||
277 | - GSM_PRESENCE_STATUS_BUSY, | ||
278 | - GSM_PRESENCE_STATUS_IDLE, | ||
279 | -} GsmPresenceStatus; | ||
280 | - | ||
281 | -typedef struct _GdmAppletData | ||
282 | -{ | ||
283 | - PanelApplet *applet; | ||
284 | - | ||
285 | - GConfClient *client; | ||
286 | - GdmUserManager *manager; | ||
287 | - GdmUser *user; | ||
288 | - | ||
289 | - GtkWidget *menubar; | ||
290 | - GtkWidget *menuitem; | ||
291 | - GtkWidget *menu; | ||
292 | -#ifdef BUILD_PRESENSE_STUFF | ||
293 | - GtkWidget *user_item; | ||
294 | -#endif | ||
295 | - GtkWidget *control_panel_item; | ||
296 | - GtkWidget *account_item; | ||
297 | - GtkWidget *lock_screen_item; | ||
298 | - GtkWidget *login_screen_item; | ||
299 | - GtkWidget *quit_session_item; | ||
300 | - | ||
301 | - guint client_notify_lockdown_id; | ||
302 | - | ||
303 | - guint current_status; | ||
304 | - guint user_loaded_notify_id; | ||
305 | - guint user_changed_notify_id; | ||
306 | - gint8 pixel_size; | ||
307 | - gint panel_size; | ||
308 | - GtkIconSize icon_size; | ||
309 | -#ifdef BUILD_PRESENSE_STUFF | ||
310 | - DBusGProxy *presence_proxy; | ||
311 | -#endif | ||
312 | -} GdmAppletData; | ||
313 | - | ||
314 | -typedef struct _SelectorResponseData | ||
315 | -{ | ||
316 | - GdmAppletData *adata; | ||
317 | - GtkRadioButton *radio; | ||
318 | -} SelectorResponseData; | ||
319 | - | ||
320 | -static void reset_icon (GdmAppletData *adata); | ||
321 | -static void update_label (GdmAppletData *adata); | ||
322 | - | ||
323 | -static gboolean applet_factory (PanelApplet *applet, | ||
324 | - const char *iid, | ||
325 | - gpointer data); | ||
326 | - | ||
327 | -PANEL_APPLET_BONOBO_FACTORY ("OAFIID:GNOME_FastUserSwitchApplet_Factory", | ||
328 | - PANEL_TYPE_APPLET, | ||
329 | - "gdm-user-switch-applet", "0", | ||
330 | - (PanelAppletFactoryCallback)applet_factory, | ||
331 | - NULL) | ||
332 | - | ||
333 | -static void | ||
334 | -about_me_cb (BonoboUIComponent *ui_container, | ||
335 | - gpointer data, | ||
336 | - const char *cname) | ||
337 | -{ | ||
338 | - GError *err; | ||
339 | - | ||
340 | - err = NULL; | ||
341 | - if (! g_spawn_command_line_async ("gnome-about-me", &err)) { | ||
342 | - g_critical ("Could not run `gnome-about-me': %s", | ||
343 | - err->message); | ||
344 | - g_error_free (err); | ||
345 | - bonobo_ui_component_set_prop (ui_container, | ||
346 | - "/commands/GdmAboutMe", | ||
347 | - "hidden", "1", | ||
348 | - NULL); | ||
349 | - } | ||
350 | -} | ||
351 | - | ||
352 | -/* | ||
353 | - * gnome-panel/applets/wncklet/window-menu.c:window_filter_button_press() | ||
354 | - * | ||
355 | - * Copyright (C) 2005 James M. Cape. | ||
356 | - * Copyright (C) 2003 Sun Microsystems, Inc. | ||
357 | - * Copyright (C) 2001 Free Software Foundation, Inc. | ||
358 | - * Copyright (C) 2000 Helix Code, Inc. | ||
359 | - */ | ||
360 | -static gboolean | ||
361 | -menubar_button_press_event_cb (GtkWidget *menubar, | ||
362 | - GdkEventButton *event, | ||
363 | - GdmAppletData *adata) | ||
364 | -{ | ||
365 | - if (event->button != 1) { | ||
366 | - g_signal_stop_emission_by_name (menubar, "button-press-event"); | ||
367 | - /* Reset the login window item */ | ||
368 | - } | ||
369 | - | ||
370 | - return FALSE; | ||
371 | -} | ||
372 | - | ||
373 | -static void | ||
374 | -about_cb (BonoboUIComponent *ui_container, | ||
375 | - gpointer data, | ||
376 | - const char *cname) | ||
377 | -{ | ||
378 | - static const char *authors[] = { | ||
379 | - "James M. Cape <jcape@ignore-your.tv>", | ||
380 | - "Thomas Thurman <thomas@thurman.org.uk>", | ||
381 | - "William Jon McCann <jmccann@redhat.com>", | ||
382 | - NULL | ||
383 | - }; | ||
384 | - static char *license[] = { | ||
385 | - N_("The User Switch Applet is free software; you can redistribute it and/or modify " | ||
386 | - "it under the terms of the GNU General Public License as published by " | ||
387 | - "the Free Software Foundation; either version 2 of the License, or " | ||
388 | - "(at your option) any later version."), | ||
389 | - N_("This program is distributed in the hope that it will be useful, " | ||
390 | - "but WITHOUT ANY WARRANTY; without even the implied warranty of " | ||
391 | - "MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the " | ||
392 | - "GNU General Public License for more details."), | ||
393 | - N_("You should have received a copy of the GNU General Public License " | ||
394 | - "along with this program; if not, write to the Free Software " | ||
395 | - "Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA "), | ||
396 | - NULL | ||
397 | - }; | ||
398 | - char *license_i18n; | ||
399 | - | ||
400 | - license_i18n = g_strconcat (_(license[0]), "\n\n", _(license[1]), "\n\n", _(license[2]), NULL); | ||
401 | - | ||
402 | - gtk_show_about_dialog (NULL, | ||
403 | - "version", VERSION, | ||
404 | - "copyright", "Copyright \xc2\xa9 2004-2005 James M. Cape.\n" | ||
405 | - "Copyright \xc2\xa9 2006 Thomas Thurman.\n" | ||
406 | - "Copyright \xc2\xa9 2008 Red Hat, Inc.", | ||
407 | - "comments", _("A menu to quickly switch between users."), | ||
408 | - "authors", authors, | ||
409 | - "license", license_i18n, | ||
410 | - "wrap-license", TRUE, | ||
411 | - "translator-credits", _("translator-credits"), | ||
412 | - "logo-icon-name", "stock_people", | ||
413 | - NULL); | ||
414 | - | ||
415 | - g_free (license_i18n); | ||
416 | -} | ||
417 | - | ||
418 | - | ||
419 | -static void | ||
420 | -admin_cb (BonoboUIComponent *ui_container, | ||
421 | - gpointer data, | ||
422 | - const char *cname) | ||
423 | -{ | ||
424 | -#ifdef USERS_ADMIN | ||
425 | - char **args; | ||
426 | - gboolean res; | ||
427 | - GError *err; | ||
428 | - | ||
429 | - err = NULL; | ||
430 | - if (!g_shell_parse_argv (USERS_ADMIN, NULL, &args, &err)) { | ||
431 | - g_critical ("Could not parse users and groups management command line `%s': %s", | ||
432 | - USERS_ADMIN, err->message); | ||
433 | - return; | ||
434 | - } | ||
435 | - | ||
436 | - res = g_spawn_async (g_get_home_dir (), | ||
437 | - args, | ||
438 | - NULL, | ||
439 | - (G_SPAWN_STDOUT_TO_DEV_NULL | | ||
440 | - G_SPAWN_STDERR_TO_DEV_NULL | | ||
441 | - G_SPAWN_SEARCH_PATH), | ||
442 | - NULL, | ||
443 | - NULL, | ||
444 | - NULL, | ||
445 | - &err); | ||
446 | - if (! res) { | ||
447 | - g_critical ("Could not run `%s' to manage users and groups: %s", | ||
448 | - USERS_ADMIN, err->message); | ||
449 | - g_error_free (err); | ||
450 | - } | ||
451 | - g_strfreev (args); | ||
452 | -#endif /* USERS_ADMIN */ | ||
453 | -} | ||
454 | - | ||
455 | -static void | ||
456 | -set_menuitem_icon (BonoboUIComponent *component, | ||
457 | - const char *item_path, | ||
458 | - GtkIconTheme *theme, | ||
459 | - const char *icon_name, | ||
460 | - gint icon_size) | ||
461 | -{ | ||
462 | - GdkPixbuf *pixbuf; | ||
463 | - int width; | ||
464 | - int height; | ||
465 | - | ||
466 | - pixbuf = gtk_icon_theme_load_icon (theme, icon_name, icon_size, 0, NULL); | ||
467 | - if (pixbuf == NULL) { | ||
468 | - return; | ||
469 | - } | ||
470 | - | ||
471 | - width = gdk_pixbuf_get_width (pixbuf); | ||
472 | - height = gdk_pixbuf_get_height (pixbuf); | ||
473 | - if (width > icon_size + 4 || height > icon_size + 4) { | ||
474 | - GdkPixbuf *tmp; | ||
475 | - if (height > width) { | ||
476 | - width *= (gdouble) icon_size / (gdouble) height; | ||
477 | - height = icon_size; | ||
478 | - } else { | ||
479 | - height *= (gdouble) icon_size / (gdouble) width; | ||
480 | - width = icon_size; | ||
481 | - } | ||
482 | - tmp = gdk_pixbuf_scale_simple (pixbuf, width, height, GDK_INTERP_BILINEAR); | ||
483 | - g_object_unref (pixbuf); | ||
484 | - pixbuf = tmp; | ||
485 | - } | ||
486 | - | ||
487 | - bonobo_ui_util_set_pixbuf (component, item_path, pixbuf, NULL); | ||
488 | - g_object_unref (pixbuf); | ||
489 | -} | ||
490 | - | ||
491 | -static void | ||
492 | -applet_style_set_cb (GtkWidget *widget, | ||
493 | - GtkStyle *old_style, | ||
494 | - gpointer data) | ||
495 | -{ | ||
496 | - BonoboUIComponent *component; | ||
497 | - GdkScreen *screen; | ||
498 | - GtkIconTheme *theme; | ||
499 | - int width; | ||
500 | - int height; | ||
501 | - int icon_size; | ||
502 | - | ||
503 | - if (gtk_widget_has_screen (widget)) { | ||
504 | - screen = gtk_widget_get_screen (widget); | ||
505 | - } else { | ||
506 | - screen = gdk_screen_get_default (); | ||
507 | - } | ||
508 | - | ||
509 | - if (gtk_icon_size_lookup_for_settings (gtk_settings_get_for_screen (screen), | ||
510 | - GTK_ICON_SIZE_MENU, &width, &height)) { | ||
511 | - icon_size = MAX (width, height); | ||
512 | - } else { | ||
513 | - icon_size = 16; | ||
514 | - } | ||
515 | - | ||
516 | - theme = gtk_icon_theme_get_for_screen (screen); | ||
517 | - component = panel_applet_get_popup_component (PANEL_APPLET (widget)); | ||
518 | - | ||
519 | - set_menuitem_icon (component, | ||
520 | - "/commands/GdmAboutMe", | ||
521 | - theme, | ||
522 | - "user-info", | ||
523 | - icon_size); | ||
524 | - set_menuitem_icon (component, | ||
525 | - "/commands/GdmUsersGroupsAdmin", | ||
526 | - theme, | ||
527 | - "stock_people", | ||
528 | - icon_size); | ||
529 | -} | ||
530 | - | ||
531 | -static void | ||
532 | -applet_change_background_cb (PanelApplet *applet, | ||
533 | - PanelAppletBackgroundType type, | ||
534 | - GdkColor *color, | ||
535 | - GdkPixmap *pixmap, | ||
536 | - GdmAppletData *adata) | ||
537 | -{ | ||
538 | - GtkRcStyle *rc_style; | ||
539 | - GtkStyle *style; | ||
540 | - | ||
541 | - gtk_widget_set_style (adata->menubar, NULL); | ||
542 | - rc_style = gtk_rc_style_new (); | ||
543 | - gtk_widget_modify_style (GTK_WIDGET (adata->menubar), rc_style); | ||
544 | - g_object_unref (rc_style); | ||
545 | - | ||
546 | - switch (type) { | ||
547 | - case PANEL_NO_BACKGROUND: | ||
548 | - break; | ||
549 | - case PANEL_COLOR_BACKGROUND: | ||
550 | - gtk_widget_modify_bg (adata->menubar, GTK_STATE_NORMAL, color); | ||
551 | - break; | ||
552 | - case PANEL_PIXMAP_BACKGROUND: | ||
553 | - style = gtk_style_copy (gtk_widget_get_style (adata->menubar)); | ||
554 | - if (style->bg_pixmap[GTK_STATE_NORMAL]) { | ||
555 | - g_object_unref (style->bg_pixmap[GTK_STATE_NORMAL]); | ||
556 | - } | ||
557 | - | ||
558 | - style->bg_pixmap[GTK_STATE_NORMAL] = g_object_ref (pixmap); | ||
559 | - gtk_widget_set_style (adata->menubar, style); | ||
560 | - g_object_unref (style); | ||
561 | - break; | ||
562 | - } | ||
563 | -} | ||
564 | - | ||
565 | -/* | ||
566 | - * gnome-panel/applets/wncklet/window-menu.c:window_menu_key_press_event() | ||
567 | - * | ||
568 | - * Copyright (C) 2003 Sun Microsystems, Inc. | ||
569 | - * Copyright (C) 2001 Free Software Foundation, Inc. | ||
570 | - * Copyright (C) 2000 Helix Code, Inc. | ||
571 | - */ | ||
572 | -static gboolean | ||
573 | -applet_key_press_event_cb (GtkWidget *widget, | ||
574 | - GdkEventKey *event, | ||
575 | - GdmAppletData *adata) | ||
576 | -{ | ||
577 | - GtkMenuShell *menu_shell; | ||
578 | - | ||
579 | - switch (event->keyval) { | ||
580 | - case GDK_KP_Enter: | ||
581 | - case GDK_ISO_Enter: | ||
582 | - case GDK_3270_Enter: | ||
583 | - case GDK_Return: | ||
584 | - case GDK_space: | ||
585 | - case GDK_KP_Space: | ||
586 | - menu_shell = GTK_MENU_SHELL (adata->menubar); | ||
587 | - /* | ||
588 | - * We need to call _gtk_menu_shell_activate() here as is done in | ||
589 | - * window_key_press_handler in gtkmenubar.c which pops up menu | ||
590 | - * when F10 is pressed. | ||
591 | - * | ||
592 | - * As that function is private its code is replicated here. | ||
593 | - */ | ||
594 | - if (!menu_shell->active) { | ||
595 | - gtk_grab_add (GTK_WIDGET (menu_shell)); | ||
596 | - menu_shell->have_grab = TRUE; | ||
597 | - menu_shell->active = TRUE; | ||
598 | - } | ||
599 | - | ||
600 | - gtk_menu_shell_select_first (menu_shell, FALSE); | ||
601 | - return TRUE; | ||
602 | - default: | ||
603 | - break; | ||
604 | - } | ||
605 | - | ||
606 | - return FALSE; | ||
607 | -} | ||
608 | - | ||
609 | -static void | ||
610 | -set_item_text_angle_and_alignment (GtkWidget *item, | ||
611 | - double text_angle, | ||
612 | - float xalign, | ||
613 | - float yalign) | ||
614 | -{ | ||
615 | - GtkWidget *label; | ||
616 | - | ||
617 | - label = gtk_bin_get_child (GTK_BIN (item)); | ||
618 | - | ||
619 | - gtk_label_set_angle (GTK_LABEL (label), text_angle); | ||
620 | - | ||
621 | - gtk_misc_set_alignment (GTK_MISC (label), xalign, yalign); | ||
622 | -} | ||
623 | - | ||
624 | -/* | ||
625 | - * gnome-panel/applets/wncklet/window-menu.c:window_menu_size_allocate() | ||
626 | - * | ||
627 | - * Copyright (C) 2003 Sun Microsystems, Inc. | ||
628 | - * Copyright (C) 2001 Free Software Foundation, Inc. | ||
629 | - * Copyright (C) 2000 Helix Code, Inc. | ||
630 | - */ | ||
631 | -static void | ||
632 | -applet_size_allocate_cb (GtkWidget *widget, | ||
633 | - GtkAllocation *allocation, | ||
634 | - GdmAppletData *adata) | ||
635 | -{ | ||
636 | - GList *children; | ||
637 | - GtkWidget *top_item; | ||
638 | - PanelAppletOrient orient; | ||
639 | - gint pixel_size; | ||
640 | - gdouble text_angle; | ||
641 | - GtkPackDirection pack_direction; | ||
642 | - float text_xalign; | ||
643 | - float text_yalign; | ||
644 | - | ||
645 | - pack_direction = GTK_PACK_DIRECTION_LTR; | ||
646 | - text_angle = 0.0; | ||
647 | - text_xalign = 0.0; | ||
648 | - text_yalign = 0.5; | ||
649 | - | ||
650 | - children = gtk_container_get_children (GTK_CONTAINER (adata->menubar)); | ||
651 | - top_item = GTK_WIDGET (children->data); | ||
652 | - g_list_free (children); | ||
653 | - | ||
654 | - orient = panel_applet_get_orient (PANEL_APPLET (widget)); | ||
655 | - | ||
656 | - switch (orient) { | ||
657 | - case PANEL_APPLET_ORIENT_UP: | ||
658 | - case PANEL_APPLET_ORIENT_DOWN: | ||
659 | - gtk_widget_set_size_request (top_item, -1, allocation->height); | ||
660 | - pixel_size = allocation->height - gtk_widget_get_style (top_item)->ythickness * 2; | ||
661 | - break; | ||
662 | - case PANEL_APPLET_ORIENT_LEFT: | ||
663 | - gtk_widget_set_size_request (top_item, allocation->width, -1); | ||
664 | - pixel_size = allocation->width - gtk_widget_get_style (top_item)->xthickness * 2; | ||
665 | - pack_direction = GTK_PACK_DIRECTION_TTB; | ||
666 | - text_angle = 270.0; | ||
667 | - text_xalign = 0.5; | ||
668 | - text_yalign = 0.0; | ||
669 | - break; | ||
670 | - case PANEL_APPLET_ORIENT_RIGHT: | ||
671 | - gtk_widget_set_size_request (top_item, allocation->width, -1); | ||
672 | - pixel_size = allocation->width - gtk_widget_get_style (top_item)->xthickness * 2; | ||
673 | - pack_direction = GTK_PACK_DIRECTION_BTT; | ||
674 | - text_angle = 90.0; | ||
675 | - text_xalign = 0.5; | ||
676 | - text_yalign = 0.0; | ||
677 | - break; | ||
678 | - default: | ||
679 | - g_assert_not_reached (); | ||
680 | - break; | ||
681 | - } | ||
682 | - | ||
683 | - gtk_menu_bar_set_pack_direction (GTK_MENU_BAR (adata->menubar), | ||
684 | - pack_direction); | ||
685 | - gtk_menu_bar_set_child_pack_direction (GTK_MENU_BAR (adata->menubar), | ||
686 | - pack_direction); | ||
687 | - | ||
688 | - set_item_text_angle_and_alignment (adata->menuitem, | ||
689 | - text_angle, | ||
690 | - text_xalign, | ||
691 | - text_yalign); | ||
692 | - | ||
693 | - if (adata->panel_size != pixel_size) { | ||
694 | - adata->panel_size = pixel_size; | ||
695 | - reset_icon (adata); | ||
696 | - } | ||
697 | -} | ||
698 | - | ||
699 | - | ||
700 | -static void | ||
701 | -gdm_applet_data_free (GdmAppletData *adata) | ||
702 | -{ | ||
703 | - gconf_client_notify_remove (adata->client, adata->client_notify_lockdown_id); | ||
704 | - | ||
705 | - if (adata->user_loaded_notify_id != 0) { | ||
706 | - g_signal_handler_disconnect (adata->user, adata->user_loaded_notify_id); | ||
707 | - } | ||
708 | - | ||
709 | - if (adata->user_changed_notify_id != 0) { | ||
710 | - g_signal_handler_disconnect (adata->user, adata->user_changed_notify_id); | ||
711 | - } | ||
712 | - | ||
713 | -#ifdef BUILD_PRESENSE_STUFF | ||
714 | - if (adata->presence_proxy != NULL) { | ||
715 | - g_object_unref (adata->presence_proxy); | ||
716 | - } | ||
717 | -#endif | ||
718 | - | ||
719 | - if (adata->user != NULL) { | ||
720 | - g_object_unref (adata->user); | ||
721 | - } | ||
722 | - g_object_unref (adata->client); | ||
723 | - g_object_unref (adata->manager); | ||
724 | - | ||
725 | - g_free (adata); | ||
726 | -} | ||
727 | - | ||
728 | - | ||
729 | -/* | ||
730 | - * gnome-panel/applets/wncklet/window-menu.c:window_menu_on_expose() | ||
731 | - * | ||
732 | - * Copyright (C) 2003 Sun Microsystems, Inc. | ||
733 | - * Copyright (C) 2001 Free Software Foundation, Inc. | ||
734 | - * Copyright (C) 2000 Helix Code, Inc. | ||
735 | - */ | ||
736 | -static gboolean | ||
737 | -menubar_expose_event_cb (GtkWidget *widget, | ||
738 | - GdkEventExpose *event, | ||
739 | - GdmAppletData *adata) | ||
740 | -{ | ||
741 | - if (gtk_widget_has_focus (GTK_WIDGET (adata->applet))) | ||
742 | - gtk_paint_focus (gtk_widget_get_style (widget), | ||
743 | - gtk_widget_get_window (widget), | ||
744 | - gtk_widget_get_state (widget), | ||
745 | - NULL, widget, "menu-applet", 0, 0, -1, -1); | ||
746 | - | ||
747 | - return FALSE; | ||
748 | -} | ||
749 | - | ||
750 | -static void | ||
751 | -menu_style_set_cb (GtkWidget *menu, | ||
752 | - GtkStyle *old_style, | ||
753 | - GdmAppletData *adata) | ||
754 | -{ | ||
755 | - GtkSettings *settings; | ||
756 | - int width; | ||
757 | - int height; | ||
758 | - | ||
759 | - adata->icon_size = gtk_icon_size_from_name ("panel-menu"); | ||
760 | - | ||
761 | - if (adata->icon_size == GTK_ICON_SIZE_INVALID) { | ||
762 | - adata->icon_size = gtk_icon_size_register ("panel-menu", 24, 24); | ||
763 | - } | ||
764 | - | ||
765 | - if (gtk_widget_has_screen (menu)) { | ||
766 | - settings = gtk_settings_get_for_screen (gtk_widget_get_screen (menu)); | ||
767 | - } else { | ||
768 | - settings = gtk_settings_get_default (); | ||
769 | - } | ||
770 | - | ||
771 | - if (!gtk_icon_size_lookup_for_settings (settings, adata->icon_size, | ||
772 | - &width, &height)) { | ||
773 | - adata->pixel_size = -1; | ||
774 | - } else { | ||
775 | - adata->pixel_size = MAX (width, height); | ||
776 | - } | ||
777 | -} | ||
778 | - | ||
779 | -static void | ||
780 | -menuitem_style_set_cb (GtkWidget *menuitem, | ||
781 | - GtkStyle *old_style, | ||
782 | - GdmAppletData *adata) | ||
783 | -{ | ||
784 | - GtkWidget *image; | ||
785 | - | ||
786 | - if (GDM_IS_ENTRY_MENU_ITEM (menuitem)) { | ||
787 | - } else { | ||
788 | - const char *icon_name; | ||
789 | - | ||
790 | - if (menuitem == adata->login_screen_item) { | ||
791 | - icon_name = "system-users"; | ||
792 | - } else if (menuitem == adata->lock_screen_item) { | ||
793 | - icon_name = "system-lock-screen"; | ||
794 | - } else if (menuitem == adata->quit_session_item) { | ||
795 | - icon_name = "system-log-out"; | ||
796 | - } else if (menuitem == adata->account_item) { | ||
797 | - icon_name = "user-info"; | ||
798 | - } else if (menuitem == adata->control_panel_item) { | ||
799 | - icon_name = "preferences-desktop"; | ||
800 | - } else { | ||
801 | - icon_name = GTK_STOCK_MISSING_IMAGE; | ||
802 | - } | ||
803 | - | ||
804 | - image = gtk_image_menu_item_get_image (GTK_IMAGE_MENU_ITEM (menuitem)); | ||
805 | - gtk_image_set_pixel_size (GTK_IMAGE (image), adata->pixel_size); | ||
806 | - gtk_image_set_from_icon_name (GTK_IMAGE (image), icon_name, | ||
807 | - adata->icon_size); | ||
808 | - } | ||
809 | -} | ||
810 | - | ||
811 | -static void | ||
812 | -on_user_changed (GdmUser *user, | ||
813 | - GdmAppletData *adata) | ||
814 | -{ | ||
815 | - g_debug ("user changed"); | ||
816 | - update_label (adata); | ||
817 | - reset_icon (adata); | ||
818 | -} | ||
819 | - | ||
820 | -/* Called every time the menu is displayed (and also for some reason | ||
821 | - * immediately it's created, which does no harm). All we have to do | ||
822 | - * here is kick off a request to GDM to let us know which users are | ||
823 | - * logged in, so we can display check marks next to their names. | ||
824 | - */ | ||
825 | -static gboolean | ||
826 | -menu_expose_cb (GtkWidget *menu, | ||
827 | - gpointer data) | ||
828 | -{ | ||
829 | - char *program; | ||
830 | - GdmAppletData *adata = data; | ||
831 | - | ||
832 | - program = g_find_program_in_path ("gnome-control-center"); | ||
833 | - if (program != NULL) { | ||
834 | - gtk_widget_show (adata->control_panel_item); | ||
835 | - } else { | ||
836 | - gtk_widget_hide (adata->control_panel_item); | ||
837 | - } | ||
838 | - g_free (program); | ||
839 | - return FALSE; | ||
840 | -} | ||
841 | - | ||
842 | -static void | ||
843 | -maybe_lock_screen (GdmAppletData *adata) | ||
844 | -{ | ||
845 | - char *args[3]; | ||
846 | - GError *err; | ||
847 | - GdkScreen *screen; | ||
848 | - gboolean use_gscreensaver = TRUE; | ||
849 | - gboolean res; | ||
850 | - | ||
851 | - g_debug ("Attempting to lock screen"); | ||
852 | - | ||
853 | - args[0] = g_find_program_in_path ("gnome-screensaver-command"); | ||
854 | - if (args[0] == NULL) { | ||
855 | - args[0] = g_find_program_in_path ("xscreensaver-command"); | ||
856 | - use_gscreensaver = FALSE; | ||
857 | - } | ||
858 | - | ||
859 | - if (args[0] == NULL) { | ||
860 | - return; | ||
861 | - } | ||
862 | - | ||
863 | - if (use_gscreensaver) { | ||
864 | - args[1] = "--lock"; | ||
865 | - } else { | ||
866 | - args[1] = "-lock"; | ||
867 | - } | ||
868 | - args[2] = NULL; | ||
869 | - | ||
870 | - if (gtk_widget_has_screen (GTK_WIDGET (adata->applet))) { | ||
871 | - screen = gtk_widget_get_screen (GTK_WIDGET (adata->applet)); | ||
872 | - } else { | ||
873 | - screen = gdk_screen_get_default (); | ||
874 | - } | ||
875 | - | ||
876 | - err = NULL; | ||
877 | - res = gdk_spawn_on_screen (screen, | ||
878 | - g_get_home_dir (), | ||
879 | - args, | ||
880 | - NULL, | ||
881 | - 0, | ||
882 | - NULL, | ||
883 | - NULL, | ||
884 | - NULL, | ||
885 | - &err); | ||
886 | - if (! res) { | ||
887 | - g_warning (_("Can't lock screen: %s"), err->message); | ||
888 | - g_error_free (err); | ||
889 | - } | ||
890 | - | ||
891 | - if (use_gscreensaver) { | ||
892 | - args[1] = "--throttle"; | ||
893 | - } else { | ||
894 | - args[1] = "-throttle"; | ||
895 | - } | ||
896 | - | ||
897 | - err = NULL; | ||
898 | - res = gdk_spawn_on_screen (screen, | ||
899 | - g_get_home_dir (), | ||
900 | - args, | ||
901 | - NULL, | ||
902 | - (G_SPAWN_STDERR_TO_DEV_NULL | ||
903 | - | G_SPAWN_STDOUT_TO_DEV_NULL), | ||
904 | - NULL, | ||
905 | - NULL, | ||
906 | - NULL, | ||
907 | - &err); | ||
908 | - if (! res) { | ||
909 | - g_warning (_("Can't temporarily set screensaver to blank screen: %s"), | ||
910 | - err->message); | ||
911 | - g_error_free (err); | ||
912 | - } | ||
913 | - | ||
914 | - g_free (args[0]); | ||
915 | -} | ||
916 | - | ||
917 | -static void | ||
918 | -do_switch (GdmAppletData *adata, | ||
919 | - GdmUser *user) | ||
920 | -{ | ||
921 | - guint num_sessions; | ||
922 | - | ||
923 | - g_debug ("Do user switch"); | ||
924 | - | ||
925 | - if (user == NULL) { | ||
926 | - gdm_user_manager_goto_login_session (adata->manager); | ||
927 | - goto out; | ||
928 | - } | ||
929 | - | ||
930 | - num_sessions = gdm_user_get_num_sessions (user); | ||
931 | - if (num_sessions > 0) { | ||
932 | - gdm_user_manager_activate_user_session (adata->manager, user); | ||
933 | - } else { | ||
934 | - gdm_user_manager_goto_login_session (adata->manager); | ||
935 | - } | ||
936 | - out: | ||
937 | - maybe_lock_screen (adata); | ||
938 | -} | ||
939 | - | ||
940 | -static void | ||
941 | -update_switch_user (GdmAppletData *adata) | ||
942 | -{ | ||
943 | - gboolean can_switch; | ||
944 | - gboolean has_other_users; | ||
945 | - | ||
946 | - can_switch = gdm_user_manager_can_switch (adata->manager); | ||
947 | - g_object_get (adata->manager, | ||
948 | - "has-multiple-users", &has_other_users, | ||
949 | - NULL); | ||
950 | - | ||
951 | - if (can_switch && has_other_users) { | ||
952 | - gtk_widget_show (adata->login_screen_item); | ||
953 | - } else { | ||
954 | - | ||
955 | - gtk_widget_hide (adata->login_screen_item); | ||
956 | - } | ||
957 | -} | ||
958 | - | ||
959 | -static void | ||
960 | -on_manager_is_loaded_changed (GdmUserManager *manager, | ||
961 | - GParamSpec *pspec, | ||
962 | - GdmAppletData *adata) | ||
963 | -{ | ||
964 | - update_switch_user (adata); | ||
965 | -} | ||
966 | - | ||
967 | -static void | ||
968 | -on_manager_has_multiple_users_changed (GdmUserManager *manager, | ||
969 | - GParamSpec *pspec, | ||
970 | - GdmAppletData *adata) | ||
971 | -{ | ||
972 | - update_switch_user (adata); | ||
973 | -} | ||
974 | - | ||
975 | -#ifdef BUILD_PRESENSE_STUFF | ||
976 | -static void | ||
977 | -on_user_item_activate (GtkMenuItem *item, | ||
978 | - GdmAppletData *adata) | ||
979 | -{ | ||
980 | - g_signal_stop_emission_by_name (item, "activate"); | ||
981 | -} | ||
982 | -#endif | ||
983 | - | ||
984 | -static void | ||
985 | -on_control_panel_activate (GtkMenuItem *item, | ||
986 | - GdmAppletData *adata) | ||
987 | -{ | ||
988 | - char *args[2]; | ||
989 | - GError *error; | ||
990 | - GdkScreen *screen; | ||
991 | - gboolean res; | ||
992 | - | ||
993 | - args[0] = g_find_program_in_path ("gnome-control-center"); | ||
994 | - if (args[0] == NULL) { | ||
995 | - return; | ||
996 | - } | ||
997 | - args[1] = NULL; | ||
998 | - | ||
999 | - if (gtk_widget_has_screen (GTK_WIDGET (adata->applet))) { | ||
1000 | - screen = gtk_widget_get_screen (GTK_WIDGET (adata->applet)); | ||
1001 | - } else { | ||
1002 | - screen = gdk_screen_get_default (); | ||
1003 | - } | ||
1004 | - | ||
1005 | - error = NULL; | ||
1006 | - res = gdk_spawn_on_screen (screen, | ||
1007 | - g_get_home_dir (), | ||
1008 | - args, | ||
1009 | - NULL, | ||
1010 | - 0, | ||
1011 | - NULL, | ||
1012 | - NULL, | ||
1013 | - NULL, | ||
1014 | - &error); | ||
1015 | - if (! res) { | ||
1016 | - g_warning (_("Can't lock screen: %s"), error->message); | ||
1017 | - g_error_free (error); | ||
1018 | - } | ||
1019 | - | ||
1020 | - g_free (args[0]); | ||
1021 | -} | ||
1022 | - | ||
1023 | -static void | ||
1024 | -on_account_activate (GtkMenuItem *item, | ||
1025 | - GdmAppletData *adata) | ||
1026 | -{ | ||
1027 | - char *args[2]; | ||
1028 | - GError *error; | ||
1029 | - GdkScreen *screen; | ||
1030 | - gboolean res; | ||
1031 | - | ||
1032 | - args[0] = g_find_program_in_path ("accounts-dialog"); | ||
1033 | - if (args[0] == NULL) { | ||
1034 | - args[0] = g_find_program_in_path ("gnome-about-me"); | ||
1035 | - if (args[0] == NULL) { | ||
1036 | - return; | ||
1037 | - } | ||
1038 | - } | ||
1039 | - args[1] = NULL; | ||
1040 | - | ||
1041 | - if (gtk_widget_has_screen (GTK_WIDGET (adata->applet))) { | ||
1042 | - screen = gtk_widget_get_screen (GTK_WIDGET (adata->applet)); | ||
1043 | - } else { | ||
1044 | - screen = gdk_screen_get_default (); | ||
1045 | - } | ||
1046 | - | ||
1047 | - error = NULL; | ||
1048 | - res = gdk_spawn_on_screen (screen, | ||
1049 | - g_get_home_dir (), | ||
1050 | - args, | ||
1051 | - NULL, | ||
1052 | - 0, | ||
1053 | - NULL, | ||
1054 | - NULL, | ||
1055 | - NULL, | ||
1056 | - &error); | ||
1057 | - if (! res) { | ||
1058 | - g_warning (_("Can't lock screen: %s"), error->message); | ||
1059 | - g_error_free (error); | ||
1060 | - } | ||
1061 | - | ||
1062 | - g_free (args[0]); | ||
1063 | -} | ||
1064 | - | ||
1065 | -static void | ||
1066 | -on_lock_screen_activate (GtkMenuItem *item, | ||
1067 | - GdmAppletData *adata) | ||
1068 | -{ | ||
1069 | - maybe_lock_screen (adata); | ||
1070 | -} | ||
1071 | - | ||
1072 | -static void | ||
1073 | -on_login_screen_activate (GtkMenuItem *item, | ||
1074 | - GdmAppletData *adata) | ||
1075 | -{ | ||
1076 | - GdmUser *user; | ||
1077 | - | ||
1078 | - user = NULL; | ||
1079 | - | ||
1080 | - do_switch (adata, user); | ||
1081 | -} | ||
1082 | - | ||
1083 | -static void | ||
1084 | -on_quit_session_activate (GtkMenuItem *item, | ||
1085 | - GdmAppletData *adata) | ||
1086 | -{ | ||
1087 | - char *args[3]; | ||
1088 | - GError *error; | ||
1089 | - GdkScreen *screen; | ||
1090 | - gboolean res; | ||
1091 | - | ||
1092 | - args[0] = g_find_program_in_path ("gnome-session-save"); | ||
1093 | - if (args[0] == NULL) { | ||
1094 | - return; | ||
1095 | - } | ||
1096 | - | ||
1097 | - args[1] = "--logout-dialog"; | ||
1098 | - args[2] = NULL; | ||
1099 | - | ||
1100 | - if (gtk_widget_has_screen (GTK_WIDGET (adata->applet))) { | ||
1101 | - screen = gtk_widget_get_screen (GTK_WIDGET (adata->applet)); | ||
1102 | - } else { | ||
1103 | - screen = gdk_screen_get_default (); | ||
1104 | - } | ||
1105 | - | ||
1106 | - error = NULL; | ||
1107 | - res = gdk_spawn_on_screen (screen, | ||
1108 | - g_get_home_dir (), | ||
1109 | - args, | ||
1110 | - NULL, | ||
1111 | - 0, | ||
1112 | - NULL, | ||
1113 | - NULL, | ||
1114 | - NULL, | ||
1115 | - &error); | ||
1116 | - if (! res) { | ||
1117 | - g_warning (_("Can't log out: %s"), error->message); | ||
1118 | - g_error_free (error); | ||
1119 | - } | ||
1120 | - | ||
1121 | - g_free (args[0]); | ||
1122 | -} | ||
1123 | - | ||
1124 | -#ifdef BUILD_PRESENSE_STUFF | ||
1125 | -static gboolean | ||
1126 | -on_menu_key_press_event (GtkWidget *widget, | ||
1127 | - GdkEventKey *event, | ||
1128 | - GdmAppletData *adata) | ||
1129 | -{ | ||
1130 | - GtkWidget *entry; | ||
1131 | - | ||
1132 | - entry = gdm_entry_menu_item_get_entry (GDM_ENTRY_MENU_ITEM (adata->user_item)); | ||
1133 | - | ||
1134 | - if (GTK_WIDGET_HAS_FOCUS (entry)) { | ||
1135 | - gtk_widget_event (entry, (GdkEvent *)event); | ||
1136 | - return TRUE; | ||
1137 | - } else { | ||
1138 | - return FALSE; | ||
1139 | - } | ||
1140 | -} | ||
1141 | - | ||
1142 | -static void | ||
1143 | -save_status (GdmAppletData *adata, | ||
1144 | - guint status) | ||
1145 | -{ | ||
1146 | - if (adata->current_status != status) { | ||
1147 | - GError *error; | ||
1148 | - | ||
1149 | - adata->current_status = status; | ||
1150 | - | ||
1151 | - g_debug ("Saving status: %u", status); | ||
1152 | - error = NULL; | ||
1153 | - dbus_g_proxy_call (adata->presence_proxy, | ||
1154 | - "SetStatus", | ||
1155 | - &error, | ||
1156 | - G_TYPE_UINT, status, | ||
1157 | - G_TYPE_INVALID, | ||
1158 | - G_TYPE_INVALID); | ||
1159 | - | ||
1160 | - if (error != NULL) { | ||
1161 | - g_warning ("Couldn't save presence status: %s", error->message); | ||
1162 | - g_error_free (error); | ||
1163 | - } | ||
1164 | - } | ||
1165 | -} | ||
1166 | - | ||
1167 | -static void | ||
1168 | -on_status_available_activate (GtkWidget *widget, | ||
1169 | - GdmAppletData *adata) | ||
1170 | -{ | ||
1171 | - | ||
1172 | - if (gtk_check_menu_item_get_active (GTK_CHECK_MENU_ITEM (widget))) { | ||
1173 | - save_status (adata, GSM_PRESENCE_STATUS_AVAILABLE); | ||
1174 | - } | ||
1175 | -} | ||
1176 | - | ||
1177 | -static void | ||
1178 | -on_status_busy_activate (GtkWidget *widget, | ||
1179 | - GdmAppletData *adata) | ||
1180 | -{ | ||
1181 | - if (gtk_check_menu_item_get_active (GTK_CHECK_MENU_ITEM (widget))) { | ||
1182 | - save_status (adata, GSM_PRESENCE_STATUS_BUSY); | ||
1183 | - } | ||
1184 | -} | ||
1185 | - | ||
1186 | -static void | ||
1187 | -on_status_invisible_activate (GtkWidget *widget, | ||
1188 | - GdmAppletData *adata) | ||
1189 | -{ | ||
1190 | - if (gtk_check_menu_item_get_active (GTK_CHECK_MENU_ITEM (widget))) { | ||
1191 | - save_status (adata, GSM_PRESENCE_STATUS_INVISIBLE); | ||
1192 | - } | ||
1193 | -} | ||
1194 | - | ||
1195 | -static struct { | ||
1196 | - char *icon_name; | ||
1197 | - char *display_name; | ||
1198 | - void *menu_callback; | ||
1199 | - GtkWidget *widget; | ||
1200 | -} statuses[] = { | ||
1201 | - { "user-online", N_("Available"), on_status_available_activate, NULL }, | ||
1202 | - { "user-invisible", N_("Invisible"), on_status_invisible_activate, NULL }, | ||
1203 | - { "user-busy", N_("Busy"), on_status_busy_activate, NULL }, | ||
1204 | - { "user-away", N_("Away"), NULL, NULL }, | ||
1205 | -}; | ||
1206 | -#endif | ||
1207 | - | ||
1208 | -static void | ||
1209 | -update_label (GdmAppletData *adata) | ||
1210 | -{ | ||
1211 | - GtkWidget *label; | ||
1212 | - char *markup; | ||
1213 | - | ||
1214 | - label = gtk_bin_get_child (GTK_BIN (adata->menuitem)); | ||
1215 | - | ||
1216 | -#ifdef BUILD_PRESENSE_STUFF | ||
1217 | - markup = g_strdup_printf ("<b>%s</b> <small>(%s)</small>", | ||
1218 | - gdm_user_get_real_name (GDM_USER (adata->user)), | ||
1219 | - _(statuses[adata->current_status].display_name)); | ||
1220 | -#else | ||
1221 | - markup = g_strdup_printf ("<b>%s</b>", | ||
1222 | - gdm_user_get_real_name (GDM_USER (adata->user))); | ||
1223 | -#endif | ||
1224 | - gtk_label_set_markup (GTK_LABEL (label), markup); | ||
1225 | - g_free (markup); | ||
1226 | -} | ||
1227 | - | ||
1228 | -#ifdef BUILD_PRESENSE_STUFF | ||
1229 | -static void | ||
1230 | -save_status_text (GdmAppletData *adata) | ||
1231 | -{ | ||
1232 | - GtkWidget *entry; | ||
1233 | - GtkTextBuffer *buffer; | ||
1234 | - char *escaped_text; | ||
1235 | - char *text; | ||
1236 | - GtkTextIter start, end; | ||
1237 | - | ||
1238 | - entry = gdm_entry_menu_item_get_entry (GDM_ENTRY_MENU_ITEM (adata->user_item)); | ||
1239 | - buffer = gtk_text_view_get_buffer (GTK_TEXT_VIEW (entry)); | ||
1240 | - gtk_text_buffer_get_bounds (buffer, &start, &end); | ||
1241 | - text = gtk_text_buffer_get_text (buffer, &start, &end, FALSE); | ||
1242 | - escaped_text = g_markup_escape_text (text, -1); | ||
1243 | - | ||
1244 | - if (escaped_text != NULL) { | ||
1245 | - GError *error; | ||
1246 | - | ||
1247 | - error = NULL; | ||
1248 | - dbus_g_proxy_call (adata->presence_proxy, | ||
1249 | - "SetStatusText", | ||
1250 | - &error, | ||
1251 | - G_TYPE_STRING, escaped_text, | ||
1252 | - G_TYPE_INVALID, | ||
1253 | - G_TYPE_INVALID); | ||
1254 | - | ||
1255 | - if (error != NULL) { | ||
1256 | - g_warning ("Couldn't set presence status text: %s", error->message); | ||
1257 | - g_error_free (error); | ||
1258 | - } | ||
1259 | - } | ||
1260 | - | ||
1261 | - g_free (text); | ||
1262 | - g_free (escaped_text); | ||
1263 | -} | ||
1264 | - | ||
1265 | -static void | ||
1266 | -on_user_item_deselect (GtkWidget *item, | ||
1267 | - GdmAppletData *adata) | ||
1268 | -{ | ||
1269 | - save_status_text (adata); | ||
1270 | -} | ||
1271 | -#endif | ||
1272 | - | ||
1273 | -static void | ||
1274 | -create_sub_menu (GdmAppletData *adata) | ||
1275 | -{ | ||
1276 | - GtkWidget *item; | ||
1277 | -#ifdef BUILD_PRESENSE_STUFF | ||
1278 | - int i; | ||
1279 | - GSList *radio_group; | ||
1280 | -#endif | ||
1281 | - | ||
1282 | - adata->menu = gtk_menu_new (); | ||
1283 | -#ifdef BUILD_PRESENSE_STUFF | ||
1284 | - g_signal_connect (adata->menu, | ||
1285 | - "key-press-event", | ||
1286 | - G_CALLBACK (on_menu_key_press_event), | ||
1287 | - adata); | ||
1288 | -#endif | ||
1289 | - gtk_menu_item_set_submenu (GTK_MENU_ITEM (adata->menuitem), adata->menu); | ||
1290 | - g_signal_connect (adata->menu, "style-set", | ||
1291 | - G_CALLBACK (menu_style_set_cb), adata); | ||
1292 | - g_signal_connect (adata->menu, "show", | ||
1293 | - G_CALLBACK (menu_expose_cb), adata); | ||
1294 | - | ||
1295 | -#ifdef BUILD_PRESENSE_STUFF | ||
1296 | - adata->user_item = gdm_entry_menu_item_new (); | ||
1297 | - gtk_menu_shell_append (GTK_MENU_SHELL (adata->menu), | ||
1298 | - adata->user_item); | ||
1299 | - gtk_widget_show (adata->user_item); | ||
1300 | - g_signal_connect (adata->user_item, "activate", | ||
1301 | - G_CALLBACK (on_user_item_activate), adata); | ||
1302 | - g_signal_connect (adata->user_item, | ||
1303 | - "deselect", | ||
1304 | - G_CALLBACK (on_user_item_deselect), | ||
1305 | - adata); | ||
1306 | - | ||
1307 | - item = gtk_separator_menu_item_new (); | ||
1308 | - gtk_menu_shell_append (GTK_MENU_SHELL (adata->menu), item); | ||
1309 | - gtk_widget_show (item); | ||
1310 | - | ||
1311 | - radio_group = NULL; | ||
1312 | - for (i = 0; i < G_N_ELEMENTS (statuses); i++) { | ||
1313 | - GtkWidget *hbox; | ||
1314 | - GtkWidget *label; | ||
1315 | - GtkWidget *image; | ||
1316 | - GtkWidget *item; | ||
1317 | - | ||
1318 | - if (statuses[i].menu_callback == NULL) { | ||
1319 | - continue; | ||
1320 | - } | ||
1321 | - | ||
1322 | - item = gtk_radio_menu_item_new (radio_group); | ||
1323 | - radio_group = gtk_radio_menu_item_get_group (GTK_RADIO_MENU_ITEM (item)); | ||
1324 | - hbox = gtk_hbox_new (FALSE, 3); | ||
1325 | - label = gtk_label_new (_(statuses[i].display_name)); | ||
1326 | - gtk_label_set_justify (GTK_LABEL(label), GTK_JUSTIFY_LEFT); | ||
1327 | - gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5); | ||
1328 | - gtk_box_pack_start (GTK_BOX (hbox), label, TRUE, TRUE, 0); | ||
1329 | - gtk_widget_show (label); | ||
1330 | - image = gtk_image_new_from_icon_name (statuses[i].icon_name, GTK_ICON_SIZE_MENU); | ||
1331 | - gtk_box_pack_start (GTK_BOX (hbox), image, FALSE, TRUE, 0); | ||
1332 | - gtk_widget_show (image); | ||
1333 | - gtk_widget_show (hbox); | ||
1334 | - gtk_container_add (GTK_CONTAINER (item), hbox); | ||
1335 | - | ||
1336 | - gtk_menu_shell_append (GTK_MENU_SHELL (adata->menu), | ||
1337 | - item); | ||
1338 | - g_signal_connect (item, "activate", | ||
1339 | - G_CALLBACK (statuses[i].menu_callback), adata); | ||
1340 | - gtk_widget_show (item); | ||
1341 | - | ||
1342 | - statuses[i].widget = item; | ||
1343 | - } | ||
1344 | - | ||
1345 | - item = gtk_separator_menu_item_new (); | ||
1346 | - gtk_menu_shell_append (GTK_MENU_SHELL (adata->menu), item); | ||
1347 | - gtk_widget_show (item); | ||
1348 | -#endif | ||
1349 | - | ||
1350 | - adata->account_item = gtk_image_menu_item_new_with_label (_("Account Information")); | ||
1351 | - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (adata->account_item), | ||
1352 | - gtk_image_new ()); | ||
1353 | - gtk_menu_shell_append (GTK_MENU_SHELL (adata->menu), | ||
1354 | - adata->account_item); | ||
1355 | - g_signal_connect (adata->account_item, "style-set", | ||
1356 | - G_CALLBACK (menuitem_style_set_cb), adata); | ||
1357 | - g_signal_connect (adata->account_item, "activate", | ||
1358 | - G_CALLBACK (on_account_activate), adata); | ||
1359 | - gtk_widget_show (adata->account_item); | ||
1360 | - | ||
1361 | - | ||
1362 | - adata->control_panel_item = gtk_image_menu_item_new_with_label (_("System Preferences")); | ||
1363 | - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (adata->control_panel_item), | ||
1364 | - gtk_image_new ()); | ||
1365 | - gtk_menu_shell_append (GTK_MENU_SHELL (adata->menu), | ||
1366 | - adata->control_panel_item); | ||
1367 | - g_signal_connect (adata->control_panel_item, "style-set", | ||
1368 | - G_CALLBACK (menuitem_style_set_cb), adata); | ||
1369 | - g_signal_connect (adata->control_panel_item, "activate", | ||
1370 | - G_CALLBACK (on_control_panel_activate), adata); | ||
1371 | - | ||
1372 | - item = gtk_separator_menu_item_new (); | ||
1373 | - gtk_menu_shell_append (GTK_MENU_SHELL (adata->menu), item); | ||
1374 | - gtk_widget_show (item); | ||
1375 | - | ||
1376 | - adata->lock_screen_item = gtk_image_menu_item_new_with_label (_("Lock Screen")); | ||
1377 | - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (adata->lock_screen_item), | ||
1378 | - gtk_image_new ()); | ||
1379 | - gtk_menu_shell_append (GTK_MENU_SHELL (adata->menu), | ||
1380 | - adata->lock_screen_item); | ||
1381 | - g_signal_connect (adata->lock_screen_item, "style-set", | ||
1382 | - G_CALLBACK (menuitem_style_set_cb), adata); | ||
1383 | - g_signal_connect (adata->lock_screen_item, "activate", | ||
1384 | - G_CALLBACK (on_lock_screen_activate), adata); | ||
1385 | - /* Only show if not locked down */ | ||
1386 | - | ||
1387 | - adata->login_screen_item = gtk_image_menu_item_new_with_label (_("Switch User")); | ||
1388 | - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (adata->login_screen_item), | ||
1389 | - gtk_image_new ()); | ||
1390 | - gtk_menu_shell_append (GTK_MENU_SHELL (adata->menu), | ||
1391 | - adata->login_screen_item); | ||
1392 | - g_signal_connect (adata->login_screen_item, "style-set", | ||
1393 | - G_CALLBACK (menuitem_style_set_cb), adata); | ||
1394 | - g_signal_connect (adata->login_screen_item, "activate", | ||
1395 | - G_CALLBACK (on_login_screen_activate), adata); | ||
1396 | - /* Only show switch user if there are other users */ | ||
1397 | - | ||
1398 | - adata->quit_session_item = gtk_image_menu_item_new_with_label (_("Quit…")); | ||
1399 | - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (adata->quit_session_item), | ||
1400 | - gtk_image_new ()); | ||
1401 | - gtk_menu_shell_append (GTK_MENU_SHELL (adata->menu), | ||
1402 | - adata->quit_session_item); | ||
1403 | - g_signal_connect (adata->quit_session_item, "style-set", | ||
1404 | - G_CALLBACK (menuitem_style_set_cb), adata); | ||
1405 | - g_signal_connect (adata->quit_session_item, "activate", | ||
1406 | - G_CALLBACK (on_quit_session_activate), adata); | ||
1407 | - gtk_widget_show (adata->quit_session_item); | ||
1408 | - gtk_widget_show (adata->menu); | ||
1409 | -} | ||
1410 | - | ||
1411 | -static void | ||
1412 | -destroy_sub_menu (GdmAppletData *adata) | ||
1413 | -{ | ||
1414 | - gtk_menu_item_set_submenu (GTK_MENU_ITEM (adata->menuitem), NULL); | ||
1415 | -} | ||
1416 | - | ||
1417 | -static void | ||
1418 | -set_menu_visibility (GdmAppletData *adata, | ||
1419 | - gboolean visible) | ||
1420 | -{ | ||
1421 | - | ||
1422 | - if (visible) { | ||
1423 | - create_sub_menu (adata); | ||
1424 | - } else { | ||
1425 | - destroy_sub_menu (adata); | ||
1426 | - } | ||
1427 | -} | ||
1428 | - | ||
1429 | -static void | ||
1430 | -client_notify_lockdown_func (GConfClient *client, | ||
1431 | - guint cnxn_id, | ||
1432 | - GConfEntry *entry, | ||
1433 | - GdmAppletData *adata) | ||
1434 | -{ | ||
1435 | - GConfValue *value; | ||
1436 | - const char *key; | ||
1437 | - | ||
1438 | - value = gconf_entry_get_value (entry); | ||
1439 | - key = gconf_entry_get_key (entry); | ||
1440 | - | ||
1441 | - if (value == NULL || key == NULL) { | ||
1442 | - return; | ||
1443 | - } | ||
1444 | - | ||
1445 | - if (strcmp (key, LOCKDOWN_USER_SWITCHING_KEY) == 0) { | ||
1446 | - if (gconf_value_get_bool (value)) { | ||
1447 | - set_menu_visibility (adata, FALSE); | ||
1448 | - } else { | ||
1449 | - set_menu_visibility (adata, TRUE); | ||
1450 | - } | ||
1451 | - } else if (strcmp (key, LOCKDOWN_LOCK_SCREEN_KEY) == 0) { | ||
1452 | - if (gconf_value_get_bool (value)) { | ||
1453 | - gtk_widget_hide (adata->lock_screen_item); | ||
1454 | - } else { | ||
1455 | - gtk_widget_show (adata->lock_screen_item); | ||
1456 | - } | ||
1457 | - } | ||
1458 | -} | ||
1459 | - | ||
1460 | -static void | ||
1461 | -reset_icon (GdmAppletData *adata) | ||
1462 | -{ | ||
1463 | - GdkPixbuf *pixbuf; | ||
1464 | - GtkWidget *image; | ||
1465 | - | ||
1466 | - if (adata->user == NULL || !gtk_widget_has_screen (GTK_WIDGET (adata->menuitem))) { | ||
1467 | - return; | ||
1468 | - } | ||
1469 | - | ||
1470 | -#ifdef BUILD_PRESENSE_STUFF | ||
1471 | - if (adata->user_item != NULL) { | ||
1472 | - image = gdm_entry_menu_item_get_image (GDM_ENTRY_MENU_ITEM (adata->user_item)); | ||
1473 | - pixbuf = gdm_user_render_icon (adata->user, adata->panel_size * 3); | ||
1474 | - if (pixbuf == NULL) { | ||
1475 | - return; | ||
1476 | - } | ||
1477 | - | ||
1478 | - gtk_image_set_from_pixbuf (GTK_IMAGE (image), pixbuf); | ||
1479 | - g_object_unref (pixbuf); | ||
1480 | - } | ||
1481 | -#else | ||
1482 | - pixbuf = gdm_user_render_icon (adata->user, adata->panel_size); | ||
1483 | - | ||
1484 | - if (pixbuf == NULL) { | ||
1485 | - return; | ||
1486 | - } | ||
1487 | - | ||
1488 | - image = gtk_image_menu_item_get_image (GTK_IMAGE_MENU_ITEM (adata->menuitem)); | ||
1489 | - gtk_image_set_from_pixbuf (GTK_IMAGE (image), pixbuf); | ||
1490 | - g_object_unref (pixbuf); | ||
1491 | -#endif | ||
1492 | -} | ||
1493 | - | ||
1494 | -static void | ||
1495 | -setup_current_user_now (GdmAppletData *adata) | ||
1496 | -{ | ||
1497 | - g_assert (adata->user != NULL); | ||
1498 | - | ||
1499 | - if (adata->user_loaded_notify_id != 0) { | ||
1500 | - g_signal_handler_disconnect (adata->user, adata->user_loaded_notify_id); | ||
1501 | - } | ||
1502 | - adata->user_loaded_notify_id = 0; | ||
1503 | - | ||
1504 | - update_label (adata); | ||
1505 | - reset_icon (adata); | ||
1506 | - adata->user_changed_notify_id = | ||
1507 | - g_signal_connect (adata->user, | ||
1508 | - "changed", | ||
1509 | - G_CALLBACK (on_user_changed), | ||
1510 | - adata); | ||
1511 | -} | ||
1512 | - | ||
1513 | -static void | ||
1514 | -on_current_user_loaded (GdmUser *user, | ||
1515 | - GParamSpec *pspec, | ||
1516 | - GdmAppletData *adata) | ||
1517 | -{ | ||
1518 | - if (!gdm_user_is_loaded (user)) { | ||
1519 | - return; | ||
1520 | - } | ||
1521 | - | ||
1522 | - setup_current_user_now (adata); | ||
1523 | -} | ||
1524 | - | ||
1525 | -static void | ||
1526 | -setup_current_user (GdmAppletData *adata) | ||
1527 | -{ | ||
1528 | - adata->user = gdm_user_manager_get_user_by_uid (adata->manager, getuid ()); | ||
1529 | - | ||
1530 | - if (adata->user == NULL) { | ||
1531 | - g_warning ("Could not setup current user"); | ||
1532 | - return; | ||
1533 | - } | ||
1534 | - | ||
1535 | - g_object_ref (adata->user); | ||
1536 | - | ||
1537 | - adata->menuitem = gtk_image_menu_item_new_with_label (""); | ||
1538 | -#ifndef BUILD_PRESENSE_STUFF | ||
1539 | - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (adata->menuitem), | ||
1540 | - gtk_image_new ()); | ||
1541 | -#endif | ||
1542 | - gtk_menu_shell_append (GTK_MENU_SHELL (adata->menubar), adata->menuitem); | ||
1543 | - gtk_widget_show (adata->menuitem); | ||
1544 | - | ||
1545 | - if (gdm_user_is_loaded (adata->user)) { | ||
1546 | - setup_current_user_now (adata); | ||
1547 | - return; | ||
1548 | - } | ||
1549 | - | ||
1550 | - adata->user_loaded_notify_id = g_signal_connect (adata->user, | ||
1551 | - "notify::is-loaded", | ||
1552 | - G_CALLBACK (on_current_user_loaded), | ||
1553 | - adata); | ||
1554 | -} | ||
1555 | - | ||
1556 | -#ifdef BUILD_PRESENSE_STUFF | ||
1557 | -static void | ||
1558 | -set_status (GdmAppletData *adata, | ||
1559 | - guint status) | ||
1560 | -{ | ||
1561 | - int i; | ||
1562 | - | ||
1563 | - g_debug ("Setting current status: %u", status); | ||
1564 | - adata->current_status = status; | ||
1565 | - for (i = 0; i < G_N_ELEMENTS (statuses); i++) { | ||
1566 | - if (statuses[i].widget == NULL) { | ||
1567 | - continue; | ||
1568 | - } | ||
1569 | - if (i == status) { | ||
1570 | - gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (statuses[i].widget), | ||
1571 | - TRUE); | ||
1572 | - } | ||
1573 | - } | ||
1574 | - | ||
1575 | - update_label (adata); | ||
1576 | -} | ||
1577 | - | ||
1578 | -static void | ||
1579 | -on_presence_status_changed (DBusGProxy *presence_proxy, | ||
1580 | - guint status, | ||
1581 | - GdmAppletData *adata) | ||
1582 | -{ | ||
1583 | - g_debug ("Status changed: %u", status); | ||
1584 | - | ||
1585 | - set_status (adata, status); | ||
1586 | -} | ||
1587 | - | ||
1588 | -static void | ||
1589 | -set_status_text (GdmAppletData *adata, | ||
1590 | - const char *status_text) | ||
1591 | -{ | ||
1592 | - GtkWidget *entry; | ||
1593 | - GtkTextBuffer *buffer; | ||
1594 | - | ||
1595 | - g_debug ("Status text changed: %s", status_text); | ||
1596 | - | ||
1597 | - entry = gdm_entry_menu_item_get_entry (GDM_ENTRY_MENU_ITEM (adata->user_item)); | ||
1598 | - buffer = gtk_text_view_get_buffer (GTK_TEXT_VIEW (entry)); | ||
1599 | - gtk_text_buffer_set_text (buffer, status_text, -1); | ||
1600 | -} | ||
1601 | - | ||
1602 | -static void | ||
1603 | -on_presence_status_text_changed (DBusGProxy *presence_proxy, | ||
1604 | - const char *status_text, | ||
1605 | - GdmAppletData *adata) | ||
1606 | -{ | ||
1607 | - set_status_text (adata, status_text); | ||
1608 | -} | ||
1609 | -#endif | ||
1610 | - | ||
1611 | -static gboolean | ||
1612 | -fill_applet (PanelApplet *applet) | ||
1613 | -{ | ||
1614 | - static const BonoboUIVerb menu_verbs[] = { | ||
1615 | - BONOBO_UI_VERB ("GdmAboutMe", about_me_cb), | ||
1616 | - BONOBO_UI_VERB ("GdmUsersGroupsAdmin", admin_cb), | ||
1617 | - BONOBO_UI_VERB ("GdmAbout", about_cb), | ||
1618 | - BONOBO_UI_VERB_END | ||
1619 | - }; | ||
1620 | - static gboolean first_time = FALSE; | ||
1621 | - char *tmp; | ||
1622 | - BonoboUIComponent *popup_component; | ||
1623 | - GdmAppletData *adata; | ||
1624 | - GError *error; | ||
1625 | - DBusGConnection *bus; | ||
1626 | - | ||
1627 | - if (!first_time) { | ||
1628 | - first_time = TRUE; | ||
1629 | - | ||
1630 | - /* Do this here so it's only done once. */ | ||
1631 | - gtk_rc_parse_string ("style \"gdm-user-switch-menubar-style\"\n" | ||
1632 | - "{\n" | ||
1633 | - "GtkMenuBar::shadow-type = none\n" | ||
1634 | - "GtkMenuBar::internal-padding = 0\n" | ||
1635 | - "}\n" | ||
1636 | - "style \"gdm-user-switch-applet-style\"\n" | ||
1637 | - "{\n" | ||
1638 | - "GtkWidget::focus-line-width = 0\n" | ||
1639 | - "GtkWidget::focus-padding = 0\n" | ||
1640 | - "}\n" | ||
1641 | - "widget \"*.gdm-user-switch-menubar\" style \"gdm-user-switch-menubar-style\"\n" | ||
1642 | - "widget \"*.gdm-user-switch-applet\" style \"gdm-user-switch-applet-style\"\n"); | ||
1643 | - gtk_window_set_default_icon_name ("stock_people"); | ||
1644 | - g_set_application_name (_("User Switch Applet")); | ||
1645 | - | ||
1646 | - if (! gdm_settings_client_init (DATADIR "/gdm/gdm.schemas", "/")) { | ||
1647 | - g_critical ("Unable to initialize settings client"); | ||
1648 | - exit (1); | ||
1649 | - } | ||
1650 | - | ||
1651 | - } | ||
1652 | - | ||
1653 | - adata = g_new0 (GdmAppletData, 1); | ||
1654 | - adata->applet = applet; | ||
1655 | - adata->panel_size = 24; | ||
1656 | - | ||
1657 | - adata->client = gconf_client_get_default (); | ||
1658 | - | ||
1659 | - gtk_widget_set_tooltip_text (GTK_WIDGET (applet), _("Change account settings and status")); | ||
1660 | - gtk_container_set_border_width (GTK_CONTAINER (applet), 0); | ||
1661 | - gtk_widget_set_name (GTK_WIDGET (applet), "gdm-user-switch-applet"); | ||
1662 | - panel_applet_set_flags (applet, PANEL_APPLET_EXPAND_MINOR); | ||
1663 | - panel_applet_setup_menu_from_file (applet, NULL, | ||
1664 | - DATADIR "/gnome-2.0/ui/GNOME_FastUserSwitchApplet.xml", | ||
1665 | - NULL, menu_verbs, adata); | ||
1666 | - | ||
1667 | - popup_component = panel_applet_get_popup_component (applet); | ||
1668 | - | ||
1669 | - /* Hide the admin context menu items if locked down or no cmd-line */ | ||
1670 | - if (gconf_client_get_bool (adata->client, | ||
1671 | - LOCKDOWN_COMMAND_LINE_KEY, | ||
1672 | - NULL) || | ||
1673 | - panel_applet_get_locked_down (applet)) { | ||
1674 | - bonobo_ui_component_set_prop (popup_component, | ||
1675 | - "/popups/button3/GdmSeparator", | ||
1676 | - "hidden", "1", NULL); | ||
1677 | - bonobo_ui_component_set_prop (popup_component, | ||
1678 | - "/commands/GdmUsersGroupsAdmin", | ||
1679 | - "hidden", "1", NULL); | ||
1680 | - } else { | ||
1681 | -#ifndef USERS_ADMIN | ||
1682 | -# ifdef GDM_SETUP | ||
1683 | - bonobo_ui_component_set_prop (popup_component, | ||
1684 | - "/popups/button3/GdmSeparator", | ||
1685 | - "hidden", "1", | ||
1686 | - NULL); | ||
1687 | -# endif /* !GDM_SETUP */ | ||
1688 | - bonobo_ui_component_set_prop (popup_component, | ||
1689 | - "/commands/GdmUsersGroupsAdmin", | ||
1690 | - "hidden", "1", | ||
1691 | - NULL); | ||
1692 | -#endif /* !USERS_ADMIN */ | ||
1693 | - } | ||
1694 | - | ||
1695 | - /* Hide the gdmphotosetup item if it can't be found in the path. */ | ||
1696 | - tmp = g_find_program_in_path ("gnome-about-me"); | ||
1697 | - if (!tmp) { | ||
1698 | - bonobo_ui_component_set_prop (popup_component, | ||
1699 | - "/commands/GdmAboutMe", | ||
1700 | - "hidden", "1", | ||
1701 | - NULL); | ||
1702 | - } else { | ||
1703 | - g_free (tmp); | ||
1704 | - } | ||
1705 | - | ||
1706 | - g_signal_connect (adata->applet, | ||
1707 | - "style-set", | ||
1708 | - G_CALLBACK (applet_style_set_cb), adata); | ||
1709 | - g_signal_connect (applet, | ||
1710 | - "change-background", | ||
1711 | - G_CALLBACK (applet_change_background_cb), adata); | ||
1712 | - g_signal_connect (applet, | ||
1713 | - "size-allocate", | ||
1714 | - G_CALLBACK (applet_size_allocate_cb), adata); | ||
1715 | - g_signal_connect (applet, | ||
1716 | - "key-press-event", | ||
1717 | - G_CALLBACK (applet_key_press_event_cb), adata); | ||
1718 | - g_signal_connect_after (applet, | ||
1719 | - "focus-in-event", | ||
1720 | - G_CALLBACK (gtk_widget_queue_draw), NULL); | ||
1721 | - g_signal_connect_after (applet, | ||
1722 | - "focus-out-event", | ||
1723 | - G_CALLBACK (gtk_widget_queue_draw), NULL); | ||
1724 | - g_object_set_data_full (G_OBJECT (applet), | ||
1725 | - "gdm-applet-data", | ||
1726 | - adata, | ||
1727 | - (GDestroyNotify) gdm_applet_data_free); | ||
1728 | - | ||
1729 | - adata->menubar = gtk_menu_bar_new (); | ||
1730 | - gtk_widget_set_name (adata->menubar, "gdm-user-switch-menubar"); | ||
1731 | - gtk_widget_set_can_focus (adata->menubar, TRUE); | ||
1732 | - g_signal_connect (adata->menubar, "button-press-event", | ||
1733 | - G_CALLBACK (menubar_button_press_event_cb), adata); | ||
1734 | - g_signal_connect_after (adata->menubar, "expose-event", | ||
1735 | - G_CALLBACK (menubar_expose_event_cb), adata); | ||
1736 | - gtk_container_add (GTK_CONTAINER (applet), adata->menubar); | ||
1737 | - gtk_widget_show (adata->menubar); | ||
1738 | - | ||
1739 | - adata->manager = gdm_user_manager_ref_default (); | ||
1740 | - g_object_set (adata->manager, "include-all", TRUE, NULL); | ||
1741 | - g_signal_connect (adata->manager, | ||
1742 | - "notify::is-loaded", | ||
1743 | - G_CALLBACK (on_manager_is_loaded_changed), | ||
1744 | - adata); | ||
1745 | - g_signal_connect (adata->manager, | ||
1746 | - "notify::has-multiple-users", | ||
1747 | - G_CALLBACK (on_manager_has_multiple_users_changed), | ||
1748 | - adata); | ||
1749 | - | ||
1750 | - gdm_user_manager_queue_load (adata->manager); | ||
1751 | - setup_current_user (adata); | ||
1752 | - | ||
1753 | - gconf_client_add_dir (adata->client, | ||
1754 | - LOCKDOWN_DIR, | ||
1755 | - GCONF_CLIENT_PRELOAD_ONELEVEL, | ||
1756 | - NULL); | ||
1757 | - | ||
1758 | - adata->client_notify_lockdown_id = gconf_client_notify_add (adata->client, | ||
1759 | - LOCKDOWN_DIR, | ||
1760 | - (GConfClientNotifyFunc)client_notify_lockdown_func, | ||
1761 | - adata, | ||
1762 | - NULL, | ||
1763 | - NULL); | ||
1764 | - | ||
1765 | - if (gconf_client_get_bool (adata->client, LOCKDOWN_USER_SWITCHING_KEY, NULL)) { | ||
1766 | - set_menu_visibility (adata, FALSE); | ||
1767 | - } else { | ||
1768 | - set_menu_visibility (adata, TRUE); | ||
1769 | - } | ||
1770 | - if (gconf_client_get_bool (adata->client, LOCKDOWN_LOCK_SCREEN_KEY, NULL)) { | ||
1771 | - gtk_widget_hide (adata->lock_screen_item); | ||
1772 | - } else { | ||
1773 | - gtk_widget_show (adata->lock_screen_item); | ||
1774 | - } | ||
1775 | - | ||
1776 | - error = NULL; | ||
1777 | - bus = dbus_g_bus_get (DBUS_BUS_SESSION, &error); | ||
1778 | - if (bus == NULL) { | ||
1779 | - g_warning ("Unable to get session bus: %s", error->message); | ||
1780 | - g_error_free (error); | ||
1781 | - goto done; | ||
1782 | - } | ||
1783 | - | ||
1784 | -#ifdef BUILD_PRESENSE_STUFF | ||
1785 | - adata->presence_proxy = dbus_g_proxy_new_for_name (bus, | ||
1786 | - "org.gnome.SessionManager", | ||
1787 | - "/org/gnome/SessionManager/Presence", | ||
1788 | - "org.gnome.SessionManager.Presence"); | ||
1789 | - if (adata->presence_proxy != NULL) { | ||
1790 | - DBusGProxy *proxy; | ||
1791 | - | ||
1792 | - dbus_g_proxy_add_signal (adata->presence_proxy, | ||
1793 | - "StatusChanged", | ||
1794 | - G_TYPE_UINT, | ||
1795 | - G_TYPE_INVALID); | ||
1796 | - dbus_g_proxy_connect_signal (adata->presence_proxy, | ||
1797 | - "StatusChanged", | ||
1798 | - G_CALLBACK (on_presence_status_changed), | ||
1799 | - adata, | ||
1800 | - NULL); | ||
1801 | - dbus_g_proxy_add_signal (adata->presence_proxy, | ||
1802 | - "StatusTextChanged", | ||
1803 | - G_TYPE_STRING, | ||
1804 | - G_TYPE_INVALID); | ||
1805 | - dbus_g_proxy_connect_signal (adata->presence_proxy, | ||
1806 | - "StatusTextChanged", | ||
1807 | - G_CALLBACK (on_presence_status_text_changed), | ||
1808 | - adata, | ||
1809 | - NULL); | ||
1810 | - | ||
1811 | - | ||
1812 | - proxy = dbus_g_proxy_new_from_proxy (adata->presence_proxy, | ||
1813 | - "org.freedesktop.DBus.Properties", | ||
1814 | - "/org/gnome/SessionManager/Presence"); | ||
1815 | - if (proxy != NULL) { | ||
1816 | - guint status; | ||
1817 | - const char *status_text; | ||
1818 | - GValue value = { 0, }; | ||
1819 | - | ||
1820 | - status = 0; | ||
1821 | - status_text = NULL; | ||
1822 | - | ||
1823 | - error = NULL; | ||
1824 | - dbus_g_proxy_call (proxy, | ||
1825 | - "Get", | ||
1826 | - &error, | ||
1827 | - G_TYPE_STRING, "org.gnome.SessionManager.Presence", | ||
1828 | - G_TYPE_STRING, "status", | ||
1829 | - G_TYPE_INVALID, | ||
1830 | - G_TYPE_VALUE, &value, | ||
1831 | - G_TYPE_INVALID); | ||
1832 | - | ||
1833 | - if (error != NULL) { | ||
1834 | - g_warning ("Couldn't get presence status: %s", error->message); | ||
1835 | - g_error_free (error); | ||
1836 | - } else { | ||
1837 | - status = g_value_get_uint (&value); | ||
1838 | - } | ||
1839 | - | ||
1840 | - g_value_unset (&value); | ||
1841 | - | ||
1842 | - error = NULL; | ||
1843 | - dbus_g_proxy_call (proxy, | ||
1844 | - "Get", | ||
1845 | - &error, | ||
1846 | - G_TYPE_STRING, "org.gnome.SessionManager.Presence", | ||
1847 | - G_TYPE_STRING, "status-text", | ||
1848 | - G_TYPE_INVALID, | ||
1849 | - G_TYPE_VALUE, &value, | ||
1850 | - G_TYPE_INVALID); | ||
1851 | - | ||
1852 | - if (error != NULL) { | ||
1853 | - g_warning ("Couldn't get presence status text: %s", error->message); | ||
1854 | - g_error_free (error); | ||
1855 | - } else { | ||
1856 | - status_text = g_value_get_string (&value); | ||
1857 | - } | ||
1858 | - | ||
1859 | - set_status (adata, status); | ||
1860 | - set_status_text (adata, status_text); | ||
1861 | - } | ||
1862 | - } else { | ||
1863 | - g_warning ("Failed to get session presence proxy"); | ||
1864 | - } | ||
1865 | -#endif | ||
1866 | - | ||
1867 | - done: | ||
1868 | - gtk_widget_show (GTK_WIDGET (adata->applet)); | ||
1869 | - | ||
1870 | - return TRUE; | ||
1871 | -} | ||
1872 | - | ||
1873 | -static gboolean | ||
1874 | -applet_factory (PanelApplet *applet, | ||
1875 | - const char *iid, | ||
1876 | - gpointer data) | ||
1877 | -{ | ||
1878 | - gboolean ret; | ||
1879 | - ret = FALSE; | ||
1880 | - if (strcmp (iid, "OAFIID:GNOME_FastUserSwitchApplet") == 0) { | ||
1881 | - ret = fill_applet (applet); | ||
1882 | - } | ||
1883 | - return ret; | ||
1884 | -} | ||
1885 | diff --git a/gui/user-switch-applet/gdm-entry-menu-item.c b/gui/user-switch-applet/gdm-entry-menu-item.c | ||
1886 | deleted file mode 100644 | ||
1887 | index d657e7a..0000000 | ||
1888 | --- a/gui/user-switch-applet/gdm-entry-menu-item.c | ||
1889 | +++ /dev/null | ||
1890 | @@ -1,304 +0,0 @@ | ||
1891 | -/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*- | ||
1892 | - * | ||
1893 | - * Copyright (C) 2008 Red Hat, Inc. | ||
1894 | - * | ||
1895 | - * This program is free software; you can redistribute it and/or modify | ||
1896 | - * it under the terms of the GNU General Public License as published by | ||
1897 | - * the Free Software Foundation; either version 2 of the License, or | ||
1898 | - * (at your option) any later version. | ||
1899 | - * | ||
1900 | - * This program is distributed in the hope that it will be useful, | ||
1901 | - * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
1902 | - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
1903 | - * GNU General Public License for more details. | ||
1904 | - * | ||
1905 | - * You should have received a copy of the GNU General Public License | ||
1906 | - * along with this program; if not, write to the Free Software | ||
1907 | - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA | ||
1908 | - */ | ||
1909 | - | ||
1910 | -#include "config.h" | ||
1911 | - | ||
1912 | -#include <unistd.h> | ||
1913 | -#include <sys/types.h> | ||
1914 | - | ||
1915 | -#include <string.h> | ||
1916 | - | ||
1917 | -#include <glib/gi18n.h> | ||
1918 | -#include <gtk/gtk.h> | ||
1919 | - | ||
1920 | -#include "gdm-entry-menu-item.h" | ||
1921 | - | ||
1922 | -/* same as twitter */ | ||
1923 | -#define TEXT_BUFFER_MAX_CHARS 64 | ||
1924 | - | ||
1925 | -enum | ||
1926 | -{ | ||
1927 | - PROP_0, | ||
1928 | -}; | ||
1929 | - | ||
1930 | -struct _GdmEntryMenuItem | ||
1931 | -{ | ||
1932 | - GtkMenuItem parent; | ||
1933 | - | ||
1934 | - GtkWidget *hbox; | ||
1935 | - GtkWidget *image; | ||
1936 | - GtkWidget *entry; | ||
1937 | -}; | ||
1938 | - | ||
1939 | -struct _GdmEntryMenuItemClass | ||
1940 | -{ | ||
1941 | - GtkMenuItemClass parent_class; | ||
1942 | -}; | ||
1943 | - | ||
1944 | -G_DEFINE_TYPE (GdmEntryMenuItem, gdm_entry_menu_item, GTK_TYPE_MENU_ITEM) | ||
1945 | - | ||
1946 | -static void | ||
1947 | -gdm_entry_menu_item_set_property (GObject *object, | ||
1948 | - guint param_id, | ||
1949 | - const GValue *value, | ||
1950 | - GParamSpec *pspec) | ||
1951 | -{ | ||
1952 | - GdmEntryMenuItem *item; | ||
1953 | - | ||
1954 | - item = GDM_ENTRY_MENU_ITEM (object); | ||
1955 | - | ||
1956 | - switch (param_id) { | ||
1957 | - default: | ||
1958 | - G_OBJECT_WARN_INVALID_PROPERTY_ID (object, param_id, pspec); | ||
1959 | - break; | ||
1960 | - } | ||
1961 | -} | ||
1962 | - | ||
1963 | -static void | ||
1964 | -gdm_entry_menu_item_get_property (GObject *object, | ||
1965 | - guint param_id, | ||
1966 | - GValue *value, | ||
1967 | - GParamSpec *pspec) | ||
1968 | -{ | ||
1969 | - GdmEntryMenuItem *item; | ||
1970 | - | ||
1971 | - item = GDM_ENTRY_MENU_ITEM (object); | ||
1972 | - | ||
1973 | - switch (param_id) { | ||
1974 | - default: | ||
1975 | - G_OBJECT_WARN_INVALID_PROPERTY_ID (object, param_id, pspec); | ||
1976 | - break; | ||
1977 | - } | ||
1978 | -} | ||
1979 | - | ||
1980 | -static void | ||
1981 | -gdm_entry_menu_item_dispose (GObject *object) | ||
1982 | -{ | ||
1983 | - | ||
1984 | - (*G_OBJECT_CLASS (gdm_entry_menu_item_parent_class)->dispose) (object); | ||
1985 | -} | ||
1986 | - | ||
1987 | -static gboolean | ||
1988 | -gdm_entry_menu_item_button_release (GtkWidget *widget, | ||
1989 | - GdkEventButton *event) | ||
1990 | -{ | ||
1991 | - return TRUE; | ||
1992 | -} | ||
1993 | - | ||
1994 | -/* Cut and paste from gtkwindow.c */ | ||
1995 | -static void | ||
1996 | -send_focus_change (GtkWidget *widget, | ||
1997 | - gboolean in) | ||
1998 | -{ | ||
1999 | - GdkEvent *fevent = gdk_event_new (GDK_FOCUS_CHANGE); | ||
2000 | - | ||
2001 | - g_object_ref (widget); | ||
2002 | - | ||
2003 | - gtk_widget_set_can_focus (widget, in); | ||
2004 | - | ||
2005 | - fevent->focus_change.type = GDK_FOCUS_CHANGE; | ||
2006 | - fevent->focus_change.window = g_object_ref (gtk_widget_get_window (widget)); | ||
2007 | - fevent->focus_change.in = in; | ||
2008 | - | ||
2009 | - gtk_widget_event (widget, fevent); | ||
2010 | - | ||
2011 | - g_object_notify (G_OBJECT (widget), "has-focus"); | ||
2012 | - | ||
2013 | - g_object_unref (widget); | ||
2014 | - gdk_event_free (fevent); | ||
2015 | -} | ||
2016 | - | ||
2017 | -static gboolean | ||
2018 | -gdm_entry_menu_item_button_press (GtkWidget *widget, | ||
2019 | - GdkEventButton *event) | ||
2020 | -{ | ||
2021 | - GtkWidget *entry; | ||
2022 | - | ||
2023 | - entry = GDM_ENTRY_MENU_ITEM (widget)->entry; | ||
2024 | - | ||
2025 | - if (gtk_widget_get_window (entry) != NULL) { | ||
2026 | - gdk_window_raise (gtk_widget_get_window (entry)); | ||
2027 | - } | ||
2028 | - | ||
2029 | - if (!gtk_widget_has_focus (entry)) { | ||
2030 | - gtk_widget_grab_focus (entry); | ||
2031 | - } | ||
2032 | - | ||
2033 | - return FALSE; | ||
2034 | -} | ||
2035 | - | ||
2036 | -static void | ||
2037 | -gdm_entry_menu_item_realize (GtkWidget *widget) | ||
2038 | -{ | ||
2039 | - if (GTK_WIDGET_CLASS (gdm_entry_menu_item_parent_class)->realize) { | ||
2040 | - GTK_WIDGET_CLASS (gdm_entry_menu_item_parent_class)->realize (widget); | ||
2041 | - } | ||
2042 | -} | ||
2043 | - | ||
2044 | -static void | ||
2045 | -gdm_entry_menu_item_select (GtkItem *item) | ||
2046 | -{ | ||
2047 | - g_return_if_fail (GDM_IS_ENTRY_MENU_ITEM (item)); | ||
2048 | - send_focus_change (GTK_WIDGET (GDM_ENTRY_MENU_ITEM (item)->entry), TRUE); | ||
2049 | -} | ||
2050 | - | ||
2051 | -static void | ||
2052 | -gdm_entry_menu_item_deselect (GtkItem *item) | ||
2053 | -{ | ||
2054 | - g_return_if_fail (GDM_IS_ENTRY_MENU_ITEM (item)); | ||
2055 | - | ||
2056 | - send_focus_change (GTK_WIDGET (GDM_ENTRY_MENU_ITEM (item)->entry), FALSE); | ||
2057 | -} | ||
2058 | - | ||
2059 | -static void | ||
2060 | -gdm_entry_menu_item_class_init (GdmEntryMenuItemClass *klass) | ||
2061 | -{ | ||
2062 | - GObjectClass *gobject_class; | ||
2063 | - GtkWidgetClass *widget_class; | ||
2064 | - GtkMenuItemClass *menu_item_class; | ||
2065 | - GtkItemClass *item_class; | ||
2066 | - | ||
2067 | - gobject_class = G_OBJECT_CLASS (klass); | ||
2068 | - widget_class = GTK_WIDGET_CLASS (klass); | ||
2069 | - menu_item_class = GTK_MENU_ITEM_CLASS (klass); | ||
2070 | - item_class = GTK_ITEM_CLASS (klass); | ||
2071 | - | ||
2072 | - gobject_class->set_property = gdm_entry_menu_item_set_property; | ||
2073 | - gobject_class->get_property = gdm_entry_menu_item_get_property; | ||
2074 | - gobject_class->dispose = gdm_entry_menu_item_dispose; | ||
2075 | - | ||
2076 | - widget_class->button_release_event = gdm_entry_menu_item_button_release; | ||
2077 | - widget_class->button_press_event = gdm_entry_menu_item_button_press; | ||
2078 | - widget_class->realize = gdm_entry_menu_item_realize; | ||
2079 | - | ||
2080 | - item_class->select = gdm_entry_menu_item_select; | ||
2081 | - item_class->deselect = gdm_entry_menu_item_deselect; | ||
2082 | - | ||
2083 | - menu_item_class->hide_on_activate = FALSE; | ||
2084 | -} | ||
2085 | - | ||
2086 | -static void | ||
2087 | -on_entry_show (GtkWidget *widget, | ||
2088 | - GdmEntryMenuItem *item) | ||
2089 | -{ | ||
2090 | - if (gtk_widget_get_window (widget) != NULL) { | ||
2091 | - gdk_window_raise (gtk_widget_get_window (widget)); | ||
2092 | - } | ||
2093 | - send_focus_change (widget, TRUE); | ||
2094 | -} | ||
2095 | - | ||
2096 | -static void | ||
2097 | -on_text_buffer_changed (GtkTextBuffer *buffer, | ||
2098 | - GdmEntryMenuItem *item) | ||
2099 | -{ | ||
2100 | - int len; | ||
2101 | - | ||
2102 | - len = gtk_text_buffer_get_char_count (buffer); | ||
2103 | - if (len > TEXT_BUFFER_MAX_CHARS) { | ||
2104 | - gdk_window_beep (gtk_widget_get_window (GTK_WIDGET (item))); | ||
2105 | - } | ||
2106 | -} | ||
2107 | - | ||
2108 | -static void | ||
2109 | -on_entry_move_focus (GtkWidget *widget, | ||
2110 | - GtkDirectionType direction, | ||
2111 | - GdmEntryMenuItem *item) | ||
2112 | -{ | ||
2113 | - g_debug ("focus move"); | ||
2114 | - send_focus_change (GTK_WIDGET (GDM_ENTRY_MENU_ITEM (item)->entry), FALSE); | ||
2115 | - g_signal_emit_by_name (item, | ||
2116 | - "move-focus", | ||
2117 | - GTK_DIR_TAB_FORWARD); | ||
2118 | -} | ||
2119 | - | ||
2120 | -static void | ||
2121 | -gdm_entry_menu_item_init (GdmEntryMenuItem *item) | ||
2122 | -{ | ||
2123 | - PangoFontDescription *fontdesc; | ||
2124 | - PangoFontMetrics *metrics; | ||
2125 | - PangoContext *context; | ||
2126 | - PangoLanguage *lang; | ||
2127 | - int ascent; | ||
2128 | - GtkTextBuffer *buffer; | ||
2129 | - | ||
2130 | - item->hbox = gtk_hbox_new (FALSE, 6); | ||
2131 | - gtk_container_add (GTK_CONTAINER (item), item->hbox); | ||
2132 | - | ||
2133 | - item->image = gtk_image_new (); | ||
2134 | - gtk_box_pack_start (GTK_BOX (item->hbox), item->image, FALSE, FALSE, 0); | ||
2135 | - | ||
2136 | - item->entry = gtk_text_view_new (); | ||
2137 | - gtk_text_view_set_accepts_tab (GTK_TEXT_VIEW (item->entry), FALSE); | ||
2138 | - gtk_text_view_set_editable (GTK_TEXT_VIEW (item->entry), TRUE); | ||
2139 | - gtk_text_view_set_wrap_mode (GTK_TEXT_VIEW (item->entry), | ||
2140 | - GTK_WRAP_WORD); | ||
2141 | - g_signal_connect (item->entry, | ||
2142 | - "show", | ||
2143 | - G_CALLBACK (on_entry_show), | ||
2144 | - item); | ||
2145 | - g_signal_connect (item->entry, | ||
2146 | - "move-focus", | ||
2147 | - G_CALLBACK (on_entry_move_focus), | ||
2148 | - item); | ||
2149 | - | ||
2150 | - buffer = gtk_text_view_get_buffer (GTK_TEXT_VIEW (item->entry)); | ||
2151 | - g_signal_connect (buffer, | ||
2152 | - "changed", | ||
2153 | - G_CALLBACK (on_text_buffer_changed), | ||
2154 | - item); | ||
2155 | - | ||
2156 | - /* get the font ascent for the current font and language */ | ||
2157 | - context = gtk_widget_get_pango_context (item->entry); | ||
2158 | - fontdesc = pango_context_get_font_description (context); | ||
2159 | - lang = pango_context_get_language (context); | ||
2160 | - metrics = pango_context_get_metrics (context, fontdesc, lang); | ||
2161 | - ascent = pango_font_metrics_get_ascent (metrics) * 1.5 / PANGO_SCALE; | ||
2162 | - pango_font_metrics_unref (metrics); | ||
2163 | - | ||
2164 | - /* size our progress bar to be five ascents long */ | ||
2165 | - gtk_widget_set_size_request (item->entry, ascent * 5, -1); | ||
2166 | - | ||
2167 | - gtk_box_pack_start (GTK_BOX (item->hbox), item->entry, TRUE, TRUE, 0); | ||
2168 | - | ||
2169 | - gtk_widget_show (item->hbox); | ||
2170 | - gtk_widget_show (item->image); | ||
2171 | - gtk_widget_show (item->entry); | ||
2172 | -} | ||
2173 | - | ||
2174 | -GtkWidget * | ||
2175 | -gdm_entry_menu_item_new (void) | ||
2176 | -{ | ||
2177 | - return g_object_new (GDM_TYPE_ENTRY_MENU_ITEM, NULL); | ||
2178 | -} | ||
2179 | - | ||
2180 | -GtkWidget * | ||
2181 | -gdm_entry_menu_item_get_entry (GdmEntryMenuItem *item) | ||
2182 | -{ | ||
2183 | - g_return_val_if_fail (GDM_IS_ENTRY_MENU_ITEM (item), NULL); | ||
2184 | - | ||
2185 | - return item->entry; | ||
2186 | -} | ||
2187 | - | ||
2188 | -GtkWidget * | ||
2189 | -gdm_entry_menu_item_get_image (GdmEntryMenuItem *item) | ||
2190 | -{ | ||
2191 | - g_return_val_if_fail (GDM_IS_ENTRY_MENU_ITEM (item), NULL); | ||
2192 | - | ||
2193 | - return item->image; | ||
2194 | -} | ||
2195 | diff --git a/gui/user-switch-applet/gdm-entry-menu-item.h b/gui/user-switch-applet/gdm-entry-menu-item.h | ||
2196 | deleted file mode 100644 | ||
2197 | index 3031609..0000000 | ||
2198 | --- a/gui/user-switch-applet/gdm-entry-menu-item.h | ||
2199 | +++ /dev/null | ||
2200 | @@ -1,51 +0,0 @@ | ||
2201 | -/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*- | ||
2202 | - * | ||
2203 | - * Copyright (C) 2004-2005 James M. Cape <jcape@ignore-your.tv>. | ||
2204 | - * | ||
2205 | - * This program is free software; you can redistribute it and/or modify | ||
2206 | - * it under the terms of the GNU General Public License as published by | ||
2207 | - * the Free Software Foundation; either version 2 of the License, or | ||
2208 | - * (at your option) any later version. | ||
2209 | - * | ||
2210 | - * This program is distributed in the hope that it will be useful, | ||
2211 | - * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
2212 | - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
2213 | - * GNU General Public License for more details. | ||
2214 | - * | ||
2215 | - * You should have received a copy of the GNU General Public License | ||
2216 | - * along with this program; if not, write to the Free Software | ||
2217 | - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA | ||
2218 | - */ | ||
2219 | - | ||
2220 | -#ifndef __GDM_ENTRY_MENU_ITEM__ | ||
2221 | -#define __GDM_ENTRY_MENU_ITEM__ | ||
2222 | - | ||
2223 | -#include <gtk/gtk.h> | ||
2224 | - | ||
2225 | -G_BEGIN_DECLS | ||
2226 | - | ||
2227 | -#define GDM_TYPE_ENTRY_MENU_ITEM \ | ||
2228 | - (gdm_entry_menu_item_get_type ()) | ||
2229 | -#define GDM_ENTRY_MENU_ITEM(object) \ | ||
2230 | - (G_TYPE_CHECK_INSTANCE_CAST ((object), GDM_TYPE_ENTRY_MENU_ITEM, GdmEntryMenuItem)) | ||
2231 | -#define GDM_ENTRY_MENU_ITEM_CLASS(klass) \ | ||
2232 | - (G_TYPE_CHECK_CLASS_CAST ((klass), GDM_TYPE_ENTRY_MENU_ITEM, GdmEntryMenuItemClass)) | ||
2233 | -#define GDM_IS_ENTRY_MENU_ITEM(object) \ | ||
2234 | - (G_TYPE_CHECK_INSTANCE_TYPE ((object), GDM_TYPE_ENTRY_MENU_ITEM)) | ||
2235 | -#define GDM_IS_ENTRY_MENU_ITEM_CLASS(klass) \ | ||
2236 | - (G_TYPE_CHECK_CLASS_TYPE ((klass), GDM_TYPE_ENTRY_MENU_ITEM)) | ||
2237 | -#define GDM_ENTRY_MENU_ITEM_GET_CLASS(object) \ | ||
2238 | - (G_TYPE_INSTANCE_GET_CLASS ((object), GDM_TYPE_ENTRY_MENU_ITEM, GdmEntryMenuItemClass)) | ||
2239 | - | ||
2240 | -typedef struct _GdmEntryMenuItem GdmEntryMenuItem; | ||
2241 | -typedef struct _GdmEntryMenuItemClass GdmEntryMenuItemClass; | ||
2242 | - | ||
2243 | -GType gdm_entry_menu_item_get_type (void) G_GNUC_CONST; | ||
2244 | - | ||
2245 | -GtkWidget *gdm_entry_menu_item_new (void); | ||
2246 | -GtkWidget *gdm_entry_menu_item_get_entry (GdmEntryMenuItem *item); | ||
2247 | -GtkWidget *gdm_entry_menu_item_get_image (GdmEntryMenuItem *item); | ||
2248 | - | ||
2249 | -G_END_DECLS | ||
2250 | - | ||
2251 | -#endif /* __GDM_ENTRY_MENU_ITEM__ */ | ||
2252 | diff --git a/po/POTFILES.in b/po/POTFILES.in | ||
2253 | index 1fccb90..cc1a3fd 100644 | ||
2254 | --- a/po/POTFILES.in | ||
2255 | +++ b/po/POTFILES.in | ||
2256 | @@ -84,10 +84,6 @@ gui/simple-greeter/gdm-timer.c | ||
2257 | gui/simple-greeter/gdm-user.c | ||
2258 | gui/simple-greeter/gdm-user-chooser-widget.c | ||
2259 | gui/simple-greeter/greeter-main.c | ||
2260 | -gui/user-switch-applet/applet.c | ||
2261 | -gui/user-switch-applet/gdm-entry-menu-item.c | ||
2262 | -gui/user-switch-applet/GNOME_FastUserSwitchApplet.server.in.in | ||
2263 | -gui/user-switch-applet/GNOME_FastUserSwitchApplet.xml | ||
2264 | utils/gdmflexiserver.c | ||
2265 | utils/gdm-screenshot.c | ||
2266 | |||
2267 | diff --git a/po/POTFILES.skip b/po/POTFILES.skip | ||
2268 | index 0269a0f..ee3d753 100644 | ||
2269 | --- a/po/POTFILES.skip | ||
2270 | +++ b/po/POTFILES.skip | ||
2271 | @@ -7,7 +7,6 @@ | ||
2272 | # remove these unless you fix "make distcheck" a different way. | ||
2273 | # | ||
2274 | data/gdm.schemas.in | ||
2275 | -gui/user-switch-applet/GNOME_FastUserSwitchApplet.server.in | ||
2276 | data/greeter-autostart/at-spi-registryd-wrapper.desktop.in | ||
2277 | data/greeter-autostart/gdm-simple-greeter.desktop.in | ||
2278 | data/greeter-autostart/gnome-power-manager.desktop.in | ||
2279 | -- | ||
2280 | 1.6.6.1 | ||
2281 | |||
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 ad21073a0..000000000 --- a/meta-gnome/recipes-gnome/gdm/gdm/0002-gdm-user-manager.c-avoid-displaying-system-users-in-.patch +++ /dev/null | |||
@@ -1,34 +0,0 @@ | |||
1 | From 43e59f3deadb3914a1cc931ae18d4023874cdeca Mon Sep 17 00:00:00 2001 | ||
2 | From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com> | ||
3 | Date: Fri, 26 Apr 2013 17:15:48 +0200 | ||
4 | Subject: [PATCH] gdm-user-manager.c: avoid displaying system users in | ||
5 | greeter's list | ||
6 | MIME-Version: 1.0 | ||
7 | Content-Type: text/plain; charset=UTF-8 | ||
8 | Content-Transfer-Encoding: 8bit | ||
9 | |||
10 | yocto environment system users have UID below 1000 | ||
11 | |||
12 | Upstream-Status: Inappropriate [configuration] | ||
13 | |||
14 | Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com> | ||
15 | --- | ||
16 | gui/simple-greeter/gdm-user-manager.c | 2 +- | ||
17 | 1 files changed, 1 insertions(+), 1 deletions(-) | ||
18 | |||
19 | diff --git a/gui/simple-greeter/gdm-user-manager.c b/gui/simple-greeter/gdm-user-manager.c | ||
20 | index c631989..f18e478 100644 | ||
21 | --- a/gui/simple-greeter/gdm-user-manager.c | ||
22 | +++ b/gui/simple-greeter/gdm-user-manager.c | ||
23 | @@ -63,7 +63,7 @@ | ||
24 | #ifdef __sun | ||
25 | #define FALLBACK_MINIMAL_UID 100 | ||
26 | #else | ||
27 | -#define FALLBACK_MINIMAL_UID 500 | ||
28 | +#define FALLBACK_MINIMAL_UID 1000 | ||
29 | #endif | ||
30 | |||
31 | #ifndef _PATH_SHELLS | ||
32 | -- | ||
33 | 1.7.4.4 | ||
34 | |||
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 1f9fa2ac2..000000000 --- a/meta-gnome/recipes-gnome/gdm/gdm/sysrooted-pkg-config.patch +++ /dev/null | |||
@@ -1,37 +0,0 @@ | |||
1 | In cross environment we have to prepend the sysroot to the path found by | ||
2 | pkgconfig since the path returned from pkgconfig does not have sysroot prefixed | ||
3 | it ends up using the files from host system. Now usually people have gnome installed | ||
4 | so the build succeeds but if you dont have gnome installed on build host then | ||
5 | it wont find the files on host system and packages using gnome-doc-utils wont | ||
6 | compile. | ||
7 | |||
8 | This should work ok with non sysrooted builds too since in those cases PKG_CONFIG_SYSROOT_DIR | ||
9 | will be empty | ||
10 | |||
11 | Upstream-Status: Pending | ||
12 | |||
13 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
14 | |||
15 | Index: gdm-2.32.2/gnome-doc-utils.make | ||
16 | =================================================================== | ||
17 | --- gdm-2.32.2.orig/gnome-doc-utils.make 2011-05-31 08:06:59.000000000 -0700 | ||
18 | +++ gdm-2.32.2/gnome-doc-utils.make 2011-09-25 15:32:39.540992521 -0700 | ||
19 | @@ -133,12 +133,12 @@ | ||
20 | _xml2po ?= `which xml2po` | ||
21 | _xml2po_mode = $(if $(DOC_ID),mallard,docbook) | ||
22 | |||
23 | -_db2html ?= `$(PKG_CONFIG) --variable db2html gnome-doc-utils` | ||
24 | -_db2omf ?= `$(PKG_CONFIG) --variable db2omf gnome-doc-utils` | ||
25 | -_malrng ?= `$(PKG_CONFIG) --variable malrng gnome-doc-utils` | ||
26 | -_chunks ?= `$(PKG_CONFIG) --variable xmldir gnome-doc-utils`/gnome/xslt/docbook/utils/chunks.xsl | ||
27 | -_credits ?= `$(PKG_CONFIG) --variable xmldir gnome-doc-utils`/gnome/xslt/docbook/utils/credits.xsl | ||
28 | -_ids ?= $(shell $(PKG_CONFIG) --variable xmldir gnome-doc-utils)/gnome/xslt/docbook/utils/ids.xsl | ||
29 | +_db2html ?= ${PKG_CONFIG_SYSROOT_DIR}`$(PKG_CONFIG) --variable db2html gnome-doc-utils` | ||
30 | +_db2omf ?= ${PKG_CONFIG_SYSROOT_DIR}`$(PKG_CONFIG) --variable db2omf gnome-doc-utils` | ||
31 | +_malrng ?= ${PKG_CONFIG_SYSROOT_DIR}`$(PKG_CONFIG) --variable malrng gnome-doc-utils` | ||
32 | +_chunks ?= ${PKG_CONFIG_SYSROOT_DIR}`$(PKG_CONFIG) --variable xmldir gnome-doc-utils`/gnome/xslt/docbook/utils/chunks.xsl | ||
33 | +_credits ?= ${PKG_CONFIG_SYSROOT_DIR}`$(PKG_CONFIG) --variable xmldir gnome-doc-utils`/gnome/xslt/docbook/utils/credits.xsl | ||
34 | +_ids ?= ${PKG_CONFIG_SYSROOT_DIR}$(shell $(PKG_CONFIG) --variable xmldir gnome-doc-utils)/gnome/xslt/docbook/utils/ids.xsl | ||
35 | |||
36 | if ENABLE_SK | ||
37 | _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 64785ca1c..000000000 --- a/meta-gnome/recipes-gnome/gdm/gdm_2.32.2.bb +++ /dev/null | |||
@@ -1,108 +0,0 @@ | |||
1 | SUMMARY = "Graphical login manager" | ||
2 | LICENSE = "GPLv2" | ||
3 | LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f" | ||
4 | |||
5 | DEPENDS = "xinput gnome-panel tcp-wrappers libcanberra libxklavier grep consolekit libpam gnome-doc-utils gtk+ xrdb" | ||
6 | |||
7 | PR = "r18" | ||
8 | |||
9 | inherit gnome update-rc.d systemd useradd | ||
10 | |||
11 | SRC_URI += " \ | ||
12 | file://cross-xdetection.diff \ | ||
13 | file://0001-Remove-user-switch-applet.patch \ | ||
14 | file://0002-gdm-user-manager.c-avoid-displaying-system-users-in-.patch \ | ||
15 | file://sysrooted-pkg-config.patch \ | ||
16 | file://%gconf-tree.xml \ | ||
17 | file://gdm \ | ||
18 | file://gdm.conf \ | ||
19 | file://gdm-pam \ | ||
20 | file://Default \ | ||
21 | file://gdm.service.in \ | ||
22 | " | ||
23 | |||
24 | SRC_URI[archive.md5sum] = "dbe5187a2e17881cc454e313e0ae8d1e" | ||
25 | SRC_URI[archive.sha256sum] = "034d23af0ea18d86e5543e707212d9297ec7d83f221808968af266dbebc0e703" | ||
26 | GNOME_COMPRESS_TYPE="bz2" | ||
27 | |||
28 | EXTRA_OECONF = " \ | ||
29 | --enable-authentication-scheme=shadow \ | ||
30 | --enable-debug=yes \ | ||
31 | --with-console-kit \ | ||
32 | --disable-scrollkeeper \ | ||
33 | " | ||
34 | |||
35 | do_configure_prepend() { | ||
36 | sed -i -e "s:\bdocs::g" ${S}/Makefile.am | ||
37 | rm -f ${S}/m4/gnome-doc-utils.m4 | ||
38 | } | ||
39 | |||
40 | do_install_prepend() { | ||
41 | install -d ${D}/${localstatedir}/lib/gdm/.gconf.mandatory | ||
42 | install ${WORKDIR}/%gconf-tree.xml ${D}/${localstatedir}/lib/gdm/.gconf.mandatory/ | ||
43 | } | ||
44 | |||
45 | do_install_append() { | ||
46 | install -d ${D}/${sysconfdir}/init.d | ||
47 | install -m 0755 ${WORKDIR}/gdm ${D}/${sysconfdir}/init.d/ | ||
48 | |||
49 | install -d ${D}/${sysconfdir}/gdm | ||
50 | install -m 0644 ${WORKDIR}/gdm.conf ${D}/${sysconfdir}/gdm/ | ||
51 | |||
52 | install -d ${D}/${sysconfdir}/pam.d | ||
53 | install -m 0755 ${WORKDIR}/gdm-pam ${D}/${sysconfdir}/pam.d/gdm | ||
54 | rm -f ${D}/${sysconfdir}/pam.d/gdm-autologin | ||
55 | |||
56 | install -d ${D}/${sysconfdir}/gdm/Init | ||
57 | install -m 0755 ${WORKDIR}/Default ${D}/${sysconfdir}/gdm/Init | ||
58 | |||
59 | install -d ${D}${systemd_unitdir}/system | ||
60 | sed -e 's,%sbindir%,${sbindir},g' \ | ||
61 | < ${WORKDIR}/gdm.service.in \ | ||
62 | > ${D}${systemd_unitdir}/system/gdm.service | ||
63 | |||
64 | chown -R gdm:gdm ${D}${localstatedir}/lib/gdm | ||
65 | chmod 0750 ${D}${localstatedir}/lib/gdm | ||
66 | |||
67 | rm -rf "${D}${localstatedir}/run" | ||
68 | rmdir --ignore-fail-on-non-empty "${D}${localstatedir}" | ||
69 | |||
70 | rm -f ${D}${datadir}/gdm/autostart/LoginWindow/at-spi-registryd-wrapper.desktop | ||
71 | rm -f ${D}${datadir}/gdm/autostart/LoginWindow/orca-screen-reader.desktop | ||
72 | rm -f ${D}${datadir}/gdm/autostart/LoginWindow/gnome-mag.desktop | ||
73 | rm -f ${D}${datadir}/gdm/autostart/LoginWindow/gok.desktop | ||
74 | rm -f ${D}${datadir}/gdm/autostart/LoginWindow/metacity.desktop | ||
75 | } | ||
76 | |||
77 | FILES_${PN} += "${datadir}/icon* \ | ||
78 | ${datadir}/xsession* \ | ||
79 | " | ||
80 | |||
81 | RDEPENDS_${PN} += "grep dbus-x11 shadow" | ||
82 | # "libpam-base-files" | ||
83 | CONFFILES_${PN} += "${sysconfdir}/gdm/gdm.conf ${sysconfdir}/init.d/gdm" | ||
84 | RRECOMMENDS_${PN} += "openssh-misc desktop-file-utils glib-2.0-utils metacity gnome-session polkit-gnome consolekit" | ||
85 | |||
86 | RREPLACES_${PN} += "${PN}-systemd" | ||
87 | RCONFLICTS_${PN} += "${PN}-systemd" | ||
88 | SYSTEMD_SERVICE_${PN} = "gdm.service" | ||
89 | |||
90 | INITSCRIPT_NAME = "gdm" | ||
91 | INITSCRIPT_PARAMS = "start 99 5 . stop 20 0 1 2 3 6 ." | ||
92 | |||
93 | USERADD_PACKAGES = "${PN}" | ||
94 | USERADD_PARAM_${PN} = "--system --no-create-home --home ${localstatedir}/lib/gdm --user-group gdm" | ||
95 | |||
96 | pkg_postinst_${PN} () { | ||
97 | # Register up as default dm | ||
98 | mkdir -p $D${sysconfdir}/X11/ | ||
99 | echo "${bindir}/gdm" > $D${sysconfdir}/X11/default-display-manager | ||
100 | } | ||
101 | |||
102 | pkg_postrm_${PN} () { | ||
103 | deluser gdm || true | ||
104 | delgroup gdm || true | ||
105 | sed -i /gdm/d ${sysconfdir}/X11/default-display-manager || true | ||
106 | } | ||
107 | |||
108 | 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 235b02a2f..000000000 --- a/meta-gnome/recipes-gnome/gnome-backgrounds/gnome-backgrounds_2.32.0.bb +++ /dev/null | |||
@@ -1,21 +0,0 @@ | |||
1 | SUMMARY = "Gnome background images" | ||
2 | |||
3 | LICENSE = "GPLv2" | ||
4 | LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f" | ||
5 | |||
6 | SECTION = "x11/gnome" | ||
7 | |||
8 | # glib-2.0 for glib-gettext.m4 which provides AM_GLIB_GNU_GETTEXT | ||
9 | # intltool-native for IT_PROG_INTLTOOL(0.35.0) | ||
10 | DEPENDS = "glib-2.0 intltool-native" | ||
11 | |||
12 | inherit gnomebase | ||
13 | |||
14 | SRC_URI[archive.md5sum] = "3df26626483b02e51adefc6ab5945a8d" | ||
15 | SRC_URI[archive.sha256sum] = "4d7b60b5ba768bf8834b5fa3a3471cd9a9e14b5884bc210dc2d3cdbf1faddcef" | ||
16 | GNOME_COMPRESS_TYPE="bz2" | ||
17 | |||
18 | FILES_${PN} += "${datadir}/gnome-background-properties" | ||
19 | |||
20 | |||
21 | 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 201783e91..000000000 --- a/meta-gnome/recipes-gnome/gnome-control-center/gnome-control-center_2.32.1.bb +++ /dev/null | |||
@@ -1,35 +0,0 @@ | |||
1 | SUMMARY = "GNOME control center" | ||
2 | LICENSE = "GPLv2" | ||
3 | LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f" | ||
4 | |||
5 | 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" | ||
6 | |||
7 | PR = "r1" | ||
8 | |||
9 | inherit gnome | ||
10 | |||
11 | SRC_URI[archive.md5sum] = "b4e8ab5c7556ae07addbfcfb4fa2f761" | ||
12 | SRC_URI[archive.sha256sum] = "7c568b57358e5c08f4d8dd76dbac7df2539135ad081872b60514b7a8ac797e66" | ||
13 | GNOME_COMPRESS_TYPE="bz2" | ||
14 | |||
15 | LDFLAGS += "-lgthread-2.0 -lxml2" | ||
16 | |||
17 | do_configure_prepend() { | ||
18 | sed -i s:help::g ${S}/Makefile.am | ||
19 | rm -f ${S}/m4/gnome-doc-utils.m4 | ||
20 | } | ||
21 | do_install_append() { | ||
22 | rm -rf ${D}${datadir}/mime | ||
23 | } | ||
24 | |||
25 | FILES_${PN} += "${datadir}/icon* \ | ||
26 | ${datadir}/xsession* \ | ||
27 | ${libdir}/window-manager-settings/*.so \ | ||
28 | ${datadir}/gnome \ | ||
29 | ${datadir}/desktop-directories \ | ||
30 | " | ||
31 | FILES_${PN}-dbg += "${libdir}/window-manager-settings/.debug" | ||
32 | FILES_${PN}-dev += "${libdir}/window-manager-settings/*.la" | ||
33 | FILES_${PN}-staticdev += "${libdir}/window-manager-settings/*.a" | ||
34 | |||
35 | 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 f1dafad2e..000000000 --- a/meta-gnome/recipes-gnome/gnome-desktop/gnome-desktop_2.32.1.bb +++ /dev/null | |||
@@ -1,28 +0,0 @@ | |||
1 | SUMMARY = "GNOME library for reading .desktop files" | ||
2 | SECTION = "x11/gnome" | ||
3 | LICENSE = "GPLv2 & LGPLv2" | ||
4 | LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ | ||
5 | file://COPYING.LIB;md5=5f30f0716dfdd0d91eb439ebec522ec2" | ||
6 | |||
7 | PR = "r6" | ||
8 | |||
9 | inherit gnome pkgconfig | ||
10 | |||
11 | SRC_URI[archive.md5sum] = "5c80d628a240eb9d9ff78913b31f2f67" | ||
12 | SRC_URI[archive.sha256sum] = "55cbecf67efe1fa1e57ac966520a7c46d799c8ba3c652a1219f60cafccb3739d" | ||
13 | GNOME_COMPRESS_TYPE="bz2" | ||
14 | |||
15 | DEPENDS += "gconf libxrandr virtual/libx11 gtk+ glib-2.0 gnome-doc-utils startup-notification intltool-native gnome-common-native" | ||
16 | |||
17 | EXTRA_OECONF = "--disable-scrollkeeper --disable-desktop-docs --disable-gnome-about" | ||
18 | |||
19 | do_configure_prepend () { | ||
20 | sed -i -e s:^#!@PYTHON@:#!${bindir}/python: ${S}/gnome-about/gnome-about.in | ||
21 | rm -f ${S}/m4/gnome-doc-utils.m4 | ||
22 | } | ||
23 | |||
24 | PACKAGES =+ "libgnome-desktop" | ||
25 | FILES_libgnome-desktop = "${libdir}/lib*${SOLIBS} ${datadir}/libgnome-desktop/pnp.ids" | ||
26 | FILES_${PN} += "${datadir}/gnome-about" | ||
27 | |||
28 | 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 805e93776..000000000 --- a/meta-gnome/recipes-gnome/gnome-disk-utility/gnome-disk-utility/0001-Add-support-for-DeviceAutomountHint.patch +++ /dev/null | |||
@@ -1,74 +0,0 @@ | |||
1 | From 7dde5bc75a1d96be9510ce1e98d28f9d33520919 Mon Sep 17 00:00:00 2001 | ||
2 | From: David Zeuthen <davidz@redhat.com> | ||
3 | Date: Fri, 8 Jul 2011 11:03:52 -0400 | ||
4 | Subject: [PATCH] Add support for DeviceAutomountHint | ||
5 | |||
6 | Based on the patch in https://bugzilla.gnome.org/show_bug.cgi?id=653184 | ||
7 | |||
8 | Upstream-Status: Applied [1] | ||
9 | |||
10 | [1] https://mail.gnome.org/archives/commits-list/2011-July/msg03207.html | ||
11 | |||
12 | Signed-off-by: David Zeuthen <davidz@redhat.com> | ||
13 | --- | ||
14 | src/gdu/gdu-device.c | 10 ++++++++++ | ||
15 | src/gdu/gdu-device.h | 1 + | ||
16 | 2 files changed, 11 insertions(+), 0 deletions(-) | ||
17 | |||
18 | diff --git a/src/gdu/gdu-device.c b/src/gdu/gdu-device.c | ||
19 | index 6a5afad..4be39cf 100644 | ||
20 | --- a/src/gdu/gdu-device.c | ||
21 | +++ b/src/gdu/gdu-device.c | ||
22 | @@ -82,6 +82,7 @@ typedef struct | ||
23 | gboolean device_presentation_nopolicy; | ||
24 | char *device_presentation_name; | ||
25 | char *device_presentation_icon_name; | ||
26 | + char *device_automount_hint; | ||
27 | guint64 device_size; | ||
28 | guint64 device_block_size; | ||
29 | |||
30 | @@ -279,6 +280,8 @@ collect_props (const char *key, | ||
31 | props->device_presentation_name = g_strdup (g_value_get_string (value)); | ||
32 | else if (strcmp (key, "DevicePresentationIconName") == 0) | ||
33 | props->device_presentation_icon_name = g_strdup (g_value_get_string (value)); | ||
34 | + else if (strcmp (key, "DeviceAutomountHint") == 0) | ||
35 | + props->device_automount_hint = g_strdup (g_value_get_string (value)); | ||
36 | else if (strcmp (key, "DeviceSize") == 0) | ||
37 | props->device_size = g_value_get_uint64 (value); | ||
38 | else if (strcmp (key, "DeviceBlockSize") == 0) | ||
39 | @@ -549,6 +552,7 @@ device_properties_free (DeviceProperties *props) | ||
40 | g_strfreev (props->device_mount_paths); | ||
41 | g_free (props->device_presentation_name); | ||
42 | g_free (props->device_presentation_icon_name); | ||
43 | + g_free (props->device_automount_hint); | ||
44 | g_free (props->job_id); | ||
45 | g_free (props->id_usage); | ||
46 | g_free (props->id_type); | ||
47 | @@ -1294,6 +1298,12 @@ gdu_device_drive_get_media_compatibility (GduDevice *device) | ||
48 | } | ||
49 | |||
50 | const char * | ||
51 | +gdu_device_get_automount_hint (GduDevice *device) | ||
52 | +{ | ||
53 | + return device->priv->props->device_automount_hint; | ||
54 | +} | ||
55 | + | ||
56 | +const char * | ||
57 | gdu_device_drive_get_media (GduDevice *device) | ||
58 | { | ||
59 | return device->priv->props->drive_media; | ||
60 | diff --git a/src/gdu/gdu-device.h b/src/gdu/gdu-device.h | ||
61 | index 4c1302b..8cfd7a9 100644 | ||
62 | --- a/src/gdu/gdu-device.h | ||
63 | +++ b/src/gdu/gdu-device.h | ||
64 | @@ -143,6 +143,7 @@ const char *gdu_device_drive_get_wwn (GduDevice *device); | ||
65 | const char *gdu_device_drive_get_connection_interface (GduDevice *device); | ||
66 | guint64 gdu_device_drive_get_connection_speed (GduDevice *device); | ||
67 | char **gdu_device_drive_get_media_compatibility (GduDevice *device); | ||
68 | +const gchar *gdu_device_get_automount_hint(GduDevice *device); | ||
69 | const char *gdu_device_drive_get_media (GduDevice *device); | ||
70 | gboolean gdu_device_drive_get_is_media_ejectable (GduDevice *device); | ||
71 | gboolean gdu_device_drive_get_requires_eject (GduDevice *device); | ||
72 | -- | ||
73 | 1.7.6.5 | ||
74 | |||
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 0bc9707c2..000000000 --- a/meta-gnome/recipes-gnome/gnome-disk-utility/gnome-disk-utility/0002-Require-libnotify-0.6.1.patch +++ /dev/null | |||
@@ -1,49 +0,0 @@ | |||
1 | From f8dea8dd411cba10a54ec083c3d5c9d641ec36c0 Mon Sep 17 00:00:00 2001 | ||
2 | From: William Jon McCann <jmccann@redhat.com> | ||
3 | Date: Tue, 12 Oct 2010 00:12:49 -0400 | ||
4 | Subject: [PATCH] Require libnotify 0.6.1 | ||
5 | |||
6 | https://bugzilla.gnome.org/show_bug.cgi?id=631940 | ||
7 | |||
8 | Upstream-Status: Backport [1] | ||
9 | |||
10 | [1] https://git.gnome.org/browse/gnome-disk-utility/commit/?id=f8dea8dd411cba10a54ec083c3d5c9d641ec36c0 | ||
11 | |||
12 | Signed-off-by: David Zeuthen <davidz@redhat.com> | ||
13 | --- | ||
14 | configure.ac | 2 +- | ||
15 | src/notification/notification-main.c | 5 +---- | ||
16 | 2 files changed, 2 insertions(+), 5 deletions(-) | ||
17 | |||
18 | diff --git a/configure.ac b/configure.ac | ||
19 | index c61212e..3790fcf 100644 | ||
20 | --- a/configure.ac | ||
21 | +++ b/configure.ac | ||
22 | @@ -128,7 +128,7 @@ DBUS_GLIB_REQUIRED=0.74 | ||
23 | GNOME_KEYRING_REQUIRED=2.22 | ||
24 | GTK2_REQUIRED=2.20.0 | ||
25 | UNIQUE_REQUIRED=1.0 | ||
26 | -LIBNOTIFY_REQUIRED=0.3.0 | ||
27 | +LIBNOTIFY_REQUIRED=0.6.1 | ||
28 | NAUTILUS_REQUIRED=2.24.0 | ||
29 | AVAHI_UI_REQUIRED=0.6.25 | ||
30 | |||
31 | diff --git a/src/notification/notification-main.c b/src/notification/notification-main.c | ||
32 | index 18e9672..b6a713f 100644 | ||
33 | --- a/src/notification/notification-main.c | ||
34 | +++ b/src/notification/notification-main.c | ||
35 | @@ -535,10 +535,7 @@ update_status_icon (NotificationData *data) | ||
36 | _("A hard disk may be failing"), | ||
37 | /* Translators: This is used as the text of the notification*/ | ||
38 | _("One or more hard disks report health problems. Click the icon to get more information."), | ||
39 | - "gtk-dialog-warning", | ||
40 | - NULL); | ||
41 | - notify_notification_attach_to_status_icon (data->ata_smart_notification, | ||
42 | - data->status_icon); | ||
43 | + "gtk-dialog-warning"); | ||
44 | notify_notification_set_urgency (data->ata_smart_notification, NOTIFY_URGENCY_CRITICAL); | ||
45 | notify_notification_set_timeout (data->ata_smart_notification, NOTIFY_EXPIRES_NEVER); | ||
46 | show_notification (data); | ||
47 | -- | ||
48 | 2.1.0 | ||
49 | |||
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 f36942d19..000000000 --- a/meta-gnome/recipes-gnome/gnome-disk-utility/gnome-disk-utility/disable-scrollkeeper.patch +++ /dev/null | |||
@@ -1,27 +0,0 @@ | |||
1 | From: Dmitry Eremin-Solenikov <dbaryshkov@gmail.com> | ||
2 | Subject: Disable scrollkeeper-config not found message | ||
3 | Upstream-Status: Not-Applicable | ||
4 | |||
5 | If scrollkeeper-config isn't found, configure fails with an error. | ||
6 | Fix that by commenting out the check. | ||
7 | |||
8 | Signed-Off-By: Dmitry Eremin-Solenikov <dbaryshkov@gmail.com> | ||
9 | |||
10 | |||
11 | Index: gnome-disk-utility-2.32.0/configure.ac | ||
12 | =================================================================== | ||
13 | --- gnome-disk-utility-2.32.0.orig/configure.ac 2010-09-15 19:07:25.000000000 +0400 | ||
14 | +++ gnome-disk-utility-2.32.0/configure.ac 2011-08-20 01:29:48.000000000 +0400 | ||
15 | @@ -188,9 +188,9 @@ | ||
16 | # ************* | ||
17 | |||
18 | AC_PATH_PROG(SCROLLKEEPER_CONFIG, scrollkeeper-config,no) | ||
19 | -if test x$SCROLLKEEPER_CONFIG = xno; then | ||
20 | - AC_MSG_ERROR(Couldn't find scrollkeeper-config, please install the scrollkeeper package) | ||
21 | -fi | ||
22 | +dnl if test x$SCROLLKEEPER_CONFIG = xno; then | ||
23 | +dnl AC_MSG_ERROR([Couldn't find scrollkeeper-config, please install the scrollkeeper package]) | ||
24 | +dnl fi | ||
25 | |||
26 | # ******************** | ||
27 | # 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 6ba397955..000000000 --- a/meta-gnome/recipes-gnome/gnome-disk-utility/gnome-disk-utility/fix-dbus-interfaces.patch +++ /dev/null | |||
@@ -1,34 +0,0 @@ | |||
1 | Index: gnome-disk-utility-2.32.0/src/gdu/Makefile.am | ||
2 | =================================================================== | ||
3 | --- gnome-disk-utility-2.32.0.orig/src/gdu/Makefile.am 2011-08-20 01:59:16.000000000 +0400 | ||
4 | +++ gnome-disk-utility-2.32.0/src/gdu/Makefile.am 2011-08-20 02:08:18.000000000 +0400 | ||
5 | @@ -14,20 +14,20 @@ | ||
6 | gdu-marshal.c: gdu-marshal.list | ||
7 | echo "#include \"gdu-marshal.h\"" > $@ && glib-genmarshal $< --prefix=gdu_marshal --body >> $@ | ||
8 | |||
9 | -udisks-daemon-glue.h: /usr/share/dbus-1/interfaces/org.freedesktop.UDisks.xml Makefile.am | ||
10 | - dbus-binding-tool --prefix=devkit_disks_daemon --mode=glib-client --output=udisks-daemon-glue.h /usr/share/dbus-1/interfaces/org.freedesktop.UDisks.xml | ||
11 | +udisks-daemon-glue.h: $(PKG_CONFIG_SYSROOT_DIR)/usr/share/dbus-1/interfaces/org.freedesktop.UDisks.xml Makefile.am | ||
12 | + 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 | ||
13 | |||
14 | -udisks-device-glue.h: /usr/share/dbus-1/interfaces/org.freedesktop.UDisks.Device.xml Makefile.am | ||
15 | - 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 | ||
16 | +udisks-device-glue.h: $(PKG_CONFIG_SYSROOT_DIR)/usr/share/dbus-1/interfaces/org.freedesktop.UDisks.Device.xml Makefile.am | ||
17 | + 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 | ||
18 | |||
19 | -udisks-adapter-glue.h: /usr/share/dbus-1/interfaces/org.freedesktop.UDisks.Adapter.xml Makefile.am | ||
20 | - 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 | ||
21 | +udisks-adapter-glue.h: $(PKG_CONFIG_SYSROOT_DIR)/usr/share/dbus-1/interfaces/org.freedesktop.UDisks.Adapter.xml Makefile.am | ||
22 | + 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 | ||
23 | |||
24 | -udisks-expander-glue.h: /usr/share/dbus-1/interfaces/org.freedesktop.UDisks.Expander.xml Makefile.am | ||
25 | - 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 | ||
26 | +udisks-expander-glue.h: $(PKG_CONFIG_SYSROOT_DIR)/usr/share/dbus-1/interfaces/org.freedesktop.UDisks.Expander.xml Makefile.am | ||
27 | + 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 | ||
28 | |||
29 | -udisks-port-glue.h: /usr/share/dbus-1/interfaces/org.freedesktop.UDisks.Port.xml Makefile.am | ||
30 | - 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 | ||
31 | +udisks-port-glue.h: $(PKG_CONFIG_SYSROOT_DIR)/usr/share/dbus-1/interfaces/org.freedesktop.UDisks.Port.xml Makefile.am | ||
32 | + 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 | ||
33 | |||
34 | 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 48e63b1ea..000000000 --- a/meta-gnome/recipes-gnome/gnome-disk-utility/gnome-disk-utility/sysrooted-pkg-config.patch +++ /dev/null | |||
@@ -1,37 +0,0 @@ | |||
1 | In cross environment we have to prepend the sysroot to the path found by | ||
2 | pkgconfig since the path returned from pkgconfig does not have sysroot prefixed | ||
3 | it ends up using the files from host system. Now usually people have gnome installed | ||
4 | so the build succeeds but if you dont have gnome installed on build host then | ||
5 | it wont find the files on host system and packages using gnome-doc-utils wont | ||
6 | compile. | ||
7 | |||
8 | This should work ok with non sysrooted builds too since in those cases PKG_CONFIG_SYSROOT_DIR | ||
9 | will be empty | ||
10 | |||
11 | Upstream-Status: Pending | ||
12 | |||
13 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
14 | |||
15 | Index: gnome-disk-utility-2.32.0/gnome-doc-utils.make | ||
16 | =================================================================== | ||
17 | --- gnome-disk-utility-2.32.0.orig/gnome-doc-utils.make 2010-09-15 08:27:46.000000000 -0700 | ||
18 | +++ gnome-disk-utility-2.32.0/gnome-doc-utils.make 2011-09-25 16:04:30.693795591 -0700 | ||
19 | @@ -133,12 +133,12 @@ | ||
20 | _xml2po ?= `which xml2po` | ||
21 | _xml2po_mode = $(if $(DOC_ID),mallard,docbook) | ||
22 | |||
23 | -_db2html ?= `$(PKG_CONFIG) --variable db2html gnome-doc-utils` | ||
24 | -_db2omf ?= `$(PKG_CONFIG) --variable db2omf gnome-doc-utils` | ||
25 | -_malrng ?= `$(PKG_CONFIG) --variable malrng gnome-doc-utils` | ||
26 | -_chunks ?= `$(PKG_CONFIG) --variable xmldir gnome-doc-utils`/gnome/xslt/docbook/utils/chunks.xsl | ||
27 | -_credits ?= `$(PKG_CONFIG) --variable xmldir gnome-doc-utils`/gnome/xslt/docbook/utils/credits.xsl | ||
28 | -_ids ?= `$(PKG_CONFIG) --variable xmldir gnome-doc-utils`/gnome/xslt/docbook/utils/ids.xsl | ||
29 | +_db2html ?= ${PKG_CONFIG_SYSROOT_DIR}`$(PKG_CONFIG) --variable db2html gnome-doc-utils` | ||
30 | +_db2omf ?= ${PKG_CONFIG_SYSROOT_DIR}`$(PKG_CONFIG) --variable db2omf gnome-doc-utils` | ||
31 | +_malrng ?= ${PKG_CONFIG_SYSROOT_DIR}`$(PKG_CONFIG) --variable malrng gnome-doc-utils` | ||
32 | +_chunks ?= ${PKG_CONFIG_SYSROOT_DIR}`$(PKG_CONFIG) --variable xmldir gnome-doc-utils`/gnome/xslt/docbook/utils/chunks.xsl | ||
33 | +_credits ?= ${PKG_CONFIG_SYSROOT_DIR}`$(PKG_CONFIG) --variable xmldir gnome-doc-utils`/gnome/xslt/docbook/utils/credits.xsl | ||
34 | +_ids ?= ${PKG_CONFIG_SYSROOT_DIR}`$(PKG_CONFIG) --variable xmldir gnome-doc-utils`/gnome/xslt/docbook/utils/ids.xsl | ||
35 | |||
36 | if ENABLE_SK | ||
37 | _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 55a589c3f..000000000 --- a/meta-gnome/recipes-gnome/gnome-disk-utility/gnome-disk-utility_2.32.0.bb +++ /dev/null | |||
@@ -1,45 +0,0 @@ | |||
1 | SUMMARY = "GNOME disk utility" | ||
2 | |||
3 | LICENSE = "GPLv2+" | ||
4 | LIC_FILES_CHKSUM = "file://COPYING;md5=e9115d11797a5e6b746b4e9b90194564" | ||
5 | |||
6 | DEPENDS = "glib-2.0 gtk+ libnotify libunique udisks avahi-ui \ | ||
7 | virtual/libx11 libatasmart gnome-doc-utils intltool-native \ | ||
8 | gnome-common-native libgnome-keyring dbus-glib-native \ | ||
9 | " | ||
10 | |||
11 | PR = "r4" | ||
12 | |||
13 | inherit gnomebase gtk-icon-cache distro_features_check | ||
14 | |||
15 | REQUIRED_DISTRO_FEATURES = "x11" | ||
16 | |||
17 | SRC_URI[archive.md5sum] = "f0366c8baebca0404d190b2d78f3582d" | ||
18 | SRC_URI[archive.sha256sum] = "03e461b6bda7f773f8018d25fa3213d3073d4dc83a76e6b39d962652f4de6a98" | ||
19 | GNOME_COMPRESS_TYPE="bz2" | ||
20 | |||
21 | SRC_URI += "\ | ||
22 | file://disable-scrollkeeper.patch \ | ||
23 | file://fix-dbus-interfaces.patch \ | ||
24 | file://sysrooted-pkg-config.patch \ | ||
25 | file://0001-Add-support-for-DeviceAutomountHint.patch \ | ||
26 | file://0002-Require-libnotify-0.6.1.patch \ | ||
27 | " | ||
28 | |||
29 | EXTRA_OECONF += "--disable-scrollkeeper" | ||
30 | |||
31 | PACKAGECONFIG ??= "" | ||
32 | PACKAGECONFIG[nautilus] = "--enable-nautilus,--disable-nautilus,nautilus" | ||
33 | |||
34 | do_configure_prepend() { | ||
35 | sed -i -e "s: help : :g" ${S}/Makefile.am | ||
36 | } | ||
37 | |||
38 | PACKAGES =+ "${PN}-nautilus-extension ${PN}-libs" | ||
39 | FILES_${PN}-nautilus-extension += "${libdir}/nautilus/extensions-2.0/*.so" | ||
40 | FILES_${PN}-libs += "${libdir}/libgdu*.so.*" | ||
41 | FILES_${PN}-dev += "${libdir}/nautilus/extensions-2.0/*.la" | ||
42 | FILES_${PN}-staticdev += "${libdir}/nautilus/extensions-2.0/*.a" | ||
43 | FILES_${PN}-dbg += "${libdir}/nautilus/extensions-2.0/.debug" | ||
44 | |||
45 | 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 d1c9e4d8f..000000000 --- a/meta-gnome/recipes-gnome/gnome-menus/gnome-menus_2.30.5.bb +++ /dev/null | |||
@@ -1,30 +0,0 @@ | |||
1 | SUMMARY = "GNOME menus" | ||
2 | SECTION = "x11/gnome" | ||
3 | LICENSE = "GPLv2 & LGPLv2" | ||
4 | LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ | ||
5 | file://COPYING.LIB;md5=5f30f0716dfdd0d91eb439ebec522ec2" | ||
6 | PR = "r1" | ||
7 | |||
8 | DEPENDS = "python libxml2 gconf popt gtk+ intltool-native" | ||
9 | |||
10 | inherit gnomebase pkgconfig python-dir pythonnative gobject-introspection | ||
11 | |||
12 | SRC_URI[archive.md5sum] = "caa6772e63ed5870cf43dc3d354e0624" | ||
13 | SRC_URI[archive.sha256sum] = "6dcc565006d6e8c2025ae83ab1f82edf6bd04d61c804c0dc9bf5ea50629c4caa" | ||
14 | GNOME_COMPRESS_TYPE="bz2" | ||
15 | |||
16 | do_configure_append () { | ||
17 | |||
18 | # this expands to native-pthon which we don't want. | ||
19 | sed -i 's:\@PYTHON\@:/usr/bin/env python:' ${S}/simple-editor/gmenu-simple-editor.in | ||
20 | |||
21 | } | ||
22 | PACKAGES += "${PN}-python ${PN}-python-staticdev" | ||
23 | FILES_${PN} += "${datadir}/desktop-directories/" | ||
24 | FILES_${PN}-python-staticdev = "${PYTHON_SITEPACKAGES_DIR}/gmenu.a ${PYTHON_SITEPACKAGES_DIR}/gmenu.la" | ||
25 | FILES_${PN}-python = "${PYTHON_SITEPACKAGES_DIR}/gmenu.so ${PYTHON_SITEPACKAGES_DIR}/GMenuSimpleEditor " | ||
26 | FILES_${PN}-dbg += "${PYTHON_SITEPACKAGES_DIR}/*/.debug \ | ||
27 | ${PYTHON_SITEPACKAGES_DIR}/.debug" | ||
28 | |||
29 | # http://errors.yoctoproject.org/Errors/Details/81001/ | ||
30 | 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 fdcccb9d7..000000000 --- a/meta-gnome/recipes-gnome/gnome-panel/gnome-panel/0001-Add-gnome-doc-utils.make.patch +++ /dev/null | |||
@@ -1,730 +0,0 @@ | |||
1 | From 7345730ac882ee5a493254e5cf9162c96c648ef2 Mon Sep 17 00:00:00 2001 | ||
2 | From: Alexander Kanavin <alex.kanavin@gmail.com> | ||
3 | Date: Tue, 17 May 2016 14:40:33 +0300 | ||
4 | Subject: [PATCH] Add gnome-doc-utils.make | ||
5 | |||
6 | Since the sources are taken from git, the file is absent | ||
7 | (and is installed by tools from gnome-doc-utils which | ||
8 | are no longer provided). | ||
9 | |||
10 | Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> | ||
11 | --- | ||
12 | gnome-doc-utils.make | 706 +++++++++++++++++++++++++++++++++++++++++++++++++++ | ||
13 | 1 file changed, 706 insertions(+) | ||
14 | create mode 100644 gnome-doc-utils.make | ||
15 | |||
16 | diff --git a/gnome-doc-utils.make b/gnome-doc-utils.make | ||
17 | new file mode 100644 | ||
18 | index 0000000..b2e0fa1 | ||
19 | --- /dev/null | ||
20 | +++ b/gnome-doc-utils.make | ||
21 | @@ -0,0 +1,706 @@ | ||
22 | +# gnome-doc-utils.make - make magic for building documentation | ||
23 | +# Copyright (C) 2004-2005 Shaun McCance <shaunm@gnome.org> | ||
24 | +# | ||
25 | +# This program is free software; you can redistribute it and/or modify | ||
26 | +# it under the terms of the GNU General Public License as published by | ||
27 | +# the Free Software Foundation; either version 2 of the License, or | ||
28 | +# (at your option) any later version. | ||
29 | +# | ||
30 | +# This program is distributed in the hope that it will be useful, | ||
31 | +# but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
32 | +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
33 | +# GNU General Public License for more details. | ||
34 | +# | ||
35 | +# You should have received a copy of the GNU General Public License | ||
36 | +# along with this program; if not, write to the Free Software Foundation, | ||
37 | +# Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. | ||
38 | +# | ||
39 | +# As a special exception to the GNU General Public License, if you | ||
40 | +# distribute this file as part of a program that contains a | ||
41 | +# configuration script generated by Autoconf, you may include it under | ||
42 | +# the same distribution terms that you use for the rest of that program. | ||
43 | + | ||
44 | +################################################################################ | ||
45 | +## @@ Generating Header Files | ||
46 | + | ||
47 | +## @ DOC_H_FILE | ||
48 | +## The name of the header file to generate | ||
49 | +DOC_H_FILE ?= | ||
50 | + | ||
51 | +## @ DOC_H_DOCS | ||
52 | +## The input DocBook files for generating the header file | ||
53 | +DOC_H_DOCS ?= | ||
54 | + | ||
55 | +$(DOC_H_FILE): $(DOC_H_DOCS); | ||
56 | + @rm -f $@.tmp; touch $@.tmp; | ||
57 | + echo 'const gchar* documentation_credits[] = {' >> $@.tmp | ||
58 | + list='$(DOC_H_DOCS)'; for doc in $$list; do \ | ||
59 | + xmlpath="`echo $$doc | sed -e 's/^\(.*\/\).*/\1/' -e '/\//!s/.*//'`:$(srcdir)/`echo $$doc | sed -e 's/^\(.*\/\).*/\1/' -e '/\//!s/.*//'`"; \ | ||
60 | + if ! test -f "$$doc"; then doc="$(srcdir)/$$doc"; fi; \ | ||
61 | + xsltproc -nonet --path "$$xmlpath" $(_credits) $$doc; \ | ||
62 | + done | sort | uniq \ | ||
63 | + | 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}}' \ | ||
64 | + | sed -e 's/\\/\\\\/' -e 's/"/\\"/' -e 's/\(.*\)/\t"\1",/' >> $@.tmp | ||
65 | + echo ' NULL' >> $@.tmp | ||
66 | + echo '};' >> $@.tmp | ||
67 | + echo >> $@.tmp | ||
68 | + list='$(DOC_H_DOCS)'; for doc in $$list; do \ | ||
69 | + xmlpath="`echo $$doc | sed -e 's/^\(.*\/\).*/\1/' -e '/\//!s/.*//'`:$(srcdir)/`echo $$doc | sed -e 's/^\(.*\/\).*/\1/' -e '/\//!s/.*//'`"; \ | ||
70 | + if ! test -f "$$doc"; then doc="$(srcdir)/$$doc"; fi; \ | ||
71 | + docid=`echo "$$doc" | sed -e 's/.*\/\([^/]*\)\.xml/\1/' \ | ||
72 | + | sed -e 's/[^a-zA-Z_]/_/g' | tr 'a-z' 'A-Z'`; \ | ||
73 | + echo $$xmlpath; \ | ||
74 | + ids=`xsltproc -nonet --xinclude --path "$$xmlpath" $(_ids) $$doc`; \ | ||
75 | + for id in $$ids; do \ | ||
76 | + echo '#define HELP_'`echo $$docid`'_'`echo $$id \ | ||
77 | + | sed -e 's/[^a-zA-Z_]/_/g' | tr 'a-z' 'A-Z'`' "'$$id'"' >> $@.tmp; \ | ||
78 | + done; \ | ||
79 | + echo >> $@.tmp; \ | ||
80 | + done; | ||
81 | + cp $@.tmp $@ && rm -f $@.tmp | ||
82 | + | ||
83 | +dist-check-gdu: | ||
84 | +if !HAVE_GNOME_DOC_UTILS | ||
85 | + @echo "*** GNOME Doc Utils must be installed in order to make dist" | ||
86 | + @false | ||
87 | +endif | ||
88 | + | ||
89 | +.PHONY: dist-doc-header | ||
90 | +dist-doc-header: $(DOC_H_FILE) | ||
91 | + @if test -f "$(DOC_H_FILE)"; then d=; else d="$(srcdir)/"; fi; \ | ||
92 | + echo "$(INSTALL_DATA) $${d}$(DOC_H_FILE) $(distdir)/$(DOC_H_FILE)"; \ | ||
93 | + $(INSTALL_DATA) "$${d}$(DOC_H_FILE)" "$(distdir)/$(DOC_H_FILE)"; | ||
94 | + | ||
95 | +doc-dist-hook: dist-check-gdu $(if $(DOC_H_FILE),dist-doc-header) | ||
96 | + | ||
97 | +.PHONY: clean-doc-header | ||
98 | +_clean_doc_header = $(if $(DOC_H_FILE),clean-doc-header) | ||
99 | +clean-local: $(_clean_doc_header) | ||
100 | +distclean-local: $(_clean_doc_header) | ||
101 | +mostlyclean-local: $(_clean_doc_header) | ||
102 | +maintainer-clean-local: $(_clean_doc_header) | ||
103 | +clean-doc-header: | ||
104 | + rm -f $(DOC_H_FILE) | ||
105 | + | ||
106 | +all: $(DOC_H_FILE) | ||
107 | + | ||
108 | + | ||
109 | +################################################################################ | ||
110 | +## @@ Generating Documentation Files | ||
111 | + | ||
112 | +## @ DOC_MODULE | ||
113 | +## The name of the document being built | ||
114 | +DOC_MODULE ?= | ||
115 | + | ||
116 | +## @ DOC_ID | ||
117 | +## The unique identifier for a Mallard document | ||
118 | +DOC_ID ?= | ||
119 | + | ||
120 | +## @ DOC_PAGES | ||
121 | +## Page files in a Mallard document | ||
122 | +DOC_PAGES ?= | ||
123 | + | ||
124 | +## @ DOC_ENTITIES | ||
125 | +## Files included with a SYSTEM entity | ||
126 | +DOC_ENTITIES ?= | ||
127 | + | ||
128 | +## @ DOC_INCLUDES | ||
129 | +## Files included with XInclude | ||
130 | +DOC_INCLUDES ?= | ||
131 | + | ||
132 | +## @ DOC_FIGURES | ||
133 | +## Figures and other external data | ||
134 | +DOC_FIGURES ?= | ||
135 | + | ||
136 | +## @ DOC_FORMATS | ||
137 | +## The default formats to be built and installed | ||
138 | +DOC_FORMATS ?= docbook | ||
139 | +_DOC_REAL_FORMATS = $(if $(DOC_USER_FORMATS),$(DOC_USER_FORMATS),$(DOC_FORMATS)) | ||
140 | + | ||
141 | +## @ DOC_LINGUAS | ||
142 | +## The languages this document is translated into | ||
143 | +DOC_LINGUAS ?= | ||
144 | +_DOC_REAL_LINGUAS = $(if $(filter environment,$(origin LINGUAS)), \ | ||
145 | + $(filter $(LINGUAS),$(DOC_LINGUAS)), \ | ||
146 | + $(DOC_LINGUAS)) | ||
147 | + | ||
148 | +_DOC_ABS_SRCDIR = @abs_srcdir@ | ||
149 | + | ||
150 | + | ||
151 | +################################################################################ | ||
152 | +## Variables for Bootstrapping | ||
153 | + | ||
154 | +_xml2po ?= `which xml2po` | ||
155 | +_xml2po_mode = $(if $(DOC_ID),mallard,docbook) | ||
156 | + | ||
157 | +_db2html ?= ${PKG_CONFIG_SYSROOT_DIR}`$(PKG_CONFIG) --variable db2html gnome-doc-utils` | ||
158 | +_db2omf ?= ${PKG_CONFIG_SYSROOT_DIR}`$(PKG_CONFIG) --variable db2omf gnome-doc-utils` | ||
159 | +_chunks ?= ${PKG_CONFIG_SYSROOT_DIR}`$(PKG_CONFIG) --variable xmldir gnome-doc-utils`/gnome/xslt/docbook/utils/chunks.xsl | ||
160 | +_credits ?= ${PKG_CONFIG_SYSROOT_DIR}`$(PKG_CONFIG) --variable xmldir gnome-doc-utils`/gnome/xslt/docbook/utils/credits.xsl | ||
161 | +_ids ?= ${PKG_CONFIG_SYSROOT_DIR}$(shell $(PKG_CONFIG) --variable xmldir gnome-doc-utils)/gnome/xslt/docbook/utils/ids.xsl | ||
162 | + | ||
163 | +if ENABLE_SK | ||
164 | +_ENABLE_SK = true | ||
165 | +_skpkgdatadir ?= `scrollkeeper-config --pkgdatadir` | ||
166 | +_sklocalstatedir ?= `scrollkeeper-config --pkglocalstatedir` | ||
167 | +_skcontentslist ?= $(_skpkgdatadir)/Templates/C/scrollkeeper_cl.xml | ||
168 | +endif | ||
169 | + | ||
170 | + | ||
171 | +################################################################################ | ||
172 | +## Support for automake silent-rules | ||
173 | +GDU_V_XML2PO=$(GDU__v_XML2PO_$(V)) | ||
174 | +GDU__v_XML2PO_=$(GDU__v_XML2PO_$(AM_DEFAULT_VERBOSITY)) | ||
175 | +GDU__v_XML2PO_0=@echo " XML2PO" $@; | ||
176 | + | ||
177 | +GDU_V_MSGFMT=$(GDU__v_MSGFMT_$(V)) | ||
178 | +GDU__v_MSGFMT_=$(GDU__v_MSGFMT_$(AM_DEFAULT_VERBOSITY)) | ||
179 | +GDU__v_MSGFMT_0=@echo " MSGFMT" $@; | ||
180 | + | ||
181 | +GDU_V_DB2OMF=$(GDU__v_DB2OMF_$(V)) | ||
182 | +GDU__v_DB2OMF_=$(GDU__v_DB2OMF_$(AM_DEFAULT_VERBOSITY)) | ||
183 | +GDU__v_DB2OMF_0=@echo " DB2OMF" $@; | ||
184 | + | ||
185 | +GDU_V_DB2HTM=$(GDU__v_DB2HTM_$(V)) | ||
186 | +GDU__v_DB2HTM_=$(GDU__v_DB2HTM_$(AM_DEFAULT_VERBOSITY)) | ||
187 | +GDU__v_DB2HTM_0=@echo " DB2HTM" $@; | ||
188 | + | ||
189 | +################################################################################ | ||
190 | +## @@ Rules for OMF Files | ||
191 | + | ||
192 | +db2omf_args = \ | ||
193 | + --stringparam db2omf.basename $(DOC_MODULE) \ | ||
194 | + --stringparam db2omf.format $(3) \ | ||
195 | + --stringparam db2omf.dtd \ | ||
196 | + $(shell xmllint --format $(2) | grep -h PUBLIC | head -n 1 \ | ||
197 | + | sed -e 's/.*PUBLIC \(\"[^\"]*\"\).*/\1/') \ | ||
198 | + --stringparam db2omf.lang $(notdir $(patsubst %/$(notdir $(2)),%,$(2))) \ | ||
199 | + --stringparam db2omf.omf_dir "$(OMF_DIR)" \ | ||
200 | + --stringparam db2omf.help_dir "$(HELP_DIR)" \ | ||
201 | + --stringparam db2omf.omf_in "$(_DOC_OMF_IN)" \ | ||
202 | + $(if $(_ENABLE_SK), \ | ||
203 | + --stringparam db2omf.scrollkeeper_cl "$(_skcontentslist)") \ | ||
204 | + $(_db2omf) $(2) | ||
205 | + | ||
206 | +## @ _DOC_OMF_IN | ||
207 | +## The OMF input file | ||
208 | +_DOC_OMF_IN = $(if $(DOC_MODULE),$(wildcard $(_DOC_ABS_SRCDIR)/$(DOC_MODULE).omf.in)) | ||
209 | + | ||
210 | +## @ _DOC_OMF_DB | ||
211 | +## The OMF files for DocBook output | ||
212 | +_DOC_OMF_DB = $(if $(_DOC_OMF_IN), \ | ||
213 | + $(foreach lc,C $(_DOC_REAL_LINGUAS),$(DOC_MODULE)-$(lc).omf)) | ||
214 | + | ||
215 | +$(_DOC_OMF_DB) : $(_DOC_OMF_IN) | ||
216 | +$(_DOC_OMF_DB) : $(DOC_MODULE)-%.omf : %/$(DOC_MODULE).xml | ||
217 | + @test "x$(_ENABLE_SK)" != "xtrue" -o -f "$(_skcontentslist)" || { \ | ||
218 | + echo "The file '$(_skcontentslist)' does not exist." >&2; \ | ||
219 | + echo "Please check your ScrollKeeper installation." >&2; \ | ||
220 | + exit 1; } | ||
221 | + $(GDU_V_DB2OMF)xsltproc -nonet -o $@ $(call db2omf_args,$@,$<,'docbook') || { rm -f "$@"; exit 1; } | ||
222 | + | ||
223 | +## @ _DOC_OMF_HTML | ||
224 | +## The OMF files for HTML output | ||
225 | +_DOC_OMF_HTML = $(if $(_DOC_OMF_IN), \ | ||
226 | + $(foreach lc,C $(_DOC_REAL_LINGUAS),$(DOC_MODULE)-html-$(lc).omf)) | ||
227 | + | ||
228 | +$(_DOC_OMF_HTML) : $(_DOC_OMF_IN) | ||
229 | +$(_DOC_OMF_HTML) : $(DOC_MODULE)-html-%.omf : %/$(DOC_MODULE).xml | ||
230 | +if ENABLE_SK | ||
231 | + @test "x$(_ENABLE_SK)" != "xtrue" -o -f "$(_skcontentslist)" || { \ | ||
232 | + echo "The file '$(_skcontentslist)' does not exist" >&2; \ | ||
233 | + echo "Please check your ScrollKeeper installation." >&2; \ | ||
234 | + exit 1; } | ||
235 | +endif | ||
236 | + $(GDU_V_DB2OMF)xsltproc -nonet -o $@ $(call db2omf_args,$@,$<,'xhtml') || { rm -f "$@"; exit 1; } | ||
237 | + | ||
238 | +## @ _DOC_OMF_ALL | ||
239 | +## All OMF output files to be built | ||
240 | +# FIXME | ||
241 | +_DOC_OMF_ALL = \ | ||
242 | + $(if $(filter docbook,$(_DOC_REAL_FORMATS)),$(_DOC_OMF_DB)) \ | ||
243 | + $(if $(filter html HTML,$(_DOC_REAL_FORMATS)),$(_DOC_OMF_HTML)) | ||
244 | + | ||
245 | +.PHONY: omf | ||
246 | +omf: $(_DOC_OMF_ALL) | ||
247 | + | ||
248 | + | ||
249 | +################################################################################ | ||
250 | +## @@ C Locale Documents | ||
251 | + | ||
252 | +## @ _DOC_C_MODULE | ||
253 | +## The top-level documentation file in the C locale | ||
254 | +_DOC_C_MODULE = $(if $(DOC_MODULE),C/$(DOC_MODULE).xml) | ||
255 | + | ||
256 | +## @ _DOC_C_PAGES | ||
257 | +## Page files in a Mallard document in the C locale | ||
258 | +_DOC_C_PAGES = $(foreach page,$(DOC_PAGES),C/$(page)) | ||
259 | + | ||
260 | +## @ _DOC_C_ENTITIES | ||
261 | +## Files included with a SYSTEM entity in the C locale | ||
262 | +_DOC_C_ENTITIES = $(foreach ent,$(DOC_ENTITIES),C/$(ent)) | ||
263 | + | ||
264 | +## @ _DOC_C_XINCLUDES | ||
265 | +## Files included with XInclude in the C locale | ||
266 | +_DOC_C_INCLUDES = $(foreach inc,$(DOC_INCLUDES),C/$(inc)) | ||
267 | + | ||
268 | +## @ _DOC_C_DOCS | ||
269 | +## All documentation files in the C locale | ||
270 | +_DOC_C_DOCS = \ | ||
271 | + $(_DOC_C_ENTITIES) $(_DOC_C_INCLUDES) \ | ||
272 | + $(_DOC_C_PAGES) $(_DOC_C_MODULE) | ||
273 | + | ||
274 | +## @ _DOC_C_DOCS_NOENT | ||
275 | +## All documentation files in the C locale, | ||
276 | +## except files included with a SYSTEM entity | ||
277 | +_DOC_C_DOCS_NOENT = \ | ||
278 | + $(_DOC_C_MODULE) $(_DOC_C_INCLUDES) \ | ||
279 | + $(_DOC_C_PAGES) | ||
280 | + | ||
281 | +## @ _DOC_C_FIGURES | ||
282 | +## All figures and other external data in the C locale | ||
283 | +_DOC_C_FIGURES = $(if $(DOC_FIGURES), \ | ||
284 | + $(foreach fig,$(DOC_FIGURES),C/$(fig)), \ | ||
285 | + $(patsubst $(srcdir)/%,%,$(wildcard $(srcdir)/C/figures/*.png))) | ||
286 | + | ||
287 | +## @ _DOC_C_HTML | ||
288 | +## All HTML documentation in the C locale | ||
289 | +# FIXME: probably have to shell escape to determine the file names | ||
290 | +_DOC_C_HTML = $(foreach f, \ | ||
291 | + $(shell xsltproc -nonet --xinclude \ | ||
292 | + --stringparam db.chunk.basename "$(DOC_MODULE)" \ | ||
293 | + $(_chunks) "C/$(DOC_MODULE).xml"), \ | ||
294 | + C/$(f).xhtml) | ||
295 | + | ||
296 | +############################################################################### | ||
297 | +## @@ Other Locale Documentation | ||
298 | + | ||
299 | +## @ _DOC_POFILES | ||
300 | +## The .po files used for translating the document | ||
301 | +_DOC_POFILES = $(if $(DOC_MODULE)$(DOC_ID), \ | ||
302 | + $(foreach lc,$(_DOC_REAL_LINGUAS),$(lc)/$(lc).po)) | ||
303 | + | ||
304 | +.PHONY: po | ||
305 | +po: $(_DOC_POFILES) | ||
306 | + | ||
307 | +## @ _DOC_MOFILES | ||
308 | +## The .mo files used for translating the document | ||
309 | +_DOC_MOFILES = $(patsubst %.po,%.mo,$(_DOC_POFILES)) | ||
310 | + | ||
311 | +.PHONY: mo | ||
312 | +mo: $(_DOC_MOFILES) | ||
313 | + | ||
314 | +## @ _DOC_LC_MODULES | ||
315 | +## The top-level documentation files in all other locales | ||
316 | +_DOC_LC_MODULES = $(if $(DOC_MODULE), \ | ||
317 | + $(foreach lc,$(_DOC_REAL_LINGUAS),$(lc)/$(DOC_MODULE).xml)) | ||
318 | + | ||
319 | +## @ _DOC_LC_PAGES | ||
320 | +## Page files in a Mallard document in all other locales | ||
321 | +_DOC_LC_PAGES = \ | ||
322 | + $(foreach lc,$(_DOC_REAL_LINGUAS),$(foreach page,$(_DOC_C_PAGES), \ | ||
323 | + $(lc)/$(notdir $(page)) )) | ||
324 | + | ||
325 | +## @ _DOC_LC_XINCLUDES | ||
326 | +## Files included with XInclude in all other locales | ||
327 | +_DOC_LC_INCLUDES = \ | ||
328 | + $(foreach lc,$(_DOC_REAL_LINGUAS),$(foreach inc,$(_DOC_C_INCLUDES), \ | ||
329 | + $(lc)/$(notdir $(inc)) )) | ||
330 | + | ||
331 | +## @ _DOC_LC_HTML | ||
332 | +## All HTML documentation in all other locales | ||
333 | +# FIXME: probably have to shell escape to determine the file names | ||
334 | +_DOC_LC_HTML = \ | ||
335 | + $(foreach lc,$(_DOC_REAL_LINGUAS),$(foreach doc,$(_DOC_C_HTML), \ | ||
336 | + $(lc)/$(notdir $(doc)) )) | ||
337 | + | ||
338 | +## @ _DOC_LC_DOCS | ||
339 | +## All documentation files in all other locales | ||
340 | +_DOC_LC_DOCS = \ | ||
341 | + $(_DOC_LC_MODULES) $(_DOC_LC_INCLUDES) $(_DOC_LC_PAGES) \ | ||
342 | + $(if $(filter html HTML,$(_DOC_REAL_FORMATS)),$(_DOC_LC_HTML)) | ||
343 | + | ||
344 | +## @ _DOC_LC_FIGURES | ||
345 | +## All figures and other external data in all other locales | ||
346 | +_DOC_LC_FIGURES = $(foreach lc,$(_DOC_REAL_LINGUAS), \ | ||
347 | + $(patsubst C/%,$(lc)/%,$(_DOC_C_FIGURES)) ) | ||
348 | + | ||
349 | +_DOC_SRC_FIGURES = \ | ||
350 | + $(foreach fig,$(_DOC_C_FIGURES), $(foreach lc,C $(_DOC_REAL_LINGUAS), \ | ||
351 | + $(wildcard $(srcdir)/$(lc)/$(patsubst C/%,%,$(fig))) )) | ||
352 | + | ||
353 | +$(_DOC_POFILES): | ||
354 | + @if ! test -d $(dir $@); then \ | ||
355 | + echo "mkdir $(dir $@)"; \ | ||
356 | + mkdir "$(dir $@)"; \ | ||
357 | + fi | ||
358 | + @if test ! -f $@ -a -f $(srcdir)/$@; then \ | ||
359 | + echo "cp $(srcdir)/$@ $@"; \ | ||
360 | + cp "$(srcdir)/$@" "$@"; \ | ||
361 | + fi; | ||
362 | + @docs=; \ | ||
363 | + list='$(_DOC_C_DOCS_NOENT)'; for doc in $$list; do \ | ||
364 | + docs="$$docs $(_DOC_ABS_SRCDIR)/$$doc"; \ | ||
365 | + done; \ | ||
366 | + if ! test -f $@; then \ | ||
367 | + echo "(cd $(dir $@) && \ | ||
368 | + $(_xml2po) -m $(_xml2po_mode) -e $$docs > $(notdir $@).tmp && \ | ||
369 | + cp $(notdir $@).tmp $(notdir $@) && rm -f $(notdir $@).tmp)"; \ | ||
370 | + (cd $(dir $@) && \ | ||
371 | + $(_xml2po) -m $(_xml2po_mode) -e $$docs > $(notdir $@).tmp && \ | ||
372 | + cp $(notdir $@).tmp $(notdir $@) && rm -f $(notdir $@).tmp); \ | ||
373 | + else \ | ||
374 | + echo "(cd $(dir $@) && \ | ||
375 | + $(_xml2po) -m $(_xml2po_mode) -e -u $(notdir $@) $$docs)"; \ | ||
376 | + (cd $(dir $@) && \ | ||
377 | + $(_xml2po) -m $(_xml2po_mode) -e -u $(notdir $@) $$docs); \ | ||
378 | + fi | ||
379 | + | ||
380 | +$(_DOC_MOFILES): %.mo: %.po | ||
381 | + $(AM_V_at)if ! test -d $(dir $@); then mkdir "$(dir $@)"; fi | ||
382 | + $(GDU_V_MSGFMT)msgfmt -o $@ $< | ||
383 | + | ||
384 | +# FIXME: fix the dependancy | ||
385 | +# FIXME: hook xml2po up | ||
386 | +$(_DOC_LC_DOCS) : $(_DOC_MOFILES) | ||
387 | +$(_DOC_LC_DOCS) : $(_DOC_C_DOCS) | ||
388 | + $(AM_V_at)if ! test -d $(dir $@); then mkdir $(dir $@); fi | ||
389 | + $(GDU_V_XML2PO)if [ -f "C/$(notdir $@)" ]; then d="../"; else d="$(_DOC_ABS_SRCDIR)/"; fi; \ | ||
390 | + mo="$(dir $@)$(patsubst %/$(notdir $@),%,$@).mo"; \ | ||
391 | + if [ -f "$${mo}" ]; then mo="../$${mo}"; else mo="$(_DOC_ABS_SRCDIR)/$${mo}"; fi; \ | ||
392 | + (cd $(dir $@) && \ | ||
393 | + $(_xml2po) -m $(_xml2po_mode) -e -t "$${mo}" \ | ||
394 | + "$${d}C/$(notdir $@)" > $(notdir $@).tmp && \ | ||
395 | + cp $(notdir $@).tmp $(notdir $@) && rm -f $(notdir $@).tmp) | ||
396 | + | ||
397 | +## @ _DOC_POT | ||
398 | +## A pot file | ||
399 | +_DOC_POT = $(if $(DOC_MODULE),$(DOC_MODULE).pot,$(if $(DOC_ID),$(DOC_ID).pot)) | ||
400 | +.PHONY: pot | ||
401 | +pot: $(_DOC_POT) | ||
402 | +$(_DOC_POT): $(_DOC_C_DOCS_NOENT) | ||
403 | + $(GDU_V_XML2PO)$(_xml2po) -m $(_xml2po_mode) -e -o $@ $^ | ||
404 | + | ||
405 | + | ||
406 | +################################################################################ | ||
407 | +## @@ All Documentation | ||
408 | + | ||
409 | +## @ _DOC_HTML_ALL | ||
410 | +## All HTML documentation, only if it's built | ||
411 | +_DOC_HTML_ALL = $(if $(filter html HTML,$(_DOC_REAL_FORMATS)), \ | ||
412 | + $(_DOC_C_HTML) $(_DOC_LC_HTML)) | ||
413 | + | ||
414 | +_DOC_HTML_TOPS = $(foreach lc,C $(_DOC_REAL_LINGUAS),$(lc)/$(DOC_MODULE).xhtml) | ||
415 | + | ||
416 | +$(_DOC_HTML_TOPS): $(_DOC_C_DOCS) $(_DOC_LC_DOCS) | ||
417 | + $(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,$@) | ||
418 | + | ||
419 | + | ||
420 | +################################################################################ | ||
421 | +## All | ||
422 | + | ||
423 | +all: \ | ||
424 | + $(_DOC_C_DOCS) $(_DOC_LC_DOCS) \ | ||
425 | + $(_DOC_OMF_ALL) $(_DOC_DSK_ALL) \ | ||
426 | + $(_DOC_HTML_ALL) $(_DOC_POFILES) | ||
427 | + | ||
428 | + | ||
429 | +################################################################################ | ||
430 | +## Clean | ||
431 | + | ||
432 | +.PHONY: clean-doc-omf clean-doc-dsk clean-doc-lc clean-doc-dir | ||
433 | + | ||
434 | +clean-doc-omf: ; rm -f $(_DOC_OMF_DB) $(_DOC_OMF_HTML) | ||
435 | +clean-doc-dsk: ; rm -f $(_DOC_DSK_DB) $(_DOC_DSK_HTML) | ||
436 | +clean-doc-lc: | ||
437 | + rm -f $(_DOC_LC_DOCS) | ||
438 | + rm -f $(_DOC_MOFILES) | ||
439 | + @list='$(_DOC_POFILES)'; for po in $$list; do \ | ||
440 | + if ! test "$$po" -ef "$(srcdir)/$$po"; then \ | ||
441 | + echo "rm -f $$po"; \ | ||
442 | + rm -f "$$po"; \ | ||
443 | + fi; \ | ||
444 | + done | ||
445 | +# .xml2.po.mo cleaning is obsolete as of 0.18.1 and could be removed in 0.20.x | ||
446 | + @for lc in C $(_DOC_REAL_LINGUAS); do \ | ||
447 | + if test -f "$$lc/.xml2po.mo"; then \ | ||
448 | + echo "rm -f $$lc/.xml2po.mo"; \ | ||
449 | + rm -f "$$lc/.xml2po.mo"; \ | ||
450 | + fi; \ | ||
451 | + done | ||
452 | +clean-doc-dir: clean-doc-lc | ||
453 | + @for lc in C $(_DOC_REAL_LINGUAS); do \ | ||
454 | + for dir in `find $$lc -depth -type d`; do \ | ||
455 | + if ! test $$dir -ef $(srcdir)/$$dir; then \ | ||
456 | + echo "rmdir $$dir"; \ | ||
457 | + rmdir "$$dir"; \ | ||
458 | + fi; \ | ||
459 | + done; \ | ||
460 | + done | ||
461 | + | ||
462 | +_clean_omf = $(if $(_DOC_OMF_IN),clean-doc-omf) | ||
463 | +_clean_dsk = $(if $(_DOC_DSK_IN),clean-doc-dsk) | ||
464 | +_clean_lc = $(if $(_DOC_REAL_LINGUAS),clean-doc-lc) | ||
465 | +_clean_dir = $(if $(DOC_MODULE)$(DOC_ID),clean-doc-dir) | ||
466 | + | ||
467 | +clean-local: \ | ||
468 | + $(_clean_omf) $(_clean_dsk) \ | ||
469 | + $(_clean_lc) $(_clean_dir) | ||
470 | +distclean-local: \ | ||
471 | + $(_clean_omf) $(_clean_dsk) \ | ||
472 | + $(_clean_lc) $(_clean_dir) | ||
473 | +mostlyclean-local: \ | ||
474 | + $(_clean_omf) $(_clean_dsk) \ | ||
475 | + $(_clean_lc) $(_clean_dir) | ||
476 | +maintainer-clean-local: \ | ||
477 | + $(_clean_omf) $(_clean_dsk) \ | ||
478 | + $(_clean_lc) $(_clean_dir) | ||
479 | + | ||
480 | + | ||
481 | + | ||
482 | +################################################################################ | ||
483 | +## Dist | ||
484 | + | ||
485 | +.PHONY: dist-doc-docs dist-doc-pages dist-doc-figs dist-doc-omf dist-doc-dsk | ||
486 | +doc-dist-hook: \ | ||
487 | + $(if $(DOC_MODULE)$(DOC_ID),dist-doc-docs) \ | ||
488 | + $(if $(_DOC_C_FIGURES),dist-doc-figs) \ | ||
489 | + $(if $(_DOC_OMF_IN),dist-doc-omf) | ||
490 | +# $(if $(_DOC_DSK_IN),dist-doc-dsk) | ||
491 | + | ||
492 | +dist-doc-docs: $(_DOC_C_DOCS) $(_DOC_LC_DOCS) $(_DOC_POFILES) | ||
493 | + @for lc in C $(_DOC_REAL_LINGUAS); do \ | ||
494 | + echo " $(mkinstalldirs) $(distdir)/$$lc"; \ | ||
495 | + $(mkinstalldirs) "$(distdir)/$$lc"; \ | ||
496 | + done | ||
497 | + @list='$(_DOC_C_DOCS)'; \ | ||
498 | + for doc in $$list; do \ | ||
499 | + if test -f "$$doc"; then d=; else d="$(srcdir)/"; fi; \ | ||
500 | + docdir=`echo $$doc | sed -e 's/^\(.*\/\).*/\1/' -e '/\//!s/.*//'`; \ | ||
501 | + if ! test -d "$(distdir)/$$docdir"; then \ | ||
502 | + echo "$(mkinstalldirs) $(distdir)/$$docdir"; \ | ||
503 | + $(mkinstalldirs) "$(distdir)/$$docdir"; \ | ||
504 | + fi; \ | ||
505 | + echo "$(INSTALL_DATA) $$d$$doc $(distdir)/$$doc"; \ | ||
506 | + $(INSTALL_DATA) "$$d$$doc" "$(distdir)/$$doc"; \ | ||
507 | + done | ||
508 | + @list='$(_DOC_LC_DOCS)'; \ | ||
509 | + for doc in $$list; do \ | ||
510 | + if test -f "$$doc"; then d=; else d="$(srcdir)/"; fi; \ | ||
511 | + docdir=`echo $$doc | sed -e 's/^\(.*\/\).*/\1/' -e '/\//!s/.*//'`; \ | ||
512 | + if ! test -d "$(distdir)/$$docdir"; then \ | ||
513 | + echo "$(mkinstalldirs) $(distdir)/$$docdir"; \ | ||
514 | + $(mkinstalldirs) "$(distdir)/$$docdir"; \ | ||
515 | + fi; \ | ||
516 | + echo "$(INSTALL_DATA) $$d$$doc $(distdir)/$$doc"; \ | ||
517 | + $(INSTALL_DATA) "$$d$$doc" "$(distdir)/$$doc"; \ | ||
518 | + done | ||
519 | + @list='$(_DOC_POFILES)'; \ | ||
520 | + for doc in $$list; do \ | ||
521 | + if test -f "$$doc"; then d=; else d="$(srcdir)/"; fi; \ | ||
522 | + docdir=`echo $$doc | sed -e 's/^\(.*\/\).*/\1/' -e '/\//!s/.*//'`; \ | ||
523 | + if ! test -d "$(distdir)/$$docdir"; then \ | ||
524 | + echo "$(mkinstalldirs) $(distdir)/$$docdir"; \ | ||
525 | + $(mkinstalldirs) "$(distdir)/$$docdir"; \ | ||
526 | + fi; \ | ||
527 | + echo "$(INSTALL_DATA) $$d$$doc $(distdir)/$$doc"; \ | ||
528 | + $(INSTALL_DATA) "$$d$$doc" "$(distdir)/$$doc"; \ | ||
529 | + done | ||
530 | + | ||
531 | +dist-doc-figs: $(_DOC_SRC_FIGURES) | ||
532 | + @list='$(_DOC_C_FIGURES) $(_DOC_LC_FIGURES)'; \ | ||
533 | + for fig in $$list; do \ | ||
534 | + if test -f "$$fig"; then d=; else d="$(srcdir)/"; fi; \ | ||
535 | + if test -f "$$d$$fig"; then \ | ||
536 | + figdir=`echo $$fig | sed -e 's/^\(.*\/\).*/\1/' -e '/\//!s/.*//'`; \ | ||
537 | + if ! test -d "$(distdir)/$$figdir"; then \ | ||
538 | + echo "$(mkinstalldirs) $(distdir)/$$figdir"; \ | ||
539 | + $(mkinstalldirs) "$(distdir)/$$figdir"; \ | ||
540 | + fi; \ | ||
541 | + echo "$(INSTALL_DATA) $$d$$fig $(distdir)/$$fig"; \ | ||
542 | + $(INSTALL_DATA) "$$d$$fig" "$(distdir)/$$fig"; \ | ||
543 | + fi; \ | ||
544 | + done; | ||
545 | + | ||
546 | +dist-doc-omf: | ||
547 | + @if test -f "$(_DOC_OMF_IN)"; then d=; else d="$(srcdir)/"; fi; \ | ||
548 | + echo "$(INSTALL_DATA) $$d$(_DOC_OMF_IN) $(distdir)/$(notdir $(_DOC_OMF_IN))"; \ | ||
549 | + $(INSTALL_DATA) "$$d$(_DOC_OMF_IN)" "$(distdir)/$(notdir $(_DOC_OMF_IN))" | ||
550 | + | ||
551 | +dist-doc-dsk: | ||
552 | + @if test -f "$(_DOC_DSK_IN)"; then d=; else d="$(srcdir)/"; fi; \ | ||
553 | + echo "$(INSTALL_DATA) $$d$(_DOC_DSK_IN) $(distdir)/$(notdir $(_DOC_DSK_IN))"; \ | ||
554 | + $(INSTALL_DATA) "$$d$(_DOC_DSK_IN)" "$(distdir)/$(notdir $(_DOC_DSK_IN))" | ||
555 | + | ||
556 | + | ||
557 | + | ||
558 | +################################################################################ | ||
559 | +## Check | ||
560 | + | ||
561 | +.PHONY: check-doc-docs check-doc-omf | ||
562 | +check: \ | ||
563 | + $(if $(DOC_MODULE),check-doc-docs) \ | ||
564 | + $(if $(DOC_ID),check-doc-pages) \ | ||
565 | + $(if $(_DOC_OMF_IN),check-doc-omf) | ||
566 | + | ||
567 | +check-doc-docs: $(_DOC_C_DOCS) $(_DOC_LC_DOCS) | ||
568 | + @for lc in C $(_DOC_REAL_LINGUAS); do \ | ||
569 | + if test -f "$$lc"; \ | ||
570 | + then d=; \ | ||
571 | + xmlpath="$$lc"; \ | ||
572 | + else \ | ||
573 | + d="$(srcdir)/"; \ | ||
574 | + xmlpath="$$lc:$(srcdir)/$$lc"; \ | ||
575 | + fi; \ | ||
576 | + echo "xmllint --noout --noent --path $$xmlpath --xinclude --postvalid $$d$$lc/$(DOC_MODULE).xml"; \ | ||
577 | + xmllint --noout --noent --path "$$xmlpath" --xinclude --postvalid "$$d$$lc/$(DOC_MODULE).xml"; \ | ||
578 | + done | ||
579 | + | ||
580 | +check-doc-pages: $(_DOC_C_PAGES) $(_DOC_LC_PAGES) | ||
581 | + for lc in C $(_DOC_REAL_LINGUAS); do \ | ||
582 | + if test -f "$$lc"; \ | ||
583 | + then d=; \ | ||
584 | + xmlpath="$$lc"; \ | ||
585 | + else \ | ||
586 | + d="$(srcdir)/"; \ | ||
587 | + xmlpath="$$lc:$(srcdir)/$$lc"; \ | ||
588 | + fi; \ | ||
589 | + for page in $(DOC_PAGES); do \ | ||
590 | + echo "xmllint --noout --noent --path $$xmlpath --xinclude $$d$$lc/$$page"; \ | ||
591 | + xmllint --noout --noent --path "$$xmlpath" --xinclude "$$d$$lc/$$page"; \ | ||
592 | + done; \ | ||
593 | + done | ||
594 | + | ||
595 | +check-doc-omf: $(_DOC_OMF_ALL) | ||
596 | + @list='$(_DOC_OMF_ALL)'; for omf in $$list; do \ | ||
597 | + echo "xmllint --noout --xinclude --dtdvalid 'http://scrollkeeper.sourceforge.net/dtds/scrollkeeper-omf-1.0/scrollkeeper-omf.dtd' $$omf"; \ | ||
598 | + xmllint --noout --xinclude --dtdvalid 'http://scrollkeeper.sourceforge.net/dtds/scrollkeeper-omf-1.0/scrollkeeper-omf.dtd' $$omf; \ | ||
599 | + done | ||
600 | + | ||
601 | + | ||
602 | + | ||
603 | +################################################################################ | ||
604 | +## Install | ||
605 | + | ||
606 | +.PHONY: install-doc-docs install-doc-html install-doc-figs install-doc-omf install-doc-dsk | ||
607 | + | ||
608 | +_doc_install_dir = $(if $(DOC_ID),$(DOC_ID),$(DOC_MODULE)) | ||
609 | + | ||
610 | +install-data-local: \ | ||
611 | + $(if $(DOC_MODULE)$(DOC_ID),install-doc-docs) \ | ||
612 | + $(if $(_DOC_HTML_ALL),install-doc-html) \ | ||
613 | + $(if $(_DOC_C_FIGURES),install-doc-figs) \ | ||
614 | + $(if $(_DOC_OMF_IN),install-doc-omf) | ||
615 | +# $(if $(_DOC_DSK_IN),install-doc-dsk) | ||
616 | + | ||
617 | +install-doc-docs: | ||
618 | + @for lc in C $(_DOC_REAL_LINGUAS); do \ | ||
619 | + echo "$(mkinstalldirs) $(DESTDIR)$(HELP_DIR)/$(_doc_install_dir)/$$lc"; \ | ||
620 | + $(mkinstalldirs) $(DESTDIR)$(HELP_DIR)/$(_doc_install_dir)/$$lc; \ | ||
621 | + done | ||
622 | + @list='$(_DOC_C_DOCS)'; for doc in $$list; do \ | ||
623 | + if test -f "$$doc"; then d=; else d="$(srcdir)/"; fi; \ | ||
624 | + docdir="$$lc/"`echo $$doc | sed -e 's/^\(.*\/\).*/\1/' -e '/\//!s/.*//'`; \ | ||
625 | + docdir="$(DESTDIR)$(HELP_DIR)/$(_doc_install_dir)/$$docdir"; \ | ||
626 | + if ! test -d "$$docdir"; then \ | ||
627 | + echo "$(mkinstalldirs) $$docdir"; \ | ||
628 | + $(mkinstalldirs) "$$docdir"; \ | ||
629 | + fi; \ | ||
630 | + echo "$(INSTALL_DATA) $$d$$doc $(DESTDIR)$(HELP_DIR)/$(_doc_install_dir)/$$doc"; \ | ||
631 | + $(INSTALL_DATA) $$d$$doc $(DESTDIR)$(HELP_DIR)/$(_doc_install_dir)/$$doc; \ | ||
632 | + done | ||
633 | + @list='$(_DOC_LC_DOCS)'; for doc in $$list; do \ | ||
634 | + if test -f "$$doc"; then d=; else d="$(srcdir)/"; fi; \ | ||
635 | + docdir="$$lc/"`echo $$doc | sed -e 's/^\(.*\/\).*/\1/' -e '/\//!s/.*//'`; \ | ||
636 | + docdir="$(DESTDIR)$(HELP_DIR)/$(_doc_install_dir)/$$docdir"; \ | ||
637 | + if ! test -d "$$docdir"; then \ | ||
638 | + echo "$(mkinstalldirs) $$docdir"; \ | ||
639 | + $(mkinstalldirs) "$$docdir"; \ | ||
640 | + fi; \ | ||
641 | + echo "$(INSTALL_DATA) $$d$$doc $(DESTDIR)$(HELP_DIR)/$(_doc_install_dir)/$$doc"; \ | ||
642 | + $(INSTALL_DATA) $$d$$doc $(DESTDIR)$(HELP_DIR)/$(_doc_install_dir)/$$doc; \ | ||
643 | + done | ||
644 | + | ||
645 | +install-doc-figs: | ||
646 | + @list='$(patsubst C/%,%,$(_DOC_C_FIGURES))'; for fig in $$list; do \ | ||
647 | + for lc in C $(_DOC_REAL_LINGUAS); do \ | ||
648 | + figsymlink=false; \ | ||
649 | + if test -f "$$lc/$$fig"; then \ | ||
650 | + figfile="$$lc/$$fig"; \ | ||
651 | + elif test -f "$(srcdir)/$$lc/$$fig"; then \ | ||
652 | + figfile="$(srcdir)/$$lc/$$fig"; \ | ||
653 | + else \ | ||
654 | + figsymlink=true; \ | ||
655 | + fi; \ | ||
656 | + figdir="$$lc/"`echo $$fig | sed -e 's/^\(.*\/\).*/\1/' -e '/\//!s/.*//'`; \ | ||
657 | + figdir="$(DESTDIR)$(HELP_DIR)/$(_doc_install_dir)/$$figdir"; \ | ||
658 | + if ! test -d "$$figdir"; then \ | ||
659 | + echo "$(mkinstalldirs) $$figdir"; \ | ||
660 | + $(mkinstalldirs) "$$figdir"; \ | ||
661 | + fi; \ | ||
662 | + figbase=`echo $$fig | sed -e 's/^.*\///'`; \ | ||
663 | + if $$figsymlink; then \ | ||
664 | + echo "cd $$figdir && $(LN_S) -f ../../C/$$fig $$figbase"; \ | ||
665 | + ( cd "$$figdir" && $(LN_S) -f "../../C/$$fig" "$$figbase" ); \ | ||
666 | + else \ | ||
667 | + echo "$(INSTALL_DATA) $$figfile $$figdir$$figbase"; \ | ||
668 | + $(INSTALL_DATA) "$$figfile" "$$figdir$$figbase"; \ | ||
669 | + fi; \ | ||
670 | + done; \ | ||
671 | + done | ||
672 | + | ||
673 | +install-doc-html: | ||
674 | + echo install-html | ||
675 | + | ||
676 | +install-doc-omf: | ||
677 | + $(mkinstalldirs) $(DESTDIR)$(OMF_DIR)/$(_doc_install_dir) | ||
678 | + @list='$(_DOC_OMF_ALL)'; for omf in $$list; do \ | ||
679 | + echo "$(INSTALL_DATA) $$omf $(DESTDIR)$(OMF_DIR)/$(_doc_install_dir)/$$omf"; \ | ||
680 | + $(INSTALL_DATA) $$omf $(DESTDIR)$(OMF_DIR)/$(_doc_install_dir)/$$omf; \ | ||
681 | + done | ||
682 | + @if test "x$(_ENABLE_SK)" = "xtrue"; then \ | ||
683 | + echo "scrollkeeper-update -p $(DESTDIR)$(_sklocalstatedir) -o $(DESTDIR)$(OMF_DIR)/$(_doc_install_dir)"; \ | ||
684 | + scrollkeeper-update -p "$(DESTDIR)$(_sklocalstatedir)" -o "$(DESTDIR)$(OMF_DIR)/$(_doc_install_dir)"; \ | ||
685 | + fi; | ||
686 | + | ||
687 | +install-doc-dsk: | ||
688 | + echo install-dsk | ||
689 | + | ||
690 | + | ||
691 | + | ||
692 | +################################################################################ | ||
693 | +## Uninstall | ||
694 | + | ||
695 | +.PHONY: uninstall-doc-docs uninstall-doc-html uninstall-doc-figs uninstall-doc-omf uninstall-doc-dsk | ||
696 | +uninstall-local: \ | ||
697 | + $(if $(DOC_MODULE)$(DOC_ID),uninstall-doc-docs) \ | ||
698 | + $(if $(_DOC_HTML_ALL),uninstall-doc-html) \ | ||
699 | + $(if $(_DOC_C_FIGURES),uninstall-doc-figs) \ | ||
700 | + $(if $(_DOC_OMF_IN),uninstall-doc-omf) | ||
701 | +# $(if $(_DOC_DSK_IN),uninstall-doc-dsk) | ||
702 | + | ||
703 | +uninstall-doc-docs: | ||
704 | + @list='$(_DOC_C_DOCS)'; for doc in $$list; do \ | ||
705 | + echo " rm -f $(DESTDIR)$(HELP_DIR)/$(_doc_install_dir)/$$doc"; \ | ||
706 | + rm -f "$(DESTDIR)$(HELP_DIR)/$(_doc_install_dir)/$$doc"; \ | ||
707 | + done | ||
708 | + @list='$(_DOC_LC_DOCS)'; for doc in $$list; do \ | ||
709 | + echo " rm -f $(DESTDIR)$(HELP_DIR)/$(_doc_install_dir)/$$doc"; \ | ||
710 | + rm -f "$(DESTDIR)$(HELP_DIR)/$(_doc_install_dir)/$$doc"; \ | ||
711 | + done | ||
712 | + | ||
713 | +uninstall-doc-figs: | ||
714 | + @list='$(_DOC_C_FIGURES) $(_DOC_LC_FIGURES)'; for fig in $$list; do \ | ||
715 | + echo "rm -f $(DESTDIR)$(HELP_DIR)/$(_doc_install_dir)/$$fig"; \ | ||
716 | + rm -f "$(DESTDIR)$(HELP_DIR)/$(_doc_install_dir)/$$fig"; \ | ||
717 | + done; | ||
718 | + | ||
719 | +uninstall-doc-omf: | ||
720 | + @list='$(_DOC_OMF_ALL)'; for omf in $$list; do \ | ||
721 | + if test "x$(_ENABLE_SK)" = "xtrue"; then \ | ||
722 | + echo "scrollkeeper-uninstall -p $(_sklocalstatedir) $(DESTDIR)$(OMF_DIR)/$(_doc_install_dir)/$$omf"; \ | ||
723 | + scrollkeeper-uninstall -p "$(_sklocalstatedir)" "$(DESTDIR)$(OMF_DIR)/$(_doc_install_dir)/$$omf"; \ | ||
724 | + fi; \ | ||
725 | + echo "rm -f $(DESTDIR)$(OMF_DIR)/$(_doc_install_dir)/$$omf"; \ | ||
726 | + rm -f "$(DESTDIR)$(OMF_DIR)/$(_doc_install_dir)/$$omf"; \ | ||
727 | + done | ||
728 | -- | ||
729 | 2.8.1 | ||
730 | |||
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 6b7fc5bec..000000000 --- a/meta-gnome/recipes-gnome/gnome-panel/gnome-panel/0001-Fix-build-with-gcc-5.patch +++ /dev/null | |||
@@ -1,35 +0,0 @@ | |||
1 | From 20810fcf329c6e0b48b8e7602565ccc70c7ce62b Mon Sep 17 00:00:00 2001 | ||
2 | From: Khem Raj <raj.khem@gmail.com> | ||
3 | Date: Sun, 10 May 2015 02:10:59 -0700 | ||
4 | Subject: [PATCH] Fix build with gcc 5 | ||
5 | |||
6 | cc1: error: ../../gnome-panel/libpanel-applets-private: No such file or | ||
7 | directory [-Werror=missing-include-dirs] | ||
8 | cc1: error: ../../gnome-panel/libpanel-applets-private: No such file or | ||
9 | directory [-Werror=missing-include-dirs] | ||
10 | cc1: error: ../../gnome-panel/libpanel-applets-private: No such file or | ||
11 | directory [-Werror=missing-include-dirs] | ||
12 | cc1: some warnings being treated as errors | ||
13 | |||
14 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
15 | --- | ||
16 | Upstream-Status: Pending | ||
17 | |||
18 | gnome-panel/libpanel-applet-private/Makefile.am | 1 - | ||
19 | 1 file changed, 1 deletion(-) | ||
20 | |||
21 | diff --git a/gnome-panel/libpanel-applet-private/Makefile.am b/gnome-panel/libpanel-applet-private/Makefile.am | ||
22 | index f12dee8..d556f12 100644 | ||
23 | --- a/gnome-panel/libpanel-applet-private/Makefile.am | ||
24 | +++ b/gnome-panel/libpanel-applet-private/Makefile.am | ||
25 | @@ -8,7 +8,6 @@ AM_CPPFLAGS = \ | ||
26 | -I$(srcdir) \ | ||
27 | -I$(top_srcdir)/gnome-panel \ | ||
28 | -I$(top_builddir)/gnome-panel \ | ||
29 | - -I$(top_builddir)/gnome-panel/libpanel-applets-private \ | ||
30 | -I$(top_builddir)/gnome-panel/libpanel-util \ | ||
31 | -DDATADIR=\""$(datadir)"\" \ | ||
32 | -DPANEL_APPLETS_DIR=\"$(appletsdir)\" \ | ||
33 | -- | ||
34 | 2.1.4 | ||
35 | |||
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 378e3e405..000000000 --- a/meta-gnome/recipes-gnome/gnome-panel/gnome-panel/as-needed.patch +++ /dev/null | |||
@@ -1,36 +0,0 @@ | |||
1 | From c65f1ae3472cfd4cd96fd376b7bbd95fba5eef0a Mon Sep 17 00:00:00 2001 | ||
2 | From: Vincent Untz <vuntz@gnome.org> | ||
3 | Date: Fri, 27 May 2011 17:00:14 +0000 | ||
4 | Subject: build: Fix build with --as-needed | ||
5 | |||
6 | upstream-status: backport | ||
7 | |||
8 | --- | ||
9 | diff --git a/applets/notification_area/Makefile.am b/applets/notification_area/Makefile.am | ||
10 | index 0afc6c5..9734536 100644 | ||
11 | --- a/applets/notification_area/Makefile.am | ||
12 | +++ b/applets/notification_area/Makefile.am | ||
13 | @@ -29,17 +29,17 @@ libtray_la_SOURCES = \ | ||
14 | NOTIFICATION_AREA_SOURCES = main.c main.h | ||
15 | |||
16 | NOTIFICATION_AREA_LDADD = \ | ||
17 | + libtray.la \ | ||
18 | ../../libpanel-applet/libpanel-applet-4.la \ | ||
19 | $(X_LIBS) \ | ||
20 | $(NOTIFICATION_AREA_LIBS) \ | ||
21 | - $(LIBPANEL_APPLET_LIBS) \ | ||
22 | - libtray.la | ||
23 | + $(LIBPANEL_APPLET_LIBS) | ||
24 | |||
25 | testtray_SOURCES = testtray.c | ||
26 | testtray_LDADD = \ | ||
27 | + libtray.la \ | ||
28 | $(X_LIBS) \ | ||
29 | - $(NOTIFICATION_AREA_LIBS) \ | ||
30 | - libtray.la | ||
31 | + $(NOTIFICATION_AREA_LIBS) | ||
32 | |||
33 | if NOTIFICATION_AREA_INPROCESS | ||
34 | APPLET_IN_PROCESS = true | ||
35 | -- | ||
36 | 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 de4cd8486..000000000 --- a/meta-gnome/recipes-gnome/gnome-panel/gnome-panel/idl-sysroot.patch +++ /dev/null | |||
@@ -1,22 +0,0 @@ | |||
1 | --- /tmp/Makefile.am 2009-10-26 16:53:20.000000000 +0100 | ||
2 | +++ gnome-panel-2.28.0/gnome-panel/Makefile.am 2009-10-26 16:53:51.000000000 +0100 | ||
3 | @@ -43,7 +43,7 @@ | ||
4 | $(NULL) | ||
5 | |||
6 | $(CORBA_SRCLIST): $(top_srcdir)/idl/GNOME_Panel.idl $(ORBIT_IDL) | ||
7 | - $(AM_V_GEN)$(ORBIT_IDL) -I $(BONOBO_IDLDIR) -I $(BONOBO_ACT_IDLDIR) $(top_srcdir)/idl/GNOME_Panel.idl | ||
8 | + $(AM_V_GEN)$(ORBIT_IDL) -I $(SYSROOT)$(BONOBO_IDLDIR) -I $(SYSROOT)$(BONOBO_ACT_IDLDIR) $(top_srcdir)/idl/GNOME_Panel.idl | ||
9 | |||
10 | BUILT_SOURCES = \ | ||
11 | $(CORBA_SRCLIST) \ | ||
12 | --- /tmp/Makefile.am 2009-10-26 16:54:17.000000000 +0100 | ||
13 | +++ gnome-panel-2.28.0/libpanel-applet/Makefile.am 2009-10-26 16:54:34.000000000 +0100 | ||
14 | @@ -45,7 +45,7 @@ | ||
15 | GNOME_Panel.h | ||
16 | |||
17 | $(CORBA_SRCLIST): $(top_srcdir)/idl/GNOME_Panel.idl $(ORBIT_IDL) | ||
18 | - $(AM_V_GEN)$(ORBIT_IDL) -I $(BONOBO_IDLDIR) -I $(BONOBO_ACT_IDLDIR) $(top_srcdir)/idl/GNOME_Panel.idl | ||
19 | + $(AM_V_GEN)$(ORBIT_IDL) -I $(SYSROOT)$(BONOBO_IDLDIR) -I $(SYSROOT)$(BONOBO_ACT_IDLDIR) $(top_srcdir)/idl/GNOME_Panel.idl | ||
20 | |||
21 | noinst_PROGRAMS = test-bonobo-applet | ||
22 | |||
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 d1cfab8fb..000000000 --- a/meta-gnome/recipes-gnome/gnome-panel/gnome-panel3_3.0.2.bb +++ /dev/null | |||
@@ -1,51 +0,0 @@ | |||
1 | SUMMARY = "GNOME panel" | ||
2 | LICENSE = "GPLv2 & LGPLv2 & GFDL-1.1" | ||
3 | |||
4 | BPN = "gnome-panel" | ||
5 | PR = "r1" | ||
6 | |||
7 | 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" | ||
8 | |||
9 | # conflicts with gnome-panel, because they provide the same package | ||
10 | # http://patches.openembedded.org/patch/43105/ | ||
11 | EXCLUDE_FROM_WORLD = "1" | ||
12 | DEFAULT_PREFERENCE = "-1" | ||
13 | |||
14 | LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ | ||
15 | file://COPYING-DOCS;md5=c9211dab3ae61e580f48432020784324 \ | ||
16 | file://COPYING.LIB;md5=5f30f0716dfdd0d91eb439ebec522ec2" | ||
17 | |||
18 | SECTION = "x11/gnome" | ||
19 | |||
20 | 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" | ||
21 | |||
22 | inherit gtk-doc gnome gettext pkgconfig | ||
23 | |||
24 | SRC_URI += "file://as-needed.patch " | ||
25 | |||
26 | SRC_URI[archive.md5sum] = "0f2f644dc4081b72f6df7a65282af7c6" | ||
27 | SRC_URI[archive.sha256sum] = "25db8ec026c4bf47f0ef5cc7e2712f2aad175bd7fb8e4952ef5f8b200f17f196" | ||
28 | |||
29 | EXTRA_OECONF = "--disable-scrollkeeper --disable-eds --enable-bonobo=no --with-in-process-applets=none" | ||
30 | |||
31 | do_configure_prepend() { | ||
32 | gnome-doc-prepare --automake | ||
33 | sed -i -e s:help:: ${S}/Makefile.am | ||
34 | } | ||
35 | |||
36 | pkg_postinst_${PN}_append () { | ||
37 | gconftool-2 --config-source=xml:readwrite:/etc/gconf/gconf.xml.defaults \ | ||
38 | --direct --load /etc/gconf/schemas/panel-default-setup.entries | ||
39 | } | ||
40 | |||
41 | PACKAGES =+ "libpanel-applet" | ||
42 | FILES_libpanel-applet = "${libdir}/libpanel-applet-3.so.*" | ||
43 | |||
44 | FILES_${PN} =+ "${datadir}/gnome* \ | ||
45 | ${datadir}/dbus-1 \ | ||
46 | ${datadir}/icons \ | ||
47 | ${datadir}/PolicyKit \ | ||
48 | ${libdir}/bonobo \ | ||
49 | " | ||
50 | |||
51 | 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 7cb8b9ddf..000000000 --- a/meta-gnome/recipes-gnome/gnome-panel/gnome-panel_2.32.1.bb +++ /dev/null | |||
@@ -1,48 +0,0 @@ | |||
1 | SUMMARY = "GNOME panel" | ||
2 | LICENSE = "GPL-2.0 & LGPL-2.0 & GFDL-1.1" | ||
3 | |||
4 | LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ | ||
5 | file://COPYING-DOCS;md5=c9211dab3ae61e580f48432020784324 \ | ||
6 | file://COPYING.LIB;md5=5f30f0716dfdd0d91eb439ebec522ec2" | ||
7 | |||
8 | SECTION = "x11/gnome" | ||
9 | |||
10 | PR = "r7" | ||
11 | |||
12 | DEPENDS = "gnome-doc-utils gconf glib-2.0 gnome-desktop gtk+ \ | ||
13 | pango libwnck gnome-menus cairo libgweather dbus dbus-glib \ | ||
14 | librsvg libcanberra \ | ||
15 | " | ||
16 | RDEPENDS_${PN} = "python" | ||
17 | |||
18 | inherit gtk-doc gnome autotools-brokensep gettext pkgconfig gconf gobject-introspection | ||
19 | |||
20 | SRCREV = "8292bd2b8a36df7eed3c760899400790cde68590" | ||
21 | SRC_URI = "git://git.gnome.org/gnome-panel;branch=gnome-2-32 \ | ||
22 | file://0001-Fix-build-with-gcc-5.patch \ | ||
23 | file://0001-Add-gnome-doc-utils.make.patch \ | ||
24 | " | ||
25 | |||
26 | S = "${WORKDIR}/git" | ||
27 | |||
28 | EXTRA_OECONF = "--disable-scrollkeeper --disable-eds --enable-bonobo=no --with-in-process-applets=none" | ||
29 | |||
30 | PACKAGECONFIG ??= "" | ||
31 | PACKAGECONFIG[networkmanager] = "--enable-network-manager,--disable-network-manager,networkmanager" | ||
32 | |||
33 | do_configure_prepend() { | ||
34 | sed -i -e s:help:: ${S}/Makefile.am | ||
35 | sed -i -e s:^#!@PYTHON@:#!/usr/bin/python: ${S}/gnome-panel/gnome-panel-add.in | ||
36 | } | ||
37 | |||
38 | PACKAGES =+ "libpanel-applet" | ||
39 | FILES_libpanel-applet = "${libdir}/libpanel-applet-*.so.*" | ||
40 | |||
41 | FILES_${PN} =+ "${datadir}/gnome* \ | ||
42 | ${datadir}/dbus-1 \ | ||
43 | ${datadir}/icons \ | ||
44 | ${datadir}/PolicyKit \ | ||
45 | ${libdir}/bonobo \ | ||
46 | " | ||
47 | |||
48 | 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 d6d49bbda..000000000 --- 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 @@ | |||
1 | From 3ed15a3c6ae4ab94c7e3af306644bb5d7f3fd1fa Mon Sep 17 00:00:00 2001 | ||
2 | From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com> | ||
3 | Date: Mon, 29 Apr 2013 13:08:10 +0200 | ||
4 | Subject: [PATCH] Makefile.am: don't build help/man | ||
5 | MIME-Version: 1.0 | ||
6 | Content-Type: text/plain; charset=UTF-8 | ||
7 | Content-Transfer-Encoding: 8bit | ||
8 | |||
9 | help crashes with: | ||
10 | |||
11 | | 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; } | ||
12 | | unable to parse fr/gnome-power-manager.xml | ||
13 | |||
14 | Upstream-Status: Inappropriate [configuration] | ||
15 | |||
16 | Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com> | ||
17 | --- | ||
18 | Makefile.am | 2 -- | ||
19 | 1 files changed, 0 insertions(+), 2 deletions(-) | ||
20 | |||
21 | diff --git a/Makefile.am b/Makefile.am | ||
22 | index 005b8a0..5b9e318 100644 | ||
23 | --- a/Makefile.am | ||
24 | +++ b/Makefile.am | ||
25 | @@ -5,9 +5,7 @@ SUBDIRS = \ | ||
26 | src \ | ||
27 | po \ | ||
28 | docs \ | ||
29 | - man \ | ||
30 | data \ | ||
31 | - help \ | ||
32 | policy \ | ||
33 | tools | ||
34 | |||
35 | -- | ||
36 | 1.7.6.5 | ||
37 | |||
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 f3db7ab6e..000000000 --- a/meta-gnome/recipes-gnome/gnome-power-manager/gnome-power-manager-2.32.0/sysrooted-pkg-config.patch +++ /dev/null | |||
@@ -1,35 +0,0 @@ | |||
1 | In cross environment we have to prepend the sysroot to the path found by | ||
2 | pkgconfig since the path returned from pkgconfig does not have sysroot prefixed | ||
3 | it ends up using the files from host system. Now usually people have gnome installed | ||
4 | so the build succeeds but if you dont have gnome installed on build host then | ||
5 | it wont find the files on host system and packages using gnome-doc-utils wont | ||
6 | compile. | ||
7 | |||
8 | This should work ok with non sysrooted builds too since in those cases PKG_CONFIG_SYSROOT_DIR | ||
9 | will be empty | ||
10 | |||
11 | Upstream-Status: Pending | ||
12 | |||
13 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
14 | |||
15 | Index: gnome-power-manager-2.32.0/gnome-doc-utils.make | ||
16 | =================================================================== | ||
17 | --- gnome-power-manager-2.32.0.orig/gnome-doc-utils.make 2010-01-27 08:28:31.000000000 -0800 | ||
18 | +++ gnome-power-manager-2.32.0/gnome-doc-utils.make 2011-09-25 16:16:04.914813800 -0700 | ||
19 | @@ -124,11 +124,11 @@ | ||
20 | |||
21 | _xml2po ?= `which xml2po` | ||
22 | |||
23 | -_db2html ?= `$(PKG_CONFIG) --variable db2html gnome-doc-utils` | ||
24 | -_db2omf ?= `$(PKG_CONFIG) --variable db2omf gnome-doc-utils` | ||
25 | -_chunks ?= `$(PKG_CONFIG) --variable xmldir gnome-doc-utils`/gnome/xslt/docbook/utils/chunks.xsl | ||
26 | -_credits ?= `$(PKG_CONFIG) --variable xmldir gnome-doc-utils`/gnome/xslt/docbook/utils/credits.xsl | ||
27 | -_ids ?= `$(PKG_CONFIG) --variable xmldir gnome-doc-utils`/gnome/xslt/docbook/utils/ids.xsl | ||
28 | +_db2html ?= ${PKG_CONFIG_SYSROOT_DIR}`$(PKG_CONFIG) --variable db2html gnome-doc-utils` | ||
29 | +_db2omf ?= ${PKG_CONFIG_SYSROOT_DIR}`$(PKG_CONFIG) --variable db2omf gnome-doc-utils` | ||
30 | +_chunks ?= ${PKG_CONFIG_SYSROOT_DIR}`$(PKG_CONFIG) --variable xmldir gnome-doc-utils`/gnome/xslt/docbook/utils/chunks.xsl | ||
31 | +_credits ?= ${PKG_CONFIG_SYSROOT_DIR}`$(PKG_CONFIG) --variable xmldir gnome-doc-utils`/gnome/xslt/docbook/utils/credits.xsl | ||
32 | +_ids ?= ${PKG_CONFIG_SYSROOT_DIR}`$(PKG_CONFIG) --variable xmldir gnome-doc-utils`/gnome/xslt/docbook/utils/ids.xsl | ||
33 | |||
34 | if ENABLE_SK | ||
35 | _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 ec2110785..000000000 --- a/meta-gnome/recipes-gnome/gnome-power-manager/gnome-power-manager_2.32.0.bb +++ /dev/null | |||
@@ -1,54 +0,0 @@ | |||
1 | SUMMARY = "Power management daemon" | ||
2 | LICENSE = "GPLv2" | ||
3 | LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f" | ||
4 | |||
5 | PR = "r4" | ||
6 | |||
7 | DEPENDS = "glib-2.0 gtk+ gconf libgnome-keyring dbus dbus-glib libnotify libwnck cairo libunique xrandr virtual/libx11 libxrender libcanberra upower gnome-doc-utils" | ||
8 | RRECOMMENDS_${PN} += "gnome-keyring" | ||
9 | |||
10 | inherit gnome | ||
11 | |||
12 | SRC_URI += " \ | ||
13 | file://sysrooted-pkg-config.patch \ | ||
14 | file://0001-Makefile.am-don-t-build-help-man.patch \ | ||
15 | " | ||
16 | |||
17 | SRC_URI[archive.md5sum] = "9a08e85dce3ffb90775f15e3bda4adda" | ||
18 | SRC_URI[archive.sha256sum] = "17fa301bf7e133285c0e054ae3be2b0f690c48f59b09f67e04d6ed339b330476" | ||
19 | GNOME_COMPRESS_TYPE="bz2" | ||
20 | |||
21 | EXTRA_OECONF = " --disable-scrollkeeper \ | ||
22 | --disable-applets \ | ||
23 | --x-includes=${STAGING_INCDIR} \ | ||
24 | --x-libraries=${STAGING_LIBDIR} \ | ||
25 | --enable-compile-warnings=no \ | ||
26 | ac_cv_header_X11_extensions_dpms_h=yes \ | ||
27 | " | ||
28 | |||
29 | do_configure_append() { | ||
30 | # Sigh... --enable-compile-warnings=no doesn't actually turn off -Werror | ||
31 | for i in $(find ${B} -name "Makefile") ; do | ||
32 | sed -i -e s:-Werror::g $i | ||
33 | done | ||
34 | sed -e "s/libtool --/${TARGET_SYS}-libtool --/" -i ${B}/src/Makefile | ||
35 | } | ||
36 | |||
37 | PACKAGES =+ "${PN}-applets" | ||
38 | |||
39 | FILES_${PN}-applets = "${bindir}/*applet* \ | ||
40 | ${libdir}/bonobo/servers \ | ||
41 | ${datadir}/gnome-2.0/ui \ | ||
42 | " | ||
43 | |||
44 | FILES_${PN} += "${datadir}/icons \ | ||
45 | ${datadir}/dbus-1 \ | ||
46 | ${datadir}/gnome/autostart \ | ||
47 | " | ||
48 | |||
49 | FILES_${PN}-doc += "${datadir}/omf \ | ||
50 | ${datadir}/gnome/help \ | ||
51 | " | ||
52 | |||
53 | # gnome-power-manager-2.32.0/src/gpm-manager.c:488:18: error: too many arguments to function 'notify_notification_new' | ||
54 | 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 b09f8d200..000000000 --- a/meta-gnome/recipes-gnome/gnome-session/gnome-session/use_G_GINT64_FORMAT.patch +++ /dev/null | |||
@@ -1,61 +0,0 @@ | |||
1 | This patch fixes the build errors when building gnome-session for 64bit target using gcc 4.8 | ||
2 | |||
3 | | gs-idle-monitor.c: In function 'handle_alarm_notify_event': | ||
4 | | gs-idle-monitor.c:196:9: error: format '%lld' expects argument of type 'long long int', but argument 5 has type 'gint64' [-Werror=format=] | ||
5 | | g_debug ("Watch %d fired, idle time = %lld", | ||
6 | | ^ | ||
7 | | gs-idle-monitor.c: In function '_xsync_alarm_set': | ||
8 | | gs-idle-monitor.c:453:17: error: format '%lld' expects argument of type 'long long int', but argument 4 has type 'gint64' [-Werror=format=] | ||
9 | | g_debug ("GSIdleMonitor: updating alarm for positive transition wait=%lld", | ||
10 | | ^ | ||
11 | | gs-idle-monitor.c:457:17: error: format '%lld' expects argument of type 'long long int', but argument 4 has type 'gint64' [-Werror=format=] | ||
12 | | g_debug ("GSIdleMonitor: creating new alarm for positive transition wait=%lld", | ||
13 | | ^ | ||
14 | | gs-idle-monitor.c:464:17: error: format '%lld' expects argument of type 'long long int', but argument 4 has type 'gint64' [-Werror=format=] | ||
15 | | g_debug ("GSIdleMonitor: updating alarm for negative transition wait=%lld", | ||
16 | | ^ | ||
17 | | gs-idle-monitor.c:468:17: error: format '%lld' expects argument of type 'long long int', but argument 4 has type 'gint64' [-Werror=format=] | ||
18 | |||
19 | Upstream-Status: Unknown | ||
20 | |||
21 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
22 | Index: gnome-session-2.32.1/gnome-session/gs-idle-monitor.c | ||
23 | =================================================================== | ||
24 | --- gnome-session-2.32.1.orig/gnome-session/gs-idle-monitor.c 2010-11-17 03:17:04.000000000 -0800 | ||
25 | +++ gnome-session-2.32.1/gnome-session/gs-idle-monitor.c 2013-06-11 23:33:12.239960082 -0700 | ||
26 | @@ -193,7 +193,7 @@ | ||
27 | return; | ||
28 | } | ||
29 | |||
30 | - g_debug ("Watch %d fired, idle time = %lld", | ||
31 | + g_debug ("Watch %d fired, idle time = %" G_GINT64_FORMAT "", | ||
32 | watch->id, | ||
33 | _xsyncvalue_to_int64 (alarm_event->counter_value)); | ||
34 | |||
35 | @@ -450,22 +450,22 @@ | ||
36 | |||
37 | attr.trigger.test_type = XSyncPositiveTransition; | ||
38 | if (watch->xalarm_positive != None) { | ||
39 | - g_debug ("GSIdleMonitor: updating alarm for positive transition wait=%lld", | ||
40 | + g_debug ("GSIdleMonitor: updating alarm for positive transition wait=%" G_GINT64_FORMAT "", | ||
41 | _xsyncvalue_to_int64 (attr.trigger.wait_value)); | ||
42 | XSyncChangeAlarm (GDK_DISPLAY (), watch->xalarm_positive, flags, &attr); | ||
43 | } else { | ||
44 | - g_debug ("GSIdleMonitor: creating new alarm for positive transition wait=%lld", | ||
45 | + g_debug ("GSIdleMonitor: creating new alarm for positive transition wait=%" G_GINT64_FORMAT "", | ||
46 | _xsyncvalue_to_int64 (attr.trigger.wait_value)); | ||
47 | watch->xalarm_positive = XSyncCreateAlarm (GDK_DISPLAY (), flags, &attr); | ||
48 | } | ||
49 | |||
50 | attr.trigger.test_type = XSyncNegativeTransition; | ||
51 | if (watch->xalarm_negative != None) { | ||
52 | - g_debug ("GSIdleMonitor: updating alarm for negative transition wait=%lld", | ||
53 | + g_debug ("GSIdleMonitor: updating alarm for negative transition wait=%" G_GINT64_FORMAT "", | ||
54 | _xsyncvalue_to_int64 (attr.trigger.wait_value)); | ||
55 | XSyncChangeAlarm (GDK_DISPLAY (), watch->xalarm_negative, flags, &attr); | ||
56 | } else { | ||
57 | - g_debug ("GSIdleMonitor: creating new alarm for negative transition wait=%lld", | ||
58 | + g_debug ("GSIdleMonitor: creating new alarm for negative transition wait=%" G_GINT64_FORMAT "", | ||
59 | _xsyncvalue_to_int64 (attr.trigger.wait_value)); | ||
60 | watch->xalarm_negative = XSyncCreateAlarm (GDK_DISPLAY (), flags, &attr); | ||
61 | } | ||
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 c49f2d3fb..000000000 --- a/meta-gnome/recipes-gnome/gnome-session/gnome-session_2.32.1.bb +++ /dev/null | |||
@@ -1,32 +0,0 @@ | |||
1 | SUMMARY = "Gnome session manager" | ||
2 | LICENSE = "GPLv2" | ||
3 | LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" | ||
4 | |||
5 | PR = "r3" | ||
6 | |||
7 | SECTION = "x11/gnome" | ||
8 | DEPENDS = "libxtst gtk+ glib-2.0 upower dbus-glib gconf pango gdk-pixbuf-native startup-notification" | ||
9 | |||
10 | inherit gnome | ||
11 | |||
12 | SRC_URI += "file://use_G_GINT64_FORMAT.patch" | ||
13 | |||
14 | SRC_URI[archive.md5sum] = "222bad6b446cb19a6b9028ea24538002" | ||
15 | SRC_URI[archive.sha256sum] = "22d93ce433fcf9c7ce6b5f36dd81f64e692ea0e41faaa0f61159ddac28c3686a" | ||
16 | GNOME_COMPRESS_TYPE="bz2" | ||
17 | |||
18 | EXTRA_OECONF = " --with-gtk=2.0 ac_cv_path_GCONF_SANITY_CHECK=set --disable-docbook-docs" | ||
19 | |||
20 | do_configure_append() { | ||
21 | for i in $(find ${S} -name "Makefile") ; do | ||
22 | sed -i -e s:"GCONFTOOL = .*/usr/bin/gconftool-2":"GCONFTOOL = /usr/bin/gconftool-2":g $i | ||
23 | sed -i -e s:"GCONF_SANITY_CHECK = set":"GCONF_SANITY_CHECK = /usr/libexec/gconf-sanity-check-2":g $i | ||
24 | done | ||
25 | } | ||
26 | |||
27 | RRECOMMENDS_${PN} += "${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'pam-plugin-ck-connector', '', d)}" | ||
28 | FILES_${PN} += "${datadir}/xsessions ${datadir}/icons ${datadir}/gnome ${libdir}/gnome-session/helpers" | ||
29 | FILES_${PN}-dbg += "${libexecdir}/gnome-session/helpers/.debug" | ||
30 | |||
31 | # http://errors.yoctoproject.org/Errors/Details/68621/ | ||
32 | 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 6dd33f351..000000000 --- a/meta-gnome/recipes-gnome/gnome-settings-daemon/files/0001-Require-libnotify-0.6.0.patch +++ /dev/null | |||
@@ -1,81 +0,0 @@ | |||
1 | From e1ab570b0dce479ba235e5542ea07d1b5bafc4c9 Mon Sep 17 00:00:00 2001 | ||
2 | From: William Jon McCann <jmccann@redhat.com> | ||
3 | Date: Mon, 11 Oct 2010 23:35:45 -0400 | ||
4 | Subject: [PATCH] Require libnotify 0.6.0 | ||
5 | |||
6 | Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com> | ||
7 | |||
8 | Upstream-Status: Backport | ||
9 | |||
10 | --- | ||
11 | configure.ac | 2 +- | ||
12 | plugins/a11y-keyboard/gsd-a11y-keyboard-manager.c | 8 ++------ | ||
13 | plugins/xrandr/gsd-xrandr-manager.c | 13 +++---------- | ||
14 | 3 files changed, 6 insertions(+), 17 deletions(-) | ||
15 | |||
16 | diff --git a/configure.ac b/configure.ac | ||
17 | index 8a90053..8624b2a 100644 | ||
18 | --- a/configure.ac | ||
19 | +++ b/configure.ac | ||
20 | @@ -54,7 +54,7 @@ GTK_REQUIRED_VERSION=2.91.0 | ||
21 | GCONF_REQUIRED_VERSION=2.6.1 | ||
22 | GIO_REQUIRED_VERSION=2.17.3 | ||
23 | GNOME_DESKTOP_REQUIRED_VERSION=2.29.92 | ||
24 | -LIBNOTIFY_REQUIRED_VERSION=0.4.3 | ||
25 | +LIBNOTIFY_REQUIRED_VERSION=0.6.1 | ||
26 | |||
27 | EXTRA_COMPILE_WARNINGS(yes) | ||
28 | |||
29 | diff --git a/plugins/a11y-keyboard/gsd-a11y-keyboard-manager.c b/plugins/a11y-keyboard/gsd-a11y-keyboard-manager.c | ||
30 | index 9ca820a..f5964b9 100644 | ||
31 | --- a/plugins/a11y-keyboard/gsd-a11y-keyboard-manager.c | ||
32 | +++ b/plugins/a11y-keyboard/gsd-a11y-keyboard-manager.c | ||
33 | @@ -608,9 +608,7 @@ ax_slowkeys_warning_post_bubble (GsdA11yKeyboardManager *manager, | ||
34 | gsd_a11y_keyboard_manager_ensure_status_icon (manager); | ||
35 | manager->priv->notification = notify_notification_new (title, | ||
36 | message, | ||
37 | - "preferences-desktop-accessibility", | ||
38 | - NULL); | ||
39 | - notify_notification_attach_to_status_icon (manager->priv->notification, manager->priv->status_icon); | ||
40 | + "preferences-desktop-accessibility"); | ||
41 | notify_notification_set_timeout (manager->priv->notification, NOTIFICATION_TIMEOUT * 1000); | ||
42 | |||
43 | notify_notification_add_action (manager->priv->notification, | ||
44 | @@ -747,9 +745,7 @@ ax_stickykeys_warning_post_bubble (GsdA11yKeyboardManager *manager, | ||
45 | gsd_a11y_keyboard_manager_ensure_status_icon (manager); | ||
46 | manager->priv->notification = notify_notification_new (title, | ||
47 | message, | ||
48 | - "preferences-desktop-accessibility", | ||
49 | - NULL); | ||
50 | - notify_notification_attach_to_status_icon (manager->priv->notification, manager->priv->status_icon); | ||
51 | + "preferences-desktop-accessibility"); | ||
52 | notify_notification_set_timeout (manager->priv->notification, NOTIFICATION_TIMEOUT * 1000); | ||
53 | |||
54 | notify_notification_add_action (manager->priv->notification, | ||
55 | diff --git a/plugins/xrandr/gsd-xrandr-manager.c b/plugins/xrandr/gsd-xrandr-manager.c | ||
56 | index 02536a3..ef57d5b 100644 | ||
57 | --- a/plugins/xrandr/gsd-xrandr-manager.c | ||
58 | +++ b/plugins/xrandr/gsd-xrandr-manager.c | ||
59 | @@ -1084,16 +1084,9 @@ error_message (GsdXrandrManager *mgr, const char *primary_text, GError *error_to | ||
60 | |||
61 | g_assert (error_to_display == NULL || secondary_text == NULL); | ||
62 | |||
63 | - if (priv->status_icon) | ||
64 | - notification = notify_notification_new_with_status_icon (primary_text, | ||
65 | - error_to_display ? error_to_display->message : secondary_text, | ||
66 | - GSD_XRANDR_ICON_NAME, | ||
67 | - priv->status_icon); | ||
68 | - else | ||
69 | - notification = notify_notification_new (primary_text, | ||
70 | - error_to_display ? error_to_display->message : secondary_text, | ||
71 | - GSD_XRANDR_ICON_NAME, | ||
72 | - NULL); | ||
73 | + notification = notify_notification_new (primary_text, | ||
74 | + error_to_display ? error_to_display->message : secondary_text, | ||
75 | + GSD_XRANDR_ICON_NAME); | ||
76 | |||
77 | notify_notification_show (notification, NULL); /* NULL-GError */ | ||
78 | #else | ||
79 | -- | ||
80 | 2.1.0 | ||
81 | |||
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 9a1897240..000000000 --- a/meta-gnome/recipes-gnome/gnome-settings-daemon/gnome-settings-daemon_2.32.1.bb +++ /dev/null | |||
@@ -1,43 +0,0 @@ | |||
1 | SUMMARY = "GNOME settings daemon" | ||
2 | LICENSE = "GPLv2" | ||
3 | LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552" | ||
4 | |||
5 | PR = "r7" | ||
6 | |||
7 | DEPENDS = "intltool libxxf86misc libsndfile1 libxtst glib-2.0 polkit gtk+ gconf dbus-glib libnotify libgnomekbd libxklavier gnome-doc-utils gnome-desktop" | ||
8 | |||
9 | inherit gnome | ||
10 | |||
11 | SRC_URI = " \ | ||
12 | git://git.gnome.org/gnome-settings-daemon;branch=gnome-2-32 \ | ||
13 | file://0001-Require-libnotify-0.6.0.patch \ | ||
14 | " | ||
15 | SRCREV = "0160f6725cfb872e017f3958f108792c3b882872" | ||
16 | |||
17 | S = "${WORKDIR}/git" | ||
18 | |||
19 | PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'pulseaudio', d)}" | ||
20 | PACKAGECONFIG[pulseaudio] = "--enable-pulse,--disable-pulse,pulseaudio glib-2.0 libcanberra" | ||
21 | PACKAGECONFIG[smartcard] = "--enable-smartcard-support,--disable-smartcard-support,nss" | ||
22 | |||
23 | EXTRA_OECONF = " \ | ||
24 | --x-includes=${STAGING_INCDIR} \ | ||
25 | --x-libraries=${STAGING_LIBDIR} \ | ||
26 | --enable-polkit \ | ||
27 | " | ||
28 | |||
29 | do_configure_prepend() { | ||
30 | sed -i -e 's:-L$libdir::g' -e 's:-I$includedir::g' ${S}/configure.ac | ||
31 | } | ||
32 | |||
33 | FILES_${PN} += "${libdir}/gnome-settings-daemon-2.0/*.so ${libdir}/gnome-settings-daemon-2.0/*plugin \ | ||
34 | ${datadir}/dbus-1/ \ | ||
35 | ${datadir}/icon* \ | ||
36 | ${datadir}/gnome-control-center \ | ||
37 | ${datadir}/xsession*" | ||
38 | |||
39 | FILES_${PN}-dbg += "${libdir}/gnome-settings-daemon-2.0/.debug" | ||
40 | FILES_${PN}-dev += "${libdir}/gnome-settings-daemon-2.0/*.la" | ||
41 | FILES_${PN}-staticdev += "${libdir}/gnome-settings-daemon-2.0/*.a" | ||
42 | |||
43 | 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 ace1b0076..000000000 --- a/meta-gnome/recipes-gnome/gnome-system-monitor/files/0001-Fix-glib-includes.patch +++ /dev/null | |||
@@ -1,101 +0,0 @@ | |||
1 | From 8587e35af52f7773f62361be2e72ddf286a59185 Mon Sep 17 00:00:00 2001 | ||
2 | From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com> | ||
3 | Date: Tue, 15 May 2012 13:02:02 +0200 | ||
4 | Subject: [PATCH] Fix glib includes | ||
5 | MIME-Version: 1.0 | ||
6 | Content-Type: text/plain; charset=UTF-8 | ||
7 | Content-Transfer-Encoding: 8bit | ||
8 | Upstream-Status: unknown | ||
9 | |||
10 | |||
11 | Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com> | ||
12 | --- | ||
13 | src/interface.h | 2 +- | ||
14 | src/load-graph.h | 2 +- | ||
15 | src/lsof.h | 2 +- | ||
16 | src/openfiles.h | 2 +- | ||
17 | src/procman_gnomesu.h | 2 +- | ||
18 | src/util.cpp | 2 +- | ||
19 | 6 files changed, 6 insertions(+), 6 deletions(-) | ||
20 | |||
21 | diff --git a/src/interface.h b/src/interface.h | ||
22 | index 4bda35a..b26b670 100644 | ||
23 | --- a/src/interface.h | ||
24 | +++ b/src/interface.h | ||
25 | @@ -20,7 +20,7 @@ | ||
26 | #ifndef _PROCMAN_INTERFACE_H_ | ||
27 | #define _PROCMAN_INTERFACE_H_ | ||
28 | |||
29 | -#include <glib/gtypes.h> | ||
30 | +#include <glib.h> | ||
31 | #include <gtk/gtk.h> | ||
32 | #include "procman.h" | ||
33 | |||
34 | diff --git a/src/load-graph.h b/src/load-graph.h | ||
35 | index 6111c78..6e7a599 100644 | ||
36 | --- a/src/load-graph.h | ||
37 | +++ b/src/load-graph.h | ||
38 | @@ -1,7 +1,7 @@ | ||
39 | #ifndef _PROCMAN_LOAD_GRAPH_H_ | ||
40 | #define _PROCMAN_LOAD_GRAPH_H_ | ||
41 | |||
42 | -#include <glib/gtypes.h> | ||
43 | +#include <glib.h> | ||
44 | #include <glibtop/cpu.h> | ||
45 | |||
46 | enum | ||
47 | diff --git a/src/lsof.h b/src/lsof.h | ||
48 | index ad7f111..da420e2 100644 | ||
49 | --- a/src/lsof.h | ||
50 | +++ b/src/lsof.h | ||
51 | @@ -1,7 +1,7 @@ | ||
52 | #ifndef H_PROCMAN_LSOF_1161179202 | ||
53 | #define H_PROCMAN_LSOF_1161179202 | ||
54 | |||
55 | -#include <glib/gmacros.h> | ||
56 | +#include <glib.h> | ||
57 | #include "procman.h" | ||
58 | |||
59 | void procman_lsof(ProcData *data); | ||
60 | diff --git a/src/openfiles.h b/src/openfiles.h | ||
61 | index 38b1cc8..a8b7b05 100644 | ||
62 | --- a/src/openfiles.h | ||
63 | +++ b/src/openfiles.h | ||
64 | @@ -1,7 +1,7 @@ | ||
65 | #ifndef _OPENFILES_H_ | ||
66 | #define _OPENFILES_H_ | ||
67 | |||
68 | -#include <glib/gtypes.h> | ||
69 | +#include <glib.h> | ||
70 | |||
71 | #include "procman.h" | ||
72 | |||
73 | diff --git a/src/procman_gnomesu.h b/src/procman_gnomesu.h | ||
74 | index fec2650..474ca9a 100644 | ||
75 | --- a/src/procman_gnomesu.h | ||
76 | +++ b/src/procman_gnomesu.h | ||
77 | @@ -1,7 +1,7 @@ | ||
78 | #ifndef H_GNOME_SYSTEM_MONITOR_GNOMESU_H_1132171917 | ||
79 | #define H_GNOME_SYSTEM_MONITOR_GNOMESU_H_1132171917 | ||
80 | |||
81 | -#include <glib/gtypes.h> | ||
82 | +#include <glib.h> | ||
83 | |||
84 | gboolean | ||
85 | procman_gnomesu_create_root_password_dialog(const char * message); | ||
86 | diff --git a/src/util.cpp b/src/util.cpp | ||
87 | index 9b1c9f5..90073fe 100644 | ||
88 | --- a/src/util.cpp | ||
89 | +++ b/src/util.cpp | ||
90 | @@ -1,7 +1,7 @@ | ||
91 | #include <config.h> | ||
92 | |||
93 | #include <glib/gi18n.h> | ||
94 | -#include <glib/gstring.h> | ||
95 | +#include <glib.h> | ||
96 | #include <gtk/gtk.h> | ||
97 | |||
98 | #include <glibtop/proctime.h> | ||
99 | -- | ||
100 | 1.7.6.5 | ||
101 | |||
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 7b6728102..000000000 --- a/meta-gnome/recipes-gnome/gnome-system-monitor/files/0002-src-procman.cpp-include-main-gtkmm.h.patch +++ /dev/null | |||
@@ -1,49 +0,0 @@ | |||
1 | From acff719983aa1294148dc4a367c48957f5510eff Mon Sep 17 00:00:00 2001 | ||
2 | From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com> | ||
3 | Date: Fri, 17 May 2013 18:25:56 +0200 | ||
4 | Subject: [PATCH] src/procman.cpp: include main gtkmm.h | ||
5 | MIME-Version: 1.0 | ||
6 | Content-Type: text/plain; charset=UTF-8 | ||
7 | Content-Transfer-Encoding: 8bit | ||
8 | |||
9 | after update of gtkmm build failed with: | ||
10 | |||
11 | In file included from /home/Superandy/tmp/oe-core-eglibc/sysroots/overo/usr/include/gtkmm-2.4/gtkmm/main.h:33:0, | ||
12 | from procman.cpp:26: | ||
13 | /home/Superandy/tmp/oe-core-eglibc/sysroots/overo/usr/include/gdkmm-2.4/gdkmm/types.h:92:7: error: 'Value' is not a template | ||
14 | /home/Superandy/tmp/oe-core-eglibc/sysroots/overo/usr/include/gdkmm-2.4/gdkmm/types.h:92:54: error: expected template-name before '<' token | ||
15 | /home/Superandy/tmp/oe-core-eglibc/sysroots/overo/usr/include/gdkmm-2.4/gdkmm/types.h:92:54: error: expected '{' before '<' token | ||
16 | /home/Superandy/tmp/oe-core-eglibc/sysroots/overo/usr/include/gdkmm-2.4/gdkmm/types.h:92:54: error: expected unqualified-id before '<' token | ||
17 | /home/Superandy/tmp/oe-core-eglibc/sysroots/overo/usr/include/gdkmm-2.4/gdkmm/types.h:174:7: error: 'Value' is not a template | ||
18 | /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 | ||
19 | /home/Superandy/tmp/oe-core-eglibc/sysroots/overo/usr/include/gdkmm-2.4/gdkmm/types.h:174:58: error: expected template-name before '<' token | ||
20 | /home/Superandy/tmp/oe-core-eglibc/sysroots/overo/usr/include/gdkmm-2.4/gdkmm/types.h:207:7: error: 'Value' is not a template | ||
21 | /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 | ||
22 | /home/Superandy/tmp/oe-core-eglibc/sysroots/overo/usr/include/gdkmm-2.4/gdkmm/types.h:207:51: error: expected template-name before '<' token | ||
23 | /home/Superandy/tmp/oe-core-eglibc/sysroots/overo/usr/include/gdkmm-2.4/gdkmm/types.h:274:7: error: 'Value' is not a template | ||
24 | /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 | ||
25 | <...> | ||
26 | |||
27 | Upstream-Status: Backport | ||
28 | |||
29 | Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com> | ||
30 | --- | ||
31 | src/procman.cpp | 2 +- | ||
32 | 1 files changed, 1 insertions(+), 1 deletions(-) | ||
33 | |||
34 | diff --git a/src/procman.cpp b/src/procman.cpp | ||
35 | index b5c0d0a..d9b4b3f 100644 | ||
36 | --- a/src/procman.cpp | ||
37 | +++ b/src/procman.cpp | ||
38 | @@ -23,7 +23,7 @@ | ||
39 | |||
40 | #include <locale.h> | ||
41 | |||
42 | -#include <gtkmm/main.h> | ||
43 | +#include <gtkmm.h> | ||
44 | #include <giomm/volumemonitor.h> | ||
45 | #include <giomm/init.h> | ||
46 | #include <glib.h> | ||
47 | -- | ||
48 | 1.7.4.4 | ||
49 | |||
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 3c5169e78..000000000 --- a/meta-gnome/recipes-gnome/gnome-system-monitor/files/Remove-pkg-config-check-for-gnome-icon-theme.patch +++ /dev/null | |||
@@ -1,30 +0,0 @@ | |||
1 | From 36fd2aa23e712f05f0cce4a1be3453fcf405d026 Mon Sep 17 00:00:00 2001 | ||
2 | From: Jussi Kukkonen <jussi.kukkonen@intel.com> | ||
3 | Date: Tue, 15 Sep 2015 16:28:18 +0300 | ||
4 | Subject: [PATCH] Remove pkg-config check for gnome-icon-theme | ||
5 | |||
6 | Theme is not required for building, and the icons are provided by | ||
7 | adwaita-icon-theme anyway | ||
8 | |||
9 | Upstream-Status: Inappropriate [Fixed in current versions] | ||
10 | Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com> | ||
11 | --- | ||
12 | configure.in | 2 +- | ||
13 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
14 | |||
15 | diff --git a/configure.in b/configure.in | ||
16 | index 3600823..42262f2 100644 | ||
17 | --- a/configure.in | ||
18 | +++ b/configure.in | ||
19 | @@ -37,7 +37,7 @@ LIBXML_REQUIRED=2.0 | ||
20 | RSVG_REQUIRED=2.12 | ||
21 | DBUS_REQUIRED=0.7 | ||
22 | |||
23 | -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) | ||
24 | +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) | ||
25 | |||
26 | |||
27 | AC_ARG_ENABLE(more-warnings, | ||
28 | -- | ||
29 | 2.1.4 | ||
30 | |||
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 4b397bf83..000000000 --- a/meta-gnome/recipes-gnome/gnome-system-monitor/gnome-system-monitor_2.28.2.bb +++ /dev/null | |||
@@ -1,35 +0,0 @@ | |||
1 | SUMMARY = "Gnome system monitor" | ||
2 | LICENSE = "GPLv2" | ||
3 | LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe" | ||
4 | SECTION = "x11/gnome" | ||
5 | PR = "r2" | ||
6 | |||
7 | DEPENDS = "libgtop gtkmm glibmm gnome-doc-utils libwnck gtk+ dbus-glib librsvg intltool-native gnome-common-native" | ||
8 | |||
9 | inherit gnome | ||
10 | SRC_URI[archive.md5sum] = "3f0bca9b0ebc7a365466851cd580d167" | ||
11 | SRC_URI[archive.sha256sum] = "b628edfd39e3a6b374ce133f367d3568475eb4e981a367f4f9d62a9784e5ae59" | ||
12 | GNOME_COMPRESS_TYPE="bz2" | ||
13 | SRC_URI += " \ | ||
14 | file://0001-Fix-glib-includes.patch \ | ||
15 | file://0002-src-procman.cpp-include-main-gtkmm.h.patch \ | ||
16 | file://Remove-pkg-config-check-for-gnome-icon-theme.patch \ | ||
17 | " | ||
18 | |||
19 | do_configure_prepend() { | ||
20 | sed -i -e s:help::g ${S}/Makefile.am | ||
21 | } | ||
22 | |||
23 | CXXFLAGS += "--std=c++11" | ||
24 | |||
25 | RRECOMMENDS_${PN} = "adwaita-icon-theme" | ||
26 | |||
27 | FILES_${PN} += "${datadir}/icons \ | ||
28 | ${datadir}/dbus-1 \ | ||
29 | ${datadir}/gnome/autostart \ | ||
30 | " | ||
31 | |||
32 | FILES_${PN}-doc += "${datadir}/omf \ | ||
33 | ${datadir}/gnome/help " | ||
34 | |||
35 | 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 d7874e492..000000000 --- a/meta-gnome/recipes-gnome/gnome/gnome-terminal/0001-Makefile.am-do-not-build-help.patch +++ /dev/null | |||
@@ -1,28 +0,0 @@ | |||
1 | From d2549d3ef08536be6d141524e3382fef07fea8bf Mon Sep 17 00:00:00 2001 | ||
2 | From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com> | ||
3 | Date: Tue, 30 Apr 2013 19:48:27 +0200 | ||
4 | Subject: [PATCH] Makefile.am: do not build help | ||
5 | MIME-Version: 1.0 | ||
6 | Content-Type: text/plain; charset=UTF-8 | ||
7 | Content-Transfer-Encoding: 8bit | ||
8 | |||
9 | Upstream-Status: Inappropriate [configuration] | ||
10 | |||
11 | Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com> | ||
12 | --- | ||
13 | Makefile.am | 2 +- | ||
14 | 1 files changed, 1 insertions(+), 1 deletions(-) | ||
15 | |||
16 | diff --git a/Makefile.am b/Makefile.am | ||
17 | index 89f7ee4..31e11ab 100644 | ||
18 | --- a/Makefile.am | ||
19 | +++ b/Makefile.am | ||
20 | @@ -1,4 +1,4 @@ | ||
21 | -SUBDIRS = src po help | ||
22 | +SUBDIRS = src po | ||
23 | |||
24 | NULL = | ||
25 | |||
26 | -- | ||
27 | 1.7.6.5 | ||
28 | |||
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 6b3bf7654..000000000 --- a/meta-gnome/recipes-gnome/gnome/gnome-terminal_2.30.2.bb +++ /dev/null | |||
@@ -1,22 +0,0 @@ | |||
1 | SUMMARY = "GNOME Terminal" | ||
2 | LICENSE = "GPL-2.0" | ||
3 | LIC_FILES_CHKSUM = "file://COPYING;md5=5b51eba4ba4cafe64073227530c061ed" | ||
4 | DEPENDS = "gtk+ glib-2.0 startup-notification dbus-glib vte9 gnome-doc-utils intltool-native" | ||
5 | PR = "r1" | ||
6 | |||
7 | inherit gnome | ||
8 | |||
9 | SRC_URI += " \ | ||
10 | file://0001-Makefile.am-do-not-build-help.patch \ | ||
11 | " | ||
12 | |||
13 | EXTRA_OECONF += "--disable-scrollkeeper" | ||
14 | |||
15 | SRC_URI[archive.md5sum] = "74c4528f00067072c2bd867d1f8fe844" | ||
16 | SRC_URI[archive.sha256sum] = "2c7af2250698b9f9f53c6eaa93211c1118cf2c7e29cbbacfd1e8a6a10069e07a" | ||
17 | GNOME_COMPRESS_TYPE="bz2" | ||
18 | |||
19 | RRECOMMENDS_${PN} += "gnome-common-schemas" | ||
20 | |||
21 | # http://errors.yoctoproject.org/Errors/Details/68636/ | ||
22 | 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 3480712b5..000000000 --- a/meta-gnome/recipes-gnome/gnome/libgnomecups_0.2.3.bb +++ /dev/null | |||
@@ -1,25 +0,0 @@ | |||
1 | DESCRIPTION="Gnome Cups Manager" | ||
2 | LICENSE="GPLv2" | ||
3 | LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f" | ||
4 | |||
5 | DEPENDS="glib-2.0 gtk+ pango cups intltool libgnomeui" | ||
6 | |||
7 | PR = "r2" | ||
8 | |||
9 | inherit gnomebase pkgconfig | ||
10 | |||
11 | do_compile_append () { | ||
12 | cp libgnomecups-1.0.pc libgnomecups-1.0.pc.old | ||
13 | sed 's:${STAGING_DIR_HOST}::' < libgnomecups-1.0.pc.old > libgnomecups-1.0.pc | ||
14 | } | ||
15 | |||
16 | SRC_URI += "\ | ||
17 | file://libgnomecups-0.2.3-glib.h.patch \ | ||
18 | file://libgnomecups-0.2.3-cups-1.6.patch \ | ||
19 | " | ||
20 | |||
21 | SRC_URI[archive.md5sum] = "dc4920c15c9f886f73ea74fbff0ae48b" | ||
22 | SRC_URI[archive.sha256sum] = "e130e80942b386de19a288a4c194ff3dbe9140315b31e982058c8bffbb6a1d29" | ||
23 | GNOME_COMPRESS_TYPE="bz2" | ||
24 | |||
25 | 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 174985a7e..000000000 --- a/meta-gnome/recipes-gnome/gnome/libgnomeprint/0001-configure-use-pkgconfig-for-freetype.patch +++ /dev/null | |||
@@ -1,37 +0,0 @@ | |||
1 | From ed31fd89f4c77d89390774d29427898a85b25ab1 Mon Sep 17 00:00:00 2001 | ||
2 | From: Koen Kooi <koen@dominion.thruhere.net> | ||
3 | Date: Fri, 1 Aug 2014 13:58:36 +0200 | ||
4 | Subject: [PATCH] configure: use pkgconfig for freetype | ||
5 | |||
6 | Upstream-status: Pending | ||
7 | Signed-off-by: Koen Kooi <koen@dominion.thruhere.net> | ||
8 | --- | ||
9 | configure.in | 12 +++++------- | ||
10 | 1 file changed, 5 insertions(+), 7 deletions(-) | ||
11 | |||
12 | diff --git a/configure.in b/configure.in | ||
13 | index 729278d..e569429 100644 | ||
14 | --- a/configure.in | ||
15 | +++ b/configure.in | ||
16 | @@ -164,13 +164,11 @@ dnl Checking for freetype2 | ||
17 | dnl ================================= | ||
18 | FREETYPE_LIBS= | ||
19 | FREETYPE_CFLAGS= | ||
20 | -AC_PATH_PROG(FREETYPE_CONFIG, freetype-config, no) | ||
21 | -if test "x$FREETYPE_CONFIG" = "xno" ; then | ||
22 | - AC_MSG_ERROR(You need FreeType2 (freetype-devel v 2.x package) for this version of libgnomeprint) | ||
23 | -else | ||
24 | - FREETYPE_CFLAGS=`$FREETYPE_CONFIG --cflags` | ||
25 | - FREETYPE_LIBS=`$FREETYPE_CONFIG --libs` | ||
26 | -fi | ||
27 | +PKG_CHECK_MODULES(FREETYPE2, freetype2, | ||
28 | + FREETYPE_CFLAGS="$CFLAGS $FREETYPE2_CFLAGS" | ||
29 | + FREETYPE_LIBS="$LIBS $FREETYPE2_LIBS", | ||
30 | + AC_MSG_ERROR([*** Unable to find FreeType2 library (http://www.freetype.org/)]) | ||
31 | +) | ||
32 | |||
33 | libgnomeprint_save_ldflags=$LDFLAGS | ||
34 | LDFLAGS="$LDFLAGS $FREETYPE_LIBS" | ||
35 | -- | ||
36 | 1.9.0 | ||
37 | |||
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 29d410a0a..000000000 --- a/meta-gnome/recipes-gnome/gnome/libgnomeprint/bison3-support.patch +++ /dev/null | |||
@@ -1,30 +0,0 @@ | |||
1 | Index: libgnomeprint-2.18.8/libgnomeprint/grammar.y | ||
2 | =================================================================== | ||
3 | --- libgnomeprint-2.18.8.orig/libgnomeprint/grammar.y | ||
4 | +++ libgnomeprint-2.18.8/libgnomeprint/grammar.y | ||
5 | @@ -99,7 +99,7 @@ gnome_print_filter_parse_prop (GnomePrin | ||
6 | } | ||
7 | |||
8 | static int yylex (void *lvalp); | ||
9 | -static int yyerror (const char *s); | ||
10 | +static int yyerror (graph_t *g, const char *s); | ||
11 | %} | ||
12 | |||
13 | %union { | ||
14 | @@ -117,6 +117,7 @@ static int yyerror (const char *s); | ||
15 | %type <p> pool | ||
16 | |||
17 | %pure_parser | ||
18 | +%parse-param { graph_t *graph } | ||
19 | |||
20 | %start graph | ||
21 | %% | ||
22 | @@ -185,7 +186,7 @@ graph: filter { | ||
23 | %% | ||
24 | |||
25 | static int | ||
26 | -yyerror (const char *s) | ||
27 | +yyerror (graph_t *g, const char *s) | ||
28 | { | ||
29 | return -1; | ||
30 | } | ||
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 53235a12d..000000000 --- a/meta-gnome/recipes-gnome/gnome/libgnomeprint/fix.includes.patch +++ /dev/null | |||
@@ -1,11 +0,0 @@ | |||
1 | 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 | ||
2 | --- libgnomeprint-2.18.7.orig/libgnomeprint/modules/cups/gnome-print-cups-transport.c 2009-04-19 19:45:36.000000000 +0200 | ||
3 | +++ libgnomeprint-2.18.7/libgnomeprint/modules/cups/gnome-print-cups-transport.c 2012-12-23 12:34:52.058643537 +0100 | ||
4 | @@ -35,6 +35,7 @@ | ||
5 | #include <sys/stat.h> | ||
6 | #include <fcntl.h> | ||
7 | #include <unistd.h> | ||
8 | +#include <stdio.h> | ||
9 | #include <locale.h> | ||
10 | |||
11 | #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 7a27ecd23..000000000 --- a/meta-gnome/recipes-gnome/gnome/libgnomeprint/freetype.patch +++ /dev/null | |||
@@ -1,38 +0,0 @@ | |||
1 | Use proper method to include freetype headers | ||
2 | |||
3 | FreeType wants to use these special macros to include its APIs | ||
4 | so be it. | ||
5 | |||
6 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
7 | Upstream-Status: Pending | ||
8 | |||
9 | Index: libgnomeprint-2.18.7/libgnomeprint/gnome-font-face.c | ||
10 | =================================================================== | ||
11 | --- libgnomeprint-2.18.7.orig/libgnomeprint/gnome-font-face.c | ||
12 | +++ libgnomeprint-2.18.7/libgnomeprint/gnome-font-face.c | ||
13 | @@ -36,7 +36,9 @@ | ||
14 | #include <stdarg.h> | ||
15 | #include <locale.h> | ||
16 | |||
17 | -#include <freetype/ftoutln.h> | ||
18 | +#include <ft2build.h> | ||
19 | +#include FT_FREETYPE_H | ||
20 | + | ||
21 | |||
22 | #include <libgnomeprint/gnome-print-private.h> | ||
23 | #include <libgnomeprint/gnome-font-private.h> | ||
24 | Index: libgnomeprint-2.18.7/libgnomeprint/gnome-rfont.c | ||
25 | =================================================================== | ||
26 | --- libgnomeprint-2.18.7.orig/libgnomeprint/gnome-rfont.c | ||
27 | +++ libgnomeprint-2.18.7/libgnomeprint/gnome-rfont.c | ||
28 | @@ -28,8 +28,8 @@ | ||
29 | |||
30 | #include <ft2build.h> | ||
31 | #include FT_FREETYPE_H | ||
32 | -#include <freetype/ftglyph.h> | ||
33 | -#include <freetype/ftbbox.h> | ||
34 | +#include FT_GLYPH_H | ||
35 | +#include FT_BBOX_H | ||
36 | #include <libart_lgpl/art_misc.h> | ||
37 | #include <libart_lgpl/art_affine.h> | ||
38 | #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 a462a4b9e..000000000 --- a/meta-gnome/recipes-gnome/gnome/libgnomeprint_2.18.8.bb +++ /dev/null | |||
@@ -1,28 +0,0 @@ | |||
1 | LICENSE = "GPLv2" | ||
2 | SECTION = "x11/gnome/libs" | ||
3 | |||
4 | DEPENDS = "bison-native flex-native libxml2 libgnomecups glib-2.0 pango libart-lgpl fontconfig popt gnome-common freetype" | ||
5 | |||
6 | LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f" | ||
7 | |||
8 | inherit gnomebase | ||
9 | |||
10 | SRC_URI += "file://fix.includes.patch \ | ||
11 | file://freetype.patch \ | ||
12 | file://0001-configure-use-pkgconfig-for-freetype.patch \ | ||
13 | file://bison3-support.patch \ | ||
14 | " | ||
15 | SRC_URI[archive.md5sum] = "63b05ffb5386e131487c6af30f4c56ac" | ||
16 | SRC_URI[archive.sha256sum] = "1034ec8651051f84d2424e7a1da61c530422cc20ce5b2d9e107e1e46778d9691" | ||
17 | GNOME_COMPRESS_TYPE="bz2" | ||
18 | |||
19 | FILES_${PN}-dbg += "\ | ||
20 | ${libdir}/${PN}/${PV}/modules/.debug \ | ||
21 | ${libdir}/${PN}/${PV}/modules/*/.debug \ | ||
22 | " | ||
23 | FILES_${PN}-staticdev += "\ | ||
24 | ${libdir}/${PN}/${PV}/modules/*.a \ | ||
25 | ${libdir}/${PN}/${PV}/modules/*/*.a \ | ||
26 | " | ||
27 | |||
28 | 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 914d2ccf9..000000000 --- a/meta-gnome/recipes-gnome/gnumeric/gnumeric/0001-configure.in-drop-introspection-macros-replace-them-.patch +++ /dev/null | |||
@@ -1,84 +0,0 @@ | |||
1 | From de5f0a535d6ea1932d2c7de53bd33510c8682ee7 Mon Sep 17 00:00:00 2001 | ||
2 | From: Alexander Kanavin <alex.kanavin@gmail.com> | ||
3 | Date: Mon, 22 Feb 2016 16:34:03 +0200 | ||
4 | Subject: [PATCH] configure.in: drop introspection macros, replace them with a | ||
5 | standard one | ||
6 | |||
7 | Upstream-Status: Pending | ||
8 | Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> | ||
9 | --- | ||
10 | configure.in | 57 +-------------------------------------------------------- | ||
11 | 1 file changed, 1 insertion(+), 56 deletions(-) | ||
12 | |||
13 | diff --git a/configure.in b/configure.in | ||
14 | index 8e1aa37..3086503 100644 | ||
15 | --- a/configure.in | ||
16 | +++ b/configure.in | ||
17 | @@ -934,63 +934,8 @@ AC_SUBST(MONO_CFLAGS) | ||
18 | AC_SUBST(MONO_LIBS) | ||
19 | ]) | ||
20 | |||
21 | -# GObject Introspection | ||
22 | -GIR_REQ=1.0.0 | ||
23 | -AC_ARG_ENABLE(introspection, | ||
24 | - AS_HELP_STRING([--enable-introspection[=@<:@no/auto/yes@:>@]], | ||
25 | - [Enable introspection for this build]),, | ||
26 | - [enable_introspection=no]) | ||
27 | - | ||
28 | -AC_MSG_CHECKING([for gobject-introspection]) | ||
29 | - | ||
30 | -dnl presence/version checking | ||
31 | -AS_CASE([$enable_introspection], | ||
32 | -[no], [ | ||
33 | - found_introspection="no (disabled, use --enable-introspection to enable)" | ||
34 | -], | ||
35 | -[yes],[ | ||
36 | - PKG_CHECK_EXISTS([gobject-introspection-1.0],, | ||
37 | - AC_MSG_ERROR([gobject-introspection-1.0 is not installed])) | ||
38 | - PKG_CHECK_EXISTS([gobject-introspection-1.0 >= $GIR_REQ], | ||
39 | - found_introspection=yes, | ||
40 | - AC_MSG_ERROR([You need to have gobject-introspection >= $1 installed to build AC_PACKAGE_NAME])) | ||
41 | -], | ||
42 | -[auto],[ | ||
43 | - PKG_CHECK_EXISTS([gobject-introspection-1.0 >= $GIR_REQ], found_introspection=yes, found_introspection=no) | ||
44 | -dnl Canonicalize enable_introspection | ||
45 | -enable_introspection=$found_introspection | ||
46 | -], | ||
47 | -[ | ||
48 | - AC_MSG_ERROR([invalid argument passed to --enable-introspection, should be one of @<:@no/auto/yes@:>@]) | ||
49 | -]) | ||
50 | +GOBJECT_INTROSPECTION_CHECK([1.46.0]) | ||
51 | |||
52 | -AC_MSG_RESULT([$found_introspection]) | ||
53 | - | ||
54 | -INTROSPECTION_SCANNER= | ||
55 | -INTROSPECTION_COMPILER= | ||
56 | -INTROSPECTION_GENERATE= | ||
57 | -INTROSPECTION_GIRDIR= | ||
58 | -INTROSPECTION_TYPELIBDIR= | ||
59 | -if test "x$found_introspection" = "xyes"; then | ||
60 | - INTROSPECTION_SCANNER=`$PKG_CONFIG --variable=g_ir_scanner gobject-introspection-1.0` | ||
61 | - INTROSPECTION_COMPILER=`$PKG_CONFIG --variable=g_ir_compiler gobject-introspection-1.0` | ||
62 | - INTROSPECTION_GENERATE=`$PKG_CONFIG --variable=g_ir_generate gobject-introspection-1.0` | ||
63 | - INTROSPECTION_GIRDIR=`$PKG_CONFIG --variable=girdir gobject-introspection-1.0` | ||
64 | - INTROSPECTION_TYPELIBDIR="$($PKG_CONFIG --variable=typelibdir gobject-introspection-1.0)" | ||
65 | - INTROSPECTION_CFLAGS=`$PKG_CONFIG --cflags gobject-introspection-1.0` | ||
66 | - INTROSPECTION_LIBS=`$PKG_CONFIG --libs gobject-introspection-1.0` | ||
67 | - INTROSPECTION_MAKEFILE=`$PKG_CONFIG --variable=datadir gobject-introspection-1.0`/gobject-introspection-1.0/Makefile.introspection | ||
68 | -fi | ||
69 | -AC_SUBST(INTROSPECTION_SCANNER) | ||
70 | -AC_SUBST(INTROSPECTION_COMPILER) | ||
71 | -AC_SUBST(INTROSPECTION_GENERATE) | ||
72 | -AC_SUBST(INTROSPECTION_GIRDIR) | ||
73 | -AC_SUBST(INTROSPECTION_TYPELIBDIR) | ||
74 | -AC_SUBST(INTROSPECTION_CFLAGS) | ||
75 | -AC_SUBST(INTROSPECTION_LIBS) | ||
76 | -AC_SUBST(INTROSPECTION_MAKEFILE) | ||
77 | - | ||
78 | -AM_CONDITIONAL(HAVE_INTROSPECTION, test "x$found_introspection" = "xyes") | ||
79 | dnl we need to change the install directories for distcheck | ||
80 | AC_ARG_WITH([gir-dir], | ||
81 | AS_HELP_STRING( | ||
82 | -- | ||
83 | 2.7.0 | ||
84 | |||
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 cc81b1fc0..000000000 --- a/meta-gnome/recipes-gnome/gnumeric/gnumeric/do-not-use-srcdir.patch +++ /dev/null | |||
@@ -1,15 +0,0 @@ | |||
1 | Index: gnumeric-1.12.0/test/Makefile.am | ||
2 | =================================================================== | ||
3 | --- gnumeric-1.12.0.orig/test/Makefile.am 2011-05-17 17:54:24.000000000 -0700 | ||
4 | +++ gnumeric-1.12.0/test/Makefile.am 2013-10-17 20:28:19.920618596 -0700 | ||
5 | @@ -25,7 +25,9 @@ | ||
6 | # | ||
7 | # 90xx: Misc stuff. | ||
8 | |||
9 | -TESTS = $(sort $(wildcard $(srcdir)/t[0-9][0-9][0-9][0-9]-*.pl)) | ||
10 | +TESTS_EXTENSIONS=.pl | ||
11 | +TESTS = @auto_find_tests@ | ||
12 | + | ||
13 | SUPPS = common.supp commondots.supp gui.supp t8003-valgrind-pdf.supp | ||
14 | |||
15 | 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 49d0fe9d4..000000000 --- a/meta-gnome/recipes-gnome/gnumeric/gnumeric_1.12.0.bb +++ /dev/null | |||
@@ -1,49 +0,0 @@ | |||
1 | LICENSE = "GPLv2 | GPLv3" | ||
2 | LIC_FILES_CHKSUM = "file://COPYING;md5=be0de417af78dd340558810d1ced52e6" | ||
3 | SECTION = "x11/utils" | ||
4 | S = "${WORKDIR}/gnumeric-${PV}" | ||
5 | DEPENDS = "gdk-pixbuf libgsf gtk+3 libxml2 libglade libart-lgpl intltool-native libgnomecanvas libgnomeprint libbonoboui orbit2-native goffice" | ||
6 | SUMMARY = "Gnumeric spreadsheet for GNOME" | ||
7 | |||
8 | GNOME_COMPRESS_TYPE = "xz" | ||
9 | |||
10 | inherit gnome pythonnative gobject-introspection | ||
11 | |||
12 | SRC_URI += "file://do-not-use-srcdir.patch \ | ||
13 | file://0001-configure.in-drop-introspection-macros-replace-them-.patch" | ||
14 | |||
15 | SRC_URI[archive.md5sum] = "3fd87cca95334b5d8ac922989670fe27" | ||
16 | SRC_URI[archive.sha256sum] = "037b53d909e5d1454b2afda8c4fb1e7838e260343e36d4e36245f4a5d0e04111" | ||
17 | |||
18 | |||
19 | EXTRA_OECONF=" --without-perl " | ||
20 | |||
21 | PACKAGES_DYNAMIC += "gnumeric-plugin-*" | ||
22 | PACKAGES += "libspreadsheet libspreadsheet-dev gnumeric-goffice gnumeric-goffice-dbg" | ||
23 | |||
24 | FILES_${PN}-dbg += "${libdir}/gnumeric/${PV}/plugins/*/.debug" | ||
25 | FILES_${PN}-dev = "${includedir} ${libdir}/pkgconfig" | ||
26 | FILES_${PN}-staticdev = "${libdir}/libspreadsheet.la" | ||
27 | FILES_libspreadsheet = "${libdir}/libspreadsheet-${PV}.so" | ||
28 | FILES_libspreadsheet-dev = "${libdir}/libspreadsheet.so" | ||
29 | FILES_gnumeric-goffice-dbg += "${libdir}/goffice/*/plugins/gnumeric/.debug" | ||
30 | FILES_gnumeric-goffice = "${libdir}/goffice/*/plugins/gnumeric/*" | ||
31 | |||
32 | # This hack works around the problem mentioned here: | ||
33 | # https://mail.gnome.org/archives/gnumeric-list/2010-February/msg00006.html | ||
34 | do_install_prepend() { | ||
35 | sed -i ${B}/doc/C/Makefile -e 's/\tfor file in $(omffile); do/\t-for file in $(omffile); do/' | ||
36 | } | ||
37 | |||
38 | python populate_packages_prepend () { | ||
39 | gnumeric_libdir = bb.data.expand('${libdir}/gnumeric/${PV}/plugins', d) | ||
40 | |||
41 | do_split_packages(d, gnumeric_libdir, '^(.*)/.*$', | ||
42 | output_pattern='gnumeric-plugin-%s', | ||
43 | description='Gnumeric plugin %s', | ||
44 | extra_depends='', | ||
45 | recursive=True, | ||
46 | prepend=True) | ||
47 | } | ||
48 | |||
49 | 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 d116968a6..000000000 --- a/meta-gnome/recipes-gnome/gthumb/files/0001-Drop-help-directory-from-build.patch +++ /dev/null | |||
@@ -1,25 +0,0 @@ | |||
1 | From 48cb878cb724e7a509260f014db6365510b8b541 Mon Sep 17 00:00:00 2001 | ||
2 | From: Alexander Kanavin <alex.kanavin@gmail.com> | ||
3 | Date: Tue, 17 May 2016 14:05:29 +0300 | ||
4 | Subject: [PATCH] Drop help directory from build | ||
5 | |||
6 | It hardcodes the use of xml2po tool form gnome-doc-utils | ||
7 | |||
8 | Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> | ||
9 | --- | ||
10 | Makefile.am | 2 +- | ||
11 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
12 | |||
13 | diff --git a/Makefile.am b/Makefile.am | ||
14 | index d056875..3fc4a41 100644 | ||
15 | --- a/Makefile.am | ||
16 | +++ b/Makefile.am | ||
17 | @@ -1,4 +1,4 @@ | ||
18 | -SUBDIRS = m4 copy-n-paste data po gthumb extensions tests help | ||
19 | +SUBDIRS = m4 copy-n-paste data po gthumb extensions tests | ||
20 | |||
21 | ACLOCAL_AMFLAGS = -I m4 | ||
22 | AMCFLAGS = -fPIC -DPIC | ||
23 | -- | ||
24 | 2.8.1 | ||
25 | |||
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 20ce5c5aa..000000000 --- a/meta-gnome/recipes-gnome/gthumb/files/parallel.patch +++ /dev/null | |||
@@ -1,158 +0,0 @@ | |||
1 | From 34969cde1dcb7740b4a7c3b6e3d04d481e5980b5 Mon Sep 17 00:00:00 2001 | ||
2 | From: Ross Burton <ross.burton@intel.com> | ||
3 | Date: Tue, 31 Jul 2012 17:26:27 +0100 | ||
4 | Subject: [PATCH] build: Fix parallel build problems with enum generation | ||
5 | |||
6 | This is a backport from a patch against master. | ||
7 | |||
8 | Upstream-Status: Submitted [https://bugzilla.gnome.org/show_bug.cgi?id=680925] | ||
9 | --- | ||
10 | extensions/file_tools/Makefile.am | 10 ++++------ | ||
11 | extensions/importer/Makefile.am | 10 ++++------ | ||
12 | extensions/pixbuf_savers/Makefile.am | 10 ++++------ | ||
13 | gthumb/Makefile.am | 10 ++++------ | ||
14 | 4 files changed, 16 insertions(+), 24 deletions(-) | ||
15 | |||
16 | diff --git a/extensions/file_tools/Makefile.am b/extensions/file_tools/Makefile.am | ||
17 | index 7785eff..d70a8a5 100644 | ||
18 | --- a/extensions/file_tools/Makefile.am | ||
19 | +++ b/extensions/file_tools/Makefile.am | ||
20 | @@ -24,17 +24,16 @@ HEADER_FILES = \ | ||
21 | gth-file-tool-undo.h \ | ||
22 | preferences.h | ||
23 | |||
24 | -enum-types.h: $(HEADER_FILES) $(GLIB_MKENUMS) | ||
25 | +enum-types.h: $(HEADER_FILES) | ||
26 | $(AM_V_GEN)( $(GLIB_MKENUMS) \ | ||
27 | --fhead "#ifndef ENUM_TYPES_H\n#define ENUM_TYPES_H\n\n#include <glib-object.h>\n\nG_BEGIN_DECLS\n" \ | ||
28 | --fprod "/* enumerations from \"@filename@\" */\n" \ | ||
29 | --vhead "GType @enum_name@_get_type (void);\n#define GTH_TYPE_@ENUMSHORT@ (@enum_name@_get_type())\n" \ | ||
30 | --ftail "G_END_DECLS\n\n#endif /* ENUM_TYPES_H */" \ | ||
31 | $^> xgen-$(@F) \ | ||
32 | - && (cmp -s xgen-$(@F) enum-types.h || cp xgen-$(@F) enum-types.h ) \ | ||
33 | - && rm -f xgen-$(@F) ) | ||
34 | + && mv -f xgen-$(@F) enum-types.h ) | ||
35 | |||
36 | -enum-types.c: $(HEADER_FILES) enum-types.h | ||
37 | +enum-types.c: $(HEADER_FILES) | ||
38 | $(AM_V_GEN)( $(GLIB_MKENUMS) \ | ||
39 | --fhead "#include <glib-object.h>\n" \ | ||
40 | --fprod "\n/* enumerations from \"@filename@\" */\n#include \"@filename@\"" \ | ||
41 | @@ -42,8 +41,7 @@ enum-types.c: $(HEADER_FILES) enum-types.h | ||
42 | --vprod " { @VALUENAME@, \"@VALUENAME@\", \"@valuenick@\" }," \ | ||
43 | --vtail " { 0, NULL, NULL }\n };\n etype = g_@type@_register_static (\"@EnumName@\", values);\n }\n return etype;\n}\n" \ | ||
44 | $^> xgen-$(@F) \ | ||
45 | - && (cmp -s xgen-$(@F) enum-types.c || cp xgen-$(@F) enum-types.c ) \ | ||
46 | - && rm -f xgen-$(@F) ) | ||
47 | + && mv -f xgen-$(@F) enum-types.c ) | ||
48 | |||
49 | libfile_tools_la_SOURCES = \ | ||
50 | $(ENUM_TYPES) \ | ||
51 | diff --git a/extensions/importer/Makefile.am b/extensions/importer/Makefile.am | ||
52 | index 29e7f2c..07c1eba 100644 | ||
53 | --- a/extensions/importer/Makefile.am | ||
54 | +++ b/extensions/importer/Makefile.am | ||
55 | @@ -14,17 +14,16 @@ HEADER_FILES = \ | ||
56 | preferences.h \ | ||
57 | utils.h | ||
58 | |||
59 | -gth-import-enum-types.h: $(HEADER_FILES) $(GLIB_MKENUMS) | ||
60 | +gth-import-enum-types.h: $(HEADER_FILES) | ||
61 | $(AM_V_GEN)( $(GLIB_MKENUMS) \ | ||
62 | --fhead "#ifndef ENUM_TYPES_H\n#define ENUM_TYPES_H\n\n#include <glib-object.h>\n\nG_BEGIN_DECLS\n" \ | ||
63 | --fprod "/* enumerations from \"@filename@\" */\n" \ | ||
64 | --vhead "GType @enum_name@_get_type (void);\n#define GTH_TYPE_@ENUMSHORT@ (@enum_name@_get_type())\n" \ | ||
65 | --ftail "G_END_DECLS\n\n#endif /* ENUM_TYPES_H */" \ | ||
66 | $^> xgen-$(@F) \ | ||
67 | - && (cmp -s xgen-$(@F) gth-import-enum-types.h || cp xgen-$(@F) gth-import-enum-types.h ) \ | ||
68 | - && rm -f xgen-$(@F) ) | ||
69 | + && mv -f xgen-$(@F) gth-import-enum-types.h ) | ||
70 | |||
71 | -gth-import-enum-types.c: $(HEADER_FILES) gth-import-enum-types.h | ||
72 | +gth-import-enum-types.c: $(HEADER_FILES) | ||
73 | $(AM_V_GEN)( $(GLIB_MKENUMS) \ | ||
74 | --fhead "#include <glib-object.h>\n" \ | ||
75 | --fprod "\n/* enumerations from \"@filename@\" */\n#include \"@filename@\"" \ | ||
76 | @@ -32,8 +31,7 @@ gth-import-enum-types.c: $(HEADER_FILES) gth-import-enum-types.h | ||
77 | --vprod " { @VALUENAME@, \"@VALUENAME@\", \"@valuenick@\" }," \ | ||
78 | --vtail " { 0, NULL, NULL }\n };\n etype = g_@type@_register_static (\"@EnumName@\", values);\n }\n return etype;\n}\n" \ | ||
79 | $^> xgen-$(@F) \ | ||
80 | - && (cmp -s xgen-$(@F) gth-import-enum-types.c || cp xgen-$(@F) gth-import-enum-types.c ) \ | ||
81 | - && rm -f xgen-$(@F) ) | ||
82 | + && mv -f xgen-$(@F) gth-import-enum-types.c ) | ||
83 | |||
84 | libimporter_la_SOURCES = \ | ||
85 | $(ENUM_TYPES) \ | ||
86 | diff --git a/extensions/pixbuf_savers/Makefile.am b/extensions/pixbuf_savers/Makefile.am | ||
87 | index bfe9f34..4764c32 100644 | ||
88 | --- a/extensions/pixbuf_savers/Makefile.am | ||
89 | +++ b/extensions/pixbuf_savers/Makefile.am | ||
90 | @@ -10,17 +10,16 @@ ENUM_TYPES = \ | ||
91 | HEADER_FILES = \ | ||
92 | preferences.h | ||
93 | |||
94 | -enum-types.h: $(HEADER_FILES) $(GLIB_MKENUMS) | ||
95 | +enum-types.h: $(HEADER_FILES) | ||
96 | $(AM_V_GEN)( $(GLIB_MKENUMS) \ | ||
97 | --fhead "#ifndef ENUM_TYPES_H\n#define ENUM_TYPES_H\n\n#include <glib-object.h>\n\nG_BEGIN_DECLS\n" \ | ||
98 | --fprod "/* enumerations from \"@filename@\" */\n" \ | ||
99 | --vhead "GType @enum_name@_get_type (void);\n#define GTH_TYPE_@ENUMSHORT@ (@enum_name@_get_type())\n" \ | ||
100 | --ftail "G_END_DECLS\n\n#endif /* ENUM_TYPES_H */" \ | ||
101 | $^> xgen-$(@F) \ | ||
102 | - && (cmp -s xgen-$(@F) enum-types.h || cp xgen-$(@F) enum-types.h ) \ | ||
103 | - && rm -f xgen-$(@F) ) | ||
104 | + && mv -f xgen-$(@F) enum-types.h ) | ||
105 | |||
106 | -enum-types.c: $(HEADER_FILES) enum-types.h | ||
107 | +enum-types.c: $(HEADER_FILES) | ||
108 | $(AM_V_GEN)( $(GLIB_MKENUMS) \ | ||
109 | --fhead "#include <glib-object.h>\n" \ | ||
110 | --fprod "\n/* enumerations from \"@filename@\" */\n#include \"@filename@\"" \ | ||
111 | @@ -28,8 +27,7 @@ enum-types.c: $(HEADER_FILES) enum-types.h | ||
112 | --vprod " { @VALUENAME@, \"@VALUENAME@\", \"@valuenick@\" }," \ | ||
113 | --vtail " { 0, NULL, NULL }\n };\n etype = g_@type@_register_static (\"@EnumName@\", values);\n }\n return etype;\n}\n" \ | ||
114 | $^> xgen-$(@F) \ | ||
115 | - && (cmp -s xgen-$(@F) enum-types.c || cp xgen-$(@F) enum-types.c ) \ | ||
116 | - && rm -f xgen-$(@F) ) | ||
117 | + && mv -f xgen-$(@F) enum-types.c ) | ||
118 | |||
119 | libpixbuf_savers_la_SOURCES = \ | ||
120 | $(ENUM_TYPES) \ | ||
121 | diff --git a/gthumb/Makefile.am b/gthumb/Makefile.am | ||
122 | index e9e385e..2f14e03 100644 | ||
123 | --- a/gthumb/Makefile.am | ||
124 | +++ b/gthumb/Makefile.am | ||
125 | @@ -296,17 +296,16 @@ gthumb_CFLAGS = \ | ||
126 | -DGTHUMB_EXTENSIONS_DIR=\"$(extensions_dir)\" \ | ||
127 | $(NULL) | ||
128 | |||
129 | -gth-enum-types.h: $(PUBLIC_HEADER_FILES) $(GLIB_MKENUMS) | ||
130 | +gth-enum-types.h: $(PUBLIC_HEADER_FILES) | ||
131 | $(AM_V_GEN)( $(GLIB_MKENUMS) \ | ||
132 | --fhead "#ifndef GTH_ENUM_TYPES_H\n#define GTH_ENUM_TYPES_H\n\n#include <glib-object.h>\n\nG_BEGIN_DECLS\n" \ | ||
133 | --fprod "/* enumerations from \"@filename@\" */\n" \ | ||
134 | --vhead "GType @enum_name@_get_type (void);\n#define GTH_TYPE_@ENUMSHORT@ (@enum_name@_get_type())\n" \ | ||
135 | --ftail "G_END_DECLS\n\n#endif /* GTH_ENUM_TYPES_H */" \ | ||
136 | $^> xgen-$(@F) \ | ||
137 | - && (cmp -s xgen-$(@F) gth-enum-types.h || cp xgen-$(@F) gth-enum-types.h ) \ | ||
138 | - && rm -f xgen-$(@F) ) | ||
139 | + && mv -f xgen-$(@F) gth-enum-types.h ) | ||
140 | |||
141 | -gth-enum-types.c: $(PUBLIC_HEADER_FILES) gth-enum-types.h | ||
142 | +gth-enum-types.c: $(PUBLIC_HEADER_FILES) | ||
143 | $(AM_V_GEN)( $(GLIB_MKENUMS) \ | ||
144 | --fhead "#include <glib-object.h>\n" \ | ||
145 | --fprod "\n/* enumerations from \"@filename@\" */\n#include \"@filename@\"" \ | ||
146 | @@ -314,8 +313,7 @@ gth-enum-types.c: $(PUBLIC_HEADER_FILES) gth-enum-types.h | ||
147 | --vprod " { @VALUENAME@, \"@VALUENAME@\", \"@valuenick@\" }," \ | ||
148 | --vtail " { 0, NULL, NULL }\n };\n etype = g_@type@_register_static (\"@EnumName@\", values);\n }\n return etype;\n}\n" \ | ||
149 | $^> xgen-$(@F) \ | ||
150 | - && (cmp -s xgen-$(@F) gth-enum-types.c || cp xgen-$(@F) gth-enum-types.c ) \ | ||
151 | - && rm -f xgen-$(@F) ) | ||
152 | + && mv -f xgen-$(@F) gth-enum-types.c ) | ||
153 | |||
154 | gth-marshal.h: gth-marshal.list $(GLIB_GENMARSHAL) | ||
155 | $(AM_V_GEN)( $(GLIB_GENMARSHAL) $(srcdir)/gth-marshal.list --header --prefix=gth_marshal > $@ ) | ||
156 | -- | ||
157 | 1.7.10.4 | ||
158 | |||
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 62d3df98e..000000000 --- a/meta-gnome/recipes-gnome/gthumb/gthumb_2.12.4.bb +++ /dev/null | |||
@@ -1,35 +0,0 @@ | |||
1 | SUMMARY = "gThumb is an image viewer and browser for the GNOME Desktop" | ||
2 | SECTION = "x11/gnome" | ||
3 | LICENSE = "GPLv2" | ||
4 | LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552" | ||
5 | 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" | ||
6 | |||
7 | PR = "r4" | ||
8 | |||
9 | EXTRA_OECONF = "--disable-gnome-keyring --disable-libsoup --disable-exiv2 --disable-clutter" | ||
10 | |||
11 | inherit gnome pkgconfig | ||
12 | |||
13 | SRC_URI[archive.md5sum] = "97fc13221b0c5d80c27a2e25a3a3ac6f" | ||
14 | SRC_URI[archive.sha256sum] = "cf809695230ab8892a078be454a42ade865754c72ec1da7c3d74d4310de54f1d" | ||
15 | GNOME_COMPRESS_TYPE="bz2" | ||
16 | |||
17 | SRC_URI += "file://parallel.patch \ | ||
18 | file://0001-Drop-help-directory-from-build.patch" | ||
19 | |||
20 | do_configure_prepend () { | ||
21 | rm -f ${S}/m4/gnome-doc-utils.m4 | ||
22 | } | ||
23 | |||
24 | do_install_append () { | ||
25 | rm -f ${D}${libdir}/${BPN}/extensions/*.a | ||
26 | } | ||
27 | |||
28 | FILES_${PN} += "${datadir}/icons" | ||
29 | FILES_${PN} += "${libdir}/${BPN}/extensions/*.so \ | ||
30 | ${libdir}/${BPN}/extensions/*.extension" | ||
31 | FILES_${PN}-dev += "${libdir}/${BPN}/extensions/*.la" | ||
32 | FILES_${PN}-dbg += "${libdir}/${BPN}/extensions/.debug/" | ||
33 | |||
34 | |||
35 | 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 6920f0aa2..000000000 --- a/meta-gnome/recipes-gnome/gweather/libgweather3_3.0.2.bb +++ /dev/null | |||
@@ -1,28 +0,0 @@ | |||
1 | LICENSE = "GPLv2" | ||
2 | LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" | ||
3 | |||
4 | SECTION = "x11/gnome/libs" | ||
5 | DEPENDS = "libxml2 gconf libsoup-2.4 gtk+3" | ||
6 | |||
7 | PNBLACKLIST[libgweather3] ?= "CONFLICT: 876 files are conflicting with libgweather - the recipe will be removed on 2017-09-01 unless the issue is fixed" | ||
8 | # e.g. sysroots/qemux86-64/usr/share/libgweather/locations.dtd | ||
9 | # sysroots/qemux86-64/usr/share/libgweather/Locations.zh_TW.xml | ||
10 | |||
11 | BPN = "libgweather" | ||
12 | |||
13 | inherit gnome | ||
14 | SRC_URI[archive.md5sum] = "f1a96c6f19c9a0bc6b4e12acc9a8a85d" | ||
15 | SRC_URI[archive.sha256sum] = "9041526fa0466b99dae5cf06c2cc70376f25531eec5d58b1e1378acfb302410c" | ||
16 | |||
17 | do_configure_prepend() { | ||
18 | sed -i -e 's: doc : :g' ${S}/Makefile.am | ||
19 | } | ||
20 | |||
21 | FILES_${PN} += "${datadir}/gnome* \ | ||
22 | ${datadir}/icons" | ||
23 | |||
24 | PACKAGES =+ "${PN}-locationdata" | ||
25 | FILES_${PN}-locationdata = "${datadir}/libgweather/*ocations*" | ||
26 | |||
27 | |||
28 | |||
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 8b69f1fe7..000000000 --- a/meta-gnome/recipes-gnome/gweather/libgweather_2.30.3.bb +++ /dev/null | |||
@@ -1,24 +0,0 @@ | |||
1 | LICENSE = "GPLv2" | ||
2 | LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f" | ||
3 | |||
4 | SECTION = "x11/gnome/libs" | ||
5 | DEPENDS = "libxml2 gconf libsoup-2.4 gtk+ libgnome-keyring" | ||
6 | |||
7 | inherit gnome | ||
8 | |||
9 | SRC_URI[archive.md5sum] = "bf6a0a05051341ecb250f332e3edfb88" | ||
10 | SRC_URI[archive.sha256sum] = "b835374661423f37c46aa8e37368ae24a68856f117b7c21e475a21efdba5264c" | ||
11 | GNOME_COMPRESS_TYPE="bz2" | ||
12 | |||
13 | do_configure_prepend() { | ||
14 | sed -i -e 's: doc : :g' ${S}/Makefile.am | ||
15 | } | ||
16 | |||
17 | FILES_${PN} += "${datadir}/gnome* \ | ||
18 | ${datadir}/icons" | ||
19 | |||
20 | PACKAGES =+ "${PN}-locationdata" | ||
21 | FILES_${PN}-locationdata = "${datadir}/libgweather/Locations*" | ||
22 | |||
23 | # http://errors.yoctoproject.org/Errors/Details/68608/ | ||
24 | 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 0062cfb11..000000000 --- a/meta-gnome/recipes-gnome/nautilus/nautilus/idl-sysroot.patch +++ /dev/null | |||
@@ -1,7 +0,0 @@ | |||
1 | Index: nautilus-2.24.2/add-include-prefix | ||
2 | =================================================================== | ||
3 | --- nautilus-2.24.2.orig/add-include-prefix 2008-10-06 17:22:21.000000000 +0000 | ||
4 | +++ nautilus-2.24.2/add-include-prefix 2009-04-09 16:00:05.000000000 +0000 | ||
5 | @@ -1 +1 @@ | ||
6 | -sed -e 's/^/ /' -e 's/ */ /g' -e 's/ / -I /g' -e 's/ -I $//' | ||
7 | +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 43a6152d8..000000000 --- a/meta-gnome/recipes-gnome/nautilus/nautilus/no-G_DISABLE_DEPRECATED.patch +++ /dev/null | |||
@@ -1,44 +0,0 @@ | |||
1 | From e7233d98c114b03c7c8b96d1f41770452da14aa7 Mon Sep 17 00:00:00 2001 | ||
2 | From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmx.de> | ||
3 | Date: Mon, 17 Oct 2011 00:59:01 +0200 | ||
4 | Subject: [PATCH] nautilus build fails for newer glib versions | ||
5 | MIME-Version: 1.0 | ||
6 | Content-Type: text/plain; charset=UTF-8 | ||
7 | Content-Transfer-Encoding: 8bit | ||
8 | |||
9 | build with glib-2.0 v2.30.0 run into errors for at least G_CONST_RETURN missing | ||
10 | |||
11 | Signed-off-by: Andreas Müller <schnitzeltony@gmx.de> | ||
12 | --- | ||
13 | configure.in | 2 +- | ||
14 | eel/Makefile.am | 1 - | ||
15 | 2 files changed, 1 insertions(+), 2 deletions(-) | ||
16 | |||
17 | diff --git a/configure.in b/configure.in | ||
18 | index 97e171e..859a097 100644 | ||
19 | --- a/configure.in | ||
20 | +++ b/configure.in | ||
21 | @@ -342,7 +342,7 @@ AC_SUBST(CORE_CFLAGS) | ||
22 | CORE_LIBS="`$PKG_CONFIG --libs $CORE_MODULES` $x_libs" | ||
23 | AC_SUBST(CORE_LIBS) | ||
24 | |||
25 | -DISABLE_DEPRECATED_CFLAGS="-DG_DISABLE_DEPRECATED -DGDK_PIXBUF_DISABLE_DEPRECATED" | ||
26 | +DISABLE_DEPRECATED_CFLAGS="-DGDK_PIXBUF_DISABLE_DEPRECATED" | ||
27 | AC_SUBST(DISABLE_DEPRECATED_CFLAGS) | ||
28 | |||
29 | dnl Multimedia keys | ||
30 | diff --git a/eel/Makefile.am b/eel/Makefile.am | ||
31 | index b1fe356..c1d56cd 100644 | ||
32 | --- a/eel/Makefile.am | ||
33 | +++ b/eel/Makefile.am | ||
34 | @@ -10,7 +10,6 @@ INCLUDES = \ | ||
35 | -DDATADIR=\""$(datadir)"\" \ | ||
36 | -DSOURCE_DATADIR=\""$(top_srcdir)/data"\" \ | ||
37 | -DGNOMELOCALEDIR=\""$(prefix)/${DATADIRNAME}/locale"\" \ | ||
38 | - -DG_DISABLE_DEPRECATED \ | ||
39 | -DGDK_PIXBUF_DISABLE_DEPRECATED \ | ||
40 | -DGMENU_I_KNOW_THIS_IS_UNSTABLE \ | ||
41 | $(NULL) | ||
42 | -- | ||
43 | 1.7.4.4 | ||
44 | |||
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 5580f93a5..000000000 --- a/meta-gnome/recipes-gnome/nautilus/nautilus3_3.2.1.bb +++ /dev/null | |||
@@ -1,54 +0,0 @@ | |||
1 | # nautilus OE build file | ||
2 | # Copyright (C) 2005, Advanced Micro Devices, Inc. All Rights Reserved | ||
3 | # Released under the MIT license (see packages/COPYING) | ||
4 | |||
5 | LICENSE="GPLv2 & LGPLv2" | ||
6 | LIC_FILES_CHKSUM = "file://COPYING;md5=f08a446809913fc9b3c718f0eaea0426 \ | ||
7 | file://COPYING.LIB;md5=f30a9716ef3762e3467a2f62bf790f0a" | ||
8 | |||
9 | PR = "r4" | ||
10 | |||
11 | DEPENDS = "libnotify gtk+3 libunique gvfs librsvg libexif gnome-desktop3" | ||
12 | # optional: tracker | ||
13 | |||
14 | # to include nautilus3/no-try-run-strftime.diff before the rest | ||
15 | FILESEXTRAPATHS_prepend := "${THISDIR}/${BPN}:" | ||
16 | BPN = "nautilus" | ||
17 | inherit gnome | ||
18 | |||
19 | SRC_URI += "file://no-try-run-strftime.diff" | ||
20 | SRC_URI[archive.md5sum] = "12314328b59aa1dfd83619f718b81bd5" | ||
21 | SRC_URI[archive.sha256sum] = "c482d6e7babcc238304cf55586cdf7e2b2806025214a143ed355f0d89b33b154" | ||
22 | |||
23 | EXTRA_OECONF = " --disable-gtk-doc --disable-update-mimedb --enable-nst-extension" | ||
24 | export SYSROOT = "${STAGING_DIR_HOST}" | ||
25 | |||
26 | do_configure() { | ||
27 | sed -i -e /docs/d ${S}/Makefile.am | ||
28 | autotools_do_configure | ||
29 | } | ||
30 | |||
31 | RDEPENDS_${PN} = "gvfs gvfsd-ftp gvfsd-sftp gvfsd-trash glib-2.0-utils" | ||
32 | FILES_${PN} += "${datadir}/icons \ | ||
33 | /usr/libexec/ \ | ||
34 | ${datadir}/nautilus* \ | ||
35 | ${datadir}/dbus-1 \ | ||
36 | ${libdir}/nautilus/extensions*/*.so \ | ||
37 | " | ||
38 | FILES_${PN}-dbg += "/usr/libexec/.debug \ | ||
39 | ${libdir}/nautilus/extensions*/.debug" | ||
40 | |||
41 | # Don't make nautils drag us in | ||
42 | PRIVATE_LIBS = "libnautilus-extension.so.1" | ||
43 | |||
44 | pkg_postinst_${PN} () { | ||
45 | if [ -n "$D" ]; then | ||
46 | exit 1 | ||
47 | fi | ||
48 | |||
49 | glib-compile-schemas ${datadir}/glib-2.0/schemas | ||
50 | } | ||
51 | |||
52 | # 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 | ||
53 | # 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) | ||
54 | 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 caf7f57b1..000000000 --- a/meta-gnome/recipes-gnome/nautilus/nautilus_2.32.2.bb +++ /dev/null | |||
@@ -1,43 +0,0 @@ | |||
1 | # nautilus OE build file | ||
2 | # Copyright (C) 2005, Advanced Micro Devices, Inc. All Rights Reserved | ||
3 | # Released under the MIT license (see packages/COPYING) | ||
4 | |||
5 | LICENSE="GPLv2 & LGPLv2" | ||
6 | LIC_FILES_CHKSUM = "file://COPYING;md5=7c0048536e43642a1f3a724c2909872b \ | ||
7 | file://COPYING.LIB;md5=f30a9716ef3762e3467a2f62bf790f0a" | ||
8 | |||
9 | PR = "r6" | ||
10 | |||
11 | DEPENDS = "gdk-pixbuf gtk+ libunique gvfs librsvg libexif esound gnome-desktop orbit2-native" | ||
12 | # optional: tracker | ||
13 | |||
14 | inherit gnome gobject-introspection | ||
15 | |||
16 | SRC_URI[archive.md5sum] = "51565aa10d1625dff56e381228346911" | ||
17 | SRC_URI[archive.sha256sum] = "2d4ff28c7a7aa5d40eb2468149954a564c257a305183773057584d22d15347a2" | ||
18 | GNOME_COMPRESS_TYPE="bz2" | ||
19 | |||
20 | SRC_URI += "file://idl-sysroot.patch \ | ||
21 | file://no-try-run-strftime.diff \ | ||
22 | file://no-G_DISABLE_DEPRECATED.patch \ | ||
23 | " | ||
24 | |||
25 | |||
26 | EXTRA_OECONF = " --disable-gtk-doc --disable-update-mimedb " | ||
27 | export SYSROOT = "${STAGING_DIR_HOST}" | ||
28 | |||
29 | do_configure() { | ||
30 | sed -i -e /docs/d ${S}/Makefile.am | ||
31 | autotools_do_configure | ||
32 | # We need native orbit-idl with target idl files. No way to say it in a clean way: | ||
33 | find ${B} -name Makefile -exec sed -i '/\/usr\/bin\/orbit-idl-2/{s:/usr/bin:${STAGING_BINDIR_NATIVE}:;s:/usr/share:${STAGING_DATADIR}:g}' {} \; | ||
34 | } | ||
35 | |||
36 | RDEPENDS_${PN} = "gvfs gvfsd-ftp gvfsd-sftp gvfsd-trash glib-networking" | ||
37 | FILES_${PN} += "${datadir}/icons" | ||
38 | |||
39 | # Don't make nautils3 drag us in | ||
40 | PRIVATE_LIBS = "libnautilus-extension.so.1" | ||
41 | |||
42 | |||
43 | 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 fedd22332..000000000 --- a/meta-gnome/recipes-gnome/pimlico/contacts.inc +++ /dev/null | |||
@@ -1,28 +0,0 @@ | |||
1 | DESCRIPTION = "Address-book application." | ||
2 | HOMEPAGE = "http://pimlico-project.org/contacts.html" | ||
3 | BUGTRACKER = "https://bugzilla.gnome.org/" | ||
4 | |||
5 | LICENSE = "GPLv2 & GPLv2+ & GPLv3+ " | ||
6 | SECTION = "x11" | ||
7 | DEPENDS = "glib-2.0 gtk+ evolution-data-server intltool-native" | ||
8 | RDEPENDS_${PN} = "libedata-book" | ||
9 | |||
10 | inherit autotools pkgconfig gconf | ||
11 | |||
12 | EXTRA_OECONF += "--disable-gnome-vfs" | ||
13 | EXTRA_OEMAKE += "GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1" | ||
14 | |||
15 | do_install_append () { | ||
16 | install -d ${D}/${datadir}/pixmaps | ||
17 | install -m 0644 ${WORKDIR}/stock_contact.png ${D}/${datadir}/pixmaps | ||
18 | install -m 0644 ${WORKDIR}/stock_person.png ${D}/${datadir}/pixmaps | ||
19 | } | ||
20 | |||
21 | FILES_${PN} += "${datadir}/pixmaps/stock_contact.png \ | ||
22 | ${datadir}/pixmaps/stock_person.png \ | ||
23 | ${datadir}/icons/hicolor" | ||
24 | |||
25 | SRC_URI = "file://stock_contact.png \ | ||
26 | file://stock_person.png \ | ||
27 | file://contacts-conditionally-install-schema.patch \ | ||
28 | " | ||
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 2ab7882c8..000000000 --- a/meta-gnome/recipes-gnome/pimlico/contacts/contacts-conditionally-install-schema.patch +++ /dev/null | |||
@@ -1,37 +0,0 @@ | |||
1 | Install schema should respect to GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL | ||
2 | |||
3 | If GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL is set, the schema should not | ||
4 | be installed. | ||
5 | |||
6 | Signed-off-by: Robert Yang <liezhi.yang@windriver.com> | ||
7 | |||
8 | Upstream-Status: Pending | ||
9 | --- | ||
10 | data/Makefile.am | 7 ++++--- | ||
11 | 1 files changed, 4 insertions(+), 3 deletions(-) | ||
12 | |||
13 | diff --git a/data/Makefile.am b/data/Makefile.am | ||
14 | index f790823..b6fd643 100644 | ||
15 | --- a/data/Makefile.am | ||
16 | +++ b/data/Makefile.am | ||
17 | @@ -14,13 +14,14 @@ dist_man1_MANS = contacts.1 | ||
18 | |||
19 | if HAVE_GCONF | ||
20 | install-data-local: | ||
21 | - GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) \ | ||
22 | + if [ "$(GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL)" != "1" ]; then \ | ||
23 | + GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) \ | ||
24 | $(GCONFTOOL) --makefile-install-rule $(schema_DATA) || \ | ||
25 | (echo ;\ | ||
26 | echo "*****************************************************"; \ | ||
27 | echo "Installation of schemas failed, install them manually"; \ | ||
28 | - echo "*****************************************************";) | ||
29 | - @true | ||
30 | + echo "*****************************************************";); \ | ||
31 | + fi | ||
32 | endif | ||
33 | |||
34 | CLEANFILES = $(desktop_DATA) | ||
35 | -- | ||
36 | 1.7.7.6 | ||
37 | |||
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 a7cfee3a0..000000000 --- a/meta-gnome/recipes-gnome/pimlico/contacts/make-382.patch +++ /dev/null | |||
@@ -1,16 +0,0 @@ | |||
1 | Fix for stricter parser in make 3.82. This fix has been pushed to upstream git. | ||
2 | |||
3 | JL - 15/12/10 | ||
4 | |||
5 | Upstream-Status: Accepted | ||
6 | |||
7 | Index: git/Makefile.am | ||
8 | =================================================================== | ||
9 | --- git.orig/Makefile.am | ||
10 | +++ git/Makefile.am | ||
11 | @@ -11,4 +11,4 @@ DISTCLEANFILES = $(INTLTOOL_BUILT) | ||
12 | MAINTAINERCLEANFILES = aclocal.m4 compile config.guess config.sub configure depcomp $(INTLTOOL_BUILT:=.in) install-sh ltmain.sh mkinstalldirs Makefile.in missing | ||
13 | |||
14 | snapshot: | ||
15 | - $(MAKE) dist distdir=$(PACKAGE)-snap`date +"%Y%m%d"` | ||
16 | + $(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 516cf93e4..000000000 --- a/meta-gnome/recipes-gnome/pimlico/contacts_0.9.bb +++ /dev/null | |||
@@ -1,20 +0,0 @@ | |||
1 | require contacts.inc | ||
2 | |||
3 | PR = "r8" | ||
4 | |||
5 | SRC_URI =+ "http://pimlico-project.org/sources/${BPN}/${BPN}-${PV}.tar.gz" | ||
6 | |||
7 | SRC_URI[md5sum] = "aab5affbf93d6fa7b978b323a8d44de0" | ||
8 | SRC_URI[sha256sum] = "9cacec98f8123993033aaa255f3f4c04c86a1be65e487dd21f0aaa54384a6f6d" | ||
9 | |||
10 | LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \ | ||
11 | file://src/contacts-main.h;endline=18;md5=0371af46fbc72e33575e0072dca5fb19 \ | ||
12 | file://src/contacts-dbus.c;endline=18;md5=e4da9ac1a0539fafc7df431010904fd5 \ | ||
13 | file://src/contacts-gtk.c;endline=21;md5=1c2e3f55b215635eff4ba76f7696f8ee" | ||
14 | |||
15 | do_configure_prepend () { | ||
16 | # It used 8 spaces to instead of a tab, but it doesn't work for us | ||
17 | sed -i 's/^ $(MAKE) dist distdir=/\t$(MAKE) dist distdir/' Makefile.am | ||
18 | } | ||
19 | |||
20 | 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 b46e9d9db..000000000 --- a/meta-gnome/recipes-gnome/pimlico/contacts_git.bb +++ /dev/null | |||
@@ -1,19 +0,0 @@ | |||
1 | require contacts.inc | ||
2 | |||
3 | LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \ | ||
4 | file://src/contacts-main.h;endline=20;md5=9dc3531c914fb6d6d4a8d1aee4519fef \ | ||
5 | file://src/contacts-dbus.c;endline=20;md5=95e02d77f155fbd07a14dba3348b9b03 \ | ||
6 | file://src/contacts-gtk.c;endline=23;md5=e1ee9b9e72045f2d3aa44cf17313b46e" | ||
7 | |||
8 | SRCREV = "19853893fdb595de6aa59db0d9dc2f9451ed2933" | ||
9 | PV = "0.12+git${SRCPV}" | ||
10 | PR = "r4" | ||
11 | |||
12 | S = "${WORKDIR}/git" | ||
13 | |||
14 | SRC_URI =+ "git://git.gnome.org/${BPN} \ | ||
15 | file://make-382.patch" | ||
16 | |||
17 | S = "${WORKDIR}/git" | ||
18 | |||
19 | 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 f8217dc3a..000000000 --- a/meta-gnome/recipes-gnome/pimlico/tasks.inc +++ /dev/null | |||
@@ -1,10 +0,0 @@ | |||
1 | DESCRIPTION = "Task list application" | ||
2 | HOMEPAGE = "http://pimlico-project.org/tasks.html" | ||
3 | BUGTRACKER = "https://bugzilla.gnome.org/" | ||
4 | |||
5 | LICENSE = "GPLv2 & GPLv2+" | ||
6 | |||
7 | SECTION = "x11" | ||
8 | DEPENDS = "glib-2.0 gtk+ evolution-data-server intltool-native" | ||
9 | |||
10 | 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 42c20c47e..000000000 --- a/meta-gnome/recipes-gnome/pimlico/tasks_0.19.bb +++ /dev/null | |||
@@ -1,16 +0,0 @@ | |||
1 | require tasks.inc | ||
2 | |||
3 | LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \ | ||
4 | file://src/gtk/main.c;endline=19;md5=8659d0b7fd68a2ad6ac30c6539ea5b82 \ | ||
5 | file://src/omoko/openmoko-tasks.c;endline=20;md5=04d56a46863c9f4247694f40257a836a \ | ||
6 | file://src/hildon/hildon-tasks.c;endline=21;md5=488ddf31dc14b2196dec7cc736211b52" | ||
7 | |||
8 | SRC_URI = "http://pimlico-project.org/sources/${BPN}/${BPN}-${PV}.tar.gz" | ||
9 | |||
10 | SRC_URI[md5sum] = "0afd969758561599fd782e1effb39c08" | ||
11 | SRC_URI[sha256sum] = "1a7fdc5f95a2193a1a25fdb13f071867fb7e42245ce19ccee4bcccb69e557f2e" | ||
12 | |||
13 | PR = "r3" | ||
14 | |||
15 | # tasks-0.19/libkoto/koto-utils.c:81:3: error: format not a string literal, argument types not checked [-Werror=format-nonliteral] | ||
16 | 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 b71f1dc5b..000000000 --- a/meta-gnome/recipes-gnome/pimlico/tasks_git.bb +++ /dev/null | |||
@@ -1,12 +0,0 @@ | |||
1 | require tasks.inc | ||
2 | |||
3 | SRC_URI = "git://git.gnome.org/${BPN}" | ||
4 | |||
5 | SRCREV = "ea52d46d691c5fce4473ea4e24a35411381f3a65" | ||
6 | PV = "0.13+git${SRCPV}" | ||
7 | PR = "r3" | ||
8 | |||
9 | S = "${WORKDIR}/git" | ||
10 | |||
11 | # ../../git/libkoto/koto-utils.c:81:3: error: format not a string literal, argument types not checked [-Werror=format-nonliteral] | ||
12 | 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 cb03fd86e..000000000 --- a/meta-gnome/recipes-gnome/system-tools/system-tools-backends-2.10.2/add-angstrom-distro.patch +++ /dev/null | |||
@@ -1,41 +0,0 @@ | |||
1 | From b5084616a3bc2a0d485f43aeae69c6025f3f857e Mon Sep 17 00:00:00 2001 | ||
2 | From: Koen Kooi <koen@dominion.thruhere.net> | ||
3 | Date: Fri, 10 Jun 2011 18:44:21 +0200 | ||
4 | Subject: [PATCH] add support for the angstrom distribtion | ||
5 | |||
6 | Signed-off-by: Koen Kooi <koen@dominion.thruhere.net> | ||
7 | --- | ||
8 | Utils/Platform.pm | 3 +++ | ||
9 | 1 files changed, 3 insertions(+), 0 deletions(-) | ||
10 | |||
11 | diff --git a/Utils/Platform.pm b/Utils/Platform.pm | ||
12 | index fc76360..8b8c770 100644 | ||
13 | --- a/Utils/Platform.pm | ||
14 | +++ b/Utils/Platform.pm | ||
15 | @@ -92,6 +92,7 @@ my $PLATFORM_INFO = { | ||
16 | "nexenta-1.0" => [ "Nexenta GNU/Solaris", "1.0", "Ellate" ], | ||
17 | "yellowdog-4.1" => [ "Yellow Dog Linux", "4.1", "Sagitta" ], | ||
18 | "guadalinex-v4" => [ "Guadalinex", "v4", "Toro" ], | ||
19 | + "angstrom" => [ "Angstrom", "", "" ], | ||
20 | }; | ||
21 | |||
22 | sub get_platform_info | ||
23 | @@ -143,6 +144,7 @@ sub ensure_distro_map | ||
24 | "vine-3.1" => "vine-3.0", | ||
25 | "vlos-1.2" => "gentoo", | ||
26 | "nexenta-1.0" => "solaris-2.11", | ||
27 | + "angstrom" => "debian", | ||
28 | ); | ||
29 | |||
30 | return $metamap{$distro} if ($metamap{$distro}); | ||
31 | @@ -375,6 +377,7 @@ sub guess | ||
32 | [ \&check_ark ], | ||
33 | [ \&check_yoper ], | ||
34 | [ \&check_distro_file, "/etc/yellowdog-release", "yellowdog", "^Yellow Dog Linux release (\\S+)" ], | ||
35 | + [ \&check_file_exists, "/etc/angstrom-version", "angstrom" ], | ||
36 | ], | ||
37 | "FreeBSD" => [[ \&check_freebsd ]], | ||
38 | "SunOS" => [[ \&check_solaris ]] | ||
39 | -- | ||
40 | 1.6.6.1 | ||
41 | |||
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 862c0ea30..000000000 --- a/meta-gnome/recipes-gnome/system-tools/system-tools-backends_2.10.2.bb +++ /dev/null | |||
@@ -1,54 +0,0 @@ | |||
1 | SUMMARY = "gnome system tools backends" | ||
2 | LICENSE = "GPLv3" | ||
3 | LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504" | ||
4 | |||
5 | DEPENDS = "dbus dbus-glib glib-2.0 polkit" | ||
6 | |||
7 | inherit gnome pkgconfig update-rc.d gettext | ||
8 | |||
9 | SRC_URI[archive.md5sum] = "edae148b31342aecae035051adc70c74" | ||
10 | SRC_URI[archive.sha256sum] = "1dbe5177df46a9c7250735e05e77129fe7ec04840771accfa87690111ca2c670" | ||
11 | |||
12 | SRC_URI += " \ | ||
13 | file://system-tools-backends \ | ||
14 | " | ||
15 | |||
16 | # This needs to move to meta-angstrom | ||
17 | SRC_URI_append_angstrom = " \ | ||
18 | file://add-angstrom-distro.patch \ | ||
19 | " | ||
20 | |||
21 | EXTRA_OECONF = " --with-net-dbus=${libdir}/perl5 " | ||
22 | |||
23 | do_configure() { | ||
24 | rm missing || true | ||
25 | automake --add-missing | ||
26 | sed -i -e 's:CC=$(CC):CC="$(CC)":g' ${S}/Net-DBus/Makefile.am | ||
27 | sed -i -e 's:CC=$(CC):CC="$(CC)":g' ${S}/Net-DBus/Makefile.in | ||
28 | libtoolize --force --install | ||
29 | aclocal | ||
30 | gnu-configize | ||
31 | oe_runconf | ||
32 | cp ${STAGING_BINDIR_CROSS}/${HOST_SYS}-libtool ${S} | ||
33 | } | ||
34 | |||
35 | do_install_append () { | ||
36 | install -d ${D}/${sysconfdir}/init.d | ||
37 | install -m 0755 ${WORKDIR}/system-tools-backends ${D}/${sysconfdir}/init.d/ | ||
38 | } | ||
39 | |||
40 | INITSCRIPT_NAME = "system-tools-backends" | ||
41 | INITSCRIPT_PARAMS = "start 50 2 3 4 5 . stop 70 1 ." | ||
42 | |||
43 | # Shadow added so there is a full adduser/deluser | ||
44 | # (Gnome images tend to pull in shadow anyway) | ||
45 | RDEPENDS_${PN} = "shadow" | ||
46 | |||
47 | FILES_${PN} += " ${sysconfdir}/dbus-1/system.d" | ||
48 | FILES_${PN} += " ${libdir}/pkgconfig" | ||
49 | FILES_${PN} += " ${datadir}/dbus-1/system-services" | ||
50 | FILES_${PN} += " ${datadir}/system-tools-backends-2.0/files" | ||
51 | FILES_${PN} += " ${datadir}/system-tools-backends-2.0/scripts" | ||
52 | FILES_${PN} += " ${datadir}/polkit*" | ||
53 | |||
54 | 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 50c9cb99f..000000000 --- a/meta-gnome/recipes-gnome/zenity/files/0001-Makefile.am-don-t-build-help.patch +++ /dev/null | |||
@@ -1,39 +0,0 @@ | |||
1 | From 17e5606f8c4c8ff26ba18489aad4c484cf8e2949 Mon Sep 17 00:00:00 2001 | ||
2 | From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com> | ||
3 | Date: Mon, 29 Apr 2013 11:34:27 +0200 | ||
4 | Subject: [PATCH] Makefile.am: don't build help | ||
5 | MIME-Version: 1.0 | ||
6 | Content-Type: text/plain; charset=UTF-8 | ||
7 | Content-Transfer-Encoding: 8bit | ||
8 | |||
9 | it crashes with: | ||
10 | |||
11 | | warning: failed to load external entity "/usr/share/xml/gnome/xslt/docbook/omf/db2omf.xsl" | ||
12 | | cannot parse /usr/share/xml/gnome/xslt/docbook/omf/db2omf.xsl | ||
13 | | make[2]: *** [zenity-bg.omf] Error 1 | ||
14 | | 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' | ||
15 | |||
16 | Upstream-Status: Inappropriate [configuration] | ||
17 | |||
18 | Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com> | ||
19 | --- | ||
20 | Makefile.am | 3 +-- | ||
21 | 1 files changed, 1 insertions(+), 2 deletions(-) | ||
22 | |||
23 | diff --git a/Makefile.am b/Makefile.am | ||
24 | index 03accc1..caec7f0 100644 | ||
25 | --- a/Makefile.am | ||
26 | +++ b/Makefile.am | ||
27 | @@ -1,8 +1,7 @@ | ||
28 | SUBDIRS = \ | ||
29 | src \ | ||
30 | po \ | ||
31 | - data \ | ||
32 | - help | ||
33 | + data | ||
34 | |||
35 | EXTRA_DIST = \ | ||
36 | autogen.sh \ | ||
37 | -- | ||
38 | 1.7.6.5 | ||
39 | |||
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 bd9f7a0ab..000000000 --- a/meta-gnome/recipes-gnome/zenity/zenity_2.32.1.bb +++ /dev/null | |||
@@ -1,21 +0,0 @@ | |||
1 | SUMMARY = "Display dialog boxes from the commandline and shell scripts" | ||
2 | LICENSE = "LGPLv2" | ||
3 | LIC_FILES_CHKSUM = "file://COPYING;md5=3bf50002aefd002f49e7bb854063f7e7" | ||
4 | |||
5 | PR = "r2" | ||
6 | |||
7 | PNBLACKLIST[zenity] ?= "BROKEN: doesn't build with B!=S - the recipe will be removed on 2017-09-01 unless the issue is fixed" | ||
8 | |||
9 | DEPENDS = "gtk+ glib-2.0 libnotify gnome-doc-utils" | ||
10 | |||
11 | inherit gnomebase | ||
12 | SRC_URI += "file://0001-Makefile.am-don-t-build-help.patch" | ||
13 | SRC_URI[archive.md5sum] = "aa66ec35451b16e424519b4973082170" | ||
14 | SRC_URI[archive.sha256sum] = "8838be041a07364b62a4281c971392e4a09bb01bb3237a836ec0457ec0ea18ac" | ||
15 | |||
16 | EXTRA_OECONF += "--disable-scrollkeeper" | ||
17 | # remove -I/usr/include from zenity_CPPFLAGS | ||
18 | do_configure_prepend() { | ||
19 | sed -i -e '/-I$(includedir)/d' src/Makefile.am | ||
20 | } | ||
21 | |||
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 83e598e6a..000000000 --- a/meta-gnome/recipes-support/florence/files/0001-Fix-glib-includes.patch +++ /dev/null | |||
@@ -1,33 +0,0 @@ | |||
1 | From c8419ef05ff92ffa3de2e626eb6acd5d2df3baa1 Mon Sep 17 00:00:00 2001 | ||
2 | From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com> | ||
3 | Date: Tue, 15 May 2012 13:40:05 +0200 | ||
4 | Subject: [PATCH] Fix glib includes | ||
5 | MIME-Version: 1.0 | ||
6 | Content-Type: text/plain; charset=UTF-8 | ||
7 | Content-Transfer-Encoding: 8bit | ||
8 | Upstream-Status: unknown | ||
9 | |||
10 | Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com> | ||
11 | --- | ||
12 | src/trace.c | 5 +---- | ||
13 | 1 files changed, 1 insertions(+), 4 deletions(-) | ||
14 | |||
15 | diff --git a/src/trace.c b/src/trace.c | ||
16 | index 5ea5c13..774c56d 100644 | ||
17 | --- a/src/trace.c | ||
18 | +++ b/src/trace.c | ||
19 | @@ -21,10 +21,7 @@ | ||
20 | |||
21 | #include "trace.h" | ||
22 | #include "system.h" | ||
23 | -#include <glib/gprintf.h> | ||
24 | -#include <glib/gutils.h> | ||
25 | -#include <glib/gslist.h> | ||
26 | -#include <glib/gstrfuncs.h> | ||
27 | +#include <glib.h> | ||
28 | #include <stdio.h> | ||
29 | #include <stdarg.h> | ||
30 | |||
31 | -- | ||
32 | 1.7.6.5 | ||
33 | |||
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 a645978d9..000000000 --- a/meta-gnome/recipes-support/goffice/goffice/0001-configure.ac-fix-paths-to-introspection-tools.patch +++ /dev/null | |||
@@ -1,41 +0,0 @@ | |||
1 | From 8e158c16cd15fff08b42ed86edc55816d3387837 Mon Sep 17 00:00:00 2001 | ||
2 | From: Alexander Kanavin <alex.kanavin@gmail.com> | ||
3 | Date: Fri, 19 Feb 2016 16:04:24 +0200 | ||
4 | Subject: [PATCH] configure.ac: fix paths to introspection tools | ||
5 | |||
6 | They need to be prefixed with $PKG_CONFIG_SYSROOT_DIR | ||
7 | |||
8 | Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> | ||
9 | --- | ||
10 | configure.ac | 8 ++++---- | ||
11 | 1 file changed, 4 insertions(+), 4 deletions(-) | ||
12 | |||
13 | diff --git a/configure.ac b/configure.ac | ||
14 | index 6d2b747..3b28463 100644 | ||
15 | --- a/configure.ac | ||
16 | +++ b/configure.ac | ||
17 | @@ -706,9 +706,9 @@ if test "x$found_introspection" = "xyes"; then | ||
18 | dnl python where to find libgoffice, so you might also need to set | ||
19 | dnl LD_LIBRARY_PATH. | ||
20 | |||
21 | - INTROSPECTION_SCANNER=`$PKG_CONFIG --variable=g_ir_scanner gobject-introspection-1.0` | ||
22 | - INTROSPECTION_COMPILER=`$PKG_CONFIG --variable=g_ir_compiler gobject-introspection-1.0` | ||
23 | - INTROSPECTION_GENERATE=`$PKG_CONFIG --variable=g_ir_generate gobject-introspection-1.0` | ||
24 | + INTROSPECTION_SCANNER=$PKG_CONFIG_SYSROOT_DIR`$PKG_CONFIG --variable=g_ir_scanner gobject-introspection-1.0` | ||
25 | + INTROSPECTION_COMPILER=$PKG_CONFIG_SYSROOT_DIR`$PKG_CONFIG --variable=g_ir_compiler gobject-introspection-1.0` | ||
26 | + INTROSPECTION_GENERATE=$PKG_CONFIG_SYSROOT_DIR`$PKG_CONFIG --variable=g_ir_generate gobject-introspection-1.0` | ||
27 | if test "x$INTROSPECTION_GIRDIR" = x; then | ||
28 | INTROSPECTION_GIRDIR=`$PKG_CONFIG --variable=girdir gobject-introspection-1.0` | ||
29 | fi | ||
30 | @@ -717,7 +717,7 @@ if test "x$found_introspection" = "xyes"; then | ||
31 | fi | ||
32 | INTROSPECTION_CFLAGS=`$PKG_CONFIG --cflags gobject-introspection-1.0` | ||
33 | INTROSPECTION_LIBS=`$PKG_CONFIG --libs gobject-introspection-1.0` | ||
34 | - INTROSPECTION_MAKEFILE=`$PKG_CONFIG --variable=datadir gobject-introspection-1.0`/gobject-introspection-1.0/Makefile.introspection | ||
35 | + INTROSPECTION_MAKEFILE=$PKG_CONFIG_SYSROOT_DIR`$PKG_CONFIG --variable=datadir gobject-introspection-1.0`/gobject-introspection-1.0/Makefile.introspection | ||
36 | else | ||
37 | INTROSPECTION_SCANNER= | ||
38 | INTROSPECTION_COMPILER= | ||
39 | -- | ||
40 | 2.7.0 | ||
41 | |||
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 6a2080d4c..000000000 --- a/meta-gnome/recipes-support/goffice/goffice_0.10.1.bb +++ /dev/null | |||
@@ -1,51 +0,0 @@ | |||
1 | DESCRIPTION="Gnome Office Library" | ||
2 | |||
3 | LICENSE="GPLv2" | ||
4 | LIC_FILES_CHKSUM = "file://COPYING;md5=6dc33ff21e1ba1ac1a2a1069d361e29e" | ||
5 | |||
6 | DEPENDS = "libxml-parser-perl-native glib-2.0 gtk+3 pango cairo libgsf libpcre libxml2 libart-lgpl librsvg intltool" | ||
7 | |||
8 | inherit gnomebase pkgconfig perlnative gobject-introspection | ||
9 | |||
10 | GNOME_COMPRESS_TYPE = "xz" | ||
11 | |||
12 | SRC_URI += "file://0001-configure.ac-fix-paths-to-introspection-tools.patch" | ||
13 | |||
14 | SRC_URI[archive.md5sum] = "90fd17c6fe205b779571e00d9b0b4727" | ||
15 | SRC_URI[archive.sha256sum] = "5c38f4e81e874cc8e89481b080f77c47c72bfd6fe2526f4fc2ef87c17f96cad0" | ||
16 | |||
17 | FILES_${PN}-dbg += "${libdir}/goffice/${PV}/plugins/*/.debug" | ||
18 | |||
19 | RRECOMMENDS_${PN} = " \ | ||
20 | goffice-plugin-plot-barcol \ | ||
21 | goffice-plugin-plot-distrib \ | ||
22 | goffice-plugin-plot-pie \ | ||
23 | goffice-plugin-plot-radar \ | ||
24 | goffice-plugin-plot-surface \ | ||
25 | goffice-plugin-plot-xy \ | ||
26 | goffice-plugin-reg-linear \ | ||
27 | goffice-plugin-reg-logfit \ | ||
28 | goffice-plugin-smoothing \ | ||
29 | " | ||
30 | |||
31 | FILES_${PN} = "${bindir}/* ${sbindir}/* ${libexecdir}/* ${libdir}/lib*${SOLIBS} \ | ||
32 | ${sysconfdir} ${sharedstatedir} ${localstatedir} \ | ||
33 | ${base_bindir}/* ${base_sbindir}/* \ | ||
34 | ${base_libdir}/*${SOLIBS} \ | ||
35 | ${datadir}/${PN} \ | ||
36 | ${datadir}/pixmaps ${datadir}/applications \ | ||
37 | ${datadir}/idl ${datadir}/omf ${datadir}/sounds \ | ||
38 | ${libdir}/bonobo/servers" | ||
39 | |||
40 | FILES_${PN}-locale = "${libdir}/locale" | ||
41 | |||
42 | PACKAGES_DYNAMIC += "^goffice-plugin-.*" | ||
43 | |||
44 | python populate_packages_prepend () { | ||
45 | goffice_libdir = d.expand('${libdir}/goffice/${PV}/plugins/') | ||
46 | |||
47 | do_split_packages(d, goffice_libdir, '(.*)', 'goffice-plugin-%s', 'Goffice plugin for %s', allow_dirs=True) | ||
48 | } | ||
49 | |||
50 | # | ../../goffice-0.10.1/goffice/math/go-complex.c:75:3: error: format not a string literal, argument types not checked [-Werror=format-nonliteral] | ||
51 | 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 5dadda2a2..000000000 --- a/meta-gnome/recipes-support/tracker/tracker-0.14.2/enable-sqlite-crosscompile.patch +++ /dev/null | |||
@@ -1,13 +0,0 @@ | |||
1 | Index: tracker-0.10.17/m4/sqlite-threadsafe.m4 | ||
2 | =================================================================== | ||
3 | --- tracker-0.10.17.orig/m4/sqlite-threadsafe.m4 | ||
4 | +++ tracker-0.10.17/m4/sqlite-threadsafe.m4 | ||
5 | @@ -45,7 +45,7 @@ int main () | ||
6 | ]])], | ||
7 | [ax_cv_sqlite_threadsafe=yes], | ||
8 | [ax_cv_sqlite_threadsafe=no], | ||
9 | - [ax_cv_sqlite_threadsafe=no])]) | ||
10 | + [ax_cv_sqlite_threadsafe=yes])]) | ||
11 | |||
12 | LIBS="$save_LIBS" | ||
13 | ]) | ||
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 6c3d9de10..000000000 --- a/meta-gnome/recipes-support/tracker/tracker-0.14.2/fix-removable-media-detection.patch +++ /dev/null | |||
@@ -1,30 +0,0 @@ | |||
1 | Index: tracker-0.14.2/src/libtracker-miner/tracker-storage.c | ||
2 | =================================================================== | ||
3 | --- tracker-0.14.2.orig/src/libtracker-miner/tracker-storage.c 2011-08-03 13:53:16.000000000 +0100 | ||
4 | +++ tracker-0.14.2/src/libtracker-miner/tracker-storage.c 2012-09-10 08:25:18.322215126 +0100 | ||
5 | @@ -20,6 +20,7 @@ | ||
6 | #include "config.h" | ||
7 | |||
8 | #include <string.h> | ||
9 | +#include <sys/stat.h> | ||
10 | |||
11 | #include <gio/gio.h> | ||
12 | #include <gio/gunixmounts.h> | ||
13 | @@ -646,6 +647,17 @@ | ||
14 | gchar *content_type; | ||
15 | gboolean is_multimedia; | ||
16 | gboolean is_blank; | ||
17 | + struct stat st; | ||
18 | + | ||
19 | + /* | ||
20 | + * Consider all files under /media to be | ||
21 | + * removable unless the file .this-is-root is | ||
22 | + * present. | ||
23 | + */ | ||
24 | + if (!strncmp (mount_path, "/media/", | ||
25 | + strlen ("/media/")) && | ||
26 | + stat ("/media/.this-is-root", &st)) | ||
27 | + is_removable = TRUE; | ||
28 | |||
29 | content_type = mount_guess_content_type (mount, &is_optical, &is_multimedia, &is_blank); | ||
30 | |||
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 fab3371f0..000000000 --- a/meta-gnome/recipes-support/tracker/tracker-0.14.2/giflib5-support.patch +++ /dev/null | |||
@@ -1,126 +0,0 @@ | |||
1 | src/tracker-extract/tracker-extract-gif.c | 36 +++++++++++++++++++++++++++++ | ||
2 | 1 file changed, 36 insertions(+) | ||
3 | --- a/src/tracker-extract/tracker-extract-gif.c | ||
4 | +++ a/src/tracker-extract/tracker-extract-gif.c | ||
5 | @@ -75,6 +75,39 @@ | ||
6 | return (GIF_OK); | ||
7 | } | ||
8 | |||
9 | +#if GIFLIB_MAJOR >= 5 | ||
10 | +static inline void | ||
11 | +gif_error (const gchar *action, int err) | ||
12 | +{ | ||
13 | + const char *str = GifErrorString (err); | ||
14 | + if (str != NULL) { | ||
15 | + g_message ("%s, error: '%s'", action, str); | ||
16 | + } else { | ||
17 | + g_message ("%s, undefined error %d", action, err); | ||
18 | + } | ||
19 | +} | ||
20 | +#else /* GIFLIB_MAJOR >= 5 */ | ||
21 | +static inline void print_gif_error() | ||
22 | +{ | ||
23 | +#if defined(GIFLIB_MAJOR) && defined(GIFLIB_MINOR) && ((GIFLIB_MAJOR == 4 && GIFLIB_MINOR >= 2) || GIFLIB_MAJOR > 4) | ||
24 | + const char *str = GifErrorString (); | ||
25 | + if (str != NULL) { | ||
26 | + g_message ("GIF, error: '%s'", str); | ||
27 | + } else { | ||
28 | + g_message ("GIF, undefined error"); | ||
29 | + } | ||
30 | +#else | ||
31 | + PrintGifError(); | ||
32 | +#endif | ||
33 | +} | ||
34 | +#endif /* GIFLIB_MAJOR >= 5 */ | ||
35 | + | ||
36 | +/* giflib 5.1 changed the API of DGifCloseFile to take two arguments */ | ||
37 | +#if !defined(GIFLIB_MAJOR) || \ | ||
38 | + !(GIFLIB_MAJOR > 5 || (GIFLIB_MAJOR == 5 && GIFLIB_MINOR >= 1)) | ||
39 | +#define DGifCloseFile(a, b) DGifCloseFile(a) | ||
40 | +#endif | ||
41 | + | ||
42 | static void | ||
43 | read_metadata (TrackerSparqlBuilder *preupdate, | ||
44 | TrackerSparqlBuilder *metadata, | ||
45 | @@ -100,14 +133,22 @@ | ||
46 | ExtBlock extBlock; | ||
47 | |||
48 | if (DGifGetRecordType(gifFile, &RecordType) == GIF_ERROR) { | ||
49 | - PrintGifError(); | ||
50 | +#if GIFLIB_MAJOR < 5 | ||
51 | + print_gif_error (); | ||
52 | +#else /* GIFLIB_MAJOR < 5 */ | ||
53 | + gif_error ("Could not read next GIF record type", gifFile->Error); | ||
54 | +#endif /* GIFLIB_MAJOR < 5 */ | ||
55 | return; | ||
56 | } | ||
57 | |||
58 | switch (RecordType) { | ||
59 | case IMAGE_DESC_RECORD_TYPE: | ||
60 | if (DGifGetImageDesc(gifFile) == GIF_ERROR) { | ||
61 | - PrintGifError(); | ||
62 | +#if GIFLIB_MAJOR < 5 | ||
63 | + print_gif_error(); | ||
64 | +#else /* GIFLIB_MAJOR < 5 */ | ||
65 | + gif_error ("Could not get GIF record information", gifFile->Error); | ||
66 | +#endif /* GIFLIB_MAJOR < 5 */ | ||
67 | return; | ||
68 | } | ||
69 | |||
70 | @@ -117,7 +158,11 @@ | ||
71 | framedata = g_malloc (framewidth*frameheight); | ||
72 | |||
73 | if (DGifGetLine(gifFile, framedata, framewidth*frameheight)==GIF_ERROR) { | ||
74 | - PrintGifError(); | ||
75 | +#if GIFLIB_MAJOR < 5 | ||
76 | + print_gif_error(); | ||
77 | +#else /* GIFLIB_MAJOR < 5 */ | ||
78 | + gif_error ("Could not load a block of GIF pixes", gifFile->Error); | ||
79 | +#endif /* GIFLIB_MAJOR < 5 */ | ||
80 | return; | ||
81 | } | ||
82 | |||
83 | @@ -593,6 +638,9 @@ | ||
84 | gchar *filename, *uri; | ||
85 | GFile *file; | ||
86 | int fd; | ||
87 | +#if GIFLIB_MAJOR >= 5 | ||
88 | + int err; | ||
89 | +#endif | ||
90 | |||
91 | preupdate = tracker_extract_info_get_preupdate_builder (info); | ||
92 | metadata = tracker_extract_info_get_metadata_builder (info); | ||
93 | @@ -617,8 +665,14 @@ | ||
94 | return FALSE; | ||
95 | } | ||
96 | |||
97 | +#if GIFLIB_MAJOR < 5 | ||
98 | if ((gifFile = DGifOpenFileHandle (fd)) == NULL) { | ||
99 | - PrintGifError (); | ||
100 | + print_gif_error (); | ||
101 | +#else /* GIFLIB_MAJOR < 5 */ | ||
102 | + if ((gifFile = DGifOpenFileHandle (fd, &err)) == NULL) { | ||
103 | + gif_error ("Could not open GIF file with handle", err); | ||
104 | +#endif /* GIFLIB_MAJOR < 5 */ | ||
105 | + g_free (filename); | ||
106 | close (fd); | ||
107 | return FALSE; | ||
108 | } | ||
109 | @@ -637,10 +691,15 @@ | ||
110 | g_string_free (where, TRUE); | ||
111 | |||
112 | g_free (uri); | ||
113 | - | ||
114 | +#if GIFLIB_MAJOR < 5 | ||
115 | if (DGifCloseFile (gifFile) != GIF_OK) { | ||
116 | - PrintGifError (); | ||
117 | + print_gif_error (); | ||
118 | + } | ||
119 | +#else /* GIFLIB_MAJOR < 5 */ | ||
120 | + if (DGifCloseFile (gifFile, NULL) != GIF_OK) { | ||
121 | + gif_error ("Could not close GIF file", gifFile->Error); | ||
122 | } | ||
123 | +#endif /* GIFLIB_MAJOR < 5 */ | ||
124 | |||
125 | return TRUE; | ||
126 | } | ||
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 eb36a120f..000000000 --- a/meta-gnome/recipes-support/tracker/tracker_0.14.2.bb +++ /dev/null | |||
@@ -1,88 +0,0 @@ | |||
1 | DESCRIPTION = "Tracker is a tool designed to extract information and metadata about your personal data so that it can be searched easily and quickly." | ||
2 | LICENSE = "GPLv2" | ||
3 | LIC_FILES_CHKSUM = "file://COPYING;md5=ee31012bf90e7b8c108c69f197f3e3a4" | ||
4 | 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" | ||
5 | |||
6 | RDEPENDS_${PN} += " gvfs gsettings-desktop-schemas" | ||
7 | |||
8 | RDEPENDS_${PN}-nautilus-extension += "nautilus" | ||
9 | HOMEPAGE = "http://projects.gnome.org/tracker/" | ||
10 | |||
11 | PR = "r7" | ||
12 | |||
13 | inherit autotools pkgconfig gnomebase gettext gsettings systemd gobject-introspection | ||
14 | |||
15 | VER_DIR = "${@gnome_verdir("${PV}")}" | ||
16 | SRC_URI = "http://ftp.gnome.org/pub/GNOME/sources/tracker/${VER_DIR}/tracker-${PV}.tar.xz \ | ||
17 | file://enable-sqlite-crosscompile.patch \ | ||
18 | file://fix-removable-media-detection.patch \ | ||
19 | file://giflib5-support.patch \ | ||
20 | file://90tracker \ | ||
21 | file://tracker-store.service \ | ||
22 | file://tracker-miner-fs.service \ | ||
23 | file://tracker-dbus.service \ | ||
24 | " | ||
25 | |||
26 | SYSTEMD_SERVICE_${PN} = " tracker-store.service tracker-miner-fs.service tracker-dbus.service " | ||
27 | SYSTEMD_AUTO_ENABLE = "disable" | ||
28 | |||
29 | EXTRA_OECONF += " tracker_cv_have_ioprio=yes" | ||
30 | |||
31 | PACKAGECONFIG ?= "nautilus" | ||
32 | PACKAGECONFIG[nautilus] = "--enable-nautilus-extension,--disable-nautilus-extension,nautilus" | ||
33 | |||
34 | # Disable the desktop-centric miners | ||
35 | EXTRA_OECONF += "--disable-miner-thunderbird --disable-miner-firefox \ | ||
36 | --disable-miner-evolution --disable-miner-flickr" | ||
37 | |||
38 | LEAD_SONAME = "libtrackerclient.so.0" | ||
39 | |||
40 | do_compile_prepend() { | ||
41 | export GIR_EXTRA_LIBS_PATH="${B}/src/libtracker-sparql-backend/.libs:${B}/src/libtracker-data/.libs:${B}/src/libtracker-common/.libs" | ||
42 | } | ||
43 | |||
44 | do_install_append() { | ||
45 | cp -PpR ${D}${STAGING_DATADIR}/* ${D}${datadir}/ || true | ||
46 | # install -d ${D}/${sysconfdir}/X11/Xsession.d/ | ||
47 | # install -m 0755 ${WORKDIR}/90tracker ${D}/${sysconfdir}/X11/Xsession.d/ | ||
48 | |||
49 | install -d ${D}${systemd_unitdir}/system | ||
50 | install -m 0644 ${WORKDIR}/tracker-store.service ${D}${systemd_unitdir}/system | ||
51 | install -m 0644 ${WORKDIR}/tracker-miner-fs.service ${D}${systemd_unitdir}/system | ||
52 | install -m 0644 ${WORKDIR}/tracker-dbus.service ${D}${systemd_unitdir}/system | ||
53 | sed -i -e 's,@LIBEXECDIR@,${libexecdir},g' \ | ||
54 | -e 's,@BASE_BINDIR@,${base_bindir},g' \ | ||
55 | ${D}${systemd_unitdir}/system/*.service | ||
56 | } | ||
57 | |||
58 | PACKAGES =+ "${PN}-tests ${PN}-vala ${PN}-nautilus-extension" | ||
59 | |||
60 | FILES_${PN} += "${datadir}/dbus-1/ \ | ||
61 | ${libdir}/tracker-${VER_DIR}/*.so.* \ | ||
62 | ${libdir}/tracker-${VER_DIR}/extract-modules/*.so \ | ||
63 | ${libdir}/tracker-${VER_DIR}/writeback-modules/*.so \ | ||
64 | ${datadir}/icons/hicolor/*/apps/tracker.* \ | ||
65 | ${libdir}/nautilus/extensions-2.0/*.la \ | ||
66 | ${datadir}/glib-2.0/schemas/* \ | ||
67 | ${systemd_unitdir}/system/tracker-store.service \ | ||
68 | ${systemd_unitdir}/system/tracker-miner-fs.service \ | ||
69 | ${systemd_unitdir}/system/tracker-dbus.service \ | ||
70 | " | ||
71 | |||
72 | FILES_${PN}-dev += "${libdir}/tracker-${VER_DIR}/*.la \ | ||
73 | ${libdir}/tracker-${VER_DIR}/*.so \ | ||
74 | ${libdir}/tracker-${VER_DIR}/*/*.la \ | ||
75 | ${libdir}/tracker-${VER_DIR}/extract-modules/*.la" | ||
76 | |||
77 | FILES_${PN}-staticdev += "${libdir}/nautilus/extensions-2.0/*.a" | ||
78 | FILES_${PN}-dbg += "${libdir}/*/*/.debug \ | ||
79 | ${libdir}/*/.debug" | ||
80 | FILES_${PN}-tests = "${datadir}/tracker-tests/" | ||
81 | FILES_${PN}-vala = "${datadir}/vala/" | ||
82 | FILES_${PN}-nautilus-extension += "${libdir}/nautilus/extensions-2.0/*.so" | ||
83 | |||
84 | SRC_URI[md5sum] = "f3a871beeebf86fd752863ebd22af9ac" | ||
85 | SRC_URI[sha256sum] = "9b59330aa2e9e09feee587ded895e9247f71fc25f46b023d616d9969314bc7f1" | ||
86 | |||
87 | # http://errors.yoctoproject.org/Errors/Details/81007/ | ||
88 | 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" | ||