* [gentoo-commits] repo/gentoo:master commit in: dev-cpp/cppgir/, dev-cpp/cppgir/files/
@ 2023-06-10 13:43 Sam James
0 siblings, 0 replies; 3+ messages in thread
From: Sam James @ 2023-06-10 13:43 UTC (permalink / raw
To: gentoo-commits
commit: 52eb1e640e74f856366ead8fffddf21c0c07073d
Author: Esteve Varela Colominas <esteve.varela <AT> gmail <DOT> com>
AuthorDate: Sat Jun 10 12:01:36 2023 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat Jun 10 13:43:29 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=52eb1e64
dev-cpp/cppgir: Add
New dependency for telegram-desktop
Signed-off-by: Esteve Varela Colominas <esteve.varela <AT> gmail.com>
Signed-off-by: Sam James <sam <AT> gentoo.org>
dev-cpp/cppgir/Manifest | 1 +
dev-cpp/cppgir/cppgir-0_p20230606.ebuild | 43 ++++++++++++++++++++++
.../cppgir-0_p20230606-fix-install-paths.patch | 13 +++++++
.../cppgir-0_p20230606-prevent-automagic.patch | 42 +++++++++++++++++++++
.../cppgir-0_p20230606-system-expected-lite.patch | 37 +++++++++++++++++++
dev-cpp/cppgir/metadata.xml | 16 ++++++++
6 files changed, 152 insertions(+)
diff --git a/dev-cpp/cppgir/Manifest b/dev-cpp/cppgir/Manifest
new file mode 100644
index 000000000000..74cef3ae99ab
--- /dev/null
+++ b/dev-cpp/cppgir/Manifest
@@ -0,0 +1 @@
+DIST cppgir-0_p20230606.tar.bz2 92576 BLAKE2B 47d43405eee8cebb782a3021e8398ce61ced23094424ced9f1bfaf390bfd83b7fa6e6fe5e0689886857cef3c992f9318de99d9e38362c2777a409cf597b55f7a SHA512 832c99379b0203db9b2cfefa530fc8f68411da5b0f121a37ab1b60dfa39e929a0d95971c4161a744dc5b3ddbb92848f1bbce9b265f9d4d5724084c08ab8fd4f4
diff --git a/dev-cpp/cppgir/cppgir-0_p20230606.ebuild b/dev-cpp/cppgir/cppgir-0_p20230606.ebuild
new file mode 100644
index 000000000000..14ebc607d6c0
--- /dev/null
+++ b/dev-cpp/cppgir/cppgir-0_p20230606.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake
+
+DESCRIPTION="GObject-Introspection C++ binding wrapper generator"
+HOMEPAGE="https://gitlab.com/mnauw/cppgir"
+
+MY_PV="960fe054ffaab7cf55722fea6094c56a8ee8f18e"
+SRC_URI="https://gitlab.com/mnauw/cppgir/-/archive/${MY_PV}/cppgir-${MY_PV}.tar.bz2 -> ${P}.tar.bz2"
+S="${WORKDIR}/${PN}-${MY_PV}"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="doc test"
+RESTRICT="!test? ( test )"
+
+DEPEND="
+ dev-cpp/expected-lite
+ dev-libs/boost:=
+ dev-libs/libfmt:=
+"
+BDEPEND="
+ doc? ( app-text/ronn-ng )
+"
+
+PATCHES=(
+ "${FILESDIR}/cppgir-0_p20230606-system-expected-lite.patch"
+ "${FILESDIR}/cppgir-0_p20230606-fix-install-paths.patch"
+ "${FILESDIR}/cppgir-0_p20230606-prevent-automagic.patch"
+)
+
+src_configure() {
+ local mycmakeargs=(
+ -DBUILD_DOC=$(usex doc)
+ -DBUILD_TESTING=$(usex test)
+ )
+
+ cmake_src_configure
+}
diff --git a/dev-cpp/cppgir/files/cppgir-0_p20230606-fix-install-paths.patch b/dev-cpp/cppgir/files/cppgir-0_p20230606-fix-install-paths.patch
new file mode 100644
index 000000000000..c27d1e9f29b0
--- /dev/null
+++ b/dev-cpp/cppgir/files/cppgir-0_p20230606-fix-install-paths.patch
@@ -0,0 +1,13 @@
+Install cmake targets in correct directory
+
+--- cppgir-960fe054ffaab7cf55722fea6094c56a8ee8f18e.orig/CMakeLists.txt
++++ cppgir-960fe054ffaab7cf55722fea6094c56a8ee8f18e/CMakeLists.txt
+@@ -259,7 +259,7 @@
+ DESTINATION ${GI_IGNORE_FILE_INSTALL_DIR})
+
+ # cmake EXPORTS
+-set(CONFIG_PACKAGE_LOCATION lib/cmake/${PROJECT_NAME})
++set(CONFIG_PACKAGE_LOCATION ${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME})
+ set(CONFIG_VERSION_NAME ${PROJECT_NAME}-config-version.cmake)
+ set(CONFIG_TARGETS_NAME ${PROJECT_NAME}-targets.cmake)
+ set(CONFIG_NAME ${PROJECT_NAME}-config.cmake)
diff --git a/dev-cpp/cppgir/files/cppgir-0_p20230606-prevent-automagic.patch b/dev-cpp/cppgir/files/cppgir-0_p20230606-prevent-automagic.patch
new file mode 100644
index 000000000000..8bb3ab5c4496
--- /dev/null
+++ b/dev-cpp/cppgir/files/cppgir-0_p20230606-prevent-automagic.patch
@@ -0,0 +1,42 @@
+Remove checks for libraries that are completely unnecessary
+
+--- cppgir-960fe054ffaab7cf55722fea6094c56a8ee8f18e.orig/CMakeLists.txt
++++ cppgir-960fe054ffaab7cf55722fea6094c56a8ee8f18e/CMakeLists.txt
+@@ -79,15 +79,14 @@
+ find_package(expected-lite REQUIRED)
+ target_link_libraries(gi PUBLIC expected-lite)
+
+-include(FindPkgConfig)
+-pkg_check_modules(GOBJECT gobject-2.0)
+-pkg_check_modules(GIO gio-2.0 gio-unix-2.0)
+-pkg_check_modules(GST gstreamer-1.0)
+-pkg_check_modules(GTK gtk+-3.0)
++if (BUILD_TESTING)
++ include(FindPkgConfig REQUIRED)
++ pkg_check_modules(GOBJECT gobject-2.0 REQUIRED)
++endif()
+
+ ## TEST ##
+
+-if (BUILD_TESTING AND GOBJECT_FOUND)
++if (BUILD_TESTING)
+ add_executable(gi-test test/main.cpp
+ test/test_object.c test/test_object.h test/test_boxed.c test/test_boxed.h)
+ target_include_directories(gi-test PRIVATE "gi" "override")
+@@ -113,7 +112,7 @@
+ set(EXAMPLE_TARGETS "")
+ set(EXAMPLE_NS "")
+
+-if (GOBJECT_FOUND)
++if (FALSE)
+ add_executable(example-gobject EXCLUDE_FROM_ALL examples/gobject.cpp)
+ target_compile_options(example-gobject PRIVATE ${GOBJECT_CFLAGS})
+ target_link_libraries(example-gobject PRIVATE ${GOBJECT_LDFLAGS})
+@@ -179,7 +178,6 @@
+ endif ()
+
+ # optional Qt example
+-find_package(Qt5Core 5.9)
+ if (Qt5Core_FOUND AND GIO_FOUND)
+ set(CMAKE_INCLUDE_CURRENT_DIR ON)
+ add_executable(example-gio-qt-async EXCLUDE_FROM_ALL examples/gio-qt-async.cpp)
diff --git a/dev-cpp/cppgir/files/cppgir-0_p20230606-system-expected-lite.patch b/dev-cpp/cppgir/files/cppgir-0_p20230606-system-expected-lite.patch
new file mode 100644
index 000000000000..096ed39dc03b
--- /dev/null
+++ b/dev-cpp/cppgir/files/cppgir-0_p20230606-system-expected-lite.patch
@@ -0,0 +1,37 @@
+Use system-wide copy of expected-lite
+
+--- cppgir-960fe054ffaab7cf55722fea6094c56a8ee8f18e.orig/CMakeLists.txt
++++ cppgir-960fe054ffaab7cf55722fea6094c56a8ee8f18e/CMakeLists.txt
+@@ -76,14 +76,8 @@
+ "$<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}/${PROJECT_NAME}/override>"
+ )
+
+-set(EXPECTED_LITE_INCLUDE "expected-lite/include")
+-if (EXISTS ${CMAKE_CURRENT_LIST_DIR}/${EXPECTED_LITE_INCLUDE}/nonstd/expected.hpp)
+- target_include_directories(gi INTERFACE
+- "$<BUILD_INTERFACE:${CMAKE_CURRENT_LIST_DIR}/${EXPECTED_LITE_INCLUDE}>"
+- )
+-else ()
+- message (FATAL_ERROR "missing submodule expected-lite")
+-endif ()
++find_package(expected-lite REQUIRED)
++target_link_libraries(gi INTERFACE nonstd::expected-lite)
+
+ include(FindPkgConfig)
+ pkg_check_modules(GOBJECT gobject-2.0)
+@@ -241,8 +235,6 @@
+ # headers
+ install(DIRECTORY gi override
+ DESTINATION ${CMAKE_INSTALL_FULL_INCLUDEDIR}/${PROJECT_NAME})
+-install(DIRECTORY ${EXPECTED_LITE_INCLUDE}/nonstd
+- DESTINATION ${CMAKE_INSTALL_FULL_INCLUDEDIR}/${PROJECT_NAME}/gi)
+
+ # doc
+ install(FILES README.md docs/cppgir.md
+--- cppgir-960fe054ffaab7cf55722fea6094c56a8ee8f18e.orig/cmake/cppgir-config.cmake
++++ cppgir-960fe054ffaab7cf55722fea6094c56a8ee8f18e/cmake/cppgir-config.cmake
+@@ -1 +1,4 @@
++include(CMakeFindDependencyMacro)
++find_dependency(expected-lite)
++
+ include("${CMAKE_CURRENT_LIST_DIR}/cppgir-targets.cmake")
diff --git a/dev-cpp/cppgir/metadata.xml b/dev-cpp/cppgir/metadata.xml
new file mode 100644
index 000000000000..8337d9d2c2da
--- /dev/null
+++ b/dev-cpp/cppgir/metadata.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="person" proxied="yes">
+ <email>esteve.varela@gmail.com</email>
+ <name>Esteve Varela Colominas</name>
+ </maintainer>
+ <maintainer type="project" proxied="proxy">
+ <email>proxy-maint@gentoo.org</email>
+ <name>Proxy Maintainers</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="gitlab">mnauw/cppgir</remote-id>
+ <bugs-to>https://gitlab.com/mnauw/cppgir/-/issues</bugs-to>
+ </upstream>
+</pkgmetadata>
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-cpp/cppgir/, dev-cpp/cppgir/files/
@ 2023-07-21 6:34 Joonas Niilola
0 siblings, 0 replies; 3+ messages in thread
From: Joonas Niilola @ 2023-07-21 6:34 UTC (permalink / raw
To: gentoo-commits
commit: ac31964c9686c5f79ba4104e7321f152072b2f71
Author: Esteve Varela Colominas <esteve.varela <AT> gmail <DOT> com>
AuthorDate: Thu Jun 29 13:02:08 2023 +0000
Commit: Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Fri Jul 21 06:31:31 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ac31964c
dev-cpp/cppgir: Drop old
Signed-off-by: Esteve Varela Colominas <esteve.varela <AT> gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/31536
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>
dev-cpp/cppgir/Manifest | 1 -
dev-cpp/cppgir/cppgir-0_p20230606.ebuild | 43 ----------------------
.../cppgir-0_p20230606-fix-install-paths.patch | 13 -------
.../cppgir-0_p20230606-prevent-automagic.patch | 42 ---------------------
.../cppgir-0_p20230606-system-expected-lite.patch | 37 -------------------
5 files changed, 136 deletions(-)
diff --git a/dev-cpp/cppgir/Manifest b/dev-cpp/cppgir/Manifest
index f9e084153296..0c1c029a1eda 100644
--- a/dev-cpp/cppgir/Manifest
+++ b/dev-cpp/cppgir/Manifest
@@ -1,2 +1 @@
-DIST cppgir-0_p20230606.tar.bz2 92576 BLAKE2B 47d43405eee8cebb782a3021e8398ce61ced23094424ced9f1bfaf390bfd83b7fa6e6fe5e0689886857cef3c992f9318de99d9e38362c2777a409cf597b55f7a SHA512 832c99379b0203db9b2cfefa530fc8f68411da5b0f121a37ab1b60dfa39e929a0d95971c4161a744dc5b3ddbb92848f1bbce9b265f9d4d5724084c08ab8fd4f4
DIST cppgir-0_p20230625.tar.bz2 93259 BLAKE2B 7593ed17391d40ba69c2915a6f3750ac5a0596977a1ddf61aad2db40e61b967ec8b4a9f6f11b22a2f15660344358b2f4cfd2f46aa50d565163b0508ac411d974 SHA512 9167650ff6d22b2da7c824c91b864a104950ed44156c4fdd222abef3261b7ae9639dbafaca4ad3c175da7707bbf221ef166778c4227bb395149b804e74d91693
diff --git a/dev-cpp/cppgir/cppgir-0_p20230606.ebuild b/dev-cpp/cppgir/cppgir-0_p20230606.ebuild
deleted file mode 100644
index 67237396897c..000000000000
--- a/dev-cpp/cppgir/cppgir-0_p20230606.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake
-
-DESCRIPTION="GObject-Introspection C++ binding wrapper generator"
-HOMEPAGE="https://gitlab.com/mnauw/cppgir"
-
-MY_PV="960fe054ffaab7cf55722fea6094c56a8ee8f18e"
-SRC_URI="https://gitlab.com/mnauw/cppgir/-/archive/${MY_PV}/cppgir-${MY_PV}.tar.bz2 -> ${P}.tar.bz2"
-S="${WORKDIR}/${PN}-${MY_PV}"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~riscv"
-IUSE="doc test"
-RESTRICT="!test? ( test )"
-
-DEPEND="
- dev-cpp/expected-lite
- dev-libs/boost:=
- dev-libs/libfmt:=
-"
-BDEPEND="
- doc? ( app-text/ronn-ng )
-"
-
-PATCHES=(
- "${FILESDIR}/cppgir-0_p20230606-system-expected-lite.patch"
- "${FILESDIR}/cppgir-0_p20230606-fix-install-paths.patch"
- "${FILESDIR}/cppgir-0_p20230606-prevent-automagic.patch"
-)
-
-src_configure() {
- local mycmakeargs=(
- -DBUILD_DOC=$(usex doc)
- -DBUILD_TESTING=$(usex test)
- )
-
- cmake_src_configure
-}
diff --git a/dev-cpp/cppgir/files/cppgir-0_p20230606-fix-install-paths.patch b/dev-cpp/cppgir/files/cppgir-0_p20230606-fix-install-paths.patch
deleted file mode 100644
index c27d1e9f29b0..000000000000
--- a/dev-cpp/cppgir/files/cppgir-0_p20230606-fix-install-paths.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Install cmake targets in correct directory
-
---- cppgir-960fe054ffaab7cf55722fea6094c56a8ee8f18e.orig/CMakeLists.txt
-+++ cppgir-960fe054ffaab7cf55722fea6094c56a8ee8f18e/CMakeLists.txt
-@@ -259,7 +259,7 @@
- DESTINATION ${GI_IGNORE_FILE_INSTALL_DIR})
-
- # cmake EXPORTS
--set(CONFIG_PACKAGE_LOCATION lib/cmake/${PROJECT_NAME})
-+set(CONFIG_PACKAGE_LOCATION ${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME})
- set(CONFIG_VERSION_NAME ${PROJECT_NAME}-config-version.cmake)
- set(CONFIG_TARGETS_NAME ${PROJECT_NAME}-targets.cmake)
- set(CONFIG_NAME ${PROJECT_NAME}-config.cmake)
diff --git a/dev-cpp/cppgir/files/cppgir-0_p20230606-prevent-automagic.patch b/dev-cpp/cppgir/files/cppgir-0_p20230606-prevent-automagic.patch
deleted file mode 100644
index 8bb3ab5c4496..000000000000
--- a/dev-cpp/cppgir/files/cppgir-0_p20230606-prevent-automagic.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-Remove checks for libraries that are completely unnecessary
-
---- cppgir-960fe054ffaab7cf55722fea6094c56a8ee8f18e.orig/CMakeLists.txt
-+++ cppgir-960fe054ffaab7cf55722fea6094c56a8ee8f18e/CMakeLists.txt
-@@ -79,15 +79,14 @@
- find_package(expected-lite REQUIRED)
- target_link_libraries(gi PUBLIC expected-lite)
-
--include(FindPkgConfig)
--pkg_check_modules(GOBJECT gobject-2.0)
--pkg_check_modules(GIO gio-2.0 gio-unix-2.0)
--pkg_check_modules(GST gstreamer-1.0)
--pkg_check_modules(GTK gtk+-3.0)
-+if (BUILD_TESTING)
-+ include(FindPkgConfig REQUIRED)
-+ pkg_check_modules(GOBJECT gobject-2.0 REQUIRED)
-+endif()
-
- ## TEST ##
-
--if (BUILD_TESTING AND GOBJECT_FOUND)
-+if (BUILD_TESTING)
- add_executable(gi-test test/main.cpp
- test/test_object.c test/test_object.h test/test_boxed.c test/test_boxed.h)
- target_include_directories(gi-test PRIVATE "gi" "override")
-@@ -113,7 +112,7 @@
- set(EXAMPLE_TARGETS "")
- set(EXAMPLE_NS "")
-
--if (GOBJECT_FOUND)
-+if (FALSE)
- add_executable(example-gobject EXCLUDE_FROM_ALL examples/gobject.cpp)
- target_compile_options(example-gobject PRIVATE ${GOBJECT_CFLAGS})
- target_link_libraries(example-gobject PRIVATE ${GOBJECT_LDFLAGS})
-@@ -179,7 +178,6 @@
- endif ()
-
- # optional Qt example
--find_package(Qt5Core 5.9)
- if (Qt5Core_FOUND AND GIO_FOUND)
- set(CMAKE_INCLUDE_CURRENT_DIR ON)
- add_executable(example-gio-qt-async EXCLUDE_FROM_ALL examples/gio-qt-async.cpp)
diff --git a/dev-cpp/cppgir/files/cppgir-0_p20230606-system-expected-lite.patch b/dev-cpp/cppgir/files/cppgir-0_p20230606-system-expected-lite.patch
deleted file mode 100644
index 096ed39dc03b..000000000000
--- a/dev-cpp/cppgir/files/cppgir-0_p20230606-system-expected-lite.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-Use system-wide copy of expected-lite
-
---- cppgir-960fe054ffaab7cf55722fea6094c56a8ee8f18e.orig/CMakeLists.txt
-+++ cppgir-960fe054ffaab7cf55722fea6094c56a8ee8f18e/CMakeLists.txt
-@@ -76,14 +76,8 @@
- "$<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}/${PROJECT_NAME}/override>"
- )
-
--set(EXPECTED_LITE_INCLUDE "expected-lite/include")
--if (EXISTS ${CMAKE_CURRENT_LIST_DIR}/${EXPECTED_LITE_INCLUDE}/nonstd/expected.hpp)
-- target_include_directories(gi INTERFACE
-- "$<BUILD_INTERFACE:${CMAKE_CURRENT_LIST_DIR}/${EXPECTED_LITE_INCLUDE}>"
-- )
--else ()
-- message (FATAL_ERROR "missing submodule expected-lite")
--endif ()
-+find_package(expected-lite REQUIRED)
-+target_link_libraries(gi INTERFACE nonstd::expected-lite)
-
- include(FindPkgConfig)
- pkg_check_modules(GOBJECT gobject-2.0)
-@@ -241,8 +235,6 @@
- # headers
- install(DIRECTORY gi override
- DESTINATION ${CMAKE_INSTALL_FULL_INCLUDEDIR}/${PROJECT_NAME})
--install(DIRECTORY ${EXPECTED_LITE_INCLUDE}/nonstd
-- DESTINATION ${CMAKE_INSTALL_FULL_INCLUDEDIR}/${PROJECT_NAME}/gi)
-
- # doc
- install(FILES README.md docs/cppgir.md
---- cppgir-960fe054ffaab7cf55722fea6094c56a8ee8f18e.orig/cmake/cppgir-config.cmake
-+++ cppgir-960fe054ffaab7cf55722fea6094c56a8ee8f18e/cmake/cppgir-config.cmake
-@@ -1 +1,4 @@
-+include(CMakeFindDependencyMacro)
-+find_dependency(expected-lite)
-+
- include("${CMAKE_CURRENT_LIST_DIR}/cppgir-targets.cmake")
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-cpp/cppgir/, dev-cpp/cppgir/files/
@ 2023-07-21 6:34 Joonas Niilola
0 siblings, 0 replies; 3+ messages in thread
From: Joonas Niilola @ 2023-07-21 6:34 UTC (permalink / raw
To: gentoo-commits
commit: 1d9d862a0d6c3432fb976c665077a36ce453a789
Author: Esteve Varela Colominas <esteve.varela <AT> gmail <DOT> com>
AuthorDate: Thu Jun 29 13:00:37 2023 +0000
Commit: Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Fri Jul 21 06:31:31 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1d9d862a
dev-cpp/cppgir: Bump to 0_p20230625
Upstreamed most patches, fixed libcxx 16
Closes: https://bugs.gentoo.org/909316
Thanks-to: James McGeehan IV <jfmfour22 <AT> gmail.com>
Thanks-to: Carlos <carana2099 <AT> gmail.com>
Signed-off-by: Esteve Varela Colominas <esteve.varela <AT> gmail.com>
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>
dev-cpp/cppgir/Manifest | 1 +
dev-cpp/cppgir/cppgir-0_p20230625.ebuild | 48 +++++++++++++++++++
.../files/cppgir-0_p20230625-fix-libcxx-16.patch | 54 ++++++++++++++++++++++
3 files changed, 103 insertions(+)
diff --git a/dev-cpp/cppgir/Manifest b/dev-cpp/cppgir/Manifest
index 74cef3ae99ab..f9e084153296 100644
--- a/dev-cpp/cppgir/Manifest
+++ b/dev-cpp/cppgir/Manifest
@@ -1 +1,2 @@
DIST cppgir-0_p20230606.tar.bz2 92576 BLAKE2B 47d43405eee8cebb782a3021e8398ce61ced23094424ced9f1bfaf390bfd83b7fa6e6fe5e0689886857cef3c992f9318de99d9e38362c2777a409cf597b55f7a SHA512 832c99379b0203db9b2cfefa530fc8f68411da5b0f121a37ab1b60dfa39e929a0d95971c4161a744dc5b3ddbb92848f1bbce9b265f9d4d5724084c08ab8fd4f4
+DIST cppgir-0_p20230625.tar.bz2 93259 BLAKE2B 7593ed17391d40ba69c2915a6f3750ac5a0596977a1ddf61aad2db40e61b967ec8b4a9f6f11b22a2f15660344358b2f4cfd2f46aa50d565163b0508ac411d974 SHA512 9167650ff6d22b2da7c824c91b864a104950ed44156c4fdd222abef3261b7ae9639dbafaca4ad3c175da7707bbf221ef166778c4227bb395149b804e74d91693
diff --git a/dev-cpp/cppgir/cppgir-0_p20230625.ebuild b/dev-cpp/cppgir/cppgir-0_p20230625.ebuild
new file mode 100644
index 000000000000..b0d3d462afe7
--- /dev/null
+++ b/dev-cpp/cppgir/cppgir-0_p20230625.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake flag-o-matic
+
+DESCRIPTION="GObject-Introspection C++ binding wrapper generator"
+HOMEPAGE="https://gitlab.com/mnauw/cppgir"
+
+MY_PV="70b0e3d522cec60316d116dcbd919b797e85685a"
+SRC_URI="https://gitlab.com/mnauw/cppgir/-/archive/${MY_PV}/cppgir-${MY_PV}.tar.bz2 -> ${P}.tar.bz2"
+S="${WORKDIR}/${PN}-${MY_PV}"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~riscv"
+IUSE="doc test"
+RESTRICT="!test? ( test )"
+
+DEPEND="
+ dev-cpp/expected-lite
+ dev-libs/boost:=
+ dev-libs/libfmt:=
+"
+BDEPEND="
+ doc? ( app-text/ronn-ng )
+ test? ( dev-libs/glib )
+"
+
+PATCHES=(
+ "${FILESDIR}/cppgir-0_p20230625-fix-libcxx-16.patch"
+)
+
+src_configure() {
+ local mycmakeargs=(
+ -DBUILD_DOC=$(usex doc)
+ -DBUILD_TESTING=$(usex test)
+ -DBUILD_EXAMPLES=no
+ -DINTERNAL_EXPECTED=no
+ )
+
+ append-cppflags \
+ -UDEFAULT_GIRPATH \
+ -DDEFAULT_GIRPATH="${EPREFIX}/usr/share:${EPREFIX}/usr/local/share"
+
+ cmake_src_configure
+}
diff --git a/dev-cpp/cppgir/files/cppgir-0_p20230625-fix-libcxx-16.patch b/dev-cpp/cppgir/files/cppgir-0_p20230625-fix-libcxx-16.patch
new file mode 100644
index 000000000000..6ca80e05594b
--- /dev/null
+++ b/dev-cpp/cppgir/files/cppgir-0_p20230625-fix-libcxx-16.patch
@@ -0,0 +1,54 @@
+Fix building with libcxx-16
+
+https://bugs.gentoo.org/909316
+https://gitlab.com/mnauw/cppgir/-/issues/41
+
+--- cppgir-70b0e3d522cec60316d116dcbd919b797e85685a.orig/CMakeLists.txt
++++ cppgir-70b0e3d522cec60316d116dcbd919b797e85685a/CMakeLists.txt
+@@ -65,8 +65,8 @@
+ -DDEFAULT_GIRPATH=${GI_DEFAULT_GIRPATH})
+ target_compile_definitions(cppgir PRIVATE
+ -DDEFAULT_IGNORE_FILE=${GI_IGNORE_FILE_INSTALL_DIR}/${GI_IGNORE_FILE}:${GI_IGNORE_FILE_INSTALL_DIR}/${GI_IGNORE_FILE_PLATFORM})
+-target_link_libraries(cppgir Boost::program_options stdc++fs ${FORMAT_LIBRARIES})
+-set_property(TARGET cppgir PROPERTY CXX_STANDARD 14)
++target_link_libraries(cppgir Boost::program_options ${FORMAT_LIBRARIES})
++set_property(TARGET cppgir PROPERTY CXX_STANDARD 17)
+
+ add_library(gi INTERFACE)
+ target_include_directories(gi INTERFACE
+--- cppgir-70b0e3d522cec60316d116dcbd919b797e85685a.orig/tools/cppgir.cpp
++++ cppgir-70b0e3d522cec60316d116dcbd919b797e85685a/tools/cppgir.cpp
+@@ -3,8 +3,8 @@
+ #include "genns.hpp"
+ #include "repository.hpp"
+
+-#include <experimental/filesystem>
+-namespace fs = std::experimental::filesystem;
++#include <filesystem>
++namespace fs = std::filesystem;
+
+ #include <boost/algorithm/string/classification.hpp>
+ #include <boost/algorithm/string/split.hpp>
+--- cppgir-70b0e3d522cec60316d116dcbd919b797e85685a.orig/tools/genbase.hpp
++++ cppgir-70b0e3d522cec60316d116dcbd919b797e85685a/tools/genbase.hpp
+@@ -6,6 +6,7 @@
+ #include "repository.hpp"
+
+ #include <set>
++#include <map>
+
+ struct GeneratorOptions
+ {
+--- cppgir-70b0e3d522cec60316d116dcbd919b797e85685a.orig/tools/genns.cpp
++++ cppgir-70b0e3d522cec60316d116dcbd919b797e85685a/tools/genns.cpp
+@@ -5,8 +5,8 @@
+ #include <boost/algorithm/string/join.hpp>
+ #include <boost/format.hpp>
+
+-#include <experimental/filesystem>
+-namespace fs = std::experimental::filesystem;
++#include <filesystem>
++namespace fs = std::filesystem;
+
+ #include <boost/property_tree/xml_parser.hpp>
+
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2023-07-21 6:34 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2023-07-21 6:34 [gentoo-commits] repo/gentoo:master commit in: dev-cpp/cppgir/, dev-cpp/cppgir/files/ Joonas Niilola
-- strict thread matches above, loose matches on Subject: below --
2023-07-21 6:34 Joonas Niilola
2023-06-10 13:43 Sam James
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox