Github messages for voidlinux
 help / color / mirror / Atom feed
* [PR PATCH] libopenshot: fix python3 detection
@ 2020-01-24 21:57 voidlinux-github
  2020-01-24 22:06 ` [PR PATCH] [Updated] " voidlinux-github
                   ` (2 more replies)
  0 siblings, 3 replies; 4+ messages in thread
From: voidlinux-github @ 2020-01-24 21:57 UTC (permalink / raw)
  To: ml

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

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

https://github.com/jnbr/void-packages libopenshot
https://github.com/void-linux/void-packages/pull/18536

libopenshot: fix python3 detection


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

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

From c2b657fe1bc3c8be0aa38e8f384c2f102925a398 Mon Sep 17 00:00:00 2001
From: Johannes <johannes.brechtmann@gmail.com>
Date: Fri, 24 Jan 2020 22:45:51 +0100
Subject: [PATCH] libopenshot: fix python3 detection

---
 srcpkgs/libopenshot/template | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libopenshot/template b/srcpkgs/libopenshot/template
index 129aa3aa9ab..4de43c687c5 100644
--- a/srcpkgs/libopenshot/template
+++ b/srcpkgs/libopenshot/template
@@ -1,12 +1,12 @@
 # Template file for 'libopenshot'
 pkgname=libopenshot
 version=0.2.3
-revision=2
+revision=3
 archs="i686 x86_64 ppc64le"
 build_style=cmake
 pycompile_module="openshot.py"
 configure_args="-DENABLE_RUBY=OFF -DUSE_SYSTEM_JSONCPP=ON" # Builds fail with Ruby-2.4.1
-hostmakedepends="swig doxygen ruby python3"
+hostmakedepends="swig doxygen ruby python3 pkg-config"
 makedepends="python3-devel ffmpeg-devel libmagick-devel qt5-devel libgomp-devel
  libopenshot-audio-devel qt5-multimedia-devel unittest-cpp zeromq-devel cppzmq
  jsoncpp-devel"
@@ -19,6 +19,11 @@ distfiles="https://github.com/OpenShot/libopenshot/archive/v${version}.tar.gz"
 checksum=8536b0a790b0d98ed4c3b10e11d1b34ae68ccbc710887e3703a5143d95598746
 patch_args="-Np1"
 
