mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2024-11-24 00:45:52 +00:00
Code Issues Releases Activity

Chase new gconf

Browse Source
This commit is contained in:
Ade Lovett 2000-10-03 17:37:51 +00:00
parent 4ccc581fda
commit cd92546e53
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=33381
18 changed files with 274 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
devel/gnome-vfs/Makefile
View File

@ -17,7 +17,7 @@ MAINTAINER= ade@FreeBSD.org
LIB_DEPENDS= gnome.4:${PORTSDIR}/x11/gnomelibs \
capplet.4:${PORTSDIR}/sysutils/gnomecontrolcenter \
bonobo.2:${PORTSDIR}/devel/bonobo \
gconf-1.0:${PORTSDIR}/devel/gconf \
gconf-1.1:${PORTSDIR}/devel/gconf \
bz2.1:${PORTSDIR}/archivers/bzip2
GLIB_CONFIG?= ${LOCALBASE}/bin/glib12-config

2
devel/gnome-vfs1/Makefile
View File

@ -17,7 +17,7 @@ MAINTAINER= ade@FreeBSD.org
LIB_DEPENDS= gnome.4:${PORTSDIR}/x11/gnomelibs \
capplet.4:${PORTSDIR}/sysutils/gnomecontrolcenter \
bonobo.2:${PORTSDIR}/devel/bonobo \
gconf-1.0:${PORTSDIR}/devel/gconf \
gconf-1.1:${PORTSDIR}/devel/gconf \
bz2.1:${PORTSDIR}/archivers/bzip2
GLIB_CONFIG?= ${LOCALBASE}/bin/glib12-config

2
devel/gnomevfs/Makefile
View File

@ -17,7 +17,7 @@ MAINTAINER= ade@FreeBSD.org
LIB_DEPENDS= gnome.4:${PORTSDIR}/x11/gnomelibs \
capplet.4:${PORTSDIR}/sysutils/gnomecontrolcenter \
bonobo.2:${PORTSDIR}/devel/bonobo \
gconf-1.0:${PORTSDIR}/devel/gconf \
gconf-1.1:${PORTSDIR}/devel/gconf \
bz2.1:${PORTSDIR}/archivers/bzip2
GLIB_CONFIG?= ${LOCALBASE}/bin/glib12-config

2
devel/gnomevfs2/Makefile
View File

@ -17,7 +17,7 @@ MAINTAINER= ade@FreeBSD.org
LIB_DEPENDS= gnome.4:${PORTSDIR}/x11/gnomelibs \
capplet.4:${PORTSDIR}/sysutils/gnomecontrolcenter \
bonobo.2:${PORTSDIR}/devel/bonobo \
gconf-1.0:${PORTSDIR}/devel/gconf \
gconf-1.1:${PORTSDIR}/devel/gconf \
bz2.1:${PORTSDIR}/archivers/bzip2
GLIB_CONFIG?= ${LOCALBASE}/bin/glib12-config

3
graphics/eog/Makefile
View File

@ -7,6 +7,7 @@
PORTNAME= eog
PORTVERSION= 0.5
PORTREVISION= 1
CATEGORIES= graphics gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
MASTER_SITE_SUBDIR= unstable/sources/eog
@ -16,7 +17,7 @@ MAINTAINER= ade@FreeBSD.org
LIB_DEPENDS= panel_applet.4:${PORTSDIR}/x11/gnomecore \
glade.4:${PORTSDIR}/devel/libglade \
bonobo.2:${PORTSDIR}/devel/bonobo \
gconf-1.0:${PORTSDIR}/devel/gconf
gconf-1.1:${PORTSDIR}/devel/gconf
USE_GMAKE= yes
USE_X_PREFIX= yes

60
graphics/eog/files/patch-ad Normal file
View File

