Separate extra library in its own package to avoid circular dependency introduced in newer libfm /menu-cache.

[youri <youri%NetBSD.org@localhost>]

Module Name:	pkgsrc-wip
Committed By:	youri <youri%NetBSD.org@localhost>
Pushed By:	youri
Date:		Mon May 23 00:05:51 2016 +0200
Changeset:	960390d0e2c2f04227c43fc464ef4a4ba53844d2

Modified Files:
	libfm/Makefile
	libfm/PLIST
	libfm/distinfo
Added Files:
	libfm/patches/patch-Makefile.in
	libfm/patches/patch-data_Makefile.in
	libfm/patches/patch-src_Makefile.in
	libfm/patches/patch-src_actions_Makefile.in
	libfm/patches/patch-src_modules_Makefile.in

Log Message:
Separate extra library in its own package to avoid
circular dependency introduced in newer libfm/menu-cache.

Update to 0.2.4:

Changes on 1.2.4 since 1.2.3:

* Fixed crash in templates on file that was deleted instantly after
    creation.

* Fixed handling %c in desktop entry Exec key: launch may fail if the
    application name contains spaces so it needs quoting.

* Fixed missing folder info update on folder attributes change.

* Use G_SPAWN_DO_NOT_REAP_CHILD on application launch, that should fix
    a problem with pkexec.

* Corrected missing newline at end of generated shortcut desktop entry.

* Improved file type detection, it failed in some cases such as DOCX.

* Returned back the workaround on thumbnailers which don't save any of
    Thumb::MTime or Thumb::URI in the thumbnail.

* Fixed wrong treating files like ".purple" as having extension "purple".

* Fixed invalid desktop entry save if 'Cancel' was pressed in the file
    properties dialog window.

* Fixed issues on dropping folders into Places for bookmarking them.

* Fixed crash in expand_exec_macros() on missing Exec line.

* Rewritten broken rubberband rendering in icon view for GTK3.

* Eliminated usage of GVolumeMonitor if no FmFolder object was created.

* Fixed renaming of desktop entries on copy operation error: it was the
    file name which was set in renaming dialog but it was compared with
    display name instead when decided whether "Rename" button should be
    active or not.

* Fixed dropping files onto applications shortcuts on the desktop: those
    should be not "inode/x-shortcut" but "application/x-desktop" instead
    and therefore handled as any other applications, i.e. allow drop.

* Added 'urxvtc' into the terminals database.

* Fixed adding user-defined MIME associations into mimeapps.list config.

* Few UI adaptations to work with GTK+ 3.10 or newer.

* Fixed creating shortcuts on paths with basename started with '?'.

* Fixed pointer-related issues with GTK+ 3.10 or newer.

* Added 'terminology' into the terminals database.

* Fixed stuck tooltip on entering empty folder.

* Fixed crash on cancelling FmDirListJob while retrieving is in progress.

* Fixed incomplete cleanup on folder reloading.

* Corrected autoscrolling to position in view to not include extra space
    (so not show all the column/row at once but only fully show exactly
    the item). This may fix a problem with double-click at the end of the
    file name which is already visible so no scrolling is needed, but if
    another file in the column/row has longer name then it could bring a
    scrolling of the column/row, and second click lands out of item area.

* Fixed timer shown in progress dialog, it should show 01:00, not 00:60.

* Fixed stuck tooltip after right-click on file in view, seen rarely.

* Disabled following symlinked directories on recursive search, that may
    give undesired results duplicating files and in some rare cases even
    may lead to endless recursion and endless number of files found.

* Fixed few small issues with icon view interactive search:
    - search should be not activated by space key;
    - cursor was missing in the entry.

* Fixed the background of the name of selected file with GTK+ 3.0.

* Fixed not-ignored invalid Path= line on launch a desktop entry.

* Fixed testing URIs like http://some.host.com for MIME type.

* Dropped using shortcuts to URIs like http://host/ as directories, no
    directory should be in principle used in shortcuts.

* Fixed possible data loss on cross-partition data movement.

