Attachment 157776 Details for Bug 200824 – libfm.diff

[patch] libfm.diff

libfm.diff (text/plain), 7.91 KB, created by Horia Racoviceanu on 2015-06-15 22:53:08 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Horia Racoviceanu

Created: 2015-06-15 22:53:08 UTC

Size: 7.91 KB

patch

obsolete

>Index: Makefile
>===================================================================
>--- Makefile	(revision 388738)
>+++ Makefile	(working copy)
>@@ -3,45 +3,87 @@
> 
> PORTNAME=	libfm
> PORTVERSION=	1.2.3
>+PORTREVISION=	1
> CATEGORIES=	x11
> MASTER_SITES=	SF/pcmanfm/PCManFM%20%2B%20Libfm%20%28tarball%20release%29/LibFM/
> 
> MAINTAINER=	horia@racoviceanu.com
>-COMMENT=	Core library of PCManFM file manager
>+COMMENT?=	Core library of PCManFM file manager
> 
> LICENSE=	LGPL21
> 
>+.if ! defined(EXTRA_ONLY)
> BUILD_DEPENDS=	p5-XML-Parser>=0:${PORTSDIR}/textproc/p5-XML-Parser \
> 		valac:${PORTSDIR}/lang/vala
> LIB_DEPENDS=	libmenu-cache.so:${PORTSDIR}/x11/menu-cache \
> 		libexif.so:${PORTSDIR}/graphics/libexif
>+.endif
> 
>-USES=		desktop-file-utils gmake libtool pathfix pkgconfig \
>-		shared-mime-info gettext-tools tar:xz
>-USE_GNOME=	glib20 gtk20
>+SLAVEDIRS=	${CATEGORIES}/${PORTNAME}-extra
>+
>+USES=		gettext-tools gmake libtool pathfix pkgconfig tar:xz
>+USE_GNOME=	glib20
> USE_LDCONFIG=	yes
> GNU_CONFIGURE=	yes
>-CONFIGURE_ARGS=	--sysconfdir=${LOCALBASE}/etc --disable-static \
>-	--with-gtk=2
>+CONFIGURE_ARGS=	--sysconfdir=${LOCALBASE}/etc --disable-static
> CPPFLAGS+=	-I${LOCALBASE}/include
> LIBS+=		-L${LOCALBASE}/lib
> INSTALL_TARGET=	install-strip
> 
>+.if ! defined(EXTRA_ONLY)
>+USES+=		desktop-file-utils shared-mime-info
>+USE_GNOME+=	gtk20
>+CONFIGURE_ARGS+=--with-gtk=2
>+.else
>+USE_GNOME+=	intltool intlhack
>+CONFIGURE_ARGS+=--with-extra-only
>+.endif
>+
>+MICRO_VERSION=	0.3
>+ABI_VERSION=	4
>+PLIST_SUB+=	MICRO_VERSION=${MICRO_VERSION} \
>+		ABI_VERSION=${ABI_VERSION}
>+
> PORTDOCS=	AUTHORS NEWS README
> 
> OPTIONS_DEFINE=	DOCS NLS
>+OPTIONS_SUB=	yes
>+
> NLS_USES=	gettext-runtime
> NLS_CONFIGURE_ENABLE=	nls
>-OPTIONS_SUB=	yes
> 
> post-patch:
>+	${REINPLACE_CMD} -e 's|^[[:blank:]]\{5,\}USE_NLS=yes|#&|' \
>+		${WRKSRC}/configure
>+
>+	${REINPLACE_CMD} -e '/^pkgincludedir/s|-@FMLIBVER@||; \
>+		/@LN_S@ @PACKAGE@-@FMLIBVER@/d' \
>+		${WRKSRC}/src/Makefile.in
>+
>+.if ! defined(EXTRA_ONLY)
> 	${REINPLACE_CMD} -e 's|DATA = libfm-extra.pc|DATA =|' \
> 		${WRKSRC}/Makefile.in
> 
>+	${REINPLACE_CMD} -e '/^LIBFM_EXTRA_INCLUDES/,+4 s|^|@EXTRALIB_ONLY_TRUE@|; \
>+		/FALSE@lib_LTLIBRARIES/s| libfm-extra.la||; \
>+		s|libfm-extra.la \\|-lfm-extra \\|' \
>+		${WRKSRC}/src/Makefile.in
>+
>+	${REINPLACE_CMD} -e 's|-@FMLIBVER@||' ${WRKSRC}/src/actions/Makefile.in
>+
>+	${REINPLACE_CMD} -e '/^vfs_menu_la_DEPENDENCIES/{s| \\||;n;d;}; \
>+		/^vfs_menu_la_LIBADD/s|$$(top.*|-lfm-extra|' \
>+		${WRKSRC}/src/modules/Makefile.in
>+
> post-install:
>-	${MV} ${STAGEDIR}${PREFIX}/etc/xdg/libfm/libfm.conf \
>-		${STAGEDIR}${PREFIX}/etc/xdg/libfm/libfm.conf.sample
>+	${MV} ${STAGEDIR}${PREFIX}/etc/xdg/${PORTNAME}/${PORTNAME}.conf \
>+		${STAGEDIR}${PREFIX}/etc/xdg/${PORTNAME}/${PORTNAME}.conf.sample
>+
>+	${INSTALL_DATA} ${WRKSRC}/src/actions/fm-actions.h \
>+		${STAGEDIR}${PREFIX}/include/${PORTNAME}
>+
> 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
> 	${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR}
>+.endif
> 
> .include <bsd.port.mk>
>Index: files/patch-configure
>===================================================================
>--- files/patch-configure	(revision 388738)
>+++ files/patch-configure	(working copy)
>@@ -1,11 +0,0 @@
>---- configure.orig	2014-10-14 16:46:23 UTC
>-+++ configure
>-@@ -14933,7 +14933,7 @@ $as_echo "#define HAVE_LC_MESSAGES 1" >>
>- 
>-     fi
>-   fi
>--     USE_NLS=yes
>-+#     USE_NLS=yes
>- 
>- 
>-     gt_cv_have_gettext=no
>Index: files/patch-src_Makefile.in
>===================================================================
>--- files/patch-src_Makefile.in	(revision 388738)
>+++ files/patch-src_Makefile.in	(working copy)
>@@ -1,49 +0,0 @@
>---- src/Makefile.in.orig	2014-10-14 16:46:21 UTC
>-+++ src/Makefile.in
>-@@ -497,7 +497,7 @@ am__relativize = \
>-   reldir="$$dir2"
>- 
>- # we use common include directory for all headers
>--pkgincludedir = $(includedir)/@PACKAGE@-@FMLIBVER@
>-+pkgincludedir = $(includedir)/@PACKAGE@
>- ACLOCAL = @ACLOCAL@
>- ACTIONS_SUBDIR = @ACTIONS_SUBDIR@
>- ALL_LINGUAS = @ALL_LINGUAS@
>-@@ -892,14 +892,14 @@ libfm_gtk_SOURCES = \
>- @EXTRALIB_ONLY_FALSE@	gtk/fm-thumbnail.h \
>- @EXTRALIB_ONLY_FALSE@	$(NULL)
>- 
>--LIBFM_EXTRA_INCLUDES = \
>--	fm-extra.h \
>--	fm-version.h \
>--	extra/fm-xml-file.h \
>--	$(NULL)
>-+@EXTRALIB_ONLY_TRUE@LIBFM_EXTRA_INCLUDES = \
>-+@EXTRALIB_ONLY_TRUE@	fm-extra.h \
>-+@EXTRALIB_ONLY_TRUE@	fm-version.h \
>-+@EXTRALIB_ONLY_TRUE@	extra/fm-xml-file.h \
>-+@EXTRALIB_ONLY_TRUE@	$(NULL)
>- 
>- EXTRA_LTLIBRARIES = libfm-gtk.la libfm-gtk3.la
>--@EXTRALIB_ONLY_FALSE@lib_LTLIBRARIES = libfm-extra.la libfm.la @LIBFM_GTK_LTLIBRARIES@
>-+@EXTRALIB_ONLY_FALSE@lib_LTLIBRARIES = libfm.la @LIBFM_GTK_LTLIBRARIES@
>- @EXTRALIB_ONLY_TRUE@lib_LTLIBRARIES = libfm-extra.la
>- libfm_la_SOURCES = \
>- 	$(libfm_SOURCES) \
>-@@ -1042,7 +1042,7 @@ lxshortcut_LDADD = \
>- @ENABLE_DEMO_TRUE@	$(GTK_LIBS) \
>- @ENABLE_DEMO_TRUE@	$(INTLLIBS) \
>- @ENABLE_DEMO_TRUE@	libfm.la \
>--@ENABLE_DEMO_TRUE@	libfm-extra.la \
>-+@ENABLE_DEMO_TRUE@	-lfm-extra \
>- @ENABLE_DEMO_TRUE@	@LIBFM_GTK_LTLIBRARIES@ \
>- @ENABLE_DEMO_TRUE@	$(NULL)
>- 
>-@@ -3079,7 +3079,6 @@ install-data-local:
>- 		rm -rf "$(DESTDIR)$(includedir)/@PACKAGE@"; \
>- 	fi
>- 	test -z "$(includedir)" || $(MKDIR_P) "$(DESTDIR)$(includedir)"
>--	@LN_S@ @PACKAGE@-@FMLIBVER@ "$(DESTDIR)$(includedir)/@PACKAGE@"
>- 
>- uninstall-local:
>- 	@if test -L "$(DESTDIR)$(includedir)/@PACKAGE@"; then \
>Index: files/patch-src_actions_Makefile.in
>===================================================================
>--- files/patch-src_actions_Makefile.in	(revision 388738)
>+++ files/patch-src_actions_Makefile.in	(working copy)
>@@ -1,11 +0,0 @@
>---- src/actions/Makefile.in.orig	2014-10-14 16:46:21 UTC
>-+++ src/actions/Makefile.in
>-@@ -424,7 +424,7 @@ AM_VALAFLAGS = \
>-     --header fm-actions.h \
>- 	$(NULL)
>- 
>--libfmactionsincludedir = $(includedir)/@PACKAGE@-@FMLIBVER@
>-+libfmactionsincludedir = $(includedir)/@PACKAGE@
>- libfmactionsinclude_HEADERS = \
>- 	fm-actions.h \
>- 	$(NULL)
>Index: files/patch-src_modules_Makefile.in
>===================================================================
>--- files/patch-src_modules_Makefile.in	(revision 388738)
>+++ files/patch-src_modules_Makefile.in	(working copy)
>@@ -1,21 +0,0 @@
>---- src/modules/Makefile.in.orig	2014-10-14 16:46:21 UTC
>-+++ src/modules/Makefile.in
>-@@ -172,8 +172,7 @@ gtk_menu_trash_la_LINK = $(LIBTOOL) $(AM
>- 	$(gtk_menu_trash_la_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) \
>- 	-o $@
>- @ENABLE_GTK_TRUE@am_gtk_menu_trash_la_rpath = -rpath $(pkglibdir)
>--vfs_menu_la_DEPENDENCIES = $(am__DEPENDENCIES_1) \
>--	$(top_builddir)/src/libfm-extra.la
>-+vfs_menu_la_DEPENDENCIES = $(am__DEPENDENCIES_1)
>- vfs_menu_la_SOURCES = vfs-menu.c
>- vfs_menu_la_OBJECTS = vfs_menu_la-vfs-menu.lo
>- vfs_menu_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
>-@@ -447,7 +446,7 @@ PLUGINS_INSTALLED = $(pkglib_LTLIBRARIES
>- 
>- # module-specific parameters
>- vfs_menu_la_CFLAGS = $(MENU_CACHE_CFLAGS) -I$(top_srcdir)/src/extra
>--vfs_menu_la_LIBADD = $(MENU_CACHE_LIBS) $(top_builddir)/src/libfm-extra.la
>-+vfs_menu_la_LIBADD = $(MENU_CACHE_LIBS) -lfm-extra
>- gtk_fileprop_x_desktop_la_CFLAGS = $(GTK_CFLAGS) -I$(top_srcdir)/src/gtk
>- gtk_fileprop_x_desktop_la_LIBADD = $(GTK_LIBS)
>- gtk_fileprop_x_shortcut_la_CFLAGS = $(GTK_CFLAGS) -I$(top_srcdir)/src/gtk
>Index: pkg-plist
>===================================================================
>--- pkg-plist	(revision 388738)
>+++ pkg-plist	(working copy)
>@@ -1,6 +1,7 @@
> bin/libfm-pref-apps
> bin/lxshortcut
> @sample etc/xdg/libfm/libfm.conf.sample
>+include/libfm/fm-actions.h
> include/libfm/fm-app-chooser-combo-box.h
> include/libfm/fm-app-chooser-dlg.h
> include/libfm/fm-app-info.h
>@@ -67,11 +68,11 @@
> include/libfm/fm-utils.h
> include/libfm/fm.h
> lib/libfm-gtk.so
>-lib/libfm-gtk.so.4
>-lib/libfm-gtk.so.4.0.3
>+lib/libfm-gtk.so.%%ABI_VERSION%%
>+lib/libfm-gtk.so.%%ABI_VERSION%%.%%MICRO_VERSION%%
> lib/libfm.so
>-lib/libfm.so.4
>-lib/libfm.so.4.0.3
>+lib/libfm.so.%%ABI_VERSION%%
>+lib/libfm.so.%%ABI_VERSION%%.%%MICRO_VERSION%%
> lib/libfm/modules/gtk-fileprop-x-desktop.so
> lib/libfm/modules/gtk-fileprop-x-shortcut.so
> lib/libfm/modules/gtk-menu-actions.so

Actions: View | Diff

Attachments on bug 200824: 157686 | 157776 | 157777 | 157778 | 157779