@ -0,0 +1,60 @@
--- src/main.c.orig Sun Sep 3 17:34:48 2000
+++ src/main.c Mon Oct 2 11:22:02 2000
@@ -38,3 +38,3 @@
gboolean opened;
- GConfError *error;
+ GError *error;
@@ -50,4 +50,4 @@
g_assert (error != NULL);
- g_message ("GConf init failed: %s", error->str);
- gconf_error_destroy (error);
+ g_message ("GConf init failed: %s", error->message);
+ g_error_free(error);
exit (EXIT_FAILURE);
--- src/image-view.c.orig Sat Sep 2 23:37:19 2000
+++ src/image-view.c Mon Oct 2 11:24:22 2000
@@ -243,3 +243,3 @@
{
- image_view_set_interp_type (IMAGE_VIEW (data), gconf_value_int (value));
+ image_view_set_interp_type (IMAGE_VIEW (data), gconf_value_get_int (value));
}
@@ -251,3 +251,3 @@
{
- image_view_set_check_type (IMAGE_VIEW (data), gconf_value_int (value));
+ image_view_set_check_type (IMAGE_VIEW (data), gconf_value_get_int (value));
}
@@ -259,3 +259,3 @@
{
- image_view_set_check_size (IMAGE_VIEW (data), gconf_value_int (value));
+ image_view_set_check_size (IMAGE_VIEW (data), gconf_value_get_int (value));
}
@@ -267,3 +267,3 @@
{
- image_view_set_dither (IMAGE_VIEW (data), gconf_value_int (value));
+ image_view_set_dither (IMAGE_VIEW (data), gconf_value_get_int (value));
}
@@ -275,3 +275,3 @@
{
- image_view_set_scroll (IMAGE_VIEW (data), gconf_value_int (value));
+ image_view_set_scroll (IMAGE_VIEW (data), gconf_value_get_int (value));
}
--- src/full-screen.c.orig Sat Sep 2 23:37:19 2000
+++ src/full-screen.c Mon Oct 2 11:27:44 2000
@@ -125,3 +125,3 @@
- priv->sb_policy = gconf_value_int (value);
+ priv->sb_policy = gconf_value_get_int (value);
@@ -141,3 +141,3 @@
- priv->bevel = gconf_value_bool (value);
+ priv->bevel = gconf_value_get_bool (value);
--- src/window.c.orig Sat Sep 2 23:37:19 2000
+++ src/window.c Mon Oct 2 11:28:25 2000
@@ -324,3 +324,3 @@
- priv->sb_policy = gconf_value_int (value);
+ priv->sb_policy = gconf_value_get_int (value);

3
graphics/eog2/Makefile
View File

@ -7,6 +7,7 @@
PORTNAME= eog
PORTVERSION= 0.5
PORTREVISION= 1
CATEGORIES= graphics gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
MASTER_SITE_SUBDIR= unstable/sources/eog
@ -16,7 +17,7 @@ MAINTAINER= ade@FreeBSD.org
LIB_DEPENDS= panel_applet.4:${PORTSDIR}/x11/gnomecore \
glade.4:${PORTSDIR}/devel/libglade \
bonobo.2:${PORTSDIR}/devel/bonobo \
gconf-1.0:${PORTSDIR}/devel/gconf
gconf-1.1:${PORTSDIR}/devel/gconf
USE_GMAKE= yes
USE_X_PREFIX= yes

60
graphics/eog2/files/patch-ad Normal file
View File

