* [PR PATCH] pygtk: fix build, stub tests.
@ 2020-10-25 0:29 fosslinux
2020-10-30 1:51 ` ericonr
` (4 more replies)
0 siblings, 5 replies; 6+ messages in thread
From: fosslinux @ 2020-10-25 0:29 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 460 bytes --]
There is a new pull request by fosslinux against master on the void-packages repository
https://github.com/fosslinux/void-packages pygtk-pango-ftbts
https://github.com/void-linux/void-packages/pull/25864
pygtk: fix build, stub tests.
tests don't work, need some weird display stuff.
pango 1.44.6 dropped font api, patch taken from arch, drops the font
interface.
A patch file from https://github.com/void-linux/void-packages/pull/25864.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-pygtk-pango-ftbts-25864.patch --]
[-- Type: text/x-diff, Size: 2125 bytes --]
From d8c3c23f918cda90ac5b97fc8e13fb256a41bfac Mon Sep 17 00:00:00 2001
From: fosslinux <fosslinux@aussies.space>
Date: Sun, 25 Oct 2020 10:29:31 +1100
Subject: [PATCH] pygtk: fix build, stub tests.
tests don't work, need some weird display stuff.
pango 1.44.6 dropped font api, patch taken from arch, drops the font
interface.
---
srcpkgs/pygtk/patches/pango-1.44.6.patch | 41 ++++++++++++++++++++++++
srcpkgs/pygtk/template | 5 +++
2 files changed, 46 insertions(+)
create mode 100644 srcpkgs/pygtk/patches/pango-1.44.6.patch
diff --git a/srcpkgs/pygtk/patches/pango-1.44.6.patch b/srcpkgs/pygtk/patches/pango-1.44.6.patch
new file mode 100644
index 00000000000..6a3cda76e6b
--- /dev/null
+++ b/srcpkgs/pygtk/patches/pango-1.44.6.patch
@@ -0,0 +1,41 @@
+From 4aaa48eb80c6802aec6d03e5695d2a0ff20e0fc2 Mon Sep 17 00:00:00 2001
+From: Jordan Petridis <jpetridis@gnome.org>
+Date: Thu, 24 Oct 2019 22:58:36 +0200
+Subject: [PATCH] Drop the PangoFont find_shaper virtual method
+
+This API has been removed from Pango 1.44.6, because it was completely
+unused by anything.
+
+However, PyGTK tries to bind everything, even unused API.
+
+Removing this from PyGTK means we can build it against the latest Pango
+again.
+
+https://gitlab.gnome.org/GNOME/pango/issues/417
+---
+ pango.defs | 9 ---------
+ 1 file changed, 9 deletions(-)
+
+diff --git pango.defs pango.defs
+index 6935c964..da968f58 100644
+--- pango.defs
++++ pango.defs
+@@ -1391,15 +1391,6 @@
+ )
+ )
+
+-(define-virtual find_shaper
+- (of-object "PangoFont")
+- (return-type "PangoEngineShape*")
+- (parameters
+- '("PangoLanguage*" "lang")
+- '("guint32" "ch")
+- )
+-)
+-
+ (define-virtual get_glyph_extents
+ (of-object "PangoFont")
+ (return-type "none")
+--
+2.24.2
+
diff --git a/srcpkgs/pygtk/template b/srcpkgs/pygtk/template
index 0e2d73b3778..e2c9802008e 100644
--- a/srcpkgs/pygtk/template
+++ b/srcpkgs/pygtk/template
@@ -26,6 +26,11 @@ pre_configure() {
fi
}
+do_check() {
+ # Needs some weird display crap
+ :
+}
+
post_install() {
vinstall gtk/gtk-extrafuncs.defs 644 usr/share/pygtk/2.0/defs
}
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: pygtk: fix build, stub tests.
2020-10-25 0:29 [PR PATCH] pygtk: fix build, stub tests fosslinux
@ 2020-10-30 1:51 ` ericonr
2020-10-30 23:34 ` [PR PATCH] [Updated] " fosslinux
` (3 subsequent siblings)
4 siblings, 0 replies; 6+ messages in thread
From: ericonr @ 2020-10-30 1:51 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 922 bytes --]
New comment by ericonr on void-packages repository
https://github.com/void-linux/void-packages/pull/25864#issuecomment-719121265
Comment:
```diff
diff --git a/srcpkgs/pygtk/template b/srcpkgs/pygtk/template
index e2c9802008..30c0b19e21 100644
--- a/srcpkgs/pygtk/template
+++ b/srcpkgs/pygtk/template
@@ -11,6 +11,7 @@ hostmakedepends="pkg-config python-gobject2-devel python-numpy"
makedepends="python-devel gtk+-devel libxml2-devel libglade-devel
python-gobject2-devel"
depends="python python-cairo python-gobject2"
+checkdepends="xvfb-run nemo"
short_desc="Python bindings for the GTK+ toolkit"
maintainer="Orphaned <orphan@voidlinux.org>"
license="LGPL-2.1-or-later"
@@ -28,7 +29,10 @@ pre_configure() {
do_check() {
# Needs some weird display crap
- :
+ export HOME="$(mktemp -d)"
+ mkdir -p "$HOME/.local/share"
+ xvfb-run make check
+ rm -r "$HOME"
}
post_install() {
```
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PR PATCH] [Updated] pygtk: fix build, stub tests.
2020-10-25 0:29 [PR PATCH] pygtk: fix build, stub tests fosslinux
2020-10-30 1:51 ` ericonr
@ 2020-10-30 23:34 ` fosslinux
2020-10-30 23:35 ` fosslinux
` (2 subsequent siblings)
4 siblings, 0 replies; 6+ messages in thread
From: fosslinux @ 2020-10-30 23:34 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 465 bytes --]
There is an updated pull request by fosslinux against master on the void-packages repository
https://github.com/fosslinux/void-packages pygtk-pango-ftbts
https://github.com/void-linux/void-packages/pull/25864
pygtk: fix build, stub tests.
tests don't work, need some weird display stuff.
pango 1.44.6 dropped font api, patch taken from arch, drops the font
interface.
A patch file from https://github.com/void-linux/void-packages/pull/25864.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-pygtk-pango-ftbts-25864.patch --]
[-- Type: text/x-diff, Size: 2655 bytes --]
From 520027eede4a95762be14ef8a0f1063dcbb80679 Mon Sep 17 00:00:00 2001
From: fosslinux <fosslinux@aussies.space>
Date: Sun, 25 Oct 2020 10:29:31 +1100
Subject: [PATCH] pygtk: fix build and tests.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
pango 1.44.6 dropped font api, patch taken from arch, drops the font
interface.
Co-authored-by: Érico Rolim <erico.erc@gmail.com>
---
srcpkgs/pygtk/patches/pango-1.44.6.patch | 41 ++++++++++++++++++++++++
srcpkgs/pygtk/template | 8 +++++
2 files changed, 49 insertions(+)
create mode 100644 srcpkgs/pygtk/patches/pango-1.44.6.patch
diff --git a/srcpkgs/pygtk/patches/pango-1.44.6.patch b/srcpkgs/pygtk/patches/pango-1.44.6.patch
new file mode 100644
index 00000000000..6a3cda76e6b
--- /dev/null
+++ b/srcpkgs/pygtk/patches/pango-1.44.6.patch
@@ -0,0 +1,41 @@
+From 4aaa48eb80c6802aec6d03e5695d2a0ff20e0fc2 Mon Sep 17 00:00:00 2001
+From: Jordan Petridis <jpetridis@gnome.org>
+Date: Thu, 24 Oct 2019 22:58:36 +0200
+Subject: [PATCH] Drop the PangoFont find_shaper virtual method
+
+This API has been removed from Pango 1.44.6, because it was completely
+unused by anything.
+
+However, PyGTK tries to bind everything, even unused API.
+
+Removing this from PyGTK means we can build it against the latest Pango
+again.
+
+https://gitlab.gnome.org/GNOME/pango/issues/417
+---
+ pango.defs | 9 ---------
+ 1 file changed, 9 deletions(-)
+
+diff --git pango.defs pango.defs
+index 6935c964..da968f58 100644
+--- pango.defs
++++ pango.defs
+@@ -1391,15 +1391,6 @@
+ )
+ )
+
+-(define-virtual find_shaper
+- (of-object "PangoFont")
+- (return-type "PangoEngineShape*")
+- (parameters
+- '("PangoLanguage*" "lang")
+- '("guint32" "ch")
+- )
+-)
+-
+ (define-virtual get_glyph_extents
+ (of-object "PangoFont")
+ (return-type "none")
+--
+2.24.2
+
diff --git a/srcpkgs/pygtk/template b/srcpkgs/pygtk/template
index 0e2d73b3778..41554b81763 100644
--- a/srcpkgs/pygtk/template
+++ b/srcpkgs/pygtk/template
@@ -11,6 +11,7 @@ hostmakedepends="pkg-config python-gobject2-devel python-numpy"
makedepends="python-devel gtk+-devel libxml2-devel libglade-devel
python-gobject2-devel"
depends="python python-cairo python-gobject2"
+checkdepends="xvfb-run nemo"
short_desc="Python bindings for the GTK+ toolkit"
maintainer="Orphaned <orphan@voidlinux.org>"
license="LGPL-2.1-or-later"
@@ -26,6 +27,13 @@ pre_configure() {
fi
}
+do_check() {
+ export HOME="$(mktemp -d)"
+ mkdir -p "$HOME/.local/share"
+ xvfb-run make check
+ rm -r "$HOME"
+}
+
post_install() {
vinstall gtk/gtk-extrafuncs.defs 644 usr/share/pygtk/2.0/defs
}
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: pygtk: fix build, stub tests.
2020-10-25 0:29 [PR PATCH] pygtk: fix build, stub tests fosslinux
2020-10-30 1:51 ` ericonr
2020-10-30 23:34 ` [PR PATCH] [Updated] " fosslinux
@ 2020-10-30 23:35 ` fosslinux
2020-10-31 15:56 ` ericonr
2020-10-31 20:48 ` [PR PATCH] [Merged]: " ericonr
4 siblings, 0 replies; 6+ messages in thread
From: fosslinux @ 2020-10-30 23:35 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 154 bytes --]
New comment by fosslinux on void-packages repository
https://github.com/void-linux/void-packages/pull/25864#issuecomment-719844890
Comment:
Patch added
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: pygtk: fix build, stub tests.
2020-10-25 0:29 [PR PATCH] pygtk: fix build, stub tests fosslinux
` (2 preceding siblings ...)
2020-10-30 23:35 ` fosslinux
@ 2020-10-31 15:56 ` ericonr
2020-10-31 20:48 ` [PR PATCH] [Merged]: " ericonr
4 siblings, 0 replies; 6+ messages in thread
From: ericonr @ 2020-10-31 15:56 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 175 bytes --]
New comment by ericonr on void-packages repository
https://github.com/void-linux/void-packages/pull/25864#issuecomment-719952549
Comment:
I guess it doesn't need a revbump?
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PR PATCH] [Merged]: pygtk: fix build, stub tests.
2020-10-25 0:29 [PR PATCH] pygtk: fix build, stub tests fosslinux
` (3 preceding siblings ...)
2020-10-31 15:56 ` ericonr
@ 2020-10-31 20:48 ` ericonr
4 siblings, 0 replies; 6+ messages in thread
From: ericonr @ 2020-10-31 20:48 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 295 bytes --]
There's a merged pull request on the void-packages repository
pygtk: fix build, stub tests.
https://github.com/void-linux/void-packages/pull/25864
Description:
tests don't work, need some weird display stuff.
pango 1.44.6 dropped font api, patch taken from arch, drops the font
interface.
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2020-10-31 20:48 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-10-25 0:29 [PR PATCH] pygtk: fix build, stub tests fosslinux
2020-10-30 1:51 ` ericonr
2020-10-30 23:34 ` [PR PATCH] [Updated] " fosslinux
2020-10-30 23:35 ` fosslinux
2020-10-31 15:56 ` ericonr
2020-10-31 20:48 ` [PR PATCH] [Merged]: " 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).