summaryrefslogtreecommitdiffstats
path: root/x11/gnome-panel/files
diff options
context:
space:
mode:
Diffstat (limited to 'x11/gnome-panel/files')
-rw-r--r--x11/gnome-panel/files/patch-applets_clock_clock-location.c11
-rw-r--r--x11/gnome-panel/files/patch-applets_clock_clock.c11
-rw-r--r--x11/gnome-panel/files/patch-configure61
-rw-r--r--x11/gnome-panel/files/patch-gnome-panel_panel-multiscreen.c59
-rw-r--r--x11/gnome-panel/files/patch-po_ja.po20
-rw-r--r--x11/gnome-panel/files/patch-po_ko.po29
6 files changed, 0 insertions, 191 deletions
diff --git a/x11/gnome-panel/files/patch-applets_clock_clock-location.c b/x11/gnome-panel/files/patch-applets_clock_clock-location.c
deleted file mode 100644
index aa25ac2fc..000000000
--- a/x11/gnome-panel/files/patch-applets_clock_clock-location.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- applets/clock/clock-location.c.orig 2008-04-07 17:17:51.000000000 -0400
-+++ applets/clock/clock-location.c 2008-04-07 22:54:31.000000000 -0400
-@@ -27,6 +27,8 @@
- #include "clock-marshallers.h"
- #include "set-timezone.h"
-
-+#define daylight 1
-+
- G_DEFINE_TYPE (ClockLocation, clock_location, G_TYPE_OBJECT)
-
- typedef struct {
diff --git a/x11/gnome-panel/files/patch-applets_clock_clock.c b/x11/gnome-panel/files/patch-applets_clock_clock.c
deleted file mode 100644
index a9b459b74..000000000
--- a/x11/gnome-panel/files/patch-applets_clock_clock.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- applets/clock/clock.c.orig 2009-07-01 15:06:23.000000000 +0200
-+++ applets/clock/clock.c 2009-07-19 15:59:26.000000000 +0200
-@@ -71,6 +71,8 @@
- #include "set-timezone.h"
- #include "system-timezone.h"
-
-+#define daylight 1
-+
- #define INTERNETSECOND (864)
- #define INTERNETBEAT (86400)
-
diff --git a/x11/gnome-panel/files/patch-configure b/x11/gnome-panel/files/patch-configure
deleted file mode 100644
index 1d7335893..000000000
--- a/x11/gnome-panel/files/patch-configure
+++ /dev/null
@@ -1,61 +0,0 @@
---- configure.orig 2009-10-04 17:26:08.000000000 -0400
-+++ configure 2009-10-04 17:31:11.000000000 -0400
-@@ -14954,12 +14955,12 @@ if test -n "$CLOCK_CFLAGS"; then
- pkg_cv_CLOCK_CFLAGS="$CLOCK_CFLAGS"
- elif test -n "$PKG_CONFIG"; then
- if test -n "$PKG_CONFIG" && \
-- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"pango >= \$PANGO_REQUIRED gtk+-2.0 >= \$GTK_REQUIRED glib-2.0 >= \$GLIB_REQUIRED gio-2.0 >= \$GLIB_REQUIRED \$LIBECAL_REQUIREMENT librsvg-2.0 dbus-glib-1 gweather >= \$GWEATHER_REQUIRED\"") >&5
-- ($PKG_CONFIG --exists --print-errors "pango >= $PANGO_REQUIRED gtk+-2.0 >= $GTK_REQUIRED glib-2.0 >= $GLIB_REQUIRED gio-2.0 >= $GLIB_REQUIRED $LIBECAL_REQUIREMENT librsvg-2.0 dbus-glib-1 gweather >= $GWEATHER_REQUIRED") 2>&5
-+ { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"pango >= \$PANGO_REQUIRED gtk+-2.0 >= \$GTK_REQUIRED glib-2.0 >= \$GLIB_REQUIRED gio-2.0 >= \$GLIB_REQUIRED \$LIBECAL_REQUIREMENT librsvg-2.0 dbus-glib-1 gweather >= \$GWEATHER_REQUIRED gnome-desktop-2.0 >= \$LIBGNOME_DESKTOP_REQUIRED\"") >&5
-+ ($PKG_CONFIG --exists --print-errors "pango >= $PANGO_REQUIRED gtk+-2.0 >= $GTK_REQUIRED glib-2.0 >= $GLIB_REQUIRED gio-2.0 >= $GLIB_REQUIRED $LIBECAL_REQUIREMENT librsvg-2.0 dbus-glib-1 gweather >= $GWEATHER_REQUIRED gnome-desktop-2.0 >= $LIBGNOME_DESKTOP_REQUIRED") 2>&5
- ac_status=$?
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; then
-- pkg_cv_CLOCK_CFLAGS=`$PKG_CONFIG --cflags "pango >= $PANGO_REQUIRED gtk+-2.0 >= $GTK_REQUIRED glib-2.0 >= $GLIB_REQUIRED gio-2.0 >= $GLIB_REQUIRED $LIBECAL_REQUIREMENT librsvg-2.0 dbus-glib-1 gweather >= $GWEATHER_REQUIRED" 2>/dev/null`
-+ pkg_cv_CLOCK_CFLAGS=`$PKG_CONFIG --cflags "pango >= $PANGO_REQUIRED gtk+-2.0 >= $GTK_REQUIRED glib-2.0 >= $GLIB_REQUIRED gio-2.0 >= $GLIB_REQUIRED $LIBECAL_REQUIREMENT librsvg-2.0 dbus-glib-1 gweather >= $GWEATHER_REQUIRED gnome-desktop-2.0 >= $LIBGNOME_DESKTOP_REQUIRED" 2>/dev/null`
- else
- pkg_failed=yes
- fi
-@@ -14970,12 +14971,12 @@ if test -n "$CLOCK_LIBS"; then
- pkg_cv_CLOCK_LIBS="$CLOCK_LIBS"
- elif test -n "$PKG_CONFIG"; then
- if test -n "$PKG_CONFIG" && \
-- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"pango >= \$PANGO_REQUIRED gtk+-2.0 >= \$GTK_REQUIRED glib-2.0 >= \$GLIB_REQUIRED gio-2.0 >= \$GLIB_REQUIRED \$LIBECAL_REQUIREMENT librsvg-2.0 dbus-glib-1 gweather >= \$GWEATHER_REQUIRED\"") >&5
-- ($PKG_CONFIG --exists --print-errors "pango >= $PANGO_REQUIRED gtk+-2.0 >= $GTK_REQUIRED glib-2.0 >= $GLIB_REQUIRED gio-2.0 >= $GLIB_REQUIRED $LIBECAL_REQUIREMENT librsvg-2.0 dbus-glib-1 gweather >= $GWEATHER_REQUIRED") 2>&5
-+ { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"pango >= \$PANGO_REQUIRED gtk+-2.0 >= \$GTK_REQUIRED glib-2.0 >= \$GLIB_REQUIRED gio-2.0 >= \$GLIB_REQUIRED \$LIBECAL_REQUIREMENT librsvg-2.0 dbus-glib-1 gweather >= \$GWEATHER_REQUIRED gnome-desktop-2.0 >= \$LIBGNOME_DESKTOP_REQUIRED\"") >&5
-+ ($PKG_CONFIG --exists --print-errors "pango >= $PANGO_REQUIRED gtk+-2.0 >= $GTK_REQUIRED glib-2.0 >= $GLIB_REQUIRED gio-2.0 >= $GLIB_REQUIRED $LIBECAL_REQUIREMENT librsvg-2.0 dbus-glib-1 gweather >= $GWEATHER_REQUIRED gnome-desktop-2.0 >= $LIBGNOME_DESKTOP_REQUIRED") 2>&5
- ac_status=$?
- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; then
-- pkg_cv_CLOCK_LIBS=`$PKG_CONFIG --libs "pango >= $PANGO_REQUIRED gtk+-2.0 >= $GTK_REQUIRED glib-2.0 >= $GLIB_REQUIRED gio-2.0 >= $GLIB_REQUIRED $LIBECAL_REQUIREMENT librsvg-2.0 dbus-glib-1 gweather >= $GWEATHER_REQUIRED" 2>/dev/null`
-+ pkg_cv_CLOCK_LIBS=`$PKG_CONFIG --libs "pango >= $PANGO_REQUIRED gtk+-2.0 >= $GTK_REQUIRED glib-2.0 >= $GLIB_REQUIRED gio-2.0 >= $GLIB_REQUIRED $LIBECAL_REQUIREMENT librsvg-2.0 dbus-glib-1 gweather >= $GWEATHER_REQUIRED gnome-desktop-2.0 >= $LIBGNOME_DESKTOP_REQUIRED" 2>/dev/null`
- else
- pkg_failed=yes
- fi
-@@ -14993,14 +14994,14 @@ else
- _pkg_short_errors_supported=no
- fi
- if test $_pkg_short_errors_supported = yes; then
-- CLOCK_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "pango >= $PANGO_REQUIRED gtk+-2.0 >= $GTK_REQUIRED glib-2.0 >= $GLIB_REQUIRED gio-2.0 >= $GLIB_REQUIRED $LIBECAL_REQUIREMENT librsvg-2.0 dbus-glib-1 gweather >= $GWEATHER_REQUIRED" 2>&1`
-+ CLOCK_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "pango >= $PANGO_REQUIRED gtk+-2.0 >= $GTK_REQUIRED glib-2.0 >= $GLIB_REQUIRED gio-2.0 >= $GLIB_REQUIRED $LIBECAL_REQUIREMENT librsvg-2.0 dbus-glib-1 gweather >= $GWEATHER_REQUIRED gnome-desktop-2.0 >= $LIBGNOME_DESKTOP_REQUIRED" 2>&1`
- else
-- CLOCK_PKG_ERRORS=`$PKG_CONFIG --print-errors "pango >= $PANGO_REQUIRED gtk+-2.0 >= $GTK_REQUIRED glib-2.0 >= $GLIB_REQUIRED gio-2.0 >= $GLIB_REQUIRED $LIBECAL_REQUIREMENT librsvg-2.0 dbus-glib-1 gweather >= $GWEATHER_REQUIRED" 2>&1`
-+ CLOCK_PKG_ERRORS=`$PKG_CONFIG --print-errors "pango >= $PANGO_REQUIRED gtk+-2.0 >= $GTK_REQUIRED glib-2.0 >= $GLIB_REQUIRED gio-2.0 >= $GLIB_REQUIRED $LIBECAL_REQUIREMENT librsvg-2.0 dbus-glib-1 gweather >= $GWEATHER_REQUIRED gnome-desktop-2.0 >= $LIBGNOME_DESKTOP_REQUIRED" 2>&1`
- fi
- # Put the nasty error message in config.log where it belongs
- echo "$CLOCK_PKG_ERRORS" >&5
-
-- { { $as_echo "$as_me:$LINENO: error: Package requirements (pango >= $PANGO_REQUIRED gtk+-2.0 >= $GTK_REQUIRED glib-2.0 >= $GLIB_REQUIRED gio-2.0 >= $GLIB_REQUIRED $LIBECAL_REQUIREMENT librsvg-2.0 dbus-glib-1 gweather >= $GWEATHER_REQUIRED) were not met:
-+ { { $as_echo "$as_me:$LINENO: error: Package requirements (pango >= $PANGO_REQUIRED gtk+-2.0 >= $GTK_REQUIRED glib-2.0 >= $GLIB_REQUIRED gio-2.0 >= $GLIB_REQUIRED $LIBECAL_REQUIREMENT librsvg-2.0 dbus-glib-1 gweather >= $GWEATHER_REQUIRED gnome-desktop-2.0 >= $LIBGNOME_DESKTOP_REQUIRED) were not met:
-
- $CLOCK_PKG_ERRORS
-
-@@ -15011,7 +15012,7 @@ Alternatively, you may set the environme
- and CLOCK_LIBS to avoid the need to call pkg-config.
- See the pkg-config man page for more details.
- " >&5
--$as_echo "$as_me: error: Package requirements (pango >= $PANGO_REQUIRED gtk+-2.0 >= $GTK_REQUIRED glib-2.0 >= $GLIB_REQUIRED gio-2.0 >= $GLIB_REQUIRED $LIBECAL_REQUIREMENT librsvg-2.0 dbus-glib-1 gweather >= $GWEATHER_REQUIRED) were not met:
-+$as_echo "$as_me: error: Package requirements (pango >= $PANGO_REQUIRED gtk+-2.0 >= $GTK_REQUIRED glib-2.0 >= $GLIB_REQUIRED gio-2.0 >= $GLIB_REQUIRED $LIBECAL_REQUIREMENT librsvg-2.0 dbus-glib-1 gweather >= $GWEATHER_REQUIRED gnome-desktop-2.0 >= $LIBGNOME_DESKTOP_REQUIRED) were not met:
-
- $CLOCK_PKG_ERRORS
-
diff --git a/x11/gnome-panel/files/patch-gnome-panel_panel-multiscreen.c b/x11/gnome-panel/files/patch-gnome-panel_panel-multiscreen.c
deleted file mode 100644
index 50ef12367..000000000
--- a/x11/gnome-panel/files/patch-gnome-panel_panel-multiscreen.c
+++ /dev/null
@@ -1,59 +0,0 @@
---- gnome-panel/panel-multiscreen.c.orig 2009-10-12 22:57:08.000000000 +1000
-+++ gnome-panel/panel-multiscreen.c 2009-10-12 22:57:08.000000000 +1000
-@@ -136,9 +136,17 @@
- xroot = GDK_WINDOW_XWINDOW (gdk_screen_get_root_window (screen));
-
- #if (RANDR_MAJOR > 1 || (RANDR_MAJOR == 1 && RANDR_MINOR >= 3))
-- if (have_randr_1_3)
-+ if (have_randr_1_3) {
- resources = XRRGetScreenResourcesCurrent (xdisplay, xroot);
-- else
-+ if (resources->noutput == 0) {
-+ /* This might happen if nothing tried to get randr
-+ * resources from the server before, so we need an
-+ * active probe. See comment #27 in
-+ * https://bugzilla.gnome.org/show_bug.cgi?id=597101 */
-+ XRRFreeScreenResources (resources);
-+ resources = XRRGetScreenResources (xdisplay, xroot);
-+ }
-+ } else
- resources = XRRGetScreenResources (xdisplay, xroot);
- #else
- resources = XRRGetScreenResources (xdisplay, xroot);
-@@ -205,6 +213,17 @@
- return FALSE;
- }
-
-+ if (geometries->len == 0) {
-+ /* This can happen in at least one case:
-+ * https://bugzilla.novell.com/show_bug.cgi?id=543876 where all
-+ * monitors appear disconnected (possibly because the screen
-+ * is behing a KVM switch) -- see comment #8.
-+ * There might be other cases too, so we stay on the safe side.
-+ */
-+ g_array_free (geometries, TRUE);
-+ return FALSE;
-+ }
-+
- *monitors_ret = geometries->len;
- *geometries_ret = (GdkRectangle *) g_array_free (geometries, FALSE);
-
-@@ -238,9 +257,15 @@
- int *monitors_ret,
- GdkRectangle **geometries_ret)
- {
-- if (panel_multiscreen_get_randr_monitors_for_screen (screen,
-- monitors_ret,
-- geometries_ret))
-+ gboolean res;
-+
-+ *monitors_ret = 0;
-+ *geometries_ret = NULL;
-+
-+ res = panel_multiscreen_get_randr_monitors_for_screen (screen,
-+ monitors_ret,
-+ geometries_ret);
-+ if (res && *monitors_ret > 0)
- return;
-
- panel_multiscreen_get_gdk_monitors_for_screen (screen,
diff --git a/x11/gnome-panel/files/patch-po_ja.po b/x11/gnome-panel/files/patch-po_ja.po
deleted file mode 100644
index 5a71e3919..000000000
--- a/x11/gnome-panel/files/patch-po_ja.po
+++ /dev/null
@@ -1,20 +0,0 @@
---- po/ja.po.orig 2007-08-13 19:37:02.000000000 -0400
-+++ po/ja.po 2007-08-14 17:00:06.000000000 -0400
-@@ -97,7 +97,7 @@ msgstr "%k:%M"
- #. * possible.
- #: ../applets/clock/calendar-window.c:234
- msgid "%b %d"
--msgstr "%b%e日"
-+msgstr "%B%e日"
-
- #: ../applets/clock/calendar-window.c:742
- msgid "_Tasks"
-@@ -138,7 +138,7 @@ msgstr "%k:%M:%S"
- #.
- #: ../applets/clock/clock.c:369
- msgid "%a %b %e"
--msgstr "%b%e日 (%a)"
-+msgstr "%B%e日 (%a)"
-
- #. translators: reverse the order of these arguments
- #. * if the time should come before the
diff --git a/x11/gnome-panel/files/patch-po_ko.po b/x11/gnome-panel/files/patch-po_ko.po
deleted file mode 100644
index 7de508a0e..000000000
--- a/x11/gnome-panel/files/patch-po_ko.po
+++ /dev/null
@@ -1,29 +0,0 @@
---- po/ko.po.orig 2008-02-26 18:15:58.000000000 +0100
-+++ po/ko.po 2008-02-26 18:16:31.000000000 +0100
-@@ -95,7 +95,7 @@ msgstr "%H:%M"
- #. * possible.
- #: ../applets/clock/calendar-window.c:250
- msgid "%b %d"
--msgstr "%b %e일"
-+msgstr "%B %e일"
-
- #: ../applets/clock/calendar-window.c:765
- msgid "Tasks"
-@@ -146,7 +146,7 @@ msgstr "%H:%M:%S"
- #.
- #: ../applets/clock/clock.c:443
- msgid "%a %b %e"
--msgstr "%b %e일 (%a)"
-+msgstr "%B %e일 (%a)"
-
- #. translators: reverse the order of these arguments
- #. * if the time should come before the
-@@ -207,7 +207,7 @@ msgstr "%p %I:%M"
-
- #: ../applets/clock/clock.c:1590
- msgid "%A, %B %d %Y"
--msgstr "%Y년 %b %e일 %A"
-+msgstr "%Y년 %B %e일 %A"
-
- #: ../applets/clock/clock.c:1665
- #, c-format