summaryrefslogtreecommitdiff
path: root/community/shotwell
diff options
context:
space:
mode:
authorNicolás Reynolds <fauno@kiwwwi.com.ar>2012-05-05 02:43:51 -0300
committerNicolás Reynolds <fauno@kiwwwi.com.ar>2012-05-05 02:43:51 -0300
commit61b68fb9fca39dda7e4b48c5af9567dc60ea3dd2 (patch)
tree6b8b6fb14ede5aae651e92f593252dba143cee74 /community/shotwell
parentca998b4c054452abed4e01be1d2b28fee0ca904f (diff)
parent5801c5acd80d30d17aaef76b8bc401c61b3ef3c9 (diff)
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts: community/camlp5/PKGBUILD community/coq/PKGBUILD community/ldns/PKGBUILD community/luxrays/PKGBUILD community/luxrender/PKGBUILD community/nut/PKGBUILD community/root/PKGBUILD community/swi-prolog/PKGBUILD community/vtk/PKGBUILD community/wings3d/wings3d.sh core/sqlite3/PKGBUILD core/tzdata/PKGBUILD extra/cmus/PKGBUILD extra/dcron/PKGBUILD extra/farsight2/PKGBUILD extra/foomatic/PKGBUILD extra/fwbuilder/PKGBUILD extra/gnome-utils/PKGBUILD extra/ivtv-utils/PKGBUILD extra/kdebase-konsole/PKGBUILD extra/kdenetwork/PKGBUILD extra/kdesdk/PKGBUILD extra/koffice/PKGBUILD extra/libxfce4menu/PKGBUILD extra/openmpi/PKGBUILD extra/telepathy-butterfly/PKGBUILD extra/telepathy-farsight/PKGBUILD extra/telepathy-kde-presence-dataengine/PKGBUILD extra/telepathy-qt4/PKGBUILD extra/xfce-utils/PKGBUILD extra/xulrunner/PKGBUILD multilib/lib32-zlib/PKGBUILD staging/gimp-devel/gimp-devel.install testing/gtk3/PKGBUILD testing/php/PKGBUILD ~xihh/couchdb-git/couchdb.install ~xihh/couchdb-git/rc-script.patch ~xihh/gmime24/PKGBUILD
Diffstat (limited to 'community/shotwell')
-rw-r--r--community/shotwell/fix-with-libraw-0.4.patch50
1 files changed, 0 insertions, 50 deletions
diff --git a/community/shotwell/fix-with-libraw-0.4.patch b/community/shotwell/fix-with-libraw-0.4.patch
deleted file mode 100644
index f6f021b61..000000000
--- a/community/shotwell/fix-with-libraw-0.4.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-Seulement dans shotwell-0.11.5-fixed/misc: gschemas.compiled
-diff -ru shotwell-0.11.5/src/photos/GRaw.vala shotwell-0.11.5-fixed/src/photos/GRaw.vala
---- shotwell-0.11.5/src/photos/GRaw.vala 2011-09-24 00:52:27.000000000 +0200
-+++ shotwell-0.11.5-fixed/src/photos/GRaw.vala 2011-11-01 00:25:05.976289495 +0100
-@@ -163,9 +163,9 @@
- proc = new LibRaw.Processor(options);
- }
-
-- public void add_masked_borders_to_bitmap() {
-- proc.add_masked_borders_to_bitmap();
-- }
-+// public void add_masked_borders_to_bitmap() {
-+// proc.add_masked_borders_to_bitmap();
-+// }
-
- public void adjust_sizes_info_only() throws Exception {
- throw_exception("adjust_sizes_info_only", proc.adjust_sizes_info_only());
-@@ -215,9 +215,9 @@
- throw_exception("ppm_tiff_writer", proc.ppm_tiff_writer(filename));
- }
-
-- public void rotate_fuji_raw() throws Exception {
-- throw_exception("rotate_fuji_raw", proc.rotate_fuji_raw());
-- }
-+// public void rotate_fuji_raw() throws Exception {
-+// throw_exception("rotate_fuji_raw", proc.rotate_fuji_raw());
-+// }
-
- public void thumb_writer(string filename) throws Exception {
- throw_exception("thumb_writer", proc.thumb_writer(filename));
-@@ -262,7 +262,7 @@
- // camera_profile
- // bad_pixels
- // dark_frame
-- output_params->filtering_mode = LibRaw.Filtering.AUTOMATIC;
-+ // output_params->filtering_mode = LibRaw.Filtering.AUTOMATIC;
- output_params->output_bps = 8;
- // output_tiff
- output_params->user_flip = GRaw.Flip.FROM_SOURCE;
-@@ -303,8 +303,8 @@
- case LibRaw.Result.UNSUPPORTED_THUMBNAIL:
- throw new Exception.UNSUPPORTED_THUMBNAIL(msg);
-
-- case LibRaw.Result.CANNOT_ADDMASK:
-- throw new Exception.CANNOT_ADDMASK(msg);
-+// case LibRaw.Result.CANNOT_ADDMASK:
-+// throw new Exception.CANNOT_ADDMASK(msg);
-
- case LibRaw.Result.UNSUFFICIENT_MEMORY:
- throw new Exception.OUT_OF_MEMORY(msg);