Attachment 154631 Details for Bug 198773 – Patch to update x11/libfm

[patch] Patch to update x11/libfm

libfm.diff (text/plain), 12.32 KB, created by Olivier Duchateau on 2015-03-21 14:09:08 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Olivier Duchateau

Created: 2015-03-21 14:09:08 UTC

Size: 12.32 KB

patch

obsolete

>Index: Makefile
>===================================================================
>--- Makefile	(révision 381795)
>+++ Makefile	(copie de travail)
>@@ -2,14 +2,14 @@
> # $FreeBSD$
> 
> PORTNAME=	libfm
>-PORTVERSION=	1.2.2.1
>+PORTVERSION=	1.2.3
> CATEGORIES=	x11
>-MASTER_SITES=	SF/pcmanfm/PCManFM%20%2B%20Libfm%20%28tarball%20release%29/libfm%20%28required%20by%20PCManFM%29/
>+MASTER_SITES=	SF/pcmanfm/PCManFM%20%2B%20Libfm%20%28tarball%20release%29/LibFM/
> 
> MAINTAINER=	horia@racoviceanu.com
>-COMMENT=	LibFM backend library to PCManFM
>+COMMENT=	Core library of PCManFM file manager
> 
>-LICENSE=	GPLv2
>+LICENSE=	LGPL21
> 
> BUILD_DEPENDS=	p5-XML-Parser>=0:${PORTSDIR}/textproc/p5-XML-Parser \
> 		valac:${PORTSDIR}/lang/vala
>@@ -16,12 +16,13 @@
> LIB_DEPENDS=	libmenu-cache.so:${PORTSDIR}/x11/menu-cache \
> 		libexif.so:${PORTSDIR}/graphics/libexif
> 
>-USES=		desktop-file-utils fam gmake libtool pathfix pkgconfig \
>-		shared-mime-info tar:xz
>-USE_GNOME=	gtk20
>+USES=		desktop-file-utils gmake libtool pathfix pkgconfig \
>+		shared-mime-info gettext-tools tar:xz
>+USE_GNOME=	glib20 gtk20
> USE_LDCONFIG=	yes
> GNU_CONFIGURE=	yes
>-CONFIGURE_ARGS=	--sysconfdir=${LOCALBASE}/etc
>+CONFIGURE_ARGS=	--sysconfdir=${LOCALBASE}/etc --disable-static \
>+	--with-gtk=2
> CPPFLAGS+=	-I${LOCALBASE}/include
> LIBS+=		-L${LOCALBASE}/lib
> INSTALL_TARGET=	install-strip
>@@ -28,19 +29,14 @@
> 
> PORTDOCS=	AUTHORS NEWS README
> 
>-OPTIONS_DEFINE=	DOCS NLS STATIC
>+OPTIONS_DEFINE=	DOCS NLS
>+NLS_USES=	gettext-runtime
>+NLS_CONFIGURE_ENABLE=	nls
> OPTIONS_SUB=	yes
> 
>-NLS_USES=	gettext
>-NLS_CONFIGURE_ENABLE=		nls
>-STATIC_CONFIGURE_ENABLE=	static
>-
>-PLIST_SUB+=	MAJORVER=1.0
>-PLIST_SUB+=	VER=4
>-
> post-patch:
>-	@${REINPLACE_CMD} -e 's|-DG_DISABLE_DEPRECATED||' \
>-		${WRKSRC}/src/Makefile.in
>+	${REINPLACE_CMD} -e 's|DATA = libfm-extra.pc|DATA =|' \
>+		${WRKSRC}/Makefile.in
> 
> post-install:
> 	${MV} ${STAGEDIR}${PREFIX}/etc/xdg/libfm/libfm.conf \
>Index: distinfo
>===================================================================
>--- distinfo	(révision 381795)
>+++ distinfo	(copie de travail)
>@@ -1,2 +1,2 @@
>-SHA256 (libfm-1.2.2.1.tar.xz) = dbb0a3f7fd9615cccf4ad8ed1a07591535712d00eede03e5bd564090b33a4329
>-SIZE (libfm-1.2.2.1.tar.xz) = 894092
>+SHA256 (libfm-1.2.3.tar.xz) = c692f1624a4cbc8d1dd55f3b3f3369fbf5d26f63a916e2c295230b2344e1fbf9
>+SIZE (libfm-1.2.3.tar.xz) = 898256
>Index: files/patch-src_Makefile.in
>===================================================================
>--- files/patch-src_Makefile.in	(révision 0)
>+++ files/patch-src_Makefile.in	(copie de travail)
>@@ -0,0 +1,49 @@
>+--- 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	(révision 0)
>+++ files/patch-src_actions_Makefile.in	(copie de travail)
>@@ -0,0 +1,11 @@
>+--- 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	(révision 0)
>+++ files/patch-src_modules_Makefile.in	(copie de travail)
>@@ -0,0 +1,21 @@
>+--- 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	(révision 381795)
>+++ pkg-plist	(copie de travail)
>@@ -1,88 +1,77 @@
> bin/libfm-pref-apps
> bin/lxshortcut
> @sample etc/xdg/libfm/libfm.conf.sample
>-include/libfm
>-include/libfm-%%MAJORVER%%/fm-actions.h
>-include/libfm-%%MAJORVER%%/fm-app-chooser-combo-box.h
>-include/libfm-%%MAJORVER%%/fm-app-chooser-dlg.h
>-include/libfm-%%MAJORVER%%/fm-app-info.h
>-include/libfm-%%MAJORVER%%/fm-app-menu-view.h
>-include/libfm-%%MAJORVER%%/fm-archiver.h
>-include/libfm-%%MAJORVER%%/fm-bookmarks.h
>-include/libfm-%%MAJORVER%%/fm-cell-renderer-pixbuf.h
>-include/libfm-%%MAJORVER%%/fm-cell-renderer-text.h
>-include/libfm-%%MAJORVER%%/fm-clipboard.h
>-include/libfm-%%MAJORVER%%/fm-config.h
>-include/libfm-%%MAJORVER%%/fm-deep-count-job.h
>-include/libfm-%%MAJORVER%%/fm-dir-list-job.h
>-include/libfm-%%MAJORVER%%/fm-dir-tree-model.h
>-include/libfm-%%MAJORVER%%/fm-dir-tree-view.h
>-include/libfm-%%MAJORVER%%/fm-dnd-auto-scroll.h
>-include/libfm-%%MAJORVER%%/fm-dnd-dest.h
>-include/libfm-%%MAJORVER%%/fm-dnd-src.h
>-include/libfm-%%MAJORVER%%/fm-dummy-monitor.h
>-include/libfm-%%MAJORVER%%/fm-extra.h
>-include/libfm-%%MAJORVER%%/fm-file-info-job.h
>-include/libfm-%%MAJORVER%%/fm-file-info.h
>-include/libfm-%%MAJORVER%%/fm-file-launcher.h
>-include/libfm-%%MAJORVER%%/fm-file-menu.h
>-include/libfm-%%MAJORVER%%/fm-file-ops-job-change-attr.h
>-include/libfm-%%MAJORVER%%/fm-file-ops-job-delete.h
>-include/libfm-%%MAJORVER%%/fm-file-ops-job-xfer.h
>-include/libfm-%%MAJORVER%%/fm-file-ops-job.h
>-include/libfm-%%MAJORVER%%/fm-file-properties.h
>-include/libfm-%%MAJORVER%%/fm-file.h
>-include/libfm-%%MAJORVER%%/fm-folder-config.h
>-include/libfm-%%MAJORVER%%/fm-folder-model.h
>-include/libfm-%%MAJORVER%%/fm-folder-view.h
>-include/libfm-%%MAJORVER%%/fm-folder.h
>-include/libfm-%%MAJORVER%%/fm-gtk-file-launcher.h
>-include/libfm-%%MAJORVER%%/fm-gtk-marshal.h
>-include/libfm-%%MAJORVER%%/fm-gtk-utils.h
>-include/libfm-%%MAJORVER%%/fm-gtk.h
>-include/libfm-%%MAJORVER%%/fm-icon-pixbuf.h
>-include/libfm-%%MAJORVER%%/fm-icon.h
>-include/libfm-%%MAJORVER%%/fm-job.h
>-include/libfm-%%MAJORVER%%/fm-list.h
>-include/libfm-%%MAJORVER%%/fm-marshal.h
>-include/libfm-%%MAJORVER%%/fm-menu-tool-item.h
>-include/libfm-%%MAJORVER%%/fm-mime-type.h
>-include/libfm-%%MAJORVER%%/fm-module.h
>-include/libfm-%%MAJORVER%%/fm-monitor.h
>-include/libfm-%%MAJORVER%%/fm-nav-history.h
>-include/libfm-%%MAJORVER%%/fm-path-bar.h
>-include/libfm-%%MAJORVER%%/fm-path-entry.h
>-include/libfm-%%MAJORVER%%/fm-path.h
>-include/libfm-%%MAJORVER%%/fm-places-model.h
>-include/libfm-%%MAJORVER%%/fm-places-view.h
>-include/libfm-%%MAJORVER%%/fm-progress-dlg.h
>-include/libfm-%%MAJORVER%%/fm-seal.h
>-include/libfm-%%MAJORVER%%/fm-side-pane.h
>-include/libfm-%%MAJORVER%%/fm-simple-job.h
>-include/libfm-%%MAJORVER%%/fm-sortable.h
>-include/libfm-%%MAJORVER%%/fm-standard-view.h
>-include/libfm-%%MAJORVER%%/fm-tab-label.h
>-include/libfm-%%MAJORVER%%/fm-templates.h
>-include/libfm-%%MAJORVER%%/fm-terminal.h
>-include/libfm-%%MAJORVER%%/fm-thumbnail-loader.h
>-include/libfm-%%MAJORVER%%/fm-thumbnail.h
>-include/libfm-%%MAJORVER%%/fm-thumbnailer.h
>-include/libfm-%%MAJORVER%%/fm-utils.h
>-include/libfm-%%MAJORVER%%/fm-version.h
>-include/libfm-%%MAJORVER%%/fm-xml-file.h
>-include/libfm-%%MAJORVER%%/fm.h
>-%%STATIC%%lib/libfm-extra.a
>-lib/libfm-extra.so
>-lib/libfm-extra.so.%%VER%%
>-lib/libfm-extra.so.%%VER%%.0.2
>-%%STATIC%%lib/libfm-gtk.a
>+include/libfm/fm-app-chooser-combo-box.h
>+include/libfm/fm-app-chooser-dlg.h
>+include/libfm/fm-app-info.h
>+include/libfm/fm-app-menu-view.h
>+include/libfm/fm-archiver.h
>+include/libfm/fm-bookmarks.h
>+include/libfm/fm-cell-renderer-pixbuf.h
>+include/libfm/fm-cell-renderer-text.h
>+include/libfm/fm-clipboard.h
>+include/libfm/fm-config.h
>+include/libfm/fm-deep-count-job.h
>+include/libfm/fm-dir-list-job.h
>+include/libfm/fm-dir-tree-model.h
>+include/libfm/fm-dir-tree-view.h
>+include/libfm/fm-dnd-auto-scroll.h
>+include/libfm/fm-dnd-dest.h
>+include/libfm/fm-dnd-src.h
>+include/libfm/fm-dummy-monitor.h
>+include/libfm/fm-file-info-job.h
>+include/libfm/fm-file-info.h
>+include/libfm/fm-file-launcher.h
>+include/libfm/fm-file-menu.h
>+include/libfm/fm-file-ops-job-change-attr.h
>+include/libfm/fm-file-ops-job-delete.h
>+include/libfm/fm-file-ops-job-xfer.h
>+include/libfm/fm-file-ops-job.h
>+include/libfm/fm-file-properties.h
>+include/libfm/fm-file.h
>+include/libfm/fm-folder-config.h
>+include/libfm/fm-folder-model.h
>+include/libfm/fm-folder-view.h
>+include/libfm/fm-folder.h
>+include/libfm/fm-gtk-file-launcher.h
>+include/libfm/fm-gtk-marshal.h
>+include/libfm/fm-gtk-utils.h
>+include/libfm/fm-gtk.h
>+include/libfm/fm-icon-pixbuf.h
>+include/libfm/fm-icon.h
>+include/libfm/fm-job.h
>+include/libfm/fm-list.h
>+include/libfm/fm-marshal.h
>+include/libfm/fm-menu-tool-item.h
>+include/libfm/fm-mime-type.h
>+include/libfm/fm-module.h
>+include/libfm/fm-monitor.h
>+include/libfm/fm-nav-history.h
>+include/libfm/fm-path-bar.h
>+include/libfm/fm-path-entry.h
>+include/libfm/fm-path.h
>+include/libfm/fm-places-model.h
>+include/libfm/fm-places-view.h
>+include/libfm/fm-progress-dlg.h
>+include/libfm/fm-seal.h
>+include/libfm/fm-side-pane.h
>+include/libfm/fm-simple-job.h
>+include/libfm/fm-sortable.h
>+include/libfm/fm-standard-view.h
>+include/libfm/fm-tab-label.h
>+include/libfm/fm-templates.h
>+include/libfm/fm-terminal.h
>+include/libfm/fm-thumbnail-loader.h
>+include/libfm/fm-thumbnail.h
>+include/libfm/fm-thumbnailer.h
>+include/libfm/fm-utils.h
>+include/libfm/fm.h
> lib/libfm-gtk.so
>-lib/libfm-gtk.so.%%VER%%
>-lib/libfm-gtk.so.%%VER%%.0.2
>-%%STATIC%%lib/libfm.a
>+lib/libfm-gtk.so.4
>+lib/libfm-gtk.so.4.0.3
> lib/libfm.so
>-lib/libfm.so.%%VER%%
>-lib/libfm.so.%%VER%%.0.2
>+lib/libfm.so.4
>+lib/libfm.so.4.0.3
> lib/libfm/modules/gtk-fileprop-x-desktop.so
> lib/libfm/modules/gtk-fileprop-x-shortcut.so
> lib/libfm/modules/gtk-menu-actions.so
>@@ -89,7 +78,6 @@
> lib/libfm/modules/gtk-menu-trash.so
> lib/libfm/modules/vfs-menu.so
> lib/libfm/modules/vfs-search.so
>-libdata/pkgconfig/libfm-extra.pc
> libdata/pkgconfig/libfm-gtk.pc
> libdata/pkgconfig/libfm.pc
> man/man1/libfm-pref-apps.1.gz
>@@ -96,6 +84,9 @@
> man/man1/lxshortcut.1.gz
> share/applications/libfm-pref-apps.desktop
> share/applications/lxshortcut.desktop
>+%%PORTDOCS%%%%DOCSDIR%%/AUTHORS
>+%%PORTDOCS%%%%DOCSDIR%%/NEWS
>+%%PORTDOCS%%%%DOCSDIR%%/README
> %%DATADIR%%/archivers.list
> %%DATADIR%%/images/folder.png
> %%DATADIR%%/images/unknown.png

Flags:

koobs: maintainer-approval? (horia)

Actions: View | Diff

Attachments on bug 198773: 154631