* Re: [PR PATCH] [Updated] New package: nwg-launchers-0.2.0.
2020-07-15 17:18 [PR PATCH] New package: nwg-launchers-0.2.0 ericonr
@ 2020-07-15 17:20 ` ericonr
2020-07-16 11:44 ` [PR PATCH] [Merged]: " Piraty
1 sibling, 0 replies; 3+ messages in thread
From: ericonr @ 2020-07-15 17:20 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 422 bytes --]
There is an updated pull request by ericonr against master on the void-packages repository
https://github.com/ericonr/void-packages jsoncpp
https://github.com/void-linux/void-packages/pull/23592
New package: nwg-launchers-0.2.0.
Also includes a change in json-c++ to allow it to be used from inside meson with cross compilation.
A patch file from https://github.com/void-linux/void-packages/pull/23592.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-jsoncpp-23592.patch --]
[-- Type: text/x-diff, Size: 4025 bytes --]
From 9ab2482ab4a31963da44852f1c32e3065ba282d1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Wed, 15 Jul 2020 14:15:30 -0300
Subject: [PATCH 1/2] json-c++: add pkg-config patch.
This patch already exists upstream, but is needed for nwg-launchers.
---
srcpkgs/json-c++/patches/pkg-config.patch | 59 +++++++++++++++++++++++
srcpkgs/json-c++/template | 2 +-
2 files changed, 60 insertions(+), 1 deletion(-)
create mode 100644 srcpkgs/json-c++/patches/pkg-config.patch
diff --git a/srcpkgs/json-c++/patches/pkg-config.patch b/srcpkgs/json-c++/patches/pkg-config.patch
new file mode 100644
index 00000000000..2ffe853e9a6
--- /dev/null
+++ b/srcpkgs/json-c++/patches/pkg-config.patch
@@ -0,0 +1,59 @@
+From c7d18c16259048878ab566c30aea2078a94b58fe Mon Sep 17 00:00:00 2001
+From: Palmer Dabbelt <palmer@dabbelt.com>
+Date: Thu, 8 Aug 2019 14:36:27 -0700
+Subject: [PATCH] cmake: Generate and install a pkg-config file.
+
+The meson builds install a pkg-config file, but the cmake builds don't.
+This adds a pkg-config file to the cmake builds that is functionally
+equivalent to the one generated from meson.
+---
+ CMakeLists.txt | 12 +++++++++++-
+ cmake/pkg-config.pc.in | 4 ++++
+ 2 files changed, 15 insertions(+), 1 deletion(-)
+ create mode 100644 cmake/pkg-config.pc.in
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index f7ba4fa38..372a7a03a 100644
+--- CMakeLists.txt
++++ CMakeLists.txt
+@@ -4,7 +4,7 @@ cmake_minimum_required(VERSION 3.1)
+ ## PROJECT
+ ## name and version
+ ##
+-project(nlohmann_json VERSION 3.8.0 LANGUAGES CXX)
++project(nlohmann_json VERSION 3.8.0 DESCRIPTION "JSON for Modern C++" LANGUAGES CXX)
+
+ ##
+ ## INCLUDE
+@@ -79,6 +79,12 @@ if (MSVC)
+ )
+ endif()
+
++# Install a pkg-config file, so other tools can find this.
++CONFIGURE_FILE(
++ "${CMAKE_CURRENT_SOURCE_DIR}/cmake/pkg-config.pc.in"
++ "${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}.pc"
++)
++
+ ##
+ ## TESTS
+ ## create and configure the unit test target
+@@ -139,4 +145,8 @@ endif()
+ NAMESPACE ${PROJECT_NAME}::
+ DESTINATION ${NLOHMANN_JSON_CONFIG_INSTALL_DIR}
+ )
++ install(
++ FILES "${CMAKE_BINARY_DIR}/${PROJECT_NAME}.pc"
++ DESTINATION lib/pkgconfig
++ )
+ endif()
+diff --git a/cmake/pkg-config.pc.in b/cmake/pkg-config.pc.in
+new file mode 100644
+index 000000000..680f10c26
+--- /dev/null
++++ cmake/pkg-config.pc.in
+@@ -0,0 +1,4 @@
++Name: ${PROJECT_NAME}
++Description: ${PROJECT_DESCRIPTION}
++Version: ${PROJECT_VERSION}
++Cflags: -I${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_INCLUDEDIR}
diff --git a/srcpkgs/json-c++/template b/srcpkgs/json-c++/template
index 1219a7e7d0b..168d7f176fc 100644
--- a/srcpkgs/json-c++/template
+++ b/srcpkgs/json-c++/template
@@ -1,7 +1,7 @@
# Template file for 'json-c++'
pkgname=json-c++
version=3.8.0
-revision=1
+revision=2
wrksrc="json-${version}"
build_style=cmake
short_desc="JSON for modern C++"
From a26faba6fb5f67f59c9475f9964c7ec0bb4cabc9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Wed, 15 Jul 2020 14:16:11 -0300
Subject: [PATCH 2/2] New package: nwg-launchers-0.2.0.
---
srcpkgs/nwg-launchers/template | 13 +++++++++++++
1 file changed, 13 insertions(+)
create mode 100644 srcpkgs/nwg-launchers/template
diff --git a/srcpkgs/nwg-launchers/template b/srcpkgs/nwg-launchers/template
new file mode 100644
index 00000000000..a148583e002
--- /dev/null
+++ b/srcpkgs/nwg-launchers/template
@@ -0,0 +1,13 @@
+# Template file for 'nwg-launchers'
+pkgname=nwg-launchers
+version=0.2.0
+revision=1
+build_style=meson
+hostmakedepends="pkg-config"
+makedepends="gtkmm-devel json-c++"
+short_desc="GTK-based launchers for window managers"
+maintainer="Érico Nogueira <ericonr@disroot.org>"
+license="GPL-3.0-or-later"
+homepage="https://github.com/nwg-piotr/nwg-launchers"
+distfiles="${homepage}/archive/v${version}.tar.gz"
+checksum=e5dd81d812646b1bf000bee4d491e1011f3d3e10ba824779f79e70d6ff5503d8
^ permalink raw reply [flat|nested] 3+ messages in thread