* Fixed incorrect data in the search dialog date selection window.

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=960390d0e2c2f04227c43fc464ef4a4ba53844d2

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 libfm/Makefile                              | 12 ++++++---
 libfm/PLIST                                 | 12 ++-------
 libfm/distinfo                              | 12 ++++++---
 libfm/patches/patch-Makefile.in             | 15 ++++++++++++
 libfm/patches/patch-data_Makefile.in        | 38 +++++++++++++++++++++++++++++
 libfm/patches/patch-src_Makefile.in         | 27 ++++++++++++++++++++
 libfm/patches/patch-src_actions_Makefile.in | 15 ++++++++++++
 libfm/patches/patch-src_modules_Makefile.in | 25 +++++++++++++++++++
 8 files changed, 139 insertions(+), 17 deletions(-)

diffs:
diff --git a/libfm/Makefile b/libfm/Makefile
index e98db43..dc7922f 100644
--- a/libfm/Makefile
+++ b/libfm/Makefile
@@ -1,7 +1,7 @@
 # $NetBSD: Makefile,v 1.12 2015/05/20 11:06:03 krytarowski Exp $
 #
 
-DISTNAME=	libfm-1.2.3
+DISTNAME=	libfm-1.2.4
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=pcmanfm/}
 EXTRACT_SUFX=	.tar.xz
@@ -15,9 +15,12 @@ GNU_CONFIGURE=		yes
 USE_LIBTOOL=		yes
 USE_TOOLS+=		intltool pkg-config
 
-OWN_DIRS=	${PKG_SYSCONFDIR}/xdg/libfm
-CONF_FILES+=	${PREFIX}/etc/xdg/libfm/libfm.conf \
-		${PKG_SYSCONFDIR}/xdg/libfm/libfm.conf
+CONFIGURE_ARGS+=	--with-gtk=2
+
+PKG_SYSCONFSUBDIR=	xdg
+OWN_DIRS=		${PKG_SYSCONFDIR}/libfm
+CONF_FILES+=		share/examples/libfm/libfm.conf \
+			${PKG_SYSCONFDIR}/libfm/libfm.conf
 
 # XXX: walk-around bug in build wrappers
 #      they try to copy $PREFIX/include/libfm to work dir and there link libfm -> libfm-1.0 is resolved
@@ -30,4 +33,5 @@ post-install:
 .include "../../sysutils/desktop-file-utils/desktopdb.mk"
 .include "../../x11/gtk2/buildlink3.mk"
 .include "../../sysutils/menu-cache/buildlink3.mk"
+.include "../../wip/libfm-extra/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/libfm/PLIST b/libfm/PLIST
index 6114ad4..5a16e1c 100644
--- a/libfm/PLIST
+++ b/libfm/PLIST
@@ -1,7 +1,6 @@
-@comment $NetBSD: PLIST,v 1.4 2015/05/20 11:06:03 krytarowski Exp $
+@comment $NetBSD$
 bin/libfm-pref-apps
 bin/lxshortcut
-etc/xdg/libfm/libfm.conf
 include/libfm-1.0/fm-actions.h
 include/libfm-1.0/fm-app-chooser-combo-box.h
 include/libfm-1.0/fm-app-chooser-dlg.h
@@ -21,7 +20,6 @@ include/libfm-1.0/fm-dnd-auto-scroll.h
 include/libfm-1.0/fm-dnd-dest.h
 include/libfm-1.0/fm-dnd-src.h
 include/libfm-1.0/fm-dummy-monitor.h
-include/libfm-1.0/fm-extra.h
 include/libfm-1.0/fm-file-info-job.h
 include/libfm-1.0/fm-file-info.h
 include/libfm-1.0/fm-file-launcher.h
@@ -68,8 +66,6 @@ include/libfm-1.0/fm-thumbnail-loader.h
 include/libfm-1.0/fm-thumbnail.h
 include/libfm-1.0/fm-thumbnailer.h
 include/libfm-1.0/fm-utils.h
-include/libfm-1.0/fm-version.h
-include/libfm-1.0/fm-xml-file.h
 include/libfm-1.0/fm.h
 include/libfm/fm-actions.h
 include/libfm/fm-app-chooser-combo-box.h
@@ -90,7 +86,6 @@ 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-extra.h
 include/libfm/fm-file-info-job.h
 include/libfm/fm-file-info.h
 include/libfm/fm-file-launcher.h
@@ -137,10 +132,7 @@ include/libfm/fm-thumbnail-loader.h
 include/libfm/fm-thumbnail.h
 include/libfm/fm-thumbnailer.h
 include/libfm/fm-utils.h
