From 7829cd6328f7a54e986f4b58defc98e1493852ef Mon Sep 17 00:00:00 2001 From: =?utf8?q?Jaros=C5=82aw=20Kruk?= Date: Tue, 28 Sep 2004 21:17:40 +0000 Subject: [PATCH] - updated to 0.6.3 Changed files: ed2k-gtk-gui-enable-deprecated.patch -> 1.2 ed2k-gtk-gui-home_etc.patch -> 1.2 --- ed2k-gtk-gui-enable-deprecated.patch | 14 +++++----- ed2k-gtk-gui-home_etc.patch | 38 +++++++++++++++------------- 2 files changed, 27 insertions(+), 25 deletions(-) diff --git a/ed2k-gtk-gui-enable-deprecated.patch b/ed2k-gtk-gui-enable-deprecated.patch index 5291a1a..bf30c2b 100644 --- a/ed2k-gtk-gui-enable-deprecated.patch +++ b/ed2k-gtk-gui-enable-deprecated.patch @@ -1,12 +1,12 @@ -diff -Nru ed2k-gtk-gui-0.6.2.orig/ed2k_gui/Makefile.am ed2k-gtk-gui-0.6.2/ed2k_gui/Makefile.am ---- ed2k-gtk-gui-0.6.2.orig/ed2k_gui/Makefile.am 2004-01-15 21:56:48.000000000 +0100 -+++ ed2k-gtk-gui-0.6.2/ed2k_gui/Makefile.am 2004-01-19 10:39:22.558251432 +0100 -@@ -5,7 +5,7 @@ - SUFFIXES=.c +diff -urN ed2k-gtk-gui-0.6.3.orig/ed2k_gui/Makefile.am ed2k-gtk-gui-0.6.3/ed2k_gui/Makefile.am +--- ed2k-gtk-gui-0.6.3.orig/ed2k_gui/Makefile.am 2004-08-27 19:30:49.000000000 +0200 ++++ ed2k-gtk-gui-0.6.3/ed2k_gui/Makefile.am 2004-09-28 22:47:01.844858440 +0200 +@@ -10,7 +10,7 @@ - CFLAGS = @CONFIGURE_CFLAGS@ + + CFLAGS = -I$(top_srcdir)/libglade @CONFIGURE_CFLAGS@ -CFLAGS += -DG_DISABLE_DEPRECATED -DGDK_DISABLE_DEPRECATED -DGTK_DISABLE_DEPRECATED -DGNET_EXPERIMENTAL +CFLAGS += -DG_DISABLE_DEPRECATED -DGDK_DISABLE_DEPRECATED -DGNET_EXPERIMENTAL CFLAGS += @GUI_CFLAGS@ @GTK_CFLAGS@ @GNET_CFLAGS@ @ICONS_CFLAGS@ @I18N_CFLAGS@ LDFLAGS = @CONFIGURE_LDFLAGS@ - ed2k_gui_LDADD = @GTK_LIBS@ @GNET_LIBS@ + ed2k_gui_LDADD = @GTK_LIBS@ @GNET_LIBS@ $(top_builddir)/libglade/libglade-2.a -lz $(WIN32LINKERADD) diff --git a/ed2k-gtk-gui-home_etc.patch b/ed2k-gtk-gui-home_etc.patch index 5f3a8cf..a28ec2b 100644 --- a/ed2k-gtk-gui-home_etc.patch +++ b/ed2k-gtk-gui-home_etc.patch @@ -1,7 +1,21 @@ -diff -Nru ed2k-gtk-gui-0.6.1.orig/ed2k_gui/options.c ed2k-gtk-gui-0.6.1/ed2k_gui/options.c ---- ed2k-gtk-gui-0.6.1.orig/ed2k_gui/options.c 2003-11-13 19:53:28.000000000 +0100 -+++ ed2k-gtk-gui-0.6.1/ed2k_gui/options.c 2003-11-22 18:51:27.000000000 +0100 -@@ -830,11 +830,11 @@ +diff -urN ed2k-gtk-gui-0.6.3.orig/ed2k_gui/icons.c ed2k-gtk-gui-0.6.3/ed2k_gui/icons.c +--- ed2k-gtk-gui-0.6.3.orig/ed2k_gui/icons.c 2004-01-16 22:24:19.000000000 +0100 ++++ ed2k-gtk-gui-0.6.3/ed2k_gui/icons.c 2004-09-28 22:39:34.974793016 +0200 +@@ -53,7 +53,9 @@ + gchar *hdiconpath; + GDir *dir; + +- homedir = g_getenv ("HOME"); ++ homedir = g_getenv ("HOME_ETC"); ++ if (!homedir) homedir = g_getenv("HOME"); ++ + + if (opt_get_str(OPT_GUI_ICON_THEME)) + themes = g_slist_append (themes, g_strdup(opt_get_str(OPT_GUI_ICON_THEME))); +diff -urN ed2k-gtk-gui-0.6.3.orig/ed2k_gui/options.c ed2k-gtk-gui-0.6.3/ed2k_gui/options.c +--- ed2k-gtk-gui-0.6.3.orig/ed2k_gui/options.c 2004-08-09 15:53:05.000000000 +0200 ++++ ed2k-gtk-gui-0.6.3/ed2k_gui/options.c 2004-09-28 22:38:21.783919720 +0200 +@@ -889,11 +889,11 @@ static void opt_init_prefpath (void) { @@ -12,18 +26,6 @@ diff -Nru ed2k-gtk-gui-0.6.1.orig/ed2k_gui/options.c ed2k-gtk-gui-0.6.1/ed2k_gui - homedir = g_get_home_dir(); + if (!homedir) homedir = g_get_home_dir(); - g_return_if_fail (homedir != NULL ); - /* using wine + cross-compiled win32 binary, we ---- ed2k-gtk-gui-0.6.1.orig/ed2k_gui/icons.c 2003-11-13 19:53:27.000000000 +0100 -+++ ed2k-gtk-gui-0.6.1/ed2k_gui/icons.c 2003-11-26 13:29:07.000000000 +0100 -@@ -53,7 +53,8 @@ - gchar *hdiconpath; - GDir *dir; - -- homedir = g_getenv ("HOME"); -+ homedir = g_getenv ("HOME_ETC"); -+ if (!homedir) homedir = g_getenv("HOME"); - - if (opt_get_str(OPT_GUI_ICON_THEME)) - themes = g_slist_append (themes, g_strdup(opt_get_str(OPT_GUI_ICON_THEME))); + #ifdef G_OS_WIN32 + /* win98: g_get_home_dir() returns NULL -- 2.43.0