2014-10-18: Orphaned and not available in the repo

This commit is contained in:
Till Maas 2014-10-18 22:30:56 +02:00
parent 20dd030281
commit 4fe15ffe0c
5 changed files with 2 additions and 160 deletions

5
.gitignore vendored
View File

@ -1,5 +0,0 @@
camlimages-2.2.0-htmlref.tar.gz
camlimages-2.2.0.tgz
camlimages-3.0.1.tar.gz
camlimages-3.0.2.tgz
/v4.0.1.tar.gz

2
dead.package Normal file
View File

@ -0,0 +1,2 @@
2014-10-18: Orphaned and not available in the repo

View File

@ -1,58 +0,0 @@
--- src/pngwrite.c.libpng 2011-06-22 13:04:32.000000000 -0500
+++ src/pngwrite.c 2012-01-29 13:58:34.231905872 -0600
@@ -62,7 +62,7 @@
}
/* error handling */
- if (setjmp(png_ptr->jmpbuf)) {
+ if (setjmp(png_jmpbuf(png_ptr))) {
/* Free all of the memory associated with the png_ptr and info_ptr */
png_destroy_write_struct(&png_ptr, &info_ptr);
fclose(fp);
@@ -171,7 +171,7 @@
}
/* error handling */
- if (setjmp(png_ptr->jmpbuf)) {
+ if (setjmp(png_jmpbuf(png_ptr))) {
/* Free all of the memory associated with the png_ptr and info_ptr */
png_destroy_write_struct(&png_ptr, &info_ptr);
fclose(fp);
--- src/pngread.c.libpng 2012-01-29 14:00:42.285180786 -0600
+++ src/pngread.c 2012-01-29 14:02:24.978232543 -0600
@@ -69,7 +69,7 @@
}
/* error handling */
- if (setjmp(png_ptr->jmpbuf)) {
+ if (setjmp(png_jmpbuf(png_ptr))) {
/* Free all of the memory associated with the png_ptr and info_ptr */
png_destroy_read_struct(&png_ptr, &info_ptr, (png_infopp)NULL);
fclose(fp);
@@ -134,7 +134,7 @@
png_set_rows(png_ptr, info_ptr, row_pointers);
/* Later, we can return something */
- if (setjmp(png_ptr->jmpbuf)) {
+ if (setjmp(png_jmpbuf(png_ptr))) {
/* Free all of the memory associated with the png_ptr and info_ptr */
png_destroy_read_struct(&png_ptr, &info_ptr, (png_infopp)NULL);
fclose(fp);
@@ -243,7 +243,7 @@
}
/* error handling */
- if (setjmp(png_ptr->jmpbuf)) {
+ if (setjmp(png_jmpbuf(png_ptr))) {
/* Free all of the memory associated with the png_ptr and info_ptr */
png_destroy_read_struct(&png_ptr, &info_ptr, (png_infopp)NULL);
fclose(fp);
@@ -302,7 +302,7 @@
png_set_rows(png_ptr, info_ptr, row_pointers);
/* Later, we can return something */
- if (setjmp(png_ptr->jmpbuf)) {
+ if (setjmp(png_jmpbuf(png_ptr))) {
/* Free all of the memory associated with the png_ptr and info_ptr */
png_destroy_read_struct(&png_ptr, &info_ptr, (png_infopp)NULL);
fclose(fp);

View File

@ -1,95 +0,0 @@
%define debug_package %{nil}
Name: ocaml-camlimages
Version: 4.0.1
Release: 2%{?dist}
Summary: OCaml image processing library
Group: Development/Libraries
License: LGPLv2 with exceptions
URL: http://cristal.inria.fr/camlimages/eng.html
Source0: https://bitbucket.org/camlspotter/camlimages/get/v4.0.1.tar.gz
# This file isn't published any more (that I could find).
# It's probably dated but at least should provide some info on how to
# use the library.
Source1: camlimages-2.2.0-htmlref.tar.gz
Patch0: ocaml-camlimages-libpng15.patch
BuildRequires: ocaml, ocaml-findlib-devel, ocaml-omake
BuildRequires: ocaml-lablgtk-devel
BuildRequires: ocaml-x11
BuildRequires: lablgtk, libpng-devel, libjpeg-devel
BuildRequires: libXpm-devel, ghostscript-devel, freetype-devel
BuildRequires: giflib-devel
BuildRequires: libtiff-devel
BuildRequires: gtk2-devel
%description
This is an image processing library, which provides some basic
functions of image processing and loading/saving various image file
formats. In addition the library can handle huge images that cannot be
(or can hardly be) stored into the memory (the library automatically
creates swap files and escapes them to reduce the memory usage).
%package devel
Summary: Development files for camlimages
Group: Development/Libraries
Requires: %{name}%{?_isa} = %{version}-%{release}
%description devel
The camlimages-devel package provides libraries and headers for
developing applications using camlimages
Includes documentation provided by ocamldoc
%prep
%setup -q -n camlspotter-camlimages-c803efa9d5d3
%setup -q -T -D -a 1 -n camlspotter-camlimages-c803efa9d5d3
%patch0 -b .libpng
%build
omake
%install
# These rules work if the library uses 'ocamlfind install' to install itself.
export DESTDIR=$RPM_BUILD_ROOT
export OCAMLFIND_DESTDIR=$RPM_BUILD_ROOT%{_libdir}/ocaml
mkdir -p $OCAMLFIND_DESTDIR $OCAMLFIND_DESTDIR/stublibs
omake install
strip $RPM_BUILD_ROOT%{_libdir}/ocaml/stublibs/*.so
mkdir -p $RPM_BUILD_ROOT/usr/share/doc/ocaml-camlimages-4.0.1
cp -pr License.txt htmlref $RPM_BUILD_ROOT/usr/share/doc/ocaml-camlimages-4.0.1
%files
%doc README License.txt
%{_libdir}/ocaml/camlimages
%exclude %{_libdir}/ocaml/camlimages/*.a
%exclude %{_libdir}/ocaml/camlimages/*.cmxa
# There aren't any *.cmx files
#%exclude %{_libdir}/ocaml/camlimages/*.cmx
%exclude %{_libdir}/ocaml/camlimages/*.mli
%{_libdir}/ocaml/stublibs/*.so
%{_libdir}/ocaml/stublibs/*.so.owner
%files devel
%doc htmlref
%{_libdir}/ocaml/camlimages/*.a
%{_libdir}/ocaml/camlimages/*.cmxa
# There aren't any *.cmx files
#%{_libdir}/ocaml/camlimages/*.cmx
%{_libdir}/ocaml/camlimages/*.mli
%changelog
* Sat Mar 10 2012 Bruno Wolff III <bruno@wolff.to> - 4.0.1-2
- Fixup "should fixes" from review
* Sun Jan 29 2012 Bruno Wolff III <bruno@wolff.to> - 4.0.1-1
- Resurrect ocaml-camlimages

View File

@ -1,2 +0,0 @@
d6b9494b56a72b65fd302d1858efff7c v4.0.1.tar.gz
fb1633c9c8df0b2b2d0f892d8c4ac2ee camlimages-2.2.0-htmlref.tar.gz