FreeBSD Bugzilla – Attachment 222790 Details for
Bug 253531
devel/libcrossguid: Update to latest commit and switch to CMake
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
Remember
[x]
|
Forgot Password
Login:
[x]
[patch]
Patch for libcrossguid v4
0001-libcrossguid.patch (text/plain), 5.00 KB, created by
Daniel Engberg
on 2021-02-24 14:32:59 UTC
(
hide
)
Description:
Patch for libcrossguid v4
Filename:
MIME Type:
Creator:
Daniel Engberg
Created:
2021-02-24 14:32:59 UTC
Size:
5.00 KB
patch
obsolete
>From 9e3020c847a10e747b914e0bf6974234917c76a9 Mon Sep 17 00:00:00 2001 >From: Daniel Engberg <daniel.engberg.lists@pyret.net> >Date: Wed, 24 Feb 2021 15:30:34 +0100 >Subject: [PATCH] libcrossguid > >libcrossguid > >Signed-off-by: Daniel Engberg <daniel.engberg.lists@pyret.net> >--- > devel/libcrossguid/Makefile | 37 ++++--------------- > devel/libcrossguid/distinfo | 5 ++- > devel/libcrossguid/files/libcrossguid.pc.in | 9 ----- > devel/libcrossguid/files/patch-CMakeLists.txt | 20 ++++++++++ > devel/libcrossguid/pkg-plist | 9 +++++ > 5 files changed, 40 insertions(+), 40 deletions(-) > create mode 100644 devel/libcrossguid/files/patch-CMakeLists.txt > create mode 100644 devel/libcrossguid/pkg-plist > >diff --git a/devel/libcrossguid/Makefile b/devel/libcrossguid/Makefile >index 347c65274da6..ffbe36997fdd 100644 >--- a/devel/libcrossguid/Makefile >+++ b/devel/libcrossguid/Makefile >@@ -1,8 +1,10 @@ > # $FreeBSD$ > > PORTNAME= libcrossguid >-PORTVERSION= 20150803 >-PORTREVISION= 6 >+DISTVERSIONPREFIX= v >+DISTVERSION= 0.2.2-52 >+DISTVERSIONSUFFIX= -gca1bf4b >+PORTEPOCH= 1 > CATEGORIES= devel > > MAINTAINER= mickael.maillot@gmail.com >@@ -13,36 +15,13 @@ LICENSE_FILE= ${WRKSRC}/LICENSE > > LIB_DEPENDS= libuuid.so:misc/e2fsprogs-libuuid > >+USES= cmake compiler:c++11-lang pkgconfig >+USE_LDCONFIG= yes >+ > USE_GITHUB= yes > GH_ACCOUNT= graeme-hill > GH_PROJECT= crossguid >-GH_TAGNAME= 8f399e8 >- >-USES= compiler:c++11-lang pkgconfig >-USE_CXXSTD= c++11 >-CXXFLAGS+= `pkg-config --cflags uuid` >-USE_LDCONFIG= yes > >-PLIST_FILES= include/guid.h \ >- lib/libcrossguid.so \ >- lib/libcrossguid.so.0 \ >- libdata/pkgconfig/libcrossguid.pc >- >-post-patch: >- @${SED} -e 's|%PREFIX%|${PREFIX}|' -e 's|%VERSION%|${PORTVERSION}|' \ >- ${FILESDIR}/libcrossguid.pc.in > ${WRKDIR}/libcrossguid.pc >- >-do-build: >- cd ${WRKSRC} && ${CXX} ${CXXFLAGS} -shared -fPIC \ >- -Wl,-soname,libcrossguid.so.0 \ >- -DGUID_LIBUUID -L${LOCALBASE}/lib guid.cpp \ >- -o libcrossguid.so.0 -luuid >- >-do-install: >- ${INSTALL_DATA} ${WRKSRC}/guid.h ${STAGEDIR}${PREFIX}/include >- ${INSTALL_LIB} ${WRKSRC}/libcrossguid.so.0 ${STAGEDIR}${PREFIX}/lib >- ${INSTALL_DATA} ${WRKDIR}/libcrossguid.pc \ >- ${STAGEDIR}${PREFIX}/libdata/pkgconfig >- ${LN} -sf libcrossguid.so.0 ${STAGEDIR}${PREFIX}/lib/libcrossguid.so >+CMAKE_ON= BUILD_SHARED_LIBS > > .include <bsd.port.mk> >diff --git a/devel/libcrossguid/distinfo b/devel/libcrossguid/distinfo >index 67b60a85af45..1058fc84d332 100644 >--- a/devel/libcrossguid/distinfo >+++ b/devel/libcrossguid/distinfo >@@ -1,2 +1,3 @@ >-SHA256 (graeme-hill-crossguid-20150803-8f399e8_GH0.tar.gz) = 929397adfe57b945c5153e09f1e0bc1763300e2b30578ec7ed6facc2821d7f6f >-SIZE (graeme-hill-crossguid-20150803-8f399e8_GH0.tar.gz) = 46576 >+TIMESTAMP = 1613377127 >+SHA256 (graeme-hill-crossguid-v0.2.2-52-gca1bf4b_GH0.tar.gz) = 731eab92a5b916eb1195208eac448155e209f9634436c0e877cb32cadd71bdc3 >+SIZE (graeme-hill-crossguid-v0.2.2-52-gca1bf4b_GH0.tar.gz) = 141678 >diff --git a/devel/libcrossguid/files/libcrossguid.pc.in b/devel/libcrossguid/files/libcrossguid.pc.in >index 0c109c01c879..e69de29bb2d1 100644 >--- a/devel/libcrossguid/files/libcrossguid.pc.in >+++ b/devel/libcrossguid/files/libcrossguid.pc.in >@@ -1,9 +0,0 @@ >-prefix=%PREFIX% >-libdir=${prefix}/lib >-includedir=${prefix}/include >- >-Name: libguid >-Description: minimal and cross platform C++ GUID library >-Version: %VERSION% >-Libs: -L${libdir} -lcrossguid >-Cflags: -I${includedir} >diff --git a/devel/libcrossguid/files/patch-CMakeLists.txt b/devel/libcrossguid/files/patch-CMakeLists.txt >new file mode 100644 >index 000000000000..47de8e3d6fdc >--- /dev/null >+++ b/devel/libcrossguid/files/patch-CMakeLists.txt >@@ -0,0 +1,20 @@ >+--- CMakeLists.txt.orig 2019-05-29 15:36:34 UTC >++++ CMakeLists.txt >+@@ -64,7 +64,7 @@ if (${CMAKE_SOURCE_DIR} STREQUAL ${CMAKE_CURRENT_SOURC >+ set(CROSSGUID_ARCHIVE_INSTALL_DIR "${CMAKE_INSTALL_LIBDIR}") >+ set(CROSSGUID_FRAMEWORK_INSTALL_DIR "${CMAKE_INSTALL_LIBDIR}") >+ >+- set(CROSSGUID_CMAKE_CONFIG_INSTALL_DIR "${CMAKE_INSTALL_DATADIR}/crossguid/cmake") >++ set(CROSSGUID_CMAKE_CONFIG_INSTALL_DIR "${CMAKE_INSTALL_LIBDIR}/cmake/crossguid/") >+ set(CROSSGUID_ADDITIONAL_FILES_INSTALL_DIR "${CMAKE_INSTALL_DATADIR}/crossguid") >+ >+ # Install target >+@@ -75,7 +75,7 @@ if (${CMAKE_SOURCE_DIR} STREQUAL ${CMAKE_CURRENT_SOURC >+ FRAMEWORK DESTINATION ${CROSSGUID_FRAMEWORK_INSTALL_DIR}) >+ >+ # Install headers >+- install(DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/include/" >++ install(DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/include/crossguid/" >+ DESTINATION ${CROSSGUID_INC_INSTALL_DIR}) >+ >+ # Make cmake config files for all targets >diff --git a/devel/libcrossguid/pkg-plist b/devel/libcrossguid/pkg-plist >new file mode 100644 >index 000000000000..22cf856d9ff4 >--- /dev/null >+++ b/devel/libcrossguid/pkg-plist >@@ -0,0 +1,9 @@ >+include/guid.hpp >+lib/cmake/crossguid/crossguid-config-%%CMAKE_BUILD_TYPE%%.cmake >+lib/cmake/crossguid/crossguid-config.cmake >+lib/libcrossguid.so >+lib/libcrossguid.so.0 >+lib/libcrossguid.so.0.2.3 >+libdata/pkgconfig/crossguid.pc >+share/crossguid/LICENSE >+share/crossguid/README.md >-- >2.30.1 >
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
Actions:
View
|
Diff
Attachments on
bug 253531
:
222457
|
222458
|
222459
| 222790