~ruther/guix-local

678152b937e39f875731bf82701f4c97517d1bd6 — Sharlatan Hellseher 4 months ago d9433bf
gnu: orangeduck-mpc: Update to 0.9.0-1.1049534.

* gnu/packages/c.scm (orangeduck-mpc): Update to
1049534fc56b1971345c7aaa792dea55d6f9b7bc commit.
[source]: Remove patch "orangeduck-mpc-fix-pkg-config.patch", available
form the latest commit.

* gnu/packages/patches/orangeduck-mpc-fix-pkg-config.patch: Delete file.
* gnu/local.mk (dist_patch_DATA): Deregister patch.

Change-Id: I9e23ed5fc6e9a89520b93be269781085ebee5e3c
3 files changed, 3 insertions(+), 31 deletions(-)

M gnu/local.mk
M gnu/packages/c.scm
D gnu/packages/patches/orangeduck-mpc-fix-pkg-config.patch
M gnu/local.mk => gnu/local.mk +0 -1
@@ 2010,7 2010,6 @@ dist_patch_DATA =						\
  %D%/packages/patches/opentaxsolver-file-browser-fix.patch     \
  %D%/packages/patches/open-zwave-hidapi.patch			\
  %D%/packages/patches/opusfile-CVE-2022-47021.patch		\
  %D%/packages/patches/orangeduck-mpc-fix-pkg-config.patch	\
  %D%/packages/patches/orbit2-fix-array-allocation-32bit.patch \
  %D%/packages/patches/orpheus-cast-errors-and-includes.patch	\
  %D%/packages/patches/ots-no-include-missing-file.patch	\

M gnu/packages/c.scm => gnu/packages/c.scm +3 -5
@@ 1466,8 1466,8 @@ Telemetry Transport (MQTT) publish-subscribe messaging protocol.")
;;; The package is named orangeduck-mpc to differentiate it from GNU mpc.
(define-public orangeduck-mpc
  ;; The last release lacks an 'install' target.
  (let ((commit "7c910e9303833c349f7432188ff77f2745254df2")
        (revision "0"))
  (let ((commit "1049534fc56b1971345c7aaa792dea55d6f9b7bc")
        (revision "1"))
    (package
      (name "orangeduck-mpc")
      (version (git-version "0.9.0" revision commit))


@@ 1479,9 1479,7 @@ Telemetry Transport (MQTT) publish-subscribe messaging protocol.")
                (file-name (git-file-name name version))
                (sha256
                 (base32
                  "01a4vcxdnz0fbn90c9zc3jzklyqqvp9sfjpjwpq0f5r0l2pp37ad"))
                (patches
                 (search-patches "orangeduck-mpc-fix-pkg-config.patch"))))
                  "1wpxchbjxsyksr8il9pvg195nvqzsjdshzyzwikxda0fss0p7aap"))))
      (build-system gnu-build-system)
      (arguments
       (list #:make-flags #~(list (string-append "CC=" #$(cc-for-target))

D gnu/packages/patches/orangeduck-mpc-fix-pkg-config.patch => gnu/packages/patches/orangeduck-mpc-fix-pkg-config.patch +0 -25
@@ 1,25 0,0 @@
Upstream status: https://github.com/orangeduck/mpc/pull/160

diff --git a/Makefile b/Makefile
index 7719acc..fe798c5 100644
--- a/Makefile
+++ b/Makefile
@@ -15,7 +15,7 @@ EXAMPLESEXE = $(EXAMPLES:.c=)
 
 .PHONY: all check clean libs $(DIST)/$(PROJ).pc
 
-all: $(EXAMPLESEXE) check
+all: $(EXAMPLESEXE) check libs $(DIST)/$(PROJ).pc
 
 $(DIST):
 	$(MKDIR) $(DIST)
@@ -65,7 +65,8 @@ install: all
 	install -m755 -t $(DESTDIR)$(PREFIX)/lib $(DIST)/lib*
 	install -m644 -t $(DESTDIR)$(PREFIX)/share/$(PROJ) $(PROJ).c $(PROJ).h
 	install -m644 $(PROJ).h $(DESTDIR)$(PREFIX)/include/$(PROJ).h
-	install -m644 $(PROJ).pc $(DESTDIR)$(PREFIX)/lib/pkgconfig/$(PROJ).pc
+	install -m644 $(DIST)/$(PROJ).pc \
+	  $(DESTDIR)$(PREFIX)/lib/pkgconfig/$(PROJ).pc
 
 uninstall:
 	rm -rf -- \