fake
21 years ago
160 changed files with 821 additions and 1229 deletions
Unified View
Diff Options
-
+2 -2package/gnome2/abiword/abiword.desc
-
+0 -46package/gnome2/acme/gcc34.patch
-
+70 -0package/gnome2/acme/gnome28-api-change-fromcvs.patch
-
+2 -2package/gnome2/at-spi/at-spi.desc
-
+2 -2package/gnome2/atk/atk.desc
-
+2 -2package/gnome2/balsa/balsa.desc
-
+2 -2package/gnome2/bug-buddy/bug-buddy.desc
-
+2 -2package/gnome2/control-center/control-center.desc
-
+43 -0package/gnome2/desktop-file-utils/desktop-file-utils.desc
-
+2 -2package/gnome2/devhelp/devhelp.desc
-
+2 -2package/gnome2/devilspie/devilspie.desc
-
+3 -3package/gnome2/dia/dia.desc
-
+62 -68package/gnome2/dia/png-hotfix.patch
-
+2 -2package/gnome2/drwright/drwright.desc
-
+2 -2package/gnome2/eel/eel.desc
-
+2 -2package/gnome2/enchant/enchant.desc
-
+2 -2package/gnome2/eog/eog.desc
-
+2 -2package/gnome2/epiphany/epiphany.desc
-
+9 -0package/gnome2/evolution-data-server/evolution-data-server.conf
-
+41 -0package/gnome2/evolution-data-server/evolution-data-server.desc
-
+43 -0package/gnome2/evolution-webcal/evolution-webcal.desc
-
+2 -34package/gnome2/evolution/evolution.conf
-
+4 -5package/gnome2/evolution/evolution.desc
-
+0 -282package/gnome2/evolution/hotfix.patch
-
+2 -2package/gnome2/file-roller/file-roller.desc
-
+2 -2package/gnome2/firestarter/firestarter.desc
-
+2 -2package/gnome2/gail/gail.desc
-
+2 -2package/gnome2/gal/gal.desc
-
+2 -2package/gnome2/gcalctool/gcalctool.desc
-
+2 -2package/gnome2/gconf-editor/gconf-editor.desc
-
+2 -2package/gnome2/gconf/gconf.desc
-
+2 -0package/gnome2/gdesklets/gdesklets.conf
-
+2 -2package/gnome2/gdesklets/gdesklets.desc
-
+1 -1package/gnome2/gdm/gdm.conf
-
+2 -2package/gnome2/gdm/gdm.desc
-
+2 -2package/gnome2/gedit/gedit.desc
-
+2 -2package/gnome2/gftp/gftp.desc
-
+2 -2package/gnome2/ggv/ggv.desc
-
+2 -2package/gnome2/ghex/ghex.desc
-
+2 -2package/gnome2/glabels/glabels.desc
-
+4 -4package/gnome2/glib/config.hlp
-
+3 -3package/gnome2/glib/config.in
-
+2 -2package/gnome2/glib/gnome-2.conf
-
+2 -2package/gnome2/glibmm/glibmm.desc
-
+2 -2package/gnome2/gmime/gmime.desc
-
+2 -2package/gnome2/gnet/gnet.desc
-
+22 -0package/gnome2/gnet/no-dashpthread-in-la.patch
-
+2 -2package/gnome2/gnome-applets/gnome-applets.desc
-
+2 -2package/gnome2/gnome-common/gnome-common.desc
-
+2 -2package/gnome2/gnome-cups-manager/gnome-cups-manager.desc
-
+2 -2package/gnome2/gnome-desktop/gnome-desktop.desc
-
+44 -0package/gnome2/gnome-doc-utils/gnome-doc-utils.desc
-
+2 -2package/gnome2/gnome-games/gnome-games.desc
-
+2 -2package/gnome2/gnome-icon-theme/gnome-icon-theme.desc
-
+2 -2package/gnome2/gnome-keyring/gnome-keyring.desc
-
+2 -2package/gnome2/gnome-mag/gnome-mag.desc
-
+2 -2package/gnome2/gnome-media/gnome-media.desc
-
+2 -2package/gnome2/gnome-mime-data/gnome-mime-data.desc
-
+44 -0package/gnome2/gnome-netstatus/gnome-netstatus.desc
-
+42 -0package/gnome2/gnome-nettool/gnome-nettool.desc
-
+2 -2package/gnome2/gnome-panel/gnome-panel.desc
-
+2 -2package/gnome2/gnome-pilot-conduits/gnome-pilot-conduits.desc
-
+0 -133package/gnome2/gnome-pilot/gcc34.patch
-
+2 -2package/gnome2/gnome-pilot/gnome-pilot.desc
-
+2 -2package/gnome2/gnome-python/gnome-python.desc
-
+1 -1package/gnome2/gnome-session/gnome-session.conf
-
+2 -2package/gnome2/gnome-session/gnome-session.desc
-
+2 -2package/gnome2/gnome-speech/gnome-speech.desc
-
+2 -2package/gnome2/gnome-system-monitor/gnome-system-monitor.desc
-
+2 -2package/gnome2/gnome-system-tools/gnome-system-tools.desc
-
+0 -44package/gnome2/gnome-terminal/gcc34.patch
-
+2 -2package/gnome2/gnome-terminal/gnome-terminal.desc
-
+2 -2package/gnome2/gnome-themes/gnome-themes.desc
-
+2 -2package/gnome2/gnome-utils/gnome-utils.desc
-
+2 -2package/gnome2/gnome-vfs/gnome-vfs.desc
-
+10 -0package/gnome2/gnome-vfs/pc-requires-gobject.patch
-
+2 -2package/gnome2/gnome-vfsmm/gnome-vfsmm.desc
-
+2 -2package/gnome2/gnome2-user-docs/gnome2-user-docs.desc
-
+2 -2package/gnome2/gnomeicu/gnomeicu.desc
-
+2 -2package/gnome2/gnopernicus/gnopernicus.desc
-
+3 -3package/gnome2/gnumeric/gnumeric.desc
-
+0 -30package/gnome2/gnumeric/hotfix.patch
-
+2 -2package/gnome2/gob/gob.desc
-
+2 -2package/gnome2/gok/gok.desc
-
+2 -2package/gnome2/gossip/gossip.desc
-
+2 -2package/gnome2/gpdf/gpdf.desc
-
+2 -2package/gnome2/gst-editor/gst-editor.desc
-
+2 -3package/gnome2/gst-plugins/gst-plugins.desc
-
+2 -2package/gnome2/gstreamer/gstreamer.desc
-
+2 -2package/gnome2/gthumb/gthumb.desc
-
+2 -2package/gnome2/gtk+/gtk+.desc
-
+2 -2package/gnome2/gtkhtml/gtkhtml.desc
-
+2 -2package/gnome2/gtkmm/gtkmm.desc
-
+2 -2package/gnome2/gtksourceview/gtksourceview.desc
-
+2 -2package/gnome2/gucharmap/gucharmap.desc
-
+2 -2package/gnome2/gworldclock/gworldclock.desc
-
+2 -2package/gnome2/libbonobo/libbonobo.desc
-
+11 -0package/gnome2/libbonobo/pcfile-missing-orbitlib.patch
-
+2 -2package/gnome2/libbonoboui/libbonoboui.desc
-
+1 -1package/gnome2/libcroco/libcroco.desc
@ -1,46 +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/acme/gcc34.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 --- |
|
||||
|
|
||||
|
|
||||
Oh my god is Gnome full of nice code duplications. This is exactly the same |
|
||||
patch as gnome-terminal needs (yes applies cleanls ;-): Some real bugs |
|
||||
uncovered by gcc-3.4 ... |
|
||||
|
|
||||
- Rene Rebe <rene@exactcode.de> |
|
||||
|
|
||||
--- gnome-terminal-2.6.0/src/eggcellrendererkeys.c.orig 2004-05-10 13:41:45.587354088 +0200
|
|
||||
+++ gnome-terminal-2.6.0/src/eggcellrendererkeys.c 2004-05-10 13:42:16.827604848 +0200
|
|
||||
@@ -584,7 +584,7 @@
|
|
||||
void |
|
||||
egg_cell_renderer_keys_set_accelerator (EggCellRendererKeys *keys, |
|
||||
guint keyval, |
|
||||
- GdkModifierType mask)
|
|
||||
+ EggVirtualModifierType mask)
|
|
||||
{ |
|
||||
char *text; |
|
||||
gboolean changed; |
|
||||
@@ -626,7 +626,7 @@
|
|
||||
void |
|
||||
egg_cell_renderer_keys_get_accelerator (EggCellRendererKeys *keys, |
|
||||
guint *keyval, |
|
||||
- GdkModifierType *mask)
|
|
||||
+ EggVirtualModifierType *mask)
|
|
||||
{ |
|
||||
g_return_if_fail (EGG_IS_CELL_RENDERER_KEYS (keys)); |
|
||||
|
|
||||
@ -0,0 +1,70 @@ |
|||||
|
--- ./src/acme.c.orig 2004-12-04 23:42:11.283583688 +0100
|
||||
|
+++ ./src/acme.c 2004-12-04 23:44:15.366720184 +0100
|
||||
|
@@ -51,6 +51,10 @@
|
||||
|
guint dialog_timeout; |
||||
|
WnckScreen *screen; |
||||
|
|
||||
|
+ /* The Event */
|
||||
|
+ GdkEvent *event;
|
||||
|
+ GdkXEvent *xevent;
|
||||
|
+
|
||||
|
/* Multihead stuff */ |
||||
|
GdkDisplay *display; |
||||
|
GdkScreen *current_screen; |
||||
|
@@ -801,8 +805,14 @@
|
||||
|
} |
||||
|
} |
||||
|
|
||||
|
+ /* Since libwnck 2.6.2.1 you need to give a timestamp */
|
||||
|
if (focused != NULL) |
||||
|
- wnck_window_close (focused);
|
||||
|
+ {
|
||||
|
+ if (acme->event)
|
||||
|
+ wnck_window_close (focused, acme->event->key.time);
|
||||
|
+ else
|
||||
|
+ wnck_window_close (focused, GDK_CURRENT_TIME);
|
||||
|
+ }
|
||||
|
} |
||||
|
|
||||
|
static void |
||||
|
@@ -1171,6 +1181,10 @@
|
||||
|
GList *l; |
||||
|
int i; |
||||
|
|
||||
|
+ /* Store the event */
|
||||
|
+ acme->event = event;
|
||||
|
+ acme->xevent = xevent;
|
||||
|
+
|
||||
|
/* Look for which screen we're receiving events */ |
||||
|
for (l = acme->screens; (l != NULL) && (event_screen == NULL); |
||||
|
l = l->next) |
||||
|
--- ./src/eggcellrendererkeys.c.orig 2003-07-18 01:12:02.000000000 +0200
|
||||
|
+++ ./src/eggcellrendererkeys.c 2004-12-04 23:47:04.379026408 +0100
|
||||
|
@@ -581,10 +581,9 @@
|
||||
|
return GTK_CELL_EDITABLE (keys->edit_widget); |
||||
|
} |
||||
|
|
||||
|
-void
|
||||
|
-egg_cell_renderer_keys_set_accelerator (EggCellRendererKeys *keys,
|
||||
|
- guint keyval,
|
||||
|
- GdkModifierType mask)
|
||||
|
+void egg_cell_renderer_keys_set_accelerator (EggCellRendererKeys *keys,
|
||||
|
+ guint keyval,
|
||||
|
+ EggVirtualModifierType mask)
|
||||
|
{ |
||||
|
char *text; |
||||
|
gboolean changed; |
||||
|
@@ -623,10 +622,9 @@
|
||||
|
|
||||
|
} |
||||
|
|
||||
|
-void
|
||||
|
-egg_cell_renderer_keys_get_accelerator (EggCellRendererKeys *keys,
|
||||
|
- guint *keyval,
|
||||
|
- GdkModifierType *mask)
|
||||
|
+void egg_cell_renderer_keys_get_accelerator (EggCellRendererKeys *keys,
|
||||
|
+ guint *keyval,
|
||||
|
+ EggVirtualModifierType *mask)
|
||||
|
{ |
||||
|
g_return_if_fail (EGG_IS_CELL_RENDERER_KEYS (keys)); |
||||
|
|
||||
@ -0,0 +1,43 @@ |
|||||
|
|
||||
|
[COPY] --- ROCK-COPYRIGHT-NOTE-BEGIN --- |
||||
|
[COPY] |
||||
|
[COPY] This copyright note is auto-generated by ./scripts/Create-CopyPatch. |
||||
|
[COPY] Please add additional copyright information _after_ the line containing |
||||
|
[COPY] the ROCK-COPYRIGHT-NOTE-END tag. Otherwise it might get removed by |
||||
|
[COPY] the ./scripts/Create-CopyPatch script. Do not edit this copyright text! |
||||
|
[COPY] |
||||
|
[COPY] ROCK Linux: rock-src/package/gnome2/desktop-file-utils/desktop-file-utils.desc |
||||
|
[COPY] ROCK Linux is Copyright (C) 1998 - 2004 Clifford Wolf |
||||
|
[COPY] |
||||
|
[COPY] This program is free software; you can redistribute it and/or modify |
||||
|
[COPY] it under the terms of the GNU General Public License as published by |
||||
|
[COPY] the Free Software Foundation; either version 2 of the License, or |
||||
|
[COPY] (at your option) any later version. A copy of the GNU General Public |
||||
|
[COPY] License can be found at Documentation/COPYING. |
||||
|
[COPY] |
||||
|
[COPY] Many people helped and are helping developing ROCK Linux. Please |
||||
|
[COPY] have a look at http://www.rocklinux.org/ and the Documentation/TEAM |
||||
|
[COPY] file for details. |
||||
|
[COPY] |
||||
|
[COPY] --- ROCK-COPYRIGHT-NOTE-END --- |
||||
|
|
||||
|
[I] command line utilities for desktop files |
||||
|
|
||||
|
[T] desktop-file-utils contains a couple of command line utilities for working |
||||
|
[T] with desktop entries. |
||||
|
|
||||
|
[U] http://www.freedesktop.org/Software/desktop-file-utils |
||||
|
|
||||
|
[A] Havoc Pennington <hp@redhat.com> |
||||
|
[A] Alex Larsson <alexl@redhat.com> |
||||
|
[M] Juergen Sawinski <jsaw@rocklinux.org> |
||||
|
|
||||
|
[C] extra/desktop/gnome |
||||
|
|
||||
|
[L] GPL |
||||
|
[S] Beta |
||||
|
[V] 0.10 |
||||
|
[P] X -----5---9 140.700 |
||||
|
|
||||
|
[D] 260783181 desktop-file-utils-0.10.tar.gz http://www.freedesktop.org/software/desktop-file-utils/releases/ |
||||
|
|
||||
@ -0,0 +1,9 @@ |
|||||
|
. $base/package/*/*/gnome-2.conf |
||||
|
|
||||
|
pkginstalled openldap && \ |
||||
|
var_append confopt ' ' "--with-openldap=$root/${pkg_openldap_prefix}" |
||||
|
|
||||
|
# bdb doesn't like some of our make options |
||||
|
makeopt="docdir=$docdir all" |
||||
|
makeinstopt="docdir=$docdir install" |
||||
|
|
||||
@ -0,0 +1,41 @@ |
|||||
|
|
||||
|
[COPY] --- ROCK-COPYRIGHT-NOTE-BEGIN --- |
||||
|
[COPY] |
||||
|
[COPY] This copyright note is auto-generated by ./scripts/Create-CopyPatch. |
||||
|
[COPY] Please add additional copyright information _after_ the line containing |
||||
|
[COPY] the ROCK-COPYRIGHT-NOTE-END tag. Otherwise it might get removed by |
||||
|
[COPY] the ./scripts/Create-CopyPatch script. Do not edit this copyright text! |
||||
|
[COPY] |
||||
|
[COPY] ROCK Linux: rock-src/package/gnome2/evolution-data-center/evolution-data-center.desc |
||||
|
[COPY] ROCK Linux is Copyright (C) 1998 - 2004 Clifford Wolf |
||||
|
[COPY] |
||||
|
[COPY] This program is free software; you can redistribute it and/or modify |
||||
|
[COPY] it under the terms of the GNU General Public License as published by |
||||
|
[COPY] the Free Software Foundation; either version 2 of the License, or |
||||
|
[COPY] (at your option) any later version. A copy of the GNU General Public |
||||
|
[COPY] License can be found at Documentation/COPYING. |
||||
|
[COPY] |
||||
|
[COPY] Many people helped and are helping developing ROCK Linux. Please |
||||
|
[COPY] have a look at http://www.rocklinux.org/ and the Documentation/TEAM |
||||
|
[COPY] file for details. |
||||
|
[COPY] |
||||
|
[COPY] --- ROCK-COPYRIGHT-NOTE-END --- |
||||
|
|
||||
|
[I] The evolution data server for the calendar and addressbook |
||||
|
|
||||
|
[T] TODO |
||||
|
|
||||
|
[U] http://gnome.org/projects/evolution/ |
||||
|
|
||||
|
[A] Many! {http://gnome.org/projects/evolution/about.shtml} |
||||
|
[M] Juergen Sawinski <jsaw@rocklinux.org> |
||||
|
|
||||
|
[C] extra/office extra/desktop/gnome |
||||
|
|
||||
|
[L] GPL |
||||
|
[S] Stable |
||||
|
[V] 1.0.2 |
||||
|
[P] X -?---5---9 151.600 |
||||
|
|
||||
|
[D] 3699387095 evolution-data-server-1.0.2.tar.bz2 http://ftp.gnome.org/pub/gnome/sources/evolution-data-server/1.0/ |
||||
|
|
||||
@ -0,0 +1,43 @@ |
|||||
|
|
||||
|
[COPY] --- ROCK-COPYRIGHT-NOTE-BEGIN --- |
||||
|
[COPY] |
||||
|
[COPY] This copyright note is auto-generated by ./scripts/Create-CopyPatch. |
||||
|
[COPY] Please add additional copyright information _after_ the line containing |
||||
|
[COPY] the ROCK-COPYRIGHT-NOTE-END tag. Otherwise it might get removed by |
||||
|
[COPY] the ./scripts/Create-CopyPatch script. Do not edit this copyright text! |
||||
|
[COPY] |
||||
|
[COPY] ROCK Linux: rock-src/package/gnome2/evolution-webcal/evolution-webcal.desc |
||||
|
[COPY] ROCK Linux is Copyright (C) 1998 - 2004 Clifford Wolf |
||||
|
[COPY] |
||||
|
[COPY] This program is free software; you can redistribute it and/or modify |
||||
|
[COPY] it under the terms of the GNU General Public License as published by |
||||
|
[COPY] the Free Software Foundation; either version 2 of the License, or |
||||
|
[COPY] (at your option) any later version. A copy of the GNU General Public |
||||
|
[COPY] License can be found at Documentation/COPYING. |
||||
|
[COPY] |
||||
|
[COPY] Many people helped and are helping developing ROCK Linux. Please |
||||
|
[COPY] have a look at http://www.rocklinux.org/ and the Documentation/TEAM |
||||
|
[COPY] file for details. |
||||
|
[COPY] |
||||
|
[COPY] --- ROCK-COPYRIGHT-NOTE-END --- |
||||
|
|
||||
|
[I] URL handler for GNOME and Evolution |
||||
|
|
||||
|
[T] A GNOME URL handler for web-published ical calendar files, which |
||||
|
[T] integrates with the Evolution groupware suite. It allows you to |
||||
|
[T] subscribe to a published calendar simply by clicking on a webcal: URL. |
||||
|
|
||||
|
[U] http://gnome.org/projects/evolution/ |
||||
|
|
||||
|
[A] Rodney Dawes <dobey@users.sourceforge.net> |
||||
|
[M] Juergen Sawinski <jsaw@rocklinux.org> |
||||
|
|
||||
|
[C] extra/desktop/gnome |
||||
|
|
||||
|
[L] GPL |
||||
|
[S] Beta |
||||
|
[V] 2.0.1 |
||||
|
[P] X -----5---9 800.000 |
||||
|
|
||||
|
[D] 4130333183 evolution-webcal-2.0.1.tar.bz2 http://ftp.acc.umu.se/pub/GNOME/sources/evolution-webcal/2.0/ |
||||
|
|
||||
@ -1,282 +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/evolution/hotfix.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 --- |
|
||||
|
|
||||
diff -urN -x '*~' evolution-1.4.0-old/camel/providers/nntp/camel-nntp-store.c evolution-1.4.0-new/camel/providers/nntp/camel-nntp-store.c
|
|
||||
--- evolution-1.4.0-old/camel/providers/nntp/camel-nntp-store.c 2002-05-28 05:00:31.000000000 +0200
|
|
||||
+++ evolution-1.4.0-new/camel/providers/nntp/camel-nntp-store.c 2003-07-04 16:51:28.000000000 +0200
|
|
||||
@@ -114,7 +114,7 @@
|
|
||||
#ifdef HAVE_SSL |
|
||||
if (ssl_mode != USE_SSL_NEVER) { |
|
||||
port = service->url->port ? service->url->port : NNTPS_PORT; |
|
||||
- tcp_stream = camel_tcp_stream_ssl_new (service, service->url->host);
|
|
||||
+ tcp_stream = camel_tcp_stream_ssl_new (service, service->url->host, 0);
|
|
||||
} else { |
|
||||
tcp_stream = camel_tcp_stream_raw_new (); |
|
||||
} |
|
||||
diff -urN -x '*~' evolution-1.4.0-old/camel/providers/nntp/camel-nntp-summary.h evolution-1.4.0-new/camel/providers/nntp/camel-nntp-summary.h
|
|
||||
--- evolution-1.4.0-old/camel/providers/nntp/camel-nntp-summary.h 2002-05-07 09:31:25.000000000 +0200
|
|
||||
+++ evolution-1.4.0-new/camel/providers/nntp/camel-nntp-summary.h 2003-07-04 15:13:18.000000000 +0200
|
|
||||
@@ -24,7 +24,6 @@
|
|
||||
#include <camel/camel-folder-summary.h> |
|
||||
#include <camel/camel-folder.h> |
|
||||
#include <camel/camel-exception.h> |
|
||||
-#include <libibex/ibex.h>
|
|
||||
|
|
||||
#define CAMEL_NNTP_SUMMARY(obj) CAMEL_CHECK_CAST (obj, camel_nntp_summary_get_type (), CamelNNTPSummary) |
|
||||
#define CAMEL_NNTP_SUMMARY_CLASS(klass) CAMEL_CHECK_CLASS_CAST (klass, camel_nntp_summary_get_type (), CamelNNTPSummaryClass) |
|
||||
--- evolution-1.4.6/e-util/e-component-listener.c~ 2003-06-04 17:05:09.000000000 +0200
|
|
||||
+++ evolution-1.4.6/e-util/e-component-listener.c 2004-07-19 17:05:37.530238768 +0200
|
|
||||
@@ -52,7 +52,6 @@
|
|
||||
cl->priv->component = CORBA_OBJECT_NIL; |
|
||||
g_object_unref (cl); |
|
||||
break; |
|
||||
- default :
|
|
||||
} |
|
||||
} |
|
||||
} |
|
||||
--- evolution-1.4.6/addressbook/conduit/address-conduit.c.orig 2004-07-19 21:45:44.116249336 +0200
|
|
||||
+++ evolution-1.4.6/addressbook/conduit/address-conduit.c 2004-07-19 21:46:07.206739048 +0200
|
|
||||
@@ -609,7 +609,6 @@
|
|
||||
return E_CARD_SIMPLE_FIELD_EMAIL_2; |
|
||||
case E_CARD_SIMPLE_FIELD_EMAIL_2: |
|
||||
return E_CARD_SIMPLE_FIELD_EMAIL_3; |
|
||||
- default:
|
|
||||
} |
|
||||
|
|
||||
return E_CARD_SIMPLE_FIELD_LAST; |
|
||||
@@ -624,7 +623,6 @@
|
|
||||
switch (*field) { |
|
||||
case E_CARD_SIMPLE_FIELD_PHONE_HOME: |
|
||||
return E_CARD_SIMPLE_FIELD_PHONE_HOME_2; |
|
||||
- default:
|
|
||||
} |
|
||||
|
|
||||
return E_CARD_SIMPLE_FIELD_LAST; |
|
||||
@@ -639,7 +637,6 @@
|
|
||||
switch (*field) { |
|
||||
case E_CARD_SIMPLE_FIELD_PHONE_BUSINESS: |
|
||||
return E_CARD_SIMPLE_FIELD_PHONE_BUSINESS_2; |
|
||||
- default:
|
|
||||
} |
|
||||
|
|
||||
return E_CARD_SIMPLE_FIELD_LAST; |
|
||||
@@ -656,7 +653,6 @@
|
|
||||
return E_CARD_SIMPLE_FIELD_PHONE_HOME_FAX; |
|
||||
case E_CARD_SIMPLE_FIELD_PHONE_HOME_FAX: |
|
||||
return E_CARD_SIMPLE_FIELD_PHONE_OTHER_FAX; |
|
||||
- default:
|
|
||||
} |
|
||||
|
|
||||
return E_CARD_SIMPLE_FIELD_LAST; |
|
||||
--- evolution-1.4.6/calendar/cal-client/cal-client.c.orig 2004-07-19 22:27:58.601948944 +0200
|
|
||||
+++ evolution-1.4.6/calendar/cal-client/cal-client.c 2004-07-19 22:27:10.202306808 +0200
|
|
||||
@@ -2886,26 +2886,26 @@
|
|
||||
return cal_client_remove_object_with_mod (client, uid, CALOBJ_MOD_ALL); |
|
||||
} |
|
||||
|
|
||||
-CalClientResult
|
|
||||
+CalClientSendResult
|
|
||||
cal_client_send_object (CalClient *client, icalcomponent *icalcomp, |
|
||||
icalcomponent **new_icalcomp, GList **users, |
|
||||
char error_msg[256]) |
|
||||
{ |
|
||||
CalClientPrivate *priv; |
|
||||
CORBA_Environment ev; |
|
||||
- CalClientResult retval;
|
|
||||
+ CalClientSendResult retval;
|
|
||||
GNOME_Evolution_Calendar_UserList *user_list; |
|
||||
char *obj_string; |
|
||||
int i; |
|
||||
|
|
||||
- g_return_val_if_fail (client != NULL, CAL_CLIENT_RESULT_INVALID_OBJECT);
|
|
||||
- g_return_val_if_fail (IS_CAL_CLIENT (client), CAL_CLIENT_RESULT_INVALID_OBJECT);
|
|
||||
+ g_return_val_if_fail (client != NULL, CAL_CLIENT_SEND_INVALID_OBJECT);
|
|
||||
+ g_return_val_if_fail (IS_CAL_CLIENT (client), CAL_CLIENT_SEND_INVALID_OBJECT);
|
|
||||
|
|
||||
priv = client->priv; |
|
||||
g_return_val_if_fail (priv->load_state == CAL_CLIENT_LOAD_LOADED, |
|
||||
- CAL_CLIENT_RESULT_INVALID_OBJECT);
|
|
||||
+ CAL_CLIENT_SEND_INVALID_OBJECT);
|
|
||||
|
|
||||
- g_return_val_if_fail (icalcomp != NULL, CAL_CLIENT_RESULT_INVALID_OBJECT);
|
|
||||
+ g_return_val_if_fail (icalcomp != NULL, CAL_CLIENT_SEND_INVALID_OBJECT);
|
|
||||
|
|
||||
/* Libical owns this memory, using one of its temporary buffers. */ |
|
||||
obj_string = icalcomponent_as_ical_string (icalcomp); |
|
||||
@@ -2925,13 +2925,13 @@
|
|
||||
g_message ("cal_client_update_objects(): could not send the objects"); |
|
||||
retval = CAL_CLIENT_SEND_CORBA_ERROR; |
|
||||
} else { |
|
||||
- retval = CAL_CLIENT_RESULT_SUCCESS;
|
|
||||
+ retval = CAL_CLIENT_SEND_SUCCESS;
|
|
||||
|
|
||||
*new_icalcomp = icalparser_parse_string (obj_string); |
|
||||
CORBA_free (obj_string); |
|
||||
|
|
||||
if (*new_icalcomp == NULL) { |
|
||||
- retval = CAL_CLIENT_RESULT_INVALID_OBJECT;
|
|
||||
+ retval = CAL_CLIENT_SEND_INVALID_OBJECT;
|
|
||||
} else { |
|
||||
*users = NULL; |
|
||||
for (i = 0; i < user_list->_length; i++) |
|
||||
--- evolution-1.4.6/calendar/gui/e-day-view.c.orig 2004-07-19 22:47:11.012755872 +0200
|
|
||||
+++ evolution-1.4.6/calendar/gui/e-day-view.c 2004-07-19 22:50:10.811422320 +0200
|
|
||||
@@ -3235,7 +3235,6 @@
|
|
||||
case GDK_SCROLL_DOWN: |
|
||||
e_day_view_scroll (day_view, -E_DAY_VIEW_WHEEL_MOUSE_STEP_SIZE); |
|
||||
return TRUE; |
|
||||
- default:
|
|
||||
} |
|
||||
|
|
||||
return FALSE; |
|
||||
@@ -3255,7 +3254,6 @@
|
|
||||
case GDK_SCROLL_DOWN: |
|
||||
e_day_view_scroll (day_view, -E_DAY_VIEW_WHEEL_MOUSE_STEP_SIZE); |
|
||||
return TRUE; |
|
||||
- default:
|
|
||||
} |
|
||||
|
|
||||
return FALSE; |
|
||||
@@ -4142,7 +4140,7 @@
|
|
||||
const char *uid; |
|
||||
|
|
||||
if (itip_organizer_is_user (event->comp, day_view->client) |
|
||||
- && cancel_component_dialog ((GtkWindow *) gtk_widget_get_toplevel (day_view),
|
|
||||
+ && cancel_component_dialog ((GtkWindow *) gtk_widget_get_toplevel ((GtkWidget *) day_view),
|
|
||||
day_view->client, event->comp, TRUE)) |
|
||||
itip_send_comp (CAL_COMPONENT_METHOD_CANCEL, event->comp, day_view->client, NULL); |
|
||||
|
|
||||
@@ -4279,7 +4277,7 @@
|
|
||||
e_day_view_on_copy (widget, data); |
|
||||
|
|
||||
if (itip_organizer_is_user (event->comp, day_view->client) |
|
||||
- && cancel_component_dialog ((GtkWindow *) gtk_widget_get_toplevel (day_view),
|
|
||||
+ && cancel_component_dialog ((GtkWindow *) gtk_widget_get_toplevel ((GtkWidget *) day_view),
|
|
||||
day_view->client, event->comp, TRUE)) |
|
||||
itip_send_comp (CAL_COMPONENT_METHOD_CANCEL, event->comp, day_view->client, NULL); |
|
||||
|
|
||||
@@ -4915,7 +4913,7 @@
|
|
||||
if (recur_component_dialog (comp, &mod, NULL)) { |
|
||||
if (cal_client_update_object_with_mod (day_view->client, comp, mod) == CAL_CLIENT_RESULT_SUCCESS) { |
|
||||
if (itip_organizer_is_user (comp, day_view->client) && |
|
||||
- send_component_dialog (gtk_widget_get_toplevel (day_view),
|
|
||||
+ send_component_dialog (gtk_widget_get_toplevel ((GtkWidget *) day_view),
|
|
||||
day_view->client, comp, FALSE)) |
|
||||
itip_send_comp (CAL_COMPONENT_METHOD_REQUEST, comp, day_view->client, NULL); |
|
||||
} else { |
|
||||
@@ -4926,7 +4924,7 @@
|
|
||||
} |
|
||||
} else if (cal_client_update_object (day_view->client, comp) == CAL_CLIENT_RESULT_SUCCESS) { |
|
||||
if (itip_organizer_is_user (comp, day_view->client) && |
|
||||
- send_component_dialog (gtk_widget_get_toplevel (day_view),
|
|
||||
+ send_component_dialog (gtk_widget_get_toplevel ((GtkWidget *) day_view),
|
|
||||
day_view->client, comp, TRUE)) |
|
||||
itip_send_comp (CAL_COMPONENT_METHOD_REQUEST, comp, day_view->client, NULL); |
|
||||
} else { |
|
||||
@@ -4997,7 +4995,7 @@
|
|
||||
if (recur_component_dialog (comp, &mod, NULL)) { |
|
||||
if (cal_client_update_object_with_mod (day_view->client, comp, mod) == CAL_CLIENT_RESULT_SUCCESS) { |
|
||||
if (itip_organizer_is_user (comp, day_view->client) && |
|
||||
- send_component_dialog (gtk_widget_get_toplevel (day_view),
|
|
||||
+ send_component_dialog (gtk_widget_get_toplevel ((GtkWidget *) day_view),
|
|
||||
day_view->client, comp, FALSE)) |
|
||||
itip_send_comp (CAL_COMPONENT_METHOD_REQUEST, comp, day_view->client, NULL); |
|
||||
} else { |
|
||||
@@ -5008,7 +5006,7 @@
|
|
||||
} |
|
||||
} else if (cal_client_update_object (day_view->client, comp) == CAL_CLIENT_RESULT_SUCCESS) { |
|
||||
if (itip_organizer_is_user (comp, day_view->client) && |
|
||||
- send_component_dialog (gtk_widget_get_toplevel (day_view), day_view->client, comp, FALSE))
|
|
||||
+ send_component_dialog (gtk_widget_get_toplevel ((GtkWidget *) day_view), day_view->client, comp, FALSE))
|
|
||||
itip_send_comp (CAL_COMPONENT_METHOD_REQUEST, comp, day_view->client, NULL); |
|
||||
} else { |
|
||||
g_message ("e_day_view_finish_resize(): Could not update the object!"); |
|
||||
@@ -6631,7 +6629,7 @@
|
|
||||
if (recur_component_dialog (event->comp, &mod, NULL)) { |
|
||||
if (cal_client_update_object_with_mod (day_view->client, event->comp, mod) == CAL_CLIENT_RESULT_SUCCESS) { |
|
||||
if (itip_organizer_is_user (event->comp, day_view->client) |
|
||||
- && send_component_dialog (gtk_widget_get_toplevel (day_view),
|
|
||||
+ && send_component_dialog (gtk_widget_get_toplevel ((GtkWidget *) day_view),
|
|
||||
day_view->client, event->comp, FALSE)) |
|
||||
itip_send_comp (CAL_COMPONENT_METHOD_REQUEST, event->comp, |
|
||||
day_view->client, NULL); |
|
||||
@@ -6641,7 +6639,7 @@
|
|
||||
} |
|
||||
} else if (cal_client_update_object (day_view->client, event->comp) == CAL_CLIENT_RESULT_SUCCESS) { |
|
||||
if (itip_organizer_is_user (event->comp, day_view->client) && |
|
||||
- send_component_dialog (gtk_widget_get_toplevel (day_view),
|
|
||||
+ send_component_dialog (gtk_widget_get_toplevel ((GtkWidget *) day_view),
|
|
||||
day_view->client, event->comp, FALSE)) |
|
||||
itip_send_comp (CAL_COMPONENT_METHOD_REQUEST, event->comp, |
|
||||
day_view->client, NULL); |
|
||||
@@ -7747,7 +7745,7 @@
|
|
||||
if (recur_component_dialog (comp, &mod, NULL)) { |
|
||||
if (cal_client_update_object_with_mod (day_view->client, comp, mod) == CAL_CLIENT_RESULT_SUCCESS) { |
|
||||
if (itip_organizer_is_user (comp, day_view->client) |
|
||||
- && send_component_dialog (gtk_widget_get_toplevel (day_view),
|
|
||||
+ && send_component_dialog (gtk_widget_get_toplevel ((GtkWidget *) day_view),
|
|
||||
day_view->client, comp, FALSE)) |
|
||||
itip_send_comp (CAL_COMPONENT_METHOD_REQUEST, comp, |
|
||||
day_view->client, NULL); |
|
||||
@@ -7759,7 +7757,7 @@
|
|
||||
} else if (cal_client_update_object (day_view->client, comp) |
|
||||
== CAL_CLIENT_RESULT_SUCCESS) { |
|
||||
if (itip_organizer_is_user (comp, day_view->client) && |
|
||||
- send_component_dialog (gtk_widget_get_toplevel (day_view),
|
|
||||
+ send_component_dialog (gtk_widget_get_toplevel ((GtkWidget *) day_view),
|
|
||||
day_view->client, comp, FALSE)) |
|
||||
itip_send_comp (CAL_COMPONENT_METHOD_REQUEST, comp, |
|
||||
day_view->client, NULL); |
|
||||
@@ -7878,7 +7876,7 @@
|
|
||||
if (recur_component_dialog (comp, &mod, NULL)) { |
|
||||
if (cal_client_update_object_with_mod (day_view->client, comp, mod) == CAL_CLIENT_RESULT_SUCCESS) { |
|
||||
if (itip_organizer_is_user (comp, day_view->client) |
|
||||
- && send_component_dialog (gtk_widget_get_toplevel (day_view),
|
|
||||
+ && send_component_dialog (gtk_widget_get_toplevel ((GtkWidget *) day_view),
|
|
||||
day_view->client, comp, FALSE)) |
|
||||
itip_send_comp (CAL_COMPONENT_METHOD_REQUEST, comp, |
|
||||
day_view->client, NULL); |
|
||||
@@ -7890,7 +7888,7 @@
|
|
||||
} else if (cal_client_update_object (day_view->client, comp) |
|
||||
== CAL_CLIENT_RESULT_SUCCESS) { |
|
||||
if (itip_organizer_is_user (comp, day_view->client) && |
|
||||
- send_component_dialog (gtk_widget_get_toplevel (day_view),
|
|
||||
+ send_component_dialog (gtk_widget_get_toplevel ((GtkWidget *) day_view),
|
|
||||
day_view->client, comp, FALSE)) |
|
||||
itip_send_comp (CAL_COMPONENT_METHOD_REQUEST, comp, |
|
||||
day_view->client, NULL); |
|
||||
@@ -8078,7 +8076,7 @@
|
|
||||
cal_client_update_object (day_view->client, comp); |
|
||||
|
|
||||
if (itip_organizer_is_user (comp, day_view->client) && |
|
||||
- send_component_dialog (gtk_widget_get_toplevel (day_view), day_view->client, comp, TRUE))
|
|
||||
+ send_component_dialog (gtk_widget_get_toplevel ((GtkWidget *) day_view), day_view->client, comp, TRUE))
|
|
||||
itip_send_comp (CAL_COMPONENT_METHOD_REQUEST, comp, day_view->client, NULL); |
|
||||
|
|
||||
g_object_unref (comp); |
|
||||
--- evolution-1.4.6/mail/message-browser.c.orig 2004-07-19 23:43:18.667794488 +0200
|
|
||||
+++ evolution-1.4.6/mail/message-browser.c 2004-07-19 23:43:32.471695976 +0200
|
|
||||
@@ -344,7 +344,6 @@
|
|
||||
case GDK_Escape: |
|
||||
message_browser_close (NULL, mb, NULL); |
|
||||
return TRUE; |
|
||||
- default:
|
|
||||
} |
|
||||
|
|
||||
return FALSE; |
|
||||
@ -0,0 +1,22 @@ |
|||||
|
--- ./configure.ac.orig 2004-12-04 23:25:59.663292424 +0100
|
||||
|
+++ ./configure.ac 2004-12-04 23:28:30.555353344 +0100
|
||||
|
@@ -179,7 +179,7 @@
|
||||
|
[dash_pthread="" |
||||
|
AC_MSG_RESULT(no)]) |
||||
|
]) |
||||
|
- LIBS="$gnet_save_LIBS $dash_pthread"
|
||||
|
+ LIBS="$gnet_save_LIBS"
|
||||
|
|
||||
|
if test "x$dash_pthread" == "x"; then |
||||
|
AC_CHECK_LIB([pthread], |
||||
|
--- ./configure.orig 2004-12-04 23:28:38.815097672 +0100
|
||||
|
+++ ./configure 2004-12-04 23:29:17.616199008 +0100
|
||||
|
@@ -4834,7 +4834,7 @@
|
||||
|
|
||||
|
fi |
||||
|
rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext |
||||
|
- LIBS="$gnet_save_LIBS $dash_pthread"
|
||||
|
+ LIBS="$gnet_save_LIBS"
|
||||
|
|
||||
|
if test "x$dash_pthread" == "x"; then |
||||
|
echo "$as_me:$LINENO: checking for pthread_create in -lpthread" >&5 |
||||
@ -0,0 +1,44 @@ |
|||||
|
|
||||
|
[COPY] --- ROCK-COPYRIGHT-NOTE-BEGIN --- |
||||
|
[COPY] |
||||
|
[COPY] This copyright note is auto-generated by ./scripts/Create-CopyPatch. |
||||
|
[COPY] Please add additional copyright information _after_ the line containing |
||||
|
[COPY] the ROCK-COPYRIGHT-NOTE-END tag. Otherwise it might get removed by |
||||
|
[COPY] the ./scripts/Create-CopyPatch script. Do not edit this copyright text! |
||||
|
[COPY] |
||||
|
[COPY] ROCK Linux: rock-src/package/gnome2/gnome-doc-utils/gnome-doc-utils.desc |
||||
|
[COPY] ROCK Linux is Copyright (C) 1998 - 2004 Clifford Wolf |
||||
|
[COPY] |
||||
|
[COPY] This program is free software; you can redistribute it and/or modify |
||||
|
[COPY] it under the terms of the GNU General Public License as published by |
||||
|
[COPY] the Free Software Foundation; either version 2 of the License, or |
||||
|
[COPY] (at your option) any later version. A copy of the GNU General Public |
||||
|
[COPY] License can be found at Documentation/COPYING. |
||||
|
[COPY] |
||||
|
[COPY] Many people helped and are helping developing ROCK Linux. Please |
||||
|
[COPY] have a look at http://www.rocklinux.org/ and the Documentation/TEAM |
||||
|
[COPY] file for details. |
||||
|
[COPY] |
||||
|
[COPY] --- ROCK-COPYRIGHT-NOTE-END --- |
||||
|
|
||||
|
[I] a collection of documentation utilities for gnome |
||||
|
|
||||
|
[T] gnome-doc-utils is a collection of documentation utilities for the Gnome |
||||
|
[T] project. Notably, it contains utilities for building documentation and |
||||
|
[T] all auxiliary files in your source tree, and it contains the DocBook |
||||
|
[T] XSLT stylesheets that were once distributed with Yelp. |
||||
|
|
||||
|
[U] http://www.gnome.org |
||||
|
|
||||
|
[A] Shaun McCance <shaunm@gnome.org> |
||||
|
[M] Juergen Sawinski <jsaw@rocklinux.org> |
||||
|
|
||||
|
[C] extra/desktop/gnome |
||||
|
|
||||
|
[L] LGPL |
||||
|
[S] Beta |
||||
|
[V] 0.1 |
||||
|
[P] X -----5---9 152.000 |
||||
|
|
||||
|
[D] 2866942532 gnome-doc-utils-0.1.tar.bz2 http://ftp.linux.org.uk/mirrors/ftp.gnome.org/sources/gnome-doc-utils/0.1/ |
||||
|
|
||||
@ -0,0 +1,44 @@ |
|||||
|
|
||||
|
[COPY] --- ROCK-COPYRIGHT-NOTE-BEGIN --- |
||||
|
[COPY] |
||||
|
[COPY] This copyright note is auto-generated by ./scripts/Create-CopyPatch. |
||||
|
[COPY] Please add additional copyright information _after_ the line containing |
||||
|
[COPY] the ROCK-COPYRIGHT-NOTE-END tag. Otherwise it might get removed by |
||||
|
[COPY] the ./scripts/Create-CopyPatch script. Do not edit this copyright text! |
||||
|
[COPY] |
||||
|
[COPY] ROCK Linux: rock-src/package/gnome2/gnome-netstatus/gnome-netstatus.desc |
||||
|
[COPY] ROCK Linux is Copyright (C) 1998 - 2004 Clifford Wolf |
||||
|
[COPY] |
||||
|
[COPY] This program is free software; you can redistribute it and/or modify |
||||
|
[COPY] it under the terms of the GNU General Public License as published by |
||||
|
[COPY] the Free Software Foundation; either version 2 of the License, or |
||||
|
[COPY] (at your option) any later version. A copy of the GNU General Public |
||||
|
[COPY] License can be found at Documentation/COPYING. |
||||
|
[COPY] |
||||
|
[COPY] Many people helped and are helping developing ROCK Linux. Please |
||||
|
[COPY] have a look at http://www.rocklinux.org/ and the Documentation/TEAM |
||||
|
[COPY] file for details. |
||||
|
[COPY] |
||||
|
[COPY] --- ROCK-COPYRIGHT-NOTE-END --- |
||||
|
|
||||
|
[I] network status panel app |
||||
|
|
||||
|
[T] This package contains an applet which provides information about a |
||||
|
[T] network interface on your panel. |
||||
|
|
||||
|
[U] http://www.gnome.org |
||||
|
|
||||
|
[A] Mark McLoughlin <mark@skynet.ie> |
||||
|
[A] Erwann Chenede <erwann.chenede@sun.com> |
||||
|
[A] Calum Benson <calum.benson@sun.com> |
||||
|
[M] Juergen Sawinski <jsaw@rocklinux.org> |
||||
|
|
||||
|
[C] extra/desktop/gnome |
||||
|
|
||||
|
[L] GPL |
||||
|
[S] Stable |
||||
|
[V] 2.8.0 |
||||
|
[P] X -----5---9 207.800 |
||||
|
|
||||
|
[D] 3205692960 gnome-netstatus-2.8.0.tar.bz2 http://ftp.gnome.org/pub/GNOME/sources/gnome-netstatus/2.8/ |
||||
|
|
||||
@ -0,0 +1,42 @@ |
|||||
|
|
||||
|
[COPY] --- ROCK-COPYRIGHT-NOTE-BEGIN --- |
||||
|
[COPY] |
||||
|
[COPY] This copyright note is auto-generated by ./scripts/Create-CopyPatch. |
||||
|
[COPY] Please add additional copyright information _after_ the line containing |
||||
|
[COPY] the ROCK-COPYRIGHT-NOTE-END tag. Otherwise it might get removed by |
||||
|
[COPY] the ./scripts/Create-CopyPatch script. Do not edit this copyright text! |
||||
|
[COPY] |
||||
|
[COPY] ROCK Linux: rock-src/package/gnome2/gnome-nettool/gnome-nettool.desc |
||||
|
[COPY] ROCK Linux is Copyright (C) 1998 - 2004 Clifford Wolf |
||||
|
[COPY] |
||||
|
[COPY] This program is free software; you can redistribute it and/or modify |
||||
|
[COPY] it under the terms of the GNU General Public License as published by |
||||
|
[COPY] the Free Software Foundation; either version 2 of the License, or |
||||
|
[COPY] (at your option) any later version. A copy of the GNU General Public |
||||
|
[COPY] License can be found at Documentation/COPYING. |
||||
|
[COPY] |
||||
|
[COPY] Many people helped and are helping developing ROCK Linux. Please |
||||
|
[COPY] have a look at http://www.rocklinux.org/ and the Documentation/TEAM |
||||
|
[COPY] file for details. |
||||
|
[COPY] |
||||
|
[COPY] --- ROCK-COPYRIGHT-NOTE-END --- |
||||
|
|
||||
|
[I] GNOME interface for various networking tools |
||||
|
|
||||
|
[T] GNOME Nettool is a set of front-ends to various networking command-line |
||||
|
[T] tools, like ping, netstat, ifconfig, whois, traceroute, finger. |
||||
|
|
||||
|
[U] http://www.gnome.org |
||||
|
|
||||
|
[A] German Poo-Caaman~o <gpoo@ubiobio.cl> |
||||
|
[M] Juergen Sawinski <jsaw@rocklinux.org> |
||||
|
|
||||
|
[C] extra/desktop/gnome |
||||
|
|
||||
|
[L] GPL |
||||
|
[S] Beta |
||||
|
[V] 0.99.3 |
||||
|
[P] X -----5---9 178.800 |
||||
|
|
||||
|
[D] 346661879 gnome-nettool-0.99.3.tar.bz2 http://ftp.acc.umu.se/pub/GNOME/sources/gnome-nettool/0.99/ |
||||
|
|
||||
@ -1,133 +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/gnome-pilot/gcc34.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 gcc-3.4 compile fixes - including deleteing goto's ,-) |
|
||||
|
|
||||
- Rene Rebe <rene@exactcode.de> |
|
||||
|
|
||||
--- gnome-pilot-2.0.10/capplet/gnome-pilot-pdialog.c.orig 2004-05-13 20:42:05.535368544 +0200
|
|
||||
+++ gnome-pilot-2.0.10/capplet/gnome-pilot-pdialog.c 2004-05-13 20:42:31.767380672 +0200
|
|
||||
@@ -135,15 +135,13 @@
|
|
||||
priv->xml = glade_xml_new (GLADEDATADIR "/gpilotd-capplet.glade", "PilotSettings", NULL); |
|
||||
if (!priv->xml) { |
|
||||
g_message ("gnome-pilot-pdialog init(): Could not load the Glade XML file!"); |
|
||||
- goto error;
|
|
||||
+ return;
|
|
||||
} |
|
||||
|
|
||||
if (!get_widgets (gppd)) { |
|
||||
g_message ("gnome-pilot-pdialog init(): Could not find all widgets in the XML file!"); |
|
||||
- goto error;
|
|
||||
+ return;
|
|
||||
} |
|
||||
-
|
|
||||
- error:
|
|
||||
} |
|
||||
|
|
||||
|
|
||||
--- gnome-pilot-2.0.10/capplet/gnome-pilot-capplet.c.orig 2004-05-13 20:40:51.301653784 +0200
|
|
||||
+++ gnome-pilot-2.0.10/capplet/gnome-pilot-capplet.c 2004-05-13 20:41:29.590832944 +0200
|
|
||||
@@ -171,18 +171,16 @@
|
|
||||
priv->xml = glade_xml_new (GLADEDATADIR "/gpilotd-capplet.glade", "CappletMain", NULL); |
|
||||
if (!priv->xml) { |
|
||||
g_message ("gnome-pilot-capplet init(): Could not load the Glade XML file!"); |
|
||||
- goto error;
|
|
||||
+ return;
|
|
||||
} |
|
||||
|
|
||||
if (!get_widgets (gpcap)) { |
|
||||
g_message ("gnome-pilot-capplet init(): Could not find all widgets in the XML file!"); |
|
||||
- goto error;
|
|
||||
+ return;
|
|
||||
} |
|
||||
|
|
||||
fill_widgets (gpcap); |
|
||||
init_widgets (gpcap); |
|
||||
-
|
|
||||
- error:
|
|
||||
} |
|
||||
|
|
||||
GnomePilotCapplet * |
|
||||
--- gnome-pilot-2.0.10/capplet/gnome-pilot-ddialog.c.orig 2004-05-13 20:43:06.454107488 +0200
|
|
||||
+++ gnome-pilot-2.0.10/capplet/gnome-pilot-ddialog.c 2004-05-13 20:43:43.189522856 +0200
|
|
||||
@@ -114,15 +114,13 @@
|
|
||||
priv->xml = glade_xml_new (GLADEDATADIR "/gpilotd-capplet.glade", "DeviceSettings", NULL); |
|
||||
if (!priv->xml) { |
|
||||
g_message ("gnome-pilot-ddialog init(): Could not load the Glade XML file!"); |
|
||||
- goto error;
|
|
||||
+ return;
|
|
||||
} |
|
||||
|
|
||||
if (!get_widgets (gpdd)) { |
|
||||
g_message ("gnome-pilot-ddialog init(): Could not find all widgets in the XML file!"); |
|
||||
- goto error;
|
|
||||
+ return;
|
|
||||
} |
|
||||
-
|
|
||||
- error:
|
|
||||
} |
|
||||
|
|
||||
|
|
||||
--- gnome-pilot-2.0.10/capplet/gnome-pilot-druid.c.orig 2004-05-13 20:47:56.979940848 +0200
|
|
||||
+++ gnome-pilot-2.0.10/capplet/gnome-pilot-druid.c 2004-05-13 20:48:22.909998880 +0200
|
|
||||
@@ -168,19 +168,17 @@
|
|
||||
priv->xml = glade_xml_new (GLADEDATADIR "/gpilotd-capplet.glade", NULL, NULL); |
|
||||
if (!priv->xml) { |
|
||||
g_message ("gnome-pilot-druid init(): Could not load the Glade XML file!"); |
|
||||
- goto error;
|
|
||||
+ return;
|
|
||||
} |
|
||||
|
|
||||
if (!get_widgets (gpd)) { |
|
||||
g_message ("gnome-pilot-druid init(): Could not find all widgets in the XML file!"); |
|
||||
- goto error;
|
|
||||
+ return;
|
|
||||
} |
|
||||
|
|
||||
map_widgets (gpd); |
|
||||
fill_widgets (gpd); |
|
||||
init_widgets (gpd); |
|
||||
-
|
|
||||
- error:
|
|
||||
} |
|
||||
|
|
||||
|
|
||||
--- ./capplet/gnome-pilot-cdialog.c.orig 2004-05-13 21:18:57.751060640 +0200
|
|
||||
+++ ./capplet/gnome-pilot-cdialog.c 2004-05-13 21:19:22.850244984 +0200
|
|
||||
@@ -112,17 +112,15 @@
|
|
||||
priv->xml = glade_xml_new (GLADEDATADIR "/gpilotd-capplet.glade", "ConduitSettings", NULL); |
|
||||
if (!priv->xml) { |
|
||||
g_message ("gnome-pilot-cdialog init(): Could not load the Glade XML file!"); |
|
||||
- goto error;
|
|
||||
+ return;
|
|
||||
} |
|
||||
|
|
||||
if (!get_widgets (gpcd)) { |
|
||||
g_message ("gnome-pilot-cdialog init(): Could not find all widgets in the XML file!"); |
|
||||
- goto error;
|
|
||||
+ return;
|
|
||||
} |
|
||||
|
|
||||
gnome_dialog_close_hides (GNOME_DIALOG (priv->dialog), TRUE); |
|
||||
-
|
|
||||
- error:
|
|
||||
} |
|
||||
|
|
||||
|
|
||||
@ -1,44 +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/gnome-terminal/gcc34.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 --- |
|
||||
|
|
||||
|
|
||||
Hm - again some real bugs uncovered by gcc-3.4 ... |
|
||||
|
|
||||
- Rene Rebe <rene@exactcode.de> |
|
||||
|
|
||||
--- gnome-terminal-2.6.0/src/eggcellrendererkeys.c.orig 2004-05-10 13:41:45.587354088 +0200
|
|
||||
+++ gnome-terminal-2.6.0/src/eggcellrendererkeys.c 2004-05-10 13:42:16.827604848 +0200
|
|
||||
@@ -584,7 +584,7 @@
|
|
||||
void |
|
||||
egg_cell_renderer_keys_set_accelerator (EggCellRendererKeys *keys, |
|
||||
guint keyval, |
|
||||
- GdkModifierType mask)
|
|
||||
+ EggVirtualModifierType mask)
|
|
||||
{ |
|
||||
char *text; |
|
||||
gboolean changed; |
|
||||
@@ -626,7 +626,7 @@
|
|
||||
void |
|
||||
egg_cell_renderer_keys_get_accelerator (EggCellRendererKeys *keys, |
|
||||
guint *keyval, |
|
||||
- GdkModifierType *mask)
|
|
||||
+ EggVirtualModifierType *mask)
|
|
||||
{ |
|
||||
g_return_if_fail (EGG_IS_CELL_RENDERER_KEYS (keys)); |
|
||||
|
|
||||
@ -0,0 +1,10 @@ |
|||||
|
--- ./gnome-vfs-2.0.pc.in.orig 2004-12-05 00:06:32.683417144 +0100
|
||||
|
+++ ./gnome-vfs-2.0.pc.in 2004-12-05 00:06:40.165279728 +0100
|
||||
|
@@ -7,6 +7,6 @@
|
||||
|
Name: gnome-vfs |
||||
|
Description: The GNOME virtual file-system libraries |
||||
|
Version: @VERSION@ |
||||
|
-Requires: bonobo-activation-2.0 libbonobo-2.0 gconf-2.0 gthread-2.0 gmodule-2.0
|
||||
|
+Requires: bonobo-activation-2.0 libbonobo-2.0 gconf-2.0 gthread-2.0 gmodule-2.0 gobject-2.0
|
||||
|
Libs: -L${libdir} -lgnomevfs-2 |
||||
|
Cflags: -I${includedir}/gnome-vfs-2.0 -I${libdir}/gnome-vfs-2.0/include |
||||
@ -1,30 +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/gnumeric/hotfix.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 --- |
|
||||
|
|
||||
--- gnumeric-1.3.1/src/workbook-control-gui-priv.h~ 2004-07-19 08:06:18.000000000 +0200
|
|
||||
+++ gnumeric-1.3.1/src/workbook-control-gui-priv.h 2004-07-23 16:35:58.642484856 +0200
|
|
||||
@@ -111,7 +111,7 @@
|
|
||||
void wbcg_insert_sheet (GtkWidget *ignored, WorkbookControlGUI *wbcg); |
|
||||
void wbcg_append_sheet (GtkWidget *ignored, WorkbookControlGUI *wbcg); |
|
||||
void wbcg_set_selection_halign (WorkbookControlGUI *wbcg, StyleHAlignFlags halign); |
|
||||
-void wbcg_set_selection_valign (WorkbookControlGUI *wbcg, StyleHAlignFlags halign);
|
|
||||
+void wbcg_set_selection_valign (WorkbookControlGUI *wbcg, StyleVAlignFlags halign);
|
|
||||
|
|
||||
enum { |
|
||||
WBCG_MARKUP_CHANGED, |
|
||||
@ -0,0 +1,11 @@ |
|||||
|
--- ./bonobo/libbonobo-2.0.pc.in.orig 2004-12-04 20:23:01.899166240 +0100
|
||||
|
+++ ./bonobo/libbonobo-2.0.pc.in 2004-12-04 20:23:35.665033048 +0100
|
||||
|
@@ -7,7 +7,7 @@
|
||||
|
|
||||
|
Name: libbonobo |
||||
|
Description: libbonobo |
||||
|
-Requires: glib-2.0 ORBit-2.0 bonobo-activation-2.0
|
||||
|
+Requires: glib-2.0 ORBit-2.0 ORBit-CosNaming-2.0 bonobo-activation-2.0
|
||||
|
Version: @VERSION@ |
||||
|
Libs: -L${libdir} -lbonobo-2 |
||||
|
Cflags: -I${includedir}/libbonobo-2.0 |
||||