diff --git a/package/blindcoder/libmatroska/libmatroska.desc b/package/blindcoder/libmatroska/libmatroska.desc index ef0d3fd7d..28dfc1e87 100644 --- a/package/blindcoder/libmatroska/libmatroska.desc +++ b/package/blindcoder/libmatroska/libmatroska.desc @@ -40,9 +40,10 @@ [L] GPL [S] Beta -[V] 0.6.2 +[V] 0.6.3 [P] X -----5---9 678.000 -[O] srcdir="libmatroska-0.6.2/make/linux" +[O] srcdir="libmatroska-$ver/make/linux" +[O] var_append makeopt " " "install" ; makeinstopt="" -[D] 2421090168 libmatroska-0.6.2.tar.gz http://matroska.free.fr/downloads/libmatroska/ +[D] 0 libmatroska-0.6.3.tar.gz http://matroska.free.fr/downloads/libmatroska/ diff --git a/package/clifford/magicpoint/gcc34.patch b/package/clifford/magicpoint/gcc34.patch new file mode 100644 index 000000000..083d4c0e3 --- /dev/null +++ b/package/clifford/magicpoint/gcc34.patch @@ -0,0 +1,40 @@ +--- ./mng.c.orig 2004-05-14 11:27:46.980807688 +0200 ++++ ./mng.c 2004-05-14 11:28:40.725637232 +0200 +@@ -216,7 +216,7 @@ + mymng = (mngstuff*)mng_get_userdata(mng); + + /* pull out the chuck type as a string */ +- // FIXME: does this assume unsigned char? ++ /* FIXME: does this assume unsigned char? */ + chunk[0] = (char)((chunktype >> 24) & 0xFF); + chunk[1] = (char)((chunktype >> 16) & 0xFF); + chunk[2] = (char)((chunktype >> 8) & 0xFF); +@@ -317,7 +317,7 @@ + } + } + +-void ++int + mng_window_setup(mymng, x, y, width, height) + mngstuff *mymng; + int x, y; +--- ./scanner.l.orig 2004-05-14 11:25:56.259639864 +0200 ++++ ./scanner.l 2004-05-14 11:26:57.899269216 +0200 +@@ -59,7 +59,7 @@ + #include "tokdefs.h" + + static int stoi __P((char *)); +-static inline int xdtoi __P((int)); ++static int xdtoi __P((int)); + + #ifdef FLEX_SCANNER + #define YY_NO_UNPUT +@@ -202,7 +202,7 @@ + } + + /* Hex digit to integer. */ +-static inline int ++static int + xdtoi(c) + register int c; + { diff --git a/package/clifford/magicpoint/head-usage.patch b/package/clifford/magicpoint/head-usage.patch new file mode 100644 index 000000000..e9386a10e --- /dev/null +++ b/package/clifford/magicpoint/head-usage.patch @@ -0,0 +1,22 @@ +--- ./configure.orig 2004-05-14 11:24:03.748744120 +0200 ++++ ./configure 2004-05-14 11:24:15.483960096 +0200 +@@ -1766,7 +1766,7 @@ + for dir in /usr/local/freetype /usr/local /opt/freetype /usr/pkg /usr; do + ac_cv_ft_lib=no + ac_cv_ft_include=no +- shlib1=`echo $dir/lib/libttf.so* | head -1 | sed -e 's/.*\///'` ++ shlib1=`echo $dir/lib/libttf.so* | head -n 1 | sed -e 's/.*\///'` + if test x$shlib1 = x; then + shlib1=no + fi +@@ -1962,8 +1962,8 @@ + ac_cv_vf_libname=VFlib + ac_cv_vf_libdir=no + ac_cv_vf_hdrdir=no +- shlib1=`echo $dir/lib/libVFlib.so* | head -1 | sed -e 's/.*\///'` +- shlib2=`echo $dir/lib/libVFlib2.so* | head -1 | sed -e 's/.*\///'` ++ shlib1=`echo $dir/lib/libVFlib.so* | head -n 1 | sed -e 's/.*\///'` ++ shlib2=`echo $dir/lib/libVFlib2.so* | head -n 1 | sed -e 's/.*\///'` + if test x$shlib1 = x; then + $shlib1=no + fi diff --git a/package/gnome14/soup/soup.desc b/package/gnome14/soup/soup.desc index 608863066..532966c01 100644 --- a/package/gnome14/soup/soup.desc +++ b/package/gnome14/soup/soup.desc @@ -27,7 +27,7 @@ [T] provides an queued asynchronous callback-based mechanism for sending [T] SOAP requests. A WSDL (Web Service Definition Language) to C compiler [T] which generates stubs for easily calling remote SOAP methods, and a -[T] CORBA IDL to WSDL compiler are also included. +[T] CORBA IDL to WSDL compiler is also included. [U] http://www.ximian.com/applications/soup diff --git a/package/gnome2/balsa/gcc34.patch b/package/gnome2/balsa/gcc34.patch new file mode 100644 index 000000000..8a029dea7 --- /dev/null +++ b/package/gnome2/balsa/gcc34.patch @@ -0,0 +1,25 @@ +--- ./libbalsa/imap/imap-commands.h.orig 2004-05-14 10:22:29.508354024 +0200 ++++ ./libbalsa/imap/imap-commands.h 2004-05-14 10:23:50.704010408 +0200 +@@ -24,7 +24,7 @@ + + /* Any-State */ + int imap_mbox_handle_can_do(ImapMboxHandle* handle, ImapCapability cap); +-ImapResult imap_mbox_handle_noop(ImapMboxHandle *r); ++ImapResponse imap_mbox_handle_noop(ImapMboxHandle *r); + + /* Non-Authenticated State */ + +@@ -86,10 +86,10 @@ + + /* Experimental/Expansion */ + ImapResponse imap_handle_starttls(ImapMboxHandle *handle); +-ImapResult imap_mbox_scan(ImapMboxHandle *r, const char*what, const char*str); ++ImapResponse imap_mbox_scan(ImapMboxHandle *r, const char*what, const char*str); + ImapResponse imap_mbox_unselect(ImapMboxHandle *h); +-ImapResult imap_mbox_thread(ImapMboxHandle *h, const char *how, +- ImapSearchKey *filter); ++ImapResponse imap_mbox_thread(ImapMboxHandle *h, const char *how, ++ ImapSearchKey *filter); + + ImapResponse imap_mbox_uid_search(ImapMboxHandle *handle, ImapSearchKey *key, + void (*cb)(unsigned uid, void *), diff --git a/package/gnome2/devhelp/compile.patch b/package/gnome2/devhelp/compile.patch new file mode 100644 index 000000000..5a7517bc4 --- /dev/null +++ b/package/gnome2/devhelp/compile.patch @@ -0,0 +1,39 @@ +--- ./libegg/menu/egg-action.c.orig 2004-05-14 10:36:25.076328384 +0200 ++++ ./libegg/menu/egg-action.c 2004-05-14 10:53:26.393064640 +0200 +@@ -1,6 +1,7 @@ + #include + #include "egg-action.h" + #include "../toolbar/eggtoolbutton.h" ++#include "../toolbar/eggtoolbar.h" + #include "../util/eggintl.h" + + //#ifndef _ +@@ -921,7 +922,7 @@ + /* gross hack!!! */ + for (tmp = GTK_TOOLBAR (button->parent)->children; tmp; tmp = tmp->next) + { +- GtkToolbarChild *tool_child = tmp->data; ++ EggToolbarChild *tool_child = tmp->data; + + if (tool_child->widget == button) + { +--- ./libegg/toolbar/eggtoolbar.c.orig 2004-05-14 10:32:25.233789992 +0200 ++++ ./libegg/toolbar/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/devhelp/devhelp.conf b/package/gnome2/devhelp/devhelp.conf index d9ca4fd99..197e5a4bf 100644 --- a/package/gnome2/devhelp/devhelp.conf +++ b/package/gnome2/devhelp/devhelp.conf @@ -22,3 +22,7 @@ . $base/package/*/*/gnome-2.conf +# devhelp does use deprecated stuff from Gtk+ but does use +# -DDGTK_DISABLE_DEPRECATED ... +var_append GCC_WRAPPER_REMOVE " " "-DGTK_DISABLE_DEPRECATED" + diff --git a/package/gnome2/gconfmm/gconfmm.desc b/package/gnome2/gconfmm/gconfmm.desc index f20bea0cf..aa0c2ec64 100644 --- a/package/gnome2/gconfmm/gconfmm.desc +++ b/package/gnome2/gconfmm/gconfmm.desc @@ -38,7 +38,7 @@ [L] GPL [S] Stable -[V] 2.6.0 +[V] 2.6.1 [P] X -----5---9 496.000 -[D] 422882283 gconfmm-2.6.0.tar.bz2 http://ftp.gnome.org/pub/GNOME/sources/gconfmm/2.6/ +[D] 0 gconfmm-2.6.1.tar.bz2 http://ftp.gnome.org/pub/GNOME/sources/gconfmm/2.6/ diff --git a/package/gnome2/glademm/glademm.desc b/package/gnome2/glademm/glademm.desc index 61ca24771..b8e95c1c9 100644 --- a/package/gnome2/glademm/glademm.desc +++ b/package/gnome2/glademm/glademm.desc @@ -35,7 +35,7 @@ [L] GPL [S] Stable -[V] 2.0.0.1 +[V] 2.5.0 [P] X -----5---9 999.500 -[D] 2404452246 glademm-2.0.0.1.tar.gz http://home.wtal.de/petig/Gtk/ +[D] 0 glademm-2.5.0.tar.gz http://home.wtal.de/petig/Gtk/ diff --git a/package/gnome2/glibmm/glibmm.desc b/package/gnome2/glibmm/glibmm.desc index 33d762668..04959465a 100644 --- a/package/gnome2/glibmm/glibmm.desc +++ b/package/gnome2/glibmm/glibmm.desc @@ -37,8 +37,8 @@ [L] LGPL [S] Stable -[V] 2.4.0 +[V] 2.4.1 [P] X -----5---9 444.000 -[D] 2153406427 glibmm-2.4.0.tar.bz2 http://ftp.gnome.org/pub/GNOME/sources/glibmm/2.4/ +[D] 0 glibmm-2.4.1.tar.bz2 http://ftp.gnome.org/pub/GNOME/sources/glibmm/2.4/ diff --git a/package/gnome2/gnome-vfsmm/gnome-vfsmm.desc b/package/gnome2/gnome-vfsmm/gnome-vfsmm.desc index 6929755b0..fba0baa4f 100644 --- a/package/gnome2/gnome-vfsmm/gnome-vfsmm.desc +++ b/package/gnome2/gnome-vfsmm/gnome-vfsmm.desc @@ -36,7 +36,7 @@ [L] LGPL [S] Beta -[V] 2.6.0 +[V] 2.6.1 [P] X -----5---9 740.000 -[D] 1340825278 gnome-vfsmm-2.6.0.tar.bz2 http://ftp.gnome.org/pub/GNOME/sources/gnome-vfsmm/2.6/ +[D] 0 gnome-vfsmm-2.6.1.tar.bz2 http://ftp.gnome.org/pub/GNOME/sources/gnome-vfsmm/2.6/ diff --git a/package/gnome2/gtkmm/gtkmm.desc b/package/gnome2/gtkmm/gtkmm.desc index 78fd9338b..3d8e0856f 100644 --- a/package/gnome2/gtkmm/gtkmm.desc +++ b/package/gnome2/gtkmm/gtkmm.desc @@ -42,8 +42,8 @@ [L] LGPL [S] Stable -[V] 2.4.0 +[V] 2.4.1 [P] X -----5---9 444.000 -[D] 3312908470 gtkmm-2.4.0.tar.bz2 http://ftp.gnome.org/pub/GNOME/sources/gtkmm/2.4/ +[D] 0 gtkmm-2.4.1.tar.bz2 http://ftp.gnome.org/pub/GNOME/sources/gtkmm/2.4/ diff --git a/package/kasc/clanlib/gcc34.patch b/package/kasc/clanlib/gcc34.patch new file mode 100644 index 000000000..eb1caab43 --- /dev/null +++ b/package/kasc/clanlib/gcc34.patch @@ -0,0 +1,56 @@ +--- ./Sources/Core/System/Unix/appconf.h.orig 2004-05-14 12:00:47.877665592 +0200 ++++ ./Sources/Core/System/Unix/appconf.h 2004-05-14 12:01:09.510376920 +0200 +@@ -527,7 +527,9 @@ + + //protected: --- if FileConfig::ConfigEntry is not public, functions in + // ConfigGroup such as Find/AddEntry can't return ConfigEntry*! ++ protected: + class ConfigGroup; ++ public: + class ConfigEntry + { + private: +--- ./Sources/Display/Display/Generic/blit_alphamask_rle.h.orig 2004-05-14 12:30:42.314047056 +0200 ++++ ./Sources/Display/Display/Generic/blit_alphamask_rle.h 2004-05-14 12:35:45.472959896 +0200 +@@ -107,14 +107,14 @@ + { + T a = alpha_data[x]; + T destval = dst_data[x]; +- T r = lookup_r[(((destval&rmask)>>rstart)<<8)+a]; //(((destval&rmask)>>rstart)*a)>>8; +- T g = lookup_g[(((destval&gmask)>>gstart)<<8)+a]; //(((destval&gmask)>>gstart)*a)>>8; +- T b = lookup_b[(((destval&bmask)>>bstart)<<8)+a]; //(((destval&bmask)>>bstart)*a)>>8; ++ T r = this->lookup_r[(((destval&this->rmask)>>this->rstart)<<8)+a]; //(((destval&rmask)>>rstart)*a)>>8; ++ T g = this->lookup_g[(((destval&this->gmask)>>this->gstart)<<8)+a]; //(((destval&gmask)>>gstart)*a)>>8; ++ T b = this->lookup_b[(((destval&this->bmask)>>this->bstart)<<8)+a]; //(((destval&bmask)>>bstart)*a)>>8; + + T amix = +- (r<rstart) + ++ (g<gstart) + ++ (b<bstart); + + dst_data[x] = amix + *(src_data++); + } +@@ -151,13 +151,13 @@ + { + T a = alpha_data[x]; + T destval = dst_buf[x]; +- T r = lookup_r[(((destval&rmask)>>rstart)<<8)+a]; +- T g = lookup_g[(((destval&gmask)>>gstart)<<8)+a]; +- T b = lookup_b[(((destval&bmask)>>bstart)<<8)+a]; ++ T r = this->lookup_r[(((destval&this->rmask)>>this->rstart)<<8)+a]; ++ T g = this->lookup_g[(((destval&this->gmask)>>this->gstart)<<8)+a]; ++ T b = this->lookup_b[(((destval&this->bmask)>>this->bstart)<<8)+a]; + T amix = +- (r<rstart) + ++ (g<gstart) + ++ (b<bstart); + dst_buf[x] = amix + *(src_data++); + } + memcpy(dst_data, dst_buf, sizeof(T)*rep); + diff --git a/package/kasc/openal/alsa_header.patch b/package/kasc/openal/alsa_header.patch index fad3646a6..9b454df86 100644 --- a/package/kasc/openal/alsa_header.patch +++ b/package/kasc/openal/alsa_header.patch @@ -1,32 +1,17 @@ -# --- 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/kasc/openal/alsa_header.patch -# ROCK Linux is Copyright (C) 1998 - 2003 Clifford Wolf -# -# This program is free software; you can redistribute it and/or modify -# it 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. A copy of the GNU General Public -# License can be found at Documentation/COPYING. -# -# Many people helped and are helping developing ROCK Linux. Please -# have a look at http://www.rocklinux.org/ and the Documentation/TEAM -# file for details. -# -# --- ROCK-COPYRIGHT-NOTE-END --- ---- ./linux/src/arch/alsa/alsa.c.orig 2003-04-30 00:03:20.000000000 +0100 -+++ ./linux/src/arch/alsa/alsa.c 2003-04-30 00:03:40.000000000 +0100 -@@ -21,6 +21,7 @@ +Some ALSA include corrections ... + + - Rene Rebe + +--- openal-2003-05-09/linux/src/arch/alsa/alsa.c.orig 2002-09-20 19:47:31.000000000 +0200 ++++ openal-2003-05-09/linux/src/arch/alsa/alsa.c 2004-05-11 08:50:34.670020144 +0200 +@@ -21,7 +21,9 @@ #include "arch/interface/interface_sound.h" #include "arch/alsa/alsa.h" -+#include ++#include #include ++#include #include "al_config.h" + #include "al_debug.h" diff --git a/package/michiel/blackbox/gcc34.patch b/package/michiel/blackbox/gcc34.patch new file mode 100644 index 000000000..0aa64452e --- /dev/null +++ b/package/michiel/blackbox/gcc34.patch @@ -0,0 +1,14 @@ +--- ./src/Timer.hh.orig 2004-05-14 11:14:47.822257792 +0200 ++++ ./src/Timer.hh 2004-05-14 11:16:53.078215992 +0200 +@@ -98,9 +98,9 @@ + ~_timer_queue(void) {} + + void release(const _Tp& value) { +- c.erase(std::remove(c.begin(), c.end(), value), c.end()); ++ this->c.erase(std::remove(this->c.begin(), this->c.end(), value), this->c.end()); + // after removing the item we need to make the heap again +- std::make_heap(c.begin(), c.end(), comp); ++ std::make_heap(this->c.begin(), this->c.end(), this->comp); + } + bool empty(void) const { return _Base::empty(); } + size_t size(void) const { return _Base::size(); } diff --git a/package/rene/ecore/gcc34.patch b/package/rene/ecore/gcc34.patch new file mode 100644 index 000000000..6fef17f39 --- /dev/null +++ b/package/rene/ecore/gcc34.patch @@ -0,0 +1,20 @@ +--- ecore-2004-01-18/src/lib/ecore_config/edb.c.orig 2004-05-13 14:41:41.642699904 +0200 ++++ ecore-2004-01-18/src/lib/ecore_config/edb.c 2004-05-13 14:41:55.229634376 +0200 +@@ -106,6 +106,7 @@ + break; + case PT_NIL: + /* currently we do nothing for undefined ojects */ ++ ; + } + + next=next->next; +--- ecore-2004-01-18/src/lib/ecore_fb/ecore_fb.c.orig 2004-05-13 14:37:15.076224168 +0200 ++++ ecore-2004-01-18/src/lib/ecore_fb/ecore_fb.c 2004-05-13 14:37:30.233919848 +0200 +@@ -1046,6 +1046,7 @@ + if (_ecore_fb_alt < 0) _ecore_fb_alt = 0; + } + retry: ++ ; + } + while (v > 0); + return 1; diff --git a/package/rene/efsd/gcc34.patch b/package/rene/efsd/gcc34.patch new file mode 100644 index 000000000..0df6ac81c --- /dev/null +++ b/package/rene/efsd/gcc34.patch @@ -0,0 +1,121 @@ +--- efsd-2004-02-25/efsd/libefsd.c.orig 2004-05-13 18:40:26.982917168 +0200 ++++ efsd-2004-02-25/efsd/libefsd.c 2004-05-13 18:42:10.480183192 +0200 +@@ -1392,6 +1392,7 @@ + break; + case EFSD_CMD_CLOSE: + default: ++ ; + } + + D_RETURN_(NULL); +@@ -1441,6 +1442,7 @@ + break; + case EFSD_CMD_CLOSE: + default: ++ ; + } + + D_RETURN_(-1); +@@ -1464,6 +1466,7 @@ + D_RETURN_(ee->efsd_metachange_event.data); + break; + default: ++ ; + } + + D_RETURN_(NULL); +--- efsd-2004-02-25/efsd/efsd_main.c.orig 2004-05-13 18:43:42.328220168 +0200 ++++ efsd-2004-02-25/efsd/efsd_main.c 2004-05-13 18:46:00.131270920 +0200 +@@ -417,7 +417,7 @@ + { + if (errno == EINTR) + { +- D(__FUNCTION__ " select() interrupted\n"); ++ D("%s select() interrupted\n", __FUNCTION__); + FD_ZERO(&fdrset); + FD_SET(famcon.fd, &fdrset); + fdsize = famcon.fd; +@@ -429,7 +429,7 @@ + } + else + { +- fprintf(stderr, __FUNCTION__ ": select error -- exiting.\n"); ++ fprintf(stderr, "%s: select error -- exiting.\n", __FUNCTION__); + perror("Mhmmm"); + exit(-1); + } +@@ -501,6 +501,7 @@ + efsd_dca_remove(m->files, famev.filename); + break; + default: ++ ; + } + + for (cl = efsd_list_head(m->clients); cl; cl = efsd_list_next(cl)) +@@ -522,6 +523,7 @@ + sort_files = TRUE; + break; + default: ++ ; + } + } + +@@ -777,7 +779,7 @@ + { + if (errno == EINTR) + { +- D(__FUNCTION__ " select() interrupted\n"); ++ D("%s select() interrupted\n", __FUNCTION__); + + FD_ZERO(&fdrset); + +--- efsd-2004-02-25/efsd/efsd_filetype.c.orig 2004-05-13 18:42:58.746845544 +0200 ++++ efsd-2004-02-25/efsd/efsd_filetype.c 2004-05-13 18:43:10.975986432 +0200 +@@ -1333,6 +1333,7 @@ + } + break; + default: ++ ; + } + + D_RETURN_(NULL); +--- efsd-2004-02-25/efsd/efsd_monitor.c.orig 2004-05-13 18:46:39.883227704 +0200 ++++ efsd-2004-02-25/efsd/efsd_monitor.c 2004-05-13 18:46:51.289493688 +0200 +@@ -358,6 +358,7 @@ + sort_files = TRUE; + break; + default: ++ ; + } + } + +--- efsd-2004-02-25/tools/efsdsh.c.orig 2004-05-13 18:47:40.042082168 +0200 ++++ efsd-2004-02-25/tools/efsdsh.c 2004-05-13 18:48:24.588310112 +0200 +@@ -223,6 +223,7 @@ + efsd_metadata_get_str(ee)); + break; + default: ++ ; + } + } + break; +@@ -353,9 +354,11 @@ + efsd_metadata_get_str(ee)); + break; + default: ++ ; + } + } + default: ++ ; + } + + /* Cleanup memory allocated for this event */ +@@ -373,6 +376,7 @@ + printf("Broken pipe caught.\n"); + break; + default: ++ ; + } + + exit(-1); diff --git a/package/rene/fam/gcc34.patch b/package/rene/fam/gcc34.patch new file mode 100644 index 000000000..978ff6bb2 --- /dev/null +++ b/package/rene/fam/gcc34.patch @@ -0,0 +1,67 @@ +--- fam-2.6.9/fam/SmallTable.h.orig 2004-05-13 17:21:00.615515152 +0200 ++++ fam-2.6.9/fam/SmallTable.h 2004-05-13 17:21:17.716915344 +0200 +@@ -98,7 +98,7 @@ + } + + template +-SmallTable::Closure ++typename SmallTable::Closure + SmallTable::position(const Tkey& key) const + { + unsigned l = 0, r = n; +--- fam-2.6.9/include/BTree.h.orig 2004-05-13 17:16:35.937752288 +0200 ++++ fam-2.6.9/include/BTree.h 2004-05-13 17:20:24.740968912 +0200 +@@ -236,7 +236,7 @@ + // to the right and returns them. + + template +-BTree::Closure ++typename BTree::Closure + BTree::Node::remove(unsigned j) + { + Key k = key[j]; +@@ -348,7 +348,7 @@ + } + + template +-BTree::Closure ++typename BTree::Closure + BTree::Node::next(const Key& pred) const + { + if (!this) +@@ -404,7 +404,7 @@ + // nodes as necessary on the way back. + + template +-BTree::Closure ++typename BTree::Closure + BTree::insert(Node *p, const Key& key, const Value& value) + { + if (!p) return Closure(key, value, NULL); +@@ -499,7 +499,7 @@ + // Returns UNDER if node p is too small afterward, OK otherwise. + + template +-BTree::Status ++typename BTree::Status + BTree::underflow(Node *p, unsigned i) + { + assert(p); +@@ -557,7 +557,7 @@ + + + template +-BTree::Closure ++typename BTree::Closure + BTree::remove_rightmost(Node *p) + { + int i = p->n; +@@ -587,7 +587,7 @@ + // back up. + + template +-BTree::Status ++typename BTree::Status + BTree::remove(Node *p, const Key& key) + { + if (!p) diff --git a/package/rene/inkscape/inkscape.conf b/package/rene/inkscape/inkscape.conf index 26ca1b212..8a3ade84e 100644 --- a/package/rene/inkscape/inkscape.conf +++ b/package/rene/inkscape/inkscape.conf @@ -21,3 +21,6 @@ # --- ROCK-COPYRIGHT-NOTE-END --- . $base/package/*/*/gnome-2.conf + +var_append GCC_WRAPPER_INSERT " " "-fpermissive" + diff --git a/package/tibit/mjpegtools/gcc34.patch b/package/tibit/mjpegtools/gcc34.patch new file mode 100644 index 000000000..b8a09de6c --- /dev/null +++ b/package/tibit/mjpegtools/gcc34.patch @@ -0,0 +1,25 @@ +--- ./mpeg2enc/picture.cc.orig 2004-05-14 09:59:53.570487912 +0200 ++++ ./mpeg2enc/picture.cc 2004-05-14 10:00:08.136273576 +0200 +@@ -83,9 +83,9 @@ + } + + +- curref = new (uint8_t *)[5]; +- curorg = new (uint8_t *)[5]; +- pred = new (uint8_t *)[5]; ++ curref = new uint8_t* [5]; ++ curorg = new uint8_t* [5]; ++ pred = new uint8_t* [5]; + + for( i = 0 ; i<3; i++) + { +--- ./lavtools/lavpipe.c.orig 2004-05-14 10:27:18.105480592 +0200 ++++ ./lavtools/lavpipe.c 2004-05-14 10:28:04.736391616 +0200 +@@ -582,6 +582,7 @@ + mjpeg_info( "closing input %d (source %d)", i, current_index); + decommission_pipe_source(source); + KEEP_SOURCE: ++ ; + } + } + }