pkgsrc-Changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
CVS commit: pkgsrc/x11/vte3
Module Name: pkgsrc
Committed By: ryoon
Date: Sat Jun 20 00:10:25 UTC 2020
Modified Files:
pkgsrc/x11/vte3: Makefile PLIST buildlink3.mk distinfo
pkgsrc/x11/vte3/patches: patch-src_pty.cc patch-src_vte.cc
Removed Files:
pkgsrc/x11/vte3/patches: patch-configure
Log Message:
vte3: Update to 0.60.3
* Use meson to build.
* Enable vala and gobject-introspection.
Changelog:
Not available.
To generate a diff of this commit:
cvs rdiff -u -r1.25 -r1.26 pkgsrc/x11/vte3/Makefile
cvs rdiff -u -r1.4 -r1.5 pkgsrc/x11/vte3/PLIST
cvs rdiff -u -r1.15 -r1.16 pkgsrc/x11/vte3/buildlink3.mk
cvs rdiff -u -r1.10 -r1.11 pkgsrc/x11/vte3/distinfo
cvs rdiff -u -r1.2 -r0 pkgsrc/x11/vte3/patches/patch-configure
cvs rdiff -u -r1.3 -r1.4 pkgsrc/x11/vte3/patches/patch-src_pty.cc
cvs rdiff -u -r1.2 -r1.3 pkgsrc/x11/vte3/patches/patch-src_vte.cc
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: pkgsrc/x11/vte3/Makefile
diff -u pkgsrc/x11/vte3/Makefile:1.25 pkgsrc/x11/vte3/Makefile:1.26
--- pkgsrc/x11/vte3/Makefile:1.25 Fri May 22 10:55:53 2020
+++ pkgsrc/x11/vte3/Makefile Sat Jun 20 00:10:24 2020
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.25 2020/05/22 10:55:53 adam Exp $
+# $NetBSD: Makefile,v 1.26 2020/06/20 00:10:24 ryoon Exp $
-DISTNAME= vte-0.54.3
+DISTNAME= vte-0.60.3
PKGNAME= ${DISTNAME:S/vte/vte3/}
-PKGREVISION= 5
CATEGORIES= x11
-MASTER_SITES= ${MASTER_SITE_GNOME:=sources/vte/0.54/}
+MASTER_SITES= ${MASTER_SITE_GNOME:=sources/vte/0.60/}
EXTRACT_SUFX= .tar.xz
MAINTAINER= pkgsrc-users%NetBSD.org@localhost
@@ -12,30 +11,28 @@ HOMEPAGE= https://www.gnome.org/
COMMENT= Terminal widget with improved accessibility and I18N support
LICENSE= gnu-lgpl-v2
-PKGCONFIG_OVERRIDE+= vte.pc.in
+PKGCONFIG_OVERRIDE_STAGE= post-configure
+PKGCONFIG_OVERRIDE+= output/meson-private/vte-2.91.pc
-USE_LIBTOOL= yes
GNU_CONFIGURE= yes
USE_TOOLS+= gmake intltool msgfmt pkg-config bash
USE_LANGUAGES= c c++14
# for c++14 \todo
GCC_REQD+= 5
-BUILDLINK_TRANSFORM+= rm:-Werror=format=2
+BUILDLINK_TRANSFORM+= rm:-Werror=format=2 # for %m in printf
-.include "../../mk/bsd.prefs.mk"
-
-.if ${OPSYS} == "SunOS" || ${OPSYS} == "Darwin"
-CONFIGURE_ARGS+= --disable-Bsymbolic
-.else
-CONFIGURE_ARGS+= --enable-Bsymbolic=auto
-.endif
-CONFIGURE_ARGS+= --disable-introspection
-CONFIGURE_ARGS+= --disable-vala
-
-.include "../../devel/gperf/buildlink3.mk"
+.include "../../devel/meson/build.mk"
+.include "../../converters/fribidi/buildlink3.mk"
+.include "../../devel/glib2/buildlink3.mk"
+.include "../../devel/gobject-introspection/buildlink3.mk"
+.include "../../devel/pango/buildlink3.mk"
.include "../../devel/pcre2/buildlink3.mk"
+.include "../../devel/zlib/buildlink3.mk"
+.include "../../lang/vala/buildlink3.mk"
.include "../../security/gnutls/buildlink3.mk"
+.include "../../textproc/icu/buildlink3.mk"
.include "../../x11/gtk3/buildlink3.mk"
+.include "../../mk/pthread.buildlink3.mk"
.include "../../mk/termcap.buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
Index: pkgsrc/x11/vte3/PLIST
diff -u pkgsrc/x11/vte3/PLIST:1.4 pkgsrc/x11/vte3/PLIST:1.5
--- pkgsrc/x11/vte3/PLIST:1.4 Thu Mar 7 21:36:06 2019
+++ pkgsrc/x11/vte3/PLIST Sat Jun 20 00:10:24 2020
@@ -1,5 +1,6 @@
-@comment $NetBSD: PLIST,v 1.4 2019/03/07 21:36:06 jmcneill Exp $
+@comment $NetBSD: PLIST,v 1.5 2020/06/20 00:10:24 ryoon Exp $
bin/vte-2.91
+etc/profile.d/vte.csh
etc/profile.d/vte.sh
include/vte-2.91/vte/vte.h
include/vte-2.91/vte/vtedeprecated.h
@@ -11,39 +12,13 @@ include/vte-2.91/vte/vteregex.h
include/vte-2.91/vte/vteterminal.h
include/vte-2.91/vte/vtetypebuiltins.h
include/vte-2.91/vte/vteversion.h
-lib/libvte-2.91.la
+lib/girepository-1.0/Vte-2.91.typelib
+lib/libvte-2.91.so
+lib/libvte-2.91.so.0
+lib/libvte-2.91.so.0.6000.3
lib/pkgconfig/vte-2.91.pc
-share/gtk-doc/html/vte-2.91/VteRegex.html
-share/gtk-doc/html/vte-2.91/VteTerminal.html
-share/gtk-doc/html/vte-2.91/annotation-glossary.html
-share/gtk-doc/html/vte-2.91/api-index-0-40.html
-share/gtk-doc/html/vte-2.91/api-index-0-44.html
-share/gtk-doc/html/vte-2.91/api-index-0-46.html
-share/gtk-doc/html/vte-2.91/api-index-0-48.html
-share/gtk-doc/html/vte-2.91/api-index-0-50.html
-share/gtk-doc/html/vte-2.91/api-index-0-52.html
-share/gtk-doc/html/vte-2.91/api-index-0-54.html
-share/gtk-doc/html/vte-2.91/api-index-deprecated.html
-share/gtk-doc/html/vte-2.91/api-index-full.html
-share/gtk-doc/html/vte-2.91/ch01.html
-share/gtk-doc/html/vte-2.91/ch02.html
-share/gtk-doc/html/vte-2.91/ch03.html
-share/gtk-doc/html/vte-2.91/ch04.html
-share/gtk-doc/html/vte-2.91/home.png
-share/gtk-doc/html/vte-2.91/index.html
-share/gtk-doc/html/vte-2.91/left-insensitive.png
-share/gtk-doc/html/vte-2.91/left.png
-share/gtk-doc/html/vte-2.91/licence.html
-share/gtk-doc/html/vte-2.91/object-hierarchy.html
-share/gtk-doc/html/vte-2.91/pt01.html
-share/gtk-doc/html/vte-2.91/right-insensitive.png
-share/gtk-doc/html/vte-2.91/right.png
-share/gtk-doc/html/vte-2.91/style.css
-share/gtk-doc/html/vte-2.91/up-insensitive.png
-share/gtk-doc/html/vte-2.91/up.png
-share/gtk-doc/html/vte-2.91/vte-2.91.devhelp2
-share/gtk-doc/html/vte-2.91/vte-Version-Information.html
-share/gtk-doc/html/vte-2.91/vte-Vte-PTY.html
+libexec/vte-urlencode-cwd
+share/gir-1.0/Vte-2.91.gir
share/locale/am/LC_MESSAGES/vte-2.91.mo
share/locale/an/LC_MESSAGES/vte-2.91.mo
share/locale/ang/LC_MESSAGES/vte-2.91.mo
@@ -59,6 +34,7 @@ share/locale/bn_IN/LC_MESSAGES/vte-2.91.
share/locale/bs/LC_MESSAGES/vte-2.91.mo
share/locale/ca/LC_MESSAGES/vte-2.91.mo
share/locale/ca@valencia/LC_MESSAGES/vte-2.91.mo
+share/locale/ckb/LC_MESSAGES/vte-2.91.mo
share/locale/cs/LC_MESSAGES/vte-2.91.mo
share/locale/cy/LC_MESSAGES/vte-2.91.mo
share/locale/da/LC_MESSAGES/vte-2.91.mo
@@ -99,6 +75,7 @@ share/locale/lt/LC_MESSAGES/vte-2.91.mo
share/locale/lv/LC_MESSAGES/vte-2.91.mo
share/locale/mai/LC_MESSAGES/vte-2.91.mo
share/locale/mi/LC_MESSAGES/vte-2.91.mo
+share/locale/mjw/LC_MESSAGES/vte-2.91.mo
share/locale/mk/LC_MESSAGES/vte-2.91.mo
share/locale/ml/LC_MESSAGES/vte-2.91.mo
share/locale/mn/LC_MESSAGES/vte-2.91.mo
@@ -139,3 +116,5 @@ share/locale/xh/LC_MESSAGES/vte-2.91.mo
share/locale/zh_CN/LC_MESSAGES/vte-2.91.mo
share/locale/zh_HK/LC_MESSAGES/vte-2.91.mo
share/locale/zh_TW/LC_MESSAGES/vte-2.91.mo
+share/vala/vapi/vte-2.91.deps
+share/vala/vapi/vte-2.91.vapi
Index: pkgsrc/x11/vte3/buildlink3.mk
diff -u pkgsrc/x11/vte3/buildlink3.mk:1.15 pkgsrc/x11/vte3/buildlink3.mk:1.16
--- pkgsrc/x11/vte3/buildlink3.mk:1.15 Fri May 22 10:55:53 2020
+++ pkgsrc/x11/vte3/buildlink3.mk Sat Jun 20 00:10:24 2020
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.15 2020/05/22 10:55:53 adam Exp $
+# $NetBSD: buildlink3.mk,v 1.16 2020/06/20 00:10:24 ryoon Exp $
BUILDLINK_TREE+= vte3
@@ -9,10 +9,10 @@ BUILDLINK_API_DEPENDS.vte3+= vte3>=0.52.
BUILDLINK_ABI_DEPENDS.vte3+= vte3>=0.54.3nb5
BUILDLINK_PKGSRCDIR.vte3?= ../../x11/vte3
+.include "../../devel/glib2/buildlink3.mk"
+.include "../../devel/pango/buildlink3.mk"
.include "../../devel/pcre2/buildlink3.mk"
-.include "../../security/gnutls/buildlink3.mk"
.include "../../x11/gtk3/buildlink3.mk"
-.include "../../mk/termcap.buildlink3.mk"
.endif # VTE3_BUILDLINK3_MK
BUILDLINK_TREE+= -vte3
Index: pkgsrc/x11/vte3/distinfo
diff -u pkgsrc/x11/vte3/distinfo:1.10 pkgsrc/x11/vte3/distinfo:1.11
--- pkgsrc/x11/vte3/distinfo:1.10 Wed Mar 27 11:19:10 2019
+++ pkgsrc/x11/vte3/distinfo Sat Jun 20 00:10:24 2020
@@ -1,12 +1,11 @@
-$NetBSD: distinfo,v 1.10 2019/03/27 11:19:10 jperkin Exp $
+$NetBSD: distinfo,v 1.11 2020/06/20 00:10:24 ryoon Exp $
-SHA1 (vte-0.54.3.tar.xz) = ea498d334e341738ef03d4d2d2c99b8bb1c1570e
-RMD160 (vte-0.54.3.tar.xz) = 3275821836e06d134288738b3e6ecec449e80d16
-SHA512 (vte-0.54.3.tar.xz) = dd7d2ac361ed9ac0550599bb3164a3bd6ba95535275c9b559c81ce0af1bbf4b3d150a7489f987b2e626b32d4a8adc82d1ff78e8c8640e5b1c036fe4076c5d8ce
-Size (vte-0.54.3.tar.xz) = 1087424 bytes
-SHA1 (patch-configure) = 9a570f27c0ec4e4680d517a8c2498b37728d52ae
+SHA1 (vte-0.60.3.tar.xz) = ba1e2f241326a2e146336832c21c41b61e0e55af
+RMD160 (vte-0.60.3.tar.xz) = 2615d28eaaf9293038f305d26e62e049f503064a
+SHA512 (vte-0.60.3.tar.xz) = 3694fe711e0b3eb9d6ba37ad8036f5d3cca4265635ed7afcde750a8445b17f820d1c55b557d0ea1c8a5a45e5408915d8da2ffd65b4d397c6582f288812ae1f18
+Size (vte-0.60.3.tar.xz) = 535504 bytes
SHA1 (patch-src_app_app.cc) = ff76c74840342195a4d318418474f69e385f6571
-SHA1 (patch-src_pty.cc) = 4bcd447b214d59da69ea8c0bc5100cce27623f63
-SHA1 (patch-src_vte.cc) = 9886ae82daa8c4ad55ce85e2dec3216d3e46221a
+SHA1 (patch-src_pty.cc) = 841aa8246db98a83d68ee7b5131df7e492787238
+SHA1 (patch-src_vte.cc) = 563a990fd00c8ec68d4afba90f3c45a76c76e404
SHA1 (patch-src_vtedraw.cc) = 1deab7738ae7c7bbb53e5b951df4d8a6ad9312f9
SHA1 (patch-src_widget.cc) = adcecb612c6a0945f13c26e3b6a89131bcab4b1f
Index: pkgsrc/x11/vte3/patches/patch-src_pty.cc
diff -u pkgsrc/x11/vte3/patches/patch-src_pty.cc:1.3 pkgsrc/x11/vte3/patches/patch-src_pty.cc:1.4
--- pkgsrc/x11/vte3/patches/patch-src_pty.cc:1.3 Fri Jun 22 14:34:43 2018
+++ pkgsrc/x11/vte3/patches/patch-src_pty.cc Sat Jun 20 00:10:24 2020
@@ -1,12 +1,12 @@
-$NetBSD: patch-src_pty.cc,v 1.3 2018/06/22 14:34:43 jperkin Exp $
+$NetBSD: patch-src_pty.cc,v 1.4 2020/06/20 00:10:24 ryoon Exp $
NetBSD fix
Use correct includes on SunOS.
Don't use packet mode on SunOS.
---- src/pty.cc.orig 2018-05-21 19:30:33.000000000 +0000
+--- src/pty.cc.orig 2020-05-13 09:51:07.000000000 +0000
+++ src/pty.cc
-@@ -60,7 +60,9 @@
+@@ -64,7 +64,9 @@
#ifdef HAVE_PTY_H
#include <pty.h>
#endif
@@ -17,7 +17,7 @@ Don't use packet mode on SunOS.
#include <stropts.h>
#endif
#include <glib.h>
-@@ -605,12 +607,14 @@ fd_setup(int fd)
+@@ -638,12 +640,14 @@ fd_setup(int fd)
return -1;
}
@@ -32,7 +32,7 @@ Don't use packet mode on SunOS.
return 0;
}
-@@ -632,7 +636,12 @@ _vte_pty_open_posix(void)
+@@ -665,7 +669,12 @@ _vte_pty_open_posix(void)
fd = posix_openpt(O_RDWR | O_NOCTTY | O_NONBLOCK | O_CLOEXEC);
#ifndef __linux__
/* Other kernels may not support CLOEXEC or NONBLOCK above, so try to fall back */
@@ -46,7 +46,7 @@ Don't use packet mode on SunOS.
if (fd == -1 && errno == EINVAL) {
/* Try without NONBLOCK and apply the flag afterward */
need_nonblocking = true;
-@@ -668,12 +677,14 @@ _vte_pty_open_posix(void)
+@@ -701,12 +710,14 @@ _vte_pty_open_posix(void)
}
#endif /* !linux */
@@ -59,5 +59,5 @@ Don't use packet mode on SunOS.
}
+#endif
- _vte_debug_print(VTE_DEBUG_PTY, "Allocated pty on fd %d.\n", (int)fd);
-
+ if (grantpt(fd) != 0) {
+ vte::util::restore_errno errsv;
Index: pkgsrc/x11/vte3/patches/patch-src_vte.cc
diff -u pkgsrc/x11/vte3/patches/patch-src_vte.cc:1.2 pkgsrc/x11/vte3/patches/patch-src_vte.cc:1.3
--- pkgsrc/x11/vte3/patches/patch-src_vte.cc:1.2 Fri Jun 22 14:34:43 2018
+++ pkgsrc/x11/vte3/patches/patch-src_vte.cc Sat Jun 20 00:10:24 2020
@@ -1,21 +1,11 @@
-$NetBSD: patch-src_vte.cc,v 1.2 2018/06/22 14:34:43 jperkin Exp $
+$NetBSD: patch-src_vte.cc,v 1.3 2020/06/20 00:10:24 ryoon Exp $
Use correct includes on SunOS.
Don't use packet mode on SunOS.
---- src/vte.cc.orig 2018-05-21 19:31:53.000000000 +0000
+--- src/vte.cc.orig 2020-05-13 09:51:07.000000000 +0000
+++ src/vte.cc
-@@ -25,6 +25,9 @@
- #include <string.h>
- #include <sys/ioctl.h>
- #include <sys/param.h> /* howmany() */
-+#ifdef __sun
-+#include <sys/ptyvar.h>
-+#endif
- #include <errno.h>
- #include <fcntl.h>
- #include <math.h>
-@@ -3970,6 +3973,9 @@ VteTerminalPrivate::pty_io_read(GIOChann
+@@ -3966,6 +3966,9 @@ Terminal::pty_io_read(int const fd,
bp = chunk->data + chunk->len;
len = 0;
do {
@@ -25,7 +15,7 @@ Don't use packet mode on SunOS.
/* We'd like to read (fd, bp, rem); but due to TIOCPKT mode
* there's an extra input byte returned at the beginning.
* We need to see what that byte is, but otherwise drop it
-@@ -3980,6 +3986,7 @@ VteTerminalPrivate::pty_io_read(GIOChann
+@@ -3977,6 +3980,7 @@ Terminal::pty_io_read(int const fd,
int ret = read (fd, bp - 1, rem + 1);
pkt_header = bp[-1];
bp[-1] = save;
@@ -33,19 +23,28 @@ Don't use packet mode on SunOS.
switch (ret){
case -1:
err = errno;
-@@ -3988,6 +3995,7 @@ VteTerminalPrivate::pty_io_read(GIOChann
- eof = TRUE;
+@@ -3985,12 +3989,15 @@ Terminal::pty_io_read(int const fd,
+ eos = true;
goto out;
default:
+#ifndef __sun
ret--;
-
- if (pkt_header & TIOCPKT_IOCTL) {
-@@ -4008,6 +4016,7 @@ VteTerminalPrivate::pty_io_read(GIOChann
- } else if (pkt_header & TIOCPKT_START) {
- pty_scroll_lock_changed(false);
+-
+ if (pkt_header == TIOCPKT_DATA) {
++#endif
+ bp += ret;
+ rem -= ret;
+ len += ret;
++#ifndef __sun
++ ret--;
+ } else {
+ if (pkt_header & TIOCPKT_IOCTL) {
+ /* We'd like to always be informed when the termios change,
+@@ -4012,6 +4019,7 @@ Terminal::pty_io_read(int const fd,
+ pty_scroll_lock_changed(false);
+ }
}
+#endif
-
- bp += ret;
- rem -= ret;
+ break;
+ }
+ } while (rem);
Home |
Main Index |
Thread Index |
Old Index