cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update to gnome-control-center-3.2.0.

Browse Source
This commit is contained in:
ajacoutot 2011-09-27 12:15:23 +00:00
parent 20fcc2f06d
commit e1698b33de
17 changed files with 276 additions and 143 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
x11/gnome/controlcenter/Makefile
View File

@ -1,12 +1,11 @@
# $OpenBSD: Makefile,v 1.36 2011/09/26 07:33:25 ajacoutot Exp $
# $OpenBSD: Makefile,v 1.37 2011/09/27 12:15:23 ajacoutot Exp $
SHARED_ONLY= Yes
COMMENT= GNOME control center
GNOME_PROJECT= gnome-control-center
GNOME_VERSION= 3.0.2
REVISION= 4
GNOME_VERSION= 3.2.0
SHARED_LIBS += gnome-control-center 0.0 # 1.0
@ -20,33 +19,37 @@ PERMIT_DISTFILES_FTP= Yes
WANTLIB += GL ICE ORBit-2 SM X11 X11-xcb Xau Xcomposite Xcursor
WANTLIB += Xdamage Xdmcp Xext Xfixes Xi Xinerama Xrandr Xrender
WANTLIB += Xtst Xxf86vm asn1 atk-1.0 c cairo cairo-gobject canberra
WANTLIB += canberra-gtk3 crypto cups dbus-1 dbus-glib-1 drm execinfo
WANTLIB += expat ffi fontconfig freetype gconf-2 gdbm gdk-3 gdk_pixbuf-2.0
WANTLIB += gio-2.0 glib-2.0 gmodule-2.0 gnome-desktop-3 gnome-menu
WANTLIB += gnomekbd gnomekbdui gobject-2.0 gssapi gthread-2.0
WANTLIB += gtk-3 gtop-2.0 krb5 kvm ltdl m ogg pango-1.0 pangocairo-1.0
WANTLIB += pangoft2-1.0 pcre pixman-1 png polkit-gobject-1 pthread
WANTLIB += pthread-stubs pulse pulse-mainloop-glib sndfile ssl
WANTLIB += vorbis vorbisfile xcb
WANTLIB += xcb-render xcb-shm xkbfile xklavier xml2 z
EXTRACT_SUFX= .tar.bz2
WANTLIB += Xt Xtst Xxf86vm asn1 atk-1.0 c cairo cairo-gobject
WANTLIB += canberra canberra-gtk3 crypto cups dbus-1 dbus-glib-1
WANTLIB += drm enchant execinfo expat ffi fontconfig freetype
WANTLIB += gailutil-3 gconf-2 gcrypt gdbm gdk-3 gdk_pixbuf-2.0
WANTLIB += gio-2.0 glib-2.0 gmodule-2.0 gnome-desktop-3 gnome-keyring
WANTLIB += gnome-menu-3 gnomekbd gnomekbdui goa-1.0 goa-backend-1.0
WANTLIB += gobject-2.0 gpg-error gssapi gstapp-0.10 gstbase-0.10
WANTLIB += gstinterfaces-0.10 gstpbutils-0.10 gstreamer-0.10 gstvideo-0.10
WANTLIB += gthread-2.0 gtk-3 gtop-2.0 icudata icui18n icuuc jpeg
WANTLIB += json-glib-1.0 krb5 kvm ltdl m notify ogg pango-1.0
WANTLIB += pangocairo-1.0 pangoft2-1.0 pcre pixman-1 png polkit-gobject-1
WANTLIB += pthread pthread-stubs pulse pulse-mainloop-glib rest-0.7
WANTLIB += sndfile soup-2.4 soup-gnome-2.4 sqlite3 ssl stdc++
WANTLIB += vorbis vorbisfile webkitgtk-3.0 xcb xcb-render xcb-shm
WANTLIB += xkbfile xklavier xml2 xslt z
MODULES= devel/gettext \
x11/gnome
LIB_DEPENDS= x11/gnome/desktop \
x11/gnome/menus \
x11/gnome/menus>=3.2.0 \
x11/gnome/libgnomekbd \
x11/gnome/online-accounts \
sysutils/upower \
devel/libgtop2 \
print/cups \
audio/pulseaudio
BUILD_DEPENDS= x11/gnome/settings-daemon \
BUILD_DEPENDS= x11/gnome/settings-daemon>=3.2.0 \
devel/gsettings-desktop-schemas
RUN_DEPENDS= x11/gnome/settings-daemon \
RUN_DEPENDS= x11/gnome/settings-daemon>=3.2.0 \
devel/gsettings-desktop-schemas
# NOTE that a11y dependencies (e.g. mousetweaks, caribou...) are not
@ -93,13 +96,14 @@ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \
FAKE_FLAGS= sysconfdir=${PREFIX}/share/examples/gnome-control-center \
pkgconfigdir=${PREFIX}/lib/pkgconfig/
# Plugins that are not fully working yet:
# XXX plugins that are not fully working yet:
# * gnome-media-panel needs udev to take appropriate action on device
# plug (see patch-schemas_org_gnome_desktop_media-handling_gschema_xml_in_in
# in devel/gsettings-desktop-schemas).
# * gnome-power-panel needs a fully working gnome-power-manager
# (userland cannot be made aware of power/button events yet).
DISABLED_PLUGINS= media power
# * gnome-wacom-panel needs device detection support
DISABLED_PLUGINS= media power wacom
pre-configure:
${SUBST_CMD} ${WRKSRC}/panels/printers/cc-printers-panel.c
@ -107,7 +111,7 @@ pre-configure:
post-install:
.for i in ${DISABLED_PLUGINS}
cd ${PREFIX} && \
rm lib/control-center-1/panels/lib$i.* ;\
rm lib/control-center-1/panels/lib$i* ;\
rm share/applications/gnome-$i-panel.desktop ;\
rm share/gnome-control-center/ui/*$i*.ui
.endfor

10
x11/gnome/controlcenter/distinfo
View File

@ -1,5 +1,5 @@
MD5 (gnome/gnome-control-center-3.0.2.tar.bz2) = W1YB+66L44oxOhabD7TZvw==
RMD160 (gnome/gnome-control-center-3.0.2.tar.bz2) = 4ZA8hNf2pmYqY4bnEQdzunifY0s=
SHA1 (gnome/gnome-control-center-3.0.2.tar.bz2) = wNXSA+JbwYKeJXgLEl77PZpOdB8=
SHA256 (gnome/gnome-control-center-3.0.2.tar.bz2) = R3sJoGCnXjZkvZzJqsa3gAZ+UBmCF+PhHcZJgONBSJY=
SIZE (gnome/gnome-control-center-3.0.2.tar.bz2) = 4567179
MD5 (gnome/gnome-control-center-3.2.0.tar.xz) = oXpSqPjo5S0NyG55GrapBw==
RMD160 (gnome/gnome-control-center-3.2.0.tar.xz) = /eF4riMLSfGSI8NCgFN1cttGg6I=
SHA1 (gnome/gnome-control-center-3.2.0.tar.xz) = LHBGrVthefyHxbwsYkD2vyoQ2TY=
SHA256 (gnome/gnome-control-center-3.2.0.tar.xz) = Bskn3L7iv2PklgRBzLm+pV0SqoMHjl1x6YMtUv0ZZqo=
SIZE (gnome/gnome-control-center-3.2.0.tar.xz) = 4233912

103
x11/gnome/controlcenter/patches/patch-configure Normal file
View File

@ -0,0 +1,103 @@
$OpenBSD: patch-configure,v 1.13 2011/09/27 12:15:23 ajacoutot Exp $
No colord on OpenBSD.
--- configure.orig Tue Sep 27 11:36:47 2011
+++ configure Tue Sep 27 11:37:11 2011
@@ -14929,96 +14929,6 @@ $as_echo "yes" >&6; }
fi
-pkg_failed=no
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for COLOR_PANEL" >&5
-$as_echo_n "checking for COLOR_PANEL... " >&6; }
-
-if test -n "$COLOR_PANEL_CFLAGS"; then
- pkg_cv_COLOR_PANEL_CFLAGS="$COLOR_PANEL_CFLAGS"
- elif test -n "$PKG_CONFIG"; then
- if test -n "$PKG_CONFIG" && \
- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$COMMON_MODULES colord >= 0.1.8\""; } >&5
- ($PKG_CONFIG --exists --print-errors "$COMMON_MODULES colord >= 0.1.8") 2>&5
- ac_status=$?
- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
- test $ac_status = 0; }; then
- pkg_cv_COLOR_PANEL_CFLAGS=`$PKG_CONFIG --cflags "$COMMON_MODULES colord >= 0.1.8" 2>/dev/null`
- test "x$?" != "x0" && pkg_failed=yes
-else
- pkg_failed=yes
-fi
- else
- pkg_failed=untried
-fi
-if test -n "$COLOR_PANEL_LIBS"; then
- pkg_cv_COLOR_PANEL_LIBS="$COLOR_PANEL_LIBS"
- elif test -n "$PKG_CONFIG"; then
- if test -n "$PKG_CONFIG" && \
- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$COMMON_MODULES colord >= 0.1.8\""; } >&5
- ($PKG_CONFIG --exists --print-errors "$COMMON_MODULES colord >= 0.1.8") 2>&5
- ac_status=$?
- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
- test $ac_status = 0; }; then
- pkg_cv_COLOR_PANEL_LIBS=`$PKG_CONFIG --libs "$COMMON_MODULES colord >= 0.1.8" 2>/dev/null`
- test "x$?" != "x0" && pkg_failed=yes
-else
- pkg_failed=yes
-fi
- else
- pkg_failed=untried
-fi
-
-
-
-if test $pkg_failed = yes; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-
-if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
- _pkg_short_errors_supported=yes
-else
- _pkg_short_errors_supported=no
-fi
- if test $_pkg_short_errors_supported = yes; then
- COLOR_PANEL_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "$COMMON_MODULES colord >= 0.1.8" 2>&1`
- else
- COLOR_PANEL_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "$COMMON_MODULES colord >= 0.1.8" 2>&1`
- fi
- # Put the nasty error message in config.log where it belongs
- echo "$COLOR_PANEL_PKG_ERRORS" >&5
-
- as_fn_error $? "Package requirements ($COMMON_MODULES colord >= 0.1.8) were not met:
-
-$COLOR_PANEL_PKG_ERRORS
-
-Consider adjusting the PKG_CONFIG_PATH environment variable if you
-installed software in a non-standard prefix.
-
-Alternatively, you may set the environment variables COLOR_PANEL_CFLAGS
-and COLOR_PANEL_LIBS to avoid the need to call pkg-config.
-See the pkg-config man page for more details." "$LINENO" 5
-elif test $pkg_failed = untried; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
- { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error $? "The pkg-config script could not be found or is too old. Make sure it
-is in your PATH or set the PKG_CONFIG environment variable to the full
-path to pkg-config.
-
-Alternatively, you may set the environment variables COLOR_PANEL_CFLAGS
-and COLOR_PANEL_LIBS to avoid the need to call pkg-config.
-See the pkg-config man page for more details.
-
-To get pkg-config, see <http://pkg-config.freedesktop.org/>.
-See \`config.log' for more details" "$LINENO" 5; }
-else
- COLOR_PANEL_CFLAGS=$pkg_cv_COLOR_PANEL_CFLAGS
- COLOR_PANEL_LIBS=$pkg_cv_COLOR_PANEL_LIBS
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-
-fi
pkg_failed=no
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for PRINTERS_PANEL" >&5

18
x11/gnome/controlcenter/patches/patch-libgnome-control-center_Makefile_in
View File

@ -1,18 +0,0 @@
$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 <ajacoutot@openbsd.org>
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)

24
x11/gnome/controlcenter/patches/patch-panels_Makefile_in Normal file
View File

@ -0,0 +1,24 @@
$OpenBSD: patch-panels_Makefile_in,v 1.3 2011/09/27 12:15:23 ajacoutot Exp $
No colord on OpenBSD.
--- panels/Makefile.in.orig Tue Sep 27 11:37:29 2011
+++ panels/Makefile.in Tue Sep 27 11:37:37 2011
@@ -71,7 +71,7 @@ AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=
distdir
ETAGS = etags
CTAGS = ctags
-DIST_SUBDIRS = common background screen power color display media \
+DIST_SUBDIRS = common background screen power display media \
mouse online-accounts region info sound keyboard \
universal-access user-accounts datetime wacom printers network
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
@@ -309,7 +309,7 @@ target_alias = @target_alias@
top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
-SUBDIRS = common background screen power color display media mouse \
+SUBDIRS = common background screen power display media mouse \
online-accounts region info sound keyboard universal-access \
user-accounts datetime wacom $(am__append_1) $(am__append_2)
all: all-recursive

12
x11/gnome/controlcenter/patches/patch-panels_common_Makefile_in
View File

@ -1,12 +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 = \
$OpenBSD: patch-panels_common_Makefile_in,v 1.2 2011/09/27 12:15:23 ajacoutot Exp $
--- panels/common/Makefile.in.orig Mon Sep 19 22:26:43 2011
+++ panels/common/Makefile.in Mon Sep 26 14:01:58 2011
@@ -356,7 +356,7 @@ AM_CPPFLAGS = \
$(LIBLANGUAGE_CFLAGS) \
-DDATADIR=\""$(datadir)"\" \
-DUIDIR=\""$(pkgdatadir)/ui/user-accounts"\" \
-DUIDIR=\""$(pkgdatadir)/ui"\" \
- -DLIBLOCALEDIR=\""$(prefix)/lib/locale"\" \
+ -DLIBLOCALEDIR=\""/usr/share/locale"\" \
+ -DLIBLOCALEDIR=\""/usr/share/locale"\" \
-DGNOMELOCALEDIR=\""$(datadir)/locale"\" \
-DUM_PIXMAP_DIR=\""$(pkgdatadir)/pixmaps"\"

10
x11/gnome/controlcenter/patches/patch-panels_common_gdm-languages_c
View File

@ -1,11 +1,11 @@
$OpenBSD: patch-panels_common_gdm-languages_c,v 1.1.1.1 2011/09/12 07:29:31 ajacoutot Exp $
$OpenBSD: patch-panels_common_gdm-languages_c,v 1.2 2011/09/27 12:15:23 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
--- panels/common/gdm-languages.c.orig Tue Aug 23 10:23:42 2011
+++ panels/common/gdm-languages.c Mon Sep 26 14:01:06 2011
@@ -455,6 +455,7 @@ struct nameent
static gboolean
collect_locales_from_archive (void)
{
@ -13,7 +13,7 @@ locale-archive file.
GMappedFile *mapped;
GError *error;
char *addr;
@@ -508,6 +509,9 @@ collect_locales_from_archive (void)
@@ -512,6 +513,9 @@ collect_locales_from_archive (void)
g_mapped_file_unref (mapped);
return locales_collected;

14
x11/gnome/controlcenter/patches/patch-panels_datetime_datetime_ui
View File

@ -1,20 +1,20 @@
$OpenBSD: patch-panels_datetime_datetime_ui,v 1.1.1.1 2011/09/12 07:29:31 ajacoutot Exp $
$OpenBSD: patch-panels_datetime_datetime_ui,v 1.2 2011/09/27 12:15:23 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 @@
--- panels/datetime/datetime.ui.orig Mon Aug 29 16:08:11 2011
+++ panels/datetime/datetime.ui Mon Sep 26 14:01:06 2011
@@ -118,7 +118,7 @@
<property name="spacing">12</property>
<child>
<object class="GtkLabel" id="label3">
- <property name="visible">True</property>
+ <property name="visible">False</property>
<property name="xalign">0</property>
<property name="label" translatable="yes">Network Time</property>
</object>
@@ -124,7 +124,7 @@
<property name="label" translatable="yes">_Network Time</property>
<property name="use_underline">True</property>
@@ -130,7 +130,7 @@
</child>
<child>
<object class="GtkSwitch" id="network_time_switch">

24
x11/gnome/controlcenter/patches/patch-panels_info_cc-info-panel_c
View File

@ -1,9 +1,9 @@
$OpenBSD: patch-panels_info_cc-info-panel_c,v 1.1.1.1 2011/09/12 07:29:31 ajacoutot Exp $
$OpenBSD: patch-panels_info_cc-info-panel_c,v 1.2 2011/09/27 12:15:23 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
--- panels/info/cc-info-panel.c.orig Mon Sep 26 18:04:02 2011
+++ panels/info/cc-info-panel.c Tue Sep 27 11:36:10 2011
@@ -23,7 +23,12 @@
#include "cc-info-panel.h"
@ -14,10 +14,10 @@ No PackageKit on OpenBSD.
+#else
#include <sys/vfs.h>
+#endif
#include <polkit/polkit.h>
#include <glib.h>
#include <glib/gi18n.h>
@@ -1123,6 +1128,7 @@ on_pk_get_updates_ready (GObject *source,
@@ -1296,6 +1301,7 @@ on_pk_get_updates_ready (GObject *source,
GAsyncResult *res,
CcInfoPanel *self)
{
@ -25,7 +25,7 @@ No PackageKit on OpenBSD.
GError *error;
GVariant *result;
@@ -1134,6 +1140,9 @@ on_pk_get_updates_ready (GObject *source,
@@ -1307,6 +1313,9 @@ on_pk_get_updates_ready (GObject *source,
g_error_free (error);
return;
}
@ -35,7 +35,7 @@ No PackageKit on OpenBSD.
}
static void
@@ -1141,6 +1150,7 @@ on_pk_get_tid_ready (GObject *source,
@@ -1314,6 +1323,7 @@ on_pk_get_tid_ready (GObject *source,
GAsyncResult *res,
CcInfoPanel *self)
{
@ -43,7 +43,7 @@ No PackageKit on OpenBSD.
GError *error;
GVariant *result;
char *tid;
@@ -1186,6 +1196,9 @@ on_pk_get_tid_ready (GObject *source,
@@ -1360,6 +1370,9 @@ on_pk_get_tid_ready (GObject *source,
NULL,
(GAsyncReadyCallback) on_pk_get_updates_ready,
self);
@ -53,7 +53,7 @@ No PackageKit on OpenBSD.
}
static void
@@ -1247,6 +1260,7 @@ cc_info_panel_init (CcInfoPanel *self)
@@ -1422,6 +1435,7 @@ cc_info_panel_init (CcInfoPanel *self)
g_assert (self->priv->session_bus);
@ -61,7 +61,7 @@ No PackageKit on 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)
@@ -1443,6 +1457,7 @@ cc_info_panel_init (CcInfoPanel *self)
self);
refresh_updates (self);
}
@ -69,12 +69,12 @@ No PackageKit on OpenBSD.
gtk_builder_add_from_file (self->priv->builder,
GNOMECC_UI_DIR "/info.ui",
@@ -1279,8 +1294,10 @@ cc_info_panel_init (CcInfoPanel *self)
@@ -1457,8 +1472,10 @@ cc_info_panel_init (CcInfoPanel *self)
self->priv->graphics_data = get_graphics_data ();
+#ifndef __OpenBSD__
widget = WID (self->priv->builder, "updates_button");
widget = WID ("updates_button");
g_signal_connect (widget, "clicked", G_CALLBACK (on_updates_button_clicked), self);
+#endif

21
x11/gnome/controlcenter/patches/patch-panels_info_hostnames-test_txt Normal file
View File

@ -0,0 +1,21 @@
$OpenBSD: patch-panels_info_hostnames-test_txt,v 1.1 2011/09/27 12:15:23 ajacoutot Exp $
XXX unbreak build (special chars are not properly processed).
--- panels/info/hostnames-test.txt.orig Tue Sep 27 12:34:57 2011
+++ panels/info/hostnames-test.txt Tue Sep 27 11:59:45 2011
@@ -1,11 +1,11 @@
# Pretty hostname, tab, display hostname, tab, real hostname
Lennart's PC Lennarts-PC lennarts-pc
-Müllers Computer Mullers-Computer mullers-computer
+Mullers Computer Mullers-Computer mullers-computer
Voran! Voran voran
-Es war einmal ein Männlein Es-war-einmal-ein-Mannlein es-war-einmal-ein-mannlein
+Es war einmal ein Mannlein Es-war-einmal-ein-Mannlein es-war-einmal-ein-mannlein
Jawoll. Ist doch wahr! Jawoll-Ist-doch-wahr jawoll-ist-doch-wahr
レナート localhost localhost
!!! localhost localhost
...zack!!! zack!... zack-zack zack-zack
-Bãstien's computer... Foo-bar Bastiens-computer-Foo-bar bastiens-computer-foo-bar
+Bastien's computer... Foo-bar Bastiens-computer-Foo-bar bastiens-computer-foo-bar
localhost localhost

17
x11/gnome/controlcenter/patches/patch-panels_keyboard_cc-keyboard-item_c
View File

@ -1,17 +0,0 @@
$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 <fmuellner@gnome.org>
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");
}

8
x11/gnome/controlcenter/patches/patch-panels_printers_cc-printers-panel_c
View File

@ -1,7 +1,7 @@
$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,
$OpenBSD: patch-panels_printers_cc-printers-panel_c,v 1.2 2011/09/27 12:15:23 ajacoutot Exp $
--- panels/printers/cc-printers-panel.c.orig Wed Jul 27 13:15:40 2011
+++ panels/printers/cc-printers-panel.c Mon Sep 26 14:01:06 2011
@@ -2138,7 +2138,7 @@ test_page_cb (GtkButton *button,
if (printer_name)
{
const gchar *const dirs[] = { "/usr/share/cups",

26
x11/gnome/controlcenter/patches/patch-panels_printers_pp-new-printer-dialog_c
View File

@ -1,28 +1,18 @@
$OpenBSD: patch-panels_printers_pp-new-printer-dialog_c,v 1.2 2011/09/12 17:24:56 ajacoutot Exp $
Fix build with cups >=1.5.0.
$OpenBSD: patch-panels_printers_pp-new-printer-dialog_c,v 1.3 2011/09/27 12:15:23 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 Mon Sep 12 19:12:04 2011
@@ -31,6 +31,7 @@
#include <gtk/gtk.h>
#include <cups/cups.h>
+#include <cups/ppd.h>
#include "pp-new-printer-dialog.h"
#include "pp-utils.h"
@@ -971,6 +972,7 @@ new_printer_add_button_cb (GtkButton *button,
pp->devices[device_id].device_uri,
pp->devices[device_id].device_location);
--- panels/printers/pp-new-printer-dialog.c.orig Mon Sep 19 16:04:52 2011
+++ panels/printers/pp-new-printer-dialog.c Mon Sep 26 14:01:06 2011
@@ -1514,6 +1514,7 @@ new_printer_add_button_cb (GtkButton *button,
pp->devices[device_id].device_make_and_model,
pp->devices[device_id].device_uri);
+#ifndef __OpenBSD__
if (ppd_name == NULL || ppd_name->ppd_match_level < PPD_EXACT_MATCH)
{
/* Try PackageKit to install printer driver */
@@ -1028,6 +1030,7 @@ new_printer_add_button_cb (GtkButton *button,
@@ -1568,6 +1569,7 @@ new_printer_add_button_cb (GtkButton *button,
g_free (device_ids);
}
}
@ -30,7 +20,7 @@ No PackageKit on OpenBSD.
/* Add the new printer */
if (ppd_name && ppd_name->ppd_name)
@@ -1154,8 +1157,10 @@ new_printer_add_button_cb (GtkButton *button,
@@ -1665,8 +1667,10 @@ new_printer_add_button_cb (GtkButton *button,
/* Set default PaperSize according to the locale */

14
x11/gnome/controlcenter/patches/patch-panels_printers_pp-utils_c
View File

@ -1,14 +0,0 @@
$OpenBSD: patch-panels_printers_pp-utils_c,v 1.1 2011/09/12 17:24:56 ajacoutot Exp $
Fix build with cups >=1.5.0.
--- panels/printers/pp-utils.c.orig Mon Sep 12 19:07:08 2011
+++ panels/printers/pp-utils.c Mon Sep 12 19:07:33 2011
@@ -25,6 +25,7 @@
#include <glib/gstdio.h>
#include <gtk/gtk.h>
#include <cups/cups.h>
+#include <cups/ppd.h>
#include <dbus/dbus-glib.h>
#include "pp-utils.h"

28
x11/gnome/controlcenter/patches/patch-panels_region_gnome-region-panel-formats_c Normal file
View File

@ -0,0 +1,28 @@
$OpenBSD: patch-panels_region_gnome-region-panel-formats_c,v 1.1 2011/09/27 12:15:23 ajacoutot Exp $
Fix build if some locale defines are missing.
--- panels/region/gnome-region-panel-formats.c.orig Tue Aug 23 10:23:42 2011
+++ panels/region/gnome-region-panel-formats.c Tue Sep 27 11:59:53 2011
@@ -132,6 +132,7 @@ update_examples_cb (GtkTreeSelection *selection, gpoin
g_free (locale);
/* Display measurement */
+#ifdef LC_MEASUREMENT
locale = g_strdup (setlocale (LC_MEASUREMENT, NULL));
setlocale (LC_MEASUREMENT, active_id);
@@ -139,10 +140,13 @@ update_examples_cb (GtkTreeSelection *selection, gpoin
if (fmt && *fmt == 2)
gtk_label_set_text (GTK_LABEL (gtk_builder_get_object (builder, "measurement_format")), _("Imperial"));
else
+#endif
gtk_label_set_text (GTK_LABEL (gtk_builder_get_object (builder, "measurement_format")), _("Metric"));
+#ifdef LC_MEASUREMENT
setlocale (LC_MEASUREMENT, locale);
g_free (locale);
+#endif
g_free (active_id);
}

10
x11/gnome/controlcenter/patches/patch-panels_user-accounts_Makefile_in
View File

@ -1,7 +1,7 @@
$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)
$OpenBSD: patch-panels_user-accounts_Makefile_in,v 1.2 2011/09/27 12:15:23 ajacoutot Exp $
--- panels/user-accounts/Makefile.in.orig Mon Sep 19 22:26:46 2011
+++ panels/user-accounts/Makefile.in Mon Sep 26 14:01:06 2011
@@ -381,7 +381,7 @@ ccpanelsdir = $(PANELS_DIR)
ccpanels_LTLIBRARIES = libuser-accounts.la
AM_CPPFLAGS = -DDATADIR=\""$(datadir)"\" \
-DUIDIR=\""$(pkgdatadir)/ui/user-accounts"\" \
@ -9,4 +9,4 @@ $OpenBSD: patch-panels_user-accounts_Makefile_in,v 1.1.1.1 2011/09/12 07:29:32 a
+ -DLIBLOCALEDIR=\""/usr/share/locale"\" \
-DGNOMELOCALEDIR=\""$(datadir)/locale"\" \
-DUM_PIXMAP_DIR=\""$(pkgdatadir)/pixmaps"\" \
-I$(srcdir)/../common/ $(PANEL_CFLAGS) \
-I$(srcdir)/../common/ \

34
x11/gnome/controlcenter/pkg/PLIST
View File

@ -1,16 +1,10 @@
@comment $OpenBSD: PLIST,v 1.17 2011/09/25 12:53:55 ajacoutot Exp $
@comment $OpenBSD: PLIST,v 1.18 2011/09/27 12:15:23 ajacoutot Exp $
@conflict control-center-1*
@conflict control-center2-*
@conflict gnome-media-<2.91.2p3
@pkgpath x11/gnome/controlcenter2
@bin bin/gnome-control-center
@bin bin/gnome-sound-applet
include/gnome-control-center-1/
include/gnome-control-center-1/libgnome-control-center/
include/gnome-control-center-1/libgnome-control-center/cc-lockbutton.h
include/gnome-control-center-1/libgnome-control-center/cc-panel.h
include/gnome-control-center-1/libgnome-control-center/cc-shell.h
include/gnome-control-center-1/libgnome-control-center/gconf-property-editor.h
lib/control-center-1/
lib/control-center-1/panels/
@comment lib/control-center-1/panels/libbackground.la
@ -25,6 +19,8 @@ lib/control-center-1/panels/libinfo.so
lib/control-center-1/panels/libkeyboard.so
@comment lib/control-center-1/panels/libmouse-properties.la
lib/control-center-1/panels/libmouse-properties.so
@comment lib/control-center-1/panels/libonline-accounts.la
lib/control-center-1/panels/libonline-accounts.so
@comment lib/control-center-1/panels/libprinters.la
lib/control-center-1/panels/libprinters.so
@comment lib/control-center-1/panels/libregion.la
@ -40,7 +36,6 @@ lib/control-center-1/panels/libuser-accounts.so
lib/libgnome-control-center.la
@lib lib/libgnome-control-center.so.${LIBgnome-control-center_VERSION}
lib/pkgconfig/gnome-keybindings.pc
lib/pkgconfig/libgnome-control-center.pc
share/applications/gnome-background-panel.desktop
share/applications/gnome-control-center.desktop
share/applications/gnome-datetime-panel.desktop
@ -48,6 +43,7 @@ share/applications/gnome-display-panel.desktop
share/applications/gnome-info-panel.desktop
share/applications/gnome-keyboard-panel.desktop
share/applications/gnome-mouse-panel.desktop
share/applications/gnome-online-accounts-panel.desktop
share/applications/gnome-printers-panel.desktop
share/applications/gnome-region-panel.desktop
share/applications/gnome-screen-panel.desktop
@ -156,6 +152,8 @@ share/gnome-control-center/pixmaps/right-ring-finger.png
share/gnome-control-center/pixmaps/right-ring-finger.svg
share/gnome-control-center/pixmaps/right-thumb.png
share/gnome-control-center/pixmaps/right-thumb.svg
share/gnome-control-center/pixmaps/wacom-stylus.svg
share/gnome-control-center/pixmaps/wacom-tablet.svg
share/gnome-control-center/sounds/
share/gnome-control-center/sounds/gnome-sounds-default.xml
share/gnome-control-center/ui/
@ -216,6 +214,8 @@ share/gnome-control-center/ui/gnome-region-panel-layout-chooser.ui
share/gnome-control-center/ui/gnome-region-panel-options-dialog.ui
share/gnome-control-center/ui/gnome-region-panel.ui
share/gnome-control-center/ui/info.ui
share/gnome-control-center/ui/language-chooser.ui
share/gnome-control-center/ui/online-accounts.ui
share/gnome-control-center/ui/printers/
share/gnome-control-center/ui/printers/new-printer-dialog.ui
share/gnome-control-center/ui/printers/printers.ui
@ -225,11 +225,9 @@ share/gnome-control-center/ui/uap.ui
share/gnome-control-center/ui/user-accounts/
share/gnome-control-center/ui/user-accounts/account-dialog.ui
share/gnome-control-center/ui/user-accounts/account-fingerprint.ui
share/gnome-control-center/ui/user-accounts/language-chooser.ui
share/gnome-control-center/ui/user-accounts/password-dialog.ui
share/gnome-control-center/ui/user-accounts/photo-dialog.ui
share/gnome-control-center/ui/user-accounts/user-accounts-dialog.ui
share/gnome/help/
share/gnome/help/control-center/
share/gnome/help/control-center/C/
share/gnome/help/control-center/C/config-accessibility-keyboard.xml
@ -268,6 +266,8 @@ share/gnome/help/control-center/it/
share/gnome/help/control-center/it/control-center.xml
share/gnome/help/control-center/ja/
share/gnome/help/control-center/ja/control-center.xml
share/gnome/help/control-center/ko/
share/gnome/help/control-center/ko/control-center.xml
share/gnome/help/control-center/oc/
share/gnome/help/control-center/oc/control-center.xml
share/gnome/help/control-center/pa/
@ -296,21 +296,33 @@ share/gnome/help/control-center/zh_HK/
share/gnome/help/control-center/zh_HK/control-center.xml
share/gnome/help/control-center/zh_TW/
share/gnome/help/control-center/zh_TW/control-center.xml
share/icons/hicolor/16x16/apps/gnome-power-manager.png
share/icons/hicolor/16x16/apps/goa-panel.png
share/icons/hicolor/16x16/apps/multimedia-volume-control.png
share/icons/hicolor/16x16/apps/multimedia-volume-control.svg
share/icons/hicolor/16x16/apps/preferences-desktop-display.png
share/icons/hicolor/16x16/apps/preferences-system-time.png
share/icons/hicolor/22x22/apps/gnome-power-manager.png
share/icons/hicolor/22x22/apps/goa-panel.png
share/icons/hicolor/22x22/apps/multimedia-volume-control.png
share/icons/hicolor/22x22/apps/multimedia-volume-control.svg
share/icons/hicolor/22x22/apps/preferences-desktop-display.png
share/icons/hicolor/22x22/apps/preferences-system-time.png
share/icons/hicolor/24x24/apps/gnome-power-manager.png
share/icons/hicolor/24x24/apps/goa-panel.png
share/icons/hicolor/24x24/apps/multimedia-volume-control.png
share/icons/hicolor/24x24/apps/preferences-desktop-display.png
share/icons/hicolor/256x256/apps/gnome-power-manager.png
share/icons/hicolor/256x256/apps/goa-panel.png
share/icons/hicolor/256x256/apps/preferences-system-time.png
share/icons/hicolor/32x32/apps/gnome-power-manager.png
share/icons/hicolor/32x32/apps/goa-panel.png
share/icons/hicolor/32x32/apps/multimedia-volume-control.png
share/icons/hicolor/32x32/apps/multimedia-volume-control.svg
share/icons/hicolor/32x32/apps/preferences-desktop-display.png
share/icons/hicolor/32x32/apps/preferences-system-time.png
share/icons/hicolor/48x48/apps/gnome-power-manager.png
share/icons/hicolor/48x48/apps/goa-panel.png
share/icons/hicolor/48x48/apps/multimedia-volume-control.png
share/icons/hicolor/48x48/apps/preferences-system-time.png
share/icons/hicolor/48x48/devices/audio-headset.svg
@ -436,7 +448,6 @@ share/locale/nl/LC_MESSAGES/gnome-control-center-2.0-timezones.mo
share/locale/nl/LC_MESSAGES/gnome-control-center-2.0.mo
share/locale/nn/LC_MESSAGES/gnome-control-center-2.0-timezones.mo
share/locale/nn/LC_MESSAGES/gnome-control-center-2.0.mo
share/locale/no/LC_MESSAGES/gnome-control-center-2.0-timezones.mo
share/locale/nso/LC_MESSAGES/gnome-control-center-2.0.mo
share/locale/oc/LC_MESSAGES/gnome-control-center-2.0.mo
share/locale/or/LC_MESSAGES/gnome-control-center-2.0-timezones.mo
@ -504,6 +515,7 @@ share/omf/control-center/control-center-fr.omf
share/omf/control-center/control-center-gl.omf
share/omf/control-center/control-center-it.omf
share/omf/control-center/control-center-ja.omf
share/omf/control-center/control-center-ko.omf
share/omf/control-center/control-center-oc.omf
share/omf/control-center/control-center-pa.omf
share/omf/control-center/control-center-pl.omf