From f00a3371dc7d08d1f076f98590fd957f2f28090a Mon Sep 17 00:00:00 2001 From: Rene Rebe Date: Thu, 17 Jun 2004 16:09:21 +0000 Subject: [PATCH] Rene Rebe: * updated epiphany and galeon (galeon might not build - at least it did not with gcc-3.4, but the code is broken enough to likely fail to compile with any other C++ compiler anyway ...) git-svn-id: http://www.rocklinux.org/svn/rock-linux/trunk@3300 c5f82cb5-29bc-0310-9cd0-bff59a50e3bc --- package/gnome2/epiphany/epiphany.desc | 4 +-- package/gnome2/epiphany/moz-1.7rc1.patch | 29 --------------- package/gnome2/epiphany/omf.patch | 33 +++++++++++++++++ package/gnome2/galeon/compile.patch | 45 ------------------------ package/gnome2/galeon/galeon.desc | 4 +-- package/gnome2/galeon/moz-1.7rc1.patch | 37 +++++-------------- 6 files changed, 46 insertions(+), 106 deletions(-) delete mode 100644 package/gnome2/epiphany/moz-1.7rc1.patch create mode 100644 package/gnome2/epiphany/omf.patch delete mode 100644 package/gnome2/galeon/compile.patch diff --git a/package/gnome2/epiphany/epiphany.desc b/package/gnome2/epiphany/epiphany.desc index dd6bd2508..5b58aed49 100644 --- a/package/gnome2/epiphany/epiphany.desc +++ b/package/gnome2/epiphany/epiphany.desc @@ -39,8 +39,8 @@ [L] GPL [S] Beta -[V] 1.2.5 +[V] 1.2.6 [P] X -----5---9 532.000 -[D] 3974433876 epiphany-1.2.5.tar.bz2 http://ftp.gnome.org/pub/GNOME/sources/epiphany/1.2/ +[D] 2253923912 epiphany-1.2.6.tar.bz2 http://ftp.gnome.org/pub/GNOME/sources/epiphany/1.2/ diff --git a/package/gnome2/epiphany/moz-1.7rc1.patch b/package/gnome2/epiphany/moz-1.7rc1.patch deleted file mode 100644 index bac33642c..000000000 --- a/package/gnome2/epiphany/moz-1.7rc1.patch +++ /dev/null @@ -1,29 +0,0 @@ -# --- ROCK-COPYRIGHT-NOTE-BEGIN --- -# -# This copyright note is auto-generated by ./scripts/Create-CopyPatch. -# Please add additional copyright information _after_ the line containing -# the ROCK-COPYRIGHT-NOTE-END tag. Otherwise it might get removed by -# the ./scripts/Create-CopyPatch script. Do not edit this copyright text! -# -# ROCK Linux: rock-src/package/gnome2/epiphany/moz-1.7rc1.patch -# ROCK Linux is Copyright (C) 1998 - 2004 Clifford Wolf -# -# This patch file is dual-licensed. It is available under the license the -# patched project is licensed under, as long as it is an OpenSource license -# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms -# of the GNU General Public License as published by the Free Software -# Foundation; either version 2 of the License, or (at your option) any later -# version. -# -# --- ROCK-COPYRIGHT-NOTE-END --- - ---- ./configure.vanilla 2004-05-16 18:25:04.263682056 +0200 -+++ ./configure 2004-05-16 18:25:54.356066856 +0200 -@@ -21855,6 +21855,7 @@ - 1.6) MOZILLA_SNAPSHOT=13 ;; - 1.7a) MOZILLA_SNAPSHOT=14 ;; - 1.7b) MOZILLA_SNAPSHOT=15 ;; -+ 1.7rc1) MOZILLA_SNAPSHOT=15 ;; - 1.7) MOZILLA_SNAPSHOT=15 ;; - *) { { echo "$as_me:$LINENO: error: - ***************************************************************************** diff --git a/package/gnome2/epiphany/omf.patch b/package/gnome2/epiphany/omf.patch new file mode 100644 index 000000000..ac5f4a69d --- /dev/null +++ b/package/gnome2/epiphany/omf.patch @@ -0,0 +1,33 @@ +--- epiphany-1.2.6/help/C/Makefile.in.orig 2004-06-17 11:48:38.721481152 +0200 ++++ epiphany-1.2.6/help/C/Makefile.in 2004-06-17 11:49:14.052110080 +0200 +@@ -458,7 +458,7 @@ + install-data-hook-omf: + $(mkinstalldirs) $(DESTDIR)$(omf_dest_dir) + for file in $(omffile); do \ +- $(INSTALL_DATA) $$file.out $(DESTDIR)$(omf_dest_dir)/$$file; \ ++ $(INSTALL_DATA) $$file $(DESTDIR)$(omf_dest_dir)/$$file; \ + done + -scrollkeeper-update -p $(scrollkeeper_localstate_dir) -o $(DESTDIR)$(omf_dest_dir) + +--- epiphany-1.2.6/help/es/Makefile.in.orig 2004-06-17 12:10:24.211016576 +0200 ++++ epiphany-1.2.6/help/es/Makefile.in 2004-06-17 12:10:39.259728824 +0200 +@@ -458,7 +458,7 @@ + install-data-hook-omf: + $(mkinstalldirs) $(DESTDIR)$(omf_dest_dir) + for file in $(omffile); do \ +- $(INSTALL_DATA) $$file.out $(DESTDIR)$(omf_dest_dir)/$$file; \ ++ $(INSTALL_DATA) $$file $(DESTDIR)$(omf_dest_dir)/$$file; \ + done + -scrollkeeper-update -p $(scrollkeeper_localstate_dir) -o $(DESTDIR)$(omf_dest_dir) + +--- epiphany-1.2.6/help/eu/Makefile.in.orig 2004-06-17 12:11:07.968364448 +0200 ++++ epiphany-1.2.6/help/eu/Makefile.in 2004-06-17 12:11:13.382541368 +0200 +@@ -458,7 +458,7 @@ + install-data-hook-omf: + $(mkinstalldirs) $(DESTDIR)$(omf_dest_dir) + for file in $(omffile); do \ +- $(INSTALL_DATA) $$file.out $(DESTDIR)$(omf_dest_dir)/$$file; \ ++ $(INSTALL_DATA) $$file $(DESTDIR)$(omf_dest_dir)/$$file; \ + done + -scrollkeeper-update -p $(scrollkeeper_localstate_dir) -o $(DESTDIR)$(omf_dest_dir) + diff --git a/package/gnome2/galeon/compile.patch b/package/gnome2/galeon/compile.patch deleted file mode 100644 index 88d9538e2..000000000 --- a/package/gnome2/galeon/compile.patch +++ /dev/null @@ -1,45 +0,0 @@ -# --- ROCK-COPYRIGHT-NOTE-BEGIN --- -# -# This copyright note is auto-generated by ./scripts/Create-CopyPatch. -# Please add additional copyright information _after_ the line containing -# the ROCK-COPYRIGHT-NOTE-END tag. Otherwise it might get removed by -# the ./scripts/Create-CopyPatch script. Do not edit this copyright text! -# -# ROCK Linux: rock-src/package/gnome2/galeon/compile.patch -# ROCK Linux is Copyright (C) 1998 - 2004 Clifford Wolf -# -# This patch file is dual-licensed. It is available under the license the -# patched project is licensed under, as long as it is an OpenSource license -# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms -# of the GNU General Public License as published by the Free Software -# Foundation; either version 2 of the License, or (at your option) any later -# version. -# -# --- ROCK-COPYRIGHT-NOTE-END --- - - -The usual trival compile fixes for lazy people. (Yes, this is really -a 1:1 copy of parts of my devhelp patch ...) - - - Rene Rebe - ---- devhelp/libegg/eggtoolbar.c.orig 2004-05-14 10:32:25.233789992 +0200 -+++ devhelp/libegg/eggtoolbar.c 2004-05-14 10:32:51.857742536 +0200 -@@ -2570,7 +2570,7 @@ - - GtkWidget* - egg_toolbar_append_element (EggToolbar *toolbar, -- GtkToolbarChildType type, -+ EggToolbarChildType type, - GtkWidget *widget, - const char *text, - const char *tooltip_text, -@@ -2587,7 +2587,7 @@ - - GtkWidget * - egg_toolbar_prepend_element (EggToolbar *toolbar, -- GtkToolbarChildType type, -+ EggToolbarChildType type, - GtkWidget *widget, - const char *text, - const char *tooltip_text, diff --git a/package/gnome2/galeon/galeon.desc b/package/gnome2/galeon/galeon.desc index 67ccdb5d0..2f18a6243 100644 --- a/package/gnome2/galeon/galeon.desc +++ b/package/gnome2/galeon/galeon.desc @@ -35,8 +35,8 @@ [L] GPL [S] Beta -[V] 1.3.14a +[V] 1.3.15 [P] X -----5---9 532.000 -[D] 2448124920 galeon-1.3.14a.tar.bz2 http://dl.sourceforge.net/sourceforge/galeon/ +[D] 3300052006 galeon-1.3.15.tar.bz2 http://dl.sourceforge.net/sourceforge/galeon/ diff --git a/package/gnome2/galeon/moz-1.7rc1.patch b/package/gnome2/galeon/moz-1.7rc1.patch index ecbd9b35d..5c3e89e5d 100644 --- a/package/gnome2/galeon/moz-1.7rc1.patch +++ b/package/gnome2/galeon/moz-1.7rc1.patch @@ -1,29 +1,10 @@ -# --- ROCK-COPYRIGHT-NOTE-BEGIN --- -# -# This copyright note is auto-generated by ./scripts/Create-CopyPatch. -# Please add additional copyright information _after_ the line containing -# the ROCK-COPYRIGHT-NOTE-END tag. Otherwise it might get removed by -# the ./scripts/Create-CopyPatch script. Do not edit this copyright text! -# -# ROCK Linux: rock-src/package/gnome2/galeon/moz-1.7rc1.patch -# ROCK Linux is Copyright (C) 1998 - 2004 Clifford Wolf -# -# This patch file is dual-licensed. It is available under the license the -# patched project is licensed under, as long as it is an OpenSource license -# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms -# of the GNU General Public License as published by the Free Software -# Foundation; either version 2 of the License, or (at your option) any later -# version. -# -# --- ROCK-COPYRIGHT-NOTE-END --- - ---- ./configure.vanilla 2004-05-16 18:13:19.136877624 +0200 -+++ ./configure 2004-05-16 18:13:28.250492144 +0200 -@@ -21835,6 +21835,7 @@ - 1.6) MOZILLA_SNAPSHOT=13 ;; - 1.7a) MOZILLA_SNAPSHOT=14 ;; +--- ./configure.orig 2004-05-31 19:46:20.000000000 +0200 ++++ ./configure 2004-06-16 12:19:46.629387240 +0200 +@@ -22748,6 +22748,7 @@ 1.7b) MOZILLA_SNAPSHOT=15 ;; -+ 1.7rc1) MOZILLA_SNAPSHOT=15 ;; - trunk) MOZILLA_SNAPSHOT=15 ;; - *) { { echo "$as_me:$LINENO: error: - ***************************************************************************** + 1.7rc1) MOZILLA_SNAPSHOT=15 ;; + 1.7rc2) MOZILLA_SNAPSHOT=16 ;; ++1.7rc3) MOZILLA_SNAPSHOT=16 ;; + 1.7) MOZILLA_SNAPSHOT=16 ;; + 1.8a) MOZILLA_SNAPSHOT=17 ;; + 1.8a1) MOZILLA_SNAPSHOT=17 ;;