mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2024-11-27 00:57:50 +00:00
Code Issues Releases Activity

x11/libfm, x11-fm/pcmanfm: update and flavorize both.

Browse Source 
- update x11/libfm to version 1.3.1
- update x11-fm/pcmanfm to version 1.3.1
- convert both to flavors
- fix other affected ports

PR:		229944
Reviewed by:	adamw, antoine, bapt
Approved by:	mat (portmgr, mentor), tcberner (mentor), jsm (maintainer), Chris Hutchinson <portmaster@bsdforge.com> (maintainer)
Differential Revision:	https://reviews.freebsd.org/D16387
This commit is contained in:
Alexandre C. Guimarães 2019-01-07 15:08:08 +00:00
parent b1f757b487
commit db490bfda4
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=489579
12 changed files with 77 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
graphics/lximage-qt/Makefile
View File

@ -14,7 +14,7 @@ LICENSE= GPLv2
LIB_DEPENDS= libexif.so:graphics/libexif \ LIB_DEPENDS= libexif.so:graphics/libexif \
libmenu-cache.so:x11/menu-cache \ libmenu-cache.so:x11/menu-cache \
libfm.so:x11/libfm libfm.so:x11/libfm@gtk2
USES= cmake compiler:c++11-lib desktop-file-utils gettext-runtime \ USES= cmake compiler:c++11-lib desktop-file-utils gettext-runtime \
localbase:ldflags lxqt pkgconfig qt:5 tar:xz localbase:ldflags lxqt pkgconfig qt:5 tar:xz

2
sysutils/lxqt-qtplugin/Makefile
View File

@ -13,7 +13,7 @@ COMMENT= LXQt system integration plugin for Qt
LICENSE= LGPL21+ LICENSE= LGPL21+
LIB_DEPENDS= libdbusmenu-qt5.so:devel/libdbusmenu-qt@qt5 \ LIB_DEPENDS= libdbusmenu-qt5.so:devel/libdbusmenu-qt@qt5 \
libfm.so:x11/libfm \ libfm.so:x11/libfm@gtk2 \
libmenu-cache.so:x11/menu-cache \ libmenu-cache.so:x11/menu-cache \
libexif.so:graphics/libexif libexif.so:graphics/libexif

2
x11-fm/pcmanfm-qt/Makefile
View File

@ -13,7 +13,7 @@ COMMENT= LXQt file manager
LICENSE= GPLv2 LICENSE= GPLv2
LIB_DEPENDS= libmenu-cache.so:x11/menu-cache \ LIB_DEPENDS= libmenu-cache.so:x11/menu-cache \
libfm.so:x11/libfm \ libfm.so:x11/libfm@gtk2 \
libexif.so:graphics/libexif libexif.so:graphics/libexif
USES= cmake compiler:c++11-lib desktop-file-utils \ USES= cmake compiler:c++11-lib desktop-file-utils \

39
x11-fm/pcmanfm/Makefile
View File

