From 877189971d76b5173de4294bf4288fd306cc3452 Mon Sep 17 00:00:00 2001 From: marcus Date: Thu, 13 Jan 2005 08:12:46 +0000 Subject: Update to 2.9.4. git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@3425 df743ca5-7f9a-e211-a948-0013205c9059 --- sysutils/gnome-control-center/Makefile | 2 +- sysutils/gnome-control-center/distinfo | 4 ++-- ...-capplets_keyboard_gnome-keyboard-properties-xkb.c | 12 ++++++++++++ ...applets_keyboard_gnome-keyboard-properties-xkblt.c | 19 +++++++++++++++++++ sysutils/gnome-control-center/files/patch-configure | 18 +++++------------- .../files/patch-libgswitchit_gswitchit_util.c | 11 ----------- sysutils/gnome-control-center/pkg-plist | 1 + sysutils/gnomecontrolcenter2/Makefile | 2 +- sysutils/gnomecontrolcenter2/distinfo | 4 ++-- ...-capplets_keyboard_gnome-keyboard-properties-xkb.c | 12 ++++++++++++ ...applets_keyboard_gnome-keyboard-properties-xkblt.c | 19 +++++++++++++++++++ sysutils/gnomecontrolcenter2/files/patch-configure | 18 +++++------------- .../files/patch-libgswitchit_gswitchit_util.c | 11 ----------- sysutils/gnomecontrolcenter2/pkg-plist | 1 + 14 files changed, 80 insertions(+), 54 deletions(-) create mode 100644 sysutils/gnome-control-center/files/patch-capplets_keyboard_gnome-keyboard-properties-xkb.c create mode 100644 sysutils/gnome-control-center/files/patch-capplets_keyboard_gnome-keyboard-properties-xkblt.c delete mode 100644 sysutils/gnome-control-center/files/patch-libgswitchit_gswitchit_util.c create mode 100644 sysutils/gnomecontrolcenter2/files/patch-capplets_keyboard_gnome-keyboard-properties-xkb.c create mode 100644 sysutils/gnomecontrolcenter2/files/patch-capplets_keyboard_gnome-keyboard-properties-xkblt.c delete mode 100644 sysutils/gnomecontrolcenter2/files/patch-libgswitchit_gswitchit_util.c (limited to 'sysutils') diff --git a/sysutils/gnome-control-center/Makefile b/sysutils/gnome-control-center/Makefile index 2abdd31cc..080e07082 100644 --- a/sysutils/gnome-control-center/Makefile +++ b/sysutils/gnome-control-center/Makefile @@ -6,7 +6,7 @@ # PORTNAME= gnomecontrolcenter2 -PORTVERSION= 2.9.3 +PORTVERSION= 2.9.4 CATEGORIES= sysutils gnome MASTER_SITES= ${MASTER_SITE_GNOME} MASTER_SITE_SUBDIR= sources/control-center/2.9 diff --git a/sysutils/gnome-control-center/distinfo b/sysutils/gnome-control-center/distinfo index 1b824a13d..8bca5eeeb 100644 --- a/sysutils/gnome-control-center/distinfo +++ b/sysutils/gnome-control-center/distinfo @@ -1,2 +1,2 @@ -MD5 (gnome2/control-center-2.9.3.tar.bz2) = 7a34d2ebe33298991ef02663321f5ed2 -SIZE (gnome2/control-center-2.9.3.tar.bz2) = 2628918 +MD5 (gnome2/control-center-2.9.4.tar.bz2) = b95677dc4caf09c1143804bc54f1b468 +SIZE (gnome2/control-center-2.9.4.tar.bz2) = 2710848 diff --git a/sysutils/gnome-control-center/files/patch-capplets_keyboard_gnome-keyboard-properties-xkb.c b/sysutils/gnome-control-center/files/patch-capplets_keyboard_gnome-keyboard-properties-xkb.c new file mode 100644 index 000000000..3058e0e25 --- /dev/null +++ b/sysutils/gnome-control-center/files/patch-capplets_keyboard_gnome-keyboard-properties-xkb.c @@ -0,0 +1,12 @@ +--- capplets/keyboard/gnome-keyboard-properties-xkb.c.orig Thu Jan 13 02:47:53 2005 ++++ capplets/keyboard/gnome-keyboard-properties-xkb.c Thu Jan 13 02:48:01 2005 +@@ -137,8 +137,8 @@ + void + setup_xkb_tabs (GladeXML * dialog, GConfChangeSet * changeset) + { +- xkbGConfClient = gconf_client_get_default (); + GObject * peditor; ++ xkbGConfClient = gconf_client_get_default (); + + XklInit (GDK_DISPLAY ()); + XklConfigInit (); diff --git a/sysutils/gnome-control-center/files/patch-capplets_keyboard_gnome-keyboard-properties-xkblt.c b/sysutils/gnome-control-center/files/patch-capplets_keyboard_gnome-keyboard-properties-xkblt.c new file mode 100644 index 000000000..70d6b8a7f --- /dev/null +++ b/sysutils/gnome-control-center/files/patch-capplets_keyboard_gnome-keyboard-properties-xkblt.c @@ -0,0 +1,19 @@ +--- capplets/keyboard/gnome-keyboard-properties-xkblt.c.orig Thu Jan 13 02:49:37 2005 ++++ capplets/keyboard/gnome-keyboard-properties-xkblt.c Thu Jan 13 02:51:22 2005 +@@ -105,11 +105,13 @@ + + if (value->type == GCONF_VALUE_INT) + { +- defaultGroup = gconf_value_get_int (value); +- GtkWidget* treeView = WID ("xkb_layouts_selected"); +- GtkTreeModel *model = GTK_TREE_MODEL (gtk_tree_view_get_model (GTK_TREE_VIEW (treeView))); ++ GtkWidget* treeView; ++ GtkTreeModel *model; + GtkTreeIter iter; + int counter = 0; ++ defaultGroup = gconf_value_get_int (value); ++ treeView = WID ("xkb_layouts_selected"); ++ model = GTK_TREE_MODEL (gtk_tree_view_get_model (GTK_TREE_VIEW (treeView))); + if (gtk_tree_model_get_iter_first (model, &iter)) + { + do diff --git a/sysutils/gnome-control-center/files/patch-configure b/sysutils/gnome-control-center/files/patch-configure index f9e0648a5..d8e861724 100644 --- a/sysutils/gnome-control-center/files/patch-configure +++ b/sysutils/gnome-control-center/files/patch-configure @@ -1,6 +1,6 @@ ---- configure.orig Mon Dec 13 00:32:14 2004 -+++ configure Mon Dec 13 00:37:30 2004 -@@ -22217,6 +22217,7 @@ +--- configure.orig Thu Jan 13 02:39:28 2005 ++++ configure Thu Jan 13 02:39:28 2005 +@@ -22221,6 +22221,7 @@ if eval "test \"\${$as_ac_var+set}\" = set"; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -8,15 +8,7 @@ cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF -@@ -22612,6 +22613,7 @@ - cat >>confdefs.h <<_ACEOF - #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1 - _ACEOF -+LIBS="-lintl $LIBS" - have_ngettext=yes - fi - done -@@ -27817,7 +27819,7 @@ +@@ -27490,7 +27491,7 @@ cat >>confdefs.h <<_ACEOF @@ -24,4 +16,4 @@ +#define GNOMECC_DATA_DIR "${datadir}/${GETTEXT_PACKAGE}" _ACEOF - GNOMECC_ICONS_DIR='$(datadir)/'${GETTEXT_PACKAGE}'/icons' + diff --git a/sysutils/gnome-control-center/files/patch-libgswitchit_gswitchit_util.c b/sysutils/gnome-control-center/files/patch-libgswitchit_gswitchit_util.c deleted file mode 100644 index 484a3e5f4..000000000 --- a/sysutils/gnome-control-center/files/patch-libgswitchit_gswitchit_util.c +++ /dev/null @@ -1,11 +0,0 @@ ---- libgswitchit/gswitchit_util.c.orig Mon Dec 13 01:09:01 2004 -+++ libgswitchit/gswitchit_util.c Mon Dec 13 01:15:31 2004 -@@ -60,7 +60,7 @@ - int level, const char format[], va_list args) - { - time_t now = time (NULL); -- g_log (NULL, G_LOG_LEVEL_DEBUG, "[%08ld,%03d,%s:%s/] \t", now, -+ g_log (NULL, G_LOG_LEVEL_DEBUG, "[%08ld,%03d,%s:%s/] \t", (long) now, - level, file, function); - g_logv (NULL, G_LOG_LEVEL_DEBUG, format, args); - } diff --git a/sysutils/gnome-control-center/pkg-plist b/sysutils/gnome-control-center/pkg-plist index 12832ae42..d5064fb82 100644 --- a/sysutils/gnome-control-center/pkg-plist +++ b/sysutils/gnome-control-center/pkg-plist @@ -160,6 +160,7 @@ share/locale/ml/LC_MESSAGES/control-center-2.0.mo share/locale/mn/LC_MESSAGES/control-center-2.0.mo share/locale/ms/LC_MESSAGES/control-center-2.0.mo share/locale/nb/LC_MESSAGES/control-center-2.0.mo +share/locale/ne/LC_MESSAGES/control-center-2.0.mo share/locale/nl/LC_MESSAGES/control-center-2.0.mo share/locale/nn/LC_MESSAGES/control-center-2.0.mo share/locale/no/LC_MESSAGES/control-center-2.0.mo diff --git a/sysutils/gnomecontrolcenter2/Makefile b/sysutils/gnomecontrolcenter2/Makefile index 2abdd31cc..080e07082 100644 --- a/sysutils/gnomecontrolcenter2/Makefile +++ b/sysutils/gnomecontrolcenter2/Makefile @@ -6,7 +6,7 @@ # PORTNAME= gnomecontrolcenter2 -PORTVERSION= 2.9.3 +PORTVERSION= 2.9.4 CATEGORIES= sysutils gnome MASTER_SITES= ${MASTER_SITE_GNOME} MASTER_SITE_SUBDIR= sources/control-center/2.9 diff --git a/sysutils/gnomecontrolcenter2/distinfo b/sysutils/gnomecontrolcenter2/distinfo index 1b824a13d..8bca5eeeb 100644 --- a/sysutils/gnomecontrolcenter2/distinfo +++ b/sysutils/gnomecontrolcenter2/distinfo @@ -1,2 +1,2 @@ -MD5 (gnome2/control-center-2.9.3.tar.bz2) = 7a34d2ebe33298991ef02663321f5ed2 -SIZE (gnome2/control-center-2.9.3.tar.bz2) = 2628918 +MD5 (gnome2/control-center-2.9.4.tar.bz2) = b95677dc4caf09c1143804bc54f1b468 +SIZE (gnome2/control-center-2.9.4.tar.bz2) = 2710848 diff --git a/sysutils/gnomecontrolcenter2/files/patch-capplets_keyboard_gnome-keyboard-properties-xkb.c b/sysutils/gnomecontrolcenter2/files/patch-capplets_keyboard_gnome-keyboard-properties-xkb.c new file mode 100644 index 000000000..3058e0e25 --- /dev/null +++ b/sysutils/gnomecontrolcenter2/files/patch-capplets_keyboard_gnome-keyboard-properties-xkb.c @@ -0,0 +1,12 @@ +--- capplets/keyboard/gnome-keyboard-properties-xkb.c.orig Thu Jan 13 02:47:53 2005 ++++ capplets/keyboard/gnome-keyboard-properties-xkb.c Thu Jan 13 02:48:01 2005 +@@ -137,8 +137,8 @@ + void + setup_xkb_tabs (GladeXML * dialog, GConfChangeSet * changeset) + { +- xkbGConfClient = gconf_client_get_default (); + GObject * peditor; ++ xkbGConfClient = gconf_client_get_default (); + + XklInit (GDK_DISPLAY ()); + XklConfigInit (); diff --git a/sysutils/gnomecontrolcenter2/files/patch-capplets_keyboard_gnome-keyboard-properties-xkblt.c b/sysutils/gnomecontrolcenter2/files/patch-capplets_keyboard_gnome-keyboard-properties-xkblt.c new file mode 100644 index 000000000..70d6b8a7f --- /dev/null +++ b/sysutils/gnomecontrolcenter2/files/patch-capplets_keyboard_gnome-keyboard-properties-xkblt.c @@ -0,0 +1,19 @@ +--- capplets/keyboard/gnome-keyboard-properties-xkblt.c.orig Thu Jan 13 02:49:37 2005 ++++ capplets/keyboard/gnome-keyboard-properties-xkblt.c Thu Jan 13 02:51:22 2005 +@@ -105,11 +105,13 @@ + + if (value->type == GCONF_VALUE_INT) + { +- defaultGroup = gconf_value_get_int (value); +- GtkWidget* treeView = WID ("xkb_layouts_selected"); +- GtkTreeModel *model = GTK_TREE_MODEL (gtk_tree_view_get_model (GTK_TREE_VIEW (treeView))); ++ GtkWidget* treeView; ++ GtkTreeModel *model; + GtkTreeIter iter; + int counter = 0; ++ defaultGroup = gconf_value_get_int (value); ++ treeView = WID ("xkb_layouts_selected"); ++ model = GTK_TREE_MODEL (gtk_tree_view_get_model (GTK_TREE_VIEW (treeView))); + if (gtk_tree_model_get_iter_first (model, &iter)) + { + do diff --git a/sysutils/gnomecontrolcenter2/files/patch-configure b/sysutils/gnomecontrolcenter2/files/patch-configure index f9e0648a5..d8e861724 100644 --- a/sysutils/gnomecontrolcenter2/files/patch-configure +++ b/sysutils/gnomecontrolcenter2/files/patch-configure @@ -1,6 +1,6 @@ ---- configure.orig Mon Dec 13 00:32:14 2004 -+++ configure Mon Dec 13 00:37:30 2004 -@@ -22217,6 +22217,7 @@ +--- configure.orig Thu Jan 13 02:39:28 2005 ++++ configure Thu Jan 13 02:39:28 2005 +@@ -22221,6 +22221,7 @@ if eval "test \"\${$as_ac_var+set}\" = set"; then echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -8,15 +8,7 @@ cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF -@@ -22612,6 +22613,7 @@ - cat >>confdefs.h <<_ACEOF - #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1 - _ACEOF -+LIBS="-lintl $LIBS" - have_ngettext=yes - fi - done -@@ -27817,7 +27819,7 @@ +@@ -27490,7 +27491,7 @@ cat >>confdefs.h <<_ACEOF @@ -24,4 +16,4 @@ +#define GNOMECC_DATA_DIR "${datadir}/${GETTEXT_PACKAGE}" _ACEOF - GNOMECC_ICONS_DIR='$(datadir)/'${GETTEXT_PACKAGE}'/icons' + diff --git a/sysutils/gnomecontrolcenter2/files/patch-libgswitchit_gswitchit_util.c b/sysutils/gnomecontrolcenter2/files/patch-libgswitchit_gswitchit_util.c deleted file mode 100644 index 484a3e5f4..000000000 --- a/sysutils/gnomecontrolcenter2/files/patch-libgswitchit_gswitchit_util.c +++ /dev/null @@ -1,11 +0,0 @@ ---- libgswitchit/gswitchit_util.c.orig Mon Dec 13 01:09:01 2004 -+++ libgswitchit/gswitchit_util.c Mon Dec 13 01:15:31 2004 -@@ -60,7 +60,7 @@ - int level, const char format[], va_list args) - { - time_t now = time (NULL); -- g_log (NULL, G_LOG_LEVEL_DEBUG, "[%08ld,%03d,%s:%s/] \t", now, -+ g_log (NULL, G_LOG_LEVEL_DEBUG, "[%08ld,%03d,%s:%s/] \t", (long) now, - level, file, function); - g_logv (NULL, G_LOG_LEVEL_DEBUG, format, args); - } diff --git a/sysutils/gnomecontrolcenter2/pkg-plist b/sysutils/gnomecontrolcenter2/pkg-plist index 12832ae42..d5064fb82 100644 --- a/sysutils/gnomecontrolcenter2/pkg-plist +++ b/sysutils/gnomecontrolcenter2/pkg-plist @@ -160,6 +160,7 @@ share/locale/ml/LC_MESSAGES/control-center-2.0.mo share/locale/mn/LC_MESSAGES/control-center-2.0.mo share/locale/ms/LC_MESSAGES/control-center-2.0.mo share/locale/nb/LC_MESSAGES/control-center-2.0.mo +share/locale/ne/LC_MESSAGES/control-center-2.0.mo share/locale/nl/LC_MESSAGES/control-center-2.0.mo share/locale/nn/LC_MESSAGES/control-center-2.0.mo share/locale/no/LC_MESSAGES/control-center-2.0.mo -- cgit v1.2.3