Index: head/x11-toolkits/gtkextra2/Makefile =================================================================== --- head/x11-toolkits/gtkextra2/Makefile (revision 408879) +++ head/x11-toolkits/gtkextra2/Makefile (revision 408880) @@ -1,38 +1,41 @@ # Created by: Maxim Sobolev # $FreeBSD$ PORTNAME= gtkextra PORTVERSION= 2.1.2 PORTREVISION= 4 CATEGORIES= x11-toolkits MASTER_SITES= SF/${PORTNAME}/${PORTVERSION} DISTNAME= ${PORTNAME:S/gtk/gtk+/}-${PORTVERSION} MAINTAINER= ports@FreeBSD.org COMMENT= Useful widget set complementary to GTK+ 2.0 +LICENSE= GPLv2+ +LICENSE_FILE= ${WRKSRC}/COPYING + USES= gmake libtool pathfix pkgconfig USE_GNOME= gtk20 GNU_CONFIGURE= yes USE_CSTD= gnu89 USE_LDCONFIG= yes INSTALL_TARGET= install-strip DOCSDIR= ${PREFIX}/share/doc/gtkextra2 PORTDOCS= * OPTIONS_DEFINE= DOCS post-patch: @${REINPLACE_CMD} -e '/^SUBDIRS/s|docs||' ${WRKSRC}/Makefile.in @${REINPLACE_CMD} -e 's|glib/.*\.h>|glib.h>|g' \ ${WRKSRC}/gtkextra/gtkcharsel.c -post-install: +post-install-DOCS-on: .for d in reference tutorial @${MKDIR} ${STAGEDIR}${DOCSDIR}/${d} @(cd ${WRKSRC}/docs/${d} && ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR}) .endfor .include Index: head/x11-toolkits/gtkextra2/files/patch-Makefile.in =================================================================== --- head/x11-toolkits/gtkextra2/files/patch-Makefile.in (revision 408879) +++ head/x11-toolkits/gtkextra2/files/patch-Makefile.in (nonexistent) @@ -1,16 +0,0 @@ ---- gtkextra/Makefile.in.orig 2011-10-27 00:29:46.287956897 +0200 -+++ gtkextra/Makefile.in 2011-10-27 00:30:31.199394384 +0200 -@@ -1028,11 +1028,11 @@ - $(libgtkextra_x11_2_0_la_OBJECTS) $(libgtkextra_linux_fb_2_0_la_OBJECTS) $(libgtkextra_win32_2_0_la_OBJECTS): ${gtkextra_built_public_sources} ${gtkextra_built_private_headers} - - $(srcdir)/gtkextra-marshal.h: gtkextra-marshal.list -- ( @GLIB_GENMARSHAL@ --prefix=gtkextra gtkextra-marshal.list --header > gtkextra-marshal.tmp \ -+ ( glib-genmarshal --prefix=gtkextra gtkextra-marshal.list --header > gtkextra-marshal.tmp \ - && mv gtkextra-marshal.tmp gtkextra-marshal.h ) \ - || ( rm -f gtkextra-marshal.tmp && exit 1 ) - $(srcdir)/gtkextra-marshal.c: gtkextra-marshal.h -- ( @GLIB_GENMARSHAL@ --prefix=gtkextra gtkextra-marshal.list --body > gtkextra-marshal.tmp \ -+ ( glib-genmarshal --prefix=gtkextra gtkextra-marshal.list --body > gtkextra-marshal.tmp \ - && mv gtkextra-marshal.tmp gtkextra-marshal.c ) \ - || ( rm -f gtkextra-marshal.tmp && exit 1 ) - Property changes on: head/x11-toolkits/gtkextra2/files/patch-Makefile.in ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/x11-toolkits/gtkextra2/files/patch-gtkcolorcombo.c =================================================================== --- head/x11-toolkits/gtkextra2/files/patch-gtkcolorcombo.c (revision 408879) +++ head/x11-toolkits/gtkextra2/files/patch-gtkcolorcombo.c (nonexistent) @@ -1,11 +0,0 @@ ---- gtkextra/gtkcolorcombo.c.orig 2011-10-27 00:08:40.655552360 +0200 -+++ gtkextra/gtkcolorcombo.c 2011-10-27 00:09:03.934648236 +0200 -@@ -146,7 +146,7 @@ - GTK_CLASS_TYPE(object_class), - GTK_SIGNAL_OFFSET(GtkColorComboClass, - changed), -- gtkextra_VOID__INT_BOXED, -+ gtkextra_VOID__BOXED_BOXED, - GTK_TYPE_NONE, - 2, GTK_TYPE_INT, GDK_TYPE_COLOR); - Property changes on: head/x11-toolkits/gtkextra2/files/patch-gtkcolorcombo.c ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/x11-toolkits/gtkextra2/files/patch-gtkextra_Makefile.in =================================================================== --- head/x11-toolkits/gtkextra2/files/patch-gtkextra_Makefile.in (nonexistent) +++ head/x11-toolkits/gtkextra2/files/patch-gtkextra_Makefile.in (revision 408880) @@ -0,0 +1,16 @@ +--- gtkextra/Makefile.in.orig 2016-02-14 18:23:03 UTC ++++ gtkextra/Makefile.in +@@ -1028,11 +1028,11 @@ uninstall-am: uninstall-gtkextraincludeH + $(libgtkextra_x11_2_0_la_OBJECTS) $(libgtkextra_linux_fb_2_0_la_OBJECTS) $(libgtkextra_win32_2_0_la_OBJECTS): ${gtkextra_built_public_sources} ${gtkextra_built_private_headers} + + $(srcdir)/gtkextra-marshal.h: gtkextra-marshal.list +- ( @GLIB_GENMARSHAL@ --prefix=gtkextra gtkextra-marshal.list --header > gtkextra-marshal.tmp \ ++ ( glib-genmarshal --prefix=gtkextra gtkextra-marshal.list --header > gtkextra-marshal.tmp \ + && mv gtkextra-marshal.tmp gtkextra-marshal.h ) \ + || ( rm -f gtkextra-marshal.tmp && exit 1 ) + $(srcdir)/gtkextra-marshal.c: gtkextra-marshal.h +- ( @GLIB_GENMARSHAL@ --prefix=gtkextra gtkextra-marshal.list --body > gtkextra-marshal.tmp \ ++ ( glib-genmarshal --prefix=gtkextra gtkextra-marshal.list --body > gtkextra-marshal.tmp \ + && mv gtkextra-marshal.tmp gtkextra-marshal.c ) \ + || ( rm -f gtkextra-marshal.tmp && exit 1 ) + Property changes on: head/x11-toolkits/gtkextra2/files/patch-gtkextra_Makefile.in ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/x11-toolkits/gtkextra2/files/patch-gtkextra_gtkcolorcombo.c =================================================================== --- head/x11-toolkits/gtkextra2/files/patch-gtkextra_gtkcolorcombo.c (nonexistent) +++ head/x11-toolkits/gtkextra2/files/patch-gtkextra_gtkcolorcombo.c (revision 408880) @@ -0,0 +1,11 @@ +--- gtkextra/gtkcolorcombo.c.orig 2004-09-16 17:48:05 UTC ++++ gtkextra/gtkcolorcombo.c +@@ -146,7 +146,7 @@ gtk_color_combo_class_init (GtkColorComb + GTK_CLASS_TYPE(object_class), + GTK_SIGNAL_OFFSET(GtkColorComboClass, + changed), +- gtkextra_VOID__INT_BOXED, ++ gtkextra_VOID__BOXED_BOXED, + GTK_TYPE_NONE, + 2, GTK_TYPE_INT, GDK_TYPE_COLOR); + Property changes on: head/x11-toolkits/gtkextra2/files/patch-gtkextra_gtkcolorcombo.c ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/x11-toolkits/gtkextra2/files/patch-gtkextra_gtkitementry.c =================================================================== --- head/x11-toolkits/gtkextra2/files/patch-gtkextra_gtkitementry.c (revision 408879) +++ head/x11-toolkits/gtkextra2/files/patch-gtkextra_gtkitementry.c (revision 408880) @@ -1,27 +1,27 @@ ---- gtkextra/gtkitementry.c.orig 2010-03-13 14:49:00.000000000 +0900 -+++ gtkextra/gtkitementry.c 2010-11-30 21:38:09.000000000 +0900 -@@ -131,7 +131,6 @@ +--- gtkextra/gtkitementry.c.orig 2010-03-13 05:49:00 UTC ++++ gtkextra/gtkitementry.c +@@ -131,7 +131,6 @@ static void gtk_entry_draw_curso static PangoLayout *gtk_entry_ensure_layout (GtkEntry *entry, gboolean include_preedit); static void gtk_entry_queue_draw (GtkEntry *entry); -static void gtk_entry_reset_im_context (GtkEntry *entry); static void gtk_entry_recompute (GtkEntry *entry); static void gtk_entry_get_cursor_locations (GtkEntry *entry, CursorType type, -@@ -1755,16 +1754,6 @@ +@@ -1755,16 +1754,6 @@ gtk_entry_queue_draw (GtkEntry *entry) } static void -gtk_entry_reset_im_context (GtkEntry *entry) -{ - if (entry->need_im_reset) - { - entry->need_im_reset = 0; - gtk_im_context_reset (entry->im_context); - } -} - -static void gtk_entry_get_cursor_locations (GtkEntry *entry, CursorType type, gint *strong_x,