diff --git a/x11/gnome/controlcenter/patches/patch-libgnome-control-center_Makefile_in b/x11/gnome/controlcenter/patches/patch-libgnome-control-center_Makefile_in new file mode 100644 index 00000000000..4aaeacfa34b --- /dev/null +++ b/x11/gnome/controlcenter/patches/patch-libgnome-control-center_Makefile_in @@ -0,0 +1,18 @@ +$OpenBSD: patch-libgnome-control-center_Makefile_in,v 1.1.1.1 2011/09/12 07:29:31 ajacoutot Exp $ + +From f658ff61aa687a8aea7c6e098beb61c61a9233ce Mon Sep 17 00:00:00 2001 +From: Antoine Jacoutot +Date: Thu, 26 May 2011 15:45:23 +0000 +Subject: Typo preventing compilation on some platforms. + +--- libgnome-control-center/Makefile.in.orig Tue May 24 10:49:25 2011 ++++ libgnome-control-center/Makefile.in Tue May 24 11:13:07 2011 +@@ -363,7 +363,7 @@ libgnome_control_center_la_SOURCES = \ + $(NULL) + + libgnome_control_center_la_LDFLAGS = \ +- no-undefined \ ++ -no-undefined \ + -version-info $(LIBGNOMECONTROLCENTER_CURRENT):$(LIBGNOMECONTROLCENTER_REVISION):$(LIBGNOMECONTROLCENTER_AGE) \ + $(NULL) + diff --git a/x11/gnome/controlcenter/patches/patch-panels_Makefile_in b/x11/gnome/controlcenter/patches/patch-panels_Makefile_in new file mode 100644 index 00000000000..2a455dfea14 --- /dev/null +++ b/x11/gnome/controlcenter/patches/patch-panels_Makefile_in @@ -0,0 +1,24 @@ +$OpenBSD: patch-panels_Makefile_in,v 1.1.1.1 2011/09/12 07:29:31 ajacoutot Exp $ + +XXX gnome-sound-panel needs pulseaudio to compile and run. + +--- panels/Makefile.in.orig Tue May 24 10:49:25 2011 ++++ panels/Makefile.in Mon Jun 13 18:07:22 2011 +@@ -72,7 +72,7 @@ AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive= + ETAGS = etags + CTAGS = ctags + DIST_SUBDIRS = common background screen power display media mouse \ +- region info sound keyboard universal-access user-accounts \ ++ region info keyboard universal-access user-accounts \ + datetime printers network + DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) + am__relativize = \ +@@ -304,7 +304,7 @@ top_build_prefix = @top_build_prefix@ + top_builddir = @top_builddir@ + top_srcdir = @top_srcdir@ + SUBDIRS = common background screen power display media mouse region \ +- info sound keyboard universal-access user-accounts datetime \ ++ info keyboard universal-access user-accounts datetime \ + $(am__append_1) $(am__append_2) + all: all-recursive + diff --git a/x11/gnome/controlcenter/patches/patch-panels_common_Makefile_in b/x11/gnome/controlcenter/patches/patch-panels_common_Makefile_in new file mode 100644 index 00000000000..5b6f93bbcf8 --- /dev/null +++ b/x11/gnome/controlcenter/patches/patch-panels_common_Makefile_in @@ -0,0 +1,12 @@ +$OpenBSD: patch-panels_common_Makefile_in,v 1.1.1.1 2011/09/12 07:29:31 ajacoutot Exp $ +--- panels/common/Makefile.in.orig Tue May 24 10:49:25 2011 ++++ panels/common/Makefile.in Tue May 24 11:13:07 2011 +@@ -312,7 +312,7 @@ AM_CPPFLAGS = \ + $(LIBLANGUAGE_CFLAGS) \ + -DDATADIR=\""$(datadir)"\" \ + -DUIDIR=\""$(pkgdatadir)/ui/user-accounts"\" \ +- -DLIBLOCALEDIR=\""$(prefix)/lib/locale"\" \ ++ -DLIBLOCALEDIR=\""/usr/share/locale"\" \ + -DGNOMELOCALEDIR=\""$(datadir)/locale"\" \ + -DUM_PIXMAP_DIR=\""$(pkgdatadir)/pixmaps"\" + diff --git a/x11/gnome/controlcenter/patches/patch-panels_common_gdm-languages_c b/x11/gnome/controlcenter/patches/patch-panels_common_gdm-languages_c new file mode 100644 index 00000000000..2f8f0c7018d --- /dev/null +++ b/x11/gnome/controlcenter/patches/patch-panels_common_gdm-languages_c @@ -0,0 +1,25 @@ +$OpenBSD: patch-panels_common_gdm-languages_c,v 1.1.1.1 2011/09/12 07:29:31 ajacoutot Exp $ + +OpenBSD does not provide localedef(1), hence we don't have a +locale-archive file. + +--- panels/common/gdm-languages.c.orig Fri Feb 4 15:39:15 2011 ++++ panels/common/gdm-languages.c Mon May 23 12:35:02 2011 +@@ -451,6 +451,7 @@ struct nameent + static gboolean + collect_locales_from_archive (void) + { ++#ifndef __OpenBSD__ + GMappedFile *mapped; + GError *error; + char *addr; +@@ -508,6 +509,9 @@ collect_locales_from_archive (void) + + g_mapped_file_unref (mapped); + return locales_collected; ++#else ++ return FALSE; ++#endif + } + + static int diff --git a/x11/gnome/controlcenter/patches/patch-panels_datetime_datetime_ui b/x11/gnome/controlcenter/patches/patch-panels_datetime_datetime_ui new file mode 100644 index 00000000000..e8d9aa7381b --- /dev/null +++ b/x11/gnome/controlcenter/patches/patch-panels_datetime_datetime_ui @@ -0,0 +1,25 @@ +$OpenBSD: patch-panels_datetime_datetime_ui,v 1.1.1.1 2011/09/12 07:29:31 ajacoutot Exp $ + +XXX don't show the NTP switch -- it requires /sbin/service, chkconfig or +update-rc... + +--- panels/datetime/datetime.ui.orig Thu Jun 16 07:29:13 2011 ++++ panels/datetime/datetime.ui Thu Jun 16 07:28:51 2011 +@@ -114,7 +114,7 @@ + 12 + + +- True ++ False + 0 + Network Time + +@@ -124,7 +124,7 @@ + + + +- True ++ False + True + True + diff --git a/x11/gnome/controlcenter/patches/patch-panels_info_cc-info-panel_c b/x11/gnome/controlcenter/patches/patch-panels_info_cc-info-panel_c new file mode 100644 index 00000000000..47fe6e5e4d8 --- /dev/null +++ b/x11/gnome/controlcenter/patches/patch-panels_info_cc-info-panel_c @@ -0,0 +1,82 @@ +$OpenBSD: patch-panels_info_cc-info-panel_c,v 1.1.1.1 2011/09/12 07:29:31 ajacoutot Exp $ + +No PackageKit on OpenBSD. + +--- panels/info/cc-info-panel.c.orig Tue May 24 10:36:24 2011 ++++ panels/info/cc-info-panel.c Wed Jun 1 13:01:22 2011 +@@ -23,7 +23,12 @@ + + #include "cc-info-panel.h" + ++#if defined(__FreeBSD__) || defined(__OpenBSD__) ++#include ++#include ++#else + #include ++#endif + + #include + #include +@@ -1123,6 +1128,7 @@ on_pk_get_updates_ready (GObject *source, + GAsyncResult *res, + CcInfoPanel *self) + { ++#ifndef __OpenBSD__ + GError *error; + GVariant *result; + +@@ -1134,6 +1140,9 @@ on_pk_get_updates_ready (GObject *source, + g_error_free (error); + return; + } ++#else ++ return; ++#endif + } + + static void +@@ -1141,6 +1150,7 @@ on_pk_get_tid_ready (GObject *source, + GAsyncResult *res, + CcInfoPanel *self) + { ++#ifndef __OpenBSD__ + GError *error; + GVariant *result; + char *tid; +@@ -1186,6 +1196,9 @@ on_pk_get_tid_ready (GObject *source, + NULL, + (GAsyncReadyCallback) on_pk_get_updates_ready, + self); ++#else ++ return; ++#endif + } + + static void +@@ -1247,6 +1260,7 @@ cc_info_panel_init (CcInfoPanel *self) + + g_assert (self->priv->session_bus); + ++#ifndef __OpenBSD__ + self->priv->pk_proxy = g_dbus_proxy_new_for_bus_sync (G_BUS_TYPE_SYSTEM, + G_DBUS_PROXY_FLAGS_NONE, + NULL, +@@ -1265,6 +1279,7 @@ cc_info_panel_init (CcInfoPanel *self) + self); + refresh_updates (self); + } ++#endif + + gtk_builder_add_from_file (self->priv->builder, + GNOMECC_UI_DIR "/info.ui", +@@ -1279,8 +1294,10 @@ cc_info_panel_init (CcInfoPanel *self) + + self->priv->graphics_data = get_graphics_data (); + ++#ifndef __OpenBSD__ + widget = WID (self->priv->builder, "updates_button"); + g_signal_connect (widget, "clicked", G_CALLBACK (on_updates_button_clicked), self); ++#endif + + info_panel_setup_selector (self); + info_panel_setup_overview (self); diff --git a/x11/gnome/controlcenter/patches/patch-panels_keyboard_cc-keyboard-item_c b/x11/gnome/controlcenter/patches/patch-panels_keyboard_cc-keyboard-item_c new file mode 100644 index 00000000000..6970ae497fe --- /dev/null +++ b/x11/gnome/controlcenter/patches/patch-panels_keyboard_cc-keyboard-item_c @@ -0,0 +1,17 @@ +$OpenBSD: patch-panels_keyboard_cc-keyboard-item_c,v 1.1.1.1 2011/09/12 07:29:32 ajacoutot Exp $ + +From a6d3ad6af357731da213695ac37e04afc8a79448 Mon Sep 17 00:00:00 2001 +From: Florian Müllner +Date: Wed, 29 Jun 2011 04:12:10 +0000 +Subject: keyboard: Fix a small memory leak + +--- panels/keyboard/cc-keyboard-item.c.orig Fri Apr 29 10:40:29 2011 ++++ panels/keyboard/cc-keyboard-item.c Sat Jul 2 01:22:46 2011 +@@ -410,6 +410,7 @@ binding_changed (GSettings *settings, + value = g_settings_get_string (item->settings, item->key); + item->editable = g_settings_is_writable (item->settings, item->key); + _set_binding (item, value, FALSE); ++ g_free (value); + g_object_notify (G_OBJECT (item), "binding"); + } + diff --git a/x11/gnome/controlcenter/patches/patch-panels_printers_cc-printers-panel_c b/x11/gnome/controlcenter/patches/patch-panels_printers_cc-printers-panel_c new file mode 100644 index 00000000000..4c1fbef8959 --- /dev/null +++ b/x11/gnome/controlcenter/patches/patch-panels_printers_cc-printers-panel_c @@ -0,0 +1,12 @@ +$OpenBSD: patch-panels_printers_cc-printers-panel_c,v 1.1.1.1 2011/09/12 07:29:31 ajacoutot Exp $ +--- panels/printers/cc-printers-panel.c.orig Tue May 24 10:36:24 2011 ++++ panels/printers/cc-printers-panel.c Tue May 24 11:13:07 2011 +@@ -2229,7 +2229,7 @@ test_page_cb (GtkButton *button, + if (printer_name) + { + const gchar *const dirs[] = { "/usr/share/cups", +- "/usr/local/share/cups", ++ "${LOCALBASE}/share/cups", + NULL }; + const gchar *testprint[] = { "%s/data/testprint", + "%s/data/testprint.ps", diff --git a/x11/gnome/controlcenter/patches/patch-panels_printers_pp-new-printer-dialog_c b/x11/gnome/controlcenter/patches/patch-panels_printers_pp-new-printer-dialog_c new file mode 100644 index 00000000000..c5730427a3d --- /dev/null +++ b/x11/gnome/controlcenter/patches/patch-panels_printers_pp-new-printer-dialog_c @@ -0,0 +1,33 @@ +$OpenBSD: patch-panels_printers_pp-new-printer-dialog_c,v 1.1.1.1 2011/09/12 07:29:32 ajacoutot Exp $ + +No PackageKit on OpenBSD. + +--- panels/printers/pp-new-printer-dialog.c.orig Mon May 9 12:31:40 2011 ++++ panels/printers/pp-new-printer-dialog.c Wed Jun 1 12:58:26 2011 +@@ -971,6 +971,7 @@ new_printer_add_button_cb (GtkButton *button, + pp->devices[device_id].device_uri, + pp->devices[device_id].device_location); + ++#ifndef __OpenBSD__ + if (ppd_name == NULL || ppd_name->ppd_match_level < PPD_EXACT_MATCH) + { + /* Try PackageKit to install printer driver */ +@@ -1028,6 +1029,7 @@ new_printer_add_button_cb (GtkButton *button, + g_free (device_ids); + } + } ++#endif + + /* Add the new printer */ + if (ppd_name && ppd_name->ppd_name) +@@ -1154,8 +1156,10 @@ new_printer_add_button_cb (GtkButton *button, + + + /* Set default PaperSize according to the locale */ ++#ifndef __OpenBSD__ + locale = setlocale (LC_PAPER, NULL); + if (locale == NULL) ++#endif + locale = setlocale (LC_MESSAGES, NULL); + + if (locale) diff --git a/x11/gnome/controlcenter/patches/patch-panels_user-accounts_Makefile_in b/x11/gnome/controlcenter/patches/patch-panels_user-accounts_Makefile_in new file mode 100644 index 00000000000..7845d98c7ae --- /dev/null +++ b/x11/gnome/controlcenter/patches/patch-panels_user-accounts_Makefile_in @@ -0,0 +1,12 @@ +$OpenBSD: patch-panels_user-accounts_Makefile_in,v 1.1.1.1 2011/09/12 07:29:32 ajacoutot Exp $ +--- panels/user-accounts/Makefile.in.orig Tue May 24 10:49:28 2011 ++++ panels/user-accounts/Makefile.in Tue May 24 11:13:07 2011 +@@ -376,7 +376,7 @@ ccpanelsdir = $(PANELS_DIR) + ccpanels_LTLIBRARIES = libuser-accounts.la + AM_CPPFLAGS = -DDATADIR=\""$(datadir)"\" \ + -DUIDIR=\""$(pkgdatadir)/ui/user-accounts"\" \ +- -DLIBLOCALEDIR=\""$(prefix)/lib/locale"\" \ ++ -DLIBLOCALEDIR=\""/usr/share/locale"\" \ + -DGNOMELOCALEDIR=\""$(datadir)/locale"\" \ + -DUM_PIXMAP_DIR=\""$(pkgdatadir)/pixmaps"\" \ + -I$(srcdir)/../common/ $(PANEL_CFLAGS) \