pkgsrc-WIP-changes archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

Bear: update to 3.2.1.



Module Name:	pkgsrc-wip
Committed By:	Thomas Klausner <wiz%gatalith.at@localhost>
Pushed By:	wiz
Date:		Sat Jun 17 01:10:42 2023 +0200
Changeset:	3b394ee84e967351725761afce43fc4a5ee71604

Modified Files:
	Bear/Makefile
	Bear/distinfo
Added Files:
	Bear/TODO
	Bear/patches/patch-source_CMakeLists.txt

Log Message:
Bear: update to 3.2.1.

Doesn't install, see TODO

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=3b394ee84e967351725761afce43fc4a5ee71604

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 Bear/Makefile                            | 20 ++++++++++++--------
 Bear/TODO                                | 23 +++++++++++++++++++++++
 Bear/distinfo                            |  7 ++++---
 Bear/patches/patch-source_CMakeLists.txt | 16 ++++++++++++++++
 4 files changed, 55 insertions(+), 11 deletions(-)

diffs:
diff --git a/Bear/Makefile b/Bear/Makefile
index 728962e574..ebf23f4ab8 100644
--- a/Bear/Makefile
+++ b/Bear/Makefile
@@ -1,22 +1,19 @@
 # $NetBSD: Makefile,v 1.8 2015/09/07 19:16:42 jonthn Exp $
 
-DISTNAME=	Bear-2.1.1
+DISTNAME=	Bear-3.1.2
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_GITHUB:=rizsotto/}
-GITHUB_PROJECT=	Bear
 
+MAINTAINER=	pkgsrc-users%NetBSD.org@localhost
 HOMEPAGE=	https://github.com/rizsotto/Bear
-COMMENT=	Bear is a tool to generate compilation database
+COMMENT=	Tool to generate compilation database
 LICENSE=	gnu-gpl-v3
 
 USE_LANGUAGES=	c c++
 USE_CMAKE=	yes
-USE_TOOLS+=	gmake
+USE_TOOLS+=	pkg-config
 
-SUBST_CLASSES+=			py_interpreter
-SUBST_STAGE.py_interpreter=	post-extract
-SUBST_FILES.py_interpreter+=	bear/main.py.in
-SUBST_SED.py_interpreter=	-e "s,/usr/bin/env python,${PYTHONBIN},g"
+PYTHON_VERSIONS_INCOMPATIBLE=	27
 
 .include "../../mk/bsd.prefs.mk"
 
@@ -26,5 +23,12 @@ PLIST_SUBST+=	LIBEXT=dylib
 PLIST_SUBST+=	LIBEXT=so
 .endif
 
+.include "../../devel/googletest/buildlink3.mk"
+.include "../../devel/spdlog/buildlink3.mk"
+.include "../../devel/protobuf/buildlink3.mk"
 .include "../../lang/python/application.mk"
+.include "../../net/grpc/buildlink3.mk"
+.include "../../security/openssl/buildlink3.mk"
+.include "../../textproc/nlohmann-json/buildlink3.mk"
+.include "../../textproc/fmtlib/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/Bear/TODO b/Bear/TODO
new file mode 100644
index 0000000000..4cddca25fe
--- /dev/null
+++ b/Bear/TODO
@@ -0,0 +1,23 @@
+Doesn't install:
+-- Installing: /scratch/wip/Bear/work/Bear-3.1.2/stage/lib/bear/wrapper
+CMake Error at intercept/cmake_install.cmake:54 (file):
+  file RPATH_CHANGE could not write new RPATH:
+
+    
+
+  to the file:
+
+    /scratch/wip/Bear/work/Bear-3.1.2/stage/lib/bear/wrapper
+
+  The current RPATH is:
+
+    /usr/pkg/lib
+
+  which does not contain:
+
+    /usr/pkg/lib:
+
+  as was expected.
+Call Stack (most recent call first):
+  cmake_install.cmake:47 (include)
+
diff --git a/Bear/distinfo b/Bear/distinfo
index f542b7fd60..cdd9aa828d 100644
--- a/Bear/distinfo
+++ b/Bear/distinfo
@@ -1,5 +1,6 @@
 $NetBSD: distinfo,v 1.6 2015/09/07 19:16:42 jonthn Exp $
 
-RMD160 (Bear-2.1.1.tar.gz) = 5ac215afb799d8f3b63a4d789b2e0fcd96e54e13
-SHA512 (Bear-2.1.1.tar.gz) = aae661c45e60e266d312180419b26014a89912fbdb8cb84635c07b39729f472c14e478ca4db8f22f950a0d5b2c8bac3f3b40edfbfeeee56ef69b47ef22333587
-Size (Bear-2.1.1.tar.gz) = 33300 bytes
+BLAKE2s (Bear-3.1.2.tar.gz) = 5b2f20da0181e36eb4da21357eaf27be5d8495c00f9f8d28407c91781806de58
+SHA512 (Bear-3.1.2.tar.gz) = 02701e8a53b9d776ca838248f5b5d149d7ded6e024ce65bd1ca3b440ab1bf95691dc3d36bb28f043ce24bc1da6e666fb022ff92fa9df7c3142451742de16ca3e
+Size (Bear-3.1.2.tar.gz) = 127197 bytes
+SHA1 (patch-source_CMakeLists.txt) = 9bd99dff24d1a9a3221f79578af32637bab8cf7f
diff --git a/Bear/patches/patch-source_CMakeLists.txt b/Bear/patches/patch-source_CMakeLists.txt
new file mode 100644
index 0000000000..a79c555e9f
--- /dev/null
+++ b/Bear/patches/patch-source_CMakeLists.txt
@@ -0,0 +1,16 @@
+$NetBSD$
+
+fmtlib 10 compatibility
+https://github.com/rizsotto/Bear/pull/526/commits/937e2ee644cab81ac710740f62caec7ce1366a5c
+
+--- source/CMakeLists.txt.orig	2023-04-21 12:49:25.000000000 +0000
++++ source/CMakeLists.txt
+@@ -29,7 +29,7 @@ find_package(spdlog REQUIRED)
+ find_package(PkgConfig REQUIRED)
+ pkg_check_modules(gRPC REQUIRED IMPORTED_TARGET protobuf grpc++)
+ 
+-if (fmt_VERSION_MAJOR EQUAL 9)
++if (fmt_VERSION_MAJOR GREATER_EQUAL 9)
+     set(FMT_NEEDS_OSTREAM_FORMATTER 1)
+     set(HAVE_FMT_STD_H 1) # FIXME: this should be done with `check_include_file`
+ endif ()


Home | Main Index | Thread Index | Old Index