Attachment 152762 Details for Bug 197463 – x11-toolkits_fltk.diff

[patch] x11-toolkits_fltk.diff

x11-toolkits_fltk.diff (text/plain), 7.61 KB, created by tkato432 on 2015-02-08 19:28:06 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: tkato432

Created: 2015-02-08 19:28:06 UTC

Size: 7.61 KB

patch

obsolete

>diff -urN /usr/ports/x11-toolkits/fltk/Makefile x11-toolkits/fltk/Makefile
>--- /usr/ports/x11-toolkits/fltk/Makefile	2015-02-04 05:54:14.607254000 +0900
>+++ x11-toolkits/fltk/Makefile	2015-02-09 00:00:00.000000000 +0900
>@@ -2,39 +2,51 @@
> # $FreeBSD: head/x11-toolkits/fltk/Makefile 378351 2015-02-03 13:55:05Z danfe $
> 
> PORTNAME=	fltk
>-PORTVERSION=	1.3.2
>-PORTREVISION=	2
>+PORTVERSION=	1.3.3
>+DISTVERSIONSUFFIX=	-source
> CATEGORIES=	x11-toolkits
>-MASTER_SITES=	http://fltk.org/pub/${PORTNAME}/${PORTVERSION}/
>-DISTNAME=	${PORTNAME}-${PORTVERSION}-source
>+MASTER_SITES=	http://fltk.org/pub/%SUBDIR%/
>+MASTER_SITE_SUBDIR=	${PORTNAME}/${PORTVERSION}
> 
> MAINTAINER=	ports@FreeBSD.org
> COMMENT=	Cross-platform C++ graphical user interface toolkit
> 
> LICENSE=	LGPL20
> 
>-LIB_DEPENDS=	libpng.so:${PORTSDIR}/graphics/png \
>-		libjpeg.so:${PORTSDIR}/graphics/jpeg
>+LIB_DEPENDS=	libjpeg.so:${PORTSDIR}/graphics/jpeg \
>+		libpng.so:${PORTSDIR}/graphics/png
>+
>+WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
> 
> USES=		pkgconfig
> USE_XORG=	xft
> USE_GL=		glu
>-USE_LDCONFIG=	yes
> GNU_CONFIGURE=	yes
>-CONFIGURE_ARGS=	--enable-shared
>-
>-WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
>+CONFIGURE_ARGS=	--enable-threads \
>+		--enable-shared \
>+		--enable-xft
>+USE_LDCONFIG=	yes
> 
> CPPFLAGS+=	-I${LOCALBASE}/include
>-LDFLAGS+=	-L${WRKSRC}/src -L${LOCALBASE}/lib
>+LDFLAGS+=	-L${LOCALBASE}/lib
> 
> PORTDOCS=	*
> 
> OPTIONS_DEFINE=	DOCS
> 
> post-patch:
>-	prefix="${PREFIX}" ; plength=$$(($${#prefix}+10)) ; \
>-	${REINPLACE_CMD} -e "\|/etc/fltk|{s||${PREFIX}&|;s|10|$${plength}|;}" \
>-	${WRKSRC}/src/Fl_Preferences.cxx
>+	@${REINPLACE_CMD} -e \
>+		'/.SILENT/s|^|#| ; \
>+		 /echo /s|^|#|' ${WRKSRC}/makeinclude.in
>+	@${REINPLACE_CMD} -e \
>+		'/cat[13]/s|^|#|' ${WRKSRC}/documentation/Makefile
>+	@${REINPLACE_CMD} -e \
>+		's|"/etc/fltk/"|"${ETCDIR}/"|' ${WRKSRC}/src/Fl_Preferences.cxx
>+
>+post-install:
>+	@(cd ${WRKSRC}/test && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} \
>+		${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} install)
>+	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/fluid
>+	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libfltk*.so.[0-9]*
> 
> .include <bsd.port.mk>
>diff -urN /usr/ports/x11-toolkits/fltk/distinfo x11-toolkits/fltk/distinfo
>--- /usr/ports/x11-toolkits/fltk/distinfo	2014-06-21 17:48:31.000000000 +0900
>+++ x11-toolkits/fltk/distinfo	2015-02-09 00:00:00.000000000 +0900
>@@ -1,2 +1,2 @@
>-SHA256 (fltk-1.3.2-source.tar.gz) = 176044df94f31bd53a5806cf5054ca78b180bf9ae27ce47649608833695ee4a4
>-SIZE (fltk-1.3.2-source.tar.gz) = 4260874
>+SHA256 (fltk-1.3.3-source.tar.gz) = f8398d98d7221d40e77bc7b19e761adaf2f1ef8bb0c30eceb7beb4f2273d0d97
>+SIZE (fltk-1.3.3-source.tar.gz) = 4986376
>diff -urN /usr/ports/x11-toolkits/fltk/files/patch-configure x11-toolkits/fltk/files/patch-configure
>--- /usr/ports/x11-toolkits/fltk/files/patch-configure	2014-06-21 17:48:31.000000000 +0900
>+++ x11-toolkits/fltk/files/patch-configure	2015-02-09 00:00:00.000000000 +0900
>@@ -1,11 +1,11 @@
> --- configure.orig	2011-08-31 09:14:41.000000000 +0200
> +++ configure	2011-08-31 09:14:54.000000000 +0200
>-@@ -11566,7 +11566,7 @@
>+@@ -7362,7 +7362,7 @@
>  	LIBS="$LIBS -lX11 $X_EXTRA_LIBS"
>  	CFLAGS="$CFLAGS $X_CFLAGS"
>  	CXXFLAGS="$CXXFLAGS $X_CFLAGS"
> -	LDFLAGS="$X_LIBS $LDFLAGS"
> +	LDFLAGS="$LDFLAGS $X_LIBS"
>  	DSOFLAGS="$X_LIBS $DSOFLAGS"
>- 	cat >>confdefs.h <<\_ACEOF
>- #define USE_X11 1
>+ 	$as_echo "#define USE_X11 1" >>confdefs.h
>+ 
>diff -urN /usr/ports/x11-toolkits/fltk/files/patch-documentation_Makefile x11-toolkits/fltk/files/patch-documentation_Makefile
>--- /usr/ports/x11-toolkits/fltk/files/patch-documentation_Makefile	2015-02-04 05:54:14.611988000 +0900
>+++ x11-toolkits/fltk/files/patch-documentation_Makefile	1970-01-01 09:00:00.000000000 +0900
>@@ -1,14 +0,0 @@
>---- documentation/Makefile.orig	2011-08-27 01:33:42.000000000 +0000
>-+++ documentation/Makefile	2011-08-27 01:39:59.000000000 +0000
>-@@ -84,11 +84,6 @@
>- 	  $(INSTALL_DATA) fltk.pdf $(DESTDIR)$(docdir); \
>- 	fi
>- 	echo "Installing man pages in $(DESTDIR)$(mandir) ..."
>--	-$(INSTALL_DIR) $(DESTDIR)$(mandir)/cat1
>--	$(INSTALL_MAN) $(SRC_DOCDIR)/fluid.$(CAT1EXT) $(DESTDIR)$(mandir)/cat1
>--	$(INSTALL_MAN) $(SRC_DOCDIR)/fltk-config.$(CAT1EXT) $(DESTDIR)$(mandir)/cat1
>--	-$(INSTALL_DIR) $(DESTDIR)$(mandir)/cat3
>--	$(INSTALL_MAN) $(SRC_DOCDIR)/fltk.$(CAT3EXT) $(DESTDIR)$(mandir)/cat3
>- 	-$(INSTALL_DIR) $(DESTDIR)$(mandir)/man1
>- 	$(INSTALL_MAN) $(SRC_DOCDIR)/fluid.man $(DESTDIR)$(mandir)/man1/fluid.1
>- 	$(INSTALL_MAN) $(SRC_DOCDIR)/fltk-config.man $(DESTDIR)$(mandir)/man1/fltk-config.1
>diff -urN /usr/ports/x11-toolkits/fltk/files/patch-fluid_Fl_Type.h x11-toolkits/fltk/files/patch-fluid_Fl_Type.h
>--- /usr/ports/x11-toolkits/fltk/files/patch-fluid_Fl_Type.h	2014-06-21 17:48:31.000000000 +0900
>+++ x11-toolkits/fltk/files/patch-fluid_Fl_Type.h	1970-01-01 09:00:00.000000000 +0900
>@@ -1,16 +0,0 @@
>---- fluid/Fl_Type.h.orig	2013-10-15 09:58:05.000000000 +0200
>-+++ fluid/Fl_Type.h	2013-10-15 10:01:26.000000000 +0200
>-@@ -33,10 +33,12 @@
>- 
>- void set_modflag(int mf);
>- 
>-+Fl_Widget *make_type_browser(int,int,int,int,const char *l=0);
>-+
>- class Fl_Type {
>- 
>-   friend class Widget_Browser;
>--  friend Fl_Widget *make_type_browser(int,int,int,int,const char *l=0);
>-+  friend Fl_Widget *make_type_browser(int,int,int,int,const char *l);
>-   friend class Fl_Window_Type;
>-   virtual void setlabel(const char *); // virtual part of label(char*)
>- 
>diff -urN /usr/ports/x11-toolkits/fltk/files/patch-src_Fl_x.cxx x11-toolkits/fltk/files/patch-src_Fl_x.cxx
>--- /usr/ports/x11-toolkits/fltk/files/patch-src_Fl_x.cxx	2014-06-21 17:48:31.000000000 +0900
>+++ x11-toolkits/fltk/files/patch-src_Fl_x.cxx	1970-01-01 09:00:00.000000000 +0900
>@@ -1,30 +0,0 @@
>-Index: src/Fl_x.cxx
>-===================================================================
>---- src/Fl_x.cxx	(revision 9749)
>-+++ src/Fl_x.cxx	(working copy)
>-@@ -1873,7 +1873,7 @@
>-   // since we do not want save_under, do not want to turn off the
>-   // border, and cannot grab without an existing window. Besides, 
>-   // there is no clear_override(). 
>--  if (win->flags() & Fl_Widget::FULLSCREEN && !Fl_X::ewmh_supported()) {
>-+  if (win->fullscreen_active() && !Fl_X::ewmh_supported()) {
>-     attr.override_redirect = 1;
>-     mask |= CWOverrideRedirect;
>-     Fl::screen_xywh(X, Y, W, H, X, Y, W, H);
>-@@ -1940,7 +1940,7 @@
>-     }
>- 
>-     // If asked for, create fullscreen
>--    if (win->flags() & Fl_Widget::FULLSCREEN && Fl_X::ewmh_supported()) {
>-+    if (win->fullscreen_active() && Fl_X::ewmh_supported()) {
>-       XChangeProperty (fl_display, xp->xid, fl_NET_WM_STATE, XA_ATOM, 32,
>-                        PropModeAppend, (unsigned char*) &fl_NET_WM_STATE_FULLSCREEN, 1);
>-     }
>-@@ -1984,7 +1984,7 @@
>-   }
>- 
>-   // non-EWMH fullscreen case, need grab
>--  if (win->flags() & Fl_Widget::FULLSCREEN && !Fl_X::ewmh_supported()) {
>-+  if (win->fullscreen_active() && !Fl_X::ewmh_supported()) {
>-     XGrabKeyboard(fl_display, xp->xid, 1, GrabModeAsync, GrabModeAsync, fl_event_time);
>-   }
>diff -urN /usr/ports/x11-toolkits/fltk/pkg-plist x11-toolkits/fltk/pkg-plist
>--- /usr/ports/x11-toolkits/fltk/pkg-plist	2015-01-28 16:45:03.000000000 +0900
>+++ x11-toolkits/fltk/pkg-plist	2015-02-09 00:00:00.000000000 +0900
>@@ -17,6 +17,7 @@
> include/FL/Fl_Choice.H
> include/FL/Fl_Clock.H
> include/FL/Fl_Color_Chooser.H
>+include/FL/Fl_Copy_Surface.H
> include/FL/Fl_Counter.H
> include/FL/Fl_Device.H
> include/FL/Fl_Dial.H
>@@ -43,6 +44,7 @@
> include/FL/Fl_Hor_Slider.H
> include/FL/Fl_Hor_Value_Slider.H
> include/FL/Fl_Image.H
>+include/FL/Fl_Image_Surface.H
> include/FL/Fl_Input.H
> include/FL/Fl_Input_.H
> include/FL/Fl_Input_Choice.H
>@@ -121,7 +123,6 @@
> include/FL/Fl_Wizard.H
> include/FL/Fl_XBM_Image.H
> include/FL/Fl_XPM_Image.H
>-include/FL/Xutf8.h
> include/FL/dirent.h
> include/FL/filename.H
> include/FL/fl_ask.H

Actions: View | Diff

Attachments on bug 197463: 152762