pkgsrc-Changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
CVS commit: pkgsrc/x11/gtk3
Module Name: pkgsrc
Committed By: adam
Date: Wed Jan 8 14:57:29 UTC 2020
Modified Files:
pkgsrc/x11/gtk3: PLIST distinfo
Added Files:
pkgsrc/x11/gtk3/patches: patch-gdk_quartz_Makefile.in
patch-gdk_quartz_gdkquartz-gtk-only.h
patch-gdk_quartz_gdkselection-quartz.c
Log Message:
gtk3: fix building on macOS with Quartz backend
To generate a diff of this commit:
cvs rdiff -u -r1.28 -r1.29 pkgsrc/x11/gtk3/PLIST
cvs rdiff -u -r1.72 -r1.73 pkgsrc/x11/gtk3/distinfo
cvs rdiff -u -r0 -r1.1 pkgsrc/x11/gtk3/patches/patch-gdk_quartz_Makefile.in \
pkgsrc/x11/gtk3/patches/patch-gdk_quartz_gdkquartz-gtk-only.h \
pkgsrc/x11/gtk3/patches/patch-gdk_quartz_gdkselection-quartz.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: pkgsrc/x11/gtk3/PLIST
diff -u pkgsrc/x11/gtk3/PLIST:1.28 pkgsrc/x11/gtk3/PLIST:1.29
--- pkgsrc/x11/gtk3/PLIST:1.28 Wed Nov 6 14:51:19 2019
+++ pkgsrc/x11/gtk3/PLIST Wed Jan 8 14:57:29 2020
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.28 2019/11/06 14:51:19 wiz Exp $
+@comment $NetBSD: PLIST,v 1.29 2020/01/08 14:57:29 adam Exp $
bin/gtk-builder-tool
bin/gtk-encode-symbolic-svg
bin/gtk-launch
@@ -55,6 +55,7 @@ include/gtk-3.0/gdk/gdkvisual.h
${PLIST.wayland}include/gtk-3.0/gdk/gdkwayland.h
include/gtk-3.0/gdk/gdkwindow.h
${PLIST.x11}include/gtk-3.0/gdk/gdkx.h
+${PLIST.quartz}include/gtk-3.0/gdk/quartz/gdkquartz-gtk-only.h
${PLIST.quartz}include/gtk-3.0/gdk/quartz/gdkquartzcursor.h
${PLIST.quartz}include/gtk-3.0/gdk/quartz/gdkquartzdevice-core.h
${PLIST.quartz}include/gtk-3.0/gdk/quartz/gdkquartzdevicemanager-core.h
@@ -425,6 +426,7 @@ include/gtk-3.0/unix-print/gtk/gtkunixpr
lib/girepository-1.0/Gdk-3.0.typelib
${PLIST.x11}lib/girepository-1.0/GdkX11-3.0.typelib
lib/girepository-1.0/Gtk-3.0.typelib
+@pkgdir lib/gtk-3.0/3.0.0/filesystems
lib/gtk-3.0/3.0.0/immodules/im-am-et.la
lib/gtk-3.0/3.0.0/immodules/im-cedilla.la
lib/gtk-3.0/3.0.0/immodules/im-cyrillic-translit.la
@@ -442,6 +444,8 @@ ${PLIST.x11}lib/gtk-3.0/3.0.0/immodules/
${PLIST.cups}lib/gtk-3.0/3.0.0/printbackends/libprintbackend-cups.la
lib/gtk-3.0/3.0.0/printbackends/libprintbackend-file.la
lib/gtk-3.0/3.0.0/printbackends/libprintbackend-lpr.la
+@pkgdir lib/gtk-3.0/immodules
+@pkgdir lib/gtk-3.0/modules
lib/libgailutil-3.la
lib/libgdk-3.la
lib/libgtk-3.la
@@ -1406,6 +1410,3 @@ share/locale/zh_TW/LC_MESSAGES/gtk30.mo
share/themes/Default/gtk-3.0/gtk-keys.css
share/themes/Emacs/gtk-3.0/gtk-keys.css
${PLIST.quartz}share/themes/Mac/gtk-3.0/gtk-keys.css
-@pkgdir lib/gtk-3.0/modules
-@pkgdir lib/gtk-3.0/immodules
-@pkgdir lib/gtk-3.0/3.0.0/filesystems
Index: pkgsrc/x11/gtk3/distinfo
diff -u pkgsrc/x11/gtk3/distinfo:1.72 pkgsrc/x11/gtk3/distinfo:1.73
--- pkgsrc/x11/gtk3/distinfo:1.72 Tue Dec 31 12:21:00 2019
+++ pkgsrc/x11/gtk3/distinfo Wed Jan 8 14:57:29 2020
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.72 2019/12/31 12:21:00 wiz Exp $
+$NetBSD: distinfo,v 1.73 2020/01/08 14:57:29 adam Exp $
SHA1 (gtk+-3.24.13.tar.xz) = 5f014189e117207580bf7bc16aea4e09e009c75a
RMD160 (gtk+-3.24.13.tar.xz) = cdf6b911d59e13b412efe0666d5d58de5095abe2
@@ -8,6 +8,9 @@ SHA1 (patch-aj) = cbfab43f27352f7c6bc57a
SHA1 (patch-config.h.in) = dc5f8741eed554f88c0b6834cadad95083e4dc8f
SHA1 (patch-configure) = d531b33e52facf960058f1223b70db680da35300
SHA1 (patch-configure.ac) = 68793f40752f25ccaecc958c72c23a504670bea5
+SHA1 (patch-gdk_quartz_Makefile.in) = 610bf837b2ed2d3524174979cab7bf54cf53bb79
+SHA1 (patch-gdk_quartz_gdkquartz-gtk-only.h) = 24aefa2631c2546ef726eba0aee0f9460c1664ed
+SHA1 (patch-gdk_quartz_gdkselection-quartz.c) = 723c97746ec93129434ca989a9ad5b026b5c8035
SHA1 (patch-gdk_wayland_gdkdevice-wayland.c) = e283bd6533ea1307b971c524bc05f0d3ee90453d
SHA1 (patch-gdk_x11_gdkscreen-x11.h) = 455d6c3de8421984ba3c99baf51cd31982a3df78
SHA1 (patch-gdk_x11_gdkwindow-x11.h) = c80f7c9d5a570817e54fd74fa903a53400dc6f64
Added files:
Index: pkgsrc/x11/gtk3/patches/patch-gdk_quartz_Makefile.in
diff -u /dev/null pkgsrc/x11/gtk3/patches/patch-gdk_quartz_Makefile.in:1.1
--- /dev/null Wed Jan 8 14:57:29 2020
+++ pkgsrc/x11/gtk3/patches/patch-gdk_quartz_Makefile.in Wed Jan 8 14:57:29 2020
@@ -0,0 +1,14 @@
+$NetBSD: patch-gdk_quartz_Makefile.in,v 1.1 2020/01/08 14:57:29 adam Exp $
+
+https://gitlab.gnome.org/GNOME/gtk/issues/2279
+
+--- gdk/quartz/Makefile.in.orig 2020-01-08 14:34:08.000000000 +0000
++++ gdk/quartz/Makefile.in
+@@ -601,6 +601,7 @@ libgdkinclude_HEADERS = \
+ gdkquartz.h
+
+ libgdkquartzinclude_HEADERS = \
++ gdkquartz-gtk-only.h \
+ gdkquartzcursor.h \
+ gdkquartzdevice-core.h \
+ gdkquartzdevicemanager-core.h \
Index: pkgsrc/x11/gtk3/patches/patch-gdk_quartz_gdkquartz-gtk-only.h
diff -u /dev/null pkgsrc/x11/gtk3/patches/patch-gdk_quartz_gdkquartz-gtk-only.h:1.1
--- /dev/null Wed Jan 8 14:57:29 2020
+++ pkgsrc/x11/gtk3/patches/patch-gdk_quartz_gdkquartz-gtk-only.h Wed Jan 8 14:57:29 2020
@@ -0,0 +1,57 @@
+$NetBSD: patch-gdk_quartz_gdkquartz-gtk-only.h,v 1.1 2020/01/08 14:57:29 adam Exp $
+
+https://gitlab.gnome.org/GNOME/gtk/issues/2279
+
+--- /dev/null 2020-01-01 20:40:06.000000000 +0000
++++ gdk/quartz/gdkquartz-gtk-only.h
+@@ -0,0 +1,50 @@
++/* gdkquartz-gtk-only.h
++ *
++ * Copyright (C) 2005-2007 Imendio AB
++ *
++ * This library is free software; you can redistribute it and/or
++ * modify it under the terms of the GNU Lesser General Public
++ * License as published by the Free Software Foundation; either
++ * version 2 of the License, or (at your option) any later version.
++ *
++ * This library is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
++ * Lesser General Public License for more details.
++ *
++ * You should have received a copy of the GNU Lesser General Public
++ * License along with this library. If not, see <http://www.gnu.org/licenses/>.
++ */
++
++#ifndef __GDK_QUARTZ_GTK_ONLY_H__
++#define __GDK_QUARTZ_GTK_ONLY_H__
++
++#if !(defined (GTK_COMPILATION) || defined (GDK_COMPILATION))
++#error "This API is for use only in Gtk internal code."
++#endif
++
++#include <Appkit/Appkit.h>
++#include <gdk/gdk.h>
++#include <gdk/quartz/gdkquartz.h>
++
++/* Drag and Drop/Clipboard */
++GDK_AVAILABLE_IN_ALL
++GdkAtom gdk_quartz_pasteboard_type_to_atom_libgtk_only (NSString *type);
++GDK_AVAILABLE_IN_ALL
++NSString *gdk_quartz_target_to_pasteboard_type_libgtk_only (const gchar *target);
++GDK_AVAILABLE_IN_ALL
++NSString *gdk_quartz_atom_to_pasteboard_type_libgtk_only (GdkAtom atom);
++
++/* Utilities */
++GDK_AVAILABLE_IN_ALL
++NSImage *gdk_quartz_pixbuf_to_ns_image_libgtk_only (GdkPixbuf *pixbuf);
++GDK_AVAILABLE_IN_ALL
++NSEvent *gdk_quartz_event_get_nsevent (GdkEvent *event);
++
++/* Window */
++GDK_AVAILABLE_IN_ALL
++NSWindow *gdk_quartz_window_get_nswindow (GdkWindow *window);
++GDK_AVAILABLE_IN_ALL
++NSView *gdk_quartz_window_get_nsview (GdkWindow *window);
++
++#endif
Index: pkgsrc/x11/gtk3/patches/patch-gdk_quartz_gdkselection-quartz.c
diff -u /dev/null pkgsrc/x11/gtk3/patches/patch-gdk_quartz_gdkselection-quartz.c:1.1
--- /dev/null Wed Jan 8 14:57:30 2020
+++ pkgsrc/x11/gtk3/patches/patch-gdk_quartz_gdkselection-quartz.c Wed Jan 8 14:57:29 2020
@@ -0,0 +1,14 @@
+$NetBSD: patch-gdk_quartz_gdkselection-quartz.c,v 1.1 2020/01/08 14:57:29 adam Exp $
+
+https://gitlab.gnome.org/GNOME/gtk/issues/2279
+
+--- gdk/quartz/gdkselection-quartz.c.orig 2020-01-08 14:36:55.000000000 +0000
++++ gdk/quartz/gdkselection-quartz.c
+@@ -24,6 +24,7 @@
+ #include "gdkproperty.h"
+ #include "gdkquartz.h"
+ #include "gdkinternal-quartz.h"
++#include "gdkquartz-gtk-only.h"
+
+ gboolean
+ _gdk_quartz_display_set_selection_owner (GdkDisplay *display,
Home |
Main Index |
Thread Index |
Old Index