@ -2,7 +2,7 @@
# $FreeBSD$ # $FreeBSD$
PORTNAME= pcmanfm PORTNAME= pcmanfm
PORTVERSION= 1.2.5 PORTVERSION= 1.3.1
CATEGORIES= x11-fm CATEGORIES= x11-fm
MASTER_SITES= SF/${PORTNAME}/PCManFM%20%2B%20Libfm%20%28tarball%20release%29/PCManFM/ MASTER_SITES= SF/${PORTNAME}/PCManFM%20%2B%20Libfm%20%28tarball%20release%29/PCManFM/
@ -11,25 +11,42 @@ COMMENT= PCMan File Manager
LICENSE= GPLv2 LICENSE= GPLv2
LIB_DEPENDS= libfm-gtk.so:x11/libfm \ LIB_DEPENDS= libfontconfig.so:x11-fonts/fontconfig \
libfontconfig.so:x11-fonts/fontconfig \
libfreetype.so:print/freetype2 libfreetype.so:print/freetype2
USES= desktop-file-utils gettext gmake libtool localbase pkgconfig \ FLAVORS= gtk2 gtk3
tar:xz FLAVOR?= ${FLAVORS:[1]}
GNU_CONFIGURE= yes
USE_GNOME= glib20 gtk20 cairo pango gdkpixbuf2 intltool intlhack
USE_XORG= x11
CONFIGURE_ARGS=--with-gtk=2 gtk3_PKGNAMESUFFIX= -gtk3
gtk2_LIB_DEPENDS= libfm-gtk.so:x11/libfm@gtk2
gtk3_LIB_DEPENDS= libfm-gtk3.so:x11/libfm@gtk3
gtk2_CONFLICTS_INSTALL= pcmanfm-gtk3
gtk3_CONFLICTS_INSTALL= pcmanfm
USES= desktop-file-utils gmake gnome gettext libtool localbase \
pkgconfig tar:xz
USE_GNOME= cairo gdkpixbuf2 intltool
USE_XORG= x11
GNU_CONFIGURE= yes
.if ${FLAVOR:Mgtk2}
USE_GNOME+= gtk20
CONFIGURE_ARGS= --with-gtk=2
.elif ${FLAVOR:Mgtk3}
USE_GNOME+= gtk30
CONFIGURE_ARGS= --with-gtk=3
.endif
OPTIONS_DEFINE= NLS OPTIONS_DEFINE= NLS
OPTIONS_SUB= yes OPTIONS_SUB= yes
NLS_USES= gettext-tools:build
NLS_CONFIGURE_ENABLE= nls NLS_CONFIGURE_ENABLE= nls
NLS_USES_OFF= gettext-tools
post-extract: post-extract:
${MV} ${WRKSRC}/data/pcmanfm.conf \ @${MV} ${WRKSRC}/data/pcmanfm.conf \
${WRKSRC}/data/pcmanfm.conf.sample ${WRKSRC}/data/pcmanfm.conf.sample
post-patch: post-patch:

6
x11-fm/pcmanfm/distinfo
View File

@ -1,3 +1,3 @@
TIMESTAMP = 1482343112 TIMESTAMP = 1545853766
SHA256 (pcmanfm-1.2.5.tar.xz) = 0c86cac028b705ff314c7464d814c2cf7ff604c17491c20aa204b1ef1a80ad67 SHA256 (pcmanfm-1.3.1.tar.xz) = 6804043b3ee3a703edde41c724946174b505fe958703eadbd7e0876ece836855
SIZE (pcmanfm-1.2.5.tar.xz) = 417808 SIZE (pcmanfm-1.3.1.tar.xz) = 423380

2
x11/libfm-extra/pkg-plist
View File

@ -3,5 +3,5 @@ include/libfm/fm-version.h
include/libfm/fm-xml-file.h include/libfm/fm-xml-file.h
lib/libfm-extra.so lib/libfm-extra.so
lib/libfm-extra.so.4 lib/libfm-extra.so.4
lib/libfm-extra.so.4.0.5 lib/libfm-extra.so.4.1.2
libdata/pkgconfig/libfm-extra.pc libdata/pkgconfig/libfm-extra.pc

2
x11/libfm-qt/Makefile
View File

@ -12,7 +12,7 @@ COMMENT= Qt port of libfm
LICENSE= LGPL21+ LICENSE= LGPL21+
LIB_DEPENDS= libfm.so:x11/libfm \ LIB_DEPENDS= libfm.so:x11/libfm@gtk2 \
libmenu-cache.so:x11/menu-cache \ libmenu-cache.so:x11/menu-cache \
libexif.so:graphics/libexif libexif.so:graphics/libexif

43
x11/libfm/Makefile
View File

