This commit was manufactured by cvs2git to create branch 'AC-branch'.

Sprout from master 2005-06-07 20:12:17 UTC paladine <paladine@pld-linux.org> '- removed mime-pdf patch (ggv can't open pdf files)'
Delete:
    ggv-ac25x.patch
    ggv-am16.patch
    ggv-buffer.patch
    ggv-gtk.patch
    ggv-libtool.patch
    ggv-locale-names.patch
    ggv-omf.patch

diff --git a/ggv-ac25x.patch b/ggv-ac25x.patch
deleted file mode 100644 (file)
index f23e964..0000000
--- a/ggv-ac25x.patch
+++ /dev/null
@@ -1,21 +0,0 @@
---- ggv-1.1.95/configure.in~   Thu Oct  3 21:35:26 2002
-+++ ggv-1.1.95/configure.in    Thu Oct  3 21:35:26 2002
-@@ -140,10 +140,6 @@
- AC_SUBST(OAF_LIBS)
- AC_SUBST(OAF_CFLAGS)
- 
--AC_SUBST(CFLAGS)
--AC_SUBST(CPPFLAGS)
--AC_SUBST(LDFLAGS)
--
- AC_OUTPUT([
- Makefile
- ggv.spec
-@@ -154,7 +150,6 @@
- help/C/Makefile
- help/it/Makefile
- help/ja/Makefile
--pixmaps/Makefile
- src/Makefile
- src/stock/Makefile
- bonobo/Makefile

diff --git a/ggv-am16.patch b/ggv-am16.patch
deleted file mode 100644 (file)
index c5000a3..0000000
--- a/ggv-am16.patch
+++ /dev/null
@@ -1,9 +0,0 @@
---- ggv-1.1.95/src/Makefile.am~        Thu Oct  3 21:41:49 2002
-+++ ggv-1.1.95/src/Makefile.am Thu Oct  3 21:41:49 2002
-@@ -96,5 +96,5 @@
- 
- BUILT_SOURCES=$(CORBA_SOURCES)
- 
--CLEANFILES += $(BUILT_SOURCES)
-+CLEANFILES = $(BUILT_SOURCES)
- 

diff --git a/ggv-buffer.patch b/ggv-buffer.patch
deleted file mode 100644 (file)
index 2fea9b0..0000000
--- a/ggv-buffer.patch
+++ /dev/null
@@ -1,145 +0,0 @@
---- ggv-1.0.2/src/ps.c.buffer  Mon Jan 22 09:04:50 2001
-+++ ggv-1.0.2/src/ps.c Tue Sep 24 23:10:14 2002
-@@ -282,7 +282,7 @@
- 
- /* Jake Hamby patch 18/3/98 */
- 
--      sscanf(line, "%*s %s", text);
-+      sscanf(line, "%*s %256s", text);
-       /*doc->epsf = iscomment(text, "EPSF-");*/
-       doc->epsf = iscomment(text, "EPSF"); /* Hamby - This line changed */
-       doc->beginheader = position;
-@@ -323,7 +323,7 @@
-       } else if (doc->date == NULL && iscomment(line+2, "CreationDate:")) {
-           doc->date = gettextline(line+length("%%CreationDate:"));
-       } else if (bb_set == NONE && iscomment(line+2, "BoundingBox:")) {
--          sscanf(line+length("%%BoundingBox:"), "%s", text);
-+          sscanf(line+length("%%BoundingBox:"), "%256s", text);
-           if (strcmp(text, "(atend)") == 0) {
-               bb_set = ATEND;
-           } else {
-@@ -355,7 +355,7 @@
-           }
-       } else if (orientation_set == NONE &&
-                  iscomment(line+2, "Orientation:")) {
--          sscanf(line+length("%%Orientation:"), "%s", text);
-+          sscanf(line+length("%%Orientation:"), "%256s", text);
-           if (strcmp(text, "(atend)") == 0) {
-               orientation_set = ATEND;
-           } else if (strcmp(text, "Portrait") == 0) {
-@@ -366,7 +366,7 @@
-               orientation_set = 1;
-           }
-       } else if (page_order_set == NONE && iscomment(line+2, "PageOrder:")) {
--          sscanf(line+length("%%PageOrder:"), "%s", text);
-+          sscanf(line+length("%%PageOrder:"), "%256s", text);
-           if (strcmp(text, "(atend)") == 0) {
-               page_order_set = ATEND;
-           } else if (strcmp(text, "Ascend") == 0) {
-@@ -380,7 +380,7 @@
-               page_order_set = 1;
-           }
-       } else if (pages_set == NONE && iscomment(line+2, "Pages:")) {
--          sscanf(line+length("%%Pages:"), "%s", text);
-+          sscanf(line+length("%%Pages:"), "%256s", text);
-           if (strcmp(text, "(atend)") == 0) {
-               pages_set = ATEND;
-           } else {
-@@ -579,7 +579,7 @@
-               /* Do nothing */
-           } else if (doc->default_page_orientation == NONE &&
-               iscomment(line+2, "PageOrientation:")) {
--              sscanf(line+length("%%PageOrientation:"), "%s", text);
-+              sscanf(line+length("%%PageOrientation:"), "%256s", text);
-               if (strcmp(text, "Portrait") == 0) {
-                   doc->default_page_orientation = PORTRAIT;
-               } else if (strcmp(text, "Landscape") == 0) {
-@@ -703,7 +703,7 @@
-               /* Do nothing */
-           } else if (doc->default_page_orientation == NONE &&
-               iscomment(line+2, "PageOrientation:")) {
--              sscanf(line+length("%%PageOrientation:"), "%s", text);
-+              sscanf(line+length("%%PageOrientation:"), "%256s", text);
-               if (strcmp(text, "Portrait") == 0) {
-                   doc->default_page_orientation = PORTRAIT;
-               } else if (strcmp(text, "Landscape") == 0) {
-@@ -842,7 +842,7 @@
-               /* Do nothing */
-           } else if (doc->pages[doc->numpages].orientation == NONE &&
-               iscomment(line+2, "PageOrientation:")) {
--              sscanf(line+length("%%PageOrientation:"), "%s", text);
-+              sscanf(line+length("%%PageOrientation:"), "%256s", text);
-               if (strcmp(text, "Portrait") == 0) {
-                   doc->pages[doc->numpages].orientation = PORTRAIT;
-               } else if (strcmp(text, "Landscape") == 0) {
-@@ -874,7 +874,7 @@
-               g_free(cp);
-           } else if ((page_bb_set == NONE || page_bb_set == ATEND) &&
-                      iscomment(line+2, "PageBoundingBox:")) {
--              sscanf(line+length("%%PageBoundingBox:"), "%s", text);
-+              sscanf(line+length("%%PageBoundingBox:"), "%256s", text);
-               if (strcmp(text, "(atend)") == 0) {
-                   page_bb_set = ATEND;
-               } else {
-@@ -988,14 +988,14 @@
-           }
-       } else if (orientation_set == ATEND &&
-                  iscomment(line+2, "Orientation:")) {
--          sscanf(line+length("%%Orientation:"), "%s", text);
-+          sscanf(line+length("%%Orientation:"), "%256s", text);
-           if (strcmp(text, "Portrait") == 0) {
-               doc->orientation = PORTRAIT;
-           } else if (strcmp(text, "Landscape") == 0) {
-               doc->orientation = LANDSCAPE;
-           }
-       } else if (page_order_set == ATEND && iscomment(line+2, "PageOrder:")) {
--          sscanf(line+length("%%PageOrder:"), "%s", text);
-+          sscanf(line+length("%%PageOrder:"), "%256s", text);
-           if (strcmp(text, "Ascend") == 0) {
-               doc->pageorder = ASCEND;
-           } else if (strcmp(text, "Descend") == 0) {
-@@ -1277,7 +1277,7 @@
-    else if IS_BEGIN("Data:")      {
-       text[0] = '\0';
-       strcpy(save, line+7);
--      if (sscanf(line+length("%%BeginData:"), "%d %*s %s", &num, text) >= 1) {
-+      if (sscanf(line+length("%%BeginData:"), "%d %*s %256s", &num, text) >= 1) {
-           if (strcmp(text, "Lines") == 0) {
-               for (i=0; i < num; i++) {
-                   cp = fgets(line, size, fp);
-@@ -1394,7 +1394,7 @@
-     } else if (iscomment(line+7, "Data:")) {
-       text[0] = '\0';
-       strcpy(save, line+7);
--      if (sscanf(line+length("%%BeginData:"), "%d %*s %s", &num, text) >= 1) {
-+      if (sscanf(line+length("%%BeginData:"), "%d %*s %256s", &num, text) >= 1) {
-           if (strcmp(text, "Lines") == 0) {
-               for (i=0; i < num; i++) {
-                   cp = fgets(line, size, fp);
-@@ -1470,7 +1470,7 @@
-       } else if (iscomment(line+7, "Data:")) {
-           text[0] = '\0';
-           if (sscanf(line+length("%%BeginData:"),
--                     "%d %*s %s", &num, text) >= 1) {
-+                     "%d %*s %256s", &num, text) >= 1) {
-               if (strcmp(text, "Lines") == 0) {
-                   for (i=0; i < num; i++) {
-                       fgets(line, sizeof line, from);
-@@ -1538,7 +1538,7 @@
-       } else if (iscomment(line+7, "Data:")) {
-           text[0] = '\0';
-           if (sscanf(line+length("%%BeginData:"),
--                     "%d %*s %s", &num, text) >= 1) {
-+                     "%d %*s %256s", &num, text) >= 1) {
-               if (strcmp(text, "Lines") == 0) {
-                   for (i=0; i < num; i++) {
-                       fgets(line, sizeof line, from);
-@@ -1623,7 +1623,7 @@
-           g_free(comment);
-           continue;
-        }
--       sscanf(comment+length("%%Pages:"), "%s", text);
-+       sscanf(comment+length("%%Pages:"), "%256s", text);
-        if (strcmp(text, "(atend)") == 0) {
-           fputs(comment, dest_file);
-           pages_atend = TRUE;

diff --git a/ggv-gtk.patch b/ggv-gtk.patch
deleted file mode 100644 (file)
index ea0e5ad..0000000
--- a/ggv-gtk.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- ggv-2.5.0/configure.in.wiget       2003-10-28 15:35:57.000000000 +0100
-+++ ggv-2.5.0/configure.in     2003-10-28 15:36:17.000000000 +0100
-@@ -149,7 +149,7 @@
- BONOBO_ACT_IDLDIR="`$PKG_CONFIG --variable=idldir bonobo-activation-2.0`"
- AC_SUBST(BONOBO_ACT_IDLDIR)
-       
--GGV_EXTRA_CFLAGS="-DG_DISABLE_DEPRECATED -DGDK_DISABLE_DEPRECATED -DGTK_DISABLE_DEPRECATED -DGNOME_DISABLE_DEPRECATED"
-+GGV_EXTRA_CFLAGS="-DG_DISABLE_DEPRECATED -DGDK_DISABLE_DEPRECATED -DGNOME_DISABLE_DEPRECATED"
- 
- AC_SUBST(GGV_EXTRA_CFLAGS)
- AC_SUBST(CFLAGS)

diff --git a/ggv-libtool.patch b/ggv-libtool.patch
deleted file mode 100644 (file)
index 244c722..0000000
--- a/ggv-libtool.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- ggv-2.5.0/src/Makefile.am.wiget    2003-10-28 14:49:50.000000000 +0100
-+++ ggv-2.5.0/src/Makefile.am  2003-10-28 14:50:33.000000000 +0100
-@@ -54,8 +54,6 @@
- ggv_SOURCES =                           \
-       ggv-window.h                    \
-       ggv-window.c                    \
--      ggv-recent.h                    \
--      ggv-recent.c                    \
-       main.c                           
- 
- ggv_LDADD =                           \

diff --git a/ggv-locale-names.patch b/ggv-locale-names.patch
deleted file mode 100644 (file)
index 2c6aefc..0000000
--- a/ggv-locale-names.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -aurN ggv-2.6.2.orig/configure.in ggv-2.6.2/configure.in
---- ggv-2.6.2.orig/configure.in        2004-07-18 21:42:43.000000000 +0200
-+++ ggv-2.6.2/configure.in     2004-09-02 13:09:28.006236088 +0200
-@@ -87,7 +87,7 @@
- dnl **************************************************
- dnl * internationalization support
- dnl **************************************************
--ALL_LINGUAS="af am ar az be bg bn ca cs cy da de el en_CA en_GB es et eu fa fi fr ga gl gu he hi hr hu id is it ja kn ko lt lv mi mk ml mn ms nl nn no pa pl pt pt_BR ro ru sk sl sq sr sr@Latn sv ta th tr uk vi zh_CN zh_TW"
-+ALL_LINGUAS="af am ar az be bg bn ca cs cy da de el en_CA en_GB es et eu fa fi fr ga gl gu he hi hr hu id is it ja kn ko lt lv mi mk ml mn ms nb nl nn pa pl pt pt_BR ro ru sk sl sq sr sr@Latn sv ta th tr uk vi zh_CN zh_TW"
- 
- GETTEXT_PACKAGE=ggv
- AC_SUBST(GETTEXT_PACKAGE)

diff --git a/ggv-omf.patch b/ggv-omf.patch
deleted file mode 100644 (file)
index 54feda1..0000000
--- a/ggv-omf.patch
+++ /dev/null
@@ -1,93 +0,0 @@
-diff -Nuard ggv-1.1.94.orig/help/C/ggv-C.omf ggv-1.1.94/help/C/ggv-C.omf
---- ggv-1.1.94.orig/help/C/ggv-C.omf   Tue Feb  5 16:05:13 2002
-+++ ggv-1.1.94/help/C/ggv-C.omf        Thu Oct  3 18:52:27 2002
-@@ -1,14 +1,22 @@
- <?xml version="1.0" standalone="no"?>
-+<!DOCTYPE omf PUBLIC "-//OMF//DTD Scrollkeeper OMF Variant V1.0//EN" "http://scrollkeeper.sourceforge.net/dtds/scrollkeeper-omf-1.0/scrollkeeper-omf.dtd">
- <omf>
-   <resource>
-+    <creator/>
-     <title>
-       The Ggv Manual
-     </title>
--    <subject>
--      <category>GNOME|Graphics</category>
--    </subject>
-+    <date>
-+      2002-10-03
-+    </date>
-+    <version identifier="1.1.94" date="2002-10-03"/>
-+    <subject category="GNOME|Graphics"/>
-+    <description/>
-+    <type/>
-     <format mime="text/sgml"/>
-     <identifier url="ggv.sgml"/>
-     <language code="C"/>
-+    <relation seriesid="7120b8a2-d6f0-11d6-85a5-aa8e4f582b0e"/>
-+    <rights type="GNU GPL" license.version="2" license="http://www.gnu.org/licenses/gpl.html"/>
-   </resource>
--</omf>
-\ No newline at end of file
-+</omf>
-diff -Nuard ggv-1.1.94.orig/help/it/ggv-it.omf ggv-1.1.94/help/it/ggv-it.omf
---- ggv-1.1.94.orig/help/it/ggv-it.omf Tue Feb  5 16:05:14 2002
-+++ ggv-1.1.94/help/it/ggv-it.omf      Thu Oct  3 18:54:18 2002
-@@ -1,14 +1,22 @@
- <?xml version="1.0" standalone="no"?>
-+<!DOCTYPE omf PUBLIC "-//OMF//DTD Scrollkeeper OMF Variant V1.0//EN" "http://scrollkeeper.sourceforge.net/dtds/scrollkeeper-omf-1.0/scrollkeeper-omf.dtd">
- <omf>
-   <resource>
-+    <creator/>
-     <title>
-       Ggv
-     </title>
--    <subject>
--      <category>GNOME|Graphics</category>
--    </subject>
-+    <date>
-+      2002-10-03
-+    </date>
-+    <version identifier="1.1.94" date="2002-10-03"/>
-+    <subject category="GNOME|Graphics"/>
-+    <description/>
-+    <type/>
-     <format mime="text/sgml"/>
-     <identifier url="ggv.sgml"/>
-     <language code="it"/>
-+    <relation seriesid="7120b8a2-d6f0-11d6-85a5-aa8e4f582b0e"/>
-+    <rights type="GNU GPL" license.version="2" license="http://www.gnu.org/licenses/gpl.html"/>
-   </resource>
- </omf>
-\ No newline at end of file
-diff -Nuard ggv-1.1.94.orig/help/ja/ggv-ja.omf ggv-1.1.94/help/ja/ggv-ja.omf
---- ggv-1.1.94.orig/help/ja/ggv-ja.omf Tue Feb  5 16:05:14 2002
-+++ ggv-1.1.94/help/ja/ggv-ja.omf      Thu Oct  3 19:02:06 2002
-@@ -1,14 +1,22 @@
--<?xml version="1.0" standalone="no"?>
-+<?xml version="1.0" encoding="EUC-JP" standalone="no" ?>
-+<!DOCTYPE omf PUBLIC "-//OMF//DTD Scrollkeeper OMF Variant V1.0//EN" "http://scrollkeeper.sourceforge.net/dtds/scrollkeeper-omf-1.0/scrollkeeper-omf.dtd">
- <omf>
-   <resource>
-+    <creator/>
-     <title>
-       GGv¥É¥­¥å¥á¥ó¥È
-     </title>
--    <subject>
--      <category>GNOME|Graphics</category>
--    </subject>
-+    <date>
-+      2002-10-03
-+    </date>
-+    <version identifier="1.1.94" date="2002-10-03"/>
-+    <subject category="GNOME|Graphics"/>
-+    <description/>
-+    <type/>
-     <format mime="text/sgml"/>
-     <identifier url="ggv.sgml"/>
-     <language code="ja"/>
-+    <relation seriesid="7120b8a2-d6f0-11d6-85a5-aa8e4f582b0e"/>
-+    <rights type="GNU GPL" license.version="2" license="http://www.gnu.org/licenses/gpl.html"/>
-   </resource>
--</omf>
-\ No newline at end of file
-+</omf>