-include/libfm/fm-version.h
-include/libfm/fm-xml-file.h
 include/libfm/fm.h
-lib/libfm-extra.la
 lib/libfm-gtk.la
 lib/libfm.la
 lib/libfm/modules/gtk-fileprop-x-desktop.so
@@ -149,13 +141,13 @@ lib/libfm/modules/gtk-menu-actions.so
 lib/libfm/modules/gtk-menu-trash.so
 lib/libfm/modules/vfs-menu.so
 lib/libfm/modules/vfs-search.so
-lib/pkgconfig/libfm-extra.pc
 lib/pkgconfig/libfm-gtk.pc
 lib/pkgconfig/libfm.pc
 man/man1/libfm-pref-apps.1
 man/man1/lxshortcut.1
 share/applications/libfm-pref-apps.desktop
 share/applications/lxshortcut.desktop
+share/examples/libfm/libfm.conf
 share/libfm/archivers.list
 share/libfm/images/folder.png
 share/libfm/images/unknown.png
diff --git a/libfm/distinfo b/libfm/distinfo
index b052a1f..50eed08 100644
--- a/libfm/distinfo
+++ b/libfm/distinfo
@@ -1,5 +1,11 @@
 $NetBSD: distinfo,v 1.3 2015/04/11 17:51:28 krytarowski Exp $
 