@ -2,7 +2,7 @@
# $FreeBSD$ # $FreeBSD$
PORTNAME= libfm PORTNAME= libfm
PORTVERSION= 1.2.5 DISTVERSION= 1.3.1
CATEGORIES= x11 CATEGORIES= x11
MASTER_SITES= SF/pcmanfm/PCManFM%20%2B%20Libfm%20%28tarball%20release%29/LibFM/ MASTER_SITES= SF/pcmanfm/PCManFM%20%2B%20Libfm%20%28tarball%20release%29/LibFM/
@ -19,35 +19,53 @@ LIB_DEPENDS= libmenu-cache.so:x11/menu-cache \
libfontconfig.so:x11-fonts/fontconfig \ libfontconfig.so:x11-fonts/fontconfig \
libfreetype.so:print/freetype2 \ libfreetype.so:print/freetype2 \
libfm-extra.so:x11/libfm-extra libfm-extra.so:x11/libfm-extra
FLAVORS= gtk2 gtk3
FLAVOR?= ${FLAVORS:[1]}
gtk3_PKGNAMESUFFIX= -gtk3
gtk2_CONFLICTS_INSTALL= libfm-gtk3
gtk3_CONFLICTS_INSTALL= libfm
.endif .endif
SLAVEDIRS= ${CATEGORIES}/${PORTNAME}-extra SLAVEDIRS= ${CATEGORIES}/${PORTNAME}-extra
USES= gettext-tools gmake libtool localbase pathfix pkgconfig tar:xz USES= gettext-tools gmake gnome libtool localbase \
USE_GNOME= glib20 intltool pkgconfig tar:xz
USE_GNOME= intltool
USE_LDCONFIG= yes USE_LDCONFIG= yes
GNU_CONFIGURE= yes GNU_CONFIGURE= yes
CONFIGURE_ARGS= --sysconfdir=${LOCALBASE}/etc --disable-static CONFIGURE_ARGS= --sysconfdir=${LOCALBASE}/etc --disable-static
INSTALL_TARGET= install-strip
.if ! defined(EXTRA_ONLY) .if ! defined(EXTRA_ONLY)
. if ${FLAVOR:Mgtk2}
USES+= desktop-file-utils shared-mime-info USES+= desktop-file-utils shared-mime-info
USE_GNOME+= gtk20 cairo gdkpixbuf2 USE_GNOME+= gtk20 cairo gdkpixbuf2
CONFIGURE_ARGS+=--with-gtk=2 CONFIGURE_ARGS+= --with-gtk=2
PLIST_SUB= GTKVERSION=gtk
. elif ${FLAVOR:Mgtk3}
USES+= desktop-file-utils shared-mime-info
USE_GNOME+= gtk30 cairo gdkpixbuf2
CONFIGURE_ARGS+= --with-gtk=3
PLIST_SUB= GTKVERSION=gtk3
. endif
.else .else
USE_GNOME+= intltool intlhack USE_GNOME+= glib20
CONFIGURE_ARGS+=--with-extra-only CONFIGURE_ARGS+= --with-extra-only
.endif .endif
INSTALL_TARGET= install-strip
OPTIONS_DEFINE= NLS OPTIONS_DEFINE= NLS
OPTIONS_SUB= yes OPTIONS_SUB= yes
NLS_USES= gettext-runtime NLS_USES= gettext-runtime:build
NLS_CONFIGURE_ENABLE= nls NLS_CONFIGURE_ENABLE= nls
post-extract: post-extract:
.if !defined(EXTRA_ONLY) .if ! defined(EXTRA_ONLY)
${MV} ${WRKSRC}/data/libfm.conf \ @${MV} ${WRKSRC}/data/libfm.conf \
${WRKSRC}/data/libfm.conf.sample ${WRKSRC}/data/libfm.conf.sample
.endif .endif
@ -56,10 +74,9 @@ post-patch:
${WRKSRC}/configure ${WRKSRC}/configure
${REINPLACE_CMD} -e '/^pkgincludedir/s|-@FMLIBVER@||; \ ${REINPLACE_CMD} -e '/^pkgincludedir/s|-@FMLIBVER@||; \
/@LN_S@ @PACKAGE@-@FMLIBVER@/d' \ /@LN_S@ @PACKAGE@-@FMLIBVER@/d' ${WRKSRC}/src/Makefile.in
${WRKSRC}/src/Makefile.in
.if !defined(EXTRA_ONLY) .if ! defined(EXTRA_ONLY)
${REINPLACE_CMD} -e 's|DATA = libfm-extra.pc|DATA =|' \ ${REINPLACE_CMD} -e 's|DATA = libfm-extra.pc|DATA =|' \
${WRKSRC}/Makefile.in ${WRKSRC}/Makefile.in

6
x11/libfm/distinfo
View File

@ -1,3 +1,3 @@
TIMESTAMP = 1481474043 TIMESTAMP = 1545853830
SHA256 (libfm-1.2.5.tar.xz) = c706bb1020cf5f2d6f5a9226f692ce1985947134dcf2bde64278bd0420779b5a SHA256 (libfm-1.3.1.tar.xz) = 96b1244bde41ca0eef0332cfb5c67bb16725dfd102128f3e6f74fadc13a1cfe4
SIZE (libfm-1.2.5.tar.xz) = 912740 SIZE (libfm-1.3.1.tar.xz) = 940632

