Github messages for voidlinux
 help / color / mirror / Atom feed
* [PR PATCH] projectM: split into -devel subpackage.
@ 2020-09-27 21:46 ericonr
  2020-09-27 21:57 ` [PR PATCH] [Updated] " ericonr
                   ` (2 more replies)
  0 siblings, 3 replies; 4+ messages in thread
From: ericonr @ 2020-09-27 21:46 UTC (permalink / raw)
  To: ml

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

There is a new pull request by ericonr against master on the void-packages repository

https://github.com/ericonr/void-packages proM
https://github.com/void-linux/void-packages/pull/25135

projectM: split into -devel subpackage.
Also fix location of desktop files, and assign to LDFLAGS instead of
adding to it.

@abenson 

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

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-proM-25135.patch --]
[-- Type: text/x-diff, Size: 1893 bytes --]

From 7bd600875b1187feea55c6213c09d33e56ef22dc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Sun, 27 Sep 2020 18:44:51 -0300
Subject: [PATCH] projectM: split into -devel subpackage.

Also fix location of desktop files, and assign to LDFLAGS instead of
adding to it.
---
 common/shlibs             |  1 +
 srcpkgs/projectM/template | 20 ++++++++++++++++++--
 2 files changed, 19 insertions(+), 2 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index 23d24e49060..036493aad38 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -765,6 +765,7 @@ libpulse-mainloop-glib.so.0 libpulseaudio-1.0_1
 libpulse-simple.so.0 libpulseaudio-1.0_1
 libpulsecommon-13.0.so libpulseaudio-13.0_1
 libpulsecore-13.0.so libpulseaudio-13.0_1
+libprojectM.so.3 projectM-3.1.7_2
 liborc-0.4.so.0 orc-0.4.11_1
 liborc-test-0.4.so.0 orc-0.4.11_1
 libgmime-2.6.so.0 gmime-2.6.4_1
diff --git a/srcpkgs/projectM/template b/srcpkgs/projectM/template
index ca2b22afdd9..563fa77563f 100644
--- a/srcpkgs/projectM/template
+++ b/srcpkgs/projectM/template
@@ -1,7 +1,7 @@
 # Template file for 'projectM'
 pkgname=projectM
 version=3.1.7
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--datadir=/usr/libexec"
 hostmakedepends="pkg-config qt5-host-tools automake libtool which"
@@ -17,5 +17,21 @@ checksum=30af6d1c108efc19311a5636efbbedbe83d23905bb8472dd3fe4b07a21fb5fd3
 
 if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
 	makedepends+=" musl-fts-devel"
-	export LDFLAGS+=" -lfts"
+	LDFLAGS="-lfts"
 fi
+
+post_install() {
+	# fix location of desktop files
+	mv $DESTDIR/usr/libexec/{applications,icons} $DESTDIR/usr/share
+}
+
+projectM-devel_package() {
+	depends="${sourcepkg}>=${version}_${revision}"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/pkgconfig
+		vmove "usr/lib/*.a"
+		vmove "usr/lib/*.so"
+	}
+}

^ permalink raw reply	[flat|nested] 4+ messages in thread

* Re: [PR PATCH] [Updated] projectM: split into -devel subpackage.
  2020-09-27 21:46 [PR PATCH] projectM: split into -devel subpackage ericonr