-SHA1 (libfm-1.2.3.tar.xz) = c3f2f34086761d89d6aba549883610084ba00750
-RMD160 (libfm-1.2.3.tar.xz) = 4bada33d443eefa267cc22e96ab1e97e355b3490
-Size (libfm-1.2.3.tar.xz) = 898256 bytes
+SHA1 (libfm-1.2.4.tar.xz) = 2f8183389c8e74edb15c6c8ab260df5dd39f3b2d
+RMD160 (libfm-1.2.4.tar.xz) = 7c8cb9da27b3f36607f00eb9069ef753bb77eab5
+SHA512 (libfm-1.2.4.tar.xz) = c609e822959f9fa83eaee6552906b6fd22d210f0802944816230b1932fc06632dc557b8998d2d065100212f79dffe13257587c744aba78592983681c8410dc24
+Size (libfm-1.2.4.tar.xz) = 912164 bytes
+SHA1 (patch-Makefile.in) = 74a134b3e0ad868ea18ac09c142f869219396a8a
+SHA1 (patch-data_Makefile.in) = 810c5b93190f37d58609fbcd594b26fca4490311
+SHA1 (patch-src_Makefile.in) = fbe630f3ba1dfb3c26979d8c86518e5bf102abc0
+SHA1 (patch-src_actions_Makefile.in) = e814f5252c231aa1c76cf2c1783f02b1a0b636ec
+SHA1 (patch-src_modules_Makefile.in) = 0429f7f7c12cd1655452166e20365f3b0b1bcb81
diff --git a/libfm/patches/patch-Makefile.in b/libfm/patches/patch-Makefile.in
new file mode 100644
index 0000000..2492116
--- /dev/null
+++ b/libfm/patches/patch-Makefile.in
@@ -0,0 +1,15 @@
+$NetBSD$
+
+Disable extra.
+
+--- Makefile.in.orig	2016-02-20 22:14:14.000000000 +0000
++++ Makefile.in
+@@ -448,7 +448,7 @@ EXTRA_DIST_DOCS = \
+ 	docs/reference/libfm/version.xml.in
+ 
+ pkgconfigdir = $(libdir)/pkgconfig
+-pkgconfig_DATA = libfm-extra.pc $(am__append_5)
++pkgconfig_DATA = $(am__append_5)
+ @EXTRALIB_ONLY_FALSE@SUBDIRS = $(DIST_SUBDIRS) $(am__append_3)
+ @EXTRALIB_ONLY_TRUE@SUBDIRS = src $(am__append_3)
+ DISTCHECK_CONFIGURE_FLAGS = --enable-gtk-doc
diff --git a/libfm/patches/patch-data_Makefile.in b/libfm/patches/patch-data_Makefile.in
new file mode 100644
index 0000000..216a0af
--- /dev/null
+++ b/libfm/patches/patch-data_Makefile.in
@@ -0,0 +1,38 @@
+$NetBSD$
+
+Fix config file installation.
+
+--- data/Makefile.in.orig	2016-02-20 22:14:14.000000000 +0000
++++ data/Makefile.in
+@@ -381,6 +381,7 @@ sbindir = @sbindir@
+ sharedstatedir = @sharedstatedir@
+ srcdir = @srcdir@
+ sysconfdir = @sysconfdir@
++sysconfexampledir = ${datadir}/examples
+ target_alias = @target_alias@
+ top_build_prefix = @top_build_prefix@
+ top_builddir = @top_builddir@
+@@ -536,18 +537,18 @@ uninstall-desktopDATA:
+ 	dir='$(DESTDIR)$(desktopdir)'; $(am__uninstall_files_from_dir)
+ install-libfmconfDATA: $(libfmconf_DATA)
+ 	@$(NORMAL_INSTALL)
+-	@list='$(libfmconf_DATA)'; test -n "$(libfmconfdir)" || list=; \
++	@list='$(libfmconf_DATA)'; test -n "$(sysconfexampledir)/libfm" || list=; \
+ 	if test -n "$$list"; then \
+-	  echo " $(MKDIR_P) '$(DESTDIR)$(libfmconfdir)'"; \
+-	  $(MKDIR_P) "$(DESTDIR)$(libfmconfdir)" || exit 1; \
++	  echo " $(MKDIR_P) '$(DESTDIR)$(sysconfexampledir)/libfm'"; \
++	  $(MKDIR_P) "$(DESTDIR)$(sysconfexampledir)/libfm" || exit 1; \
+ 	fi; \
+ 	for p in $$list; do \
+ 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+ 	  echo "$$d$$p"; \
+ 	done | $(am__base_list) | \
+ 	while read files; do \
+-	  echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(libfmconfdir)'"; \
+-	  $(INSTALL_DATA) $$files "$(DESTDIR)$(libfmconfdir)" || exit $$?; \
++	  echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(sysconfexampledir)/libfm'"; \
++	  $(INSTALL_DATA) $$files "$(DESTDIR)$(sysconfexampledir)/libfm" || exit $$?; \
+ 	done
+ 
+ uninstall-libfmconfDATA:
diff --git a/libfm/patches/patch-src_Makefile.in b/libfm/patches/patch-src_Makefile.in
new file mode 100644
index 0000000..61fa7af
--- /dev/null
+++ b/libfm/patches/patch-src_Makefile.in
@@ -0,0 +1,27 @@
+$NetBSD$
+
+Disable extra.
+
+--- src/Makefile.in.orig	2016-02-20 22:14:15.000000000 +0000
++++ src/Makefile.in
+@@ -893,14 +893,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)
++#LIBFM_EXTRA_INCLUDES = \
++#	fm-extra.h \
++#	fm-version.h \
++#	extra/fm-xml-file.h \
++#	$(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) \
diff --git a/libfm/patches/patch-src_actions_Makefile.in b/libfm/patches/patch-src_actions_Makefile.in
new file mode 100644
index 0000000..59e8e39
--- /dev/null
+++ b/libfm/patches/patch-src_actions_Makefile.in
@@ -0,0 +1,15 @@
+$NetBSD$
+
+Disable extra.
+
+--- src/actions/Makefile.in.orig	2016-02-20 22:14:15.000000000 +0000
++++ src/actions/Makefile.in
+@@ -247,7 +247,7 @@ EXIF_CFLAGS = @EXIF_CFLAGS@
+ EXIF_LIBS = @EXIF_LIBS@
+ FGREP = @FGREP@
+ FMINCLUDEADD = @FMINCLUDEADD@
+-FMLIBVER = @FMLIBVER@
++FMLIBVER =
+ FM_VERSION_MAJOR = @FM_VERSION_MAJOR@
+ FM_VERSION_MICRO = @FM_VERSION_MICRO@
+ FM_VERSION_MINOR = @FM_VERSION_MINOR@
diff --git a/libfm/patches/patch-src_modules_Makefile.in b/libfm/patches/patch-src_modules_Makefile.in
new file mode 100644
index 0000000..5ec6dac
--- /dev/null
+++ b/libfm/patches/patch-src_modules_Makefile.in
@@ -0,0 +1,25 @@
+$NetBSD$
+
+Disable extra.
+
+--- src/modules/Makefile.in.orig	2016-02-20 22:14:15.000000000 +0000
++++ 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) \
+@@ -448,7 +447,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