FreeBSD Bugzilla – Attachment 209125 Details for
Bug 241938
graphics/photoflow: update and unbreak
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
Remember
[x]
|
Forgot Password
Login:
[x]
[patch]
patch
photoflow.patch (text/plain), 6.19 KB, created by
Alex Dupre
on 2019-11-13 09:00:33 UTC
(
hide
)
Description:
patch
Filename:
MIME Type:
Creator:
Alex Dupre
Created:
2019-11-13 09:00:33 UTC
Size:
6.19 KB
patch
obsolete
>Index: photoflow/Makefile >=================================================================== >--- photoflow/Makefile (revisione 517363) >+++ photoflow/Makefile (copia di lavoro) >@@ -1,8 +1,7 @@ > # $FreeBSD$ > > PORTNAME= photoflow >-DISTVERSION= 0.2.8-1260 >-PORTREVISION= 2 >+DISTVERSION= 0.2.8-1398 > CATEGORIES= graphics > > MAINTAINER= yuri@FreeBSD.org >@@ -11,7 +10,6 @@ > LICENSE= GPLv3 > LICENSE_FILE= ${WRKSRC}/LICENSE > >-BROKEN= no matching function for call to 'vips_image_get_blob' > BROKEN_i386= see https://github.com/aferrero2707/PhotoFlow/issues/192 > > LIB_DEPENDS= libexiv2.so:graphics/exiv2 \ >@@ -26,7 +24,7 @@ > USE_GITHUB= yes > GH_ACCOUNT= aferrero2707 > GH_PROJECT= PhotoFlow >-GH_TAGNAME= da84a071 >+GH_TAGNAME= d92c3989 > USE_GNOME= atkmm cairomm glib20 glibmm gtk20 gtkmm24 libsigc++20 pangomm > > CMAKE_OFF= BUNDLED_LENSFUN >Index: photoflow/distinfo >=================================================================== >--- photoflow/distinfo (revisione 517363) >+++ photoflow/distinfo (copia di lavoro) >@@ -1,6 +1,6 @@ >-TIMESTAMP = 1560191008 >-SHA256 (aferrero2707-PhotoFlow-0.2.8-1260-da84a071_GH0.tar.gz) = 6553848199f1a57f67e64c3414cdd61e74e497ef4476ea4d3df637f1e1304d32 >-SIZE (aferrero2707-PhotoFlow-0.2.8-1260-da84a071_GH0.tar.gz) = 10119031 >+TIMESTAMP = 1573631919 >+SHA256 (aferrero2707-PhotoFlow-0.2.8-1398-d92c3989_GH0.tar.gz) = 0cf5aa91d1e08ebcfe4db79c20750fdfa53fbb13142996b66db42682a6f16918 >+SIZE (aferrero2707-PhotoFlow-0.2.8-1398-d92c3989_GH0.tar.gz) = 11827728 > SHA256 (sobotka-filmic-blender-1.1.1_GH0.tar.gz) = 87efcadfac0edbcdd6e4612ff8451dee12e42699830d17505de0d8593788ee95 > SIZE (sobotka-filmic-blender-1.1.1_GH0.tar.gz) = 3071707 > SHA256 (imageworks-OpenColorIO-Configs-0bb079c08be410030669cbf5f19ff869b88af953_GH0.tar.gz) = 26dcda1bf6b871b74e67de8046eb78061f167e5d41c23cb151a120818feeb70d >Index: photoflow/files/patch-data_CMakeLists.txt >=================================================================== >--- photoflow/files/patch-data_CMakeLists.txt (revisione 517363) >+++ photoflow/files/patch-data_CMakeLists.txt (copia di lavoro) >@@ -1,6 +1,6 @@ >---- data/CMakeLists.txt.orig 2019-06-10 18:18:22 UTC >+--- data/CMakeLists.txt.orig 2019-11-10 21:19:31 UTC > +++ data/CMakeLists.txt >-@@ -9,30 +9,30 @@ install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/photoflow.de >+@@ -10,30 +10,30 @@ install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/photoflow.ap > if (OpenColorIO_FOUND) > include(ExternalProject) > >Index: photoflow/files/patch-src_CMakeLists.txt >=================================================================== >--- photoflow/files/patch-src_CMakeLists.txt (revisione 517363) >+++ photoflow/files/patch-src_CMakeLists.txt (copia di lavoro) >@@ -1,15 +1,15 @@ >---- src/CMakeLists.txt.orig 2019-06-07 16:05:32 UTC >+--- src/CMakeLists.txt.orig 2019-11-10 21:19:31 UTC > +++ src/CMakeLists.txt > @@ -5,7 +5,7 @@ ELSEIF(APPLE) > SET(GMIC_FLAGS "-march=nocona -mno-sse3 -mtune=generic -Dgmic_build -Dcimg_use_vt100 -Dcimg_use_fftw3 -Dcimg_use_tiff -Dcimg_use_zlib -Dcimg_display=0 -Dcimg_use_fftw3_singlethread -fpermissive") > #SET(GMIC_FLAGS "-Wno-error=c++11-narrowing -Dgmic_build -Dcimg_use_vt100 -Dcimg_use_fftw3 -Dcimg_use_tiff -Dcimg_use_zlib -Dcimg_display=0 -Dcimg_use_fftw3_singlethread -fpermissive") > ELSE(MINGW) >-- SET(GMIC_FLAGS "-std=gnu++11 -march=nocona -mno-sse3 -mtune=generic -Wno-error=narrowing -Dgmic_build -Dcimg_use_vt100 -Dgmic_is_parallel -Dcimg_use_fftw3 -Dcimg_use_tiff -Dcimg_use_zlib -Dcimg_display=0 -fno-ipa-sra -fpermissive") >-+ SET(GMIC_FLAGS "-std=gnu++11 -Wno-error=narrowing -Dgmic_build -Dcimg_use_vt100 -Dgmic_is_parallel -Dcimg_use_fftw3 -Dcimg_use_tiff -Dcimg_use_zlib -Dcimg_display=0 -fpermissive") >+- SET(GMIC_FLAGS "-std=gnu++14 -march=nocona -mno-sse3 -mtune=generic -Wno-error=narrowing -Dgmic_build -Dcimg_use_vt100 -Dgmic_is_parallel -Dcimg_use_fftw3 -Dcimg_use_tiff -Dcimg_use_zlib -Dcimg_display=0 -fno-ipa-sra -fpermissive") >++ SET(GMIC_FLAGS "-std=gnu++14 -Wno-error=narrowing -Dgmic_build -Dcimg_use_vt100 -Dgmic_is_parallel -Dcimg_use_fftw3 -Dcimg_use_tiff -Dcimg_use_zlib -Dcimg_display=0 -fpermissive") > ENDIF(MINGW) > > set(COMPILE_FLAGS " ${GMIC_FLAGS} -I${CMAKE_SOURCE_DIR}/src/dt -DLIBRAW_NODLL -DINSTALL_PREFIX='\"${INSTALL_PREFIX}\"' ") >-@@ -482,7 +482,7 @@ ENDIF(APPLE) >+@@ -542,7 +542,7 @@ ENDIF(APPLE) > # > # photoflow executable > # >Index: photoflow/files/patch-src_external_rawspeed_src_librawspeed_common_Mutex.h >=================================================================== >--- photoflow/files/patch-src_external_rawspeed_src_librawspeed_common_Mutex.h (revisione 517363) >+++ photoflow/files/patch-src_external_rawspeed_src_librawspeed_common_Mutex.h (nonexistent) >@@ -1,17 +0,0 @@ >---- src/external/rawspeed/src/librawspeed/common/Mutex.h.orig 2019-08-13 19:14:10 UTC >-+++ src/external/rawspeed/src/librawspeed/common/Mutex.h >-@@ -77,12 +77,12 @@ class CAPABILITY("mutex") Mutex final { (public) >- // Acquire/lock this mutex exclusively. Only one thread can have exclusive >- // access at any one time. Write operations to guarded data require an >- // exclusive lock. >-- void __attribute__((const)) Lock() const ACQUIRE() { >-+ void Lock() ACQUIRE() { >- // NOP, since there is no mutex. only here to still check for proper locking >- } >- >- // Release/unlock an exclusive mutex. >-- void __attribute__((const)) Unlock() const RELEASE() { >-+ void Unlock() RELEASE() { >- // NOP, since there is no mutex. only here to still check for proper locking >- } >- > >Property changes on: photoflow/files/patch-src_external_rawspeed_src_librawspeed_common_Mutex.h >___________________________________________________________________ >Deleted: fbsd:nokeywords >## -1 +0,0 ## >-yes >\ No newline at end of property >Deleted: svn:eol-style >## -1 +0,0 ## >-native >\ No newline at end of property >Deleted: svn:mime-type >## -1 +0,0 ## >-text/plain >\ No newline at end of property >Index: photoflow/pkg-plist >=================================================================== >--- photoflow/pkg-plist (revisione 517363) >+++ photoflow/pkg-plist (copia di lavoro) >@@ -12,6 +12,7 @@ > share/locale/de/LC_MESSAGES/photoflow.mo > share/locale/fr/LC_MESSAGES/photoflow.mo > share/locale/pl/LC_MESSAGES/photoflow.mo >+share/metainfo/photoflow.appdata.xml > %%DATADIR%%/gmic_def.gmic > %%DATADIR%%/gmic_film_cluts.gmz > %%DATADIR%%/help/en/clone_stamp.hlp
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Flags:
yuri
:
maintainer-approval+
Actions:
View
|
Diff
Attachments on
bug 241938
: 209125