@ 2020-09-27 21:57 ` ericonr
  2020-09-27 23:43 ` ericonr
  2020-09-27 23:43 ` [PR PATCH] [Closed]: " ericonr
  2 siblings, 0 replies; 4+ messages in thread
From: ericonr @ 2020-09-27 21:57 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 proM
https://github.com/void-linux/void-packages/pull/25135

projectM: split into -devel subpackage.
Also fix location of desktop files, and assign to LDFLAGS instead of
adding to it.

@abenson 

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

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-proM-25135.patch --]
[-- Type: text/x-diff, Size: 2178 bytes --]

From 2da40dddef0cb43c1016d277e96c2aa41389e038 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89rico=20Rolim?= <erico.erc@gmail.com>
Date: Sun, 27 Sep 2020 18:44:51 -0300
Subject: [PATCH] projectM: split into -devel subpackage.

Also fix location of desktop files, and assign to LDFLAGS instead of
adding to it.
---
 common/shlibs             |  1 +
 srcpkgs/projectM-devel    |  1 +
 srcpkgs/projectM/template | 20 ++++++++++++++++++--
 3 files changed, 20 insertions(+), 2 deletions(-)
 create mode 120000 srcpkgs/projectM-devel

diff --git a/common/shlibs b/common/shlibs
index 23d24e49060..036493aad38 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -765,6 +765,7 @@ libpulse-mainloop-glib.so.0 libpulseaudio-1.0_1
 libpulse-simple.so.0 libpulseaudio-1.0_1
 libpulsecommon-13.0.so libpulseaudio-13.0_1
 libpulsecore-13.0.so libpulseaudio-13.0_1
+libprojectM.so.3 projectM-3.1.7_2
 liborc-0.4.so.0 orc-0.4.11_1
 liborc-test-0.4.so.0 orc-0.4.11_1
 libgmime-2.6.so.0 gmime-2.6.4_1
diff --git a/srcpkgs/projectM-devel b/srcpkgs/projectM-devel
new file mode 120000
index 00000000000..80ca2de8e22
--- /dev/null
+++ b/srcpkgs/projectM-devel
@@ -0,0 +1 @@
+projectM
\ No newline at end of file
diff --git a/srcpkgs/projectM/template b/srcpkgs/projectM/template
index ca2b22afdd9..563fa77563f 100644
--- a/srcpkgs/projectM/template
+++ b/srcpkgs/projectM/template
@@ -1,7 +1,7 @@
 # Template file for 'projectM'
 pkgname=projectM
 version=3.1.7
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--datadir=/usr/libexec"
 hostmakedepends="pkg-config qt5-host-tools automake libtool which"
@@ -17,5 +17,21 @@ checksum=30af6d1c108efc19311a5636efbbedbe83d23905bb8472dd3fe4b07a21fb5fd3
 
 if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
 	makedepends+=" musl-fts-devel"
-	export LDFLAGS+=" -lfts"
+	LDFLAGS="-lfts"
 fi
+
+post_install() {
+	# fix location of desktop files
+	mv $DESTDIR/usr/libexec/{applications,icons} $DESTDIR/usr/share
+}
+
+projectM-devel_package() {
+	depends="${sourcepkg}>=${version}_${revision}"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/pkgconfig
+		vmove "usr/lib/*.a"
+		vmove "usr/lib/*.so"
+	}
+}

^ permalink raw reply	[flat|nested] 4+ messages in thread

* Re: projectM: split into -devel subpackage.
  2020-09-27 21:46 [PR PATCH] projectM: split into -devel subpackage ericonr
  2020-09-27 21:57 ` [PR PATCH] [Updated] " ericonr
@ 2020-09-27 23:43 ` ericonr
  2020-09-27 23:43 ` [PR PATCH] [Closed]: " ericonr
  2 siblings, 0 replies; 4+ messages in thread
From: ericonr @ 2020-09-27 23:43 UTC (permalink / raw)
  To: ml

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

New comment by ericonr on void-packages repository

https://github.com/void-linux/void-packages/pull/25135#issuecomment-699704308

Comment:
Pulled into #25078 

^ permalink raw reply	[flat|nested] 4+ messages in thread

* Re: [PR PATCH] [Closed]: projectM: split into -devel subpackage.
  2020-09-27 21:46 [PR PATCH] projectM: split into -devel subpackage ericonr
  2020-09-27 21:57 ` [PR PATCH] [Updated] " ericonr
  2020-09-27 23:43 ` ericonr
@ 2020-09-27 23:43 ` ericonr
  2 siblings, 0 replies; 4+ messages in thread
From: ericonr @ 2020-09-27 23:43 UTC (permalink / raw)
  To: ml

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

There's a closed pull request on the void-packages repository

projectM: split into -devel subpackage.
https://github.com/void-linux/void-packages/pull/25135

Description:
Also fix location of desktop files, and assign to LDFLAGS instead of
adding to it.

@abenson 

^ permalink raw reply	[flat|nested] 4+ messages in thread

end of thread, other threads:[~2020-09-27 23:43 UTC | newest]

Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-09-27 21:46 [PR PATCH] projectM: split into -devel subpackage ericonr
2020-09-27 21:57 ` [PR PATCH] [Updated] " ericonr
2020-09-27 23:43 ` ericonr
2020-09-27 23:43 ` [PR PATCH] [Closed]: " ericonr

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).