From 7e3d1dd13ac04eb161d7cbd17057dc145c5da95e Mon Sep 17 00:00:00 2001 From: Daniel Jahre Date: Sat, 24 Dec 2005 15:17:45 +0000 Subject: [PATCH] Daniel Jahre: updated cinepaint to version 0.20-1 and added gcc4 patch [2005121503053815463] (https://www.rocklinux.net/submaster) git-svn-id: http://www.rocklinux.org/svn/rock-linux/trunk@6887 c5f82cb5-29bc-0310-9cd0-bff59a50e3bc --- package/public/cinepaint/cinepaint-gcc4.patch | 61 +++++++++++++++++++ package/public/cinepaint/cinepaint.desc | 4 +- package/public/cinepaint/gcc34.patch | 30 --------- 3 files changed, 63 insertions(+), 32 deletions(-) create mode 100644 package/public/cinepaint/cinepaint-gcc4.patch delete mode 100644 package/public/cinepaint/gcc34.patch diff --git a/package/public/cinepaint/cinepaint-gcc4.patch b/package/public/cinepaint/cinepaint-gcc4.patch new file mode 100644 index 000000000..a3a389517 --- /dev/null +++ b/package/public/cinepaint/cinepaint-gcc4.patch @@ -0,0 +1,61 @@ +--- ./app/histogram_tool.c.vanilla 2005-12-14 16:29:07.000000000 +0100 ++++ ./app/histogram_tool.c 2005-12-14 16:31:31.000000000 +0100 +@@ -84,7 +84,7 @@ + static void *histogram_tool_options = NULL; + static HistogramToolDialog *histogram_tool_dialog = NULL; + +-static Argument * histogram_invoker (Argument *args); ++Argument * histogram_invoker (Argument *args); + + static char * histogram_info_names[7] = + { +@@ -538,7 +538,7 @@ + /* + * TBD - WRB -make work with float data + */ +-static Argument * ++Argument * + histogram_invoker (Argument *args) + { + Argument *return_args; +--- ./plug-ins/bracketing_to_hdr/Fl_Cartesius.cpp.vanilla 2005-12-15 02:17:32.000000000 +0100 ++++ ./plug-ins/bracketing_to_hdr/Fl_Cartesius.cpp 2005-12-15 02:33:44.000000000 +0100 +@@ -804,7 +804,7 @@ + case FL_MOVE: + mk_coord_picker_str(wx_from_x(Fl::event_x()), wy_from_y(Fl::event_y())); + //draw_coord_picker(); // now via the damage() channel... +- damage (FL_DAMAGE_USER1); // my code word for "draw only coord picker" ++ //damage (FL_DAMAGE_USER1); // my code word for "draw only coord picker" + return 1; + + case FL_ENTER: +@@ -896,13 +896,14 @@ + + // Check if only the coord picker is to update (before Fl_Group::draw(), + // which clears all!) Note: draw_coord() doesn't need win-world-map... +- ++ ++/* + if (damage() == FL_DAMAGE_USER1) { // &-question fails (MOVE-Problem) + draw_coord_picker(); + TRACE_DRAW(("only coord_picker\n")) + return; + } +- ++*/ + if (rejustify_) justify(); // Before draw_children(), so that children + // have the right map too + +--- ./plug-ins/bracketing_to_hdr/fl_print_event.cpp.vanilla 2005-12-15 02:34:37.000000000 +0100 ++++ ./plug-ins/bracketing_to_hdr/fl_print_event.cpp 2005-12-15 02:34:57.000000000 +0100 +@@ -89,8 +89,8 @@ + if (mask & FL_DAMAGE_EXPOSE) strcat(s," EXPOSE"); + if (mask & FL_DAMAGE_SCROLL) strcat(s," SCROLL"); + if (mask & FL_DAMAGE_OVERLAY) strcat(s," OVERLAY"); +- if (mask & FL_DAMAGE_USER1) strcat(s," USER1"); +- if (mask & FL_DAMAGE_USER2) strcat(s," USER2"); ++// if (mask & FL_DAMAGE_USER1) strcat(s," USER1"); ++// if (mask & FL_DAMAGE_USER2) strcat(s," USER2"); + if (mask & FL_DAMAGE_ALL) strcat(s," ALL"); + } + printf("damage mask: %d: %s", mask, s); diff --git a/package/public/cinepaint/cinepaint.desc b/package/public/cinepaint/cinepaint.desc index f5f11e57a..00932abae 100644 --- a/package/public/cinepaint/cinepaint.desc +++ b/package/public/cinepaint/cinepaint.desc @@ -57,8 +57,8 @@ [L] GPL [S] Beta -[V] 0.18 +[V] 0.20-1 [P] X -?---5---9 132.800 -[D] 2973468024 cinepaint-0.18-3.tar.gz http://dl.sourceforge.net/cinepaint/ +[D] 1006386812 cinepaint-0.20-1.tar.gz http://dl.sourceforge.net/cinepaint/ diff --git a/package/public/cinepaint/gcc34.patch b/package/public/cinepaint/gcc34.patch deleted file mode 100644 index 4d34a3279..000000000 --- a/package/public/cinepaint/gcc34.patch +++ /dev/null @@ -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/rene/cinepaint/gcc34.patch -# ROCK Linux is Copyright (C) 1998 - 2005 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 --- - ---- ./plug-ins/psd/psd.c.orig 2004-02-07 00:20:23.000000000 +0100 -+++ ./plug-ins/psd/psd.c 2004-07-10 14:32:37.772325057 +0200 -@@ -299,7 +299,7 @@ - gint *nreturn_vals, - GimpParam **return_vals); - --static GImageType psd_type_to_gimp_type (psd_imagetype psdtype); -+static GDrawableType psd_type_to_gimp_type (psd_imagetype psdtype); - static GImageType psd_type_to_gimp_base_type (psd_imagetype psdtype); - static GLayerMode psd_lmode_to_gimp_lmode (gchar modekey[4]); - static GimpUnit psd_unit_to_gimp_unit (gint psdunit);