diff options
Diffstat (limited to 'x11-toolkits/vte/files')
4 files changed, 25 insertions, 78 deletions
diff --git a/x11-toolkits/vte/files/patch-gnome-pty-helper_Makefile.in b/x11-toolkits/vte/files/patch-gnome-pty-helper_Makefile.in index 8f838a9b007f..5534225003e7 100644 --- a/x11-toolkits/vte/files/patch-gnome-pty-helper_Makefile.in +++ b/x11-toolkits/vte/files/patch-gnome-pty-helper_Makefile.in @@ -1,22 +1,5 @@ --- gnome-pty-helper/Makefile.in.orig 2007-07-29 17:20:13.000000000 -0400 +++ gnome-pty-helper/Makefile.in 2007-07-29 17:25:47.000000000 -0400 -@@ -107,6 +107,7 @@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_P - LDFLAGS = @LDFLAGS@ - LIBOBJS = @LIBOBJS@ - LIBS = @LIBS@ -+BSD_PTHREAD_LIBS = @BSD_PTHREAD_LIBS@ - LTLIBOBJS = @LTLIBOBJS@ - MAINT = @MAINT@ - MAKEINFO = @MAKEINFO@ -@@ -271,7 +272,7 @@ clean-libexecPROGRAMS: - -test -z "$(libexec_PROGRAMS)" || rm -f $(libexec_PROGRAMS) - gnome-pty-helper$(EXEEXT): $(gnome_pty_helper_OBJECTS) $(gnome_pty_helper_DEPENDENCIES) - @rm -f gnome-pty-helper$(EXEEXT) -- $(LINK) $(gnome_pty_helper_OBJECTS) $(gnome_pty_helper_LDADD) $(LIBS) -+ $(LINK) $(gnome_pty_helper_OBJECTS) $(gnome_pty_helper_LDADD) $(LIBS) $(BSD_PTHREAD_LIBS) - - mostlyclean-compile: - -rm -f *.$(OBJEXT) @@ -584,8 +585,8 @@ uninstall-am: uninstall-libexecPROGRAMS diff --git a/x11-toolkits/vte/files/patch-gnome-pty-helper_configure b/x11-toolkits/vte/files/patch-gnome-pty-helper_configure deleted file mode 100644 index 70091c3aa2f7..000000000000 --- a/x11-toolkits/vte/files/patch-gnome-pty-helper_configure +++ /dev/null @@ -1,27 +0,0 @@ ---- gnome-pty-helper/configure.orig 2008-09-08 19:30:02.000000000 -0400 -+++ gnome-pty-helper/configure 2008-09-08 19:31:21.000000000 -0400 -@@ -673,6 +673,7 @@ AMTAR - am__tar - am__untar - CC -+BSD_PTHREAD_LIBS - CFLAGS - LDFLAGS - CPPFLAGS -@@ -8434,6 +8435,7 @@ AMTAR!$AMTAR$ac_delim - am__tar!$am__tar$ac_delim - am__untar!$am__untar$ac_delim - CC!$CC$ac_delim -+BSD_PTHREAD_LIBS!$BSD_PTHREAD_LIBS$ac_delim - CFLAGS!$CFLAGS$ac_delim - LDFLAGS!$LDFLAGS$ac_delim - CPPFLAGS!$CPPFLAGS$ac_delim -@@ -8470,7 +8472,7 @@ LIBOBJS!$LIBOBJS$ac_delim - LTLIBOBJS!$LTLIBOBJS$ac_delim - _ACEOF - -- if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 94; then -+ if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 95; then - break - elif $ac_last_try; then - { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5 diff --git a/x11-toolkits/vte/files/patch-gnome-pty-helper_gnome-pty-helper.c b/x11-toolkits/vte/files/patch-gnome-pty-helper_gnome-pty-helper.c deleted file mode 100644 index 6be543a31e05..000000000000 --- a/x11-toolkits/vte/files/patch-gnome-pty-helper_gnome-pty-helper.c +++ /dev/null @@ -1,26 +0,0 @@ ---- gnome-pty-helper/gnome-pty-helper.c.orig Tue Feb 14 03:58:10 2006 -+++ gnome-pty-helper/gnome-pty-helper.c Sat Feb 25 16:38:04 2006 -@@ -95,12 +95,12 @@ static pty_info *pty_list; - #endif /* CMSG_DATA */ - - static struct cmsghdr *cmptr; --static int CONTROLLEN; -+static socklen_t CONTROLLEN; - - static int - init_msg_pass (void) - { -- CONTROLLEN = (CMSG_DATA (cmptr) - (unsigned char *)cmptr) + sizeof(int); -+ CONTROLLEN = CMSG_SPACE (sizeof (int)); - cmptr = malloc (CONTROLLEN); - - if (cmptr) -@@ -128,7 +128,7 @@ pass_fd (int client_fd, int fd) - - cmptr->cmsg_level = SOL_SOCKET; - cmptr->cmsg_type = SCM_RIGHTS; -- cmptr->cmsg_len = CONTROLLEN; -+ cmptr->cmsg_len = CMSG_LEN (sizeof (fd)); - *(int *)CMSG_DATA (cmptr) = fd; - - if (sendmsg (client_fd, &msg, 0) != 1) diff --git a/x11-toolkits/vte/files/patch-python_Makefile.in b/x11-toolkits/vte/files/patch-python_Makefile.in index 10ee93b1347b..d8c01a7483df 100644 --- a/x11-toolkits/vte/files/patch-python_Makefile.in +++ b/x11-toolkits/vte/files/patch-python_Makefile.in @@ -1,19 +1,36 @@ ---- python/Makefile.in.orig Tue Feb 27 12:46:42 2007 -+++ python/Makefile.in Tue Feb 27 12:47:11 2007 -@@ -61,7 +61,6 @@ +--- python/Makefile.in.orig 2009-03-16 08:49:19.000000000 +0100 ++++ python/Makefile.in 2009-03-16 08:51:17.000000000 +0100 +@@ -56,7 +56,6 @@ LTLIBRARIES = $(pythonsiteexec_LTLIBRARIES) am__DEPENDENCIES_1 = @BUILD_PYTHON_MODULES_TRUE@vtemodule_la_DEPENDENCIES = \ -@BUILD_PYTHON_MODULES_TRUE@ $(top_builddir)/src/libvte.la \ @BUILD_PYTHON_MODULES_TRUE@ $(am__DEPENDENCIES_1) \ @BUILD_PYTHON_MODULES_TRUE@ $(am__DEPENDENCIES_1) \ - @BUILD_PYTHON_MODULES_TRUE@ $(am__DEPENDENCIES_1) \ -@@ -303,7 +302,7 @@ + @BUILD_PYTHON_MODULES_TRUE@ $(am__DEPENDENCIES_1) +@@ -290,11 +289,11 @@ + top_builddir = @top_builddir@ + top_srcdir = @top_srcdir@ + EXTRA_DIST = vte.defs pyvte.pc.in vte.override cat.py unrealize.py vte-demo.py +-defsdir = $(datadir)/pygtk/2.0/defs +-defs_DATA = vte.defs +-pkgconfigdir = $(prefix)/libdata/pkgconfig +-pkgconfig_DATA = pyvte.pc +-PYTHON_MODULES = vtemodule.la ++@BUILD_PYTHON_MODULES_TRUE@defsdir = $(datadir)/pygtk/2.0/defs ++@BUILD_PYTHON_MODULES_TRUE@defs_DATA = vte.defs ++@BUILD_PYTHON_MODULES_TRUE@pkgconfigdir = $(prefix)/libdata/pkgconfig ++@BUILD_PYTHON_MODULES_TRUE@pkgconfig_DATA = pyvte.pc ++@BUILD_PYTHON_MODULES_TRUE@PYTHON_MODULES = vtemodule.la + @BUILD_PYTHON_MODULES_TRUE@pythonsiteexecdir = $(pyexecdir)/gtk-2.0 + @BUILD_PYTHON_MODULES_TRUE@pythonsiteexec_LTLIBRARIES = $(PYTHON_MODULES) @BUILD_PYTHON_MODULES_TRUE@CLEANFILES = vte.c - @BUILD_PYTHON_MODULES_TRUE@vtemodule_la_CFLAGS = $(VTE_CFLAGS) $(X_CFLAGS) $(PYTHON_INCLUDES) $(PYGTK_CFLAGS) - @BUILD_PYTHON_MODULES_TRUE@vtemodule_la_SOURCES = vtemodule.c +@@ -305,7 +304,7 @@ + # we do this to suport building with -Wl,-z,defs which errors on + # vtemodule.so as we cannot include $(PYTHON_LIBS) due to bug 410986. + @BUILD_PYTHON_MODULES_TRUE@vtemodule_la_LDFLAGS = -module -avoid-version -export-symbols-regex initvte $(PYTHON_LDFLAGS) $(AM_LDFLAGS) -@BUILD_PYTHON_MODULES_TRUE@vtemodule_la_LIBADD = $(top_builddir)/src/libvte.la $(LIBS) $(PYGTK_LIBS) $(VTE_LIBS) $(X_LIBS) +@BUILD_PYTHON_MODULES_TRUE@vtemodule_la_LIBADD = -lvte $(LIBS) $(PYGTK_LIBS) $(VTE_LIBS) $(X_LIBS) - @BUILD_PYTHON_MODULES_TRUE@vtemodule_la_LDFLAGS = -module -avoid-version -export-symbols-regex initvte @BUILD_PYTHON_MODULES_TRUE@nodist_vtemodule_la_SOURCES = vte.c all: all-am + |