From: sgn <sgn@users.noreply.github.com>
To: ml@inbox.vuxu.org
Subject: Re: gtk+3 and gtk4 have a conflicting file which causes FileChooser crash in every program.
Date: Fri, 18 Sep 2020 15:56:47 +0200 [thread overview]
Message-ID: <20200918135647.tkQmHgZBI3OIwicS4NVnGt7bgIpOYmIGjyqSSp-5VhI@z> (raw)
In-Reply-To: <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-24964@inbox.vuxu.org>
[-- Attachment #1: Type: text/plain, Size: 3906 bytes --]
New comment by sgn on void-packages repository
https://github.com/void-linux/void-packages/issues/24964#issuecomment-694883519
Comment:
Updated gtk4 will fix the conflicts, I'm waiting for GNOME 3.38 merged to merge this in:
```diff
commit 4ee6506513 (HEAD -> master)
Author: Đoàn Trần Công Danh <congdanhqx@gmail.com>
Date: Fri Sep 18 20:55:16 2020 +0700
gtk4: update to 3.99.1.
---
.../gtk4/patches/vulkan-VK_RESULT_RANGE_SIZE.patch | 12 ----------
srcpkgs/gtk4/template | 27 +++++++++++-----------
2 files changed, 14 insertions(+), 25 deletions(-)
diff --git a/srcpkgs/gtk4/patches/vulkan-VK_RESULT_RANGE_SIZE.patch b/srcpkgs/gtk4/patches/vulkan-VK_RESULT_RANGE_SIZE.patch
deleted file mode 100644
index 7275e958bb..0000000000
--- a/srcpkgs/gtk4/patches/vulkan-VK_RESULT_RANGE_SIZE.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- gdk/gdkvulkancontext.c 2018-06-26 13:48:16.000000000 +0200
-+++ gdk/gdkvulkancontext.c 2020-07-26 16:28:33.487718532 +0200
-@@ -190,7 +190,9 @@
- case VK_ERROR_FRAGMENTATION_EXT:
- return "A descriptor pool creation has failed due to fragmentation";
- #endif
-+#if defined(VK_RESULT_RANGE_SIZE)
- case VK_RESULT_RANGE_SIZE:
-+#endif
- case VK_RESULT_MAX_ENUM:
- default:
- return "Unknown Vulkan error.";
diff --git a/srcpkgs/gtk4/template b/srcpkgs/gtk4/template
index 58388b515c..690a80e2f6 100644
--- a/srcpkgs/gtk4/template
+++ b/srcpkgs/gtk4/template
@@ -1,8 +1,8 @@
# Template file for 'gtk4'
pkgname=gtk4
-version=3.94.0
-revision=2
-wrksrc="gtk+-${version}"
+version=3.99.1
+revision=1
+wrksrc="gtk-${version}"
build_style=meson
build_helper="gir"
configure_args="-Dman-pages=true -Dbuild-tests=false -Dmedia=all
@@ -11,11 +11,12 @@ configure_args="-Dman-pages=true -Dbuild-tests=false -Dmedia=all
-Dwayland-backend=$(vopt_if wayland true false)
-Dintrospection=$(vopt_if gir true false)
-Dprint-backends=$(vopt_if cups 'cups,file' file)
- -Dcolord=$(vopt_if colord yes no)
- -Dcloudproviders=$(vopt_if cloudproviders true false)
- -Dvulkan=$(vopt_if vulkan yes no)"
+ -Dcolord=$(vopt_if colord enabled disabled)
+ -Dcloudproviders=$(vopt_if cloudproviders enabled disabled)
+ -Dvulkan=$(vopt_if vulkan enabled disabled)"
hostmakedepends="gettext-devel glib-devel gtk-doc gtk-update-icon-cache perl
- pkg-config $(vopt_if wayland 'wayland-devel wayland-protocols')"
+ pkg-config sassc gettext
+ $(vopt_if wayland 'wayland-devel wayland-protocols')"
makedepends="at-spi2-atk-devel gdk-pixbuf-devel libepoxy-devel pango-devel
iso-codes graphene-devel gst-plugins-bad1-devel ffmpeg-devel
$(vopt_if colord 'colord-devel') $(vopt_if cups 'cups-devel')
@@ -27,8 +28,8 @@ short_desc="GIMP ToolKit (v4)"
maintainer="Enno Boland <gottox@voidlinux.org>"
license="LGPL-2.1-or-later"
homepage="https://www.gtk.org/"
-distfiles="${GNOME_SITE}/gtk+/${version%.*}/gtk+-${version}.tar.xz"
-checksum=a947caa5296610b0f1d7a03b58df34765c227c577c78e683e75eea3251a67035
+distfiles="${GNOME_SITE}/gtk/${version%.*}/gtk-${version}.tar.xz"
+checksum=9b444e1ce3728680290917e143930195599c65c84c4debbfacfc1044aeff3c94
# Package build options
build_options="broadway colord cups gir cloudproviders wayland x11"
@@ -56,10 +57,10 @@ gtk4-demo_package() {
vmove usr/bin/gtk4-demo
vmove usr/bin/gtk4-widget-factory
vmove usr/bin/gtk4-demo-application
- vmove usr/share/gtk-4.0/gtkbuilder.rng
- vmove usr/share/glib-2.0/schemas/org.gtk.Demo.gschema.xml
- vmove usr/share/applications/gtk4-widget-factory.desktop
- vmove usr/share/applications/gtk4-demo.desktop
+ vmove usr/share/gtk-4.0/gtk4builder.rng
+ vmove usr/share/glib-2.0/schemas/org.gtk.Demo4.gschema.xml
+ vmove usr/share/applications/WidgetFactory4.desktop
+ vmove usr/share/applications/Demo4.desktop
vmove usr/share/icons
}
}
```
next prev parent reply other threads:[~2020-09-18 13:56 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-09-18 10:50 [ISSUE] gtk+3 and gtk4 have a conflicting file which causes FileChooser crash in almost " PaperMountainStudio
2020-09-18 13:56 ` sgn [this message]
2020-09-19 5:10 ` [ISSUE] [CLOSED] gtk+3 and gtk4 have a conflicting file which causes FileChooser crash in " sgn
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=20200918135647.tkQmHgZBI3OIwicS4NVnGt7bgIpOYmIGjyqSSp-5VhI@z \
--to=sgn@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).