Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=860dda61af43813babd3697cc6369a600bf21716
commit 860dda61af43813babd3697cc6369a600bf21716 Author: Devil505 <devil505li...@gmail.com> Date: Tue Nov 1 10:20:04 2011 +0100 shotwell-0.11.5-3-i686 * added patch to build with libraw 0.14.3 diff --git a/source/gnome-extra/shotwell/FrugalBuild b/source/gnome-extra/shotwell/FrugalBuild index 2510cc8..7a6c607 100644 --- a/source/gnome-extra/shotwell/FrugalBuild +++ b/source/gnome-extra/shotwell/FrugalBuild @@ -3,10 +3,10 @@ pkgname=shotwell pkgver=0.11.5 -pkgrel=2 +pkgrel=3 pkgdesc="A digital photo organizer designed for the GNOME desktop environment" url="http://yorba.org/shotwell/"; -depends=('gconf' 'libgee' 'libgphoto2' 'unique1' 'webkit' 'libgexiv2>=0.3.1-2' 'libraw' 'librsvg' 'json-glib' 'libgudev') +depends=('gconf' 'libgee' 'libgphoto2' 'unique1' 'webkit' 'libgexiv2>=0.3.1-2' 'libraw>=0.14.3' 'librsvg' 'json-glib' 'libgudev') makedepends=('vala>=0.11' 'intltool') options=('scriptlet') _F_gnome_schemas=('/etc/gconf/schemas/shotwell.schemas') @@ -18,9 +18,11 @@ groups=('gnome-extra') archs=('i686' 'x86_64') up2date="Flasttar $url/install/" source=(http://yorba.org/download/shotwell/0.11/$pkgname-$pkgver.tar.bz2 \ - http://ftp.gnome.org/pub/gnome/sources/vala/0.12/vala-0.12.1.tar.bz2) + http://ftp.gnome.org/pub/gnome/sources/vala/0.12/vala-0.12.1.tar.bz2 \ + build-hack.patch) sha1sums=('7ca5bd82b0c39ba6f47e40c24b4a521c0729db1b' \ - 'defa61ac7b9f97abe8aac7ad7fb3f80f3c0b9657') + 'defa61ac7b9f97abe8aac7ad7fb3f80f3c0b9657' \ + 'a539136e8f62d5353f73a1b9628fd7ff5bc3034b') build() { cd $Fsrcdir/vala-0.12.1 @@ -35,6 +37,9 @@ build() { --disable-desktop-update \ --disable-gsettings-convert-install \ --disable-icon-update || Fdie + # hack + make || true + Fpatch build-hack.patch make || Fdie Fmakeinstall Frm usr/share/icons/hicolor/icon-theme.cache diff --git a/source/gnome-extra/shotwell/build-hack.patch b/source/gnome-extra/shotwell/build-hack.patch new file mode 100644 index 0000000..3a3d605 --- /dev/null +++ b/source/gnome-extra/shotwell/build-hack.patch @@ -0,0 +1,81 @@ +diff -wbBur shotwell-0.11.4/src/photos/GRaw.c shotwell-0.11.4.my/src/photos/GRaw.c +--- shotwell-0.11.4/src/photos/GRaw.c 2011-10-28 12:44:04.000000000 +0400 ++++ shotwell-0.11.4.my/src/photos/GRaw.c 2011-10-28 12:41:48.000000000 +0400 +@@ -210,7 +210,7 @@ + }; + GRawProcessor* graw_processor_new (enum LibRaw_constructor_flags options); + GRawProcessor* graw_processor_construct (GType object_type, enum LibRaw_constructor_flags options); +-void graw_processor_add_masked_borders_to_bitmap (GRawProcessor* self); ++//void graw_processor_add_masked_borders_to_bitmap (GRawProcessor* self); + void graw_processor_adjust_sizes_info_only (GRawProcessor* self, GError** error); + void graw_processor_document_mode_processing (GRawProcessor* self, GError** error); + libraw_imgother_t graw_processor_get_image_other (GRawProcessor* self); +@@ -223,7 +223,7 @@ + void graw_processor_open_file (GRawProcessor* self, const gchar* filename, GError** error); + void graw_processor_process (GRawProcessor* self, GError** error); + void graw_processor_ppm_tiff_writer (GRawProcessor* self, const gchar* filename, GError** error); +-void graw_processor_rotate_fuji_raw (GRawProcessor* self, GError** error); ++//void graw_processor_rotate_fuji_raw (GRawProcessor* self, GError** error); + void graw_processor_thumb_writer (GRawProcessor* self, const gchar* filename, GError** error); + void graw_processor_recycle (GRawProcessor* self); + void graw_processor_unpack (GRawProcessor* self, GError** error); +@@ -677,12 +677,12 @@ + return graw_processor_construct (GRAW_TYPE_PROCESSOR, options); + } + +- ++#if 0 + void graw_processor_add_masked_borders_to_bitmap (GRawProcessor* self) { + g_return_if_fail (GRAW_IS_PROCESSOR (self)); + libraw_add_masked_borders_to_bitmap (self->priv->proc); + } +- ++#endif + + void graw_processor_adjust_sizes_info_only (GRawProcessor* self, GError** error) { + enum LibRaw_errors _tmp0_; +@@ -909,7 +909,7 @@ + } + } + +- ++#if 0 + void graw_processor_rotate_fuji_raw (GRawProcessor* self, GError** error) { + enum LibRaw_errors _tmp0_; + GError * _inner_error_ = NULL; +@@ -927,7 +927,7 @@ + } + } + } +- ++#endif + + void graw_processor_thumb_writer (GRawProcessor* self, const gchar* filename, GError** error) { + enum LibRaw_errors _tmp0_; +@@ -1044,8 +1044,8 @@ + (*_tmp8_).use_camera_matrix = TRUE; + _tmp9_ = graw_processor_get_output_params (self); + (*_tmp9_).output_color = (gint) GRAW_COLORSPACE_SRGB; +- _tmp10_ = graw_processor_get_output_params (self); +- (*_tmp10_).filtering_mode = LIBRAW_FILTERING_AUTOMATIC; ++// _tmp10_ = graw_processor_get_output_params (self); ++// (*_tmp10_).filtering_mode = LIBRAW_FILTERING_AUTOMATIC; + _tmp11_ = graw_processor_get_output_params (self); + (*_tmp11_).output_bps = 8; + _tmp12_ = graw_processor_get_output_params (self); +@@ -1356,6 +1356,7 @@ + return; + } + } ++#if 0 + case LIBRAW_CANNOT_ADDMASK: + { + GError* _tmp10_ = NULL; +@@ -1372,6 +1373,7 @@ + return; + } + } ++#endif + case LIBRAW_UNSUFFICIENT_MEMORY: + { + GError* _tmp11_ = NULL; _______________________________________________ Frugalware-git mailing list Frugalware-git@frugalware.org http://frugalware.org/mailman/listinfo/frugalware-git
