Attachment 202269 Details for Bug 235943 – patch

[patch] patch

exiv2.diff (text/plain), 6.01 KB, created by Kurt Jaeger on 2019-02-22 18:24:18 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Kurt Jaeger

Created: 2019-02-22 18:24:18 UTC

Size: 6.01 KB

patch

obsolete

>Index: Makefile
>===================================================================
>--- Makefile	(revision 493543)
>+++ Makefile	(working copy)
>@@ -2,9 +2,8 @@
> # $FreeBSD$
> 
> PORTNAME=	exiv2
>-DISTVERSION=	0.26
>-PORTREVISION=	1
>-DISTVERSIONSUFFIX=	-trunk
>+DISTVERSION=	0.27.0
>+DISTVERSIONSUFFIX=	a-Source
> PORTEPOCH=	1
> CATEGORIES=	graphics
> MASTER_SITES=	http://www.exiv2.org/builds/
>@@ -29,6 +28,6 @@
> 
> PATHFIX_CMAKELISTSTXT=	CMakeChecks.txt
> 
>-WRKSRC=		${WRKDIR}/${PORTNAME}-trunk
>+WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}-Source
> 
> .include <bsd.port.mk>
>Index: distinfo
>===================================================================
>--- distinfo	(revision 493543)
>+++ distinfo	(working copy)
>@@ -1,3 +1,3 @@
>-TIMESTAMP = 1523892704
>-SHA256 (exiv2-0.26-trunk.tar.gz) = c75e3c4a0811bf700d92c82319373b7a825a2331c12b8b37d41eb58e4f18eafb
>-SIZE (exiv2-0.26-trunk.tar.gz) = 5677925
>+TIMESTAMP = 1550859075
>+SHA256 (exiv2-0.27.0a-Source.tar.gz) = a4adfa7aaf295b0383adead476f8e0493b9d6c6c7570d5884d2ebf8a2871902f
>+SIZE (exiv2-0.27.0a-Source.tar.gz) = 27168207
>Index: files/patch-src_CMakeLists.txt
>===================================================================
>--- files/patch-src_CMakeLists.txt	(revision 493543)
>+++ files/patch-src_CMakeLists.txt	(nonexistent)
>@@ -1,22 +0,0 @@
>-FreeBSD does hat have -ldl. 
>- 
>-Instead of unconditionally passing 'dl' to the linker, use cmakes 'CMAKE_DL_LIBS' [1] 
>-which handles that properly on all systems.
>-
>-[1] https://cmake.org/cmake/help/v3.6/variable/CMAKE_DL_LIBS.html
>-
>---- src/CMakeLists.txt.orig        2017-03-27 09:04:12 UTC
>-+++ src/CMakeLists.txt
>-@@ -265,9 +265,9 @@ if ( MSVC )
>-     TARGET_LINK_LIBRARIES( exiv2lib ${PRIVATE_VAR} ${SSH_LIBRARIES} )
>- else()
>-     if ( UNIX AND NOT FREEBSD )
>--        TARGET_LINK_LIBRARIES( exiv2lib ${PRIVATE_VAR} dl ${EXPAT_LIBRARIES} )
>--        TARGET_LINK_LIBRARIES( exiv2lib ${PRIVATE_VAR} dl ${CURL_LIBRARIES} )
>--        TARGET_LINK_LIBRARIES( exiv2lib ${PRIVATE_VAR} dl ${SSH_LIBRARIES} )
>-+        TARGET_LINK_LIBRARIES( exiv2lib ${PRIVATE_VAR} ${CMAKE_DL_LIBS} ${EXPAT_LIBRARIES} )
>-+        TARGET_LINK_LIBRARIES( exiv2lib ${PRIVATE_VAR} ${CMAKE_DL_LIBS} ${CURL_LIBRARIES} )
>-+        TARGET_LINK_LIBRARIES( exiv2lib ${PRIVATE_VAR} ${CMAKE_DL_LIBS} ${SSH_LIBRARIES} )
>-     else()
>-         TARGET_LINK_LIBRARIES( exiv2lib ${PRIVATE_VAR} ${EXPAT_LIBRARIES} )
>-         TARGET_LINK_LIBRARIES( exiv2lib ${PRIVATE_VAR} ${CURL_LIBRARIES} )
>
>Property changes on: files/patch-src_CMakeLists.txt
>___________________________________________________________________
>Deleted: fbsd:nokeywords
>## -1,2 +0,0 ##
>-yes
>-\ No newline at end of property
>\ 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: files/patch-src_actions.cpp
>===================================================================
>--- files/patch-src_actions.cpp	(revision 493543)
>+++ files/patch-src_actions.cpp	(nonexistent)
>@@ -1,16 +0,0 @@
>-FreeBSD does not know either 
>-* PTHREAD_RECURSIVE_MUTEX_INITIALIZER nor 
>-* PTHREAD_RECUSRIVE_MUTEX_INITIALIZER_NP
>-
>-
>---- src/actions.cpp.orig        2017-03-08 20:42:28 UTC
>-+++ src/actions.cpp
>-@@ -2048,6 +2048,8 @@ namespace {
>-  #if defined(__APPLE__)
>-   /* This is the critical section object (statically allocated). */
>-   static pthread_mutex_t cs =  PTHREAD_RECURSIVE_MUTEX_INITIALIZER;
>-+ #elif defined(__FreeBSD__)
>-+  static pthread_mutex_t cs =  PTHREAD_MUTEX_INITIALIZER;
>-  #else
>-   static pthread_mutex_t cs =  PTHREAD_RECURSIVE_MUTEX_INITIALIZER_NP;
>-  #endif
>
>Property changes on: files/patch-src_actions.cpp
>___________________________________________________________________
>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: pkg-plist
>===================================================================
>--- pkg-plist	(revision 493543)
>+++ pkg-plist	(working copy)
>@@ -1,4 +1,42 @@
> bin/exiv2
>+bin/addmoddel
>+bin/convert-test
>+bin/easyaccess-test
>+bin/exifcomment
>+bin/exifdata
>+bin/exifdata-test
>+bin/exifprint
>+bin/exifvalue
>+bin/exiv2json
>+bin/geotag
>+bin/ini-test
>+bin/iotest
>+bin/iptceasy
>+bin/iptcprint
>+bin/iptctest
>+bin/key-test
>+bin/largeiptc-test
>+bin/metacopy
>+bin/mmap-test
>+bin/mrwthumb
>+bin/path-test
>+bin/prevtest
>+bin/stringto-test
>+bin/taglist
>+bin/tiff-test
>+bin/werror-test
>+bin/write-test
>+bin/write2-test
>+bin/xmpdump
>+bin/xmpparse
>+bin/xmpparser-test
>+bin/xmpprint
>+bin/xmpsample
>+include/exiv2/bigtiffimage.hpp
>+include/exiv2/exiv2lib_export.h
>+include/exiv2/slice.hpp
>+include/exiv2/ssh.hpp
>+include/exiv2/xmp_exiv2.hpp
> include/exiv2/asfvideo.hpp
> include/exiv2/basicio.hpp
> include/exiv2/bmpimage.hpp
>@@ -35,7 +73,6 @@
> include/exiv2/riffvideo.hpp
> include/exiv2/rw2image.hpp
> include/exiv2/rwlock.hpp
>-include/exiv2/svn_version.h
> include/exiv2/tags.hpp
> include/exiv2/tgaimage.hpp
> include/exiv2/tiffimage.hpp
>@@ -44,26 +81,13 @@
> include/exiv2/value.hpp
> include/exiv2/version.hpp
> include/exiv2/webpimage.hpp
>-include/exiv2/xmp.hpp
> include/exiv2/xmpsidecar.hpp
> lib/libexiv2.so
>-lib/libexiv2.so.26
>-lib/libexiv2.so.26.0.0
>-libdata/pkgconfig/exiv2.lsm
>+lib/libexiv2.so.0.27.0
>+lib/libexiv2.so.27
>+lib/libxmp.a
> libdata/pkgconfig/exiv2.pc
> man/man1/exiv2.1.gz
>-share/locale/bs/LC_MESSAGES/exiv2.mo
>-share/locale/de/LC_MESSAGES/exiv2.mo
>-share/locale/es/LC_MESSAGES/exiv2.mo
>-share/locale/fi/LC_MESSAGES/exiv2.mo
>-share/locale/fr/LC_MESSAGES/exiv2.mo
>-share/locale/gl/LC_MESSAGES/exiv2.mo
>-share/locale/ms/LC_MESSAGES/exiv2.mo
>-share/locale/pl/LC_MESSAGES/exiv2.mo
>-share/locale/pt/LC_MESSAGES/exiv2.mo
>-share/locale/ru/LC_MESSAGES/exiv2.mo
>-share/locale/sk/LC_MESSAGES/exiv2.mo
>-share/locale/sv/LC_MESSAGES/exiv2.mo
>-share/locale/ug/LC_MESSAGES/exiv2.mo
>-share/locale/uk/LC_MESSAGES/exiv2.mo
>-share/locale/vi/LC_MESSAGES/exiv2.mo
>+man/man1/exiv2samples.1.gz
>+%%DATADIR%%/cmake/exiv2Config-%%CMAKE_BUILD_TYPE%%.cmake
>+%%DATADIR%%/cmake/exiv2Config.cmake

Actions: View | Diff

Attachments on bug 235943: 202269 | 202334 | 202335