Github messages for voidlinux
 help / color / mirror / Atom feed
From: r-c-f <r-c-f@users.noreply.github.com>
To: ml@inbox.vuxu.org
Subject: [PR PATCH] ncurses: install non-wide pkg-config files
Date: Fri, 17 Sep 2021 03:36:56 +0200	[thread overview]
Message-ID: <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-32988@inbox.vuxu.org> (raw)

[-- Attachment #1: Type: text/plain, Size: 1823 bytes --]

There is a new pull request by r-c-f against master on the void-packages repository

https://github.com/r-c-f/void-packages ncurses-nonwide-pc
https://github.com/void-linux/void-packages/pull/32988

ncurses: install non-wide pkg-config files
Currently, there are symlinks to fool non-wide users into using the
proper .so/.a files, but pkg-config is unable to make use of them. This
installs the .pc files (which were already being generated). Fixes #32987

<!-- Mark items with [x] where applicable -->

#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)

#### Have the results of the proposed changes been tested?
- [x] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR

<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
#### Does it build and run successfully? 
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [x] I built this PR locally for my native architecture, (x86_64-glibc)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
  - [ ] aarch64-musl
  - [x] armv7l
  - [ ] armv6l-musl



A patch file from https://github.com/void-linux/void-packages/pull/32988.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-ncurses-nonwide-pc-32988.patch --]
[-- Type: text/x-diff, Size: 1648 bytes --]

From 4d7e7501b95f48127a25266a37cbd2a14c9d41df Mon Sep 17 00:00:00 2001
From: Ryan Farley <ryan.farley@gmx.com>
Date: Thu, 16 Sep 2021 19:39:22 -0500
Subject: [PATCH] ncurses: install non-wide pkg-config files

Currently, there are symlinks to fool non-wide users into using the
proper .so/.a files, but pkg-config is unable to make use of them. This
installs the .pc files (which were already being generated).
---
 srcpkgs/ncurses/template | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/srcpkgs/ncurses/template b/srcpkgs/ncurses/template
index 90454e01ec10..7c96a8f3a00a 100644
--- a/srcpkgs/ncurses/template
+++ b/srcpkgs/ncurses/template
@@ -1,7 +1,7 @@
 # Template file for 'ncurses'
 pkgname=ncurses
 version=6.2
-revision=4
+revision=5
 bootstrap=yes
 configure_args="--enable-big-core"
 short_desc="System V Release 4.0 curses emulation library"
@@ -50,6 +50,9 @@ do_build() {
 do_install() {
 	vlicense COPYING
 
+	cd ${wrksrc}/ncurses-build/misc
+	make DESTDIR=${DESTDIR} install
+
 	cd ${wrksrc}/ncursesw-build
 	make DESTDIR=${DESTDIR} install
 
@@ -110,11 +113,10 @@ ncurses-devel_package() {
 	pkg_install() {
 		vmove "usr/bin/ncurses*-config"
 		vmove usr/include
-		vmove usr/lib/pkgconfig/ncursesw.pc
-		vmove usr/lib/pkgconfig/formw.pc
-		vmove usr/lib/pkgconfig/menuw.pc
-		vmove usr/lib/pkgconfig/ncurses++w.pc
-		vmove usr/lib/pkgconfig/panelw.pc
+		vmove "usr/lib/pkgconfig/ncurses*.pc"
+		vmove "usr/lib/pkgconfig/form*.pc"
+		vmove "usr/lib/pkgconfig/menu*.pc"
+		vmove "usr/lib/pkgconfig/panel*.pc"
 		vmove "usr/lib/*.a"
 		vmove "usr/lib/libcurses*.so"
 		vmove "usr/lib/libform*.so"

             reply	other threads:[~2021-09-17  1:36 UTC|newest]

Thread overview: 4+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-09-17  1:36 r-c-f [this message]
2021-09-22 22:34 ` [PR PATCH] [Closed]: " q66
2021-09-22 22:34 ` q66
2021-09-22 22:35 ` q66

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-32988@inbox.vuxu.org \
    --to=r-c-f@users.noreply.github.com \
    --cc=ml@inbox.vuxu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).