[Midnightbsd-cvs] mports [19978] trunk/x11/gnome-terminal: update to gnome terminal 3.16.2
laffer1 at midnightbsd.org
laffer1 at midnightbsd.org
Sat Aug 22 18:55:39 EDT 2015
Revision: 19978
http://svnweb.midnightbsd.org/mports/?rev=19978
Author: laffer1
Date: 2015-08-22 18:55:33 -0400 (Sat, 22 Aug 2015)
Log Message:
-----------
update to gnome terminal 3.16.2
Modified Paths:
--------------
trunk/x11/gnome-terminal/Makefile
trunk/x11/gnome-terminal/distinfo
trunk/x11/gnome-terminal/files/patch-config.h.in
trunk/x11/gnome-terminal/files/patch-src_terminal-screen.c
trunk/x11/gnome-terminal/pkg-plist
Removed Paths:
-------------
trunk/x11/gnome-terminal/files/patch-configure
trunk/x11/gnome-terminal/files/patch-configure.ac
Modified: trunk/x11/gnome-terminal/Makefile
===================================================================
--- trunk/x11/gnome-terminal/Makefile 2015-08-22 22:53:04 UTC (rev 19977)
+++ trunk/x11/gnome-terminal/Makefile 2015-08-22 22:55:33 UTC (rev 19978)
@@ -1,7 +1,7 @@
# $MidnightBSD$
PORTNAME= gnome-terminal
-PORTVERSION= 3.14.2
+PORTVERSION= 3.16.2
CATEGORIES= x11 gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome3
@@ -13,29 +13,35 @@
BUILD_DEPENDS= gsettings-desktop-schemas>=0:${PORTSDIR}/devel/gsettings-desktop-schemas \
itstool:${PORTSDIR}/textproc/itstool \
- appdata-tools>=0:${PORTSDIR}/devel/appdata-tools \
+ appdata-validate:${PORTSDIR}/devel/appstream-glib \
vala:${PORTSDIR}/lang/vala
LIB_DEPENDS= libstartup-notification-1.so:${PORTSDIR}/x11/startup-notification \
libuuid.so:${PORTSDIR}/misc/e2fsprogs-libuuid
RUN_DEPENDS= gsettings-desktop-schemas>=0:${PORTSDIR}/devel/gsettings-desktop-schemas
-USES= gettext gmake libtool pathfix pkgconfig tar:xz
-USE_GNOME= dconf gnomeprefix gtk30 intlhack nautilus3 vte3
+PORTSCOUT= limitw:1,even
+
+USES= cpe gettext gmake libtool pathfix pkgconfig tar:xz
+USE_GNOME= dconf gtk30 intlhack nautilus3 vte3
USE_XORG= sm ice
GNU_CONFIGURE= yes
-CONFIGURE_ARGS= --disable-search-provider
CPPFLAGS+= -I${LOCALBASE}/include
LDFLAGS+= -L${LOCALBASE}/lib
INSTALL_TARGET= install-strip
+CPE_VENDOR= gnome
GLIB_SCHEMAS= org.gnome.Terminal.gschema.xml
-OPTIONS_SUB= yes
-OPTIONS_DEFINE= MIGRATION
-OPTIONS_DEFAULT= MIGRATION
+OPTIONS_SUB= yes
+OPTIONS_DEFINE= MIGRATION SEARCHPROVIDER
+OPTIONS_DEFAULT= SEARCHPROVIDER
+SEARCHPROVIDER_DESC= Gnome-shell search provider
+SEARCHPROVIDER_CONFIGURE_ENABLE= search-provider
+SEARCHPROVIDER_BUILD_DEPENDS= gnome-shell:${PORTSDIR}/x11/gnome-shell
+SEARCHPROVIDER_RUN_DEPENDS= gnome-shell:${PORTSDIR}/x11/gnome-shell
MIGRATION_CONFIGURE_ENABLE= migration
-MIGRATION_USE= GNOME=gconf2
-MIGRATION_DESC= Profile migration to gsettings (pulls in gconf2)
+MIGRATION_USE= GNOME=gconf2
+MIGRATION_DESC= Profile migration to gsettings (pulls in gconf2)
.include <bsd.mport.options.mk>
@@ -45,6 +51,10 @@
@${REINPLACE_CMD} -e 's|-Wno-suggest-attribute=format||g ; \
s|-Wno-unused-but-set-variable||g' \
${WRKSRC}/src/Makefile.in
-EXTRA_PATCHES+= ${FILESDIR}/extra-src_terminal-screen.c
+post-install:
+.for i in cs de el es fi fr gl hu pt_BR ru
+ @${RMDIR} ${PREFIX}/share/help/${i}/gnome-terminal/figures
+.endfor
+
.include <bsd.port.mk>
Modified: trunk/x11/gnome-terminal/distinfo
===================================================================
--- trunk/x11/gnome-terminal/distinfo 2015-08-22 22:53:04 UTC (rev 19977)
+++ trunk/x11/gnome-terminal/distinfo 2015-08-22 22:55:33 UTC (rev 19978)
@@ -1,2 +1,2 @@
-SHA256 (gnome3/gnome-terminal-3.14.2.tar.xz) = 886bf9accb863d59791c5d8f2078d0fb022245a79854ad4a131b7b2186c27d2b
-SIZE (gnome3/gnome-terminal-3.14.2.tar.xz) = 1784996
+SHA256 (gnome3/gnome-terminal-3.16.2.tar.xz) = 9df7bab7bfd15ca9a3c60612e425baaf5c8b32ba181619f740b7129a0768f4e0
+SIZE (gnome3/gnome-terminal-3.16.2.tar.xz) = 1798620
Modified: trunk/x11/gnome-terminal/files/patch-config.h.in
===================================================================
--- trunk/x11/gnome-terminal/files/patch-config.h.in 2015-08-22 22:53:04 UTC (rev 19977)
+++ trunk/x11/gnome-terminal/files/patch-config.h.in 2015-08-22 22:55:33 UTC (rev 19978)
@@ -1,6 +1,6 @@
---- config.h.in.orig 2009-05-03 15:26:39.000000000 -0400
-+++ config.h.in 2009-05-03 15:26:55.000000000 -0400
-@@ -24,6 +24,9 @@
+--- config.h.in.orig 2011-01-13 04:05:18.243479000 +0000
++++ config.h.in 2011-01-13 04:05:35.000000000 +0000
+@@ -27,6 +27,9 @@
/* Define to 1 if you have the <inttypes.h> header file. */
#undef HAVE_INTTYPES_H
Deleted: trunk/x11/gnome-terminal/files/patch-configure
===================================================================
--- trunk/x11/gnome-terminal/files/patch-configure 2015-08-22 22:53:04 UTC (rev 19977)
+++ trunk/x11/gnome-terminal/files/patch-configure 2015-08-22 22:55:33 UTC (rev 19978)
@@ -1,82 +0,0 @@
---- configure.orig 2009-05-03 15:26:45.000000000 -0400
-+++ configure 2009-05-03 15:27:01.000000000 -0400
-@@ -15099,6 +15099,79 @@ GLIB_GENMARSHAL="$($PKG_CONFIG --variabl
- GLIB_MKENUMS="$($PKG_CONFIG --variable=glib_mkenums glib-2.0)"
-
-
-+{ echo "$as_me:$LINENO: checking for kinfo_getfile in -lutil" >&5
-+echo $ECHO_N "checking for kinfo_getfile in -lutil... $ECHO_C" >&6; }
-+if test "${ac_cv_lib_util_kinfo_getfile+set}" = set; then
-+ echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+ ac_check_lib_save_LIBS=$LIBS
-+LIBS="-lutil $LIBS"
-+cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h. */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h. */
-+
-+/* Override any GCC internal prototype to avoid an error.
-+ Use char because int might match the return type of a GCC
-+ builtin and then its argument prototype would still apply. */
-+#ifdef __cplusplus
-+extern "C"
-+#endif
-+char kinfo_getfile ();
-+int
-+main ()
-+{
-+return kinfo_getfile ();
-+ ;
-+ return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext conftest$ac_exeext
-+if { (ac_try="$ac_link"
-+case "(($ac_try" in
-+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-+ *) ac_try_echo=$ac_try;;
-+esac
-+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-+ (eval "$ac_link") 2>conftest.er1
-+ ac_status=$?
-+ grep -v '^ *+' conftest.er1 >conftest.err
-+ rm -f conftest.er1
-+ cat conftest.err >&5
-+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+ (exit $ac_status); } && {
-+ test -z "$ac_c_werror_flag" ||
-+ test ! -s conftest.err
-+ } && test -s conftest$ac_exeext &&
-+ $as_test_x conftest$ac_exeext; then
-+ ac_cv_lib_util_kinfo_getfile=yes
-+else
-+ echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+ ac_cv_lib_util_kinfo_getfile=no
-+fi
-+
-+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
-+ conftest$ac_exeext conftest.$ac_ext
-+LIBS=$ac_check_lib_save_LIBS
-+fi
-+{ echo "$as_me:$LINENO: result: $ac_cv_lib_util_kinfo_getfile" >&5
-+echo "${ECHO_T}$ac_cv_lib_util_kinfo_getfile" >&6; }
-+if test $ac_cv_lib_util_kinfo_getfile = yes; then
-+ LIBS="${LIBS} -lutil"
-+
-+cat >>confdefs.h <<\_ACEOF
-+#define HAVE_KINFO_GETFILE 1
-+_ACEOF
-+
-+else
-+ :
-+fi
-+
-+
- # Extract the first word of "gtk-builder-convert", so it can be a program name with args.
- set dummy gtk-builder-convert; ac_word=$2
- { echo "$as_me:$LINENO: checking for $ac_word" >&5
Deleted: trunk/x11/gnome-terminal/files/patch-configure.ac
===================================================================
--- trunk/x11/gnome-terminal/files/patch-configure.ac 2015-08-22 22:53:04 UTC (rev 19977)
+++ trunk/x11/gnome-terminal/files/patch-configure.ac 2015-08-22 22:55:33 UTC (rev 19978)
@@ -1,13 +0,0 @@
---- configure.ac.orig 2009-05-03 15:25:26.000000000 -0400
-+++ configure.ac 2009-05-03 15:26:34.000000000 -0400
-@@ -96,6 +96,10 @@ AC_SUBST([GLIB_GENMARSHAL])
- GLIB_MKENUMS="$($PKG_CONFIG --variable=glib_mkenums glib-2.0)"
- AC_SUBST([GLIB_MKENUMS])
-
-+AC_CHECK_LIB(util, kinfo_getfile,
-+ [LIBS="${LIBS} -lutil"
-+ AC_DEFINE(HAVE_KINFO_GETFILE, 1, [Define if you have the kinfo_getfile function])], [:])
-+
- AC_PATH_PROG([GTK_BUILDER_CONVERT],[gtk-builder-convert],[false])
- if test "$GTK_BUILDER_CONVERT" = "false"; then
- AC_MSG_ERROR([gtk-builder-convert not found])
Modified: trunk/x11/gnome-terminal/files/patch-src_terminal-screen.c
===================================================================
--- trunk/x11/gnome-terminal/files/patch-src_terminal-screen.c 2015-08-22 22:53:04 UTC (rev 19977)
+++ trunk/x11/gnome-terminal/files/patch-src_terminal-screen.c 2015-08-22 22:55:33 UTC (rev 19978)
@@ -1,97 +1,24 @@
---- src/terminal-screen.c.orig 2009-08-13 14:39:24.000000000 +0200
-+++ src/terminal-screen.c 2009-08-20 10:41:58.000000000 +0200
-@@ -18,6 +18,15 @@
-
- #include <config.h>
-
-+#ifdef __FreeBSD__
-+#include <sys/types.h>
-+#include <sys/sysctl.h>
-+#include <sys/param.h>
-+#include <sys/user.h>
-+#ifdef HAVE_KINFO_GETFILE
-+#include <libutil.h>
+--- src/terminal-screen.c.orig 2014-09-23 20:15:23.000000000 +0200
++++ src/terminal-screen.c 2014-11-09 20:19:35.759291981 +0100
+@@ -1192,7 +1192,21 @@
+ for (j = 0; j < n_fds; j++) {
+ if (fds[j] == target_fd) {
+ do {
++#if defined(F_DUPFD_CLOEXEC)
+ fd = fcntl (fds[j], F_DUPFD_CLOEXEC, 3);
++#else
++ fd = fcntl (fds[j], F_DUPFD, 3);
++ int flags = fcntl (fd, F_GETFD);
++ if (flags == -1)
++ {
++ //errror
++ }
++ flags |= FD_CLOEXEC;
++ if (fcntl (fd, F_SETFD, FD_CLOEXEC) == -1)
++ {
++ //error
++ }
+#endif
-+#endif
- #include <string.h>
- #include <stdlib.h>
- #include <unistd.h>
-@@ -184,15 +193,28 @@ G_DEFINE_TYPE (TerminalScreen, terminal_
- static char *
- cwd_of_pid (int pid)
- {
-+#ifndef __FreeBSD__
- static const char patterns[][18] = {
- "/proc/%d/cwd", /* Linux */
- "/proc/%d/path/cwd", /* Solaris >= 10 */
- };
-+#else
-+#if __FreeBSD_version > 800018 || (__FreeBSD_version < 800000 && __FreeBSD_version >= 700104)
-+ struct kinfo_file *freep, *kif;
-+#ifndef HAVE_KINFO_GETFILE
-+ size_t len;
-+ int name[4];
-+#else
-+ int cnt;
-+#endif /* HAVE_KINFO_GETFILE */
-+#endif /* __FreeBSD_version > 800018 || (__FreeBSD_version < 800000 && __FreeBSD_version >= 700104) */
-+#endif /* __FreeBSD__ */
- guint i;
-
- if (pid == -1)
- return NULL;
-
-+#ifndef __FreeBSD__
- /* Try to get the working directory using various OS-specific mechanisms */
- for (i = 0; i < G_N_ELEMENTS (patterns); ++i)
- {
-@@ -230,6 +252,49 @@ cwd_of_pid (int pid)
- return working_dir;
- }
- }
-+#else
-+ int fgpid = pid;
-+#if __FreeBSD_version > 800018 || (__FreeBSD_version < 800000 && __FreeBSD_version >= 700104)
-+#ifndef HAVE_KINFO_GETFILE
-+ name[0] = CTL_KERN;
-+ name[1] = KERN_PROC;
-+ name[2] = KERN_PROC_FILEDESC;
-+ name[3] = fgpid;
-+
-+ if (sysctl (name, 4, NULL, &len, NULL, 0) < 0)
-+ return NULL;
-+ freep = kif = g_malloc (len);
-+ if (sysctl (name, 4, kif, &len, NULL, 0) < 0)
-+ {
-+ g_free (freep);
-+ return NULL;
-+ }
-+#else
-+ freep = kinfo_getfile (fgpid, &cnt);
-+#endif /* HAVE_KINFO_GETFILE */
-+
-+#ifndef HAVE_KINFO_GETFILE
-+ for (i = 0; i < len / sizeof (*kif); i++, kif++)
-+ {
-+ if (kif->kf_structsize != sizeof (*kif))
-+ continue;
-+#else
-+ for (i = 0; i < cnt; i++)
-+ {
-+ kif = &freep[i];
-+#endif /* HAVE_KINFO_GETFILE */
-+ if (kif->kf_fd == KF_FD_TYPE_CWD)
-+ {
-+ char *working_dir;
-+
-+ working_dir = g_strdup (kif->kf_path);
-+ g_free (freep);
-+ return working_dir;
-+ }
-+ }
-+ g_free (freep);
-+#endif /* __FreeBSD_version > 800018 || (__FreeBSD_version < 800000 && __FreeBSD_version >= 700104) */
-+#endif /* __FreeBSD__ */
-
- return NULL;
- }
+ } while (fd == -1 && errno == EINTR);
+ if (fd == -1)
+ _exit (127);
Modified: trunk/x11/gnome-terminal/pkg-plist
===================================================================
--- trunk/x11/gnome-terminal/pkg-plist 2015-08-22 22:53:04 UTC (rev 19977)
+++ trunk/x11/gnome-terminal/pkg-plist 2015-08-22 22:55:33 UTC (rev 19978)
@@ -6,6 +6,7 @@
share/appdata/gnome-terminal.appdata.xml
share/applications/gnome-terminal.desktop
share/dbus-1/services/org.gnome.Terminal.service
+%%SEARCHPROVIDER%%share/gnome-shell/search-providers/gnome-terminal-search-provider.ini
share/help/C/gnome-terminal/adv-keyboard-shortcuts.page
share/help/C/gnome-terminal/app-colors.page
share/help/C/gnome-terminal/app-cursor.page
@@ -32,7 +33,7 @@
share/help/C/gnome-terminal/pref-profiles.page
share/help/C/gnome-terminal/pref-scrolling.page
share/help/C/gnome-terminal/pref-tab-window.page
-share/help/C/gnome-terminal/pref-theme.page
+share/help/C/gnome-terminal/pref-user-input.page
share/help/C/gnome-terminal/pref.page
share/help/C/gnome-terminal/prob-reset.page
share/help/C/gnome-terminal/profile.page
@@ -64,7 +65,7 @@
share/help/cs/gnome-terminal/pref-profiles.page
share/help/cs/gnome-terminal/pref-scrolling.page
share/help/cs/gnome-terminal/pref-tab-window.page
-share/help/cs/gnome-terminal/pref-theme.page
+share/help/cs/gnome-terminal/pref-user-input.page
share/help/cs/gnome-terminal/pref.page
share/help/cs/gnome-terminal/prob-reset.page
share/help/cs/gnome-terminal/profile.page
@@ -96,7 +97,7 @@
share/help/de/gnome-terminal/pref-profiles.page
share/help/de/gnome-terminal/pref-scrolling.page
share/help/de/gnome-terminal/pref-tab-window.page
-share/help/de/gnome-terminal/pref-theme.page
+share/help/de/gnome-terminal/pref-user-input.page
share/help/de/gnome-terminal/pref.page
share/help/de/gnome-terminal/prob-reset.page
share/help/de/gnome-terminal/profile.page
@@ -128,7 +129,7 @@
share/help/el/gnome-terminal/pref-profiles.page
share/help/el/gnome-terminal/pref-scrolling.page
share/help/el/gnome-terminal/pref-tab-window.page
-share/help/el/gnome-terminal/pref-theme.page
+share/help/el/gnome-terminal/pref-user-input.page
share/help/el/gnome-terminal/pref.page
share/help/el/gnome-terminal/prob-reset.page
share/help/el/gnome-terminal/profile.page
@@ -160,7 +161,7 @@
share/help/es/gnome-terminal/pref-profiles.page
share/help/es/gnome-terminal/pref-scrolling.page
share/help/es/gnome-terminal/pref-tab-window.page
-share/help/es/gnome-terminal/pref-theme.page
+share/help/es/gnome-terminal/pref-user-input.page
share/help/es/gnome-terminal/pref.page
share/help/es/gnome-terminal/prob-reset.page
share/help/es/gnome-terminal/profile.page
@@ -192,7 +193,7 @@
share/help/fi/gnome-terminal/pref-profiles.page
share/help/fi/gnome-terminal/pref-scrolling.page
share/help/fi/gnome-terminal/pref-tab-window.page
-share/help/fi/gnome-terminal/pref-theme.page
+share/help/fi/gnome-terminal/pref-user-input.page
share/help/fi/gnome-terminal/pref.page
share/help/fi/gnome-terminal/prob-reset.page
share/help/fi/gnome-terminal/profile.page
@@ -224,7 +225,7 @@
share/help/fr/gnome-terminal/pref-profiles.page
share/help/fr/gnome-terminal/pref-scrolling.page
share/help/fr/gnome-terminal/pref-tab-window.page
-share/help/fr/gnome-terminal/pref-theme.page
+share/help/fr/gnome-terminal/pref-user-input.page
share/help/fr/gnome-terminal/pref.page
share/help/fr/gnome-terminal/prob-reset.page
share/help/fr/gnome-terminal/profile.page
@@ -256,7 +257,7 @@
share/help/gl/gnome-terminal/pref-profiles.page
share/help/gl/gnome-terminal/pref-scrolling.page
share/help/gl/gnome-terminal/pref-tab-window.page
-share/help/gl/gnome-terminal/pref-theme.page
+share/help/gl/gnome-terminal/pref-user-input.page
share/help/gl/gnome-terminal/pref.page
share/help/gl/gnome-terminal/prob-reset.page
share/help/gl/gnome-terminal/profile.page
@@ -288,7 +289,7 @@
share/help/hu/gnome-terminal/pref-profiles.page
share/help/hu/gnome-terminal/pref-scrolling.page
share/help/hu/gnome-terminal/pref-tab-window.page
-share/help/hu/gnome-terminal/pref-theme.page
+share/help/hu/gnome-terminal/pref-user-input.page
share/help/hu/gnome-terminal/pref.page
share/help/hu/gnome-terminal/prob-reset.page
share/help/hu/gnome-terminal/profile.page
@@ -320,7 +321,7 @@
share/help/pt_BR/gnome-terminal/pref-profiles.page
share/help/pt_BR/gnome-terminal/pref-scrolling.page
share/help/pt_BR/gnome-terminal/pref-tab-window.page
-share/help/pt_BR/gnome-terminal/pref-theme.page
+share/help/pt_BR/gnome-terminal/pref-user-input.page
share/help/pt_BR/gnome-terminal/pref.page
share/help/pt_BR/gnome-terminal/prob-reset.page
share/help/pt_BR/gnome-terminal/profile.page
@@ -352,7 +353,7 @@
share/help/ru/gnome-terminal/pref-profiles.page
share/help/ru/gnome-terminal/pref-scrolling.page
share/help/ru/gnome-terminal/pref-tab-window.page
-share/help/ru/gnome-terminal/pref-theme.page
+share/help/ru/gnome-terminal/pref-user-input.page
share/help/ru/gnome-terminal/pref.page
share/help/ru/gnome-terminal/prob-reset.page
share/help/ru/gnome-terminal/profile.page
More information about the Midnightbsd-cvs
mailing list