diff options
Diffstat (limited to 'gnome-base/gnome-applets/files')
4 files changed, 0 insertions, 224 deletions
diff --git a/gnome-base/gnome-applets/files/gnome-applets-2.32.1.1-dbus-fix.patch b/gnome-base/gnome-applets/files/gnome-applets-2.32.1.1-dbus-fix.patch deleted file mode 100644 index 16c2999a84e8..000000000000 --- a/gnome-base/gnome-applets/files/gnome-applets-2.32.1.1-dbus-fix.patch +++ /dev/null @@ -1,28 +0,0 @@ -From fe72f63c91a1458d97d455ab0078d042464366e7 Mon Sep 17 00:00:00 2001 -From: Enrico Minack <enrico-minack@gmx.de> -Date: Mon, 03 Jan 2011 19:58:13 +0000 -Subject: gweather: fixes NetworkManager support to compile, see bug 636217 - ---- -diff --git a/gweather/Makefile.am b/gweather/Makefile.am -index ea6ac96..165efda 100644 ---- a/gweather/Makefile.am -+++ b/gweather/Makefile.am -@@ -6,6 +6,7 @@ INCLUDES = \ - -I$(srcdir) \ - -I$(top_srcdir) \ - -DGWEATHER_MENU_UI_DIR=\""$(uidir)"\" \ -+ $(DBUS_CFLAGS) \ - $(GNOME_APPLETS3_CFLAGS) \ - $(LIBNOTIFY_CFLAGS) \ - $(LIBGWEATHER_CFLAGS) \ -@@ -22,6 +23,7 @@ gweather_applet_2_SOURCES = \ - gweather-applet.c gweather-applet.h - - gweather_applet_2_LDADD = \ -+ $(DBUS_LIBS) \ - $(LIBNOTIFY_LIBS) \ - $(GNOME_APPLETS3_LIBS) \ - $(GNOME_LIBS2_LIBS) \ --- -cgit v0.8.3.4 diff --git a/gnome-base/gnome-applets/files/gnome-applets-2.32.1.1-libnotify-0.7.patch b/gnome-base/gnome-applets/files/gnome-applets-2.32.1.1-libnotify-0.7.patch deleted file mode 100644 index f2b889ec0324..000000000000 --- a/gnome-base/gnome-applets/files/gnome-applets-2.32.1.1-libnotify-0.7.patch +++ /dev/null @@ -1,53 +0,0 @@ ---- battstat/battstat_applet.c -+++ battstat/battstat_applet.c -@@ -42,6 +42,9 @@ - - #ifdef HAVE_LIBNOTIFY - #include <libnotify/notify.h> -+#ifndef NOTIFY_CHECK_VERSION -+#define NOTIFY_CHECK_VERSION(x,y,z) 0 -+#endif - #endif - - #include "battstat.h" -@@ -435,7 +438,12 @@ - GTK_ICON_LOOKUP_USE_BUILTIN, - NULL); - -- NotifyNotification *n = notify_notification_new (_("Your battery is now fully recharged"), "", /* "battery" */ NULL, applet); -+ NotifyNotification *n = notify_notification_new (_("Your battery is now fully recharged"), "", /* "battery" */ NULL -+#if NOTIFY_CHECK_VERSION (0, 7, 0) -+ ); -+#else -+ , applet); -+#endif - - /* XXX: it would be nice to pass this as a named icon */ - notify_notification_set_icon_from_pixbuf (n, icon); ---- gweather/gweather-applet.c -+++ gweather/gweather-applet.c -@@ -30,6 +30,9 @@ - #ifdef HAVE_LIBNOTIFY - #include <libnotify/notify.h> - #include <libnotify/notification.h> -+#ifndef NOTIFY_CHECK_VERSION -+#define NOTIFY_CHECK_VERSION(x,y,z) 0 -+#endif - #endif - - #define GWEATHER_I_KNOW_THIS_IS_UNSTABLE -@@ -471,8 +474,12 @@ - if (icon == NULL) - icon = "stock-unknown"; - -- n = notify_notification_new (message, detail, icon, -- gw_applet->container); -+ n = notify_notification_new (message, detail, icon -+#if NOTIFY_CHECK_VERSION (0, 7, 0) -+ ); -+#else -+ , gw_applet->container); -+#endif - - notify_notification_show (n, &error); - if (error) diff --git a/gnome-base/gnome-applets/files/gnome-applets-2.32.1.1-mixer-libm.patch b/gnome-base/gnome-applets/files/gnome-applets-2.32.1.1-mixer-libm.patch deleted file mode 100644 index 813f336853b9..000000000000 --- a/gnome-base/gnome-applets/files/gnome-applets-2.32.1.1-mixer-libm.patch +++ /dev/null @@ -1,26 +0,0 @@ -From f2a7c6548ad508c94398e10c49c962363e15d739 Mon Sep 17 00:00:00 2001 -From: Ray Strode <rstrode@redhat.com> -Date: Wed, 19 Sep 2012 18:27:22 -0400 -Subject: [PATCH] configure: add -lm dependency on mixer libs - -the mixer applet requires -lm to build. -this commit adds that dependency. ---- - configure.in | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/configure.in b/configure.in -index 7c1c8fc..b318fb5 100644 ---- a/configure.in -+++ b/configure.in -@@ -297,6 +297,7 @@ if test "x$enable_mixer" != "xno"; then - AC_MSG_ERROR([Mixer applet explicitly requested but a compatible gstreamer version was not found]) - fi - fi -+MIXER_LIBS="$MIXER_LIBS -lm" - AM_CONDITIONAL(BUILD_MIXER_APPLET, test "x$enable_mixer" = "xyes") - AC_SUBST(MIXER_CFLAGS) - AC_SUBST(MIXER_LIBS) --- -1.8.5.2 - diff --git a/gnome-base/gnome-applets/files/gnome-applets-2.32.1.1-underlinking.patch b/gnome-base/gnome-applets/files/gnome-applets-2.32.1.1-underlinking.patch deleted file mode 100644 index c8308ef46aaa..000000000000 --- a/gnome-base/gnome-applets/files/gnome-applets-2.32.1.1-underlinking.patch +++ /dev/null @@ -1,117 +0,0 @@ - geyes/Makefile.am | 2 +- - geyes/Makefile.in | 2 +- - multiload/Makefile.am | 3 ++- - multiload/Makefile.in | 1 + - stickynotes/Makefile.am | 3 ++- - stickynotes/Makefile.in | 3 ++- - trashapplet/src/Makefile.am | 3 ++- - trashapplet/src/Makefile.in | 3 ++- - 8 files changed, 13 insertions(+), 7 deletions(-) - -diff --git a/geyes/Makefile.am b/geyes/Makefile.am -index 7668b4c..18cd851 100644 ---- a/geyes/Makefile.am -+++ b/geyes/Makefile.am -@@ -16,7 +16,7 @@ geyes_applet2_SOURCES = \ - geyes.h - - geyes_applet2_LDADD = \ -- $(GNOME_APPLETS3_LIBS) -+ $(GNOME_APPLETS3_LIBS) -lm - - appletdir = $(datadir)/gnome-panel/applets - applet_in_files = org.gnome.applets.GeyesApplet.panel-applet.in -diff --git a/geyes/Makefile.in b/geyes/Makefile.in -index cfededa..afe87e2 100644 ---- a/geyes/Makefile.in -+++ b/geyes/Makefile.in -@@ -384,7 +384,7 @@ geyes_applet2_SOURCES = \ - geyes.h - - geyes_applet2_LDADD = \ -- $(GNOME_APPLETS3_LIBS) -+ $(GNOME_APPLETS3_LIBS) -lm - - appletdir = $(datadir)/gnome-panel/applets - applet_in_files = org.gnome.applets.GeyesApplet.panel-applet.in -diff --git a/multiload/Makefile.am b/multiload/Makefile.am -index 53b3147..8fe2b9f 100644 ---- a/multiload/Makefile.am -+++ b/multiload/Makefile.am -@@ -24,7 +24,8 @@ multiload_applet_2_SOURCES = \ - multiload_applet_2_LDADD = \ - $(GNOME_APPLETS3_LIBS) \ - $(GTOP_APPLETS_LIBS) \ -- $(GNOMEDESKTOP_LIBS) -+ $(GNOMEDESKTOP_LIBS) \ -+ -lm - - schemasdir = @GCONF_SCHEMA_FILE_DIR@ - schemas_in_files = multiload.schemas.in -diff --git a/multiload/Makefile.in b/multiload/Makefile.in -index b86d621..bf13bd8 100644 ---- a/multiload/Makefile.in -+++ b/multiload/Makefile.in -@@ -395,6 +395,7 @@ multiload_applet_2_LDADD = \ - $(GNOME_APPLETS3_LIBS) \ - $(GTOP_APPLETS_LIBS) \ - $(GNOMEDESKTOP_LIBS) -+ -lm - - schemasdir = @GCONF_SCHEMA_FILE_DIR@ - schemas_in_files = multiload.schemas.in -diff --git a/stickynotes/Makefile.am b/stickynotes/Makefile.am -index c279952..65f5502 100644 ---- a/stickynotes/Makefile.am -+++ b/stickynotes/Makefile.am -@@ -35,7 +35,8 @@ stickynotes_applet_SOURCES = \ - stickynotes_applet_LDADD = \ - $(GNOME_APPLETS3_LIBS) \ - $(LIBWNCK_LIBS) \ -- $(XML2_LIBS) -+ $(XML2_LIBS) \ -+ $(X_LIBS) - - builder_DATA = $(builder_files) - -diff --git a/stickynotes/Makefile.in b/stickynotes/Makefile.in -index 5442614..2e8167b 100644 ---- a/stickynotes/Makefile.in -+++ b/stickynotes/Makefile.in -@@ -413,7 +413,8 @@ schemas_in_files = stickynotes.schemas.in - @BUILD_STICKYNOTES_APPLET_TRUE@stickynotes_applet_LDADD = \ - @BUILD_STICKYNOTES_APPLET_TRUE@ $(GNOME_APPLETS3_LIBS) \ - @BUILD_STICKYNOTES_APPLET_TRUE@ $(LIBWNCK_LIBS) \ --@BUILD_STICKYNOTES_APPLET_TRUE@ $(XML2_LIBS) -+@BUILD_STICKYNOTES_APPLET_TRUE@ $(XML2_LIBS) \ -+@BUILD_STICKYNOTES_APPLET_TRUE@ $(X_LIBS) - - @BUILD_STICKYNOTES_APPLET_TRUE@builder_DATA = $(builder_files) - @BUILD_STICKYNOTES_APPLET_TRUE@uidir = $(datadir)/gnome-2.0/ui -diff --git a/trashapplet/src/Makefile.am b/trashapplet/src/Makefile.am -index 52da653..05ba024 100644 ---- a/trashapplet/src/Makefile.am -+++ b/trashapplet/src/Makefile.am -@@ -14,6 +14,7 @@ trashapplet_SOURCES = \ - - trashapplet_LDADD = \ - $(GNOME_APPLETS3_LIBS) \ -- $(GIO_LIBS) -+ $(GIO_LIBS) \ -+ $(X_LIBS) - - -include $(top_srcdir)/git.mk -diff --git a/trashapplet/src/Makefile.in b/trashapplet/src/Makefile.in -index f006b80..a6ee115 100644 ---- a/trashapplet/src/Makefile.in -+++ b/trashapplet/src/Makefile.in -@@ -320,7 +320,8 @@ trashapplet_SOURCES = \ - - trashapplet_LDADD = \ - $(GNOME_APPLETS3_LIBS) \ -- $(GIO_LIBS) -+ $(GIO_LIBS) \ -+ $(X_LIBS) - - all: all-am - |