X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=dillo-0.7.0-alt-asp-charset-encodings-sysconfdir.patch;fp=dillo-0.7.0-alt-asp-charset-encodings-sysconfdir.patch;h=49e9f1750efd7277d17165714090a5484ed0f0d1;hb=eadaba5f1eac1becadbf393712896d2e2c98c408;hp=f309841329aee63a860a0f733020bba08c9d94c3;hpb=e1210af3f3cf2e7a5056a0a0079a7e217fb2f7db;p=packages%2Fdillo.git

diff --git a/dillo-0.7.0-alt-asp-charset-encodings-sysconfdir.patch b/dillo-0.7.0-alt-asp-charset-encodings-sysconfdir.patch
index f309841..49e9f17 100644
--- a/dillo-0.7.0-alt-asp-charset-encodings-sysconfdir.patch
+++ b/dillo-0.7.0-alt-asp-charset-encodings-sysconfdir.patch
@@ -31,31 +31,6 @@
 +<enc value="KOI8-U">Ukraine (KOI8-U)</enc>
 +<enc value="UTF-8">Unicode (UTF-8)</enc>
 +<enc value="UTF-16">Unicode (UTF-16)</enc>
---- dillo-0.7.0~/Makefile.am	2003-02-13 23:56:11 +0300
-+++ dillo-0.7.0/Makefile.am	2003-02-21 03:15:46 +0300
-@@ -1,17 +1,21 @@
- SUBDIRS = doc src dpi
-   
--EXTRA_DIST = ChangeLog.old dillorc
-+EXTRA_DIST = ChangeLog.old dillorc encodings
- 
- install-data-local: dillorc
- 	-if [ -d $(DESTDIR)$(sysconfdir) ]; then \
- 		$(INSTALL_DATA) -b $(srcdir)/dillorc $(DESTDIR)$(sysconfdir)/; \
-+		$(INSTALL_DATA) --backup=t $(srcdir)/encodings $(DESTDIR)$(sysconfdir)/; \
- 	elif [ -d /etc/ ]; then \
- 		$(INSTALL_DATA) -b $(srcdir)/dillorc /etc/; \
-+		$(INSTALL_DATA) --backup=t $(srcdir)/encodings /etc/; \
- 	fi
- 
- uninstall-local:
- 	-if [ -d $(DESTDIR)$(sysconfdir) ]; then \
- 		rm -f $(DESTDIR)$(sysconfdir)/dillorc*; \
-+		rm -f $(DESTDIR)$(sysconfdir)/encodings*; \
- 	elif [ -d /etc/ ]; then \
- 		rm -f /etc/dillorc*; \
-+		rm -f /etc/encodings* ;\
- 	fi
 --- dillo-0.7.0~/src/browser.h	2003-02-10 16:10:30 +0300
 +++ dillo-0.7.0/src/browser.h	2003-02-21 03:15:46 +0300
 @@ -4,10 +4,8 @@
@@ -115,12 +90,12 @@
  #include "dicache.h"
  #include "dns.h"
  #include "IO/mime.h"
-@@ -171,7 +179,7 @@
+@@ -194,7 +194,7 @@
   */
  gint main(int argc, char *argv[])
  {
--   gchar *file, *curr_locale;
-+   gchar *file, *loctmp;
+-   gchar *dir, *curr_locale;
++   gchar *dir, *loctmp;
     DilloUrl *start_url;
     BrowserWindow *bw;
     guint32 xid = 0;
@@ -766,18 +741,6 @@ diff -ubBdr -N dillo-0.7.0~/src/html.c dillo-0.7.0/src/html.c
  
     /* now that the bw is made, let's customize it.. */
     Interface_browser_window_customize(bw);
---- dillo-0.7.0~/src/Makefile.am	2003-01-05 22:24:06 +0300
-+++ dillo-0.7.0/src/Makefile.am	2003-02-21 03:15:46 +0300
-@@ -57,6 +57,9 @@
- 	dw_tooltip.h \
- 	dw_widget.c \
- 	dw_widget.h \
-+	encodings.c \
-+	encodings.h \
-+	encoding-types.h \
- 	findtext.c \
- 	findtext.h \
- 	web.c	\
 diff -ubBdr -N dillo-0.7.0~/src/Makefile.am.orig dillo-0.7.0/src/Makefile.am.orig
 --- dillo-0.7.0~/src/menu.c	2003-02-11 00:30:13 +0300
 +++ dillo-0.7.0/src/menu.c	2003-02-21 03:15:46 +0300
@@ -829,15 +792,6 @@ diff -ubBdr -N dillo-0.7.0~/src/Makefile.am.orig dillo-0.7.0/src/Makefile.am.ori
     case DRC_TOKEN_LIMIT_TEXT_WIDTH:
        prefs.limit_text_width = (strcmp(scanner->value.v_string, "YES") == 0);
        break;
-@@ -250,7 +255,7 @@
-    file = a_Misc_prepend_user_home(".dillo/dillorc");
-    fd = open(file, O_RDONLY);
-    g_free(file);
--   if (fd < 0 && (fd = open("/etc/dillorc", O_RDONLY)) < 0)
-+   if (fd < 0 && (fd = open("/etc/dillo/dillorc", O_RDONLY)) < 0)
-       if ((fd = open("/usr/local/etc/dillorc", O_RDONLY)) < 0)
-          return FILE_NOT_FOUND;
- 
 @@ -347,6 +352,7 @@
     prefs.small_icons = FALSE;
     prefs.limit_text_width = FALSE;
@@ -873,3 +827,15 @@ diff -ubBdr -N dillo-0.7.0~/src/Makefile.am.orig dillo-0.7.0/src/Makefile.am.ori
     gboolean use_dicache;
     gboolean show_back;
     gboolean show_forw;
+--- dillo-0.7.2/src/Makefile.am.orig	Sun May  4 14:08:25 2003
++++ dillo-0.7.2/src/Makefile.am	Sun May  4 14:11:41 2003
+@@ -59,6 +59,9 @@
+ 	dw_tooltip.h \
+ 	dw_widget.c \
+ 	dw_widget.h \
++	encodings.c \
++	encodings.h \
++	encoding-types.h \
+ 	findtext.c \
+ 	findtext.h \
+ 	selection.c \