@ -0,0 +1,60 @@
--- src/main.c.orig Sun Sep 3 17:34:48 2000
+++ src/main.c Mon Oct 2 11:22:02 2000
@@ -38,3 +38,3 @@
gboolean opened;
- GConfError *error;
+ GError *error;
@@ -50,4 +50,4 @@
g_assert (error != NULL);
- g_message ("GConf init failed: %s", error->str);
- gconf_error_destroy (error);
+ g_message ("GConf init failed: %s", error->message);
+ g_error_free(error);
exit (EXIT_FAILURE);
--- src/image-view.c.orig Sat Sep 2 23:37:19 2000
+++ src/image-view.c Mon Oct 2 11:24:22 2000
@@ -243,3 +243,3 @@
{
- image_view_set_interp_type (IMAGE_VIEW (data), gconf_value_int (value));
+ image_view_set_interp_type (IMAGE_VIEW (data), gconf_value_get_int (value));
}
@@ -251,3 +251,3 @@
{
- image_view_set_check_type (IMAGE_VIEW (data), gconf_value_int (value));
+ image_view_set_check_type (IMAGE_VIEW (data), gconf_value_get_int (value));
}
@@ -259,3 +259,3 @@
{
- image_view_set_check_size (IMAGE_VIEW (data), gconf_value_int (value));
+ image_view_set_check_size (IMAGE_VIEW (data), gconf_value_get_int (value));
}
@@ -267,3 +267,3 @@
{
- image_view_set_dither (IMAGE_VIEW (data), gconf_value_int (value));
+ image_view_set_dither (IMAGE_VIEW (data), gconf_value_get_int (value));
}
@@ -275,3 +275,3 @@
{
- image_view_set_scroll (IMAGE_VIEW (data), gconf_value_int (value));
+ image_view_set_scroll (IMAGE_VIEW (data), gconf_value_get_int (value));
}
--- src/full-screen.c.orig Sat Sep 2 23:37:19 2000
+++ src/full-screen.c Mon Oct 2 11:27:44 2000
@@ -125,3 +125,3 @@
- priv->sb_policy = gconf_value_int (value);
+ priv->sb_policy = gconf_value_get_int (value);
@@ -141,3 +141,3 @@
- priv->bevel = gconf_value_bool (value);
+ priv->bevel = gconf_value_get_bool (value);
--- src/window.c.orig Sat Sep 2 23:37:19 2000
+++ src/window.c Mon Oct 2 11:28:25 2000
@@ -324,3 +324,3 @@
- priv->sb_policy = gconf_value_int (value);
+ priv->sb_policy = gconf_value_get_int (value);

2
sysutils/medusa/Makefile
View File

@ -16,7 +16,7 @@ MAINTAINER= ade@FreeBSD.org
LIB_DEPENDS= gnome.4:${PORTSDIR}/x11/gnomelibs \
oaf.0:${PORTSDIR}/devel/oaf \
gnomevfs.0:${PORTSDIR}/devel/gnomevfs \
gconf-1.0:${PORTSDIR}/devel/gconf
gconf-1.1:${PORTSDIR}/devel/gconf
GLIB_CONFIG?= ${LOCALBASE}/bin/glib12-config
GTK_CONFIG?= ${X11BASE}/bin/gtk12-config

2
www/encompass/Makefile
View File

@ -15,7 +15,7 @@ MAINTAINER= sobomax@FreeBSD.org
LIB_DEPENDS= gnome.4:${PORTSDIR}/x11/gnomelibs \
gtkhtml.4:${PORTSDIR}/www/gtkhtml \
glibwww.1:${PORTSDIR}/www/glibwww \
gconf-1.0:${PORTSDIR}/devel/gconf
gconf-1.1:${PORTSDIR}/devel/gconf
RUN_DEPENDS= panel:${PORTSDIR}/x11/gnomecore \
${X11BASE}/share/gnome/sounds/login.wav:${PORTSDIR}/audio/gnomeaudio

2
www/gtkhtml/Makefile
View File

@ -16,7 +16,7 @@ MAINTAINER= ade@FreeBSD.org
LIB_DEPENDS= bonobo.2:${PORTSDIR}/devel/bonobo \
wwwzip.1:${PORTSDIR}/www/libwww \
gconf-1.0:${PORTSDIR}/devel/gconf \
gconf-1.1:${PORTSDIR}/devel/gconf \
pspell.2:${PORTSDIR}/textproc/pspell
GLIB_CONFIG?= ${LOCALBASE}/bin/glib12-config

2
www/gtkhtml3/Makefile
View File

@ -16,7 +16,7 @@ MAINTAINER= ade@FreeBSD.org
LIB_DEPENDS= bonobo.2:${PORTSDIR}/devel/bonobo \
wwwzip.1:${PORTSDIR}/www/libwww \
gconf-1.0:${PORTSDIR}/devel/gconf \
gconf-1.1:${PORTSDIR}/devel/gconf \
pspell.2:${PORTSDIR}/textproc/pspell
GLIB_CONFIG?= ${LOCALBASE}/bin/glib12-config