11
x11/libfm/pkg-plist
View File

@ -1,6 +1,7 @@
bin/libfm-pref-apps bin/libfm-pref-apps
bin/lxshortcut bin/lxshortcut
@sample etc/xdg/libfm/libfm.conf.sample @sample etc/xdg/libfm/libfm.conf.sample
include/libfm/fm-action.h
include/libfm/fm-actions.h include/libfm/fm-actions.h
include/libfm/fm-app-chooser-combo-box.h include/libfm/fm-app-chooser-combo-box.h
include/libfm/fm-app-chooser-dlg.h include/libfm/fm-app-chooser-dlg.h
@ -67,19 +68,19 @@ include/libfm/fm-thumbnail.h
include/libfm/fm-thumbnailer.h include/libfm/fm-thumbnailer.h
include/libfm/fm-utils.h include/libfm/fm-utils.h
include/libfm/fm.h include/libfm/fm.h
lib/libfm-gtk.so lib/libfm-%%GTKVERSION%%.so
lib/libfm-gtk.so.4 lib/libfm-%%GTKVERSION%%.so.4
lib/libfm-gtk.so.4.0.5 lib/libfm-%%GTKVERSION%%.so.4.1.2
lib/libfm.so lib/libfm.so
lib/libfm.so.4 lib/libfm.so.4
lib/libfm.so.4.0.5 lib/libfm.so.4.1.2
lib/libfm/modules/gtk-fileprop-x-desktop.so lib/libfm/modules/gtk-fileprop-x-desktop.so
lib/libfm/modules/gtk-fileprop-x-shortcut.so lib/libfm/modules/gtk-fileprop-x-shortcut.so
lib/libfm/modules/gtk-menu-actions.so lib/libfm/modules/gtk-menu-actions.so
lib/libfm/modules/gtk-menu-trash.so lib/libfm/modules/gtk-menu-trash.so
lib/libfm/modules/vfs-menu.so lib/libfm/modules/vfs-menu.so
lib/libfm/modules/vfs-search.so lib/libfm/modules/vfs-search.so
libdata/pkgconfig/libfm-gtk.pc libdata/pkgconfig/libfm-%%GTKVERSION%%.pc
libdata/pkgconfig/libfm.pc libdata/pkgconfig/libfm.pc
man/man1/libfm-pref-apps.1.gz man/man1/libfm-pref-apps.1.gz
man/man1/lxshortcut.1.gz man/man1/lxshortcut.1.gz

2
x11/lxhotkey/Makefile
View File

@ -13,7 +13,7 @@ LICENSE= GPLv2
LICENSE_FILE= ${WRKSRC}/COPYING LICENSE_FILE= ${WRKSRC}/COPYING
LIB_DEPENDS= libfm-extra.so:x11/libfm-extra \ LIB_DEPENDS= libfm-extra.so:x11/libfm-extra \
libfm.so:x11/libfm \ libfm.so:x11/libfm@gtk2 \
libfontconfig.so:x11-fonts/fontconfig \ libfontconfig.so:x11-fonts/fontconfig \
libfreetype.so:print/freetype2 \ libfreetype.so:print/freetype2 \
libunistring.so:devel/libunistring libunistring.so:devel/libunistring

2
x11/lxpanel/Makefile
View File

@ -15,7 +15,7 @@ LICENSE_FILE= ${WRKSRC}/COPYING
LIB_DEPENDS= libmenu-cache.so:x11/menu-cache \ LIB_DEPENDS= libmenu-cache.so:x11/menu-cache \
libkeybinder.so:x11/keybinder \ libkeybinder.so:x11/keybinder \
libfm-gtk.so:x11/libfm \ libfm-gtk.so:x11/libfm@gtk2 \
libfontconfig.so:x11-fonts/fontconfig \ libfontconfig.so:x11-fonts/fontconfig \
libfreetype.so:print/freetype2 libfreetype.so:print/freetype2
RUN_DEPENDS= ${LOCALBASE}/etc/xdg/menus/lxde-applications.menu:x11/lxmenu-data RUN_DEPENDS= ${LOCALBASE}/etc/xdg/menus/lxde-applications.menu:x11/lxmenu-data