From ed99462af67bdd358afcfb5d4da71847b3f8f63f Mon Sep 17 00:00:00 2001 From: Silvan Calarco Date: Fri, 5 Jan 2024 17:22:04 +0100 Subject: [PATCH] rebuilt with libgphoto2 2.5.5 [release 2.0-2mamba;Fri Dec 26 2014] --- rawstudio-2.0-build-fixes.patch | 84 +++++++++++++++++++++++++++++++++ rawstudio.spec | 45 ++++++++++++++---- 2 files changed, 121 insertions(+), 8 deletions(-) create mode 100644 rawstudio-2.0-build-fixes.patch diff --git a/rawstudio-2.0-build-fixes.patch b/rawstudio-2.0-build-fixes.patch new file mode 100644 index 0000000..fee7397 --- /dev/null +++ b/rawstudio-2.0-build-fixes.patch @@ -0,0 +1,84 @@ +diff -ru rawstudio-2.0/plugins/lensfun/lensfun.c rawstudio-2.0.patched/plugins/lensfun/lensfun.c +--- rawstudio-2.0/plugins/lensfun/lensfun.c 2011-03-27 19:53:27.000000000 +0200 ++++ rawstudio-2.0.patched/plugins/lensfun/lensfun.c 2014-12-26 17:28:46.045242306 +0100 +@@ -652,7 +652,7 @@ + } + + /* Start threads to apply phase 2, Vignetting and CA Correction */ +- if (effective_flags & (LF_MODIFY_VIGNETTING | LF_MODIFY_CCI)) ++ if (effective_flags & (LF_MODIFY_VIGNETTING)) + { + /* Phase 2 is corrected inplace, so copy input first */ + guint y_offset, y_per_thread, threaded_h; +diff -ru rawstudio-2.0/plugins/output-facebook/Makefile.am rawstudio-2.0.patched/plugins/output-facebook/Makefile.am +--- rawstudio-2.0/plugins/output-facebook/Makefile.am 2011-02-15 18:28:03.000000000 +0100 ++++ rawstudio-2.0.patched/plugins/output-facebook/Makefile.am 2014-12-26 17:54:30.136152500 +0100 +@@ -19,7 +19,7 @@ + libdir = $(datadir)/rawstudio/plugins/ + + output_facebook_la_LIBADD = @PACKAGE_LIBS@ +-output_facebook_la_LDFLAGS = -module -avoid-version -L/usr/lib -lcurl ++output_facebook_la_LDFLAGS = -module -avoid-version -lcurl + output_facebook_la_SOURCES = output-facebook.c output-facebook.h \ + rs-facebook-client.c rs-facebook-client.h \ + rs-facebook-client-param.c rs-facebook-client-param.h +diff -ru rawstudio-2.0/plugins/output-facebook/Makefile.in rawstudio-2.0.patched/plugins/output-facebook/Makefile.in +--- rawstudio-2.0/plugins/output-facebook/Makefile.in 2011-04-07 23:44:00.000000000 +0200 ++++ rawstudio-2.0.patched/plugins/output-facebook/Makefile.in 2014-12-26 17:54:37.688099551 +0100 +@@ -252,7 +252,7 @@ + + lib_LTLIBRARIES = output_facebook.la + output_facebook_la_LIBADD = @PACKAGE_LIBS@ +-output_facebook_la_LDFLAGS = -module -avoid-version -L/usr/lib -lcurl ++output_facebook_la_LDFLAGS = -module -avoid-version -lcurl + output_facebook_la_SOURCES = output-facebook.c output-facebook.h \ + rs-facebook-client.c rs-facebook-client.h \ + rs-facebook-client-param.c rs-facebook-client-param.h +diff -ru rawstudio-2.0/plugins/output-flickr/Makefile.am rawstudio-2.0.patched/plugins/output-flickr/Makefile.am +--- rawstudio-2.0/plugins/output-flickr/Makefile.am 2011-02-15 18:28:03.000000000 +0100 ++++ rawstudio-2.0.patched/plugins/output-flickr/Makefile.am 2014-12-26 17:54:52.689994379 +0100 +@@ -18,7 +18,7 @@ + libdir = $(datadir)/rawstudio/plugins/ + + output_flickr_la_LIBADD = @PACKAGE_LIBS@ +-output_flickr_la_LDFLAGS = -module -avoid-version -L/usr/lib -lflickcurl ++output_flickr_la_LDFLAGS = -module -avoid-version -lflickcurl + output_flickr_la_SOURCES = output-flickr.c output-flickr.h + + plugin_DATA = flickr-logo.svg +diff -ru rawstudio-2.0/plugins/output-flickr/Makefile.in rawstudio-2.0.patched/plugins/output-flickr/Makefile.in +--- rawstudio-2.0/plugins/output-flickr/Makefile.in 2011-04-07 23:44:00.000000000 +0200 ++++ rawstudio-2.0.patched/plugins/output-flickr/Makefile.in 2014-12-26 17:55:06.905894709 +0100 +@@ -250,7 +250,7 @@ + + lib_LTLIBRARIES = output_flickr.la + output_flickr_la_LIBADD = @PACKAGE_LIBS@ +-output_flickr_la_LDFLAGS = -module -avoid-version -L/usr/lib -lflickcurl ++output_flickr_la_LDFLAGS = -module -avoid-version -lflickcurl + output_flickr_la_SOURCES = output-flickr.c output-flickr.h + plugin_DATA = flickr-logo.svg + EXTRA_DIST = $(plugin_DATA) +diff -ru rawstudio-2.0/plugins/output-picasa/Makefile.am rawstudio-2.0.patched/plugins/output-picasa/Makefile.am +--- rawstudio-2.0/plugins/output-picasa/Makefile.am 2011-02-15 18:28:03.000000000 +0100 ++++ rawstudio-2.0.patched/plugins/output-picasa/Makefile.am 2014-12-26 17:55:21.678791195 +0100 +@@ -18,7 +18,7 @@ + libdir = $(datadir)/rawstudio/plugins/ + + output_picasa_la_LIBADD = @PACKAGE_LIBS@ +-output_picasa_la_LDFLAGS = -module -avoid-version -L/usr/lib ++output_picasa_la_LDFLAGS = -module -avoid-version + output_picasa_la_SOURCES = output-picasa.c rs-picasa-client.c rs-picasa-client.h + + plugin_DATA = picasa-logo.svg +diff -ru rawstudio-2.0/plugins/output-picasa/Makefile.in rawstudio-2.0.patched/plugins/output-picasa/Makefile.in +--- rawstudio-2.0/plugins/output-picasa/Makefile.in 2011-04-07 23:44:01.000000000 +0200 ++++ rawstudio-2.0.patched/plugins/output-picasa/Makefile.in 2014-12-26 17:55:30.452729716 +0100 +@@ -250,7 +250,7 @@ + + lib_LTLIBRARIES = output_picasa.la + output_picasa_la_LIBADD = @PACKAGE_LIBS@ +-output_picasa_la_LDFLAGS = -module -avoid-version -L/usr/lib ++output_picasa_la_LDFLAGS = -module -avoid-version + output_picasa_la_SOURCES = output-picasa.c rs-picasa-client.c rs-picasa-client.h + plugin_DATA = picasa-logo.svg + EXTRA_DIST = $(plugin_DATA) diff --git a/rawstudio.spec b/rawstudio.spec index d16d3cc..82869c6 100644 --- a/rawstudio.spec +++ b/rawstudio.spec @@ -1,6 +1,6 @@ Name: rawstudio Version: 2.0 -Release: 1mamba +Release: 2mamba Summary: Read, manipulate and convert digital camera raw images Group: Graphical Desktop/Applications/Graphics Vendor: openmamba @@ -9,15 +9,40 @@ Packager: Fabio Giani URL: http://rawstudio.org Source: http://www.rawstudio.org/files/release/rawstudio-%{version}.tar.gz Patch1: rawstudio-2.0-libpng-1.5.patch +Patch2: rawstudio-2.0-build-fixes.patch License: GPL -BuildRequires: libgtk-devel -BuildRequires: libxml2-devel -BuildRequires: GConf-devel +## AUTOBUILDREQ-BEGIN +BuildRequires: glibc-devel +BuildRequires: libGConf-devel +BuildRequires: libX11-devel +BuildRequires: libatk-devel +BuildRequires: libcairo-devel +BuildRequires: libcurl-devel BuildRequires: libdbus-devel -BuildRequires: liblcms-devel -BuildRequires: libjpeg-devel -BuildRequires: libtiff-devel +BuildRequires: libexif-devel BuildRequires: libexiv2-devel +BuildRequires: libfftw-devel +BuildRequires: libflickcurl-devel +BuildRequires: libfontconfig-devel +BuildRequires: libfreetype-devel +BuildRequires: libgcc +BuildRequires: libgdk-pixbuf-devel +BuildRequires: libglib-devel +BuildRequires: libgphoto2-devel +BuildRequires: libgtk2-devel +BuildRequires: libjpeg-devel +BuildRequires: liblcms-devel +BuildRequires: liblensfun-devel +BuildRequires: libopenssl-devel +BuildRequires: libpango-devel +BuildRequires: libraptor2-devel +BuildRequires: libsqlite-devel +BuildRequires: libstdc++6-devel +BuildRequires: libtiff-devel +BuildRequires: libxml2-devel +## AUTOBUILDREQ-END +BuildRequires: libxml2-devel +BuildRequires: libgphoto2-devel >= 1:2.5 Requires: lib%{name} = %{?epoch:%epoch:}%{version}-%{release} BuildRoot: %{_tmppath}/%{name}-%{version}-root @@ -48,6 +73,7 @@ This package contains development files for lib%{name}. mkdir librawstudio/lib %patch1 -p1 +%patch2 -p1 %build %configure @@ -55,7 +81,7 @@ mkdir librawstudio/lib %install [ "%{buildroot}" != / ] && rm -rf "%{buildroot}" -%makeinstall DESTDIR=$RPM_BUILD_ROOT +%makeinstall DESTDIR=%{buildroot} # Fix desktop file warning # Note: the Encoding tag seems to be deprecated in desktop entry specs v1.0 @@ -94,6 +120,9 @@ echo "Encoding=UTF-8" >> %{buildroot}%{_datadir}/applications/rawstudio.desktop %{_libdir}/pkgconfig/rawstudio-2.0.pc %changelog +* Fri Dec 26 2014 Silvan Calarco 2.0-2mamba +- rebuilt with libgphoto2 2.5.5 + * Mon Jun 03 2013 Automatic Build System 2.0-1mamba - automatic version update by autodist - added patch to fix libpng1.5 compatibility issue