2
www/gtkhtml38/Makefile
View File

@ -16,7 +16,7 @@ MAINTAINER= ade@FreeBSD.org
LIB_DEPENDS= bonobo.2:${PORTSDIR}/devel/bonobo \
wwwzip.1:${PORTSDIR}/www/libwww \
gconf-1.0:${PORTSDIR}/devel/gconf \
gconf-1.1:${PORTSDIR}/devel/gconf \
pspell.2:${PORTSDIR}/textproc/pspell
GLIB_CONFIG?= ${LOCALBASE}/bin/glib12-config

2
www/libgtkhtml/Makefile
View File

@ -16,7 +16,7 @@ MAINTAINER= ade@FreeBSD.org
LIB_DEPENDS= bonobo.2:${PORTSDIR}/devel/bonobo \
wwwzip.1:${PORTSDIR}/www/libwww \
gconf-1.0:${PORTSDIR}/devel/gconf \
gconf-1.1:${PORTSDIR}/devel/gconf \
pspell.2:${PORTSDIR}/textproc/pspell
GLIB_CONFIG?= ${LOCALBASE}/bin/glib12-config

2
x11-fm/nautilus/Makefile
View File

@ -7,7 +7,7 @@
PORTNAME= nautilus
PORTVERSION= 0.1.0
PORTREVISION= 1
PORTREVISION= 2
CATEGORIES= x11-fm gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
MASTER_SITE_SUBDIR= unstable/sources/nautilus

69
x11-fm/nautilus/files/patch-ah Normal file
View File