+pre_configure() {
+  # vendored python cmake module does not find python 3.8
+  rm cmake/Modules/FindPythonLibs.cmake
+}
+
 libopenshot-devel_package() {
 	short_desc+=" - development files"
 	pkg_install() {

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

* Re: [PR PATCH] [Updated] libopenshot: fix python3 detection
  2020-01-24 21:57 [PR PATCH] libopenshot: fix python3 detection voidlinux-github
@ 2020-01-24 22:06 ` voidlinux-github
  2020-01-24 22:13 ` voidlinux-github
  2020-01-24 22:22 ` [PR PATCH] [Merged]: " voidlinux-github
  2 siblings, 0 replies; 4+ messages in thread
From: voidlinux-github @ 2020-01-24 22:06 UTC (permalink / raw)
  To: ml

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

There is an updated pull request by jnbr against master on the void-packages repository

https://github.com/jnbr/void-packages libopenshot
https://github.com/void-linux/void-packages/pull/18536

libopenshot: fix python3 detection


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

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

From f34fb6d1f7de043ff43bbe60b63a43fa22812914 Mon Sep 17 00:00:00 2001
From: Johannes <johannes.brechtmann@gmail.com>
Date: Fri, 24 Jan 2020 22:45:51 +0100
Subject: [PATCH] libopenshot: fix python3 detection

---
 srcpkgs/libopenshot/template | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/libopenshot/template b/srcpkgs/libopenshot/template
index 129aa3aa9ab..9c34e27337c 100644
--- a/srcpkgs/libopenshot/template
+++ b/srcpkgs/libopenshot/template
@@ -1,12 +1,12 @@
 # Template file for 'libopenshot'
 pkgname=libopenshot
 version=0.2.3
-revision=2
+revision=3
 archs="i686 x86_64 ppc64le"
 build_style=cmake
 pycompile_module="openshot.py"
 configure_args="-DENABLE_RUBY=OFF -DUSE_SYSTEM_JSONCPP=ON" # Builds fail with Ruby-2.4.1
-hostmakedepends="swig doxygen ruby python3"
+hostmakedepends="swig doxygen ruby python3 pkg-config"
 makedepends="python3-devel ffmpeg-devel libmagick-devel qt5-devel libgomp-devel
  libopenshot-audio-devel qt5-multimedia-devel unittest-cpp zeromq-devel cppzmq
  jsoncpp-devel"
@@ -19,6 +19,11 @@ distfiles="https://github.com/OpenShot/libopenshot/archive/v${version}.tar.gz"
 checksum=8536b0a790b0d98ed4c3b10e11d1b34ae68ccbc710887e3703a5143d95598746
 patch_args="-Np1"
 
+pre_configure() {
+	# vendored python cmake module does not find python 3.8
+	rm cmake/Modules/FindPythonLibs.cmake
+}
+
 libopenshot-devel_package() {
 	short_desc+=" - development files"
 	pkg_install() {

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

* Re: [PR PATCH] [Updated] libopenshot: fix python3 detection
  2020-01-24 21:57 [PR PATCH] libopenshot: fix python3 detection voidlinux-github
  2020-01-24 22:06 ` [PR PATCH] [Updated] " voidlinux-github
@ 2020-01-24 22:13 ` voidlinux-github
  2020-01-24 22:22 ` [PR PATCH] [Merged]: " voidlinux-github
  2 siblings, 0 replies; 4+ messages in thread
From: voidlinux-github @ 2020-01-24 22:13 UTC (permalink / raw)
  To: ml

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

There is an updated pull request by jnbr against master on the void-packages repository

https://github.com/jnbr/void-packages libopenshot
https://github.com/void-linux/void-packages/pull/18536

libopenshot: fix python3 detection


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

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

From 4085a7d637dbb9997469f898573a165b68014c9a Mon Sep 17 00:00:00 2001
From: Johannes <johannes.brechtmann@gmail.com>
Date: Fri, 24 Jan 2020 22:45:51 +0100
Subject: [PATCH] libopenshot: fix python3 detection

---
 srcpkgs/libopenshot/template | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/libopenshot/template b/srcpkgs/libopenshot/template
index 129aa3aa9ab..0701bed0dbf 100644
--- a/srcpkgs/libopenshot/template
+++ b/srcpkgs/libopenshot/template
@@ -1,12 +1,11 @@
 # Template file for 'libopenshot'
 pkgname=libopenshot
 version=0.2.3
-revision=2
+revision=3
 archs="i686 x86_64 ppc64le"
 build_style=cmake
-pycompile_module="openshot.py"
 configure_args="-DENABLE_RUBY=OFF -DUSE_SYSTEM_JSONCPP=ON" # Builds fail with Ruby-2.4.1
-hostmakedepends="swig doxygen ruby python3"
+hostmakedepends="swig doxygen ruby python3 pkg-config"
 makedepends="python3-devel ffmpeg-devel libmagick-devel qt5-devel libgomp-devel
  libopenshot-audio-devel qt5-multimedia-devel unittest-cpp zeromq-devel cppzmq
  jsoncpp-devel"
@@ -19,6 +18,11 @@ distfiles="https://github.com/OpenShot/libopenshot/archive/v${version}.tar.gz"
 checksum=8536b0a790b0d98ed4c3b10e11d1b34ae68ccbc710887e3703a5143d95598746
 patch_args="-Np1"
 
+pre_configure() {
+	# vendored python cmake module does not find python 3.8
+	rm cmake/Modules/FindPythonLibs.cmake
+}
+
 libopenshot-devel_package() {
 	short_desc+=" - development files"
 	pkg_install() {

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

* Re: [PR PATCH] [Merged]: libopenshot: fix python3 detection
  2020-01-24 21:57 [PR PATCH] libopenshot: fix python3 detection voidlinux-github
  2020-01-24 22:06 ` [PR PATCH] [Updated] " voidlinux-github
  2020-01-24 22:13 ` voidlinux-github
@ 2020-01-24 22:22 ` voidlinux-github
  2 siblings, 0 replies; 4+ messages in thread
From: voidlinux-github @ 2020-01-24 22:22 UTC (permalink / raw)
  To: ml

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

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

libopenshot: fix python3 detection
https://github.com/void-linux/void-packages/pull/18536

Description:


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

end of thread, other threads:[~2020-01-24 22:22 UTC | newest]

Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-01-24 21:57 [PR PATCH] libopenshot: fix python3 detection voidlinux-github
2020-01-24 22:06 ` [PR PATCH] [Updated] " voidlinux-github
2020-01-24 22:13 ` voidlinux-github
2020-01-24 22:22 ` [PR PATCH] [Merged]: " voidlinux-github

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