rpms/cinepaint/devel cinepaint-0.22-gcc44.patch, NONE, 1.1 icc_examin-0.46-default.patch, NONE, 1.1 import.log, NONE, 1.1 .cvsignore, 1.3, 1.4 cinepaint.spec, 1.14, 1.15 sources, 1.3, 1.4 cinepaint-0.22-0-icc_helfer_fltk.patch, 1.1, NONE icc_examin-0.44-gcc43.patch, 1.1, NONE
NicolasChauvet
kwizart at fedoraproject.org
Mon Mar 9 16:44:36 UTC 2009
Author: kwizart
Update of /cvs/pkgs/rpms/cinepaint/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30578/devel
Modified Files:
.cvsignore cinepaint.spec sources
Added Files:
cinepaint-0.22-gcc44.patch icc_examin-0.46-default.patch
import.log
Removed Files:
cinepaint-0.22-0-icc_helfer_fltk.patch
icc_examin-0.44-gcc43.patch
Log Message:
- Fix for gcc44
- backport oyranos 0.1.9 support
- Switch from freefont to dejavu-sans-fonts for icc_examin internal plug-in
cinepaint-0.22-gcc44.patch:
--- NEW FILE cinepaint-0.22-gcc44.patch ---
diff -up cinepaint-0.22-1/plug-ins/collect/collect.cpp.gcc44 cinepaint-0.22-1/plug-ins/collect/collect.cpp
--- cinepaint-0.22-1/plug-ins/collect/collect.cpp.gcc44 2009-03-09 14:47:35.000000000 +0100
+++ cinepaint-0.22-1/plug-ins/collect/collect.cpp 2009-03-09 15:17:01.000000000 +0100
@@ -301,7 +301,7 @@ do_collect ()
return -1;
// renaming the layer to the original filename
- gimp_layer_set_name (layers[0], strrchr(fc->value(1),'/')+1);
+ gimp_layer_set_name (layers[0], strrchr((char *)fc->value(1),'/')+1);
GPrecisionType image_base_prec = gimp_drawable_precision (layers[0]);
int base_gray = gimp_drawable_gray (layers[0]);
@@ -341,7 +341,7 @@ do_collect ()
#endif
gimp_image_add_layer (image_ID, layers[0], 0); DBG
// set layer name to filename
- gimp_layer_set_name(layers[0], strrchr(fc->value(i),'/')+1);
+ gimp_layer_set_name(layers[0], strrchr((char *)fc->value(i),'/')+1);
// searching max dimensions
if (gimp_image_width(load_image_ID) > max_w)
icc_examin-0.46-default.patch:
--- NEW FILE icc_examin-0.46-default.patch ---
diff -up icc_examin-0.46/icc_gl.cpp.default icc_examin-0.46/icc_gl.cpp
--- icc_examin-0.46/icc_gl.cpp.default 2009-03-05 16:26:24.000000000 +0100
+++ icc_examin-0.46/icc_gl.cpp 2009-03-05 16:28:09.000000000 +0100
@@ -731,7 +731,7 @@ GL_Ansicht::GLinit_()
if(font) delete font;
if(ortho_font) delete ortho_font;
- const char* font_name = "/usr/X11R6/lib/X11/fonts/truetype/FreeSans.ttf";
+ const char* font_name = "/usr/share/fonts/dejavu/DejaVuSans.ttf";
# if APPLE
std::string f_n;
if(getenv("RESOURCESPATH"))
@@ -748,7 +748,7 @@ GL_Ansicht::GLinit_()
# endif
if(!holeDateiModifikationsZeit(font_name)) {
DBG_PROG_S( _("Could not open font in:") << font_name )
- font_name = "/usr/X11R6/lib/X11/fonts/truetype/arial.ttf";
+ font_name = "/usr/share/fonts/dejavu/DejaVuSans.ttf";
if(!holeDateiModifikationsZeit(font_name)) {
DBG_PROG_S( _("Could not open font in:") << font_name )
#ifdef WIN32
@@ -773,7 +773,7 @@ GL_Ansicht::GLinit_()
font_name = n;
if(!holeDateiModifikationsZeit(font_name)) {
DBG_PROG_S( _("Could not open font in:") << font_name )
- sprintf (n, "%s/FreeSans.ttf", SRCDIR);
+ sprintf (n, "%s/DejaVuSans.ttf", SRCDIR);
font_name = n;
}
}
--- NEW FILE import.log ---
cinepaint-0_22_1-12_fc10:HEAD:cinepaint-0.22.1-12.fc10.src.rpm:1236616951
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/cinepaint/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore 7 Mar 2008 21:39:36 -0000 1.3
+++ .cvsignore 9 Mar 2009 16:44:35 -0000 1.4
@@ -1,2 +1,2 @@
cinepaint-0.22-1.tar.gz
-icc_examin-0.44.tar.gz
+icc_examin-0.46.tar.gz
Index: cinepaint.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cinepaint/devel/cinepaint.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- cinepaint.spec 24 Feb 2009 07:33:18 -0000 1.14
+++ cinepaint.spec 9 Mar 2009 16:44:35 -0000 1.15
@@ -6,7 +6,7 @@
Name: cinepaint
Version: %(echo %{cinever} |sed 's|-|.|')
-Release: 11%{?dist}
+Release: 12%{?dist}
Summary: CinePaint is a tool for manipulating images
Group: Applications/Multimedia
@@ -14,8 +14,7 @@
URL: http://www.cinepaint.org/
Source0: http://downloads.sourceforge.net/%{name}/%{name}-%{cinever}.tar.gz
# http://www.behrmann.name/index.php?option=com_content&task=view&id=33&Itemid=69
-Source1: http://kwizart.fedorapeople.org/SOURCES/icc_examin-0.44.tar.gz
-Patch0: cinepaint-0.22-0-icc_helfer_fltk.patch
+Source1: http://downloads.sourceforge.net/oyranos/icc_examin-0.46.tar.gz
Patch1: cinepaint-0.22-0-nonweak-symbol.patch
Patch2: cinepaint-0.22-0-rm_rpath.patch
Patch3: cinepaint-0.22-0-pc_req.patch
@@ -24,7 +23,8 @@
Patch6: cinepaint-0.22-multilib.patch
Patch8: cinepaint-0.22-gcc43_cine.patch
Patch9: cinepaint-0.22-1-underquoted.patch
-Patch11: icc_examin-0.44-gcc43.patch
+Patch10: cinepaint-0.22-gcc44.patch
+Patch11: icc_examin-0.46-default.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
#ifnarch %{ix86} ppc
@@ -47,9 +47,11 @@
BuildRequires: libXxf86vm-devel
BuildRequires: OpenEXR-devel >= 1.6.0
BuildRequires: oyranos-devel
+BuildRequires: elektra-devel
-Requires: freefont
-Requires: pygtk2
+%if 0%{?fedora} > 10
+Requires: dejavu-sans-fonts
+%endif
Requires: oyranos
Requires: %{name}-libs = %{version}-%{release}
@@ -88,7 +90,6 @@
%prep
%setup -q -n cinepaint-%{cinever}
-%patch0 -p1 -b .compile
%patch1 -p1 -b .symbol
%patch2 -p1 -b .rm_rpath
%patch3 -p1 -b .req
@@ -98,24 +99,21 @@
%patch8 -p1 -b .gcc43_cine
#Fix #450325
%patch9 -p1 -b .underquoted
+%patch10 -p1 -b .gcc44
#Fix to prevent a multilibs problem
touch -r cinepaint.m4.underquoted cinepaint.m4
%setup -q -D -T -a 1 -n cinepaint-%{cinever}
-pushd icc_examin-0.44
-%patch11 -p1 -b .gcc43
+pushd icc_examin-0.46
+%patch11 -p1 -b .icc_def
popd
+# Update bundled version of icc_examin
rm -rf plug-ins/icc_examin/icc_examin
-# Fix default path FreeSans.ttf
-sed -i -e 's|/usr/X11R6/lib/X11/fonts/truetype/FreeSans.ttf|%{_datadir}/fonts/freefont/FreeSans.ttf|' \
- icc_examin-0.44/icc_gl.cpp
-sed -i -e 's|fonts/FreeSans.ttf|fonts/freefont/FreeSans.ttf|' icc_examin-0.44/icc_gl.cpp
-
-cp -pR icc_examin-0.44 plug-ins/icc_examin/icc_examin
+cp -pR icc_examin-0.46 plug-ins/icc_examin/icc_examin
#ifnarch %{ix86} ppc
-autoconf
+autoconf -f -i
#endif
for i in AUTHORS COPYING LICENSE README ;do
@@ -123,17 +121,12 @@
done
sed -i 's|\r||' NEWS COPYING
-
-# make compile log more verbose
-sed -i.debug -e '/SILENT/s|^.*$|:|' plug-ins/icc_examin/icc_examin/configure.sh
-# remove rpath
-sed -i.rpath -e '/rpath/d' plug-ins/icc_examin/icc_examin/configure
-
# prevent interp_md5 to be used
rm plug-ins/script-fu/interp_md5.{h,c}
%build
+export CFLAGS="$RPM_OPT_FLAGS -D_GNU_SOURCE"
%configure \
--disable-static \
--enable-gtk2 \
@@ -225,14 +218,15 @@
%changelog
+* Mon Mar 9 2009 kwizart < kwizart at gmail.com > - 0.22.1-12
+- Fix for gcc44
+
* Mon Feb 23 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.22.1-11
- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
* Mon Dec 8 2008 kwizart < kwizart at gmail.com > - 0.22.1-10
- Fix underquoted cinepaint.m4 - #450325
-
-* Sat Nov 29 2008 Ignacio Vazquez-Abrams <ivazqueznet+rpm at gmail.com> - 0.22.1-9
-- Rebuild for Python 2.6
+- Fix automatic provides a specific architecture
* Thu Oct 09 2008 Dennis Gilmore <dennis at ausil.us> - 0.22.1-8
- add sparc64 to the list of 64 bit arches for python site arch
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/cinepaint/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources 7 Mar 2008 21:39:36 -0000 1.3
+++ sources 9 Mar 2009 16:44:35 -0000 1.4
@@ -1,2 +1,2 @@
f360587240db6b6d2f0bfd94c420c492 cinepaint-0.22-1.tar.gz
-81e9bba15a777d53fbeb03acd65f7338 icc_examin-0.44.tar.gz
+01b8a19489601850192476a06393cf47 icc_examin-0.46.tar.gz
--- cinepaint-0.22-0-icc_helfer_fltk.patch DELETED ---
--- icc_examin-0.44-gcc43.patch DELETED ---
More information about the fedora-extras-commits
mailing list