@ -0,0 +1,69 @@
--- libnautilus-extensions/nautilus-preferences.c.orig Wed Jul 12 03:03:32 2000
+++ libnautilus-extensions/nautilus-preferences.c Tue Oct 3 11:59:02 2000
@@ -594,3 +594,3 @@
if (!gconf_is_initialized ()) {
- GConfError *error = NULL;
+ GError *error = NULL;
char *argv[] = { "nautilus", NULL };
@@ -601,5 +601,5 @@
/* FIXME bugzilla.eazel.com 672: Need better error reporting here */
- g_warning ("GConf init failed:\n %s", error->str);
+ g_warning ("GConf init failed:\n %s", error->message);
- gconf_error_destroy (error);
+ g_error_free (error);
--- libnautilus-extensions/nautilus-user-level-manager.c.orig Wed Jul 12 03:03:32 2000
+++ libnautilus-extensions/nautilus-user-level-manager.c Tue Oct 3 12:06:04 2000
@@ -111,3 +111,3 @@
if (!gconf_is_initialized ()) {
- GConfError *error = NULL;
+ GError *error = NULL;
char *argv[] = { "nautilus", NULL };
@@ -118,5 +118,5 @@
/* FIXME bugzilla.eazel.com 672: Need better error reporting here */
- g_warning ("GConf init failed:\n %s", error->str);
+ g_warning ("GConf init failed:\n %s", error->message);
- gconf_error_destroy (error);
+ g_error_free (error);
@@ -245,3 +245,3 @@
- gconf_value_destroy (value);
+ gconf_value_free (value);
}
@@ -460,3 +460,3 @@
if (value) {
- gconf_value_destroy (value);
+ gconf_value_free (value);
}
@@ -499,5 +499,5 @@
case GCONF_VALUE_STRING:
- result = (gconf_value_string (value_a)
- && gconf_value_string (value_b)
- && (strcmp (gconf_value_string (value_a), gconf_value_string (value_b)) == 0));
+ result = (gconf_value_get_string (value_a)
+ && gconf_value_get_string (value_b)
+ && (strcmp (gconf_value_get_string (value_a), gconf_value_get_string (value_b)) == 0));
break;
@@ -505,3 +505,3 @@
case GCONF_VALUE_INT:
- result = (gconf_value_int (value_a) == gconf_value_int (value_b));
+ result = (gconf_value_get_int (value_a) == gconf_value_get_int (value_b));
break;
@@ -509,3 +509,3 @@
case GCONF_VALUE_BOOL:
- result = (gconf_value_bool (value_a) == gconf_value_bool (value_b));
+ result = (gconf_value_get_bool (value_a) == gconf_value_get_bool (value_b));
break;
@@ -522,3 +522,3 @@
if (value_a) {
- gconf_value_destroy (value_a);
+ gconf_value_free (value_a);
}
@@ -526,3 +526,3 @@
if (value_b) {
- gconf_value_destroy (value_b);
+ gconf_value_free (value_b);
}

2
x11-fm/nautilus2/Makefile
View File

@ -7,7 +7,7 @@
PORTNAME= nautilus
PORTVERSION= 0.1.0
PORTREVISION= 1
PORTREVISION= 2
CATEGORIES= x11-fm gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
MASTER_SITE_SUBDIR= unstable/sources/nautilus

69
x11-fm/nautilus2/files/patch-ah Normal file
View File

@ -0,0 +1,69 @@
--- libnautilus-extensions/nautilus-preferences.c.orig Wed Jul 12 03:03:32 2000
+++ libnautilus-extensions/nautilus-preferences.c Tue Oct 3 11:59:02 2000
@@ -594,3 +594,3 @@
if (!gconf_is_initialized ()) {
- GConfError *error = NULL;
+ GError *error = NULL;
char *argv[] = { "nautilus", NULL };
@@ -601,5 +601,5 @@
/* FIXME bugzilla.eazel.com 672: Need better error reporting here */
- g_warning ("GConf init failed:\n %s", error->str);
+ g_warning ("GConf init failed:\n %s", error->message);
- gconf_error_destroy (error);
+ g_error_free (error);
--- libnautilus-extensions/nautilus-user-level-manager.c.orig Wed Jul 12 03:03:32 2000
+++ libnautilus-extensions/nautilus-user-level-manager.c Tue Oct 3 12:06:04 2000
@@ -111,3 +111,3 @@
if (!gconf_is_initialized ()) {
- GConfError *error = NULL;
+ GError *error = NULL;
char *argv[] = { "nautilus", NULL };
@@ -118,5 +118,5 @@
/* FIXME bugzilla.eazel.com 672: Need better error reporting here */
- g_warning ("GConf init failed:\n %s", error->str);
+ g_warning ("GConf init failed:\n %s", error->message);
- gconf_error_destroy (error);
+ g_error_free (error);
@@ -245,3 +245,3 @@
- gconf_value_destroy (value);
+ gconf_value_free (value);
}
@@ -460,3 +460,3 @@
if (value) {
- gconf_value_destroy (value);
+ gconf_value_free (value);
}
@@ -499,5 +499,5 @@
case GCONF_VALUE_STRING:
- result = (gconf_value_string (value_a)
- && gconf_value_string (value_b)
- && (strcmp (gconf_value_string (value_a), gconf_value_string (value_b)) == 0));
+ result = (gconf_value_get_string (value_a)
+ && gconf_value_get_string (value_b)
+ && (strcmp (gconf_value_get_string (value_a), gconf_value_get_string (value_b)) == 0));
break;
@@ -505,3 +505,3 @@
case GCONF_VALUE_INT:
- result = (gconf_value_int (value_a) == gconf_value_int (value_b));
+ result = (gconf_value_get_int (value_a) == gconf_value_get_int (value_b));
break;
@@ -509,3 +509,3 @@
case GCONF_VALUE_BOOL:
- result = (gconf_value_bool (value_a) == gconf_value_bool (value_b));
+ result = (gconf_value_get_bool (value_a) == gconf_value_get_bool (value_b));
break;
@@ -522,3 +522,3 @@
if (value_a) {
- gconf_value_destroy (value_a);
+ gconf_value_free (value_a);
}
@@ -526,3 +526,3 @@
if (value_b) {
- gconf_value_destroy (value_b);
+ gconf_value_free (value_b);
}